- remove some unused code

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 903cbe4b4c87b1bb011c311c429959e70f46f563..61143f4bac1b2ed8751df51adc630c0569a2a640 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -33,16 +33,16 @@ 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[12] = 
+{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"),
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb",
+  N_("Inherit"), N_("Ignore") };
 
 char const * GUISeriesNames[4] = 
 { N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
@@ -63,8 +63,10 @@ char const * GUIMiscNames[5] =
 //
 // Strings used to read and write .lyx format files
 //
-char const * LyXFamilyNames[6] = 
-{ "roman", "sans", "typewriter", "symbol", "default", "error" };
+char const * LyXFamilyNames[12] = 
+{ "roman", "sans", "typewriter", "symbol",
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb",
+  "default", "error" };
 
 char const * LyXSeriesNames[4] = 
 { "medium", "bold", "default", "error" };
@@ -75,7 +77,7 @@ char const * LyXShapeNames[6] =
 char const * LyXSizeNames[14] = 
 { "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
   "larger", "largest", "huge", "giant", 
-  "increase-error", "decrease-error", "default", "error" };
+  "increase", "decrease", "default", "error" };
 
 char const * LyXMiscNames[5] = 
 { "off", "on", "toggle", "default", "error" };
@@ -157,7 +159,11 @@ bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT1)
+#ifndef INHERIT_LANGUAGE
+       : bits(inherit), lang(default_language)
+#else
        : bits(inherit), lang(inherit_language)
+#endif
 {}
 
 
@@ -377,7 +383,9 @@ LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE 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'
@@ -423,7 +431,14 @@ void LyXFont::update(LyXFont const & newfont, bool toggleall)
        
        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 +468,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,6 +493,7 @@ LyXFont & LyXFont::realize(LyXFont const & tmplt, Language const * deflang)
                        setLanguage(tmplt.language());
                }
        }
+#endif
        if (bits == inherit) {
                bits = tmplt.bits;
                return *this;
@@ -511,8 +534,10 @@ bool LyXFont::resolved() const
                shape() != INHERIT_SHAPE && size() != INHERIT_SIZE &&
                emph() != INHERIT && underbar() != INHERIT && 
                noun() != INHERIT &&
-               color() != LColor::inherit &&
-               language() != inherit_language);
+#ifdef INHERIT_LANGUAGE
+               language() != inherit_language &&
+#endif
+               color() != LColor::inherit);
 }
 
 
@@ -650,9 +675,9 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
 {
        bool error = false;
        bool finished = false;
-       while (!finished && lex.IsOK() && !error) {
+       while (!finished && lex.isOK() && !error) {
                lex.next();
-               string const tok = lowercase(lex.GetString());
+               string const tok = lowercase(lex.getString());
 
                if (tok.empty()) {
                        continue;
@@ -660,23 +685,23 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
                        finished = true;
                } else if (tok == "family") {
                        lex.next();
-                       string const ttok = lex.GetString();
+                       string const ttok = lex.getString();
                        setLyXFamily(ttok);
                } else if (tok == "series") {
                        lex.next();
-                       string const ttok = lex.GetString();
+                       string const ttok = lex.getString();
                        setLyXSeries(ttok);
                } else if (tok == "shape") {
                        lex.next();
-                       string const ttok = lex.GetString();
+                       string const ttok = lex.getString();
                        setLyXShape(ttok);
                } else if (tok == "size") {
                        lex.next();
-                       string const ttok = lex.GetString();
+                       string const ttok = lex.getString();
                        setLyXSize(ttok);
                } else if (tok == "misc") {
                        lex.next();
-                       string const ttok = lowercase(lex.GetString());
+                       string const ttok = lowercase(lex.getString());
 
                        if (ttok == "no_bar") {
                                setUnderbar(OFF);
@@ -695,7 +720,7 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
                        }
                } else if (tok == "color") {
                        lex.next();
-                       string const ttok = lex.GetString();
+                       string const ttok = lex.getString();
                        setLyXColor(ttok);
                } else {
                        lex.printError("Unknown tag `$$Token'");
@@ -708,7 +733,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 +785,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";