Fix horizontal lines in math arrays

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

diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp
index 4b68626062e59225208915ce1d90545d4a766bb7..5fbba55656435865580fb19febf85b52c6d1845b 100644 (file)
--- a/src/mathed/MathMacroTemplate.cpp
+++ b/src/mathed/MathMacroTemplate.cpp
@@ -13,8 +13,6 @@
 
 #include "MathMacroTemplate.h"
 
-#include "DocIterator.h"
-#include "LaTeXFeatures.h"
 #include "InsetMathBrace.h"
 #include "InsetMathChar.h"
 #include "InsetMathHull.h"
@@ -31,9 +29,12 @@
 #include "Color.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
+#include "DocIterator.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "LaTeXFeatures.h"
 #include "Lexer.h"
+#include "MetricsInfo.h"
 #include "TocBackend.h"
 
 #include "frontends/Painter.h"
@@ -542,7 +543,7 @@ void MathMacroTemplate::createLook(int args) const
 
 void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       Changer dummy1 = mi.base.changeFontSet(from_ascii("mathnormal"));
+       Changer dummy1 = mi.base.changeFontSet("mathnormal");
        Changer dummy2 = mi.base.changeStyle(LM_ST_TEXT);
 
        // valid macro?
@@ -586,7 +587,7 @@ void MathMacroTemplate::draw(PainterInfo & pi, int x, int y) const
 {
        // FIXME: Calling Changer on the same object repeatedly is inefficient.
        Changer dummy0 = pi.base.font.changeColor(Color_math);
-       Changer dummy1 = pi.base.changeFontSet(from_ascii("mathnormal"));
+       Changer dummy1 = pi.base.changeFontSet("mathnormal");
        Changer dummy2 = pi.base.changeStyle(LM_ST_TEXT);
 
        setPosCache(pi, x, y);
@@ -1171,8 +1172,7 @@ void MathMacroTemplate::read(Lexer & lex)
 void MathMacroTemplate::write(ostream & os) const
 {
        odocstringstream oss;
-       TexRow texrow(false);
-       otexrowstream ots(oss,texrow);
+       otexrowstream ots(oss);
        WriteStream wi(ots, false, false, WriteStream::wsDefault);
        oss << "FormulaMacro\n";
        write(wi);