nullptr

[lyx.git] / src / mathed / MathFactory.cpp

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 54fe012857007c3a554ba66e05ba0fba05f3fae4..08f0b01e392157de8546663066a5f9366c4aaa60 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -71,8 +71,8 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Encoding.h"
+#include "FontInfo.h"
 #include "LyX.h" // use_gui
-#include "OutputParams.h"
 
 #include <iomanip>
 
@@ -203,7 +203,7 @@ void initSymbols()
                        } else
                                htmlname = xmlname = "";
                        MacroTable::iterator it = MacroTable::globalMacros().insert(
-                                       0, from_utf8(macro));
+                                       nullptr, from_utf8(macro));
                        if (!extra.empty() || !htmlname.empty() || !xmlname.empty() || !required.empty()) {
                                MathWordList::iterator wit = theMathWordList.find(it->first);
                                if (wit != theMathWordList.end())
@@ -380,7 +380,7 @@ void initMath()
 }
 
 
-bool ensureMath(WriteStream & os, bool needs_mathmode, bool macro,
+bool ensureMath(TeXMathStream & os, bool needs_mathmode, bool macro,
                 bool textmode_macro)
 {
        bool brace = os.pendingBrace();
@@ -420,8 +420,8 @@ bool ensureMath(WriteStream & os, bool needs_mathmode, bool macro,
 }
 
 
-int ensureMode(WriteStream & os, InsetMath::mode_type mode,
-               bool locked, bool ascii)
+int ensureMode(TeXMathStream & os, InsetMath::mode_type mode,
+               bool locked, bool ascii)
 {
        bool textmode = mode == InsetMath::TEXT_MODE;
        if (os.latex() && textmode && os.pendingBrace()) {
@@ -624,6 +624,8 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
                return MathAtom(new InsetMathFrac(buf, InsetMathFrac::CFRACLEFT));
        if (s == "cfracright")
                return MathAtom(new InsetMathFrac(buf, InsetMathFrac::CFRACRIGHT));
+       if (s == "case") // TODO: only if class is aastex(6|62)
+               return MathAtom(new InsetMathFrac(buf, InsetMathFrac::AASTEX_CASE));
        //if (s == "infer")
        //      return MathAtom(new MathInferInset);
        if (s == "atop")