Account for old versions of Pygments

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

diff --git a/src/mathed/InsetMathDots.cpp b/src/mathed/InsetMathDots.cpp
index 7bbfa0b3e02b23700122b4acfbb07f38023fdea7..8c4bd8374b3f35b84cdf06d44f23436c39278ed7 100644 (file)
--- a/src/mathed/InsetMathDots.cpp
+++ b/src/mathed/InsetMathDots.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,18 +13,20 @@
 
 #include "InsetMathDots.h"
 
+#include "Dimension.h"
+#include "LaTeXFeatures.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "MathParser.h"
 #include "MetricsInfo.h"
 
 #include "frontends/FontMetrics.h"
-
+#include "support/lassert.h"
 
 namespace lyx {
 
 InsetMathDots::InsetMathDots(latexkeys const * key)
-       : key_(key)
+       : dh_(0), key_(key)
 {}
 
 
@@ -47,25 +49,26 @@ void InsetMathDots::metrics(MetricsInfo & mi, Dimension & dim) const
                dim.wid = (dim.wid / 2) + 1;
                dh_ = dim.asc;
        }
-       else if (key_->name == "ddots")
+       else if (key_->name == "ddots" || key_->name == "adots" || key_->name == "iddots")
                dh_ = dim.asc;
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 
-void InsetMathDots::draw(PainterInfo & pain, int x, int y) const
+void InsetMathDots::draw(PainterInfo & pi, int x, int y) const
 {
-       Dimension const dim = dimension(*pain.base.bv);
-       mathed_draw_deco(pain, x + 2, y - dh_, dim.width() - 2, dim.ascent(),
-               key_->name);
-       if (key_->name == "vdots" || key_->name == "ddots")
+       Dimension const dim = dimension(*pi.base.bv);
+       if (key_->name == "adots" || key_->name == "iddots")
+               --y;
+       mathed_draw_deco(pi, x + 2, y - dh_, dim.width() - 2, dim.ascent(),
+                       key_->name);
+       if (key_->name == "vdots" || key_->name == "ddots" || key_->name == "adots" || key_->name == "iddots")
                ++x;
-       if (key_->name != "vdots")
+       if (key_->name == "adots" || key_->name == "iddots")
+               ++y;
+       else if (key_->name != "vdots")
                --y;
-       mathed_draw_deco(pain, x + 2, y - dh_, dim.width() - 2, dim.ascent(),
+       mathed_draw_deco(pi, x + 2, y - dh_, dim.width() - 2, dim.ascent(),
                key_->name);
-       setPosCache(pain, x, y);
 }
 
 
@@ -75,4 +78,54 @@ docstring InsetMathDots::name() const
 }
 
 
+void InsetMathDots::validate(LaTeXFeatures & features) const
+{
+       if (!key_->requires.empty())
+               features.require(key_->requires);
+}
+
+
+void InsetMathDots::mathmlize(MathStream & os) const
+{
+       // which symbols we support is decided by what is listed in
+       // lib/symbols as generating a dots inset
+       docstring const & n = key_->name;
+       std::string ent;
+       if (n == "dots" || n == "dotsc" || n == "dotso" || n == "ldots")
+               ent = "…";
+       else if (n == "adots" || n == "iddots")
+               ent = "⋰";
+       else if (n == "cdots" || n == "dotsb" || n == "dotsi" || n == "dotsm")
+               ent = "⋯";
+       else if (n == "ddots")
+               ent = "⋱";
+       else if (n == "vdots")
+               ent = "⋮";
+       else
+               LASSERT(false, ent = "…");
+       os << MTag("mi") << from_ascii(ent) << ETag("mi");
+}
+
+
+void InsetMathDots::htmlize(HtmlStream & os) const
+{
+       // which symbols we support is decided by what is listed in
+       // lib/symbols as generating a dots inset
+       docstring const & n = key_->name;
+       std::string ent;
+       if (n == "dots" || n == "dotsc" || n == "dotso" || n == "ldots")
+               ent = "&#x02026;";
+       else if (n == "adots" || n == "iddots")
+               ent = "&#x022F0;";
+       else if (n == "cdots" || n == "dotsb" || n == "dotsi" || n == "dotsm")
+               ent = "&#x022EF;";
+       else if (n == "ddots")
+               ent = "&#x022F1;";
+       else if (n == "vdots")
+               ent = "&#x022EE;";
+       else
+               LASSERT(false, ent = "#x02026;");
+       os << from_ascii(ent);
+}
+
 } // namespace lyx