X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathStream.h;h=b7e79434af1c02bea66f460abc4b39e215fe7648;hb=3a544072a522845b192594dd2ab11fcb1fc80eeb;hp=3116ab43d0dde4bf87d9cfd7529ce7869d558920;hpb=f6bd79745e65006895070e2e1da854abc6d4d431;p=lyx.git diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h index 3116ab43d0..b7e79434af 100644 --- a/src/mathed/MathStream.h +++ b/src/mathed/MathStream.h @@ -13,6 +13,8 @@ #define MATH_MATHMLSTREAM_H #include "InsetMath.h" + +#include "TexRow.h" #include "texstream.h" #include "support/Changer.h" @@ -26,7 +28,6 @@ class Encoding; class InsetMath; class MathAtom; class MathData; -struct RowEntry; // // LaTeX/LyX @@ -41,6 +42,12 @@ public: wsPreview }; /// + enum UlemCmdType { + NONE, + UNDERLINE, + STRIKEOUT + }; + /// explicit WriteStream(otexrowstream & os, bool fragile = false, bool latex = false, OutputType output = wsDefault, Encoding const * encoding = 0); @@ -66,6 +73,14 @@ public: void canBreakLine(bool breakline) { canbreakline_ = breakline; } /// tell whether we can write an immediately following newline char bool canBreakLine() const { return canbreakline_; } + /// record whether we have to take care for striking out display math + void strikeoutMath(bool mathsout) { mathsout_ = mathsout; } + /// tell whether we have to take care for striking out display math + bool strikeoutMath() const { return mathsout_; } + /// record which ulem command type we are inside + void ulemCmd(UlemCmdType ulemcmd) { ulemcmd_ = ulemcmd; } + /// tell which ulem command type we are inside + UlemCmdType ulemCmd() const { return ulemcmd_; } /// writes space if next thing is isalpha() void pendingSpace(bool how); /// writes space if next thing is isalpha() @@ -90,7 +105,7 @@ public: Encoding const * encoding() const { return encoding_; } /// Temporarily change the TexRow information about the outer row entry. - Changer changeRowEntry(RowEntry entry); + Changer changeRowEntry(TexRow::RowEntry entry); /// TexRow::starts the innermost outer math inset /// returns true if the outer row entry will appear at this line bool startOuterRow(); @@ -117,13 +132,16 @@ private: bool ascii_; /// are we allowed to output an immediately following newline? bool canbreakline_; + /// should we take care for striking out display math? + bool mathsout_; + /// what ulem command are we inside (none, underline, strikeout)? + UlemCmdType ulemcmd_; /// int line_; /// Encoding const * encoding_; /// Row entry we are in - /// (it is a pointer to allow forward-declaration) - unique_ptr row_entry_; + TexRow::RowEntry row_entry_; }; /// @@ -141,10 +159,11 @@ WriteStream & operator<<(WriteStream &, int); /// WriteStream & operator<<(WriteStream &, unsigned int); -/// ensure math mode, possibly by opening \ensuremath -bool ensureMath(WriteStream & os, bool needs_math_mode = true, bool macro = false); +/// ensure correct mode, possibly by opening \ensuremath or \lyxmathsym +bool ensureMath(WriteStream & os, bool needs_mathmode = true, + bool macro = false, bool textmode_macro = false); -/// ensure the requested mode, possibly by closing \ensuremath +/// ensure the requested mode, possibly by closing \ensuremath or \lyxmathsym int ensureMode(WriteStream & os, InsetMath::mode_type mode, bool locked, bool ascii); @@ -153,6 +172,8 @@ int ensureMode(WriteStream & os, InsetMath::mode_type mode, bool locked, bool as * * A local variable of this type can be used to either ensure math mode * or delay the writing of a pending brace when outputting LaTeX. + * A LyX InsetMathMacro is always assumed needing a math mode environment, while + * no assumption is made for macros defined through \newcommand or \def. * * Example 1: * @@ -171,23 +192,35 @@ int ensureMode(WriteStream & os, InsetMath::mode_type mode, bool locked, bool as * * Example 3: * - * MathEnsurer ensurer(os, needs_math_mode, true); + * MathEnsurer ensurer(os, needs_mathmode, true, textmode_macro); + * + * This form is mainly used for math macros as they are treated specially. + * In essence, the macros defined in the lib/symbols file and tagged as + * textmode will be enclosed in \lyxmathsym if they appear in a math mode + * environment, while macros defined in the preamble or ERT are left as is. + * The third parameter must be set to true and the fourth parameter has also + * to be specified. Only the following 3 different cases are handled. + * + * When the needs_mathmode parameter is true the behavior is as in Example 1. + * This is the case for a LyX InsetMathMacro or a macro not tagged as textmode. + * + * When the needs_mathmode and textmode_macro parameters are both false the + * macro is left in the same (text or math mode) environment it was entered. + * This is because it is assumed that the macro was designed for that mode + * and we have no way to tell the contrary. + * This is the case for macros defined by using \newcommand or \def in ERT. * - * The third parameter is set to true only for a user defined macro, which - * needs special handling. When it is a MathMacro, the needs_math_mode - * parameter is true and the behavior is as in Example 1. When the - * needs_math_mode parameter is false (not a MathMacro) and the macro - * was entered in a text box and we are in math mode, the mode is reset - * to text. This is because the macro was probably designed for text mode - * (given that it was entered in text mode and we have no way to tell the - * contrary). + * When the needs_mathmode parameter is false while textmode_macro is true the + * macro will be enclosed in \lyxmathsym if it appears in a math mode environment. + * This is the case for the macros tagged as textmode in lib/symbols. */ class MathEnsurer { public: /// - explicit MathEnsurer(WriteStream & os, bool needs_math_mode = true, bool macro = false) - : os_(os), brace_(ensureMath(os, needs_math_mode, macro)) {} + explicit MathEnsurer(WriteStream & 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: @@ -263,7 +296,7 @@ private: class MTag { public: /// - MTag(char const * const tag, std::string attr = "") + MTag(char const * const tag, std::string attr = "") : tag_(tag), attr_(attr) {} /// char const * const tag_;