WriteStream & operator<<(WriteStream & ws, docstring const & s)
{
+ // 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() && s.length() > 0) {
- if (isAlphaASCII(s[0]))
+ } else if (ws.pendingSpace()) {
+ if (isAlphaASCII(s[first]))
ws.os() << ' ';
- else if (s[0] == ' ' && ws.textMode())
+ 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;
}
Encoding const * encoding)
: os_(os), fragile_(fragile), firstitem_(false), latex_(latex),
output_(output), pendingspace_(false), pendingbrace_(false),
- textmode_(false), locked_(0), ascii_(0), line_(0), encoding_(encoding)
+ textmode_(false), locked_(0), ascii_(0), canbreakline_(true),
+ 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), ascii_(0), line_(0), encoding_(0)
+ textmode_(false), locked_(0), ascii_(0), canbreakline_(true),
+ line_(0), encoding_(0)
{}
WriteStream & operator<<(WriteStream & ws, char const * s)
{
- if (ws.pendingBrace()) {
- ws.os() << '}';
- ws.pendingBrace(false);
- ws.pendingSpace(false);
- ws.textMode(true);
- } 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;
- ws.addlines(int(count(s, s + strlen(s), '\n')));
+ ws << from_utf8(s);
return ws;
}
WriteStream & operator<<(WriteStream & ws, char c)
{
+ if (c == '\n' && !ws.canBreakLine())
+ return ws;
+
if (ws.pendingBrace()) {
ws.os() << '}';
ws.pendingBrace(false);
ws.os() << c;
if (c == '\n')
ws.addlines(1);
+ ws.canBreakLine(c != '\n');
return ws;
}
ws.textMode(true);
}
ws.os() << i;
+ ws.canBreakLine(true);
return ws;
}
ws.textMode(true);
}
ws.os() << i;
+ ws.canBreakLine(true);
return ws;
}
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)
+ : os_(os)
{
was_text_ = os_.inText();
- if (was_text_)
- os_ << "</mtext>";
- if (text) {
- os_.setTextMode();
- os_ << "<mtext";
- if (!attrs.empty())
- os_ << " " << from_utf8(attrs);
- os_ << ">";
- opened_ = true;
- } else {
- if (!attrs.empty()) {
- os_ << "<mstyle " << from_utf8(attrs) << ">";
- opened_ = true;
- }
- os_.setMathMode();
- }
+ os_.setTextMode(text);
}
SetMode::~SetMode()
{
- if (opened_) {
- if (os_.inText())
- os_ << "</mtext>";
- else
- os_ << "</mstyle>";
- }
- if (was_text_) {
- os_.setTextMode();
- os_ << "<mtext>";
- } else {
- os_.setMathMode();
- }
+ os_.setTextMode(was_text_);
}
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)
+ : os_(os)
{
was_text_ = os_.inText();
- if (text) {
- os_.setTextMode();
- if (attrs.empty())
- os_ << MTag("span");
- else
- os_ << MTag("span", attrs);
- opened_ = true;
- } else
- os_.setMathMode();
+ os_.setTextMode(text);
}
SetHTMLMode::~SetHTMLMode()
{
- if (opened_)
- os_ << ETag("span");
- if (was_text_)
- os_.setTextMode();
- else
- os_.setMathMode();
+ os_.setTextMode(was_text_);
}