info-insert without arg is valid

[lyx.git] / src / FontInfo.cpp

diff --git a/src/FontInfo.cpp b/src/FontInfo.cpp
index be792623071b74fb36f9f7bb9383b49bf65e6bd1..983499db68a41f3c13ddfeea98aa581e24772eb1 100644 (file)
--- a/src/FontInfo.cpp
+++ b/src/FontInfo.cpp
@@ -70,6 +70,8 @@ FontInfo const sane_font(
        FONT_OFF,
        FONT_OFF,
        FONT_OFF,
+       FONT_OFF,
+       FONT_OFF,
        FONT_OFF);
 
 FontInfo const inherit_font(
@@ -85,7 +87,9 @@ FontInfo const inherit_font(
        FONT_INHERIT,
        FONT_INHERIT,
        FONT_INHERIT,
-       FONT_OFF);
+       FONT_INHERIT,
+       FONT_OFF,
+       FONT_INHERIT);
 
 FontInfo const ignore_font(
        IGNORE_FAMILY,
@@ -100,6 +104,8 @@ FontInfo const ignore_font(
        FONT_IGNORE,
        FONT_IGNORE,
        FONT_IGNORE,
+       FONT_IGNORE,
+       FONT_IGNORE,
        FONT_IGNORE);
 
 
@@ -211,6 +217,8 @@ void FontInfo::reduce(FontInfo const & tmplt)
                underbar_ = FONT_INHERIT;
        if (strikeout_ == tmplt.strikeout_)
                strikeout_ = FONT_INHERIT;
+       if (xout_ == tmplt.xout_)
+               xout_ = FONT_INHERIT;
        if (uuline_ == tmplt.uuline_)
                uuline_ = FONT_INHERIT;
        if (uwave_ == tmplt.uwave_)
@@ -221,6 +229,8 @@ void FontInfo::reduce(FontInfo const & tmplt)
                color_ = Color_inherit;
        if (background_ == tmplt.background_)
                background_ = Color_inherit;
+       if (nospellcheck_ == tmplt.nospellcheck_)
+               nospellcheck_ = FONT_INHERIT;
 }
 
 
@@ -253,6 +263,9 @@ FontInfo & FontInfo::realize(FontInfo const & tmplt)
        if (strikeout_ == FONT_INHERIT)
                strikeout_ = tmplt.strikeout_;
 
+       if (xout_ == FONT_INHERIT)
+               xout_ = tmplt.xout_;
+
        if (uuline_ == FONT_INHERIT)
                uuline_ = tmplt.uuline_;
 
@@ -268,6 +281,9 @@ FontInfo & FontInfo::realize(FontInfo const & tmplt)
        if (background_ == Color_inherit)
                background_ = tmplt.background_;
 
+       if (nospellcheck_ == FONT_INHERIT)
+               nospellcheck_ = tmplt.nospellcheck_;
+
        return *this;
 }
 
@@ -362,10 +378,12 @@ void FontInfo::update(FontInfo const & newfont, bool toggleall)
        setEmph(setMisc(newfont.emph_, emph_));
        setUnderbar(setMisc(newfont.underbar_, underbar_));
        setStrikeout(setMisc(newfont.strikeout_, strikeout_));
+       setXout(setMisc(newfont.xout_, xout_));
        setUuline(setMisc(newfont.uuline_, uuline_));
        setUwave(setMisc(newfont.uwave_, uwave_));
        setNoun(setMisc(newfont.noun_, noun_));
        setNumber(setMisc(newfont.number_, number_));
+       setNoSpellcheck(setMisc(newfont.nospellcheck_, nospellcheck_));
 
        if (newfont.color_ == color_ && toggleall)
                setColor(Color_inherit); // toggle 'back'
@@ -385,9 +403,9 @@ bool FontInfo::resolved() const
                && shape_ != INHERIT_SHAPE && size_ != FONT_SIZE_INHERIT
                && emph_ != FONT_INHERIT && underbar_ != FONT_INHERIT
                && uuline_ != FONT_INHERIT && uwave_ != FONT_INHERIT
-               && strikeout_ != FONT_INHERIT && noun_ != FONT_INHERIT
-               && color_ != Color_inherit
-               && background_ != Color_inherit);
+               && strikeout_ != FONT_INHERIT && xout_ != FONT_INHERIT
+               && noun_ != FONT_INHERIT && color_ != Color_inherit
+               && background_ != Color_inherit && nospellcheck_ != FONT_INHERIT);
 }
 
 
@@ -514,12 +532,12 @@ string getSizeCSS(FontSize const & s)
        }
        return "";
 }
-       
-} // namespace anonymous
+
+} // namespace
 
 
 // FIXME This does not yet handle color
-docstring FontInfo::asCSS() const 
+docstring FontInfo::asCSS() const
 {
        string retval;
        string tmp = getFamilyCSS(family_);
@@ -532,7 +550,7 @@ docstring FontInfo::asCSS() const
        tmp = getSizeCSS(size_);
        if (!tmp.empty())
                appendSep(retval, makeCSSTag("font-size", tmp));
-       return from_ascii(retval);      
+       return from_ascii(retval);
 }
 
 
@@ -656,6 +674,8 @@ FontInfo lyxRead(Lexer & lex, FontInfo const & fi)
                                f.setUnderbar(FONT_OFF);
                        } else if (ttok == "no_strikeout") {
                                f.setStrikeout(FONT_OFF);
+                       } else if (ttok == "no_xout") {
+                               f.setXout(FONT_OFF);
                        } else if (ttok == "no_uuline") {
                                f.setUuline(FONT_OFF);
                        } else if (ttok == "no_uwave") {
@@ -670,12 +690,18 @@ FontInfo lyxRead(Lexer & lex, FontInfo const & fi)
                                f.setUnderbar(FONT_ON);
                        } else if (ttok == "strikeout") {
                                f.setStrikeout(FONT_ON);
+                       } else if (ttok == "xout") {
+                               f.setXout(FONT_ON);
                        } else if (ttok == "uuline") {
                                f.setUuline(FONT_ON);
                        } else if (ttok == "uwave") {
                                f.setUwave(FONT_ON);
                        } else if (ttok == "noun") {
                                f.setNoun(FONT_ON);
+                       } else if (ttok == "nospellcheck") {
+                               f.setNoSpellcheck(FONT_ON);
+                       } else if (ttok == "no_nospellcheck") {
+                               f.setNoSpellcheck(FONT_OFF);
                        } else {
                                lex.printError("Illegal misc type");
                        }
@@ -718,6 +744,10 @@ void lyxWrite(ostream & os, FontInfo const & f, string const & start, int level)
                oss << indent << "\tMisc Strikeout\n";
        else if (f.strikeout() == FONT_OFF)
                oss << indent << "\tMisc No_Strikeout\n";
+       if (f.xout() == FONT_ON)
+               oss << indent << "\tMisc Xout\n";
+       else if (f.xout() == FONT_OFF)
+               oss << indent << "\tMisc No_Xout\n";
        if (f.uuline() == FONT_ON)
                oss << indent << "\tMisc Uuline\n";
        else if (f.uuline() == FONT_OFF)
@@ -734,6 +764,10 @@ void lyxWrite(ostream & os, FontInfo const & f, string const & start, int level)
                oss << indent << "\tMisc Noun\n";
        else if (f.noun() == FONT_OFF)
                oss << indent << "\tMisc No_Noun\n";
+       if (f.nospellcheck() == FONT_ON)
+               oss << indent << "\tMisc NoSpellcheck\n";
+       else if (f.nospellcheck() == FONT_OFF)
+               oss << indent << "\tMisc No_NoSpellcheck\n";
        if (f.color() != Color_inherit && f.color() != Color_none)
                oss << indent << "\tColor " << lcolor.getLyXName(f.color())
                    << '\n';