X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathStream.h;h=ad1baada353dcd214b682442db7def4527a3a0d2;hb=efaae780dbbe3685e26e040ed4255e5abf268106;hp=cf08afe23c5890405a6664fb4ce4617a7bbacf2d;hpb=30b18aec37da1355c8947cfeb8d181e7b5a9a4f9;p=lyx.git

diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index cf08afe23c..ad1baada35 100644
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -59,6 +59,10 @@ public:
 	bool & firstitem() { return firstitem_; }
 	///
 	void addlines(unsigned int);
+	/// record whether we can write an immediately following newline char
+	void canBreakLine(bool breakline) { canbreakline_ = breakline; }
+	/// tell whether we can write an immediately following newline char
+	bool canBreakLine() const { return canbreakline_; }
 	/// writes space if next thing is isalpha()
 	void pendingSpace(bool how);
 	/// writes space if next thing is isalpha()
@@ -102,6 +106,8 @@ private:
 	bool locked_;
 	/// should we use only ascii chars when producing latex code?
 	bool ascii_;
+	/// are we allowed to output an immediately following newline?
+	bool canbreakline_;
 	///
 	int line_;
 	///
@@ -262,6 +268,13 @@ public:
 };
 
 
+/// Throw MathExportException to signal that the attempt to export
+/// some math in the current format did not succeed. E.g., we can't
+/// export xymatrix as MathML, so that will throw, and we'll fall back
+/// to images.
+class MathExportException : public std::exception {};
+
+
 class MathStream {
 public:
 	///
@@ -286,9 +299,7 @@ public:
 	bool inText() const { return in_text_; }
 private:
 	///
-	void setTextMode() { in_text_ = true; }
-	///
-	void setMathMode() { in_text_ = false; }
+	void setTextMode(bool t) { in_text_ = t; }
 	///
 	odocstream & os_;
 	///
@@ -296,8 +307,6 @@ private:
 	///
 	int line_;
 	///
-	char lastchar_;
-	///
 	bool in_text_;
 	///
 	odocstringstream deferred_;
@@ -324,30 +333,16 @@ MathStream & operator<<(MathStream &, ETag const &);
 
 
 /// A simpler version of ModeSpecifier, for MathML
-// FIXME There are still problems here with nesting, at least
-// potentially. The problem is that true nesting of text mode isn't
-// actually possible. I.e., we can't have: 
-//		<mtext><mtext></mtext></mtext>
-// So we have to have:
-//		<mtext></mtext><mtext></mtext><mtext></mtext>
-// instead, where the last is really a continuation of the first.
-// We'll need some kind of stack to remember all that.
 class SetMode {
 public:
-	///
-	explicit SetMode(MathStream & os, bool text, docstring attrs);
 	///
 	explicit SetMode(MathStream & os, bool text);
 	///
 	~SetMode();
 private:
-	///
-	void init(bool, docstring);
 	///
 	MathStream & os_;
 	///
-	bool opened_;
-	///
 	bool was_text_;
 };
 
@@ -376,9 +371,7 @@ public:
 	bool inText() const { return in_text_; }
 private:
 	///
-	void setTextMode() { in_text_ = true; }
-	///
-	void setMathMode() { in_text_ = false; }
+	void setTextMode(bool t) { in_text_ = t; }
 	///
 	odocstream & os_;
 	///
@@ -386,13 +379,11 @@ private:
 	///
 	int line_;
 	///
-	char lastchar_;
-	///
 	bool in_text_;
 	///
 	odocstringstream deferred_;
 	///
-	friend class SetMode;
+	friend class SetHTMLMode;
 };
 
 ///
@@ -413,6 +404,20 @@ HtmlStream & operator<<(HtmlStream &, MTag const &);
 HtmlStream & operator<<(HtmlStream &, ETag const &);
 
 
+class SetHTMLMode {
+public:
+	///
+	explicit SetHTMLMode(HtmlStream & os, bool text);
+	///
+	~SetHTMLMode();
+private:
+	///
+	HtmlStream & os_;
+	///
+	bool was_text_;
+};
+
+
 //
 // Debugging
 //