protectspace_ = false;
}
if (terminate_command_) {
- if ((c == ' ' || c == '\0') && !isprotected)
- // A space follows. Terminate with brackets.
+ 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.
otexstream & operator<<(otexstream & ots, BreakLine)
{
if (ots.canBreakLine()) {
+ if (ots.terminateCommand())
+ ots << "{}";
ots.otexrowstream::put('\n');
ots.lastChar('\n');
}
{
otexrowstream & otrs = ots;
if (ots.canBreakLine()) {
+ if (ots.terminateCommand())
+ otrs << "{}";
otrs << "%\n";
ots.lastChar('\n');
}
otexrowstream & otrs = ots;
bool isprotected = false;
- char const c = ts.str[0];
+ char_type const c = ts.str[0];
if (ots.protectSpace()) {
if (!ots.canBreakLine() && c == ' ') {
otrs << "{}";
ots.protectSpace(false);
}
if (ots.terminateCommand()) {
- if ((c == ' ' || c == '\0') && !isprotected)
- // A space follows. Terminate with brackets.
+ 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.
return ots;
otexrowstream & otrs = ots;
bool isprotected = false;
- char const c = s[0];
+ char_type const c = s[0];
if (ots.protectSpace()) {
if (!ots.canBreakLine() && c == ' ') {
otrs << "{}";
ots.protectSpace(false);
}
if (ots.terminateCommand()) {
- if ((c == ' ' || c == '\0') && !isprotected)
- // A space follows. Terminate with brackets.
+ 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.
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
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