#include <config.h>
#include "InsetMath.h"
-#include "MathArray.h"
+#include "MathData.h"
#include "MathStream.h"
-#include "gettext.h"
-#include "debug.h"
+#include "support/gettext.h"
+#include "support/debug.h"
+#include "support/docstream.h"
#include "support/lstrings.h"
#include "support/textutils.h"
-#include <boost/current_function.hpp>
+#include <boost/assert.hpp>
-using std::endl;
+using namespace std;
namespace lyx {
-
-
-MathArray & InsetMath::cell(idx_type)
+MathData & InsetMath::cell(idx_type)
{
- static MathArray dummyCell;
- lyxerr << BOOST_CURRENT_FUNCTION << ": I don't have any cell" << endl;
+ static MathData dummyCell;
+ LYXERR0("I don't have any cell");
return dummyCell;
}
-MathArray const & InsetMath::cell(idx_type) const
+MathData const & InsetMath::cell(idx_type) const
{
- static MathArray dummyCell;
- lyxerr << BOOST_CURRENT_FUNCTION << ": I don't have any cell" << endl;
+ static MathData dummyCell;
+ LYXERR0("I don't have any cell");
return dummyCell;
}
void InsetMath::metricsT(TextMetricsInfo const &, Dimension &) const
{
-#ifdef WITH_WARNINGS
- lyxerr << "InsetMath::metricsT(Text) called directly!" << endl;
-#endif
+ LYXERR0("InsetMath::metricsT(Text) called directly!");
}
void InsetMath::drawT(TextPainter &, int, int) const
{
-#ifdef WITH_WARNINGS
- lyxerr << "InsetMath::drawT(Text) called directly!" << endl;
-#endif
+ LYXERR0("InsetMath::drawT(Text) called directly!");
}
-
void InsetMath::write(WriteStream & os) const
{
docstring const s = name();
int InsetMath::plaintext(Buffer const &, odocstream &,
- OutputParams const &) const
+ OutputParams const &) const
{
// all math plain text output shall take place in InsetMathHull
BOOST_ASSERT(false);
void InsetMath::mathmlize(MathStream & os) const
{
- NormalStream ns(os.os());
- normalize(ns);
+ NormalStream ns(os.os());
+ normalize(ns);
}
}
-docstring InsetMath::name() const
-{
- return from_ascii("unknown");
-}
-
-
-std::ostream & operator<<(std::ostream & os, MathAtom const & at)
+ostream & operator<<(ostream & os, MathAtom const & at)
{
odocstringstream oss;
WriteStream wi(oss, false, false);