Cmake export tests: Added sublabel handling also to revertedTests

[lyx.git] / src / mathed / MathStream.cpp

diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp
index b142f7e9c04b2d63632d86f57b78883eaf9d6023..dabfc0680f93bb5ff8a03a9b9d880290be681aeb 100644 (file)
--- a/src/mathed/MathStream.cpp
+++ b/src/mathed/MathStream.cpp
@@ -85,42 +85,56 @@ NormalStream & operator<<(NormalStream & ns, int i)
 
 WriteStream & operator<<(WriteStream & ws, docstring const & s)
 {
+       // Skip leading '\n' if we had already output a newline char
+       size_t const first =
+               (s.length() > 0 && (s[0] != '\n' || ws.canBreakLine())) ? 0 : 1;
+
+       // Check whether there's something to output
+       if (s.length() <= first)
+               return ws;
+
        if (ws.pendingBrace()) {
                ws.os() << '}';
                ws.pendingBrace(false);
                ws.pendingSpace(false);
                ws.textMode(true);
-       } else if (ws.pendingSpace() && s.length() > 0) {
-               if (isAlphaASCII(s[0]))
+       } else if (ws.pendingSpace()) {
+               if (isAlphaASCII(s[first]))
                        ws.os() << ' ';
-               else if (s[0] == ' ' && ws.textMode())
+               else if (s[first] == ' ' && ws.textMode())
                        ws.os() << '\\';
                ws.pendingSpace(false);
        }
-       ws.os() << s;
+       ws.os() << s.substr(first);
        int lf = 0;
-       docstring::const_iterator dit = s.begin();
+       char_type lastchar = 0;
+       docstring::const_iterator dit = s.begin() + first;
        docstring::const_iterator end = s.end();
-       for (; dit != end; ++dit)
-               if ((*dit) == '\n')
+       for (; dit != end; ++dit) {
+               lastchar = *dit;
+               if (lastchar == '\n')
                        ++lf;
+       }
        ws.addlines(lf);
+       ws.canBreakLine(lastchar != '\n');
        return ws;
 }
 
 
-WriteStream::WriteStream(odocstream & os, bool fragile, bool latex, OutputType output,
-                       Encoding const * encoding)
+WriteStream::WriteStream(otexrowstream & os, bool fragile, bool latex,
+                                                OutputType output, Encoding const * encoding)
        : os_(os), fragile_(fragile), firstitem_(false), latex_(latex),
          output_(output), pendingspace_(false), pendingbrace_(false),
-         textmode_(false), locked_(0), ascii_(0), line_(0), encoding_(encoding)
+         textmode_(false), locked_(0), ascii_(0), canbreakline_(true),
+         line_(0), encoding_(encoding)
 {}
 
 
-WriteStream::WriteStream(odocstream & os)
+WriteStream::WriteStream(otexrowstream & os)
        : os_(os), fragile_(false), firstitem_(false), latex_(false),
          output_(wsDefault), pendingspace_(false), pendingbrace_(false),
-         textmode_(false), locked_(0), ascii_(0), line_(0), encoding_(0)
+         textmode_(false), locked_(0), ascii_(0), canbreakline_(true),
+         line_(0), encoding_(0) 
 {}
 
 
@@ -169,6 +183,29 @@ void WriteStream::asciiOnly(bool ascii)
 }
 
 
+void WriteStream::pushRowEntry(TexRow::RowEntry entry)
+{
+       outer_row_entries_.push_back(entry);
+}
+
+
+void WriteStream::popRowEntry()
+{
+       if (!outer_row_entries_.empty())
+               outer_row_entries_.pop_back();
+}
+
+
+bool WriteStream::startOuterRow()
+{
+       size_t n = outer_row_entries_.size();
+       if (n > 0)
+               return texrow().start(outer_row_entries_[n - 1]);
+       else
+               return false;
+}
+
+
 WriteStream & operator<<(WriteStream & ws, MathAtom const & at)
 {
        at->write(ws);
@@ -185,26 +222,16 @@ WriteStream & operator<<(WriteStream & ws, MathData const & ar)
 
 WriteStream & operator<<(WriteStream & ws, char const * s)
 {
-       if (ws.pendingBrace()) {
-               ws.os() << '}';
-               ws.pendingBrace(false);
-               ws.pendingSpace(false);
-               ws.textMode(true);
-       } else if (ws.pendingSpace() && strlen(s) > 0) {
-               if (isAlphaASCII(s[0]))
-                       ws.os() << ' ';
-               else if (s[0] == ' ' && ws.textMode())
-                       ws.os() << '\\';
-               ws.pendingSpace(false);
-       }
-       ws.os() << s;
-       ws.addlines(int(count(s, s + strlen(s), '\n')));
+       ws << from_utf8(s);
        return ws;
 }
 
 
 WriteStream & operator<<(WriteStream & ws, char c)
 {
+       if (c == '\n' && !ws.canBreakLine())
+               return ws;
+
        if (ws.pendingBrace()) {
                ws.os() << '}';
                ws.pendingBrace(false);
@@ -220,6 +247,7 @@ WriteStream & operator<<(WriteStream & ws, char c)
        ws.os() << c;
        if (c == '\n')
                ws.addlines(1);
+       ws.canBreakLine(c != '\n');
        return ws;
 }
 
@@ -232,6 +260,7 @@ WriteStream & operator<<(WriteStream & ws, int i)
                ws.textMode(true);
        }
        ws.os() << i;
+       ws.canBreakLine(true);
        return ws;
 }
 
@@ -244,6 +273,7 @@ WriteStream & operator<<(WriteStream & ws, unsigned int i)
                ws.textMode(true);
        }
        ws.os() << i;
+       ws.canBreakLine(true);
        return ws;
 }
 
@@ -252,7 +282,7 @@ WriteStream & operator<<(WriteStream & ws, unsigned int i)
 
 
 MathStream::MathStream(odocstream & os)
-       : os_(os), tab_(0), line_(0), lastchar_(0), in_text_(false)
+       : os_(os), tab_(0), line_(0), in_text_(false)
 {}
 
 
@@ -350,7 +380,7 @@ MathStream & operator<<(MathStream & ms, docstring const & s)
 
 
 HtmlStream::HtmlStream(odocstream & os)
-       : os_(os), tab_(0), line_(0), lastchar_(0), in_text_(false)
+       : os_(os), tab_(0), line_(0), in_text_(false)
 {}
 
 
@@ -435,55 +465,16 @@ HtmlStream & operator<<(HtmlStream & ms, docstring const & s)
 
 
 SetMode::SetMode(MathStream & os, bool text)
-       : os_(os), opened_(false)
-{
-       init(text, "");
-}
-
-
-SetMode::SetMode(MathStream & os, bool text, string const & attrs)
-       : os_(os), opened_(false)
-{
-       init(text, attrs);
-}
-
-
-void SetMode::init(bool text, string const & attrs)
+       : os_(os)
 {
        was_text_ = os_.inText();
-       if (was_text_)
-               os_ << "</mtext>";
-       if (text) {
-               os_.setTextMode();
-               os_ << "<mtext";
-               if (!attrs.empty())
-                       os_ << " " << from_utf8(attrs);
-               os_ << ">";
-               opened_ = true;
-       } else {
-               if (!attrs.empty()) {
-                       os_ << "<mstyle " << from_utf8(attrs) << ">";
-                       opened_ = true;
-               }
-               os_.setMathMode();
-       }
+       os_.setTextMode(text);
 }
 
 
 SetMode::~SetMode()
 {
-       if (opened_) {
-               if (os_.inText())
-                       os_ << "</mtext>";
-               else
-                       os_ << "</mstyle>";
-       }
-       if (was_text_) {
-               os_.setTextMode();
-               os_ << "<mtext>";
-       } else {
-               os_.setMathMode();
-       }
+       os_.setTextMode(was_text_);
 }
 
 
@@ -491,42 +482,16 @@ SetMode::~SetMode()
 
 
 SetHTMLMode::SetHTMLMode(HtmlStream & os, bool text)
-       : os_(os), opened_(false)
-{
-       init(text, "");
-}
-
-
-SetHTMLMode::SetHTMLMode(HtmlStream & os, bool text, string attrs)
-       : os_(os), opened_(true)
-{
-       init(text, attrs);
-}
-
-
-void SetHTMLMode::init(bool text, string const & attrs)
+       : os_(os)
 {
        was_text_ = os_.inText();
-       if (text) {
-               os_.setTextMode();
-               if (attrs.empty())
-                       os_ << MTag("span");
-               else
-                       os_ << MTag("span", attrs);
-               opened_ = true;
-       } else
-               os_.setMathMode();
+       os_.setTextMode(text);
 }
 
 
 SetHTMLMode::~SetHTMLMode()
 {
-       if (opened_)
-               os_ << ETag("span");
-       if (was_text_)
-               os_.setTextMode();
-       else
-               os_.setMathMode();
+       os_.setTextMode(was_text_);
 }