X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMath.cpp;h=a4e310fc6ec42e09068c48a1caeaf6f4b9797341;hb=c56d524cd6af5d0ed0d50fef51ab434ce418d1e0;hp=dce8d598923f3d2be916bae4922a0b8b1a2aad20;hpb=90837aaf6eee523fd594c0ea7f44c053bb49a3cf;p=lyx.git diff --git a/src/mathed/InsetMath.cpp b/src/mathed/InsetMath.cpp index dce8d59892..a4e310fc6e 100644 --- a/src/mathed/InsetMath.cpp +++ b/src/mathed/InsetMath.cpp @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Alejandro Aguilar Sierra - * \author André Pönitz + * \author André Pönitz * * Full author contact details are available in file CREDITS. */ @@ -27,9 +27,15 @@ using namespace std; namespace lyx { +docstring InsetMath::name() const +{ + return from_utf8("Unknown"); +} + + MathData & InsetMath::cell(idx_type) { - static MathData dummyCell; + static MathData dummyCell(&buffer()); LYXERR0("I don't have any cell"); return dummyCell; } @@ -47,7 +53,7 @@ void InsetMath::dump() const { lyxerr << "---------------------------------------------" << endl; odocstringstream os; - WriteStream wi(os, false, true, false); + WriteStream wi(os, false, true, WriteStream::wsDefault); write(wi); lyxerr << to_utf8(os.str()); lyxerr << "\n---------------------------------------------" << endl; @@ -68,23 +74,18 @@ void InsetMath::drawT(TextPainter &, int, int) const void InsetMath::write(WriteStream & os) const { - bool brace = os.pendingBrace(); - os.pendingBrace(false); - if (os.latex() && os.textMode()) { - os << "\\ensuremath{"; - os.textMode(false); - } + MathEnsurer ensurer(os); docstring const s = name(); os << "\\" << s; // We need an extra ' ' unless this is a single-char-non-ASCII name // or anything non-ASCII follows if (s.size() != 1 || isAlphaASCII(s[0])) os.pendingSpace(true); - os.pendingBrace(brace); } -int InsetMath::plaintext(odocstream &, OutputParams const &) const +int InsetMath::plaintext(odocstringstream &, + OutputParams const &, size_t) const { // all math plain text output shall take place in InsetMathHull LASSERT(false, /**/); @@ -128,8 +129,21 @@ void InsetMath::mathematica(MathematicaStream & os) const void InsetMath::mathmlize(MathStream & os) const { + os << ""; + os << MTag("mi"); + NormalStream ns(os.os()); + normalize(ns); + os << ETag("mi"); +} + + +void InsetMath::htmlize(HtmlStream & os) const +{ + os << ""; + os << MTag("span", "style='color: red;'"); NormalStream ns(os.os()); normalize(ns); + os << ETag("span"); } @@ -142,7 +156,7 @@ HullType InsetMath::getType() const ostream & operator<<(ostream & os, MathAtom const & at) { odocstringstream oss; - WriteStream wi(oss, false, false, false); + WriteStream wi(oss, false, false, WriteStream::wsDefault); at->write(wi); return os << to_utf8(oss.str()); } @@ -150,7 +164,7 @@ ostream & operator<<(ostream & os, MathAtom const & at) odocstream & operator<<(odocstream & os, MathAtom const & at) { - WriteStream wi(os, false, false, false); + WriteStream wi(os, false, false, WriteStream::wsDefault); at->write(wi); return os; }