Fix misparsing of alternative simple formulas

[lyx.git] / src / mathed / InsetMathDecoration.cpp

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index 4077afbfc847b5f6fa668eda6a9dd53b464b69a9..b9202f5d6394bbf5cc0e1d7623916d60f023c65b 100644 (file)
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -22,6 +22,7 @@
 #include "LaTeXFeatures.h"
 
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/lassert.h"
 
 #include <ostream>
@@ -46,7 +47,7 @@ Inset * InsetMathDecoration::clone() const
 
 bool InsetMathDecoration::upper() const
 {
-       return key_->name.substr(0, 5) != "under";
+       return key_->name.substr(0, 5) != "under" && key_->name != "utilde";
 }
 
 
@@ -92,12 +93,24 @@ bool InsetMathDecoration::wide() const
                        key_->name == "widetilde" ||
                        key_->name == "underleftarrow" ||
                        key_->name == "underrightarrow" ||
-                       key_->name == "underleftrightarrow";
+                       key_->name == "underleftrightarrow" ||
+                       key_->name == "undertilde" ||
+                       key_->name == "utilde";
+}
+
+
+InsetMath::mode_type InsetMathDecoration::currentMode() const
+{
+       return key_->name == "underbar" ? TEXT_MODE : MATH_MODE;
 }
 
 
 void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+       bool really_change_font = currentMode() == TEXT_MODE
+                               && isMathFont(from_ascii(mi.base.fontname));
+       FontSetChanger dummy(mi.base, "textnormal", really_change_font);
+
        cell(0).metrics(mi, dim);
 
        dh_  = 6; //mathed_char_height(LM_TC_VAR, mi, 'I', ascent_, descent_);
@@ -117,6 +130,10 @@ void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetMathDecoration::draw(PainterInfo & pi, int x, int y) const
 {
+       bool really_change_font = currentMode() == TEXT_MODE
+                               && isMathFont(from_ascii(pi.base.fontname));
+       FontSetChanger dummy(pi.base, "textnormal", really_change_font);
+
        cell(0).draw(pi, x + 1, y);
        Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
        if (wide())
@@ -134,7 +151,9 @@ void InsetMathDecoration::write(WriteStream & os) const
        MathEnsurer ensurer(os);
        if (os.fragile() && protect())
                os << "\\protect";
-       os << '\\' << key_->name << '{' << cell(0) << '}';
+       os << '\\' << key_->name << '{';
+       ModeSpecifier specifier(os, currentMode());
+       os << cell(0) << '}';
 }
 
 
@@ -159,9 +178,9 @@ namespace {
                string tag;
        };
 
-       typedef map<string, Attributes> Translator;
+       typedef map<string, Attributes> TranslationMap;
 
-       void buildTranslator(Translator & t) {
+       void buildTranslationMap(TranslationMap & t) {
                // the decorations we need to support are listed in lib/symbols
                t["acute"] = Attributes(true, "&acute;");
                t["bar"]   = Attributes(true, "&OverBar;");
@@ -187,23 +206,25 @@ namespace {
                // this is the macron, again, but it works
                t["underline"] = Attributes(false, "&macr;");
                t["underrightarrow"] = Attributes(false, "&xrarr;");
+               t["undertilde"] = Attributes(false, "&Tilde;");
+               t["utilde"] = Attributes(false, "&Tilde;");
                t["vec"] = Attributes(true, "&rarr;");
                t["widehat"] = Attributes(true, "&Hat;");
                t["widetilde"] = Attributes(true, "&Tilde;");
        }
 
-       Translator const & translator() {
-               static Translator t;
+       TranslationMap const & translationMap() {
+               static TranslationMap t;
                if (t.empty())
-                       buildTranslator(t);
+                       buildTranslationMap(t);
                return t;
        }
 }
 
 void InsetMathDecoration::mathmlize(MathStream & os) const
 {
-       Translator const & t = translator();
-       Translator::const_iterator cur = t.find(to_utf8(key_->name));
+       TranslationMap const & t = translationMap();
+       TranslationMap::const_iterator cur = t.find(to_utf8(key_->name));
        LASSERT(cur != t.end(), return);
        char const * const outag = cur->second.over ? "mover" : "munder";
        os << MTag(outag)
@@ -215,9 +236,21 @@ void InsetMathDecoration::mathmlize(MathStream & os) const
 
 void InsetMathDecoration::htmlize(HtmlStream & os) const
 {
-       Translator const & t = translator();
-       Translator::const_iterator cur = t.find(to_utf8(key_->name));
+       string const name = to_utf8(key_->name);
+       if (name == "bar") {
+               os << MTag("span", "class='overbar'") << cell(0) << ETag("span");
+               return;
+       }
+       
+       if (name == "underbar" || name == "underline") {
+               os << MTag("span", "class='underbar'") << cell(0) << ETag("span");
+               return;
+       }
+
+       TranslationMap const & t = translationMap();
+       TranslationMap::const_iterator cur = t.find(name);
        LASSERT(cur != t.end(), return);
+       
        bool symontop = cur->second.over;
        string const symclass = symontop ? "symontop" : "symonbot";
        os << MTag("span", "class='symbolpair " + symclass + "'")
@@ -239,14 +272,20 @@ void InsetMathDecoration::htmlize(HtmlStream & os) const
 // ideas borrowed from the eLyXer code
 void InsetMathDecoration::validate(LaTeXFeatures & features) const
 {
-       if (features.runparams().flavor == OutputParams::HTML) {
-               features.addPreambleSnippet("<style type=\"text/css\">\n"
-                       "span.symbolpair{display: inline-block; text-align:center;}\n"
-                       "span.symontop{vertical-align: top;}\n"
-                       "span.symonbot{vertical-align: bottom;}\n"
-                       "span.symbolpair span{display: block;}\n"                       
-                       "span.symbol{height: 0.5ex;}\n"
-                       "</style>");
+       if (features.runparams().math_flavor == OutputParams::MathAsHTML) {
+               string const name = to_utf8(key_->name);
+               if (name == "bar") {
+                       features.addCSSSnippet("span.overbar{border-top: thin black solid;}");
+               } else if (name == "underbar" || name == "underline") {
+                       features.addCSSSnippet("span.underbar{border-bottom: thin black solid;}");
+               } else {
+                       features.addCSSSnippet(
+                               "span.symbolpair{display: inline-block; text-align:center;}\n"
+                               "span.symontop{vertical-align: top;}\n"
+                               "span.symonbot{vertical-align: bottom;}\n"
+                               "span.symbolpair span{display: block;}\n"                       
+                               "span.symbol{height: 0.5ex;}");
+               }
        } else {
                if (!key_->requires.empty())
                        features.require(to_utf8(key_->requires));