Fix broken Apple speller interface

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

diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index aa1f71a4616ea5831df08abf1d39932aac60b652..6d0399e4c8e2bca0b902caf2c16de4f4505a613d 100644 (file)
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -13,6 +13,7 @@
 #define MATH_MATHMLSTREAM_H
 
 #include "InsetMath.h"
+#include "FontInfo.h"
 
 #include "TexRow.h"
 #include "texstream.h"
@@ -37,7 +38,8 @@ public:
        enum OutputType {
                wsDefault,
                wsDryrun,
-               wsPreview
+               wsPreview,
+               wsSearchAdv
        };
        ///
        enum UlemCmdType {
@@ -80,9 +82,15 @@ public:
        /// tell which ulem command type we are inside
        UlemCmdType ulemCmd() const { return ulemcmd_; }
        /// writes space if next thing is isalpha()
-       void pendingSpace(bool how);
+       void pendingSpace(bool space);
        /// writes space if next thing is isalpha()
        bool pendingSpace() const { return pendingspace_; }
+       /// write braces if a space is pending and next char is [
+       /// or when a prime immediately follows a superscript
+       void useBraces(bool braces);
+       /// write braces if a space is pending and next char is [
+       /// or when a prime immediately follows a superscript
+       bool useBraces() const { return usebraces_; }
        /// tell whether to write the closing brace of \ensuremath
        void pendingBrace(bool brace);
        /// tell whether to write the closing brace of \ensuremath
@@ -100,7 +108,7 @@ public:
        /// tell whether to use only ascii chars when producing latex code
        bool asciiOnly() const { return ascii_; }
        /// tell whether we are in a MathClass inset
-       void inMathClass(bool mathclass) { mathclass_ = mathclass; };
+       void inMathClass(bool mathclass) { mathclass_ = mathclass; }
        /// tell whether we are in a MathClass inset
        bool inMathClass() const { return mathclass_; }
        /// LaTeX encoding
@@ -124,6 +132,9 @@ private:
        OutputType output_ = wsDefault;
        /// do we have a space pending?
        bool pendingspace_ = false;
+       /// do we have to write braces when a space is pending and [ follows,
+       /// or when a prime immediately follows a superscript?
+       bool usebraces_ = false;
        /// do we have a brace pending?
        bool pendingbrace_ = false;
        /// are we in text mode when producing latex code?
@@ -310,6 +321,18 @@ public:
        std::string attr_;
 };
 
+/// Start inline tag.
+class MTagInline {
+public:
+       ///
+       MTagInline(char const * const tag, std::string const & attr = std::string())
+               : tag_(tag), attr_(attr) {}
+       ///
+       char const * const tag_;
+       ///
+       std::string attr_;
+};
+
 
 /// End tag.
 class ETag {
@@ -321,6 +344,16 @@ public:
 };
 
 
+/// End inlinetag.
+class ETagInline {
+public:
+       ///
+       explicit ETagInline(char const * const tag) : tag_(tag) {}
+       ///
+       char const * const tag_;
+};
+
+
 /// Compound tag (no content, directly closed).
 class CTag {
 public:
@@ -371,6 +404,10 @@ public:
        std::string namespacedTag(std::string const & tag) const {
                return (xmlns().empty() ? "" : xmlns() + ":") + tag;
        }
+       /// Returns the current math style in the stream.
+       const MathStyle & getFontMathStyle() const { return font_math_style_; }
+       /// Returns the current math style in the stream.
+       void setFontMathStyle(const MathStyle style) { font_math_style_ = style; }
 private:
        ///
        void setTextMode(bool t) { in_text_ = t; }
@@ -388,6 +425,8 @@ private:
        std::string xmlns_;
        ///
        bool xml_mode_;
+       /// The only important part of a FontInfo object.
+       MathStyle font_math_style_;
        ///
        friend class SetMode;
 };
@@ -407,8 +446,12 @@ MathMLStream & operator<<(MathMLStream &, char_type);
 ///
 MathMLStream & operator<<(MathMLStream &, MTag const &);
 ///
+MathMLStream & operator<<(MathMLStream &, MTagInline const &);
+///
 MathMLStream & operator<<(MathMLStream &, ETag const &);
 ///
+MathMLStream & operator<<(MathMLStream &, ETagInline const &);
+///
 MathMLStream & operator<<(MathMLStream &, CTag const &);