Account for old versions of Pygments

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

diff --git a/src/mathed/MathMacroArgument.cpp b/src/mathed/MathMacroArgument.cpp
index 68f4f98452ede5482bc22278af1863aa023d691f..d3a16ff8d9af6ab88e87236d0bdac06a14b5d487 100644 (file)
--- a/src/mathed/MathMacroArgument.cpp
+++ b/src/mathed/MathMacroArgument.cpp
@@ -16,15 +16,49 @@
 #include "MathSupport.h"
 
 #include "support/debug.h"
+#include "support/lassert.h"
 
 
 namespace lyx {
 
+
+Inset * InsetMathHash::clone() const
+{
+       return new InsetMathHash(*this);
+}
+
+
+void InsetMathHash::write(WriteStream & os) const
+{
+       os << str_;
+}
+
+
+void InsetMathHash::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+       metricsStrRedBlack(mi, dim, str_);
+}
+
+
+void InsetMathHash::draw(PainterInfo & pi, int x, int y) const
+{
+       drawStrRed(pi, x, y, str_);
+}
+
+
+void InsetMathHash::normalize(NormalStream & os) const
+{
+       os << "[hash " << str_ << "] ";
+}
+
+
 MathMacroArgument::MathMacroArgument(int n)
        : number_(n)
 {
        if (n < 1 || n > 9) {
-               LYXERR0("MathMacroArgument::MathMacroArgument: wrong Argument id: " << n);
+               LYXERR0("MathMacroArgument::MathMacroArgument: wrong Argument id: "
+                       << n);
+               LASSERT(false, n = 1);
        }
 
        // The profiler tells us not to use
@@ -32,7 +66,6 @@ MathMacroArgument::MathMacroArgument(int n)
        // so we do the conversion of n to ASCII manually.
        // This works because 1 <= n <= 9.
        str_.resize(2);
-       str_[0] = '#';
        str_[1] = '0' + n;
 }
 
@@ -47,6 +80,7 @@ void MathMacroArgument::setNumber(int n)
 {
        if (n < 1 || n > 9) {
                LYXERR0("MathMacroArgument::setNumber: wrong Argument id: " << n);
+               LASSERT(false, return);
        }
 
        number_ = n;
@@ -54,25 +88,6 @@ void MathMacroArgument::setNumber(int n)
 }
 
 
-void MathMacroArgument::write(WriteStream & os) const
-{
-       os << str_;
-}
-
-
-void MathMacroArgument::metrics(MetricsInfo & mi, Dimension & dim) const
-{
-       mathed_string_dim(mi.base.font, str_, dim);
-}
-
-
-void MathMacroArgument::draw(PainterInfo & pi, int x, int y) const
-{
-       drawStrRed(pi, x, y, str_);
-       setPosCache(pi, x, y);
-}
-
-
 void MathMacroArgument::normalize(NormalStream & os) const
 {
        os << "[macroarg " << str_ << "] ";