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

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 52bfa989a5188d90ede85eca555a70a3a09e1561..819b401c116cdfe6935fa71afa4453e3daa8a073 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -29,31 +29,33 @@
 using std::ostream;
 using std::endl;
 
+#ifndef CXX_GLOBAL_CSTD
+using std::strlen;
+#endif
+
+
 //
 // Names for the GUI
 //
 
-static
+namespace {
+
 char const * GUIFamilyNames[6] = 
 { N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), N_("Inherit"),
   N_("Ignore") };
 
-static
 char const * GUISeriesNames[4] = 
 { N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
 
-static
 char const * GUIShapeNames[6] = 
 { N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
   N_("Ignore") };
 
-static
 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_("Inherit"), N_("Ignore") };
  
-static
 char const * GUIMiscNames[5] = 
 { N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
 
@@ -61,48 +63,40 @@ char const * GUIMiscNames[5] =
 //
 // Strings used to read and write .lyx format files
 //
-static
 char const * LyXFamilyNames[6] = 
 { "roman", "sans", "typewriter", "symbol", "default", "error" };
 
-static
 char const * LyXSeriesNames[4] = 
 { "medium", "bold", "default", "error" };
 
-static
 char const * LyXShapeNames[6] = 
 { "up", "italic", "slanted", "smallcaps", "default", "error" };
 
-static
 char const * LyXSizeNames[14] = 
 { "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
   "larger", "largest", "huge", "giant", 
   "increase-error", "decrease-error", "default", "error" };
 
-static
 char const * LyXMiscNames[5] = 
 { "off", "on", "toggle", "default", "error" };
 
 //
 // Strings used to write LaTeX files
 //
-static
 char const * LaTeXFamilyNames[6] = 
 { "textrm", "textsf", "texttt", "error1", "error2", "error3" };
 
-static
 char const * LaTeXSeriesNames[4] = 
 { "textmd", "textbf", "error4", "error5" };
 
-static
 char const * LaTeXShapeNames[6] = 
 { "textup", "textit", "textsl", "textsc", "error6", "error7" };
 
-static
 char const * LaTeXSizeNames[14] = 
 { "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large",
   "Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" };
 
+} // namespace anon
 
 
 // Initialize static member
@@ -113,7 +107,9 @@ LyXFont::FontBits LyXFont::sane = {
        SIZE_NORMAL,
        LColor::none,
        OFF,
+#ifndef NO_LATEX
        OFF,
+#endif
        OFF,
        OFF,
        OFF };
@@ -126,7 +122,9 @@ LyXFont::FontBits LyXFont::inherit = {
        INHERIT_SIZE,
        LColor::inherit,
        INHERIT,
+#ifndef NO_LATEX
        INHERIT,
+#endif
        INHERIT,
        INHERIT,
        OFF };
@@ -139,7 +137,9 @@ LyXFont::FontBits LyXFont::ignore = {
        IGNORE_SIZE,
        LColor::ignore,
        IGNORE,
+#ifndef NO_LATEX
        IGNORE,
+#endif
        IGNORE,
        IGNORE,
        IGNORE };
@@ -155,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;
 }
 
@@ -166,83 +168,34 @@ bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
 }
 
 
-LyXFont::LyXFont()
-{
-       bits = sane;
-       lang = default_language;
-}
-
-
 LyXFont::LyXFont(LyXFont::FONT_INIT1)
-{
-       bits = inherit;
-       lang = default_language;
-}
+       : bits(inherit), lang(default_language)
+{}
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT2)
-{
-       bits = ignore;
-       lang = ignore_language;
-}
+       : bits(ignore), lang(ignore_language)
+{}
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT3)
-{
-       bits = sane;
-       lang = default_language;
-}
+       : bits(sane), lang(default_language)
+{}
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT1, Language const * l)
-{
-       bits = inherit;
-       lang = l;
-}
+       : bits(inherit), lang(l)
+{}
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT2, Language const * l)
-{
-       bits = ignore;
-       lang = l;
-}
+       : bits(ignore), lang(l)
+{}
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT3, Language const * l)
-{
-       bits = sane;
-       lang = l;
-}
-
-
-LyXFont::FONT_FAMILY LyXFont::family() const 
-{
-       return bits.family;
-}
-
-
-LyXFont::FONT_SERIES LyXFont::series() const
-{
-       return bits.series;
-}
-
-
-LyXFont::FONT_SHAPE LyXFont::shape() const
-{
-       return bits.shape;
-}
-
-
-LyXFont::FONT_SIZE LyXFont::size() const
-{
-       return bits.size;
-}
-
-
-LyXFont::FONT_MISC_STATE LyXFont::emph() const
-{
-       return bits.emph;
-}
+       : bits(sane), lang(l)
+{}
 
 
 LyXFont::FONT_MISC_STATE LyXFont::underbar() const
@@ -251,16 +204,12 @@ LyXFont::FONT_MISC_STATE LyXFont::underbar() const
 }
 
 
-LyXFont::FONT_MISC_STATE LyXFont::noun() const
-{
-       return bits.noun;
-}
-
-
+#ifndef NO_LATEX
 LyXFont::FONT_MISC_STATE LyXFont::latex() const 
 {
        return bits.latex;
 }
+#endif
 
 
 LColor::color LyXFont::color() const 
@@ -289,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);
 }
 
 
@@ -342,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)
@@ -491,8 +446,6 @@ void LyXFont::update(LyXFont const & newfont,
                        incSize();
                else if (newfont.size() == DECREASE_SIZE)
                        decSize();
-               else if (newfont.size() == size() && toggleall)
-                       setSize(INHERIT_SIZE); // toggle 'back'
                else
                        setSize(newfont.size());
        }
@@ -500,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)
@@ -535,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);
 }
@@ -571,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;
        }
@@ -587,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);
 }
 
@@ -595,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)
@@ -614,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))
@@ -752,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());
@@ -763,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());
@@ -836,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()) {
@@ -852,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
@@ -1040,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();
@@ -1068,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;
 }