X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathStream.cpp;h=cf3fb51f1f0ba484be79ef9dc7567570b20c3afd;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=6ad980597d54a92495b819911e196ee8ca755432;hpb=a694de895effa49df79cb9b2fd00d6dce03fd0b2;p=lyx.git diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp index 6ad980597d..cf3fb51f1f 100644 --- a/src/mathed/MathStream.cpp +++ b/src/mathed/MathStream.cpp @@ -3,7 +3,7 @@ * 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. */ @@ -12,12 +12,15 @@ #include "MathStream.h" -#include "InsetMath.h" +#include "MathFactory.h" #include "MathData.h" #include "MathExtern.h" -#include "support/textutils.h" +#include "TexRow.h" + #include "support/docstring.h" +#include "support/RefChanger.h" +#include "support/textutils.h" #include #include @@ -86,38 +89,57 @@ NormalStream & operator<<(NormalStream & ns, int i) 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, bool dryrun) +WriteStream::WriteStream(otexrowstream & os, bool fragile, bool latex, + OutputType output, Encoding const * encoding) : os_(os), fragile_(fragile), firstitem_(false), latex_(latex), - dryrun_(dryrun), pendingspace_(false), line_(0) -{} - - -WriteStream::WriteStream(odocstream & os) - : os_(os), fragile_(false), firstitem_(false), latex_(false), - dryrun_(false), pendingspace_(false), line_(0) + output_(output), insidemacro_(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) {} WriteStream::~WriteStream() { - if (pendingspace_) + if (pendingbrace_) + os_ << '}'; + else if (pendingspace_) os_ << ' '; } @@ -134,6 +156,44 @@ void WriteStream::pendingSpace(bool how) } +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); @@ -150,41 +210,58 @@ WriteStream & operator<<(WriteStream & ws, MathData const & ar) 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; } @@ -193,10 +270,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), 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); @@ -225,11 +328,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; } @@ -244,20 +357,132 @@ 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), 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() << "'; + 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_); +} + + ////////////////////////////////////////////////////////////////////// @@ -473,4 +698,25 @@ OctaveStream & operator<<(OctaveStream & os, string const & s) } +docstring convertDelimToXMLEscape(docstring const & name) +{ + if (name.size() == 1) { + char_type const c = name[0]; + if (c == '<') + return from_ascii("<"); + else if (c == '>') + return from_ascii(">"); + else + return name; + } + MathWordList const & words = mathedWordList(); + MathWordList::const_iterator it = words.find(name); + if (it != words.end()) { + docstring const escape = it->second.xmlname; + return escape; + } + LYXERR0("Unable to find `" << name <<"' in the mathWordList."); + return name; +} + } // namespace lyx