Revert c6ce76c2 and fix 670efa8f

[lyx.git] / src / mathed / MathStream.h

diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index 6f432b65fcfed9b4cf5f4d855b50685c1e9260bc..3116ab43d0dde4bf87d9cfd7529ce7869d558920 100644 (file)
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -17,6 +17,7 @@
 
 #include "support/Changer.h"
 #include "support/strfwd.h"
+#include "support/unique_ptr.h"
 
 
 namespace lyx {
@@ -25,6 +26,7 @@ class Encoding;
 class InsetMath;
 class MathAtom;
 class MathData;
+struct RowEntry;
 
 //
 // LaTeX/LyX
@@ -39,10 +41,9 @@ public:
                wsPreview
        };
        ///
-       WriteStream(otexrowstream & os, bool fragile, bool latex, OutputType output,
-                               Encoding const * encoding = 0);
-       ///
-       explicit WriteStream(otexrowstream & os);
+       explicit WriteStream(otexrowstream & os, bool fragile = false,
+                            bool latex = false, OutputType output = wsDefault,
+                            Encoding const * encoding = 0);
        ///
        ~WriteStream();
        ///
@@ -89,7 +90,7 @@ public:
        Encoding const * encoding() const { return encoding_; }
 
        /// Temporarily change the TexRow information about the outer row entry.
-       Changer changeRowEntry(TexRow::RowEntry entry);
+       Changer changeRowEntry(RowEntry entry);
        /// TexRow::starts the innermost outer math inset
        /// returns true if the outer row entry will appear at this line
        bool startOuterRow();
@@ -121,7 +122,8 @@ private:
        ///
        Encoding const * encoding_;
        /// Row entry we are in
-       TexRow::RowEntry row_entry_;
+       /// (it is a pointer to allow forward-declaration)
+       unique_ptr<RowEntry> row_entry_;
 };
 
 ///
@@ -585,6 +587,9 @@ OctaveStream & operator<<(OctaveStream &, char);
 ///
 OctaveStream & operator<<(OctaveStream &, int);
 
+
+docstring convertDelimToXMLEscape(docstring const & name);
+
 } // namespace lyx
 
 #endif