Revert "DocBook: make openParTag/closeTag use paragraphs instead of layouts."

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

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index 7a0cfb09c18e616750bc9603fb13fa686f76f24c..0349c69ee5f158a04997a38b5cb10cbccf272a3f 100644 (file)
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -27,6 +27,7 @@
 #include "support/lassert.h"
 #include "support/lstrings.h"
 
+#include <algorithm>
 #include <ostream>
 
 using namespace lyx::support;
@@ -37,7 +38,7 @@ namespace lyx {
 
 
 InsetMathDecoration::InsetMathDecoration(Buffer * buf, latexkeys const * key)
-       : InsetMathNest(buf, 1), key_(key), dh_(0), dy_(0), dw_(0)
+       : InsetMathNest(buf, 1), key_(key)
 {
 //     lyxerr << " creating deco " << key->name << endl;
 }
@@ -55,11 +56,11 @@ bool InsetMathDecoration::upper() const
 }
 
 
-bool InsetMathDecoration::isScriptable() const
+MathClass InsetMathDecoration::mathClass() const
 {
-       return
-                       key_->name == "overbrace" ||
-                       key_->name == "underbrace";
+       if (key_->name == "overbrace" || key_->name == "underbrace")
+               return MC_OP;
+       return MC_ORD;
 }
 
 
@@ -105,10 +106,7 @@ InsetMath::mode_type InsetMathDecoration::currentMode() const
 
 void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       Changer dummy =
-               (currentMode() == MATH_MODE) ? mi.base.changeEnsureMath() :
-               (isMathFont(mi.base.fontname)) ? mi.base.changeFontSet("textnormal")
-               : Changer();
+       Changer dummy = mi.base.changeEnsureMath(currentMode());
 
        cell(0).metrics(mi, dim);
 
@@ -122,27 +120,20 @@ void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
                dy_ = dim.des + 1;
                dim.des += dh_ + 2;
        }
-
-       metricsMarkers(mi, dim);
 }
 
 
 void InsetMathDecoration::draw(PainterInfo & pi, int x, int y) const
 {
-       Changer dummy =
-               (currentMode() == MATH_MODE) ? pi.base.changeEnsureMath() :
-               (isMathFont(pi.base.fontname)) ? pi.base.changeFontSet("textnormal")
-               : Changer();
+       Changer dummy = pi.base.changeEnsureMath(currentMode());
 
-       cell(0).draw(pi, x + 1, y);
+       cell(0).draw(pi, x, y);
        Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
        if (wide())
                mathed_draw_deco(pi, x + 1, y + dy_, dim0.wid, dh_, key_->name);
        else
                mathed_draw_deco(pi, x + 1 + (dim0.wid - dw_) / 2,
                        y + dy_, dw_, dh_, key_->name);
-       drawMarkers(pi, x, y);
-       setPosCache(pi, x, y);
 }
 
 
@@ -154,6 +145,7 @@ void InsetMathDecoration::write(WriteStream & os) const
        os << '\\' << key_->name << '{';
        ModeSpecifier specifier(os, currentMode());
        os << cell(0) << '}';
+       writeLimits(os);
 }
 
 
@@ -172,45 +164,46 @@ void InsetMathDecoration::infoize(odocstream & os) const
 namespace {
        struct Attributes {
                Attributes() : over(false) {}
-               Attributes(bool o, string t)
-                       : over(o), tag(t) {}
+               Attributes(bool o, string const & t, string const & entity)
+                       : over(o), tag(t), entity(entity) {}
                bool over;
                string tag;
+               string entity;
        };
 
        typedef map<string, Attributes> TranslationMap;
 
        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;");
-               t["breve"] = Attributes(true, "&breve;");
-               t["check"] = Attributes(true, "&caron;");
-               t["ddddot"] = Attributes(true, "&DotDot;");
-               t["dddot"] = Attributes(true, "&TripleDot;");
-               t["ddot"] = Attributes(true, "&Dot;");
-               t["dot"] = Attributes(true, "&dot;");
-               t["grave"] = Attributes(true, "&grave;");
-               t["hat"] = Attributes(true, "&circ;");
-               t["mathring"] = Attributes(true, "&ring;");
-               t["overbrace"] = Attributes(true, "&OverBrace;");
-               t["overleftarrow"] = Attributes(true, "&xlarr;");
-               t["overleftrightarrow"] = Attributes(true, "&xharr;");
-               t["overline"] = Attributes(true, "&macr;");
-               t["overrightarrow"] = Attributes(true, "&xrarr;");
-               t["tilde"] = Attributes(true, "&tilde;");
-               t["underbar"] = Attributes(false, "&UnderBar;");
-               t["underbrace"] = Attributes(false, "&UnderBrace;");
-               t["underleftarrow"] = Attributes(false, "&xlarr;");
-               t["underleftrightarrow"] = Attributes(false, "&xharr;");
+               t["acute"] = Attributes(true, "&acute;", "&#x00B4;");
+               t["bar"]   = Attributes(true, "&OverBar;", "&#x00AF;");
+               t["breve"] = Attributes(true, "&breve;", "&#x02D8;");
+               t["check"] = Attributes(true, "&caron;", "&#x02C7;");
+               t["ddddot"] = Attributes(true, "&DotDot;", "&#x20DC;");
+               t["dddot"] = Attributes(true, "&TripleDot;", "&#x20DB;");
+               t["ddot"] = Attributes(true, "&Dot;", "&#x00A8;");
+               t["dot"] = Attributes(true, "&dot;", "&#x02D9;");
+               t["grave"] = Attributes(true, "&grave;", "&#x0060;");
+               t["hat"] = Attributes(true, "&circ;", "&#x02C6;");
+               t["mathring"] = Attributes(true, "&ring;", "&#x02DA;");
+               t["overbrace"] = Attributes(true, "&OverBrace;", "&#xFE37;");
+               t["overleftarrow"] = Attributes(true, "&xlarr;", "&#x27F5;");
+               t["overleftrightarrow"] = Attributes(true, "&xharr;", "&#x27F7;");
+               t["overline"] = Attributes(true, "&macr;", "&#x00AF;");
+               t["overrightarrow"] = Attributes(true, "&xrarr;", "&#x27F6;");
+               t["tilde"] = Attributes(true, "&tilde;", "&#x02DC;");
+               t["underbar"] = Attributes(false, "&UnderBar;", "&#x0332;");
+               t["underbrace"] = Attributes(false, "&UnderBrace;", "&#xFE38;");
+               t["underleftarrow"] = Attributes(false, "&xlarr;", "&#x27F5;");
+               t["underleftrightarrow"] = Attributes(false, "&xharr;", "&#x27F7;");
                // 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;");
+               t["underline"] = Attributes(false, "&macr;", "&#x00AF;");
+               t["underrightarrow"] = Attributes(false, "&xrarr;", "&#x27F6;");
+               t["undertilde"] = Attributes(false, "&Tilde;", "&#x223C;");
+               t["utilde"] = Attributes(false, "&Tilde;", "&#x223C;");
+               t["vec"] = Attributes(true, "&rarr;", "&#x2192;");
+               t["widehat"] = Attributes(true, "&Hat;", "&#x005E;");
+               t["widetilde"] = Attributes(true, "&Tilde;", "&#x223C;");
        }
 
        TranslationMap const & translationMap() {
@@ -219,18 +212,21 @@ namespace {
                        buildTranslationMap(t);
                return t;
        }
-}
+} // namespace
 
-void InsetMathDecoration::mathmlize(MathStream & os) const
+void InsetMathDecoration::mathmlize(MathStream & ms) const
 {
        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)
-                << MTag("mrow") << cell(0) << ETag("mrow")
-                << from_ascii("<mo stretchy=\"true\">" + cur->second.tag + "</mo>")
-                << ETag(outag);
+       std::string decoration = ms.xmlMode() ? cur->second.entity : cur->second.tag;
+       ms << MTag(outag)
+          << MTag("mrow") << cell(0) << ETag("mrow")
+          << "<" << from_ascii(ms.namespacedTag("mo")) << " stretchy=\"true\">"
+          << from_ascii(decoration)
+          << "</" << from_ascii(ms.namespacedTag("mo")) << ">"
+          << ETag(outag);
 }
 
 
@@ -287,8 +283,8 @@ void InsetMathDecoration::validate(LaTeXFeatures & features) const
                                "span.symbol{height: 0.5ex;}");
                }
        } else {
-               if (!key_->requires.empty())
-                       features.require(key_->requires);
+               if (!key_->required.empty())
+                       features.require(key_->required);
        }
        InsetMathNest::validate(features);
 }