#include <config.h>
#include "InsetMathHull.h"
-
#include "InsetMathChar.h"
#include "InsetMathColor.h"
#include "InsetMathFrac.h"
#include "BufferParams.h"
#include "BufferView.h"
#include "ColorSet.h"
+#include "Cursor.h"
#include "CutAndPaste.h"
#include "Encoding.h"
#include "Exporter.h"
#include "InsetMathMacro.h"
#include "InsetMathMacroTemplate.h"
#include "MetricsInfo.h"
-#include "output_xhtml.h"
#include "Paragraph.h"
#include "ParIterator.h"
-#include "sgml.h"
+#include "xml.h"
#include "TexRow.h"
#include "TextClass.h"
#include "TextPainter.h"
#include "insets/InsetRef.h"
#include "insets/RenderPreview.h"
-#include "graphics/GraphicsImage.h"
#include "graphics/PreviewImage.h"
#include "graphics/PreviewLoader.h"
#include "frontends/alert.h"
+#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
#include "support/convert.h"
#include "support/filetools.h"
#include "support/lassert.h"
#include "support/lstrings.h"
-#include "support/RefChanger.h"
+#include "support/Changer.h"
#include <sstream>
// writes a preamble for underlined or struck out math display
- void writeMathdisplayPreamble(WriteStream & os)
+ void writeMathdisplayPreamble(TeXMathStream & os)
{
- if (os.strikeoutMath()) {
- if (os.ulemCmd() == WriteStream::UNDERLINE)
- os << "\\raisebox{-\\belowdisplayshortskip}{"
- "\\lyxmathsout{\\parbox[b]{\\linewidth}{";
- else
- os << "\\lyxmathsout{\\parbox{\\linewidth}{";
- } else if (os.ulemCmd() == WriteStream::UNDERLINE)
+ if (os.strikeoutMath())
+ return;
+
+ if (os.ulemCmd() == TeXMathStream::UNDERLINE)
os << "\\raisebox{-\\belowdisplayshortskip}{"
"\\parbox[b]{\\linewidth}{";
- else if (os.ulemCmd() == WriteStream::STRIKEOUT)
+ else if (os.ulemCmd() == TeXMathStream::STRIKEOUT)
os << "\\parbox{\\linewidth}{";
}
// writes a postamble for underlined or struck out math display
- void writeMathdisplayPostamble(WriteStream & os)
+ void writeMathdisplayPostamble(TeXMathStream & os)
{
- if (os.strikeoutMath()) {
- if (os.ulemCmd() == WriteStream::UNDERLINE)
- os << "}";
- os << "}}\\\\\n";
- } else if (os.ulemCmd() == WriteStream::UNDERLINE)
+ if (os.strikeoutMath())
+ return;
+
+ if (os.ulemCmd() == TeXMathStream::UNDERLINE)
os << "}}\\\\\n";
- else if (os.ulemCmd() == WriteStream::STRIKEOUT)
+ else if (os.ulemCmd() == TeXMathStream::STRIKEOUT)
os << "}\\\\\n";
}
-
} // namespace
-HullType hullType(docstring const & s)
-{
- if (s == "none") return hullNone;
- if (s == "simple") return hullSimple;
- if (s == "equation") return hullEquation;
- if (s == "eqnarray") return hullEqnArray;
- if (s == "align") return hullAlign;
- if (s == "alignat") return hullAlignAt;
- if (s == "xalignat") return hullXAlignAt;
- if (s == "xxalignat") return hullXXAlignAt;
- if (s == "multline") return hullMultline;
- if (s == "gather") return hullGather;
- if (s == "flalign") return hullFlAlign;
- if (s == "regexp") return hullRegexp;
- lyxerr << "unknown hull type '" << to_utf8(s) << "'" << endl;
- return hullUnknown;
-}
-
-
-docstring hullName(HullType type)
-{
- switch (type) {
- case hullNone: return from_ascii("none");
- case hullSimple: return from_ascii("simple");
- case hullEquation: return from_ascii("equation");
- case hullEqnArray: return from_ascii("eqnarray");
- case hullAlign: return from_ascii("align");
- case hullAlignAt: return from_ascii("alignat");
- case hullXAlignAt: return from_ascii("xalignat");
- case hullXXAlignAt: return from_ascii("xxalignat");
- case hullMultline: return from_ascii("multline");
- case hullGather: return from_ascii("gather");
- case hullFlAlign: return from_ascii("flalign");
- case hullRegexp: return from_ascii("regexp");
- case hullUnknown:
- lyxerr << "unknown hull type" << endl;
- break;
- }
- return from_ascii("none");
-}
-
static InsetLabel * dummy_pointer = 0;
InsetMathHull::InsetMathHull(Buffer * buf)
- : InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, NUMBER),
+ : InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, NONUMBER),
numbers_(1, empty_docstring()), label_(1, dummy_pointer),
preview_(new RenderPreview(this))
{
InsetMathHull::InsetMathHull(Buffer * buf, HullType type)
- : InsetMathGrid(buf, getCols(type), 1), type_(type), numbered_(1, NUMBER),
+ : InsetMathGrid(buf, getCols(type), 1), type_(type), numbered_(1, NONUMBER),
numbers_(1, empty_docstring()), label_(1, dummy_pointer),
preview_(new RenderPreview(this))
{
InsetMathHull::~InsetMathHull()
{
- for (size_t i = 0; i < label_.size(); ++i)
- delete label_[i];
+ for (auto & i : label_)
+ delete i;
}
numbered_ = other.numbered_;
numbers_ = other.numbers_;
buffer_ = other.buffer_;
- for (size_t i = 0; i < label_.size(); ++i)
- delete label_[i];
+ for (auto & i : label_)
+ delete i;
label_ = other.label_;
for (size_t i = 0; i != label_.size(); ++i) {
if (label_[i])
} // namespace
-void InsetMathHull::updateBuffer(ParIterator const & it, UpdateType utype)
+void InsetMathHull::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
{
if (!buffer_) {
//FIXME: buffer_ should be set at creation for this inset! Problem is
counter_map[eqstr] = cnts.value(eqstr);
for (size_t i = 0; i != label_.size(); ++i) {
if (numbered(i)) {
- cnts.step(eqstr, utype);
- numbers_[i] = cnts.theCounter(eqstr, lang);
+ Paragraph const & par = it.paragraph();
+ if (!par.isDeleted(it.pos())) {
+ cnts.step(eqstr, utype);
+ numbers_[i] = cnts.theCounter(eqstr, lang);
+ } else
+ numbers_[i] = from_ascii("#");
} else
numbers_[i] = empty_docstring();
}
// now the labels
for (size_t i = 0; i != label_.size(); ++i) {
if (label_[i])
- label_[i]->updateBuffer(it, utype);
+ label_[i]->updateBuffer(it, utype, deleted);
}
// pass down
- InsetMathGrid::updateBuffer(it, utype);
+ InsetMathGrid::updateBuffer(it, utype, deleted);
}
}
-bool InsetMathHull::idxFirst(Cursor & cur) const
-{
- cur.idx() = 0;
- cur.pos() = 0;
- return true;
-}
-
-
-bool InsetMathHull::idxLast(Cursor & cur) const
-{
- cur.idx() = nargs() - 1;
- cur.pos() = cur.lastpos();
- return true;
-}
-
-
// FIXME: InsetMathGrid should be changed to let the real column alignment be
// given by a virtual method like displayColAlign, because the values produced
// by defaultColAlign can be invalidated by lfuns such as add-column. For the
namespace {
-static const int ERROR_FRAME_WIDTH = 2;
+const int ERROR_FRAME_WIDTH = 2;
+
+bool previewTooSmall(Dimension const & dim)
+{
+ return dim.width() <= 10 && dim.height() <= 10;
+}
}
+
void InsetMathHull::metrics(MetricsInfo & mi, Dimension & dim) const
{
+ /* Compute \(above|below)displayskip
+ true value in LaTeX is 10pt plus 2pt minus 5pt (in normal size at 10pt)
+ But we use a fixed number of pixels and scale them with zoom.
+ */
+ int const bottom_display_margin = mi.base.bv->zoomedPixels(6);
+ int top_display_margin = bottom_display_margin;
+ // at start of paragraph, add an empty line
+ if (mi.vmode)
+ top_display_margin += theFontMetrics(mi.base.font).maxHeight() + 2;
+
if (previewState(mi.base.bv)) {
preview_->metrics(mi, dim);
if (previewTooSmall(dim)) {
dim.wid += 2 * ERROR_FRAME_WIDTH;
dim.asc += 2 * ERROR_FRAME_WIDTH;
} else {
- // insert a one pixel gap in front of the formula
- dim.wid += 1;
- if (display())
- dim.des += displayMargin();
+ // insert a gap in front of the formula
+ // value was hardcoded to 1 pixel
+ dim.wid += mi.base.bv->zoomedPixels(1) ;
+ if (display()) {
+ dim.asc += top_display_margin;
+ dim.des += bottom_display_margin;
+ }
}
return;
}
- Changer dummy1 = mi.base.changeFontSet(standardFont());
- Changer dummy2 = mi.base.font.changeStyle(display() ? LM_ST_DISPLAY
- : LM_ST_TEXT);
-
- // let the cells adjust themselves
- InsetMathGrid::metrics(mi, dim);
+ {
+ Changer dummy1 = mi.base.changeFontSet(standardFont());
+ Changer dummy2 = mi.base.font.changeStyle(display() ? DISPLAY_STYLE
+ : TEXT_STYLE);
- if (display()) {
- dim.asc += displayMargin();
- dim.des += displayMargin();
+ // let the cells adjust themselves
+ InsetMathGrid::metrics(mi, dim);
}
+ // Check whether the numbering interferes with the equations
if (numberedType()) {
- Changer dummy = mi.base.changeFontSet("mathrm");
- int l = 0;
- for (row_type row = 0; row < nrows(); ++row)
- l = max(l, mathed_string_width(mi.base.font, nicelabel(row)));
+ BufferParams::MathNumber const math_number = buffer().params().getMathNumber();
+ int extra_offset = 0;
+ for (row_type row = 0; row < nrows(); ++row) {
+ rowinfo(row).offset[mi.base.bv] += extra_offset;
+ if (!numbered(row))
+ continue;
+ docstring const nl = nicelabel(row);
+ Dimension dimnl;
+ mathed_string_dim(mi.base.font, nl, dimnl);
+ int const ind = indent(*mi.base.bv);
+ int const x = ind ? ind : (mi.base.textwidth - dim.wid) / 2;
+ // for some reason metrics does not trigger at the
+ // same point as draw, and therefore we use >= instead of >
+ if ((math_number == BufferParams::LEFT && dimnl.wid >= x)
+ || (math_number == BufferParams::RIGHT
+ && dimnl.wid >= mi.base.textwidth - x - dim.wid)) {
+ extra_offset += dimnl.height();
+ }
+ }
+ dim.des += extra_offset;
+ }
+
- if (l)
- // Value was hardcoded to 30 pixels
- dim.wid += Length(0.3, Length::IN).inPixels(mi.base) + l;
+ if (display()) {
+ dim.asc += top_display_margin;
+ dim.des += bottom_display_margin;
}
// reserve some space for marker.
dim.wid += 2;
-
- // make it at least as high as the current font
- int asc = 0;
- int des = 0;
- math_font_max_dim(mi.base.font, asc, des);
- dim.asc = max(dim.asc, asc);
- dim.des = max(dim.des, des);
-}
-
-
-bool InsetMathHull::previewTooSmall(Dimension const & dim) const
-{
- return dim.width() <= 10 && dim.height() <= 10;
}
}
+void InsetMathHull::drawMarkers(PainterInfo & pi, int x, int y) const
+{
+ ColorCode pen_color = mouseHovered(pi.base.bv) || editing(pi.base.bv)?
+ Color_mathframe : Color_mathcorners;
+ // If the corners have the same color as the background, do not paint them.
+ if (lcolor.getX11HexName(Color_mathbg) == lcolor.getX11HexName(pen_color))
+ return;
+
+ Inset::drawMarkers(pi, x, y);
+ Dimension const dim = dimension(*pi.base.bv);
+ int const t = x + dim.width() - 1;
+ int const a = y - dim.ascent();
+ pi.pain.line(x, a + 3, x, a, pen_color);
+ pi.pain.line(t, a + 3, t, a, pen_color);
+ pi.pain.line(x, a, x + 3, a, pen_color);
+ pi.pain.line(t - 3, a, t, a, pen_color);
+}
+
+
void InsetMathHull::drawBackground(PainterInfo & pi, int x, int y) const
{
Dimension const dim = dimension(*pi.base.bv);
dim.wid, dim.asc + dim.des, backgroundColor(pi));
return;
}
+ // If there are numbers, the margins around the (displayed)
+ // equation have to be cleared.
+ if (numberedType())
+ pi.pain.fillRectangle(pi.leftx, y - dim.asc,
+ pi.rightx - pi.leftx, dim.height(), pi.background_color);
pi.pain.fillRectangle(x + 1, y - dim.asc + 1, dim.wid - 2,
dim.asc + dim.des - 1, pi.backgroundColor(this));
}
if (previewState(bv)) {
// Do not draw change tracking cue if taken care of by RowPainter
// already.
- Changer dummy = !canPaintChange(*bv) ? make_change(pi.change_, Change())
- : Changer();
+ Changer dummy = !canPaintChange(*bv) ? changeVar(pi.change, Change())
+ : noChange();
if (previewTooSmall(dim)) {
// we have an extra frame
preview_->draw(pi, x + ERROR_FRAME_WIDTH, y);
} else {
// one pixel gap in front
- preview_->draw(pi, x + 1, y);
+ // value was hardcoded to 1 pixel
+ int const gap = pi.base.bv->zoomedPixels(1) ;
+ preview_->draw(pi, x + gap, y);
}
return;
}
+ // First draw the numbers
ColorCode color = pi.selected && lyxrc.use_system_colors
? Color_selectiontext : standardColor();
bool const really_change_color = pi.base.font.color() == Color_none;
Changer dummy0 = really_change_color ? pi.base.font.changeColor(color)
- : Changer();
- Changer dummy1 = pi.base.changeFontSet(standardFont());
- Changer dummy2 = pi.base.font.changeStyle(display() ? LM_ST_DISPLAY
- : LM_ST_TEXT);
-
- int xmath = x;
- BufferParams::MathNumber const math_number = buffer().params().getMathNumber();
- if (numberedType() && math_number == BufferParams::LEFT) {
- Changer dummy = pi.base.changeFontSet("mathrm");
- int l = 0;
- for (row_type row = 0; row < nrows(); ++row)
- l = max(l, mathed_string_width(pi.base.font, nicelabel(row)));
-
- if (l)
- // Value was hardcoded to 30 pixels
- xmath += Length(0.3, Length::IN).inPixels(pi.base) + l;
- }
-
- InsetMathGrid::draw(pi, xmath + 1, y);
- drawMarkers2(pi, x, y);
-
+ : noChange();
if (numberedType()) {
- Changer dummy = pi.base.changeFontSet("mathrm");
+ BufferParams::MathNumber const math_number = buffer().params().getMathNumber();
for (row_type row = 0; row < nrows(); ++row) {
- int const yy = y + rowinfo_[row].offset_;
+ int yy = y + rowinfo(row).offset[bv];
docstring const nl = nicelabel(row);
- if (math_number == BufferParams::LEFT)
- pi.draw(x, yy, nl);
- else {
- int l = mathed_string_width(pi.base.font, nl);
- pi.draw(x + dim.wid - l, yy, nl);
+ Dimension dimnl;
+ mathed_string_dim(pi.base.font, nl, dimnl);
+ if (math_number == BufferParams::LEFT) {
+ if (dimnl.wid > x - pi.leftx)
+ yy += rowinfo(row).descent + dimnl.asc;
+ pi.draw(pi.leftx, yy, nl);
+ } else {
+ if (dimnl.wid > pi.rightx - x - dim.wid)
+ yy += rowinfo(row).descent + dimnl.asc;
+ pi.draw(pi.rightx - dimnl.wid, yy, nl);
}
}
}
+ // Then the equations
+ Changer dummy1 = pi.base.changeFontSet(standardFont());
+ Changer dummy2 = pi.base.font.changeStyle(display() ? DISPLAY_STYLE
+ : TEXT_STYLE);
+ InsetMathGrid::draw(pi, x + 1, y);
+ drawMarkers(pi, x, y);
+
// drawing change line
- if (canPaintChange(*bv))
- pi.change_.paintCue(pi, x + 1, y + 1 - dim.asc,
- x + dim.wid, y + dim.des);
+ if (canPaintChange(*bv)) {
+ // like in metrics()
+ int const display_margin = display() ? pi.base.inPixels(Length(12, Length::PT)) : 0;
+ pi.change.paintCue(pi, x + 1, y + 1 - dim.asc + display_margin,
+ x + dim.wid, y + dim.des - display_margin);
+ }
}
} else {
odocstringstream os;
otexrowstream ots(os);
- WriteStream wi(ots, false, true, WriteStream::wsDefault);
+ TeXMathStream wi(ots, false, true, TeXMathStream::wsDefault);
write(wi);
dim.wid = os.str().size();
dim.asc = 1;
} else {
odocstringstream os;
otexrowstream ots(os);
- WriteStream wi(ots, false, true, WriteStream::wsDefault);
+ TeXMathStream wi(ots, false, true, TeXMathStream::wsDefault);
write(wi);
pain.draw(x, y, os.str().c_str());
}
if (inset.isBufferValid())
encoding = &(inset.buffer().params().encoding());
otexrowstream ots(ls);
- WriteStream wi(ots, false, true, WriteStream::wsPreview, encoding);
+ TeXMathStream wi(ots, false, true, TeXMathStream::wsPreview, encoding);
inset.write(wi);
return ls.str();
}
for (idx_type idx = 0; idx < nargs(); ++idx)
usedMacros(cell(idx), pos, macros, defs);
- MacroNameSet::iterator it = defs.begin();
- MacroNameSet::iterator end = defs.end();
docstring macro_preamble;
- for (; it != end; ++it)
- macro_preamble.append(*it);
+ for (auto const & defvar : defs)
+ macro_preamble.append(defvar);
// set the font series and size for this snippet
DocIterator dit = pos.getInnerText();
case hullEqnArray:
break;
}
- for (size_t row = 0; row < numbered_.size(); ++row)
- if (numbered_[row] == NOTAG)
+ for (auto const & row : numbered_)
+ if (row == NOTAG)
return true;
return false;
}
}
-Inset::DisplayType InsetMathHull::display() const
+Inset::RowFlags InsetMathHull::rowFlags() const
{
switch (type_) {
case hullUnknown:
case hullMultline:
case hullGather:
if (buffer().params().is_math_indent)
- return AlignLeft;
+ return Display | AlignLeft;
else
- return AlignCenter;
+ return Display;
}
// avoid warning
- return AlignCenter;
+ return Display;
}
{
// FIXME: set this in the textclass. This value is what the article class uses.
static Length default_indent(2.5, Length::EM);
- if (display() != Inline && buffer().params().is_math_indent) {
+ if (display() && buffer().params().is_math_indent) {
Length const & len = buffer().params().getMathIndent();
if (len.empty())
return bv.inPixels(default_indent);
+ bgcol + "}{\\ensuremath{\\mathtt{#1}}}}");
features.addPreambleSnippet(
from_ascii("\\newcommand{\\endregexp}{}"));
- } else if (outerDisplay() && features.inDeletedInset()
- && !features.mustProvide("ct-dvipost")) {
- features.require("ct-tikz-math-sout");
+ } else if (outerDisplay() && features.inDeletedInset()) {
+ features.require("tikz");
+ features.require("ct-tikz-object-sout");
}
// Validation is necessary only if not using AMS math.
}
-void InsetMathHull::header_write(WriteStream & os) const
+CtObject InsetMathHull::getCtObject(OutputParams const & runparams) const
+{
+ CtObject res = CtObject::Normal;
+ switch(type_) {
+ case hullNone:
+ case hullSimple:
+ case hullAlignAt:
+ case hullXAlignAt:
+ case hullXXAlignAt:
+ case hullRegexp:
+ case hullUnknown:
+ break;
+
+ case hullEquation:
+ case hullEqnArray:
+ case hullAlign:
+ case hullFlAlign:
+ case hullGather:
+ case hullMultline: {
+ if (runparams.inulemcmd
+ && (!runparams.local_font || runparams.local_font->fontInfo().strikeout() != FONT_ON))
+ res = CtObject::UDisplayObject;
+ else
+ res = CtObject::DisplayObject;
+ break;
+ }
+ }
+ return res;
+}
+
+
+void InsetMathHull::header_write(TeXMathStream & os) const
{
bool n = numberedType();
}
-void InsetMathHull::footer_write(WriteStream & os) const
+void InsetMathHull::footer_write(TeXMathStream & os) const
{
bool n = numberedType();
numbered(0, false);
} else {
setType(hullEquation);
- numbered(0, label_[0] ? true : false);
+ numbered(0, label_[0] != nullptr);
mutate(newtype);
}
break;
default:
// we passed the guard so we should not be here
- LASSERT("Mutation not implemented, but should have been.", return);
+ LYXERR0("Mutation not implemented, but should have been.");
+ LASSERT(false, return);
break;
}// switch
}
return res + InsetMathGrid::eolString(row, fragile, latex, last_eoln);
}
-void InsetMathHull::write(WriteStream & os) const
+void InsetMathHull::write(TeXMathStream & os) const
{
ModeSpecifier specifier(os, MATH_MODE);
header_write(os);
void InsetMathHull::doExtern(Cursor & cur, FuncRequest & func)
{
- docstring dlang;
- docstring extra;
- idocstringstream iss(func.argument());
- iss >> dlang >> extra;
+ //FIXME: sort out whether we want std::string or docstring for those
+ string const lang = func.getArg(0);
+ docstring extra = from_utf8(func.getArg(1));
if (extra.empty())
extra = from_ascii("noextra");
- string const lang = to_ascii(dlang);
// replace selection with result of computation
if (reduceSelectionToOneCell(cur)) {
return true;
}
case LFUN_MATH_DISPLAY: {
- status.setEnabled(display() != Inline || allowDisplayMath(cur));
- status.setOnOff(display() != Inline);
+ status.setEnabled(display() || allowDisplayMath(cur));
+ status.setOnOff(display());
return true;
}
case LFUN_MATH_NUMBER_TOGGLE:
// FIXME: what is the right test, this or the one of
// LABEL_INSERT?
- status.setEnabled(display() != Inline);
+ status.setEnabled(display());
status.setOnOff(numberedType());
return true;
// LABEL_INSERT?
bool const enable = (type_ == hullMultline)
? (nrows() - 1 == cur.row())
- : display() != Inline;
+ : display();
row_type const r = (type_ == hullMultline) ? nrows() - 1 : cur.row();
status.setEnabled(enable);
status.setOnOff(enable && numbered(r));
case LFUN_LABEL_COPY_AS_REFERENCE: {
bool enabled = false;
- row_type row;
if (cmd.argument().empty() && &cur.inset() == this) {
// if there is no argument and we're inside math, we retrieve
// the row number from the cursor position.
- row = (type_ == hullMultline) ? nrows() - 1 : cur.row();
+ row_type row = (type_ == hullMultline) ? nrows() - 1 : cur.row();
enabled = numberedType() && label_[row] && numbered(row);
} else {
// if there is an argument, find the corresponding label, else
font.fromString(to_utf8(arg), b);
if (font.fontInfo().color() != Color_inherit) {
MathAtom at = MathAtom(new InsetMathColor(buffer_, true, font.fontInfo().color()));
- cur.handleNest(at, 0);
+ cur.handleNest(at);
}
}
void InsetMathHull::edit(Cursor & cur, bool front, EntryDirection entry_from)
{
- cur.push(*this);
- bool enter_front = (entry_from == Inset::ENTRY_DIRECTION_LEFT ||
- (entry_from == Inset::ENTRY_DIRECTION_IGNORE && front));
- enter_front ? idxFirst(cur) : idxLast(cur);
+ InsetMathNest::edit(cur, front, entry_from);
// The inset formula dimension is not necessarily the same as the
// one of the instant preview image, so we have to indicate to the
// BufferView that a metrics update is needed.
}
-void InsetMathHull::revealCodes(Cursor & cur) const
-{
- if (!cur.inMathed())
- return;
- odocstringstream os;
- cur.info(os, false);
- cur.message(os.str());
-/*
- // write something to the minibuffer
- // translate to latex
- cur.markInsert(bv);
- ostringstream os;
- write(os);
- string str = os.str();
- cur.markErase(bv);
- string::size_type pos = 0;
- string res;
- for (string::iterator it = str.begin(); it != str.end(); ++it) {
- if (*it == '\n')
- res += ' ';
- else if (*it == '\0') {
- res += " -X- ";
- pos = it - str.begin();
- }
- else
- res += *it;
- }
- if (pos > 30)
- res = res.substr(pos - 30);
- if (res.size() > 60)
- res = res.substr(0, 60);
- cur.message(res);
-*/
-}
-
-
/////////////////////////////////////////////////////////////////////
{
odocstringstream oss;
otexrowstream ots(oss);
- WriteStream wi(ots, false, false, WriteStream::wsDefault);
+ TeXMathStream wi(ots, false, false, TeXMathStream::wsDefault);
oss << "Formula ";
write(wi);
os << to_utf8(oss.str());
int InsetMathHull::plaintext(odocstringstream & os,
OutputParams const & op, size_t max_length) const
{
- // disables ASCII-art for export of equations. See #2275.
- if (0 && display()) {
+ // Try enabling this now that there is a flag as requested at #2275.
+ if (buffer().isExporting() && display()) {
Dimension dim;
TextMetricsInfo mi;
metricsT(mi, dim);
odocstringstream oss;
otexrowstream ots(oss);
Encoding const * const enc = encodings.fromLyXName("utf8");
- WriteStream wi(ots, false, true, WriteStream::wsDefault, enc);
+ TeXMathStream wi(ots, false, true, TeXMathStream::wsDefault, enc);
// Fix Bug #6139
if (type_ == hullRegexp)
}
-int InsetMathHull::docbook(odocstream & os, OutputParams const & runparams) const
-{
- MathStream ms(os);
- int res = 0;
+void InsetMathHull::docbook(XMLStream & xs, OutputParams const & runparams) const {
+ // Choose the tag around the MathML equation.
docstring name;
+ bool doCR = false;
if (getType() == hullSimple)
name = from_ascii("inlineequation");
- else
+ else {
+ doCR = true; // This is a block equation, always have <informalequation> on its own line.
name = from_ascii("informalequation");
+ }
- docstring bname = name;
- if (!label(0).empty())
- bname += " id='" + sgml::cleanID(buffer(), runparams, label(0)) + "'";
+ // DocBook also has <equation>, but it comes with a title.
+ // TODO: recognise \tag from amsmath? This would allow having <equation> with a proper title.
- ++ms.tab(); ms.cr(); ms.os() << '<' << bname << '>';
+ docstring attr;
- odocstringstream ls;
- otexstream ols(ls);
- if (runparams.flavor == OutputParams::XML) {
- ms << MTag("alt role='tex' ");
- // Workaround for db2latex: db2latex always includes equations with
- // \ensuremath{} or \begin{display}\end{display}
- // so we strip LyX' math environment
- WriteStream wi(ols, false, false, WriteStream::wsDefault, runparams.encoding);
- InsetMathGrid::write(wi);
- ms << from_utf8(subst(subst(to_utf8(ls.str()), "&", "&"), "<", "<"));
- ms << ETag("alt");
- ms << MTag("math");
- ms << ETag("alt");
- ms << MTag("math");
- InsetMathGrid::mathmlize(ms);
- ms << ETag("math");
- } else {
- ms << MTag("alt role='tex'");
- latex(ols, runparams);
- res = ols.texrow().rows();
- ms << from_utf8(subst(subst(to_utf8(ls.str()), "&", "&"), "<", "<"));
- ms << ETag("alt");
+ bool mathmlNamespaceInline = buffer().params().docbook_mathml_prefix == BufferParams::NoPrefix;
+ if (mathmlNamespaceInline)
+ attr += "xmlns=\"http://www.w3.org/1998/Math/MathML\"";
+
+ for (row_type i = 0; i < nrows(); ++i) {
+ if (!label(i).empty()) {
+ if (!attr.empty())
+ attr += " ";
+
+ attr += "xml:id=\"" + xml::cleanID(label(i)) + "\"";
+ break;
+ }
+ }
+
+ if (doCR)
+ if (!xs.isLastTagCR())
+ xs << xml::CR();
+
+ xs << xml::StartTag(name, attr);
+ xs << xml::CR();
+
+ // With DocBook 5, MathML must be within its own namespace (defined in Buffer.cpp::writeDocBookSource, except when
+ // it should be inlined).
+ // Output everything in a separate stream so that this does not interfere with the standard flow of DocBook tags.
+ std::string mathmlNamespacePrefix;
+ if (!mathmlNamespaceInline) {
+ if (buffer().params().docbook_mathml_prefix == BufferParams::MPrefix)
+ mathmlNamespacePrefix = "m";
+ else if (buffer().params().docbook_mathml_prefix == BufferParams::MMLPrefix)
+ mathmlNamespacePrefix = "mml";
}
- ms << from_ascii("<graphic fileref=\"eqn/");
- if (!label(0).empty())
- ms << sgml::cleanID(buffer(), runparams, label(0));
- else
- ms << sgml::uniqueID(from_ascii("anon"));
+ odocstringstream osmath;
+ MathMLStream ms(osmath, mathmlNamespacePrefix, true);
- if (runparams.flavor == OutputParams::XML)
- ms << from_ascii("\"/>");
- else
- ms << from_ascii("\">");
+ // Output the MathML subtree.
+ // TeX transcription. Avoid MTag/ETag so that there are no extraneous spaces.
+ ms << "<" << from_ascii("alt") << " role='tex'" << ">";
+ // Workaround for db2latex: db2latex always includes equations with
+ // \ensuremath{} or \begin{display}\end{display}
+ // so we strip LyX' math environment
+ odocstringstream ls;
+ otexstream ols(ls);
+ TeXMathStream wi(ols, false, false, TeXMathStream::wsDefault, runparams.encoding);
+ InsetMathGrid::write(wi);
+ ms << from_utf8(subst(subst(to_utf8(ls.str()), "&", "&"), "<", "<"));
+ ms << "</" << from_ascii("alt") << ">";
+
+ // Actual transformation of the formula into MathML. This translation may fail (for example, due to custom macros).
+ // The new output stream is required to deal with the errors: first write completely the formula into this
+ // temporary stream; then, if it is possible without error, then copy it back to the "real" stream. Otherwise,
+ // some incomplete tags might be put into the real stream.
+ try {
+ // First, generate the MathML expression. If there is an error in the generation, this block is not fully
+ // executed, and the formula is not output to the DocBook stream.
+ odocstringstream ostmp;
+ MathMLStream mstmp(ostmp, ms.xmlns(), ms.xmlMode());
+ InsetMathGrid::mathmlize(mstmp);
+
+ // Choose the display style for the formula, to be output as an attribute near the formula root.
+ std::string mathmlAttr;
+ if (getType() == hullSimple)
+ mathmlAttr = "display=\"inline\"";
+ else
+ mathmlAttr = "display=\"block\"";
- ms.cr(); --ms.tab(); ms.os() << "</" << name << '>';
+ // Then, output the formula.
+ ms << MTag("math", mathmlAttr);
+ ms.cr();
+ osmath << ostmp.str(); // osmath is not a XMLStream, so no need for XMLStream::ESCAPE_NONE.
+ ms << ETag("math");
+ } catch (MathExportException const &) {
+ ms.cr();
+ osmath << "<mathphrase>MathML export failed. Please report this as a bug to the LyX developers: "
+ "https://www.lyx.org/trac.</mathphrase>";
+ }
- return ms.line() + res;
+ // Output the complete formula to the DocBook stream.
+ xs << XMLStream::ESCAPE_NONE << osmath.str();
+ xs << xml::CR();
+ xs << xml::EndTag(name);
+ if (doCR)
+ xs << xml::CR();
}
// this duplicates code from InsetMathGrid, but
// we need access here to number information,
// and we simply do not have that in InsetMathGrid.
-void InsetMathHull::mathmlize(MathStream & os) const
+void InsetMathHull::mathmlize(MathMLStream & ms) const
{
bool const havenumbers = haveNumbers();
bool const havetable = havenumbers || nrows() > 1 || ncols() > 1;
if (havetable)
- os << MTag("mtable");
+ ms << MTag("mtable");
char const * const celltag = havetable ? "mtd" : "mrow";
// FIXME There does not seem to be wide support at the moment
// for mlabeledtr, so we have to use just mtr for now.
char const * const rowtag = "mtr";
for (row_type row = 0; row < nrows(); ++row) {
if (havetable)
- os << MTag(rowtag);
+ ms << MTag(rowtag);
for (col_type col = 0; col < ncols(); ++col) {
- os << MTag(celltag)
+ ms << MTag(celltag)
<< cell(index(row, col))
<< ETag(celltag);
}
// fleqn?
if (havenumbers) {
- os << MTag("mtd");
+ ms << MTag("mtd");
docstring const & num = numbers_[row];
if (!num.empty())
- os << '(' << num << ')';
- os << ETag("mtd");
+ ms << '(' << num << ')';
+ ms << ETag("mtd");
}
if (havetable)
- os << ETag(rowtag);
+ ms << ETag(rowtag);
}
if (havetable)
- os << ETag("mtable");
+ ms << ETag("mtable");
}
-void InsetMathHull::mathAsLatex(WriteStream & os) const
+void InsetMathHull::mathAsLatex(TeXMathStream & os) const
{
MathEnsurer ensurer(os, false);
bool havenumbers = haveNumbers();
}
-docstring InsetMathHull::xhtml(XHTMLStream & xs, OutputParams const & op) const
+docstring InsetMathHull::xhtml(XMLStream & xs, OutputParams const & op) const
{
BufferParams::MathOutput const mathtype =
buffer().masterBuffer()->params().html_math_output;
// FIXME Eventually we would like to do this inset by inset.
if (mathtype == BufferParams::MathML) {
odocstringstream os;
- MathStream ms(os);
+ MathMLStream ms(os);
try {
mathmlize(ms);
success = true;
} catch (MathExportException const &) {}
if (success) {
if (getType() == hullSimple)
- xs << html::StartTag("math",
+ xs << xml::StartTag("math",
"xmlns=\"http://www.w3.org/1998/Math/MathML\"", true);
else
- xs << html::StartTag("math",
+ xs << xml::StartTag("math",
"display=\"block\" xmlns=\"http://www.w3.org/1998/Math/MathML\"", true);
- xs << XHTMLStream::ESCAPE_NONE
+ xs << XMLStream::ESCAPE_NONE
<< os.str()
- << html::EndTag("math");
+ << xml::EndTag("math");
}
} else if (mathtype == BufferParams::HTML) {
odocstringstream os;
} catch (MathExportException const &) {}
if (success) {
string const tag = (getType() == hullSimple) ? "span" : "div";
- xs << html::StartTag(tag, "class='formula'", true)
- << XHTMLStream::ESCAPE_NONE
+ xs << xml::StartTag(tag, "class='formula'", true)
+ << XMLStream::ESCAPE_NONE
<< os.str()
- << html::EndTag(tag);
+ << xml::EndTag(tag);
}
}
}
string const tag = (getType() == hullSimple) ? "span" : "div";
- xs << html::CR()
- << html::StartTag(tag, "style = \"text-align: center;\"")
- << html::CompTag("img", "src=\"" + filename + "\" alt=\"Mathematical Equation\"")
- << html::EndTag(tag)
- << html::CR();
+ xs << xml::CR()
+ << xml::StartTag(tag, "style = \"text-align: center;\"")
+ << xml::CompTag("img", "src=\"" + filename + "\" alt=\"Mathematical Equation\"")
+ << xml::EndTag(tag)
+ << xml::CR();
success = true;
}
}
// $...$ or whatever.
odocstringstream ls;
otexrowstream ots(ls);
- WriteStream wi(ots, false, true, WriteStream::wsPreview);
+ TeXMathStream wi(ots, false, true, TeXMathStream::wsPreview);
ModeSpecifier specifier(wi, MATH_MODE);
mathAsLatex(wi);
docstring const latex = ls.str();
// FIXME XHTML
// probably should allow for some kind of customization here
string const tag = (getType() == hullSimple) ? "span" : "div";
- xs << html::StartTag(tag, "class='math'")
+ xs << xml::StartTag(tag, "class='math'")
<< latex
- << html::EndTag(tag)
- << html::CR();
+ << xml::EndTag(tag)
+ << xml::CR();
}
return docstring();
}
bool InsetMathHull::canPaintChange(BufferView const &) const
{
// We let RowPainter do it seamlessly for inline insets
- return display() != Inline;
+ return display();
}