#include <config.h>
#include "InsetMathHull.h"
-
#include "InsetMathChar.h"
#include "InsetMathColor.h"
#include "InsetMathFrac.h"
{
/* Compute \(above|below)displayskip
true value in LaTeX is 10pt plus 2pt minus 5pt (in normal size at 10pt)
- But 12 pixels is what we are used to.
+ But we use a fixed number of pixels and scale them with zoom.
*/
- int const bottom_display_margin = 12;
+ 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)
}
-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;
- MathMLStream 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
+ 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()), "&", "&"), "<", "<"));
// 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;
MathMLStream mstmp(ostmp, ms.xmlns(), ms.xmlMode());
- InsetMathGrid::mathmlize(mstmp);
+ mathmlize(mstmp);
- // Then, output it (but only if the generation can be done without errors!).
- ms << MTag("math");
+ // 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 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.
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)