]> git.lyx.org Git - lyx.git/blobdiff - src/lyxfont.C
projects / lyx.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
some visual feedback for extra vertical space
[lyx.git] / src / lyxfont.C
diff --git a/src/lyxfont.C b/src/lyxfont.C
index 819b401c116cdfe6935fa71afa4453e3daa8a073..1875b15061c28e007b3de195a4fad4fc640f6e39 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -107,9 +107,6 @@ LyXFont::FontBits LyXFont::sane = {
        SIZE_NORMAL,
        LColor::none,
        OFF,
-#ifndef NO_LATEX
-       OFF,
-#endif
        OFF,
        OFF,
        OFF };
@@ -122,9 +119,6 @@ LyXFont::FontBits LyXFont::inherit = {
        INHERIT_SIZE,
        LColor::inherit,
        INHERIT,
-#ifndef NO_LATEX
-       INHERIT,
-#endif
        INHERIT,
        INHERIT,
        OFF };
@@ -137,9 +131,6 @@ LyXFont::FontBits LyXFont::ignore = {
        IGNORE_SIZE,
        LColor::ignore,
        IGNORE,
-#ifndef NO_LATEX
-       IGNORE,
-#endif
        IGNORE,
        IGNORE,
        IGNORE };
@@ -155,9 +146,6 @@ bool LyXFont::FontBits::operator==(LyXFont::FontBits const & fb1) const
                fb1.emph == emph &&
                fb1.underbar == underbar &&
                fb1.noun == noun &&
-#ifndef NO_LATEX
-               fb1.latex == latex &&
-#endif
                fb1.number == number;
 }
 
@@ -169,7 +157,7 @@ bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT1)
-       : bits(inherit), lang(default_language)
+       : bits(inherit), lang(inherit_language)
 {}
 
 
@@ -204,14 +192,6 @@ LyXFont::FONT_MISC_STATE LyXFont::underbar() const
 }
 
 
-#ifndef NO_LATEX
-LyXFont::FONT_MISC_STATE LyXFont::latex() const 
-{
-       return bits.latex;
-}
-#endif
-
-
 LColor::color LyXFont::color() const 
 {
        return bits.color;
@@ -239,9 +219,6 @@ bool LyXFont::isRightToLeft() const
 bool LyXFont::isVisibleRightToLeft() const 
 {
        return (lang->RightToLeft() &&
-#ifndef NO_LATEX
-               latex() != ON &&
-#endif
                number() != ON);
 }
 
@@ -295,15 +272,6 @@ LyXFont & LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
 }
 
 
-#ifndef NO_LATEX
-LyXFont & LyXFont::setLatex(LyXFont::FONT_MISC_STATE l)
-{
-       bits.latex = l;
-       return *this;
-}
-#endif
-
-
 LyXFont & LyXFont::setColor(LColor::color c)
 {
        bits.color = c;
@@ -409,8 +377,7 @@ LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont,
 
 
 /// Updates font settings according to request
-void LyXFont::update(LyXFont const & newfont,
-                    Language const * document_language, bool toggleall)
+void LyXFont::update(LyXFont const & newfont, bool toggleall)
 {
        if (newfont.family() == family() && toggleall)
                setFamily(INHERIT_FAMILY); // toggle 'back'
@@ -453,16 +420,10 @@ void LyXFont::update(LyXFont const & newfont,
        setEmph(setMisc(newfont.emph(), emph()));
        setUnderbar(setMisc(newfont.underbar(), underbar()));
        setNoun(setMisc(newfont.noun(), noun()));
-#ifndef NO_LATEX
-       setLatex(setMisc(newfont.latex(), latex()));
-#endif
        
        setNumber(setMisc(newfont.number(), number()));
        if (newfont.language() == language() && toggleall)
-               if (language() == document_language)
-                       setLanguage(default_language);
-               else
-                       setLanguage(document_language);
+               setLanguage(inherit_language);
        else if (newfont.language() != ignore_language)
                setLanguage(newfont.language());
 
@@ -490,18 +451,26 @@ void LyXFont::reduce(LyXFont const & tmplt)
                setUnderbar(INHERIT);
        if (noun() == tmplt.noun())
                setNoun(INHERIT);
-#ifndef NO_LATEX
-       if (latex() == tmplt.latex())
-               setLatex(INHERIT);
-#endif
        if (color() == tmplt.color())
                setColor(LColor::inherit);
+       if (language() == tmplt.language())
+               setLanguage(inherit_language);
 }
 
 
 /// Realize font from a template
-LyXFont & LyXFont::realize(LyXFont const & tmplt)
-{
+LyXFont & LyXFont::realize(LyXFont const & tmplt, Language const * deflang)
+{
+       if (language() == inherit_language) {
+               if (tmplt.language() == inherit_language ||
+                       tmplt.language() == ignore_language ||
+                       tmplt.language() == default_language)
+               {
+                       setLanguage(deflang);
+               } else {
+                       setLanguage(tmplt.language());
+               }
+       }
        if (bits == inherit) {
                bits = tmplt.bits;
                return *this;
@@ -528,11 +497,6 @@ LyXFont & LyXFont::realize(LyXFont const & tmplt)
        if (bits.noun == INHERIT) {
                bits.noun = tmplt.bits.noun;
        }
-#ifndef NO_LATEX
-       if (bits.latex == INHERIT) {
-               bits.latex = tmplt.bits.latex;
-       }
-#endif
        if (bits.color == LColor::inherit) {
                bits.color = tmplt.bits.color;
        }
@@ -547,10 +511,8 @@ bool LyXFont::resolved() const
                shape() != INHERIT_SHAPE && size() != INHERIT_SIZE &&
                emph() != INHERIT && underbar() != INHERIT && 
                noun() != INHERIT &&
-#ifndef NO_LATEX
-               latex() != INHERIT &&
-#endif
-               color() != LColor::inherit);
+               color() != LColor::inherit &&
+               language() != inherit_language);
 }
 
 
@@ -576,10 +538,6 @@ string const LyXFont::stateText(BufferParams * params) const
                    << _(GUIMiscNames[underbar()]) << ", ";
        if (noun() != INHERIT)
                ost << _("Noun ") << _(GUIMiscNames[noun()]) << ", ";
-#ifndef NO_LATEX
-       if (latex() != INHERIT)
-               ost << _("Latex ") << _(GUIMiscNames[latex()]) << ", ";
-#endif
        if (bits == inherit)
                ost << _("Default") << ", ";
        if (!params || (language() != params->language))
@@ -692,9 +650,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;
@@ -702,36 +660,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);
-#ifndef NO_LATEX
-               } else if (tok == "latex") {
-                       lex.next();
-                       string const ttok = lowercase(lex.GetString());
-
-                       if (ttok == "no_latex") {
-                               setLatex(OFF);
-                       } else if (ttok == "latex") {
-                               setLatex(ON);
-                       } else {
-                               lex.printError("Illegal LaTeX type`$$Token'");
-                       }
-#endif
                } else if (tok == "misc") {
                        lex.next();
-                       string const ttok = lowercase(lex.GetString());
+                       string const ttok = lowercase(lex.getString());
 
                        if (ttok == "no_bar") {
                                setUnderbar(OFF);
@@ -750,7 +695,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'");
@@ -762,7 +707,8 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
 
 
 /// Writes the changes from this font to orgfont in .lyx format in file
-void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
+void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
+                              Language const * doclang, ostream & os) const
 {
        os << "\n";
        if (orgfont.family() != family()) {
@@ -802,24 +748,6 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
        if (orgfont.noun() != noun()) {
                os << "\\noun " << LyXMiscNames[noun()] << " \n";
        }
-#ifndef NO_LATEX
-       if (orgfont.latex() != latex()) {
-               // This is only for backwards compatibility
-               switch (latex()) {
-               case OFF:       os << "\\latex no_latex \n"; break;
-               case ON:        os << "\\latex latex \n"; break;
-               case TOGGLE:    lyxerr << "LyXFont::lyxWriteFontChanges: "
-                                       "TOGGLE should not appear here!"
-                                      << endl;
-               break;
-               case INHERIT:   os << "\\latex default \n"; break;
-               case IGNORE:    lyxerr << "LyXFont::lyxWriteFontChanges: "
-                                       "IGNORE should not appear here!"
-                                      << endl;
-               break;
-               }
-       }
-#endif
        if (orgfont.color() != color()) {
                // To make us file compatible with older
                // lyx versions we emit "default" instead
@@ -829,7 +757,9 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
                os << "\\color " << col_str << "\n";
        }
        if (orgfont.language() != language()) {
-               if (language())
+               if (language() == inherit_language)
+                       os << "\\lang " << doclang->lang() << "\n";
+               else if (language())
                        os << "\\lang " << language()->lang() << "\n";
                else
                        os << "\\lang unknown\n";
@@ -936,7 +866,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;
@@ -1008,10 +938,6 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
 
 LColor::color LyXFont::realColor() const
 {
-#ifndef NO_LATEX
-       if (latex() == ON)
-               return LColor::latex;
-#endif
        if (color() == LColor::none)
                return LColor::foreground;
        return color();
@@ -1035,16 +961,6 @@ LyXFont::FONT_SHAPE LyXFont::realShape() const
 }
 
 
-bool LyXFont::equalExceptLatex(LyXFont const & f) const 
-{
-       LyXFont f1 = *this;
-#ifndef NO_LATEX
-       f1.setLatex(f.latex());
-#endif
-       return f1 == f;
-}
-
-
 ostream & operator<<(ostream & o, LyXFont::FONT_MISC_STATE fms)
 {
        return o << int(fms);
The LyX Source Repository