More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 065a5d8d72752f108753e1d9003c464bad2be183..5c81bcfacce8dceb8cfd015d1b2763cbdef24021 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -192,7 +192,7 @@ LyXFont & LyXFont::decSize()
 /// Increases font size by one
 LyXFont & LyXFont::incSize() 
 {
-       switch(size()) {
+       switch (size()) {
        case SIZE_HUGER:        break;
        case SIZE_HUGE:         setSize(SIZE_HUGER);    break;
        case SIZE_LARGEST:      setSize(SIZE_HUGE);     break;
@@ -245,7 +245,7 @@ LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont,
 void LyXFont::update(LyXFont const & newfont,
                     Language const * document_language, bool toggleall)
 {
-       if(newfont.family() == family() && toggleall)
+       if (newfont.family() == family() && toggleall)
                setFamily(INHERIT_FAMILY); // toggle 'back'
        else if (newfont.family() != IGNORE_FAMILY)
                setFamily(newfont.family());
@@ -268,7 +268,7 @@ void LyXFont::update(LyXFont const & newfont,
                break;
        }
 
-       if(newfont.shape() == shape() && toggleall)
+       if (newfont.shape() == shape() && toggleall)
                setShape(INHERIT_SHAPE); // toggle 'back'
        else if (newfont.shape() != IGNORE_SHAPE)
                setShape(newfont.shape());
@@ -292,7 +292,10 @@ void LyXFont::update(LyXFont const & newfont,
 
        setNumber(setMisc(newfont.number(), number()));
        if (newfont.language() == language() && toggleall)
-               setLanguage(document_language);
+               if (language() == document_language)
+                       setLanguage(default_language);
+               else
+                       setLanguage(document_language);
        else if (newfont.language() != ignore_language)
                setLanguage(newfont.language());
 
@@ -404,12 +407,11 @@ string const LyXFont::stateText(BufferParams * params) const
                ost << _("Latex ") << _(GUIMiscNames[latex()]) << ", ";
        if (bits == inherit)
                ost << _("Default") << ", ";
-       if (!params || (language() != params->language_info))
-               ost << _("Language: ") << _(language()->display().c_str()) << ", ";
+       if (!params || (language() != params->language))
+               ost << _("Language: ") << _(language()->display()) << ", ";
        if (number() != OFF)
                ost << _("  Number ") << _(GUIMiscNames[number()]);
 
-
        string buf(ost.str().c_str());
        buf = strip(buf, ' ');
        buf = strip(buf, ',');
@@ -502,6 +504,7 @@ LyXFont & LyXFont::setLyXColor(string const & col)
 }
 
 
+#if 0
 /// Sets size after GUI name
 LyXFont & LyXFont::setGUISize(string const & siz)
 {
@@ -512,6 +515,7 @@ LyXFont & LyXFont::setGUISize(string const & siz)
        setColor(lcolor.getFromGUIName(siz));
        return *this;
 }
+#endif
 
 
 // Returns size in latex format
@@ -676,7 +680,8 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
        int count = 0;
        bool env = false;
 
-       if (language() != base.language() && language() != prev.language()) {
+       if (language()->babel() != base.language()->babel() &&
+           language()->babel() != prev.language()->babel()) {
                if (isRightToLeft() != prev.isRightToLeft()) {
                        if (isRightToLeft()) {
                                os << "\\R{";
@@ -688,7 +693,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
                } else {
                        string tmp = '{' + 
                                subst(lyxrc.language_command_begin,
-                                     "$$lang", language()->lang());
+                                     "$$lang", language()->babel());
                        os << tmp;
                        count += tmp.length();
                }