Improve BibTeX name parsing #1

[lyx.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 96f2fc709c6abd6416319d72a84081371432e57e..b2f9974504fbba14bafd4a28af83611e13f64ed7 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -58,29 +58,42 @@ MetricsBase::MetricsBase(BufferView * b, FontInfo f, int w)
 }
 
 
-Changer MetricsBase::changeFontSet(string const & name, bool cond)
+Changer MetricsBase::changeFontSet(string const & name)
 {
        RefChanger<MetricsBase> rc = make_save(*this);
-       if (!cond)
-               rc->keep();
-       else {
-               ColorCode oldcolor = font.color();
-               string const oldname = fontname;
-               fontname = name;
-               if (isMathFont(name) || isMathFont(oldname))
-                       font = sane_font;
-               augmentFont(font, name);
-               font.setSize(rc->old.font.size());
-               font.setStyle(rc->old.font.style());
-               if (name != "lyxtex"
-                   && ((isTextFont(oldname) && oldcolor != Color_foreground)
-                       || (isMathFont(oldname) && oldcolor != Color_math)))
-                       font.setColor(oldcolor);
-       }
+       ColorCode oldcolor = font.color();
+       string const oldname = fontname;
+       fontname = name;
+       if (isMathFont(name) || isMathFont(oldname))
+               font = sane_font;
+       augmentFont(font, name);
+       font.setSize(rc->old.font.size());
+       font.setStyle(rc->old.font.style());
+       if (name != "lyxtex"
+           && ((isTextFont(oldname) && oldcolor != Color_foreground)
+               || (isMathFont(oldname) && oldcolor != Color_math)))
+               font.setColor(oldcolor);
        return move(rc);
 }
 
 
+Changer MetricsBase::changeEnsureMath(Inset::mode_type mode)
+{
+       switch (mode) {
+       case Inset::UNDECIDED_MODE:
+               return Changer();
+       case Inset::TEXT_MODE:
+               return isMathFont(fontname) ? changeFontSet("textnormal") : Changer();
+       case Inset::MATH_MODE:
+               // FIXME:
+               //   \textit{\ensuremath{\text{a}}}
+               // should appear in italics
+               return isTextFont(fontname) ? changeFontSet("mathnormal"): Changer();
+       }
+       return Changer();
+}
+
+
 /////////////////////////////////////////////////////////////////////////
 //
 // MetricsInfo
@@ -152,35 +165,42 @@ Color PainterInfo::textColor(Color const & color) const
 }
 
 
-Changer MetricsBase::changeScript(bool cond)
+Changer MetricsBase::changeScript()
 {
        switch (font.style()) {
        case LM_ST_DISPLAY:
        case LM_ST_TEXT:
-               return font.changeStyle(LM_ST_SCRIPT, cond);
+               return font.changeStyle(LM_ST_SCRIPT);
        case LM_ST_SCRIPT:
        case LM_ST_SCRIPTSCRIPT:
-               return font.changeStyle(LM_ST_SCRIPTSCRIPT, cond);
+               return font.changeStyle(LM_ST_SCRIPTSCRIPT);
        }
        //remove Warning
-       LASSERT(false, return Changer());
+       return Changer();
 }
 
 
-Changer MetricsBase::changeFrac(bool cond)
+Changer MetricsBase::changeFrac()
 {
        switch (font.style()) {
        case LM_ST_DISPLAY:
-               return font.changeStyle(LM_ST_TEXT, cond);
+               return font.changeStyle(LM_ST_TEXT);
        case LM_ST_TEXT:
-               return font.changeStyle(LM_ST_SCRIPT, cond);
+               return font.changeStyle(LM_ST_SCRIPT);
        case LM_ST_SCRIPT:
        case LM_ST_SCRIPTSCRIPT:
-               return font.changeStyle(LM_ST_SCRIPTSCRIPT, cond);
+               return font.changeStyle(LM_ST_SCRIPTSCRIPT);
        }
        //remove Warning
        return Changer();
 }
 
 
+Changer MetricsBase::changeArray()
+{
+       return (font.style() == LM_ST_DISPLAY) ? font.changeStyle(LM_ST_TEXT)
+               : Changer();
+}
+
+
 } // namespace lyx