protectspace_ = false;
}
os_.put(c);
- lastchar_ = c;
- if (c == '\n') {
+ lastChar(c);
+ if (c == '\n')
texrow_.newline();
- canbreakline_ = false;
- } else
- canbreakline_ = true;
}
if (ots.canBreakLine()) {
ots.os().put('\n');
ots.lastChar('\n');
- ots.canBreakLine(false);
ots.texrow().newline();
}
ots.protectSpace(false);
if (ots.canBreakLine()) {
ots.os() << "%\n";
ots.lastChar('\n');
- ots.canBreakLine(false);
ots.texrow().newline();
}
ots.protectSpace(false);
} else
ots.os() << s;
+ if (len > 1)
+ ots.canBreakLine(s[len - 2] != '\n');
ots.lastChar(s[len - 1]);
ots.texrow().newlines(count(s.begin(), s.end(), '\n'));
- ots.canBreakLine(s[len - 1] != '\n');
return ots;
}
otexstream & operator<<(otexstream & ots, string const & s)
{
- ots << s.c_str();
+ ots << from_utf8(s);
return ots;
}
otexstream & operator<<(otexstream & ots, char const * s)
{
- size_t const len = strlen(s);
-
- // Check whether there's something to output
- if (len == 0)
- return ots;
-
- if (ots.protectSpace()) {
- if (!ots.canBreakLine() && s[0] == ' ')
- ots.os() << "{}";
- ots.protectSpace(false);
- }
- ots.os() << s;
- ots.lastChar(s[len - 1]);
- ots.texrow().newlines(count(s, s + len, '\n'));
- ots.canBreakLine(s[len - 1] != '\n');
+ ots << from_utf8(s);
return ots;
}
ots.lastChar(c);
if (c == '\n')
ots.texrow().newline();
- ots.canBreakLine(c != '\n');
return ots;
}
{
ots.os() << value;
ots.lastChar(0);
- ots.canBreakLine(true);
ots.protectSpace(false);
return ots;
}