#include "LaTeXFeatures.h"
#include "InsetMathAMSArray.h"
#include "MathData.h"
-#include "MathMLStream.h"
+#include "MathStream.h"
#include "MathStream.h"
#include "MathSupport.h"
#include "support/lstrings.h"
#include "support/std_ostream.h"
-using std::string;
using std::auto_ptr;
-
namespace lyx {
using support::bformat;
-InsetMathAMSArray::InsetMathAMSArray(string const & name, int m, int n)
+InsetMathAMSArray::InsetMathAMSArray(docstring const & name, int m, int n)
: InsetMathGrid(m, n), name_(name)
{}
-InsetMathAMSArray::InsetMathAMSArray(string const & name)
+InsetMathAMSArray::InsetMathAMSArray(docstring const & name)
: InsetMathGrid(1, 1), name_(name)
{}
{
int const yy = y - dim_.ascent();
// Drawing the deco after an ArrayChanger does not work
- mathed_draw_deco(pi, x + 1, yy, 5, dim_.height(), name_left());
- mathed_draw_deco(pi, x + dim_.width() - 8, yy, 5, dim_.height(), name_right());
+ mathed_draw_deco(pi, x + 1, yy, 5, dim_.height(), from_ascii(name_left()));
+ mathed_draw_deco(pi, x + dim_.width() - 8, yy, 5, dim_.height(), from_ascii(name_right()));
ArrayChanger dummy(pi.base);
InsetMathGrid::drawWithMargin(pi, x, y, 6, 8);
}
docstring const & s = cmd.argument();
if (s == "add-vline-left" || s == "add-vline-right") {
flag.message(bformat(
- from_utf8(N_("Can't add vertical grid lines in '%1$s'")),
- from_utf8(name_)));
+ from_utf8(N_("Can't add vertical grid lines in '%1$s'")), name_));
flag.enabled(false);
return true;
}
}
-void InsetMathAMSArray::infoize(std::ostream & os) const
+void InsetMathAMSArray::infoize(odocstream & os) const
{
- string name = name_;
+ docstring name = name_;
name[0] = support::uppercase(name[0]);
os << name << ' ';
}