X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathStream.h;h=ad1baada353dcd214b682442db7def4527a3a0d2;hb=704328d3488c75733ddeb9ad5439b1907e323e39;hp=7da9a9b9f9177d0949a6a1c71f4ac8e0b3d750ba;hpb=8cd4ef18c865bbffb38664025c869362bf4ce5d1;p=lyx.git
diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index 7da9a9b9f9..ad1baada35 100644
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -299,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_;
///
@@ -335,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:
-//
-// 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, std::string const & attrs);
///
explicit SetMode(MathStream & os, bool text);
///
~SetMode();
private:
- ///
- void init(bool, std::string const &);
///
MathStream & os_;
///
- bool opened_;
- ///
bool was_text_;
};
@@ -387,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_;
///
@@ -424,20 +406,14 @@ HtmlStream & operator<<(HtmlStream &, ETag const &);
class SetHTMLMode {
public:
- ///
- explicit SetHTMLMode(HtmlStream & os, bool text, std::string attrs);
///
explicit SetHTMLMode(HtmlStream & os, bool text);
///
~SetHTMLMode();
private:
- ///
- void init(bool, std::string const &);
///
HtmlStream & os_;
///
- bool opened_;
- ///
bool was_text_;
};