}
-void Font::setProperties(FontInfo const & f)
-{
- bits_.setFamily(f.family());
- bits_.setSeries(f.series());
- bits_.setShape(f.shape());
- bits_.setSize(f.size());
-}
-
-
/// 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 & multipar_inset,
- bool const & needs_cprotection) const
+ bool non_inherit_inset,
+ bool needs_cprotection) const
{
int count = 0;
p.reduce(prev.bits_);
if (f.size() != INHERIT_SIZE) {
- os << '{';
- ++count;
- os << '\\'
- << LaTeXSizeSwitchNames[f.size()] << termcmd;
- count += strlen(LaTeXSizeSwitchNames[f.size()]) + 1;
+ if (!runparams.find_effective()) {
+ os << '{';
+ ++count;
+ os << '\\'
+ << LaTeXSizeSwitchNames[f.size()] << termcmd;
+ count += strlen(LaTeXSizeSwitchNames[f.size()]) + 1;
+ }
+ else {
+ os << '\\'
+ << LaTeXSizeSwitchNames[f.size()] << '{';
+ count += strlen(LaTeXSizeSwitchNames[f.size()]) + 2;
+ }
}
if (f.family() != INHERIT_FAMILY) {
- if (multipar_inset) {
+ if (non_inherit_inset) {
os << '{';
++count;
os << '\\' << LaTeXFamilySwitchNames[f.family()] << termcmd;
}
}
if (f.series() != INHERIT_SERIES) {
- if (multipar_inset) {
+ if (non_inherit_inset) {
os << '{';
++count;
os << '\\' << LaTeXSeriesSwitchNames[f.series()] << termcmd;
}
}
if (f.shape() != INHERIT_SHAPE) {
- if (multipar_inset) {
+ if (non_inherit_inset) {
os << '{';
++count;
os << '\\' << LaTeXShapeSwitchNames[f.shape()] << termcmd;
count += strlen(LaTeXShapeCommandNames[f.shape()]) + 2;
}
}
- if (f.color() != Color_inherit && f.color() != Color_ignore && !multipar_inset) {
+ if (f.color() != Color_inherit && f.color() != Color_ignore) {
if (f.color() == Color_none && p.color() != Color_none) {
// Color none: Close previous color, if any
os << '}';
++count;
} else if (f.color() != Color_none) {
- if (needs_cprotection) {
- os << "\\cprotect";
- count += 9;
- }
os << "\\textcolor{"
<< from_ascii(lcolor.getLaTeXName(f.color()))
<< "}{";
count += 9;
}
}
- if (f.emph() == FONT_ON && !multipar_inset) {
+ if (f.emph() == FONT_ON) {
if (needs_cprotection) {
os << "\\cprotect";
count += 9;
count += 6;
}
// \noun{} is a LyX special macro
- if (f.noun() == FONT_ON && !multipar_inset) {
+ if (f.noun() == FONT_ON) {
if (needs_cprotection) {
os << "\\cprotect";
count += 9;
// The ulem commands need to be on the deepest nesting level
// because ulem puts every nested group or macro in a box,
// which prevents linebreaks (#8424, #8733)
- if (f.underbar() == FONT_ON && !multipar_inset) {
+ if (f.underbar() == FONT_ON) {
if (needs_cprotection) {
os << "\\cprotect";
count += 9;
count += 7;
++runparams.inulemcmd;
}
- if (f.uuline() == FONT_ON && !multipar_inset) {
+ if (f.uuline() == FONT_ON) {
if (needs_cprotection) {
os << "\\cprotect";
count += 9;
count += 8;
++runparams.inulemcmd;
}
- if (f.strikeout() == FONT_ON && !multipar_inset) {
+ if (f.strikeout() == FONT_ON) {
if (needs_cprotection) {
os << "\\cprotect";
count += 9;
count += 6;
++runparams.inulemcmd;
}
- if (f.xout() == FONT_ON && !multipar_inset) {
+ if (f.xout() == FONT_ON) {
if (needs_cprotection) {
os << "\\cprotect";
count += 9;
count += 6;
++runparams.inulemcmd;
}
- if (f.uwave() == FONT_ON && !multipar_inset) {
+ if (f.uwave() == FONT_ON) {
if (runparams.inulemcmd) {
// needed with nested uwave in xout
// see https://tex.stackexchange.com/a/263042
Font const & base,
Font const & next,
bool & needPar,
- bool const & closeLanguage,
- bool const & multipar_inset) const
+ bool closeLanguage) const
{
int count = 0;
FontInfo f = bits_;
f.reduce(base.bits_);
- if (f.family() != INHERIT_FAMILY && !multipar_inset) {
+ if (f.family() != INHERIT_FAMILY) {
os << '}';
++count;
}
- if (f.series() != INHERIT_SERIES && !multipar_inset) {
+ if (f.series() != INHERIT_SERIES) {
os << '}';
++count;
}
- if (f.shape() != INHERIT_SHAPE && !multipar_inset) {
+ if (f.shape() != INHERIT_SHAPE) {
os << '}';
++count;
}
}
if (f.size() != INHERIT_SIZE) {
// We do not close size group in front of
- // insets with allowMultiPar() true (as opposed
+ // insets with InheritFont() false (as opposed
// to all other font properties) (#8384)
- if (!multipar_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 << '}';
bool const using_begin_end =
runparams.use_polyglossia ||
!lyxrc.language_command_end.empty();
- if (using_begin_end)
+ if (using_begin_end && !languageStackEmpty())
popLanguageName();
}
Language const * doc_language = bparams.language;
if (bits_.noun() == FONT_ON) {
- LYXERR(Debug::LATEX, "font.noun: " << bits_.noun());
+ LYXERR(Debug::OUTFILE, "font.noun: " << bits_.noun());
features.require("noun");
- LYXERR(Debug::LATEX, "Noun enabled. Font: " << to_utf8(stateText()));
+ LYXERR(Debug::OUTFILE, "Noun enabled. Font: " << to_utf8(stateText()));
}
if (bits_.underbar() == FONT_ON) {
- LYXERR(Debug::LATEX, "font.underline: " << bits_.underbar());
+ LYXERR(Debug::OUTFILE, "font.underline: " << bits_.underbar());
features.require("ulem");
- LYXERR(Debug::LATEX, "Underline enabled. Font: " << to_utf8(stateText()));
+ LYXERR(Debug::OUTFILE, "Underline enabled. Font: " << to_utf8(stateText()));
}
if (bits_.strikeout() == FONT_ON) {
- LYXERR(Debug::LATEX, "font.strikeout: " << bits_.strikeout());
+ LYXERR(Debug::OUTFILE, "font.strikeout: " << bits_.strikeout());
features.require("ulem");
- LYXERR(Debug::LATEX, "Strike out enabled. Font: " << to_utf8(stateText()));
+ LYXERR(Debug::OUTFILE, "Strike out enabled. Font: " << to_utf8(stateText()));
}
if (bits_.xout() == FONT_ON) {
- LYXERR(Debug::LATEX, "font.xout: " << bits_.xout());
+ LYXERR(Debug::OUTFILE, "font.xout: " << bits_.xout());
features.require("ulem");
- LYXERR(Debug::LATEX, "Cross out enabled. Font: " << to_utf8(stateText()));
+ LYXERR(Debug::OUTFILE, "Cross out enabled. Font: " << to_utf8(stateText()));
}
if (bits_.uuline() == FONT_ON) {
- LYXERR(Debug::LATEX, "font.uuline: " << bits_.uuline());
+ LYXERR(Debug::OUTFILE, "font.uuline: " << bits_.uuline());
features.require("ulem");
- LYXERR(Debug::LATEX, "Double underline enabled. Font: " << to_utf8(stateText()));
+ LYXERR(Debug::OUTFILE, "Double underline enabled. Font: " << to_utf8(stateText()));
}
if (bits_.uwave() == FONT_ON) {
- LYXERR(Debug::LATEX, "font.uwave: " << bits_.uwave());
+ LYXERR(Debug::OUTFILE, "font.uwave: " << bits_.uwave());
features.require("ulem");
- LYXERR(Debug::LATEX, "Wavy underline enabled. Font: " << to_utf8(stateText()));
+ LYXERR(Debug::OUTFILE, "Wavy underline enabled. Font: " << to_utf8(stateText()));
}
switch (bits_.color()) {
case Color_none:
break;
default:
features.require("color");
- LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText()));
+ LYXERR(Debug::OUTFILE, "Color enabled. Font: " << to_utf8(stateText()));
}
// FIXME: Do something for background and soul package?
&& lang_ != latex_language)
{
features.useLanguage(lang_);
- LYXERR(Debug::LATEX, "Found language " << lang_->lang());
+ LYXERR(Debug::OUTFILE, "Found language " << lang_->lang());
}
}
ostream & operator<<(ostream & os, Font const & font)
{
return os << font.bits_
- << " lang: " << (font.lang_ ? font.lang_->lang() : nullptr);
+ << " lang: " << (font.lang_ ? font.lang_->lang() : "");
}
projects / lyx.git / blobdiff