]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_mathmlstream.C
fix typo that put too many include paths for most people
[lyx.git] / src / mathed / math_mathmlstream.C
index f4e9ad4f926904dd0f4a9f48977dfa6ab9b70d30..9f9c1dc7d5d52b538f5a1c7e45618744de316e4f 100644 (file)
@@ -4,9 +4,13 @@
 #include "math_inset.h"
 #include "math_extern.h"
 #include "debug.h"
+#include "support/lyxalgo.h"
 
 
-MathMLStream::MathMLStream(std::ostream & os)
+using std::ostream;
+
+
+MathMLStream::MathMLStream(ostream & os)
        : os_(os), tab_(0), line_(0), lastchar_(0)
 {}
 
@@ -183,16 +187,22 @@ NormalStream & operator<<(NormalStream & ns, char c)
 //////////////////////////////////////////////////////////////////////
 
 
-WriteStream::WriteStream(std::ostream & os, bool fragile)
-       : os_(os), fragile_(fragile), line_(0)
+WriteStream::WriteStream(ostream & os, bool fragile, bool latex)
+       : os_(os), fragile_(fragile), latex_(latex), firstitem_(false), line_(0)
 {}
 
 
-WriteStream::WriteStream(std::ostream & os)
-       : os_(os), fragile_(false), line_(0)
+WriteStream::WriteStream(ostream & os)
+       : os_(os), fragile_(false), latex_(false), firstitem_(false), line_(0)
 {}
 
 
+void WriteStream::addlines(unsigned int n)
+{
+       line_ += n;
+}
+
+
 WriteStream & operator<<(WriteStream & ws, MathInset const * p)
 {
        if (p)
@@ -213,10 +223,7 @@ WriteStream & operator<<(WriteStream & ws, MathArray const & ar)
 WriteStream & operator<<(WriteStream & ws, char const * s)
 {
        ws.os() << s;
-       for ( ; *s ; ++s) {
-               if (*s == '\n')
-                       ++ws.line();
-       }
+       ws.addlines(int(lyx::count(s, s+strlen(s), '\n')));
        return ws;
 }
 
@@ -225,7 +232,7 @@ WriteStream & operator<<(WriteStream & ws, char c)
 {
        ws.os() << c;
        if (c == '\n')
-               ++ws.line();
+               ws.addlines(1);
        return ws;
 }