Fix crash when running lyx -dbg insets -e ...

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index c481050584c1a0131b1fb87af4cf8ae0f6f071e3..819b401c116cdfe6935fa71afa4453e3daa8a073 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -107,7 +107,9 @@ LyXFont::FontBits LyXFont::sane = {
        SIZE_NORMAL,
        LColor::none,
        OFF,
+#ifndef NO_LATEX
        OFF,
+#endif
        OFF,
        OFF,
        OFF };
@@ -120,7 +122,9 @@ LyXFont::FontBits LyXFont::inherit = {
        INHERIT_SIZE,
        LColor::inherit,
        INHERIT,
+#ifndef NO_LATEX
        INHERIT,
+#endif
        INHERIT,
        INHERIT,
        OFF };
@@ -133,7 +137,9 @@ LyXFont::FontBits LyXFont::ignore = {
        IGNORE_SIZE,
        LColor::ignore,
        IGNORE,
+#ifndef NO_LATEX
        IGNORE,
+#endif
        IGNORE,
        IGNORE,
        IGNORE };
@@ -149,7 +155,9 @@ 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;
 }
 
@@ -196,10 +204,12 @@ 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 
@@ -228,7 +238,11 @@ bool LyXFont::isRightToLeft() const
 
 bool LyXFont::isVisibleRightToLeft() const 
 {
-       return (lang->RightToLeft() && latex() != ON && number() != ON);
+       return (lang->RightToLeft() &&
+#ifndef NO_LATEX
+               latex() != ON &&
+#endif
+               number() != ON);
 }
 
 
@@ -281,11 +295,13 @@ 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)
@@ -437,8 +453,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)
@@ -472,8 +490,10 @@ 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);
 }
@@ -508,9 +528,11 @@ 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;
        }
@@ -524,7 +546,10 @@ bool LyXFont::resolved() const
        return (family() != INHERIT_FAMILY && series() != INHERIT_SERIES &&
                shape() != INHERIT_SHAPE && size() != INHERIT_SIZE &&
                emph() != INHERIT && underbar() != INHERIT && 
-               noun() != INHERIT && latex() != INHERIT && 
+               noun() != INHERIT &&
+#ifndef NO_LATEX
+               latex() != INHERIT &&
+#endif
                color() != LColor::inherit);
 }
 
@@ -532,7 +557,7 @@ bool LyXFont::resolved() const
 /// Build GUI description of font state
 string const LyXFont::stateText(BufferParams * params) const
 {
-       std::ostringstream ost;
+       ostringstream ost;
        if (family() != INHERIT_FAMILY)
                ost << _(GUIFamilyNames[family()]) << ", ";
        if (series() != INHERIT_SERIES)
@@ -551,8 +576,10 @@ 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))
@@ -689,6 +716,7 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
                        lex.next();
                        string const ttok = lex.GetString();
                        setLyXSize(ttok);
+#ifndef NO_LATEX
                } else if (tok == "latex") {
                        lex.next();
                        string const ttok = lowercase(lex.GetString());
@@ -700,6 +728,7 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
                        } else {
                                lex.printError("Illegal LaTeX type`$$Token'");
                        }
+#endif
                } else if (tok == "misc") {
                        lex.next();
                        string const ttok = lowercase(lex.GetString());
@@ -773,6 +802,7 @@ 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()) {
@@ -789,6 +819,7 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
                break;
                }
        }
+#endif
        if (orgfont.color() != color()) {
                // To make us file compatible with older
                // lyx versions we emit "default" instead
@@ -977,8 +1008,10 @@ 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();
@@ -1005,7 +1038,9 @@ 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;
 }