We only support gcc >= 4.9.

[lyx.git] / src / mathed / InsetMathHull.cpp

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 24e4397490573b0e117da11cd4a44b956efd2cd1..a53b33d6bb3c0c232ef685b02b89d01b6df5cceb 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -11,7 +11,6 @@
 #include <config.h>
 
 #include "InsetMathHull.h"
-
 #include "InsetMathChar.h"
 #include "InsetMathColor.h"
 #include "InsetMathFrac.h"
@@ -480,12 +479,9 @@ 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)
-          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)
@@ -2371,8 +2367,7 @@ int InsetMathHull::plaintext(odocstringstream & os,
 }
 
 
-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;
@@ -2387,9 +2382,17 @@ void InsetMathHull::docbook(XMLStream & xs, OutputParams const & runparams) cons
        // 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;
                }
        }
@@ -2401,20 +2404,28 @@ void InsetMathHull::docbook(XMLStream & xs, OutputParams const & runparams) cons
        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()), "&", "&amp;"), "<", "&lt;"));
@@ -2437,7 +2448,8 @@ void InsetMathHull::docbook(XMLStream & xs, OutputParams const & runparams) cons
                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.