[LyX/master] MathML: use Core for XHTML, 3 for DocBook.

Thibaut Cuvelier tcuvelier at lyx.org
Sat Sep 28 14:51:00 UTC 2024


commit 75f467fa13c88da474f4a960a34f1da63b7a99ed
Author: Thibaut Cuvelier <tcuvelier at lyx.org>
Date:   Sat Sep 28 16:49:46 2024 +0200

    MathML: use Core for XHTML, 3 for DocBook.
    
    In a near future, this should rather be controlled by a user-visible parameter.
---
 src/mathed/InsetMathHull.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 57c57f20ea..1ab613d916 100644
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -2417,7 +2417,7 @@ void InsetMathHull::docbook(XMLStream & xs, OutputParams const & runparams) cons
 	}
 
 	odocstringstream osmath;
-	MathMLStream ms(osmath, mathmlNamespacePrefix);
+	MathMLStream ms(osmath, mathmlNamespacePrefix, MathMLStream::mathml3);
 
 	// Output the MathML subtree.
 	// TeX transcription. Avoid MTag/ETag so that there are no extraneous spaces.
@@ -2440,7 +2440,7 @@ void InsetMathHull::docbook(XMLStream & xs, OutputParams const & runparams) cons
 		// 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());
+		MathMLStream mstmp(ostmp, ms.xmlns(), ms.version());
 		mathmlize(mstmp);
 
 		// Choose the display style for the formula, to be output as an attribute near the formula root.
@@ -2651,7 +2651,7 @@ docstring InsetMathHull::xhtml(XMLStream & xs, OutputParams const & op) const
 	// FIXME Eventually we would like to do this inset by inset.
 	if (mathtype == BufferParams::MathML) {
 		odocstringstream os;
-		MathMLStream ms(os);
+		MathMLStream ms(os, "", MathMLStream::mathmlCore);
 		try {
 			mathmlize(ms);
 			success = true;


More information about the lyx-cvs mailing list