LyXFont::LyXFont(LyXFont::FONT_INIT1)
-#ifndef INHERIT_LANGUAGE
: bits(inherit), lang(default_language)
-#else
- : bits(inherit), lang(inherit_language)
-#endif
{}
if (language() == document_language)
setLanguage(default_language);
else
-#ifndef INHERIT_LANGUAGE
setLanguage(document_language);
-#else
- setLanguage(inherit_language);
-#endif
else if (newfont.language() != ignore_language)
setLanguage(newfont.language());
setNoun(INHERIT);
if (color() == tmplt.color())
setColor(LColor::inherit);
-#ifdef INHERIT_LANGUAGE
- if (language() == tmplt.language())
- setLanguage(inherit_language);
-#endif
}
/// Realize font from a template
-#ifndef INHERIT_LANGUAGE
LyXFont & LyXFont::realize(LyXFont const & tmplt)
-#else
-LyXFont & LyXFont::realize(LyXFont const & tmplt, Language const * deflang)
-#endif
{
-#ifdef INHERIT_LANGUAGE
- if (language() == inherit_language) {
- if (tmplt.language() == inherit_language ||
- tmplt.language() == ignore_language ||
- tmplt.language() == default_language)
- {
- setLanguage(deflang);
- } else {
- setLanguage(tmplt.language());
- }
- }
-#endif
if (bits == inherit) {
bits = tmplt.bits;
return *this;
shape() != INHERIT_SHAPE && size() != INHERIT_SIZE &&
emph() != INHERIT && underbar() != INHERIT &&
noun() != INHERIT &&
-#ifdef INHERIT_LANGUAGE
- language() != inherit_language &&
-#endif
color() != LColor::inherit);
}
ost << _(" Number ") << _(GUIMiscNames[number()]);
string buf(ost.str().c_str());
- buf = strip(buf, ", ");
+ buf = rtrim(buf, ", ");
return buf;
}
/// Writes the changes from this font to orgfont in .lyx format in file
void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
-#ifdef INHERIT_LANGUAGE
- Language const * doclang,
-#endif
ostream & os) const
{
os << "\n";
os << "\\color " << col_str << "\n";
}
if (orgfont.language() != language()) {
-#ifndef INHERIT_LANGUAGE
if (language())
-#else
- if (language() == inherit_language)
- os << "\\lang " << doclang->lang() << "\n";
- else if (language())
-#endif
os << "\\lang " << language()->lang() << "\n";
else
os << "\\lang unknown\n";
int count = 0;
bool env = false;
- LyXFont f = *this; // why do you need this?
- f.reduce(base); // why isn't this just "reduce(base);" (Lgb)
- // Because this function is const. Everything breaks if this
- // method changes the font it represents. There is no speed penalty
- // by using the temporary. (Asger)
-
+ // reduce the current font to changes against the base
+ // font (of the layout). We use a temporary for this to
+ // avoid changing this font instance, as that would break
+ LyXFont f = *this;
+ f.reduce(base);
if (f.family() != INHERIT_FAMILY) {
os << '}';