//
// Strings used to write LaTeX files
//
-char const * LaTeXFamilyNames[NUM_FAMILIES + 2] =
+char const * LaTeXFamilyCommandNames[NUM_FAMILIES + 2] =
{ "textrm", "textsf", "texttt", "error1", "error2", "error3", "error4",
"error5", "error6", "error7", "error8", "error9", "error10", "error11",
"error12", "error13", "error14" };
-char const * LaTeXSeriesNames[NUM_SERIES + 2] =
+char const * LaTeXFamilySwitchNames[NUM_FAMILIES + 2] =
+{ "rmfamily", "sffamily", "ttfamily", "error1", "error2", "error3", "error4",
+ "error5", "error6", "error7", "error8", "error9", "error10", "error11",
+ "error12", "error13", "error14" };
+
+char const * LaTeXSeriesCommandNames[NUM_SERIES + 2] =
{ "textmd", "textbf", "error4", "error5" };
-char const * LaTeXShapeNames[NUM_SHAPE + 2] =
+char const * LaTeXSeriesSwitchNames[NUM_SERIES + 2] =
+{ "mdseries", "bfseries", "error4", "error5" };
+
+char const * LaTeXShapeCommandNames[NUM_SHAPE + 2] =
{ "textup", "textit", "textsl", "textsc", "error6", "error7" };
-char const * LaTeXSizeNames[NUM_SIZE + 4] =
+char const * LaTeXShapeSwitchNames[NUM_SHAPE + 2] =
+{ "upshape", "itshape", "slshape", "scshape", "error6", "error7" };
+
+char const * LaTeXSizeSwitchNames[NUM_SIZE + 4] =
{ "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large",
"Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" };
/// Updates font settings according to request
void Font::update(Font const & newfont,
- Language const * document_language,
+ Language const * default_lang,
bool toggleall)
{
bits_.update(newfont.fontInfo(), toggleall);
if (newfont.language() == language() && toggleall)
- if (language() == document_language)
+ if (language() == default_lang)
setLanguage(default_language);
else
- setLanguage(document_language);
+ setLanguage(default_lang);
else if (newfont.language() == reset_language)
- setLanguage(document_language);
+ setLanguage(default_lang);
else if (newfont.language() != ignore_language)
setLanguage(newfont.language());
}
// Returns size in latex format
string const Font::latexSize() const
{
- return LaTeXSizeNames[bits_.size()];
+ return LaTeXSizeSwitchNames[bits_.size()];
}
/// Writes the head of the LaTeX needed to impose this font
// Returns number of chars written.
-int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
+int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
OutputParams const & runparams,
Font const & base,
- Font const & prev) const
+ Font const & prev,
+ bool non_inherit_inset,
+ bool needs_cprotection) const
{
int count = 0;
&& language()->lang() != base.language()->lang()
&& language() != prev.language()) {
if (!language()->polyglossia().empty()) {
- string tmp = "\\text" + language()->polyglossia();
+ string tmp;
+ if (needs_cprotection)
+ tmp += "\\cprotect";
+ tmp += "\\text" + language()->polyglossia();
if (!language()->polyglossiaOpts().empty()) {
tmp += "[" + language()->polyglossiaOpts() + "]";
- if (runparams.use_hyperref && runparams.moving_arg)
+ if (runparams.use_hyperref && runparams.moving_arg) {
// We need to strip the command for
// the pdf string, see #11813
- tmp = "\\texorpdfstring{" + tmp + "}{}";
+ string tmpp;
+ if (needs_cprotection)
+ tmpp = "\\cprotect";
+ tmp = tmpp + "\\texorpdfstring{" + tmp + "}{}";
+ }
}
tmp += "{";
os << from_ascii(tmp);
} else if (language()->babel() != base.language()->babel() &&
language() != prev.language()) {
if (language()->lang() == "farsi") {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\textFR{";
count += 8;
} else if (!isRightToLeft() &&
base.language()->lang() == "farsi") {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\textLR{";
count += 8;
} else if (language()->lang() == "arabic_arabi") {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\textAR{";
count += 8;
} else if (!isRightToLeft() &&
base.language()->lang() == "arabic_arabi") {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\textLR{";
count += 8;
// currently the remaining RTL languages are arabic_arabtex and hebrew
} else if (isRightToLeft() != prev.isRightToLeft()) {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
if (isRightToLeft()) {
os << "\\R{";
count += 3;
}
if (language()->encoding()->package() == Encoding::CJK) {
- pair<bool, int> const c = switchEncoding(os, bparams,
+ pair<bool, int> const c = switchEncoding(os.os(), bparams,
runparams, *(language()->encoding()));
if (c.first) {
open_encoding_ = true;
os << '{';
++count;
os << '\\'
- << LaTeXSizeNames[f.size()]
- << "{}";
- count += strlen(LaTeXSizeNames[f.size()]) + 3;
+ << LaTeXSizeSwitchNames[f.size()] << termcmd;
+ count += strlen(LaTeXSizeSwitchNames[f.size()]) + 1;
}
if (f.family() != INHERIT_FAMILY) {
- os << '\\'
- << LaTeXFamilyNames[f.family()]
- << '{';
- count += strlen(LaTeXFamilyNames[f.family()]) + 2;
+ if (non_inherit_inset) {
+ os << '{';
+ ++count;
+ os << '\\' << LaTeXFamilySwitchNames[f.family()] << termcmd;
+ count += strlen(LaTeXFamilySwitchNames[f.family()]) + 1;
+ } else {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
+ os << '\\'
+ << LaTeXFamilyCommandNames[f.family()]
+ << '{';
+ count += strlen(LaTeXFamilyCommandNames[f.family()]) + 2;
+ }
}
if (f.series() != INHERIT_SERIES) {
- os << '\\'
- << LaTeXSeriesNames[f.series()]
- << '{';
- count += strlen(LaTeXSeriesNames[f.series()]) + 2;
+ if (non_inherit_inset) {
+ os << '{';
+ ++count;
+ os << '\\' << LaTeXSeriesSwitchNames[f.series()] << termcmd;
+ count += strlen(LaTeXSeriesSwitchNames[f.series()]) + 1;
+ } else {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
+ os << '\\'
+ << LaTeXSeriesCommandNames[f.series()]
+ << '{';
+ count += strlen(LaTeXSeriesCommandNames[f.series()]) + 2;
+ }
}
if (f.shape() != INHERIT_SHAPE) {
- os << '\\'
- << LaTeXShapeNames[f.shape()]
- << '{';
- count += strlen(LaTeXShapeNames[f.shape()]) + 2;
+ if (non_inherit_inset) {
+ os << '{';
+ ++count;
+ os << '\\' << LaTeXShapeSwitchNames[f.shape()] << termcmd;
+ count += strlen(LaTeXShapeSwitchNames[f.shape()]) + 1;
+ } else {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
+ os << '\\'
+ << LaTeXShapeCommandNames[f.shape()]
+ << '{';
+ count += strlen(LaTeXShapeCommandNames[f.shape()]) + 2;
+ }
}
if (f.color() != Color_inherit && f.color() != Color_ignore) {
if (f.color() == Color_none && p.color() != Color_none) {
}
}
if (f.emph() == FONT_ON) {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\emph{";
count += 6;
}
// \noun{} is a LyX special macro
if (f.noun() == FONT_ON) {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\noun{";
count += 6;
}
// because ulem puts every nested group or macro in a box,
// which prevents linebreaks (#8424, #8733)
if (f.underbar() == FONT_ON) {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\uline{";
- count += 10;
+ count += 7;
++runparams.inulemcmd;
}
if (f.uuline() == FONT_ON) {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\uuline{";
- count += 11;
+ count += 8;
++runparams.inulemcmd;
}
if (f.strikeout() == FONT_ON) {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\sout{";
- count += 9;
+ count += 6;
++runparams.inulemcmd;
}
if (f.xout() == FONT_ON) {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\xout{";
- count += 9;
+ count += 6;
++runparams.inulemcmd;
}
if (f.uwave() == FONT_ON) {
os << "\\ULdepth=1000pt";
count += 15;
}
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\uwave{";
- count += 10;
+ count += 7;
++runparams.inulemcmd;
}
return count;
Font const & base,
Font const & next,
bool & needPar,
- bool const & closeLanguage,
- bool const & non_inherit_inset) const
+ bool closeLanguage) const
{
int count = 0;
// We do not close size group in front of
// insets with InheritFont() false (as opposed
// to all other font properties) (#8384)
- if (!non_inherit_inset) {
- if (needPar && !closeLanguage) {
- os << "\\par";
- count += 4;
- needPar = false;
- }
- os << '}';
- ++count;
+ if (needPar && !closeLanguage) {
+ os << "\\par";
+ count += 4;
+ needPar = false;
}
+ os << '}';
+ ++count;
}
if (f.underbar() == FONT_ON) {
os << '}';
ostream & operator<<(ostream & os, Font const & font)
{
return os << font.bits_
- << " lang: " << (font.lang_ ? font.lang_->lang() : nullptr);
+ << " lang: " << (font.lang_ ? font.lang_->lang() : "");
}