X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=5a11937436819b30783bbafc5945b5078e765239;hb=0ba59ef037642f4de07669128355fac762b04746;hp=e00f1d004b69c85c08686dc725ae6840db1ae55f;hpb=0cf717d0c8ba3d766acb45c3adfcc0de1f3b79db;p=lyx.git diff --git a/src/lyxfont.C b/src/lyxfont.C index e00f1d004b..5a11937436 100644 --- a/src/lyxfont.C +++ b/src/lyxfont.C @@ -1,8 +1,8 @@ /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich * Copyright 1995-2001 The LyX Team. * @@ -22,7 +22,7 @@ #include "debug.h" #include "lyxrc.h" #include "lyxlex.h" -#include "FontLoader.h" +#include "language.h" #include "support/lstrings.h" #include "bufferparams.h" // stateText @@ -39,61 +39,62 @@ using std::strlen; namespace { -char const * GUIFamilyNames[11] = +char const * GUIFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] = { N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), - "cmsy", "cmm", "cmex", "msa", "msb", + "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", N_("Inherit"), N_("Ignore") }; -char const * GUISeriesNames[4] = +char const * GUISeriesNames[4] = { N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") }; -char const * GUIShapeNames[6] = +char const * GUIShapeNames[6] = { N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"), N_("Ignore") }; -char const * GUISizeNames[14] = +char const * GUISizeNames[14] = { N_("Tiny"), N_("Smallest"), N_("Smaller"), N_("Small"), N_("Normal"), N_("Large"), - N_("Larger"), N_("Largest"), N_("Huge"), N_("Huger"), N_("Increase"), N_("Decrease"), + N_("Larger"), N_("Largest"), N_("Huge"), N_("Huger"), N_("Increase"), N_("Decrease"), N_("Inherit"), N_("Ignore") }; - -char const * GUIMiscNames[5] = + +char const * GUIMiscNames[5] = { N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") }; // // Strings used to read and write .lyx format files // -char const * LyXFamilyNames[12] = -{ "roman", "sans", "typewriter", "symbol", "symbol2", "symbol3", - "symbolex", "fraktur", "mathscr", "mathbb", "default", "error" }; +char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] = +{ "roman", "sans", "typewriter", "symbol", + "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", + "default", "error" }; -char const * LyXSeriesNames[4] = +char const * LyXSeriesNames[4] = { "medium", "bold", "default", "error" }; -char const * LyXShapeNames[6] = +char const * LyXShapeNames[6] = { "up", "italic", "slanted", "smallcaps", "default", "error" }; -char const * LyXSizeNames[14] = +char const * LyXSizeNames[14] = { "tiny", "scriptsize", "footnotesize", "small", "normal", "large", - "larger", "largest", "huge", "giant", - "increase-error", "decrease-error", "default", "error" }; + "larger", "largest", "huge", "giant", + "increase", "decrease", "default", "error" }; -char const * LyXMiscNames[5] = +char const * LyXMiscNames[5] = { "off", "on", "toggle", "default", "error" }; // // Strings used to write LaTeX files // -char const * LaTeXFamilyNames[6] = +char const * LaTeXFamilyNames[6] = { "textrm", "textsf", "texttt", "error1", "error2", "error3" }; -char const * LaTeXSeriesNames[4] = +char const * LaTeXSeriesNames[4] = { "textmd", "textbf", "error4", "error5" }; -char const * LaTeXShapeNames[6] = +char const * LaTeXShapeNames[6] = { "textup", "textit", "textsl", "textsc", "error6", "error7" }; -char const * LaTeXSizeNames[14] = +char const * LaTeXSizeNames[14] = { "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large", "Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" }; @@ -137,32 +138,28 @@ LyXFont::FontBits LyXFont::ignore = { IGNORE }; -bool LyXFont::FontBits::operator==(LyXFont::FontBits const & fb1) const +bool operator==(LyXFont::FontBits const & lhs, + LyXFont::FontBits const & rhs) { - return fb1.family == family && - fb1.series == series && - fb1.shape == shape && - fb1.size == size && - fb1.color == color && - fb1.emph == emph && - fb1.underbar == underbar && - fb1.noun == noun && - fb1.number == number; + return lhs.family == rhs.family && + lhs.series == rhs.series && + lhs.shape == rhs.shape && + lhs.size == rhs.size && + lhs.color == rhs.color && + lhs.emph == rhs.emph && + lhs.underbar == rhs.underbar && + lhs.noun == rhs.noun && + lhs.number == rhs.number; } -bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const -{ - return !(fb1 == *this); -} +LyXFont::LyXFont() + : bits(sane), lang(default_language) +{} LyXFont::LyXFont(LyXFont::FONT_INIT1) -#ifndef INHERIT_LANGUAGE : bits(inherit), lang(default_language) -#else - : bits(inherit), lang(inherit_language) -#endif {} @@ -197,31 +194,31 @@ LyXFont::FONT_MISC_STATE LyXFont::underbar() const } -LColor::color LyXFont::color() const +LColor::color LyXFont::color() const { return bits.color; } -Language const * LyXFont::language() const +Language const * LyXFont::language() const { return lang; } -LyXFont::FONT_MISC_STATE LyXFont::number() const +LyXFont::FONT_MISC_STATE LyXFont::number() const { return bits.number; } -bool LyXFont::isRightToLeft() const +bool LyXFont::isRightToLeft() const { return lang->RightToLeft(); } -bool LyXFont::isVisibleRightToLeft() const +bool LyXFont::isVisibleRightToLeft() const { return (lang->RightToLeft() && number() != ON); @@ -299,7 +296,7 @@ LyXFont & LyXFont::setNumber(LyXFont::FONT_MISC_STATE n) /// Decreases font size by one -LyXFont & LyXFont::decSize() +LyXFont & LyXFont::decSize() { switch (size()) { case SIZE_HUGER: setSize(SIZE_HUGE); break; @@ -330,7 +327,7 @@ LyXFont & LyXFont::decSize() /// Increases font size by one -LyXFont & LyXFont::incSize() +LyXFont & LyXFont::incSize() { switch (size()) { case SIZE_HUGER: break; @@ -361,7 +358,7 @@ LyXFont & LyXFont::incSize() /// Updates a misc setting according to request -LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont, +LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont, FONT_MISC_STATE org) { if (newfont == TOGGLE) { @@ -376,13 +373,13 @@ LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont, } } else if (newfont == IGNORE) return org; - else + else return newfont; } /// Updates font settings according to request -void LyXFont::update(LyXFont const & newfont, +void LyXFont::update(LyXFont const & newfont, Language const * document_language, bool toggleall) { @@ -405,7 +402,7 @@ void LyXFont::update(LyXFont const & newfont, case INHERIT_SERIES: setSeries(newfont.series()); break; - case IGNORE_SERIES: + case IGNORE_SERIES: break; } @@ -427,17 +424,13 @@ void LyXFont::update(LyXFont const & newfont, setEmph(setMisc(newfont.emph(), emph())); setUnderbar(setMisc(newfont.underbar(), underbar())); setNoun(setMisc(newfont.noun(), noun())); - + setNumber(setMisc(newfont.number(), number())); if (newfont.language() == language() && toggleall) 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()); @@ -467,37 +460,17 @@ void LyXFont::reduce(LyXFont const & tmplt) 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; } - + if (bits.family == INHERIT_FAMILY) { bits.family = tmplt.bits.family; } @@ -531,11 +504,8 @@ bool LyXFont::resolved() const { return (family() != INHERIT_FAMILY && series() != INHERIT_SERIES && shape() != INHERIT_SHAPE && size() != INHERIT_SIZE && - emph() != INHERIT && underbar() != INHERIT && + emph() != INHERIT && underbar() != INHERIT && noun() != INHERIT && -#ifdef INHERIT_LANGUAGE - language() != inherit_language && -#endif color() != LColor::inherit); } @@ -569,9 +539,8 @@ string const LyXFont::stateText(BufferParams * params) const if (number() != OFF) ost << _(" Number ") << _(GUIMiscNames[number()]); - string buf(ost.str().c_str()); - buf = strip(buf, ' '); - buf = strip(buf, ','); + string buf(STRCONV(ost.str())); + buf = rtrim(buf, ", "); return buf; } @@ -579,7 +548,7 @@ string const LyXFont::stateText(BufferParams * params) const // Set family according to lyx format string LyXFont & LyXFont::setLyXFamily(string const & fam) { - string const s = lowercase(fam); + string const s = ascii_lowercase(fam); int i = 0; while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error") ++i; @@ -595,7 +564,7 @@ LyXFont & LyXFont::setLyXFamily(string const & fam) // Set series according to lyx format string LyXFont & LyXFont::setLyXSeries(string const & ser) { - string const s = lowercase(ser); + string const s = ascii_lowercase(ser); int i = 0; while (s != LyXSeriesNames[i] && LyXSeriesNames[i] != "error") ++i; @@ -611,7 +580,7 @@ LyXFont & LyXFont::setLyXSeries(string const & ser) // Set shape according to lyx format string LyXFont & LyXFont::setLyXShape(string const & sha) { - string const s = lowercase(sha); + string const s = ascii_lowercase(sha); int i = 0; while (s != LyXShapeNames[i] && LyXShapeNames[i] != "error") ++i; @@ -627,7 +596,7 @@ LyXFont & LyXFont::setLyXShape(string const & sha) // Set size according to lyx format string LyXFont & LyXFont::setLyXSize(string const & siz) { - string const s = lowercase(siz); + string const s = ascii_lowercase(siz); int i = 0; while (s != LyXSizeNames[i] && LyXSizeNames[i] != "error") ++i; if (s == LyXSizeNames[i]) { @@ -642,7 +611,7 @@ LyXFont & LyXFont::setLyXSize(string const & siz) // Set size according to lyx format string LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz) { - string const s = lowercase(siz); + string const s = ascii_lowercase(siz); int i = 0; while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") ++i; if (s == LyXMiscNames[i]) @@ -676,7 +645,7 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex) bool finished = false; while (!finished && lex.isOK() && !error) { lex.next(); - string const tok = lowercase(lex.getString()); + string const tok = ascii_lowercase(lex.getString()); if (tok.empty()) { continue; @@ -700,7 +669,7 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex) setLyXSize(ttok); } else if (tok == "misc") { lex.next(); - string const ttok = lowercase(lex.getString()); + string const ttok = ascii_lowercase(lex.getString()); if (ttok == "no_bar") { setUnderbar(OFF); @@ -732,9 +701,6 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex) /// 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"; @@ -784,13 +750,7 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, 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"; @@ -807,7 +767,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base, bool env = false; if (language()->babel() != base.language()->babel() && - language()->babel() != prev.language()->babel()) { + language() != prev.language()) { if (isRightToLeft() != prev.isRightToLeft()) { if (isRightToLeft()) { os << "\\R{"; @@ -833,7 +793,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base, LyXFont f = *this; f.reduce(base); - + if (f.family() != INHERIT_FAMILY) { os << '\\' << LaTeXFamilyNames[f.family()] @@ -897,17 +857,16 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base, // Returns number of chars written // This one corresponds to latexWriteStartChanges(). (Asger) int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base, - LyXFont const & next) const + LyXFont const & next) const { 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 << '}';