X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathStream.cpp;h=b142f7e9c04b2d63632d86f57b78883eaf9d6023;hb=573500dd04f154f27318ac5ec469a337f97fe9f0;hp=bfba25e463a7eac03ddd1c19c224f409ed67d990;hpb=89e7f60e1d1e9f8b20288703643c9bca820b393b;p=lyx.git
diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp
index bfba25e463..b142f7e9c0 100644
--- a/src/mathed/MathStream.cpp
+++ b/src/mathed/MathStream.cpp
@@ -93,6 +93,8 @@ WriteStream & operator<<(WriteStream & ws, docstring const & s)
} else if (ws.pendingSpace() && s.length() > 0) {
if (isAlphaASCII(s[0]))
ws.os() << ' ';
+ else if (s[0] == ' ' && ws.textMode())
+ ws.os() << '\\';
ws.pendingSpace(false);
}
ws.os() << s;
@@ -111,14 +113,14 @@ WriteStream::WriteStream(odocstream & os, bool fragile, bool latex, OutputType o
Encoding const * encoding)
: os_(os), fragile_(fragile), firstitem_(false), latex_(latex),
output_(output), pendingspace_(false), pendingbrace_(false),
- textmode_(false), locked_(0), line_(0), encoding_(encoding)
+ textmode_(false), locked_(0), ascii_(0), line_(0), encoding_(encoding)
{}
WriteStream::WriteStream(odocstream & os)
: os_(os), fragile_(false), firstitem_(false), latex_(false),
output_(wsDefault), pendingspace_(false), pendingbrace_(false),
- textmode_(false), locked_(0), line_(0), encoding_(0)
+ textmode_(false), locked_(0), ascii_(0), line_(0), encoding_(0)
{}
@@ -161,6 +163,12 @@ void WriteStream::lockedMode(bool locked)
}
+void WriteStream::asciiOnly(bool ascii)
+{
+ ascii_ = ascii;
+}
+
+
WriteStream & operator<<(WriteStream & ws, MathAtom const & at)
{
at->write(ws);
@@ -185,6 +193,8 @@ WriteStream & operator<<(WriteStream & ws, char const * s)
} 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;
@@ -203,6 +213,8 @@ WriteStream & operator<<(WriteStream & ws, char c)
} else if (ws.pendingSpace()) {
if (isAlphaASCII(c))
ws.os() << ' ';
+ else if (c == ' ' && ws.textMode())
+ ws.os() << '\\';
ws.pendingSpace(false);
}
ws.os() << c;
@@ -240,10 +252,36 @@ WriteStream & operator<<(WriteStream & ws, unsigned int i)
MathStream::MathStream(odocstream & os)
- : os_(os), tab_(0), line_(0), lastchar_(0)
+ : os_(os), tab_(0), line_(0), lastchar_(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);
@@ -272,11 +310,21 @@ MathStream & operator<<(MathStream & ms, char c)
}
+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() << '<' << from_ascii(t.tag_) << '>';
+ ms.os() << '<' << from_ascii(t.tag_);
+ if (!t.attr_.empty())
+ ms.os() << " " << from_ascii(t.attr_);
+ ms << '>';
return ms;
}
@@ -291,20 +339,197 @@ MathStream & operator<<(MathStream & ms, ETag const & t)
}
-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), lastchar_(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), 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)
+{
+ was_text_ = os_.inText();
+ if (was_text_)
+ os_ << "";
+ if (text) {
+ os_.setTextMode();
+ os_ << "";
+ opened_ = true;
+ } else {
+ if (!attrs.empty()) {
+ os_ << "";
+ opened_ = true;
+ }
+ os_.setMathMode();
+ }
+}
+
+
+SetMode::~SetMode()
+{
+ if (opened_) {
+ if (os_.inText())
+ os_ << "";
+ else
+ os_ << "";
+ }
+ if (was_text_) {
+ os_.setTextMode();
+ os_ << "";
+ } else {
+ os_.setMathMode();
+ }
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+
+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)
+{
+ was_text_ = os_.inText();
+ if (text) {
+ os_.setTextMode();
+ if (attrs.empty())
+ os_ << MTag("span");
+ else
+ os_ << MTag("span", attrs);
+ opened_ = true;
+ } else
+ os_.setMathMode();
+}
+
+
+SetHTMLMode::~SetHTMLMode()
+{
+ if (opened_)
+ os_ << ETag("span");
+ if (was_text_)
+ os_.setTextMode();
+ else
+ os_.setMathMode();
+}
+
+
//////////////////////////////////////////////////////////////////////