void otexstream::put(char_type const & c)
{
+ bool isprotected = false;
if (protectspace_) {
- if (!canbreakline_ && c == ' ')
+ if (!canbreakline_ && c == ' ') {
os() << "{}";
+ isprotected = true;
+ }
protectspace_ = false;
}
+ if (terminate_command_) {
+ if ((c == ' ' || c == '\0' || c == '\n') && !isprotected)
+ // A space or line break follows. Terminate with brackets.
+ os() << "{}";
+ else if (c != '\\' && c != '{' && c != '}')
+ // Non-terminating character follows. Terminate with space.
+ os() << " ";
+ terminate_command_ = false;
+ }
otexrowstream::put(c);
lastChar(c);
}
TexString otexstringstream::release()
{
- TexString ts{ods_.str(), TexRow()};
- swap(ts.texrow, texrow());
+ TexString ts(ods_.str(), std::move(texrow()));
+ // reset this
+ texrow() = TexRow();
ods_.clear();
ods_.str(docstring());
return ts;
BreakLine breakln;
SafeBreakLine safebreakln;
+TerminateCommand termcmd;
otexstream & operator<<(otexstream & ots, BreakLine)
{
if (ots.canBreakLine()) {
+ if (ots.terminateCommand())
+ ots << "{}";
ots.otexrowstream::put('\n');
ots.lastChar('\n');
}
ots.protectSpace(false);
+ ots.terminateCommand(false);
return ots;
}
{
otexrowstream & otrs = ots;
if (ots.canBreakLine()) {
+ if (ots.terminateCommand())
+ otrs << "{}";
otrs << "%\n";
ots.lastChar('\n');
}
ots.protectSpace(false);
+ ots.terminateCommand(false);
+ return ots;
+}
+
+
+otexstream & operator<<(otexstream & ots, TerminateCommand)
+{
+ ots.terminateCommand(true);
return ots;
}
otexrowstream & operator<<(otexrowstream & ots, TexString ts)
{
ts.validate();
- ots.os() << move(ts.str);
- ots.texrow().append(move(ts.texrow));
+ ots.os() << std::move(ts.str);
+ ots.texrow().append(std::move(ts.texrow));
return ots;
}
return ots;
otexrowstream & otrs = ots;
+ bool isprotected = false;
+ char_type const c = ts.str[0];
if (ots.protectSpace()) {
- if (!ots.canBreakLine() && ts.str[0] == ' ')
+ if (!ots.canBreakLine() && c == ' ') {
otrs << "{}";
+ isprotected = true;
+ }
ots.protectSpace(false);
}
+ if (ots.terminateCommand()) {
+ if ((c == ' ' || c == '\0' || c == '\n') && !isprotected)
+ // A space or line break follows. Terminate with brackets.
+ otrs << "{}";
+ else if (c != '\\' && c != '{' && c != '}')
+ // Non-terminating character follows. Terminate with space.
+ otrs << " ";
+ ots.terminateCommand(false);
+ }
if (len > 1)
ots.canBreakLine(ts.str[len - 2] != '\n');
ots.lastChar(ts.str[len - 1]);
- otrs << move(ts);
+ otrs << std::move(ts);
return ots;
}
if (len == 0)
return ots;
otexrowstream & otrs = ots;
+ bool isprotected = false;
+ char_type const c = s[0];
if (ots.protectSpace()) {
- if (!ots.canBreakLine() && s[0] == ' ')
+ if (!ots.canBreakLine() && c == ' ') {
otrs << "{}";
+ isprotected = true;
+ }
ots.protectSpace(false);
}
+ if (ots.terminateCommand()) {
+ if ((c == ' ' || c == '\0' || c == '\n') && !isprotected)
+ // A space or line break follows. Terminate with brackets.
+ otrs << "{}";
+ else if (c != '\\' && c != '{' && c != '}')
+ // Non-terminating character follows. Terminate with space.
+ otrs << " ";
+ ots.terminateCommand(false);
+ }
if (contains(s, 0xF0000)) {
// Some encoding changes for the underlying stream are embedded
template otexrowstream & operator<< <unsigned long>(otexrowstream &,
unsigned long);
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
template otexrowstream & operator<< <unsigned long long>(otexrowstream &,
unsigned long long);
#endif
ots.os() << value;
ots.lastChar(0);
ots.protectSpace(false);
+ ots.terminateCommand(false);
return ots;
}
template otexstream & operator<< <int>(otexstream &, int);
template otexstream & operator<< <unsigned int>(otexstream &, unsigned int);
template otexstream & operator<< <unsigned long>(otexstream &, unsigned long);
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
template otexstream & operator<< <unsigned long long>(otexstream &, unsigned long long);
#endif
-}
+} // namespace lyx