cursor is no more damaging the background. L-shaped cursor is broken right now....

[lyx.git] / src / mathed / InsetMathMacro.C

diff --git a/src/mathed/InsetMathMacro.C b/src/mathed/InsetMathMacro.C
index 7a0110eea10bbb8d1b054c3f90d47ed266d57b79..bb0966d8b64720374529e30e77d3b8d9ae57ddd9 100644 (file)
--- a/src/mathed/InsetMathMacro.C
+++ b/src/mathed/InsetMathMacro.C
@@ -14,7 +14,7 @@
 #include "InsetMathMacro.h"
 #include "MathSupport.h"
 #include "MathExtern.h"
-#include "MathMLStream.h"
+#include "MathStream.h"
 
 #include "buffer.h"
 #include "cursor.h"
@@ -23,15 +23,17 @@
 #include "LaTeXFeatures.h"
 #include "frontends/Painter.h"
 
-using lyx::docstring;
+
+namespace lyx {
 
 using std::string;
 using std::max;
 using std::auto_ptr;
 using std::endl;
+using std::vector;
 
 
-MathMacro::MathMacro(string const & name, int numargs)
+MathMacro::MathMacro(docstring const & name, int numargs)
        : InsetMathNest(numargs), name_(name)
 {}
 
@@ -42,18 +44,18 @@ auto_ptr<InsetBase> MathMacro::doClone() const
 }
 
 
-string MathMacro::name() const
+docstring MathMacro::name() const
 {
        return name_;
 }
 
 
-void MathMacro::cursorPos(CursorSlice const & sl, bool boundary, int & x,
-               int & y) const
+void MathMacro::cursorPos(BufferView const & bv,
+               CursorSlice const & sl, bool boundary, int & x, int & y) const
 {
        // We may have 0 arguments, but InsetMathNest requires at least one.
        if (nargs() > 0)
-               InsetMathNest::cursorPos(sl, boundary, x, y);
+               InsetMathNest::cursorPos(bv, sl, boundary, x, y);
 }
 
 
@@ -62,12 +64,15 @@ void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
        if (!MacroTable::globalMacros().has(name())) {
                mathed_string_dim(mi.base.font, "Unknown: " + name(), dim);
        } else if (editing(mi.base.bv)) {
+               // FIXME UNICODE
                asArray(MacroTable::globalMacros().get(name()).def(), tmpl_);
                LyXFont font = mi.base.font;
-               augmentFont(font, "lyxtex");
+               augmentFont(font, from_ascii("lyxtex"));
                tmpl_.metrics(mi, dim);
+               // FIXME UNICODE
                dim.wid += mathed_string_width(font, name()) + 10;
-               int ww = mathed_string_width(font, "#1: ");
+               // FIXME UNICODE
+               int ww = mathed_string_width(font, from_ascii("#1: "));
                for (idx_type i = 0; i < nargs(); ++i) {
                        MathArray const & c = cell(i);
                        c.metrics(mi);
@@ -86,24 +91,25 @@ void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
 void MathMacro::draw(PainterInfo & pi, int x, int y) const
 {
        if (!MacroTable::globalMacros().has(name())) {
+               // FIXME UNICODE
                drawStrRed(pi, x, y, "Unknown: " + name());
        } else if (editing(pi.base.bv)) {
                LyXFont font = pi.base.font;
-               augmentFont(font, "lyxtex");
+               augmentFont(font, from_ascii("lyxtex"));
                int h = y - dim_.ascent() + 2 + tmpl_.ascent();
-               docstring dn(name().begin(), name().end());
-               pi.pain.text(x + 3, h, dn, font);
+               pi.pain.text(x + 3, h, name(), font);
                int const w = mathed_string_width(font, name());
                tmpl_.draw(pi, x + w + 12, h);
                h += tmpl_.descent();
                Dimension ldim;
-               mathed_string_dim(font, "#1: ", ldim);
+               string t = "#1: ";
+               mathed_string_dim(font, name(), ldim);
                for (idx_type i = 0; i < nargs(); ++i) {
                        MathArray const & c = cell(i);
                        h += max(c.ascent(), ldim.asc) + 5;
                        c.draw(pi, x + ldim.wid, h);
-                       lyx::char_type str[] = { '#', '1', ':', '\0' };
-                       str[1] += static_cast<lyx::char_type>(i);
+                       char_type str[] = { '#', '1', ':', '\0' };
+                       str[1] += static_cast<char_type>(i);
                        pi.pain.text(x + 3, h, str, font);
                        h += max(c.descent(), ldim.des) + 5;
                }
@@ -125,7 +131,7 @@ void MathMacro::drawSelection(PainterInfo & pi, int x, int y) const
 void MathMacro::validate(LaTeXFeatures & features) const
 {
        if (name() == "binom" || name() == "mathcircumflex")
-               features.require(name());
+               features.require(to_utf8(name()));
 }
 
 
@@ -150,21 +156,21 @@ InsetBase * MathMacro::editXY(LCursor & cur, int x, int y)
 void MathMacro::maple(MapleStream & os) const
 {
        updateExpansion();
-       ::maple(expanded_, os);
+       lyx::maple(expanded_, os);
 }
 
 
-void MathMacro::mathmlize(MathMLStream & os) const
+void MathMacro::mathmlize(MathStream & os) const
 {
        updateExpansion();
-       ::mathmlize(expanded_, os);
+       lyx::mathmlize(expanded_, os);
 }
 
 
 void MathMacro::octave(OctaveStream & os) const
 {
        updateExpansion();
-       ::octave(expanded_, os);
+       lyx::octave(expanded_, os);
 }
 
 
@@ -174,14 +180,17 @@ void MathMacro::updateExpansion() const
 }
 
 
-void MathMacro::infoize(std::ostream & os) const
+void MathMacro::infoize(odocstream & os) const
 {
        os << "Macro: " << name();
 }
 
 
-void MathMacro::infoize2(std::ostream & os) const
+void MathMacro::infoize2(odocstream & os) const
 {
        os << "Macro: " << name();
 
 }
+
+
+} // namespace lyx