remove noload/don't typeset

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 8cd660eed0561da8b487b1240abdbf760913f4e4..7a04c7177e54783cf96254fbec3d987a10963fc9 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -159,11 +159,7 @@ LyXFont::LyXFont()
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT1)
-#ifndef INHERIT_LANGUAGE
        : bits(inherit), lang(default_language)
-#else
-       : bits(inherit), lang(inherit_language)
-#endif
 {}
 
 
@@ -434,11 +430,7 @@ void LyXFont::update(LyXFont const & newfont,
                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());
 
@@ -468,32 +460,12 @@ 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;
@@ -534,9 +506,6 @@ bool LyXFont::resolved() const
                shape() != INHERIT_SHAPE && size() != INHERIT_SIZE &&
                emph() != INHERIT && underbar() != INHERIT &&
                noun() != INHERIT &&
-#ifdef INHERIT_LANGUAGE
-               language() != inherit_language &&
-#endif
                color() != LColor::inherit);
 }
 
@@ -571,8 +540,7 @@ string const LyXFont::stateText(BufferParams * params) const
                ost << _("  Number ") << _(GUIMiscNames[number()]);
 
        string buf(ost.str().c_str());
-       buf = strip(buf, ' ');
-       buf = strip(buf, ',');
+       buf = rtrim(buf, ", ");
        return buf;
 }
 
@@ -580,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;
@@ -596,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;
@@ -612,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;
@@ -628,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]) {
@@ -643,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])
@@ -677,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;
@@ -701,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);
@@ -733,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";
@@ -785,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";
@@ -903,12 +862,11 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
        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 << '}';