#include <config.h>
-#include <algorithm>
#include "math_mathmlstream.h"
#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)
{}
//////////////////////////////////////////////////////////////////////
-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)
WriteStream & operator<<(WriteStream & ws, char const * s)
{
ws.os() << s;
- ws.line() += std::count(s, s + strlen(s), '\n');
+ ws.addlines(int(lyx::count(s, s+strlen(s), '\n')));
return ws;
}
{
ws.os() << c;
if (c == '\n')
- ++ws.line();
+ ws.addlines(1);
return ws;
}