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

diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index 5eb2f8de2f..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_;
 	///
@@ -127,7 +133,7 @@ WriteStream & operator<<(WriteStream &, unsigned int);
 bool ensureMath(WriteStream & os, bool needs_math_mode = true, bool macro = false);
 
 /// ensure the requested mode, possibly by closing \ensuremath
-int ensureMode(WriteStream & os, InsetMath::mode_type mode, bool locked);
+int ensureMode(WriteStream & os, InsetMath::mode_type mode, bool locked, bool ascii);
 
 
 /**
@@ -191,6 +197,8 @@ private:
  * the mode needs being temporarily switched when a command would not work
  * in the current mode. As there are cases where this switching is to be
  * avoided, the optional third parameter can be used to lock the mode.
+ * When the mode is locked, the optional fourth parameter specifies whether
+ * strings are to be output by using a suitable ascii representation.
  *
  * Example 1:
  *
@@ -204,6 +212,13 @@ private:
  *
  * Sets the current mode to text mode and disallows mode switching.
  *
+ * Example 3:
+ *
+ *      ModeSpecifier specifier(os, TEXT_MODE, true, true);
+ *
+ * Sets the current mode to text mode, disallows mode switching, and outputs
+ * strings as ascii only.
+ *
  * At the end of specifier's scope the mode is reset to its previous value.
  */
 class ModeSpecifier
@@ -211,13 +226,14 @@ class ModeSpecifier
 public:
 	///
 	explicit ModeSpecifier(WriteStream & os, InsetMath::mode_type mode,
-				bool locked = false)
-		: os_(os), oldmodes_(ensureMode(os, mode, locked)) {}
+				bool locked = false, bool ascii = false)
+		: os_(os), oldmodes_(ensureMode(os, mode, locked, ascii)) {}
 	///
 	~ModeSpecifier()
 	{
-		os_.textMode(oldmodes_ & 1);
-		os_.lockedMode(oldmodes_ & 2);
+		os_.textMode(oldmodes_ & 0x01);
+		os_.lockedMode(oldmodes_ & 0x02);
+		os_.asciiOnly(oldmodes_ & 0x04);
 	}
 private:
 	///
@@ -252,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:
 	///
@@ -276,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_;
 	///
@@ -286,8 +307,6 @@ private:
 	///
 	int line_;
 	///
-	char lastchar_;
-	///
 	bool in_text_;
 	///
 	odocstringstream deferred_;
@@ -314,29 +333,86 @@ 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_;
+};
+
+
+class HtmlStream {
+public:
+	///
+	explicit HtmlStream(odocstream & os);
+	///
+	void cr();
+	///
+	odocstream & os() { return os_; }
+	///
+	int line() const { return line_; }
+	///
+	int & tab() { return tab_; }
+	///
+	friend HtmlStream & operator<<(HtmlStream &, char const *);
+	///
+	void defer(docstring const &);
+	///
+	void defer(std::string const &);
+	///
+	docstring deferred() const;
+	///
+	bool inText() const { return in_text_; }
+private:
+	///
+	void setTextMode(bool t) { in_text_ = t; }
+	///
+	odocstream & os_;
+	///
+	int tab_;
+	///
+	int line_;
+	///
+	bool in_text_;
+	///
+	odocstringstream deferred_;
+	///
+	friend class SetHTMLMode;
+};
+
+///
+HtmlStream & operator<<(HtmlStream &, MathAtom const &);
+///
+HtmlStream & operator<<(HtmlStream &, MathData const &);
+///
+HtmlStream & operator<<(HtmlStream &, docstring const &);
+///
+HtmlStream & operator<<(HtmlStream &, char const *);
+///
+HtmlStream & operator<<(HtmlStream &, char);
+///
+HtmlStream & operator<<(HtmlStream &, char_type);
+///
+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_;
 };