* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#include "InsetMath.h"
+#include "MathStream.h"
+
#include "MathData.h"
#include "MathExtern.h"
-#include "MathStream.h"
-#include "support/lyxalgo.h"
+#include "support/docstring.h"
+#include "support/RefChanger.h"
#include "support/textutils.h"
+#include <algorithm>
+#include <cstring>
+#include <ostream>
-namespace lyx {
-
-using std::strlen;
-
+using namespace std;
+namespace lyx {
//////////////////////////////////////////////////////////////////////
}
-NormalStream & operator<<(NormalStream & ns, MathArray const & ar)
+NormalStream & operator<<(NormalStream & ns, MathData const & ar)
{
normalize(ar, ns);
return ns;
}
-NormalStream & operator<<(NormalStream & ns, const std::string & s)
+NormalStream & operator<<(NormalStream & ns, const string & s)
{
ns.os() << from_utf8(s);
return ns;
WriteStream & operator<<(WriteStream & ws, docstring const & s)
{
- if (ws.pendingSpace() && s.length() > 0) {
- if (isAlphaASCII(s[0]))
+ // 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()) {
+ if (isAlphaASCII(s[first]))
ws.os() << ' ';
+ 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)
+WriteStream::WriteStream(otexrowstream & os, bool fragile, bool latex,
+ OutputType output, Encoding const * encoding)
: os_(os), fragile_(fragile), firstitem_(false), latex_(latex),
- pendingspace_(false), line_(0)
-{}
-
-
-WriteStream::WriteStream(odocstream & os)
- : os_(os), fragile_(false), firstitem_(false), latex_(false),
- pendingspace_(false), line_(0)
+ output_(output), pendingspace_(false), pendingbrace_(false),
+ textmode_(false), locked_(0), ascii_(0), canbreakline_(true),
+ line_(0), encoding_(encoding), row_entry_(TexRow::row_none)
{}
WriteStream::~WriteStream()
{
- if (pendingspace_)
+ if (pendingbrace_)
+ os_ << '}';
+ else if (pendingspace_)
os_ << ' ';
}
}
+void WriteStream::pendingBrace(bool brace)
+{
+ pendingbrace_ = brace;
+}
+
+
+void WriteStream::textMode(bool textmode)
+{
+ textmode_ = textmode;
+}
+
+
+void WriteStream::lockedMode(bool locked)
+{
+ locked_ = locked;
+}
+
+
+void WriteStream::asciiOnly(bool ascii)
+{
+ ascii_ = ascii;
+}
+
+
+Changer WriteStream::changeRowEntry(TexRow::RowEntry entry)
+{
+ return make_change(row_entry_, entry);
+}
+
+
+bool WriteStream::startOuterRow()
+{
+ if (TexRow::isNone(row_entry_))
+ return false;
+ return texrow().start(row_entry_);
+}
+
+
WriteStream & operator<<(WriteStream & ws, MathAtom const & at)
{
at->write(ws);
}
-WriteStream & operator<<(WriteStream & ws, MathArray const & ar)
+WriteStream & operator<<(WriteStream & ws, MathData const & ar)
{
write(ar, ws);
return ws;
WriteStream & operator<<(WriteStream & ws, char const * s)
{
- if (ws.pendingSpace() && strlen(s) > 0) {
- if (isAlphaASCII(s[0]))
- 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 (ws.pendingSpace()) {
+ if (c == '\n' && !ws.canBreakLine())
+ return ws;
+
+ if (ws.pendingBrace()) {
+ ws.os() << '}';
+ ws.pendingBrace(false);
+ ws.pendingSpace(false);
+ ws.textMode(true);
+ } else if (ws.pendingSpace()) {
if (isAlphaASCII(c))
ws.os() << ' ';
+ else if (c == ' ' && ws.textMode())
+ ws.os() << '\\';
ws.pendingSpace(false);
}
ws.os() << c;
if (c == '\n')
ws.addlines(1);
+ ws.canBreakLine(c != '\n');
return ws;
}
WriteStream & operator<<(WriteStream & ws, int i)
{
+ if (ws.pendingBrace()) {
+ ws.os() << '}';
+ ws.pendingBrace(false);
+ ws.textMode(true);
+ }
ws.os() << i;
+ ws.canBreakLine(true);
return ws;
}
WriteStream & operator<<(WriteStream & ws, unsigned int i)
{
+ if (ws.pendingBrace()) {
+ ws.os() << '}';
+ ws.pendingBrace(false);
+ ws.textMode(true);
+ }
ws.os() << i;
+ ws.canBreakLine(true);
return ws;
}
MathStream::MathStream(odocstream & os)
- : os_(os), tab_(0), line_(0), lastchar_(0)
+ : os_(os), tab_(0), line_(0), in_text_(false)
{}
+void MathStream::cr()
+{
+ os() << '\n';
+ for (int i = 0; i < tab(); ++i)
+ os() << ' ';
+}
+
+
+void MathStream::defer(docstring const & s)
+{
+ deferred_ << s;
+}
+
+
+void MathStream::defer(string const & s)
+{
+ deferred_ << from_utf8(s);
+}
+
+
+docstring MathStream::deferred() const
+{
+ return deferred_.str();
+}
+
+
MathStream & operator<<(MathStream & ms, MathAtom const & at)
{
at->mathmlize(ms);
}
-MathStream & operator<<(MathStream & ms, MathArray const & ar)
+MathStream & operator<<(MathStream & ms, MathData const & ar)
{
mathmlize(ar, ms);
return ms;
}
+MathStream & operator<<(MathStream & ms, char_type c)
+{
+ ms.os().put(c);
+ return ms;
+}
+
+
MathStream & operator<<(MathStream & ms, MTag const & t)
{
++ms.tab();
ms.cr();
- ms.os() << '<' << t.tag_ << '>';
+ ms.os() << '<' << from_ascii(t.tag_);
+ if (!t.attr_.empty())
+ ms.os() << " " << from_ascii(t.attr_);
+ ms << '>';
return ms;
}
ms.cr();
if (ms.tab() > 0)
--ms.tab();
- ms.os() << "</" << t.tag_ << '>';
+ ms.os() << "</" << from_ascii(t.tag_) << '>';
return ms;
}
-void MathStream::cr()
+MathStream & operator<<(MathStream & ms, docstring const & s)
{
- os() << '\n';
- for (int i = 0; i < tab(); ++i)
- os() << ' ';
+ ms.os() << s;
+ return ms;
}
-MathStream & operator<<(MathStream & ms, docstring const & s)
+//////////////////////////////////////////////////////////////////////
+
+
+HtmlStream::HtmlStream(odocstream & os)
+ : os_(os), tab_(0), line_(0), in_text_(false)
+{}
+
+
+void HtmlStream::defer(docstring const & s)
+{
+ deferred_ << s;
+}
+
+
+void HtmlStream::defer(string const & s)
+{
+ deferred_ << from_utf8(s);
+}
+
+
+docstring HtmlStream::deferred() const
+{
+ return deferred_.str();
+}
+
+
+HtmlStream & operator<<(HtmlStream & ms, MathAtom const & at)
+{
+ at->htmlize(ms);
+ return ms;
+}
+
+
+HtmlStream & operator<<(HtmlStream & ms, MathData const & ar)
+{
+ htmlize(ar, ms);
+ return ms;
+}
+
+
+HtmlStream & operator<<(HtmlStream & ms, char const * s)
+{
+ ms.os() << s;
+ return ms;
+}
+
+
+HtmlStream & operator<<(HtmlStream & ms, char c)
+{
+ ms.os() << c;
+ return ms;
+}
+
+
+HtmlStream & operator<<(HtmlStream & ms, char_type c)
+{
+ ms.os().put(c);
+ return ms;
+}
+
+
+HtmlStream & operator<<(HtmlStream & ms, MTag const & t)
+{
+ ms.os() << '<' << from_ascii(t.tag_);
+ if (!t.attr_.empty())
+ ms.os() << " " << from_ascii(t.attr_);
+ ms << '>';
+ return ms;
+}
+
+
+HtmlStream & operator<<(HtmlStream & ms, ETag const & t)
+{
+ ms.os() << "</" << from_ascii(t.tag_) << '>';
+ return ms;
+}
+
+
+HtmlStream & operator<<(HtmlStream & ms, docstring const & s)
{
ms.os() << s;
return ms;
}
+
+//////////////////////////////////////////////////////////////////////
+
+
+SetMode::SetMode(MathStream & os, bool text)
+ : os_(os)
+{
+ was_text_ = os_.inText();
+ os_.setTextMode(text);
+}
+
+
+SetMode::~SetMode()
+{
+ os_.setTextMode(was_text_);
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+
+SetHTMLMode::SetHTMLMode(HtmlStream & os, bool text)
+ : os_(os)
+{
+ was_text_ = os_.inText();
+ os_.setTextMode(text);
+}
+
+
+SetHTMLMode::~SetHTMLMode()
+{
+ os_.setTextMode(was_text_);
+}
+
+
//////////////////////////////////////////////////////////////////////
}
-MapleStream & operator<<(MapleStream & ms, MathArray const & ar)
+MapleStream & operator<<(MapleStream & ms, MathData const & ar)
{
maple(ar, ms);
return ms;
}
-MaximaStream & operator<<(MaximaStream & ms, MathArray const & ar)
+MaximaStream & operator<<(MaximaStream & ms, MathData const & ar)
{
maxima(ar, ms);
return ms;
}
-MathematicaStream & operator<<(MathematicaStream & ms, MathArray const & ar)
+MathematicaStream & operator<<(MathematicaStream & ms, MathData const & ar)
{
mathematica(ar, ms);
return ms;
}
-OctaveStream & operator<<(OctaveStream & ns, MathArray const & ar)
+OctaveStream & operator<<(OctaveStream & ns, MathData const & ar)
{
octave(ar, ns);
return ns;
}
-OctaveStream & operator<<(OctaveStream & os, std::string const & s)
+OctaveStream & operator<<(OctaveStream & os, string const & s)
{
os.os() << from_utf8(s);
return os;