}
if (runparams.verbatim) {
+ // FIXME UNICODE: This can fail if c cannot
+ // be encoded in the current encoding.
os.put(c);
return;
}
break;
default:
-
// LyX, LaTeX etc.
if (latexSpecialPhrase(os, i, column, runparams))
return;
// but we should avoid ligatures
if (i + 1 >= int(text_.size()) || text_[i + 1] != c)
return true;
- os << "\\,{}";
- column += 3;
- // Alternative code:
- //os << "\\textcompwordmark{}";
- //column += 19;
+ os << "\\textcompwordmark{}";
+ column += 19;
return true;
case '|':
os.put(c);
{
switch (c) {
case '-':
+ // within \ttfamily, "--" is merged to "-" (no endash)
+ // so we avoid this rather irritating ligature
if (i + 1 < int(text_.size()) && text_[i + 1] == '-') {
- // "--" in Typewriter mode -> "-{}-"
os << "-{}";
column += 2;
} else
os << '-';
return true;
- // FIXME I assume this is hack treating typewriter as verbatim
- // This should be re-evaluated eventually.
-
- case '\0':
- return true;
-
-// // Those characters are not directly supported.
-// case '\\':
-// case '\"':
-// case '$': case '&':
-// case '%': case '#': case '{':
-// case '}': case '_':
-// case '~':
-// case '^':
-// case '*': case '[':
-// case ' ':
-// return false;
-
+ // everything else has to be checked separately
+ // (depending on the encoding)
default:
return false;
}
}
-bool Paragraph::forceEmptyLayout() const
+bool Paragraph::forcePlainLayout() const
{
Inset const * const inset = inInset();
if (!inset)
return true;
- return inset->forceEmptyLayout();
+ return inset->forcePlainLayout();
}
}
-bool Paragraph::useEmptyLayout() const
+bool Paragraph::usePlainLayout() const
{
Inset const * const inset = inInset();
if (!inset)
return false;
- return inset->useEmptyLayout();
+ return inset->usePlainLayout();
}
bool return_value = false;
- bool asdefault = forceEmptyLayout();
+ bool asdefault = forcePlainLayout();
Layout const & style = asdefault ?
bparams.documentClass().emptyLayout() :
}
}
- // Set the encoding to that returned from simpleTeXSpecialChars (see
+ // Set the encoding to that returned from latexSpecialChar (see
// comment for encoding member in OutputParams.h)
runparams.encoding = rp.encoding;
}
}
-void Paragraph::setEmptyOrDefaultLayout(DocumentClass const & tclass)
+void Paragraph::setPlainOrDefaultLayout(DocumentClass const & tclass)
{
- if (useEmptyLayout())
+ if (usePlainLayout())
setLayout(tclass.emptyLayout());
else
setLayout(tclass.defaultLayout());