X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathStream.h;h=153e7df3c584404a43b68ebae48db36a6ba2edce;hb=d9082639080b9de993742bd352f92e5183058cf5;hp=1d7e1de42423b4dc81475ce19a8270284d5a9738;hpb=2afc68ede218a927e9bb7c59ba37cc2a574a323e;p=lyx.git diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h index 1d7e1de424..153e7df3c5 100644 --- a/src/mathed/MathStream.h +++ b/src/mathed/MathStream.h @@ -19,13 +19,11 @@ #include "support/Changer.h" #include "support/strfwd.h" -#include "support/unique_ptr.h" namespace lyx { class Encoding; -class InsetMath; class MathAtom; class MathData; @@ -33,7 +31,7 @@ class MathData; // LaTeX/LyX // -class WriteStream { +class TeXMathStream { public: /// enum OutputType { @@ -48,11 +46,11 @@ public: STRIKEOUT }; /// - explicit WriteStream(otexrowstream & os, bool fragile = false, - bool latex = false, OutputType output = wsDefault, - Encoding const * encoding = 0); + explicit TeXMathStream(otexrowstream & os, bool fragile = false, + bool latex = false, OutputType output = wsDefault, + Encoding const * encoding = nullptr); /// - ~WriteStream(); + ~TeXMathStream(); /// int line() const { return line_; } /// @@ -82,9 +80,13 @@ 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 [ + void useBraces(bool braces); + /// write braces if a space is pending and next char is [ + 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 @@ -117,60 +119,62 @@ private: /// otexrowstream & os_; /// do we have to write \\protect sometimes - bool fragile_; + bool fragile_ = false; /// are we at the beginning of an MathData? - bool firstitem_; + bool firstitem_ = false; /// are we writing to .tex? - int latex_; + int latex_ = false; /// output type (default, source preview, instant preview)? - OutputType output_; + OutputType output_ = wsDefault; /// do we have a space pending? - bool pendingspace_; + bool pendingspace_ = false; + /// do we have to write braces when a space is pending and [ follows? + bool usebraces_ = false; /// do we have a brace pending? - bool pendingbrace_; + bool pendingbrace_ = false; /// are we in text mode when producing latex code? - bool textmode_; + bool textmode_ = false; /// are we allowed to switch mode when producing latex code? - bool locked_; + bool locked_ = false; /// should we use only ascii chars when producing latex code? - bool ascii_; + bool ascii_ = false; /// are we allowed to output an immediately following newline? - bool canbreakline_; + bool canbreakline_ = true; /// should we take care for striking out display math? - bool mathsout_; + bool mathsout_ = false; /// what ulem command are we inside (none, underline, strikeout)? - UlemCmdType ulemcmd_; + UlemCmdType ulemcmd_ = NONE; /// - int line_; + int line_ = 0; /// - Encoding const * encoding_; + Encoding const * encoding_ = nullptr; /// Row entry we are in - TexRow::RowEntry row_entry_; + TexRow::RowEntry row_entry_ = TexRow::row_none; /// whether we are in a MathClass inset - bool mathclass_; + bool mathclass_ = false; }; /// -WriteStream & operator<<(WriteStream &, MathAtom const &); +TeXMathStream & operator<<(TeXMathStream &, MathAtom const &); /// -WriteStream & operator<<(WriteStream &, MathData const &); +TeXMathStream & operator<<(TeXMathStream &, MathData const &); /// -WriteStream & operator<<(WriteStream &, docstring const &); +TeXMathStream & operator<<(TeXMathStream &, docstring const &); /// -WriteStream & operator<<(WriteStream &, char const * const); +TeXMathStream & operator<<(TeXMathStream &, char const * const); /// -WriteStream & operator<<(WriteStream &, char); +TeXMathStream & operator<<(TeXMathStream &, char); /// -WriteStream & operator<<(WriteStream &, int); +TeXMathStream & operator<<(TeXMathStream &, int); /// -WriteStream & operator<<(WriteStream &, unsigned int); +TeXMathStream & operator<<(TeXMathStream &, unsigned int); /// ensure correct mode, possibly by opening \ensuremath or \lyxmathsym -bool ensureMath(WriteStream & os, bool needs_mathmode = true, +bool ensureMath(TeXMathStream & os, bool needs_mathmode = true, bool macro = false, bool textmode_macro = false); /// ensure the requested mode, possibly by closing \ensuremath or \lyxmathsym -int ensureMode(WriteStream & os, InsetMath::mode_type mode, bool locked, bool ascii); +int ensureMode(TeXMathStream & os, InsetMath::mode_type mode, bool locked, bool ascii); /** @@ -224,14 +228,14 @@ class MathEnsurer { public: /// - explicit MathEnsurer(WriteStream & os, bool needs_mathmode = true, + explicit MathEnsurer(TeXMathStream & os, bool needs_mathmode = true, bool macro = false, bool textmode_macro = false) : os_(os), brace_(ensureMath(os, needs_mathmode, macro, textmode_macro)) {} /// ~MathEnsurer() { os_.pendingBrace(brace_); } private: /// - WriteStream & os_; + TeXMathStream & os_; /// bool brace_; }; @@ -276,8 +280,8 @@ class ModeSpecifier { public: /// - explicit ModeSpecifier(WriteStream & os, InsetMath::mode_type mode, - bool locked = false, bool ascii = false) + explicit ModeSpecifier(TeXMathStream & os, InsetMath::mode_type mode, + bool locked = false, bool ascii = false) : os_(os), oldmodes_(ensureMode(os, mode, locked, ascii)) {} /// ~ModeSpecifier() @@ -288,7 +292,7 @@ public: } private: /// - WriteStream & os_; + TeXMathStream & os_; /// int oldmodes_; }; @@ -343,10 +347,10 @@ public: class MathExportException : public std::exception {}; -class MathStream { +class MathMLStream { public: /// Builds a stream proxy for os; the MathML namespace is given by xmlns (supposed to be already defined elsewhere in the document). - explicit MathStream(odocstream & os, std::string const & xmlns = "", bool xmlMode = false); + explicit MathMLStream(odocstream & os, std::string const & xmlns = "", bool xmlMode = false); /// void cr(); /// @@ -356,7 +360,7 @@ public: /// int & tab() { return tab_; } /// - friend MathStream & operator<<(MathStream &, char const *); + friend MathMLStream & operator<<(MathMLStream &, char const *); /// void defer(docstring const &); /// @@ -395,35 +399,35 @@ private: }; /// -MathStream & operator<<(MathStream &, MathAtom const &); +MathMLStream & operator<<(MathMLStream &, MathAtom const &); /// -MathStream & operator<<(MathStream &, MathData const &); +MathMLStream & operator<<(MathMLStream &, MathData const &); /// -MathStream & operator<<(MathStream &, docstring const &); +MathMLStream & operator<<(MathMLStream &, docstring const &); /// -MathStream & operator<<(MathStream &, char const *); +MathMLStream & operator<<(MathMLStream &, char const *); /// -MathStream & operator<<(MathStream &, char); +MathMLStream & operator<<(MathMLStream &, char); /// -MathStream & operator<<(MathStream &, char_type); +MathMLStream & operator<<(MathMLStream &, char_type); /// -MathStream & operator<<(MathStream &, MTag const &); +MathMLStream & operator<<(MathMLStream &, MTag const &); /// -MathStream & operator<<(MathStream &, ETag const &); +MathMLStream & operator<<(MathMLStream &, ETag const &); /// -MathStream & operator<<(MathStream &, CTag const &); +MathMLStream & operator<<(MathMLStream &, CTag const &); /// A simpler version of ModeSpecifier, for MathML class SetMode { public: /// - explicit SetMode(MathStream & ms, bool text); + explicit SetMode(MathMLStream & ms, bool text); /// ~SetMode(); private: /// - MathStream & ms_; + MathMLStream & ms_; /// bool was_text_; };