#include "TexRow.h"
+
+#include "support/debug.h"
#include "support/docstring.h"
-#include "support/RefChanger.h"
#include "support/textutils.h"
#include <algorithm>
/////////////////////////////////////////////////////////////////
-WriteStream & operator<<(WriteStream & ws, docstring const & s)
+TeXMathStream & operator<<(TeXMathStream & ws, docstring const & s)
{
// Skip leading '\n' if we had already output a newline char
size_t const first =
} else if (ws.pendingSpace()) {
if (isAlphaASCII(s[first]))
ws.os() << ' ';
+ else if (s[first] == '[' && ws.useBraces())
+ ws.os() << "{}";
else if (s[first] == ' ' && ws.textMode())
ws.os() << '\\';
ws.pendingSpace(false);
+ } else if (ws.useBraces()) {
+ if (s[first] == '\'')
+ ws.os() << "{}";
+ ws.useBraces(false);
}
ws.os() << s.substr(first);
int lf = 0;
}
-WriteStream::WriteStream(otexrowstream & os, bool fragile, bool latex,
- OutputType output, Encoding const * encoding)
- : os_(os), fragile_(fragile), firstitem_(false), latex_(latex),
- output_(output), insidemacro_opt_(false), pendingspace_(false),
- pendingbrace_(false), textmode_(false), locked_(0), ascii_(0),
- canbreakline_(true), mathsout_(false), ulemcmd_(NONE), line_(0),
- encoding_(encoding), row_entry_(TexRow::row_none)
+TeXMathStream::TeXMathStream(otexrowstream & os, bool fragile, bool latex,
+ OutputType output, Encoding const * encoding)
+ : os_(os), fragile_(fragile), latex_(latex),
+ output_(output), encoding_(encoding)
{}
-WriteStream::~WriteStream()
+TeXMathStream::~TeXMathStream()
{
if (pendingbrace_)
os_ << '}';
}
-void WriteStream::addlines(unsigned int n)
+void TeXMathStream::addlines(unsigned int n)
{
line_ += n;
}
-void WriteStream::pendingSpace(bool how)
+void TeXMathStream::pendingSpace(bool space)
+{
+ pendingspace_ = space;
+ if (!space)
+ usebraces_ = false;
+}
+
+
+void TeXMathStream::useBraces(bool braces)
{
- pendingspace_ = how;
+ usebraces_ = braces;
}
-void WriteStream::pendingBrace(bool brace)
+void TeXMathStream::pendingBrace(bool brace)
{
pendingbrace_ = brace;
}
-void WriteStream::textMode(bool textmode)
+void TeXMathStream::textMode(bool textmode)
{
textmode_ = textmode;
}
-void WriteStream::lockedMode(bool locked)
+void TeXMathStream::lockedMode(bool locked)
{
locked_ = locked;
}
-void WriteStream::asciiOnly(bool ascii)
+void TeXMathStream::asciiOnly(bool ascii)
{
ascii_ = ascii;
}
-Changer WriteStream::changeRowEntry(TexRow::RowEntry entry)
+Changer TeXMathStream::changeRowEntry(TexRow::RowEntry entry)
{
- return make_change(row_entry_, entry);
+ return changeVar(row_entry_, entry);
}
-bool WriteStream::startOuterRow()
+bool TeXMathStream::startOuterRow()
{
if (TexRow::isNone(row_entry_))
return false;
}
-WriteStream & operator<<(WriteStream & ws, MathAtom const & at)
+TeXMathStream & operator<<(TeXMathStream & ws, MathAtom const & at)
{
at->write(ws);
return ws;
}
-WriteStream & operator<<(WriteStream & ws, MathData const & ar)
+TeXMathStream & operator<<(TeXMathStream & ws, MathData const & ar)
{
write(ar, ws);
return ws;
}
-WriteStream & operator<<(WriteStream & ws, char const * s)
+TeXMathStream & operator<<(TeXMathStream & ws, char const * s)
{
ws << from_utf8(s);
return ws;
}
-WriteStream & operator<<(WriteStream & ws, char c)
+TeXMathStream & operator<<(TeXMathStream & ws, char c)
{
if (c == '\n' && !ws.canBreakLine())
return ws;
} else if (ws.pendingSpace()) {
if (isAlphaASCII(c))
ws.os() << ' ';
+ else if (c == '[' && ws.useBraces())
+ ws.os() << "{}";
else if (c == ' ' && ws.textMode())
ws.os() << '\\';
ws.pendingSpace(false);
+ } else if (ws.useBraces()) {
+ if (c == '\'')
+ ws.os() << "{}";
+ ws.useBraces(false);
}
ws.os() << c;
if (c == '\n')
}
-WriteStream & operator<<(WriteStream & ws, int i)
+TeXMathStream & operator<<(TeXMathStream & ws, int i)
{
if (ws.pendingBrace()) {
ws.os() << '}';
}
-WriteStream & operator<<(WriteStream & ws, unsigned int i)
+TeXMathStream & operator<<(TeXMathStream & ws, unsigned int i)
{
if (ws.pendingBrace()) {
ws.os() << '}';
//////////////////////////////////////////////////////////////////////
-MathStream::MathStream(odocstream & os)
- : os_(os), tab_(0), line_(0), in_text_(false)
+MathMLStream::MathMLStream(odocstream & os, std::string const & xmlns, bool xmlMode)
+ : os_(os), tab_(0), line_(0), in_text_(false), xmlns_(xmlns), xml_mode_(xmlMode)
{}
-void MathStream::cr()
+void MathMLStream::cr()
{
os() << '\n';
for (int i = 0; i < tab(); ++i)
}
-void MathStream::defer(docstring const & s)
+void MathMLStream::defer(docstring const & s)
{
deferred_ << s;
}
-void MathStream::defer(string const & s)
+void MathMLStream::defer(string const & s)
{
deferred_ << from_utf8(s);
}
-docstring MathStream::deferred() const
+docstring MathMLStream::deferred() const
{
return deferred_.str();
}
-MathStream & operator<<(MathStream & ms, MathAtom const & at)
+MathMLStream & operator<<(MathMLStream & ms, MathAtom const & at)
{
at->mathmlize(ms);
return ms;
}
-MathStream & operator<<(MathStream & ms, MathData const & ar)
+MathMLStream & operator<<(MathMLStream & ms, MathData const & ar)
{
mathmlize(ar, ms);
return ms;
}
-MathStream & operator<<(MathStream & ms, char const * s)
+MathMLStream & operator<<(MathMLStream & ms, char const * s)
{
ms.os() << s;
return ms;
}
-MathStream & operator<<(MathStream & ms, char c)
+MathMLStream & operator<<(MathMLStream & ms, char c)
{
ms.os() << c;
return ms;
}
-MathStream & operator<<(MathStream & ms, char_type c)
+MathMLStream & operator<<(MathMLStream & ms, char_type c)
{
ms.os().put(c);
return ms;
}
-MathStream & operator<<(MathStream & ms, MTag const & t)
+MathMLStream & operator<<(MathMLStream & ms, MTag const & t)
{
++ms.tab();
ms.cr();
- ms.os() << '<' << from_ascii(t.tag_);
+ ms.os() << '<' << from_ascii(ms.namespacedTag(t.tag_));
if (!t.attr_.empty())
ms.os() << " " << from_ascii(t.attr_);
- ms << '>';
+ ms << ">";
return ms;
}
-MathStream & operator<<(MathStream & ms, ETag const & t)
+MathMLStream & operator<<(MathMLStream & ms, ETag const & t)
{
ms.cr();
if (ms.tab() > 0)
--ms.tab();
- ms.os() << "</" << from_ascii(t.tag_) << '>';
+ ms.os() << "</" << from_ascii(ms.namespacedTag(t.tag_)) << ">";
return ms;
}
-MathStream & operator<<(MathStream & ms, docstring const & s)
+MathMLStream & operator<<(MathMLStream & ms, CTag const & t)
+{
+ ms.cr();
+ ms.os() << "<" << from_ascii(ms.namespacedTag(t.tag_));
+ if (!t.attr_.empty())
+ ms.os() << " " << from_utf8(t.attr_);
+ ms.os() << "/>";
+ return ms;
+}
+
+
+MathMLStream & operator<<(MathMLStream & ms, docstring const & s)
{
ms.os() << s;
return ms;
//////////////////////////////////////////////////////////////////////
-SetMode::SetMode(MathStream & os, bool text)
- : os_(os)
+SetMode::SetMode(MathMLStream & ms, bool text)
+ : ms_(ms)
{
- was_text_ = os_.inText();
- os_.setTextMode(text);
+ was_text_ = ms_.inText();
+ ms_.setTextMode(text);
}
SetMode::~SetMode()
{
- os_.setTextMode(was_text_);
+ ms_.setTextMode(was_text_);
}
}
-docstring convertDelimToXMLEscape(docstring const & name)
+docstring convertDelimToXMLEscape(docstring const & name, bool xmlmode)
{
+ // For the basic symbols, no difference between XML and HTML.
if (name.size() == 1) {
char_type const c = name[0];
if (c == '<')
MathWordList const & words = mathedWordList();
MathWordList::const_iterator it = words.find(name);
if (it != words.end()) {
- docstring const escape = it->second.xmlname;
+ // Only difference between XML and HTML, based on the contents read by MathFactory.
+ docstring const escape = xmlmode ? it->second.xmlname : it->second.htmlname;
return escape;
}
LYXERR0("Unable to find `" << name <<"' in the mathWordList.");