X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathStream.h;h=ad1baada353dcd214b682442db7def4527a3a0d2;hb=704328d3488c75733ddeb9ad5439b1907e323e39;hp=6fb8f8265fe18b3b45d8458edfa096876fa19871;hpb=d652a84f4b10251af9e9d216e5642506047cdb29;p=lyx.git
diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index 6fb8f8265f..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,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:
-//
-// So we have to have:
-//
-// 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_;
};