Rename MathStream to MathMLStream.

diff --git a/src/mathed/InsetMath.cpp b/src/mathed/InsetMath.cpp
index d12474f2495e24548bae81f28f6c180d4743850e..9109c39bd1910fe0fcfe4beb9b9691ba47fbddcc 100644 (file)
--- a/src/mathed/InsetMath.cpp
+++ b/src/mathed/InsetMath.cpp
@@ -202,7 +202,7 @@ void InsetMath::mathematica(MathematicaStream & os) const
 }
 
 
-void InsetMath::mathmlize(MathStream & ms) const
+void InsetMath::mathmlize(MathMLStream & ms) const
 {
        ms << "<!-- " << from_utf8(insetName(lyxCode())) << " -->";
        ms << MTag("mi");

diff --git a/src/mathed/InsetMath.h b/src/mathed/InsetMath.h
index f5db673ac8e53b598f595c35f5580dec7c65a71d..95051bc8e720f3649b239ef04befe7544f804c80 100644 (file)
--- a/src/mathed/InsetMath.h
+++ b/src/mathed/InsetMath.h
@@ -104,7 +104,7 @@ class OctaveStream;
 class MapleStream;
 class MaximaStream;
 class MathematicaStream;
-class MathStream;
+class MathMLStream;
 class WriteStream;
 
 class MathData;
@@ -241,7 +241,7 @@ public:
        /// write content as something readable by Mathematica
        virtual void mathematica(MathematicaStream &) const;
        /// write content as MathML
-       virtual void mathmlize(MathStream &) const;
+       virtual void mathmlize(MathMLStream &) const;
        /// write content as HTML, best we can.
        /// the idea for this, and some of the details, come from
        /// eLyXer, written by Alex Fernandez. no code is borrowed. rather,

diff --git a/src/mathed/InsetMathAMSArray.h b/src/mathed/InsetMathAMSArray.h
index ab9ead0bd08dcd71d3b9df0b13f05da9cfd3ff7d..8feb5750c7e63245c06f28bbe394d5cb41cdc7f4 100644 (file)
--- a/src/mathed/InsetMathAMSArray.h
+++ b/src/mathed/InsetMathAMSArray.h
@@ -51,7 +51,7 @@ public:
        void normalize(NormalStream &) const override;
        // Don't need mathmlize or htmlize, as this is handled by
        // InsetMathMatrix after being extracted in MathExtern.
-       // void mathmlize(MathStream &) const override;
+       // void mathmlize(MathMLStream &) const override;
        // void htmlize(HtmlStream &) const override;
        ///
        void validate(LaTeXFeatures & features) const override;

diff --git a/src/mathed/InsetMathBig.cpp b/src/mathed/InsetMathBig.cpp
index 265e159bf2f4d8ec97263062fa1104e9229244b8..fa31b7568bac8fb2baefae0dc7f3b950f7b364d6 100644 (file)
--- a/src/mathed/InsetMathBig.cpp
+++ b/src/mathed/InsetMathBig.cpp
@@ -135,7 +135,7 @@ void InsetMathBig::normalize(NormalStream & os) const
 }
 
 
-void InsetMathBig::mathmlize(MathStream & ms) const
+void InsetMathBig::mathmlize(MathMLStream & ms) const
 {
        ms << "<" << from_ascii(ms.namespacedTag("mo"))
           << " form='prefix' fence='true' stretchy='true' symmetric='true'>"

diff --git a/src/mathed/InsetMathBig.h b/src/mathed/InsetMathBig.h
index ed1c773b6b6e384955332e6c4558c9a2c0c82867..e98afa3f11bf644f20e8038f3a3e357c98250166 100644 (file)
--- a/src/mathed/InsetMathBig.h
+++ b/src/mathed/InsetMathBig.h
@@ -35,7 +35,7 @@ public:
        ///
        void normalize(NormalStream & os) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathBoldSymbol.cpp b/src/mathed/InsetMathBoldSymbol.cpp
index 5dbe1fda2859a0e7d0ae12865f0b781b288be64b..7b6932b8de425e66582f669dfbcbe73f9574c7fb 100644 (file)
--- a/src/mathed/InsetMathBoldSymbol.cpp
+++ b/src/mathed/InsetMathBoldSymbol.cpp
@@ -107,7 +107,7 @@ void InsetMathBoldSymbol::write(WriteStream & os) const
 }
 
 
-void InsetMathBoldSymbol::mathmlize(MathStream & ms) const
+void InsetMathBoldSymbol::mathmlize(MathMLStream & ms) const
 {
        ms << "<" << from_ascii(ms.namespacedTag("mstyle")) << " mathvariant='bold'>"
           << cell(0)

diff --git a/src/mathed/InsetMathBoldSymbol.h b/src/mathed/InsetMathBoldSymbol.h
index 9d883d2c5d027cae0fa068bd548fd68d44cc4f55..27e9614af2d4cae90fecfd73e7e716e9498a8eae 100644 (file)
--- a/src/mathed/InsetMathBoldSymbol.h
+++ b/src/mathed/InsetMathBoldSymbol.h
@@ -42,7 +42,7 @@ public:
        ///
        void write(WriteStream & os) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathBox.cpp b/src/mathed/InsetMathBox.cpp
index c0df607789ede1ddb977643bfeb7d575dc4e91e3..7364d49a848523bcc8528c19e8b653e71d6b5017 100644 (file)
--- a/src/mathed/InsetMathBox.cpp
+++ b/src/mathed/InsetMathBox.cpp
@@ -57,7 +57,7 @@ void InsetMathBox::normalize(NormalStream & os) const
 }
 
 
-void InsetMathBox::mathmlize(MathStream & ms) const
+void InsetMathBox::mathmlize(MathMLStream & ms) const
 {
        // FIXME XHTML
        // Need to do something special for tags here.
@@ -163,7 +163,7 @@ void InsetMathFBox::normalize(NormalStream & os) const
 }
 
 
-void InsetMathFBox::mathmlize(MathStream & ms) const
+void InsetMathFBox::mathmlize(MathMLStream & ms) const
 {
        SetMode textmode(ms, true);
        ms << MTag("mstyle", "class='fbox'")
@@ -307,7 +307,7 @@ void InsetMathMakebox::infoize(odocstream & os) const
 }
 
 
-void InsetMathMakebox::mathmlize(MathStream & ms) const
+void InsetMathMakebox::mathmlize(MathMLStream & ms) const
 {
        // FIXME We could do something with the other arguments.
        std::string const cssclass = framebox_ ? "framebox" : "makebox";
@@ -391,7 +391,7 @@ void InsetMathBoxed::infoize(odocstream & os) const
 }
 
 
-void InsetMathBoxed::mathmlize(MathStream & ms) const
+void InsetMathBoxed::mathmlize(MathMLStream & ms) const
 {
        ms << MTag("mstyle", "class='boxed'")
           << cell(0)

diff --git a/src/mathed/InsetMathBox.h b/src/mathed/InsetMathBox.h
index 93d8954a2e7000d72ccc704b276f9c21dd6e9721..6ab33b7a5040731e851068e474ce9c4aea3ea69f 100644 (file)
--- a/src/mathed/InsetMathBox.h
+++ b/src/mathed/InsetMathBox.h
@@ -33,7 +33,7 @@ public:
        ///
        void normalize(NormalStream & ns) const override;
        ///
-       void mathmlize(MathStream & ms) const override;
+       void mathmlize(MathMLStream & ms) const override;
        ///
        void htmlize(HtmlStream & ms) const override;
        ///
@@ -68,7 +68,7 @@ public:
        /// write normalized content
        void normalize(NormalStream & ns) const override;
        ///
-       void mathmlize(MathStream & ms) const override;
+       void mathmlize(MathMLStream & ms) const override;
        ///
        void htmlize(HtmlStream & ms) const override;
        ///
@@ -95,7 +95,7 @@ public:
        /// write normalized content
        void normalize(NormalStream & ns) const override;
        ///
-       void mathmlize(MathStream & ms) const override;
+       void mathmlize(MathMLStream & ms) const override;
        ///
        void htmlize(HtmlStream & ms) const override;
        ///
@@ -128,7 +128,7 @@ public:
        ///
        void write(WriteStream & os) const override;
        ///
-       void mathmlize(MathStream & ms) const override;
+       void mathmlize(MathMLStream & ms) const override;
        ///
        void htmlize(HtmlStream & ms) const override;
        /// write normalized content

diff --git a/src/mathed/InsetMathBrace.cpp b/src/mathed/InsetMathBrace.cpp
index a31a759a419bce0a136ba8a3c4ea9de4e24b8276..8a3bcde24dc174a2cd2dd883d58ddcf2ec3d6d66 100644 (file)
--- a/src/mathed/InsetMathBrace.cpp
+++ b/src/mathed/InsetMathBrace.cpp
@@ -96,7 +96,7 @@ void InsetMathBrace::octave(OctaveStream & os) const
 }
 
 
-void InsetMathBrace::mathmlize(MathStream & ms) const
+void InsetMathBrace::mathmlize(MathMLStream & ms) const
 {
        ms << MTag("mrow") << cell(0) << ETag("mrow");
 }

diff --git a/src/mathed/InsetMathBrace.h b/src/mathed/InsetMathBrace.h
index 35082d1a7a7489f7af69672187e44d17155c5e03..72a63e0bbe7e149df2537906da085b46367ddfd6 100644 (file)
--- a/src/mathed/InsetMathBrace.h
+++ b/src/mathed/InsetMathBrace.h
@@ -44,7 +44,7 @@ public:
        ///
        void octave(OctaveStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathCancel.cpp b/src/mathed/InsetMathCancel.cpp
index ee82d0c3787b76a478922bef220a0f3dc0bea1a7..5370bb45a56b6a8550adc43daa732cab77ad690a 100644 (file)
--- a/src/mathed/InsetMathCancel.cpp
+++ b/src/mathed/InsetMathCancel.cpp
@@ -138,7 +138,7 @@ void InsetMathCancel::htmlize(HtmlStream & os) const
 }
 
 
-void InsetMathCancel::mathmlize(MathStream & ms) const
+void InsetMathCancel::mathmlize(MathMLStream & ms) const
 {
        switch (kind_) {
        case cancel:

diff --git a/src/mathed/InsetMathCancel.h b/src/mathed/InsetMathCancel.h
index c429fb53ed03f5f2642177764d60be13e861cc26..2f8e94dc72371efb401df9ba544c26b02744effd 100644 (file)
--- a/src/mathed/InsetMathCancel.h
+++ b/src/mathed/InsetMathCancel.h
@@ -40,7 +40,7 @@ public:
        ///
        InsetCode lyxCode() const override { return MATH_CANCEL_CODE; }
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathCancelto.h b/src/mathed/InsetMathCancelto.h
index 4c81c4cdf3a0f2a9d5061fd619e2e86e3232d919..654bd49d1e45da7e69cac7527bb4903e2b5a975f 100644 (file)
--- a/src/mathed/InsetMathCancelto.h
+++ b/src/mathed/InsetMathCancelto.h
@@ -36,7 +36,7 @@ public:
        ///
        InsetCode lyxCode() const override { return MATH_CANCELTO_CODE; }
        /// Nothing for now
-       void mathmlize(MathStream &) const override {}
+       void mathmlize(MathMLStream &) const override {}
        /// Nothing for HTML
        void htmlize(HtmlStream &) const override {}
        ///

diff --git a/src/mathed/InsetMathCases.cpp b/src/mathed/InsetMathCases.cpp
index 09ad0f8fa8273c8610aa49ccfac99db924fab500..cc5191e1c2a8a848b631a8318407ae82305f8eff 100644 (file)
--- a/src/mathed/InsetMathCases.cpp
+++ b/src/mathed/InsetMathCases.cpp
@@ -143,7 +143,7 @@ void InsetMathCases::maple(MapleStream & os) const
 }
 
 
-void InsetMathCases::mathmlize(MathStream & ms) const
+void InsetMathCases::mathmlize(MathMLStream & ms) const
 {
        ms << "<" << from_ascii(ms.namespacedTag("mo"))
           << " form='prefix' fence='true' stretchy='true' symmetric='true'>"

diff --git a/src/mathed/InsetMathCases.h b/src/mathed/InsetMathCases.h
index f6b9dfc52fcd22717ff813e245b1e1075d72eb01..e74bea75d0be17b52ac221ae43b8e22f9d3d1094 100644 (file)
--- a/src/mathed/InsetMathCases.h
+++ b/src/mathed/InsetMathCases.h
@@ -41,7 +41,7 @@ public:
        ///
        void maple(MapleStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index decfac2d59ec8c073c0c16846c7be5dc877240ba..cadadd24c17e4fc62dde43f98df66437210dd596 100644 (file)
--- a/src/mathed/InsetMathChar.cpp
+++ b/src/mathed/InsetMathChar.cpp
@@ -228,7 +228,7 @@ void InsetMathChar::octave(OctaveStream & os) const
 // mathalpha, then we'll treat it as an identifier, otherwise as an
 // operator.
 // Worst case: We get bad spacing, or bad italics.
-void InsetMathChar::mathmlize(MathStream & ms) const
+void InsetMathChar::mathmlize(MathMLStream & ms) const
 {
        std::string entity;
        switch (char_) {

diff --git a/src/mathed/InsetMathChar.h b/src/mathed/InsetMathChar.h
index 64e9ad0f6e3afd9569f47c6b6117f3846c1eb3d6..5f1a128125a902a73863da66c62547d4427f0f99 100644 (file)
--- a/src/mathed/InsetMathChar.h
+++ b/src/mathed/InsetMathChar.h
@@ -43,7 +43,7 @@ public:
        ///
        void octave(OctaveStream & os) const override;
        ///
-       void mathmlize(MathStream & ms) const override;
+       void mathmlize(MathMLStream & ms) const override;
        ///
        void htmlize(HtmlStream & ms) const override;
        /// identifies Charinsets

diff --git a/src/mathed/InsetMathColor.h b/src/mathed/InsetMathColor.h
index 55a02c259641f8c478de225302721fee195ad08f..3051f22b4e7ff78dbfa3158233cd3f5e81846ba0 100644 (file)
--- a/src/mathed/InsetMathColor.h
+++ b/src/mathed/InsetMathColor.h
@@ -37,7 +37,7 @@ public:
        ///
        void write(WriteStream & os) const override;
        /// FIXME XHTML For now, we do nothing with color.
-       void mathmlize(MathStream &) const override {}
+       void mathmlize(MathMLStream &) const override {}
        /// FIXME XHTML For now, we do nothing with color.
        void htmlize(HtmlStream &) const override {}
        ///

diff --git a/src/mathed/InsetMathComment.cpp b/src/mathed/InsetMathComment.cpp
index 1a248ebfaa56784dc7bd44ca94587e159d550521..1b51fdbf5d57f647be591677057351e6185e4efd 100644 (file)
--- a/src/mathed/InsetMathComment.cpp
+++ b/src/mathed/InsetMathComment.cpp
@@ -83,7 +83,7 @@ void InsetMathComment::maple(MapleStream & os) const
 }
 
 
-void InsetMathComment::mathmlize(MathStream & ms) const
+void InsetMathComment::mathmlize(MathMLStream & ms) const
 {
        ms << MTag("comment") << cell(0) << ETag("comment");
 }

diff --git a/src/mathed/InsetMathComment.h b/src/mathed/InsetMathComment.h
index 0134f6cfa970e9f80089345d339b1213351c4741..ff6bbe345444297d2c71654a6178be1011048fb4 100644 (file)
--- a/src/mathed/InsetMathComment.h
+++ b/src/mathed/InsetMathComment.h
@@ -44,7 +44,7 @@ public:
        ///
        void octave(OctaveStream &) const override {}
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index 125aaa61e177c7c816ba8b4afe8d5d242c5a419a..398e3a299ded6297afe61ab4261ea1d664a2355e 100644 (file)
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -223,7 +223,7 @@ namespace {
        }
 } // namespace
 
-void InsetMathDecoration::mathmlize(MathStream & ms) const
+void InsetMathDecoration::mathmlize(MathMLStream & ms) const
 {
        TranslationMap const & t = translationMap();
        TranslationMap::const_iterator cur = t.find(to_utf8(key_->name));

diff --git a/src/mathed/InsetMathDecoration.h b/src/mathed/InsetMathDecoration.h
index ed329d8f20850701660fd8ed0c7ea39ce34b27cc..3e890db230364c894191236414cde4eda49769b7 100644 (file)
--- a/src/mathed/InsetMathDecoration.h
+++ b/src/mathed/InsetMathDecoration.h
@@ -50,7 +50,7 @@ public:
        ///
        InsetCode lyxCode() const override { return MATH_DECORATION_CODE; }
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
 private:

diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp
index 11a47d139f4c30b153db5f6616c59a86f5140bc4..3326bd7edd37800a0897e9113087d43a34271067 100644 (file)
--- a/src/mathed/InsetMathDelim.cpp
+++ b/src/mathed/InsetMathDelim.cpp
@@ -179,7 +179,7 @@ void InsetMathDelim::mathematica(MathematicaStream & os) const
 }
 
 
-void InsetMathDelim::mathmlize(MathStream & ms) const
+void InsetMathDelim::mathmlize(MathMLStream & ms) const
 {
        ms << "<" << from_ascii(ms.namespacedTag("mo")) << " form='prefix' fence='true' stretchy='true' symmetric='true'>"
           << convertDelimToXMLEscape(left_, ms.xmlMode())

diff --git a/src/mathed/InsetMathDelim.h b/src/mathed/InsetMathDelim.h
index d45ecc7174679ea2fb90cea8c2cc0afe48f1cd62..c8828a8c35f6a8550f8ed5e57c81f0d7952a2a5d 100644 (file)
--- a/src/mathed/InsetMathDelim.h
+++ b/src/mathed/InsetMathDelim.h
@@ -58,7 +58,7 @@ public:
        ///
        void mathematica(MathematicaStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathDots.cpp b/src/mathed/InsetMathDots.cpp
index f8e8e2397d9ce8f2723525eddeffdc74b0429399..44490cb0d27496348cb155ec5599f0b985cd246c 100644 (file)
--- a/src/mathed/InsetMathDots.cpp
+++ b/src/mathed/InsetMathDots.cpp
@@ -85,7 +85,7 @@ void InsetMathDots::validate(LaTeXFeatures & features) const
 }
 
 
-void InsetMathDots::mathmlize(MathStream & ms) const
+void InsetMathDots::mathmlize(MathMLStream & ms) const
 {
        // which symbols we support is decided by what is listed in
        // lib/symbols as generating a dots inset

diff --git a/src/mathed/InsetMathDots.h b/src/mathed/InsetMathDots.h
index 2650de004457b85607292574d4b02be572e2b5f6..5deffe5422aee15a0159e5de450234acec82fb69 100644 (file)
--- a/src/mathed/InsetMathDots.h
+++ b/src/mathed/InsetMathDots.h
@@ -35,7 +35,7 @@ public:
        ///
        InsetCode lyxCode() const override { return MATH_DOTS_CODE; }
        ///
-       void mathmlize(MathStream & ms) const override;
+       void mathmlize(MathMLStream & ms) const override;
        ///
        void htmlize(HtmlStream & os) const override;
 protected:

diff --git a/src/mathed/InsetMathEnsureMath.cpp b/src/mathed/InsetMathEnsureMath.cpp
index 55c7be78a9eb70e38e0428880ebee3732926a570..3669b09ba3690f0267e8179eac1c8c45c740fcd7 100644 (file)
--- a/src/mathed/InsetMathEnsureMath.cpp
+++ b/src/mathed/InsetMathEnsureMath.cpp
@@ -69,7 +69,7 @@ void InsetMathEnsureMath::write(WriteStream & os) const
 }
 
 
-void InsetMathEnsureMath::mathmlize(MathStream & ms) const
+void InsetMathEnsureMath::mathmlize(MathMLStream & ms) const
 {
        SetMode mathmode(ms, false);
        ms << MTag("mstyle", "class='math'")

diff --git a/src/mathed/InsetMathEnsureMath.h b/src/mathed/InsetMathEnsureMath.h
index ac491aff752046ca205664be00ae00d0f0036809..bbd4b80bc68adb1e3597ec2c4b6646b383006300 100644 (file)
--- a/src/mathed/InsetMathEnsureMath.h
+++ b/src/mathed/InsetMathEnsureMath.h
@@ -36,7 +36,7 @@ public:
        ///
        void write(WriteStream & os) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathExFunc.cpp b/src/mathed/InsetMathExFunc.cpp
index 9782e25cf3ff2aefdbe56b06d53aa1ca5fdf9cc1..16eb38515d40977fdaac0c06cbf258577097c890 100644 (file)
--- a/src/mathed/InsetMathExFunc.cpp
+++ b/src/mathed/InsetMathExFunc.cpp
@@ -122,7 +122,7 @@ void InsetMathExFunc::mathematica(MathematicaStream & os) const
 }
 
 
-void InsetMathExFunc::mathmlize(MathStream & ms) const
+void InsetMathExFunc::mathmlize(MathMLStream & ms) const
 {
        ms << "<" << from_ascii(ms.namespacedTag("mi")) << ">"
           << name_

diff --git a/src/mathed/InsetMathExFunc.h b/src/mathed/InsetMathExFunc.h
index 48c16e98d883b2aa0efda0addffdc0f72c90c736..ff99140cca6a1eaa259d3a469143888748ef4e2f 100644 (file)
--- a/src/mathed/InsetMathExFunc.h
+++ b/src/mathed/InsetMathExFunc.h
@@ -41,7 +41,7 @@ public:
        ///
        void mathematica(MathematicaStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathExInt.cpp b/src/mathed/InsetMathExInt.cpp
index f0242c0bdb1893a549c9bf582ac1348f562843cc..dcf274604b626a6bd52cee4123c1546571eadc0d 100644 (file)
--- a/src/mathed/InsetMathExInt.cpp
+++ b/src/mathed/InsetMathExInt.cpp
@@ -123,7 +123,7 @@ void InsetMathExInt::mathematica(MathematicaStream & os) const
 }
 
 
-void InsetMathExInt::mathmlize(MathStream & ms) const
+void InsetMathExInt::mathmlize(MathMLStream & ms) const
 {
        // At the moment, we are not extracting sums and the like for MathML.
        // If we should decide to do so later, then we'll need to re-merge

diff --git a/src/mathed/InsetMathExInt.h b/src/mathed/InsetMathExInt.h
index 4a8c97a83718bd2193f9961c60d56505d67d861c..0d58fb326a65bb15f8d5fd2a7c96fba79d56e5ac 100644 (file)
--- a/src/mathed/InsetMathExInt.h
+++ b/src/mathed/InsetMathExInt.h
@@ -52,7 +52,7 @@ public:
        ///
        void mathematica(MathematicaStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathFont.cpp b/src/mathed/InsetMathFont.cpp
index 1de00464a7326641ee8b3cb6012de649c9f77df4..317e285fdbcf8cec66b5fde2e2888deb51687b46 100644 (file)
--- a/src/mathed/InsetMathFont.cpp
+++ b/src/mathed/InsetMathFont.cpp
@@ -191,7 +191,7 @@ void InsetMathFont::htmlize(HtmlStream & os) const
 
 
 // The fonts we want to support are listed in lib/symbols
-void InsetMathFont::mathmlize(MathStream & ms) const
+void InsetMathFont::mathmlize(MathMLStream & ms) const
 {
        // FIXME These are not quite right, because they do not nest
        // correctly. A proper fix would presumably involve tracking

diff --git a/src/mathed/InsetMathFont.h b/src/mathed/InsetMathFont.h
index 32a360069fb9645ed3a5cd3ac68d9521775304db..8595c38c14fd549ef5e327e5be2d65e1e0b4d5ec 100644 (file)
--- a/src/mathed/InsetMathFont.h
+++ b/src/mathed/InsetMathFont.h
@@ -48,7 +48,7 @@ public:
        ///
        void validate(LaTeXFeatures & features) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathFrac.cpp b/src/mathed/InsetMathFrac.cpp
index 8a79214021a8b7a9aee425211ea09652210966e3..2ff0cb6cef6e175388ab596495d9e0d844820c3c 100644 (file)
--- a/src/mathed/InsetMathFrac.cpp
+++ b/src/mathed/InsetMathFrac.cpp
@@ -491,7 +491,7 @@ void InsetMathFrac::octave(OctaveStream & os) const
 }
 
 
-void InsetMathFrac::mathmlize(MathStream & ms) const
+void InsetMathFrac::mathmlize(MathMLStream & ms) const
 {
        switch (kind_) {
        case ATOP:
@@ -730,7 +730,7 @@ void InsetMathBinom::normalize(NormalStream & os) const
 }
 
 
-void InsetMathBinom::mathmlize(MathStream & ms) const
+void InsetMathBinom::mathmlize(MathMLStream & ms) const
 {
        char ldelim = ' ';
        char rdelim = ' ';

diff --git a/src/mathed/InsetMathFrac.h b/src/mathed/InsetMathFrac.h
index c8c65da9bdd96f6d59f00f0fe60711baa4ed126e..6691033183d088a534f79a1daf0c389576865efc 100644 (file)
--- a/src/mathed/InsetMathFrac.h
+++ b/src/mathed/InsetMathFrac.h
@@ -90,7 +90,7 @@ public:
        ///
        void octave(OctaveStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///
@@ -133,7 +133,7 @@ public:
        ///
        bool extraBraces() const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index 260d61ef8b2fac4e469fb6da070151a330b6aa81..f10633ebd4dac1f62c1847117db61f48b06a3b01 100644 (file)
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -1158,7 +1158,7 @@ void InsetMathGrid::normalize(NormalStream & os) const
 }
 
 
-void InsetMathGrid::mathmlize(MathStream & ms) const
+void InsetMathGrid::mathmlize(MathMLStream & ms) const
 {
        bool const havetable = nrows() > 1 || ncols() > 1;
        if (havetable)

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index dd61efd71ac8fca4df4a6f557d5e7f8cd8befa2c..992844cfb875cd25a7c6b02e8ee238f1b9fb7706 100644 (file)
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -218,7 +218,7 @@ public:
        ///
        //void maple(MapleStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index f0df1d90fd81b590e5833d9524d98ab3a8953111..1a58583ff41878330e29b92a00e9db4211732d77 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -2404,7 +2404,7 @@ void InsetMathHull::docbook(XMLStream & xs, OutputParams const & runparams) cons
        // With DocBook 5, MathML must be within its own namespace; defined in Buffer.cpp::writeDocBookSource as "m".
        // Output everything in a separate stream so that this does not interfere with the standard flow of DocBook tags.
        odocstringstream osmath;
-       MathStream ms(osmath, "m", true);
+       MathMLStream ms(osmath, "m", true);
 
        // Output the MathML subtree.
        odocstringstream ls;
@@ -2427,7 +2427,7 @@ void InsetMathHull::docbook(XMLStream & xs, OutputParams const & runparams) cons
        try {
                // First, generate the MathML expression.
                odocstringstream ostmp;
-               MathStream mstmp(ostmp, ms.xmlns(), ms.xmlMode());
+               MathMLStream mstmp(ostmp, ms.xmlns(), ms.xmlMode());
                InsetMathGrid::mathmlize(mstmp);
 
                // Then, output it (but only if the generation can be done without errors!).
@@ -2505,7 +2505,7 @@ void InsetMathHull::htmlize(HtmlStream & os) const
 // 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;
@@ -2592,7 +2592,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;
-               MathStream ms(os);
+               MathMLStream ms(os);
                try {
                        mathmlize(ms);
                        success = true;

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index d34f7fc6e401bab567e367fe53273cc066c94e95..6901d6241c79d6fc3b076f5554abc93913c38e29 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -148,7 +148,7 @@ public:
        ///
        docstring xhtml(XMLStream &, OutputParams const &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathKern.h b/src/mathed/InsetMathKern.h
index 1cf938b2bd509b635a943c686b7f5e1d4c2da833..77bf4118ec13e787a9a756602ca9e9e310093932 100644 (file)
--- a/src/mathed/InsetMathKern.h
+++ b/src/mathed/InsetMathKern.h
@@ -40,7 +40,7 @@ public:
        ///
        void normalize(NormalStream & ns) const override;
        ///
-       void mathmlize(MathStream &) const override { }
+       void mathmlize(MathMLStream &) const override { }
        ///
        void htmlize(HtmlStream &) const override { }
        ///

diff --git a/src/mathed/InsetMathMacro.cpp b/src/mathed/InsetMathMacro.cpp
index 24409512e1ba7344d39031a195e8bdc6537aa32a..0d3e5d9a394f5f64effea50104bfd6c69180ccf8 100644 (file)
--- a/src/mathed/InsetMathMacro.cpp
+++ b/src/mathed/InsetMathMacro.cpp
@@ -169,7 +169,7 @@ public:
        ///
        void mathematica(MathematicaStream & ms) const override { ms << mathMacro_->cell(idx_); }
        ///
-       void mathmlize(MathStream & ms) const override { ms << mathMacro_->cell(idx_); }
+       void mathmlize(MathMLStream & ms) const override { ms << mathMacro_->cell(idx_); }
        ///
        void htmlize(HtmlStream & ms) const override { ms << mathMacro_->cell(idx_); }
        ///
@@ -1240,7 +1240,7 @@ void InsetMathMacro::mathematica(MathematicaStream & os) const
 }
 
 
-void InsetMathMacro::mathmlize(MathStream & ms) const
+void InsetMathMacro::mathmlize(MathMLStream & ms) const
 {
        // macro_ is 0 if this is an unknown macro
        LATTEST(d->macro_ || d->displayMode_ != DISPLAY_NORMAL);

diff --git a/src/mathed/InsetMathMacro.h b/src/mathed/InsetMathMacro.h
index ccc879b5139e80afe84ae38439f870d37ac9925e..a2677d76357e9dfd65203845e4b034ea061a63a4 100644 (file)
--- a/src/mathed/InsetMathMacro.h
+++ b/src/mathed/InsetMathMacro.h
@@ -105,7 +105,7 @@ public:
        ///
        void mathematica(MathematicaStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathMatrix.cpp b/src/mathed/InsetMathMatrix.cpp
index bd43581ce0d6718dcb340f3ff37d3648f275dd49..6ee9586307292b32ce39d5cda7e2eddc82ae96ce 100644 (file)
--- a/src/mathed/InsetMathMatrix.cpp
+++ b/src/mathed/InsetMathMatrix.cpp
@@ -92,7 +92,7 @@ void InsetMathMatrix::mathematica(MathematicaStream & os) const
 }
 
 
-void InsetMathMatrix::mathmlize(MathStream & ms) const
+void InsetMathMatrix::mathmlize(MathMLStream & ms) const
 {
        ms << "<" << from_ascii(ms.namespacedTag("mo")) << " form='prefix' fence='true' stretchy='true' symmetric='true' lspace='thinmathspace'>"
           << convertDelimToXMLEscape(left_, ms.xmlMode())

diff --git a/src/mathed/InsetMathMatrix.h b/src/mathed/InsetMathMatrix.h
index 6f13b0f6293dd97453bf4d2866b2ab716bb88a9c..8750079380ca7e8cab972f9e8620e60ce2800a32 100644 (file)
--- a/src/mathed/InsetMathMatrix.h
+++ b/src/mathed/InsetMathMatrix.h
@@ -40,7 +40,7 @@ public:
        ///
        void mathematica(MathematicaStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathNumber.cpp b/src/mathed/InsetMathNumber.cpp
index 593da68d97af0016036fb1e17a16ddbb2bc3325b..3b10c7a45b4d152079a90ef5ff20b9dcf8790516 100644 (file)
--- a/src/mathed/InsetMathNumber.cpp
+++ b/src/mathed/InsetMathNumber.cpp
@@ -68,7 +68,7 @@ void InsetMathNumber::octave(OctaveStream & os) const
 }
 
 
-void InsetMathNumber::mathmlize(MathStream & ms) const
+void InsetMathNumber::mathmlize(MathMLStream & ms) const
 {
        ms << "<" << from_ascii(ms.namespacedTag("mn")) << ">"
           << str_

diff --git a/src/mathed/InsetMathNumber.h b/src/mathed/InsetMathNumber.h
index ce5803c1869e2932d894dfa82b75f88adb5d644a..8470d4b03fdf7dc558abdc252004cde0c710e151 100644 (file)
--- a/src/mathed/InsetMathNumber.h
+++ b/src/mathed/InsetMathNumber.h
@@ -43,7 +43,7 @@ public:
        ///
        void mathematica(MathematicaStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathOverset.cpp b/src/mathed/InsetMathOverset.cpp
index 2db26cf4c00983248fcaef9fdfdbf3b03b3bcc0b..a00888e1f6c8d316a34157d0cdab622bd4269def 100644 (file)
--- a/src/mathed/InsetMathOverset.cpp
+++ b/src/mathed/InsetMathOverset.cpp
@@ -103,7 +103,7 @@ void InsetMathOverset::normalize(NormalStream & os) const
 }
 
 
-void InsetMathOverset::mathmlize(MathStream & ms) const
+void InsetMathOverset::mathmlize(MathMLStream & ms) const
 {
        ms << "<" << from_ascii(ms.namespacedTag("mover")) << " accent='false'>"
           << cell(0) << cell(1)

diff --git a/src/mathed/InsetMathOverset.h b/src/mathed/InsetMathOverset.h
index 36b548ffc4e41427655a11fd61c43c60592dbb57..9925bad6c8d9cdcac88de25d653e5944574b4de2 100644 (file)
--- a/src/mathed/InsetMathOverset.h
+++ b/src/mathed/InsetMathOverset.h
@@ -38,7 +38,7 @@ public:
        ///
        void normalize(NormalStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathPhantom.h b/src/mathed/InsetMathPhantom.h
index aa1ccbfb83ff95b42da6b44b6641600a69aaae45..c4a6a8e108f4e737643d0a1d49945ade34bceddd 100644 (file)
--- a/src/mathed/InsetMathPhantom.h
+++ b/src/mathed/InsetMathPhantom.h
@@ -46,7 +46,7 @@ public:
        ///
        InsetCode lyxCode() const override { return MATH_PHANTOM_CODE; }
        /// Nothing for now
-       void mathmlize(MathStream &) const override {}
+       void mathmlize(MathMLStream &) const override {}
        /// Nothing for HTML
        void htmlize(HtmlStream &) const override {}
        /// request "external features"

diff --git a/src/mathed/InsetMathRoot.cpp b/src/mathed/InsetMathRoot.cpp
index 55da0086bf4d109ce356540a3c422d98e7499176..4ab30583774ab5c98cdc662d0e232b6d78011548 100644 (file)
--- a/src/mathed/InsetMathRoot.cpp
+++ b/src/mathed/InsetMathRoot.cpp
@@ -216,7 +216,7 @@ void InsetMathRoot::octave(OctaveStream & os) const
 }
 
 
-void InsetMathRoot::mathmlize(MathStream & ms) const
+void InsetMathRoot::mathmlize(MathMLStream & ms) const
 {
        ms << MTag("mroot") << cell(0) << cell(1) << ETag("mroot");
 }

diff --git a/src/mathed/InsetMathRoot.h b/src/mathed/InsetMathRoot.h
index 253d0e7164a8c1fe30507381cb86662b56bbc4ea..ad57e8e3bf941cfc9737a51ab0191faa3aea1612 100644 (file)
--- a/src/mathed/InsetMathRoot.h
+++ b/src/mathed/InsetMathRoot.h
@@ -45,7 +45,7 @@ public:
        ///
        void normalize(NormalStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index 15ed90f131c7101114ef48493c617c42be16ffc1..0b82d05c12ed7c86613fed7cfea3bafaec8bec85 100644 (file)
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -594,11 +594,11 @@ void InsetMathScript::mathematica(MathematicaStream & os) const
 }
 
 
-void InsetMathScript::mathmlize(MathStream & ms) const
+void InsetMathScript::mathmlize(MathMLStream & ms) const
 {
        bool d = hasDown() && !down().empty();
        bool u = hasUp() && !up().empty();
-       // FIXME: the MathStream should be able to give us this information
+       // FIXME: the MathMLStream should be able to give us this information
        bool l = has_limits_;
 
        if (u && d)

diff --git a/src/mathed/InsetMathScript.h b/src/mathed/InsetMathScript.h
index 1b34c5c7adf073f13446d4ff8f3b12bea7bc46d9..909fd768d2c6452dcc4733824df124edee74c0d6 100644 (file)
--- a/src/mathed/InsetMathScript.h
+++ b/src/mathed/InsetMathScript.h
@@ -65,7 +65,7 @@ public:
        /// write content as something readable by Mathematica
        void mathematica(MathematicaStream &) const override;
        /// write content as MathML
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        /// write content as HTML
        void htmlize(HtmlStream &) const override;
        /// write content as something readable by Octave

diff --git a/src/mathed/InsetMathSideset.cpp b/src/mathed/InsetMathSideset.cpp
index 7dccfc1727dd4dd2f9a1cba9bed2222f6d67a92f..df7f43d14d951cd4406f365405d48c196a567b5c 100644 (file)
--- a/src/mathed/InsetMathSideset.cpp
+++ b/src/mathed/InsetMathSideset.cpp
@@ -385,7 +385,7 @@ void InsetMathSideset::normalize(NormalStream & os) const
 }
 
 
-void InsetMathSideset::mathmlize(MathStream & ms) const
+void InsetMathSideset::mathmlize(MathMLStream & ms) const
 {
        // FIXME This is only accurate if both scriptl_ and scriptr_ are true
        if (!scriptl_)

diff --git a/src/mathed/InsetMathSideset.h b/src/mathed/InsetMathSideset.h
index 8bfe8105bb11870abadff4b0496f3079e98de1b1..c32c1330323d25c727e2f619df06519c389b0923 100644 (file)
--- a/src/mathed/InsetMathSideset.h
+++ b/src/mathed/InsetMathSideset.h
@@ -54,7 +54,7 @@ public:
        /// write normalized content
        void normalize(NormalStream &) const override;
        /// write content as MathML
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        /// write content as HTML
        void htmlize(HtmlStream &) const override;
 

diff --git a/src/mathed/InsetMathSize.cpp b/src/mathed/InsetMathSize.cpp
index baacafffa4c0d9eab482019a44fd5234783bda97..195a4545f4a6ce779c46623799797f56ca8d3096 100644 (file)
--- a/src/mathed/InsetMathSize.cpp
+++ b/src/mathed/InsetMathSize.cpp
@@ -73,7 +73,7 @@ void InsetMathSize::write(WriteStream & os) const
 //     \scriptscriptstyle. The corresponding values of displaystyle and scriptlevel
 //     for those TeX styles would be "true" and "0", "false" and "0", "false" and "1",
 //     and "false" and "2", respectively.
-void InsetMathSize::mathmlize(MathStream & ms) const
+void InsetMathSize::mathmlize(MathMLStream & ms) const
 {
        string const & name = to_utf8(key_->name);
        bool dispstyle = (name == "displaystyle");

diff --git a/src/mathed/InsetMathSize.h b/src/mathed/InsetMathSize.h
index 783e826439de78029ab11314caa0c7d53992b9df..48d1e7595385de8a6bb75032a5f9122b7e08399f 100644 (file)
--- a/src/mathed/InsetMathSize.h
+++ b/src/mathed/InsetMathSize.h
@@ -41,7 +41,7 @@ public:
        ///
        void infoize(odocstream & os) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathSpace.cpp b/src/mathed/InsetMathSpace.cpp
index 8e764868eb877dba43ec49667e024338318cb788..f639218687c84b3079453b080989511838a4d991 100644 (file)
--- a/src/mathed/InsetMathSpace.cpp
+++ b/src/mathed/InsetMathSpace.cpp
@@ -195,7 +195,7 @@ void InsetMathSpace::octave(OctaveStream & os) const
 }
 
 
-void InsetMathSpace::mathmlize(MathStream & ms) const
+void InsetMathSpace::mathmlize(MathMLStream & ms) const
 {
        SpaceInfo const & si = space_info[space_];
        if (si.negative || !si.visible)

diff --git a/src/mathed/InsetMathSpace.h b/src/mathed/InsetMathSpace.h
index ff23305466f92f09d3954c120ac3cbb9b3338ef4..1b0fc037edc20a8d712dc5c37ee30021fe40da64 100644 (file)
--- a/src/mathed/InsetMathSpace.h
+++ b/src/mathed/InsetMathSpace.h
@@ -52,7 +52,7 @@ public:
        ///
        void octave(OctaveStream &) const override;
        ///
-       void mathmlize(MathStream & ms) const override;
+       void mathmlize(MathMLStream & ms) const override;
        ///
        void htmlize(HtmlStream & ms) const override;
        ///

diff --git a/src/mathed/InsetMathSpecialChar.cpp b/src/mathed/InsetMathSpecialChar.cpp
index f2a9a737f31dafe244c04597799b1a35bd6fe2f1..d901b213b9ac5b63e8566c22f007c845abaadbad 100644 (file)
--- a/src/mathed/InsetMathSpecialChar.cpp
+++ b/src/mathed/InsetMathSpecialChar.cpp
@@ -132,7 +132,7 @@ void InsetMathSpecialChar::octave(OctaveStream & os) const
 }
 
 
-void InsetMathSpecialChar::mathmlize(MathStream & ms) const
+void InsetMathSpecialChar::mathmlize(MathMLStream & ms) const
 {
        switch (char_) {
        case '&':

diff --git a/src/mathed/InsetMathSpecialChar.h b/src/mathed/InsetMathSpecialChar.h
index 88acce613e0248248943422c9fa9e6a2f14a2fcf..9f81ae6e40c361a24cdc9a6cecb452b51a48930c 100644 (file)
--- a/src/mathed/InsetMathSpecialChar.h
+++ b/src/mathed/InsetMathSpecialChar.h
@@ -47,7 +47,7 @@ public:
        ///
        void mathematica(MathematicaStream &) const override;
        ///
-       void mathmlize(MathStream & ms) const override;
+       void mathmlize(MathMLStream & ms) const override;
        ///
        void htmlize(HtmlStream & ms) const override;
        /// identifies SpecialChar insets

diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index 31314b3f842822b38bf70ebd02d0978353a81538..6099070178c920ee42b78e16910c93057d8c03e4 100644 (file)
--- a/src/mathed/InsetMathSplit.cpp
+++ b/src/mathed/InsetMathSplit.cpp
@@ -186,7 +186,7 @@ void InsetMathSplit::infoize(odocstream & os) const
 }
 
 
-void InsetMathSplit::mathmlize(MathStream & ms) const
+void InsetMathSplit::mathmlize(MathMLStream & ms) const
 {
        // split, gathered, aligned, alignedat
        // At the moment, those seem to display just fine without any

diff --git a/src/mathed/InsetMathSplit.h b/src/mathed/InsetMathSplit.h
index c271414bc1f68fb846ee998b18b082aca66db640..f7c2f16dfe0618ccd968a30196a20a81b26a7c3d 100644 (file)
--- a/src/mathed/InsetMathSplit.h
+++ b/src/mathed/InsetMathSplit.h
@@ -35,7 +35,7 @@ public:
        ///
        void infoize(odocstream & os) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathSqrt.cpp b/src/mathed/InsetMathSqrt.cpp
index 23d28e80293e7e799d3b2c122083f440dc9c63c0..51e1e2fe845043b3fc5c6b3538182a3e06d8944d 100644 (file)
--- a/src/mathed/InsetMathSqrt.cpp
+++ b/src/mathed/InsetMathSqrt.cpp
@@ -98,7 +98,7 @@ void InsetMathSqrt::octave(OctaveStream & os) const
 }
 
 
-void InsetMathSqrt::mathmlize(MathStream & ms) const
+void InsetMathSqrt::mathmlize(MathMLStream & ms) const
 {
        ms << MTag("msqrt") << cell(0) << ETag("msqrt");
 }

diff --git a/src/mathed/InsetMathSqrt.h b/src/mathed/InsetMathSqrt.h
index dba72eed704cd3ed2120e9eb908ca35a4e8fb16f..1a299a64dee55eaa92399a74424827d64771452b 100644 (file)
--- a/src/mathed/InsetMathSqrt.h
+++ b/src/mathed/InsetMathSqrt.h
@@ -44,7 +44,7 @@ public:
        ///
        void octave(OctaveStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathStackrel.cpp b/src/mathed/InsetMathStackrel.cpp
index 53e307571486e188ecbb4cac5e6f1291ffa7b43c..e9b974cd0f6dbc79c682f39bf37047312b643bf6 100644 (file)
--- a/src/mathed/InsetMathStackrel.cpp
+++ b/src/mathed/InsetMathStackrel.cpp
@@ -141,7 +141,7 @@ void InsetMathStackrel::normalize(NormalStream & os) const
 }
 
 
-void InsetMathStackrel::mathmlize(MathStream & ms) const
+void InsetMathStackrel::mathmlize(MathMLStream & ms) const
 {
        if (nargs() > 2)
                ms << "<" << from_ascii(ms.namespacedTag("munderover")) << ">"

diff --git a/src/mathed/InsetMathStackrel.h b/src/mathed/InsetMathStackrel.h
index 0e5514fd38be3a1a9d78919b687782315cc44c1f..6af7fbdaa01faf7b3ea508d61df85531f578d934 100644 (file)
--- a/src/mathed/InsetMathStackrel.h
+++ b/src/mathed/InsetMathStackrel.h
@@ -38,7 +38,7 @@ public:
        ///
        void normalize(NormalStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathString.cpp b/src/mathed/InsetMathString.cpp
index 8aac4f38a8d4f723fa569391887d0fde7decb190..ef403f452a8f0610b2ea7490930e3d19d6a42c73 100644 (file)
--- a/src/mathed/InsetMathString.cpp
+++ b/src/mathed/InsetMathString.cpp
@@ -94,7 +94,7 @@ void InsetMathString::octave(OctaveStream & os) const
 }
 
 
-void InsetMathString::mathmlize(MathStream &) const
+void InsetMathString::mathmlize(MathMLStream &) const
 {
        // useless, no doubt, but we should not be here
        LATTEST(false);

diff --git a/src/mathed/InsetMathString.h b/src/mathed/InsetMathString.h
index 9f2e0bf4f509cc907b5f1f111437416d8a9ab8c4..ad18fae0e751df7b1288852d0d5c27e76afe9a19 100644 (file)
--- a/src/mathed/InsetMathString.h
+++ b/src/mathed/InsetMathString.h
@@ -47,7 +47,7 @@ public:
        ///
        void mathematica(MathematicaStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void write(WriteStream & os) const override;
        ///

diff --git a/src/mathed/InsetMathSubstack.cpp b/src/mathed/InsetMathSubstack.cpp
index f9dfb01821e5bb6603a42c050cf05c75f61a1b56..f44bf9f78008f1da66a13954af65377e69ac7b4e 100644 (file)
--- a/src/mathed/InsetMathSubstack.cpp
+++ b/src/mathed/InsetMathSubstack.cpp
@@ -125,7 +125,7 @@ void InsetMathSubstack::maple(MapleStream & os) const
 }
 
 
-void InsetMathSubstack::mathmlize(MathStream & ms) const
+void InsetMathSubstack::mathmlize(MathMLStream & ms) const
 {
        int movers = 0;
        row_type const numrows = nrows();

diff --git a/src/mathed/InsetMathSubstack.h b/src/mathed/InsetMathSubstack.h
index f5be05ff0302d046ec6e5e79bdfec41d548b4fe6..1950acd4fa74d486d8a83605f33aa3cef8467980 100644 (file)
--- a/src/mathed/InsetMathSubstack.h
+++ b/src/mathed/InsetMathSubstack.h
@@ -39,7 +39,7 @@ public:
        ///
        void write(WriteStream & os) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathSymbol.cpp b/src/mathed/InsetMathSymbol.cpp
index 5c6d96fd4883377ee8d2650ea94af05ea119325e..f8315391dfce9b4f7e982ef11646056fbaa1c7b8 100644 (file)
--- a/src/mathed/InsetMathSymbol.cpp
+++ b/src/mathed/InsetMathSymbol.cpp
@@ -156,7 +156,7 @@ void InsetMathSymbol::mathematica(MathematicaStream & os) const
 }
 
 
-void InsetMathSymbol::mathmlize(MathStream & ms) const
+void InsetMathSymbol::mathmlize(MathMLStream & ms) const
 {
        // FIXME We may need to do more interesting things
        // with MathMLtype.

diff --git a/src/mathed/InsetMathSymbol.h b/src/mathed/InsetMathSymbol.h
index a21bc935eff1f0f371de29c7c1a4b794fe729f0a..00458c34db9eeeae01f65816d7110783a813dc06 100644 (file)
--- a/src/mathed/InsetMathSymbol.h
+++ b/src/mathed/InsetMathSymbol.h
@@ -63,7 +63,7 @@ public:
        ///
        void mathematica(MathematicaStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        /// \param spacing controls whether we print spaces around

diff --git a/src/mathed/InsetMathUnderset.cpp b/src/mathed/InsetMathUnderset.cpp
index 2c38e3065f2a2f5d054f0fbfacc870d5c796ffe8..bb628fb5a85e436b9351f476e46e759f9446a335 100644 (file)
--- a/src/mathed/InsetMathUnderset.cpp
+++ b/src/mathed/InsetMathUnderset.cpp
@@ -92,7 +92,7 @@ void InsetMathUnderset::normalize(NormalStream & os) const
 }
 
 
-void InsetMathUnderset::mathmlize(MathStream & ms) const
+void InsetMathUnderset::mathmlize(MathMLStream & ms) const
 {
        ms << "<" << from_ascii(ms.namespacedTag("munder")) << " accent='false'>"
           << cell(0) << cell(1)

diff --git a/src/mathed/InsetMathUnderset.h b/src/mathed/InsetMathUnderset.h
index a546f2420d968155b449325b630de4d4d2f3d21d..f84c4814dc1e177bb87226ea4b1dcd284f927b09 100644 (file)
--- a/src/mathed/InsetMathUnderset.h
+++ b/src/mathed/InsetMathUnderset.h
@@ -36,7 +36,7 @@ public:
        ///
        void normalize(NormalStream & ns) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathUnknown.cpp b/src/mathed/InsetMathUnknown.cpp
index e79a17c015b289acdb679f7ead9989a1e133d984..92d6b416e1fe31ef2c894c5f74447bee6d970527 100644 (file)
--- a/src/mathed/InsetMathUnknown.cpp
+++ b/src/mathed/InsetMathUnknown.cpp
@@ -89,7 +89,7 @@ void InsetMathUnknown::mathematica(MathematicaStream & os) const
 }
 
 
-void InsetMathUnknown::mathmlize(MathStream &) const
+void InsetMathUnknown::mathmlize(MathMLStream &) const
 {
        throw MathExportException();
 }

diff --git a/src/mathed/InsetMathUnknown.h b/src/mathed/InsetMathUnknown.h
index cd73f96aa7ff0fa9519ada1512354a8be8e4cd96..f0377168fa60789f926be551bcb6c737f4d6dad8 100644 (file)
--- a/src/mathed/InsetMathUnknown.h
+++ b/src/mathed/InsetMathUnknown.h
@@ -48,7 +48,7 @@ public:
        ///
        void mathematica(MathematicaStream &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp
index f4bd7e18cb97f568d1429274c68e06e011d2b36b..2de93f79909fe4e01807e81f9849e877ee162965 100644 (file)
--- a/src/mathed/InsetMathXArrow.cpp
+++ b/src/mathed/InsetMathXArrow.cpp
@@ -84,7 +84,7 @@ void InsetMathXArrow::normalize(NormalStream & os) const
 }
 
 
-void InsetMathXArrow::mathmlize(MathStream & ms) const
+void InsetMathXArrow::mathmlize(MathMLStream & ms) const
 {
        char const * arrow;
 

diff --git a/src/mathed/InsetMathXArrow.h b/src/mathed/InsetMathXArrow.h
index 7c98ccaa130958eb9a2be84a9ce6b0613e160ff8..b3bd67e10f9d8f98a7156d4d13c0ee5e49183d8b 100644 (file)
--- a/src/mathed/InsetMathXArrow.h
+++ b/src/mathed/InsetMathXArrow.h
@@ -32,7 +32,7 @@ public:
        ///
        void normalize(NormalStream & os) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///

diff --git a/src/mathed/InsetMathXYMatrix.cpp b/src/mathed/InsetMathXYMatrix.cpp
index f559aa2d1ab84124474493e8620d46f78e6c3b00..036f54aa9d85ea166d0f428b571d1148962e7613 100644 (file)
--- a/src/mathed/InsetMathXYMatrix.cpp
+++ b/src/mathed/InsetMathXYMatrix.cpp
@@ -154,7 +154,7 @@ void InsetMathXYMatrix::validate(LaTeXFeatures & features) const
 }
 
 
-void InsetMathXYMatrix::mathmlize(MathStream &) const
+void InsetMathXYMatrix::mathmlize(MathMLStream &) const
 {
        throw MathExportException();
 }

diff --git a/src/mathed/InsetMathXYMatrix.h b/src/mathed/InsetMathXYMatrix.h
index 5655e33c751f8dcf3f4e282423d71c3ada11b71e..95be0fe3ce99ed5a8f3996ebb35428216b084191 100644 (file)
--- a/src/mathed/InsetMathXYMatrix.h
+++ b/src/mathed/InsetMathXYMatrix.h
@@ -49,7 +49,7 @@ public:
        ///
        InsetCode lyxCode() const override { return MATH_XYMATRIX_CODE; }
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
 

diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index 4d53b28245679d47f90fbad8591f7395c9339601..42a2d25f43a195824cd1783dd8bc93744b302674 100644 (file)
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -1586,7 +1586,7 @@ void mathematica(MathData const & dat, MathematicaStream & os)
 }
 
 
-void mathmlize(MathData const & dat, MathStream & ms)
+void mathmlize(MathData const & dat, MathMLStream & ms)
 {
        MathData ar = dat;
        extractStructure(ar, MATHML);

diff --git a/src/mathed/MathExtern.h b/src/mathed/MathExtern.h
index b6707f92a9fc7464315872bb01860e4dc399e35c..973f026a1e1d2115bd1124e87b30038dac520a3a 100644 (file)
--- a/src/mathed/MathExtern.h
+++ b/src/mathed/MathExtern.h
@@ -21,7 +21,7 @@ class NormalStream;
 class MapleStream;
 class MaximaStream;
 class MathematicaStream;
-class MathStream;
+class MathMLStream;
 class OctaveStream;
 class WriteStream;
 class MathData;
@@ -32,7 +32,7 @@ void normalize(MathData const &, NormalStream &);
 void maple(MathData const &, MapleStream &);
 void maxima(MathData const &, MaximaStream &);
 void mathematica(MathData const &, MathematicaStream &);
-void mathmlize(MathData const &, MathStream &);
+void mathmlize(MathData const &, MathMLStream &);
 void octave(MathData const &, OctaveStream &);
 
 bool extractNumber(MathData const & ar, int & i);

diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp
index 9c2d5cef8c26475c42863e99e456dfe355635df5..43e4a3e570a53e1b6fc6486959a3c0f807542a55 100644 (file)
--- a/src/mathed/MathStream.cpp
+++ b/src/mathed/MathStream.cpp
@@ -267,12 +267,12 @@ WriteStream & operator<<(WriteStream & ws, unsigned int i)
 //////////////////////////////////////////////////////////////////////
 
 
-MathStream::MathStream(odocstream & os, std::string const & xmlns, bool xmlMode)
+MathMLStream::MathMLStream(odocstream & os, std::string const & xmlns, bool xmlMode)
        : os_(os), tab_(0), line_(0), in_text_(false), xmlns_(xmlns), xml_mode_(xmlMode)
 {}
 
 
-void MathStream::cr()
+void MathMLStream::cr()
 {
        os() << '\n';
        for (int i = 0; i < tab(); ++i)
@@ -280,60 +280,60 @@ void MathStream::cr()
 }
 
 
-void MathStream::defer(docstring const & s)
+void MathMLStream::defer(docstring const & s)
 {
        deferred_ << s;
 }
 
 
-void MathStream::defer(string const & s)
+void MathMLStream::defer(string const & s)
 {
        deferred_ << from_utf8(s);
 }
 
 
-docstring MathStream::deferred() const
+docstring MathMLStream::deferred() const
 {
        return deferred_.str();
 }
 
 
-MathStream & operator<<(MathStream & ms, MathAtom const & at)
+MathMLStream & operator<<(MathMLStream & ms, MathAtom const & at)
 {
        at->mathmlize(ms);
        return ms;
 }
 
 
-MathStream & operator<<(MathStream & ms, MathData const & ar)
+MathMLStream & operator<<(MathMLStream & ms, MathData const & ar)
 {
        mathmlize(ar, ms);
        return ms;
 }
 
 
-MathStream & operator<<(MathStream & ms, char const * s)
+MathMLStream & operator<<(MathMLStream & ms, char const * s)
 {
        ms.os() << s;
        return ms;
 }
 
 
-MathStream & operator<<(MathStream & ms, char c)
+MathMLStream & operator<<(MathMLStream & ms, char c)
 {
        ms.os() << c;
        return ms;
 }
 
 
-MathStream & operator<<(MathStream & ms, char_type c)
+MathMLStream & operator<<(MathMLStream & ms, char_type c)
 {
        ms.os().put(c);
        return ms;
 }
 
 
-MathStream & operator<<(MathStream & ms, MTag const & t)
+MathMLStream & operator<<(MathMLStream & ms, MTag const & t)
 {
        ++ms.tab();
        ms.cr();
@@ -345,7 +345,7 @@ MathStream & operator<<(MathStream & ms, MTag const & t)
 }
 
 
-MathStream & operator<<(MathStream & ms, ETag const & t)
+MathMLStream & operator<<(MathMLStream & ms, ETag const & t)
 {
        ms.cr();
        if (ms.tab() > 0)
@@ -355,7 +355,7 @@ MathStream & operator<<(MathStream & ms, ETag const & t)
 }
 
 
-MathStream & operator<<(MathStream & ms, CTag const & t)
+MathMLStream & operator<<(MathMLStream & ms, CTag const & t)
 {
        ms.cr();
        ms.os() << "<" << from_ascii(ms.namespacedTag(t.tag_));
@@ -366,7 +366,7 @@ MathStream & operator<<(MathStream & ms, CTag const & t)
 }
 
 
-MathStream & operator<<(MathStream & ms, docstring const & s)
+MathMLStream & operator<<(MathMLStream & ms, docstring const & s)
 {
        ms.os() << s;
        return ms;
@@ -461,7 +461,7 @@ HtmlStream & operator<<(HtmlStream & ms, docstring const & s)
 //////////////////////////////////////////////////////////////////////
 
 
-SetMode::SetMode(MathStream & ms, bool text)
+SetMode::SetMode(MathMLStream & ms, bool text)
        : ms_(ms)
 {
        was_text_ = ms_.inText();

diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index a75a4cd907ac08685f500db6f97436ce61fbf5e2..56df9b40a3027dafd32db0eb6f76569145129fee 100644 (file)
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -341,10 +341,10 @@ public:
 class MathExportException : public std::exception {};
 
 
-class MathStream {
+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 MathStream(odocstream & os, std::string const & xmlns = "", bool xmlMode = false);
+       explicit MathMLStream(odocstream & os, std::string const & xmlns = "", bool xmlMode = false);
        ///
        void cr();
        ///
@@ -354,7 +354,7 @@ public:
        ///
        int & tab() { return tab_; }
        ///
-       friend MathStream & operator<<(MathStream &, char const *);
+       friend MathMLStream & operator<<(MathMLStream &, char const *);
        ///
        void defer(docstring const &);
        ///
@@ -393,35 +393,35 @@ private:
 };
 
 ///
-MathStream & operator<<(MathStream &, MathAtom const &);
+MathMLStream & operator<<(MathMLStream &, MathAtom const &);
 ///
-MathStream & operator<<(MathStream &, MathData const &);
+MathMLStream & operator<<(MathMLStream &, MathData const &);
 ///
-MathStream & operator<<(MathStream &, docstring const &);
+MathMLStream & operator<<(MathMLStream &, docstring const &);
 ///
-MathStream & operator<<(MathStream &, char const *);
+MathMLStream & operator<<(MathMLStream &, char const *);
 ///
-MathStream & operator<<(MathStream &, char);
+MathMLStream & operator<<(MathMLStream &, char);
 ///
-MathStream & operator<<(MathStream &, char_type);
+MathMLStream & operator<<(MathMLStream &, char_type);
 ///
-MathStream & operator<<(MathStream &, MTag const &);
+MathMLStream & operator<<(MathMLStream &, MTag const &);
 ///
-MathStream & operator<<(MathStream &, ETag const &);
+MathMLStream & operator<<(MathMLStream &, ETag const &);
 ///
-MathStream & operator<<(MathStream &, CTag const &);
+MathMLStream & operator<<(MathMLStream &, CTag const &);
 
 
 /// A simpler version of ModeSpecifier, for MathML
 class SetMode {
 public:
        ///
-       explicit SetMode(MathStream & ms, bool text);
+       explicit SetMode(MathMLStream & ms, bool text);
        ///
        ~SetMode();
 private:
        ///
-       MathStream & ms_;
+       MathMLStream & ms_;
        ///
        bool was_text_;
 };

diff --git a/src/xml.h b/src/xml.h
index 902007581ea4f64dc377e465c76f190746ff5f8a..471d925201f44d4e6cf21999b56a8c657c2643b0 100644 (file)
--- a/src/xml.h
+++ b/src/xml.h
@@ -25,7 +25,7 @@ class Paragraph;
 class OutputParams;
 
 // Inspiration for the *Tag structs and for XMLStream
-// came from MathStream and its cousins.
+// came from MathMLStream and its cousins.
 
 namespace xml {
 struct StartTag;