#include <config.h>
#include "InsetMathHull.h"
-
#include "InsetMathChar.h"
#include "InsetMathColor.h"
#include "InsetMathFrac.h"
#include "insets/InsetRef.h"
#include "insets/RenderPreview.h"
-#include "graphics/GraphicsImage.h"
#include "graphics/PreviewImage.h"
#include "graphics/PreviewLoader.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())
return;
- if (os.ulemCmd() == WriteStream::UNDERLINE)
+ 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())
return;
- if (os.ulemCmd() == WriteStream::UNDERLINE)
+ if (os.ulemCmd() == TeXMathStream::UNDERLINE)
os << "}}\\\\\n";
- else if (os.ulemCmd() == WriteStream::STRIKEOUT)
+ else if (os.ulemCmd() == TeXMathStream::STRIKEOUT)
os << "}\\\\\n";
}
{
/* Compute \(above|below)displayskip
true value in LaTeX is 10pt plus 2pt minus 5pt (in normal size at 10pt)
- FIXME: make this dependent of current size? (minor improvement)
- FIXME: if would be nice if this was not part of the inset, but
- just increased the row ascent/descent.
- FIXME: even better would be to handle the short skip case.
+ But we use a fixed number of pixels and scale them with zoom.
*/
- int const bottom_display_margin = mi.base.inPixels(Length(10, Length::PT));
+ 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)
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));
+ dim.height() - 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);
}
// 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();
if (numberedType()) {
BufferParams::MathNumber const math_number = buffer().params().getMathNumber();
for (row_type row = 0; row < nrows(); ++row) {
Dimension dimnl;
mathed_string_dim(pi.base.font, nl, dimnl);
if (math_number == BufferParams::LEFT) {
+ ColorCode const col = pi.selected_left
+ ? Color_selectiontext
+ : pi.base.font.color();
+ Changer dummy0 = pi.base.font.changeColor(col);
if (dimnl.wid > x - pi.leftx)
yy += rowinfo(row).descent + dimnl.asc;
+ pi.pain.fillRectangle(pi.leftx, yy - dimnl.asc,
+ dimnl.width(), dimnl.height(),
+ pi.selected_left ? Color_selection : pi.background_color);
pi.draw(pi.leftx, yy, nl);
} else {
+ ColorCode const col = pi.selected_right
+ ? Color_selectiontext
+ : pi.base.font.color();
+ Changer dummy0 = pi.base.font.changeColor(col);
if (dimnl.wid > pi.rightx - x - dim.wid)
yy += rowinfo(row).descent + dimnl.asc;
+ pi.pain.fillRectangle(pi.rightx - dimnl.wid, yy - dimnl.asc,
+ dimnl.width(), dimnl.height(),
+ pi.selected_right ? Color_selection : pi.background_color);
pi.draw(pi.rightx - dimnl.wid, yy, nl);
}
}
}
// Then the equations
+ 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)
+ : noChange();
Changer dummy1 = pi.base.changeFontSet(standardFont());
Changer dummy2 = pi.base.font.changeStyle(display() ? DISPLAY_STYLE
: TEXT_STYLE);
} 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();
}
}
-OutputParams::CtObject InsetMathHull::CtObject(OutputParams const & runparams) const
+CtObject InsetMathHull::getCtObject(OutputParams const & runparams) const
{
- OutputParams::CtObject res = OutputParams::CT_NORMAL;
+ CtObject res = CtObject::Normal;
switch(type_) {
case hullNone:
case hullSimple:
case hullMultline: {
if (runparams.inulemcmd
&& (!runparams.local_font || runparams.local_font->fontInfo().strikeout() != FONT_ON))
- res = OutputParams::CT_UDISPLAYOBJECT;
+ res = CtObject::UDisplayObject;
else
- res = OutputParams::CT_DISPLAYOBJECT;
+ res = CtObject::DisplayObject;
break;
}
}
}
-void InsetMathHull::header_write(WriteStream & os) const
+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();
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);
{
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());
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)
}
-void InsetMathHull::docbook(XMLStream & xs, OutputParams const & runparams) const
-{
+void InsetMathHull::docbook(XMLStream & xs, OutputParams const & runparams) const {
// Choose the tag around the MathML equation.
docstring name;
bool doCR = false;
// TODO: recognise \tag from amsmath? This would allow having <equation> with a proper title.
docstring attr;
+
+ 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()) {
- attr = "xml:id=\"" + xml::cleanID(label(i)) + "\"";
+ if (!attr.empty())
+ attr += " ";
+
+ attr += "xml:id=\"" + xml::cleanID(label(i)) + "\"";
break;
}
}
xs << xml::StartTag(name, attr);
xs << xml::CR();
- // With DocBook 5, MathML must be within its own namespace; defined in Buffer.cpp::writeDocBookSource as "m".
+ // 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";
+ }
+
odocstringstream osmath;
- MathStream ms(osmath, "m", true);
+ MathMLStream ms(osmath, mathmlNamespacePrefix, true);
// Output the MathML subtree.
- odocstringstream ls;
- otexstream ols(ls);
-
// 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
- WriteStream wi(ols, false, false, WriteStream::wsDefault, runparams.encoding);
+ 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") << ">";
// 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.
+ // 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;
- MathStream mstmp(ostmp, ms.xmlns(), ms.xmlMode());
- InsetMathGrid::mathmlize(mstmp);
+ MathMLStream mstmp(ostmp, ms.xmlns(), ms.xmlMode());
+ 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\"";
- // Then, output it (but only if the generation can be done without errors!).
- ms << MTag("math");
+ // 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.</mathphrase>";
+ osmath << "<mathphrase>MathML export failed. Please report this as a bug to the LyX developers: "
+ "https://www.lyx.org/trac.</mathphrase>";
}
// Output the complete formula to the DocBook stream.
// 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 & ms) const
+void InsetMathHull::mathmlize(MathMLStream & ms) const
{
bool const havenumbers = haveNumbers();
bool const havetable = havenumbers || nrows() > 1 || ncols() > 1;
- if (havetable)
- ms << MTag("mtable");
+ if (havetable) {
+ if (getType() == hullSimple)
+ ms << MTag("mtable");
+ else if (getType() >= hullAlign && getType() <= hullXXAlignAt)
+ ms << MTag("mtable", "displaystyle='true' columnalign='right left'");
+ else
+ ms << MTag("mtable", "displaystyle='true'");
+ }
+
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.
ms << MTag("mtd");
docstring const & num = numbers_[row];
if (!num.empty())
- ms << '(' << num << ')';
+ ms << MTagInline("mtext") << '(' << num << ')' << ETagInline("mtext");
ms << ETag("mtd");
}
if (havetable)
}
-void InsetMathHull::mathAsLatex(WriteStream & os) const
+void InsetMathHull::mathAsLatex(TeXMathStream & os) const
{
MathEnsurer ensurer(os, false);
bool havenumbers = haveNumbers();
// 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;
string const tag = (getType() == hullSimple) ? "span" : "div";
xs << xml::CR()
<< xml::StartTag(tag, "style = \"text-align: center;\"")
- << xml::CompTag("img", "src=\"" + filename + "\" alt=\"Mathematical Equation\"")
- << xml::EndTag(tag)
- << xml::CR();
+ << 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();
projects / lyx.git / blobdiff