MathML: add a version enum.

diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp
index 665b3fcbf46bde71d94eb8c1440ab827b5fab322..a9d6e0498ed1d34555fb929068bec8b07e13fa29 100644 (file)
--- a/src/mathed/MathStream.cpp
+++ b/src/mathed/MathStream.cpp
@@ -288,8 +288,8 @@ TeXMathStream & operator<<(TeXMathStream & ws, unsigned int i)
 //////////////////////////////////////////////////////////////////////
 
 
-MathMLStream::MathMLStream(odocstream & os, std::string const & xmlns)
-       : os_(os), xmlns_(xmlns)
+MathMLStream::MathMLStream(odocstream & os, std::string const & xmlns, MathMLVersion version)
+       : os_(os), xmlns_(xmlns), version_(version)
 {
        if (inText())
                font_math_style_ = TEXT_STYLE;

diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index 40bb7d3bfb41c7faa748d58f6eee4a03cfd063c8..ccc6f14fff2ebad77daf13fb74670ddf30a87d26 100644 (file)
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -376,8 +376,15 @@ class MathExportException : public std::exception {};
 
 class MathMLStream {
 public:
-       /// Builds a stream proxy for os; the MathML namespace is given by xmlns (supposed to be already defined elsewhere in the document).
-       explicit MathMLStream(odocstream & os, std::string const & xmlns = "");
+       ///
+       enum MathMLVersion {
+               mathml3,
+               mathmlCore
+       };
+
+       /// Builds a stream proxy for os; the MathML namespace is given by xmlns
+       /// (supposed to be already defined elsewhere in the document).
+       explicit MathMLStream(odocstream & os, std::string const & xmlns = "", MathMLVersion version = mathml3);
        ///
        void cr();
        /// Indentation when nesting tags
@@ -403,7 +410,7 @@ public:
 private:
        /// Check whether it makes sense to start a <mtext>
        void beforeText();
-       ///Check whether there is a <mtext> to close here
+       /// Check whether there is a <mtext> to close here
        void beforeTag();
        ///
        odocstream & os_;
@@ -420,6 +427,8 @@ private:
        odocstringstream deferred_;
        ///
        std::string xmlns_;
+       ///
+       MathMLVersion version_;
        /// The only important part of a FontInfo object.
        MathStyle font_math_style_;
        ///