/// 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());
}
OutputParams const & runparams,
Font const & base,
Font const & prev,
- bool const & non_inherit_inset,
- bool const & needs_cprotection) const
+ bool non_inherit_inset,
+ bool needs_cprotection) const
{
int count = 0;
string const tmp =
subst(lyxrc.language_command_local,
"$$lang", language()->babel());
- if (needs_cprotection && !prefixIs(tmp, "\\begin{")) {
- os << "\\cprotect";
- count += 9;
- }
os << from_ascii(tmp);
count += tmp.length();
if (!lyxrc.language_command_end.empty())
os << '}';
++count;
} else if (f.color() != Color_none) {
- if (needs_cprotection) {
- os << "\\cprotect";
- count += 9;
- }
os << "\\textcolor{"
<< from_ascii(lcolor.getLaTeXName(f.color()))
<< "}{";
Font const & base,
Font const & next,
bool & needPar,
- bool const & closeLanguage) const
+ bool closeLanguage) const
{
int count = 0;
ostream & operator<<(ostream & os, Font const & font)
{
return os << font.bits_
- << " lang: " << (font.lang_ ? font.lang_->lang() : nullptr);
+ << " lang: " << (font.lang_ ? font.lang_->lang() : "");
}