X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=3a3b3f845bdefded459e4defed53862e6a48347d;hb=539d0d16648f3ceabcc4d4b8f2300ebdcbb8369c;hp=1875b15061c28e007b3de195a4fad4fc640f6e39;hpb=a0bf0835e531b77fb00417c4256eee8baa020c26;p=lyx.git diff --git a/src/lyxfont.C b/src/lyxfont.C index 1875b15061..3a3b3f845b 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,6 +22,7 @@ #include "debug.h" #include "lyxrc.h" #include "lyxlex.h" +#include "language.h" #include "FontLoader.h" #include "support/lstrings.h" #include "bufferparams.h" // stateText @@ -33,66 +34,68 @@ using std::endl; using std::strlen; #endif - // // Names for the GUI // namespace { -char const * GUIFamilyNames[6] = -{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), N_("Inherit"), - N_("Ignore") }; +char const * GUIFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] = +{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), + "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", + 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[6] = -{ "roman", "sans", "typewriter", "symbol", "default", "error" }; +char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] = +{ "roman", "sans", "typewriter", "symbol", + "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", + "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" }; @@ -156,8 +159,17 @@ bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const } +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 {} @@ -192,31 +204,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); @@ -294,7 +306,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; @@ -325,7 +337,7 @@ LyXFont & LyXFont::decSize() /// Increases font size by one -LyXFont & LyXFont::incSize() +LyXFont & LyXFont::incSize() { switch (size()) { case SIZE_HUGER: break; @@ -356,7 +368,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) { @@ -371,13 +383,15 @@ 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, bool toggleall) +void LyXFont::update(LyXFont const & newfont, + Language const * document_language, + bool toggleall) { if (newfont.family() == family() && toggleall) setFamily(INHERIT_FAMILY); // toggle 'back' @@ -398,7 +412,7 @@ void LyXFont::update(LyXFont const & newfont, bool toggleall) case INHERIT_SERIES: setSeries(newfont.series()); break; - case IGNORE_SERIES: + case IGNORE_SERIES: break; } @@ -420,10 +434,17 @@ void LyXFont::update(LyXFont const & newfont, bool toggleall) 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) - setLanguage(inherit_language); + 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()); @@ -453,14 +474,21 @@ 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 || @@ -471,11 +499,12 @@ LyXFont & LyXFont::realize(LyXFont const & tmplt, Language const * deflang) setLanguage(tmplt.language()); } } +#endif if (bits == inherit) { bits = tmplt.bits; return *this; } - + if (bits.family == INHERIT_FAMILY) { bits.family = tmplt.bits.family; } @@ -509,10 +538,12 @@ 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 && - color() != LColor::inherit && - language() != inherit_language); +#ifdef INHERIT_LANGUAGE + language() != inherit_language && +#endif + color() != LColor::inherit); } @@ -708,7 +739,10 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex) /// Writes the changes from this font to orgfont in .lyx format in file void LyXFont::lyxWriteChanges(LyXFont const & orgfont, - Language const * doclang, ostream & os) const +#ifdef INHERIT_LANGUAGE + Language const * doclang, +#endif + ostream & os) const { os << "\n"; if (orgfont.family() != family()) { @@ -757,9 +791,13 @@ 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"; @@ -802,7 +840,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base, LyXFont f = *this; f.reduce(base); - + if (f.family() != INHERIT_FAMILY) { os << '\\' << LaTeXFamilyNames[f.family()] @@ -866,7 +904,7 @@ 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;