nullptr

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

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 16889f5a4e68db0af00b5ef9ae62cf8642fd6bfb..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>
 
@@ -155,6 +155,7 @@ void initSymbols()
        bool skip = false;
        while (getline(fs, line)) {
                int charid     = 0;
+               int dsp_charid = 0;
                int fallbackid = 0;
                if (line.empty() || line[0] == '#')
                        continue;
@@ -186,23 +187,24 @@ void initSymbols()
                        // or
                        // \def\macroname{definition} requires
                        // or
-                       // \def\macroname{definition} extra xmlname requires
+                       // \def\macroname{definition} extra htmlname xmlname requires
                        istringstream is(line);
                        string macro;
                        string required;
                        string extra;
+                       string htmlname;
                        string xmlname;
                        bool hidden = false;
                        is >> setw(65536) >> macro >> required;
-                       if ((is >> xmlname)) {
+                       if ((is >> htmlname >> xmlname)) {
                                extra = required;
                                if (!(is >> required))
                                        required = "";
                        } else
-                               xmlname = "";
+                               htmlname = xmlname = "";
                        MacroTable::iterator it = MacroTable::globalMacros().insert(
-                                       0, from_utf8(macro));
-                       if (!extra.empty() || !xmlname.empty() || !required.empty()) {
+                                       nullptr, from_utf8(macro));
+                       if (!extra.empty() || !htmlname.empty() || !xmlname.empty() || !required.empty()) {
                                MathWordList::iterator wit = theMathWordList.find(it->first);
                                if (wit != theMathWordList.end())
                                        LYXERR(Debug::MATHED, "readSymbols: inset "
@@ -212,6 +214,7 @@ void initSymbols()
                                        tmp.inset = "macro";
                                        tmp.name = it->first;
                                        tmp.extra = from_utf8(extra);
+                                       tmp.htmlname = from_utf8(htmlname);
                                        tmp.xmlname = from_utf8(xmlname);
                                        if (required == "hiddensymbol") {
                                                required = "";
@@ -226,10 +229,11 @@ void initSymbols()
                        // If you change the following output, please adjust
                        // development/tools/generate_symbols_images.py.
                        LYXERR(Debug::MATHED, "read symbol '" << to_utf8(it->first)
-                               << "  inset: macro"
-                               << "  draw: 0"
-                               << "  extra: " << extra
-                               << "  xml: " << xmlname
+                           << "  inset: macro"
+                           << "  draw: 0"
+                           << "  extra: " << extra
+                           << "  html: " << htmlname
+                           << "  xml: " << xmlname
                                << "  requires: " << required
                                << "  hidden: " << hidden << '\'');
                        continue;
@@ -240,9 +244,12 @@ void initSymbols()
                docstring help;
                is >> tmp.name >> help;
                tmp.inset = to_ascii(help);
-               if (isFontName(tmp.inset))
-                       is >> charid >> fallbackid >> tmp.extra >> tmp.xmlname;
-               else
+               if (isFontName(tmp.inset)) {
+                       is >> help >> fallbackid >> tmp.extra >> tmp.htmlname >> tmp.xmlname;
+                       docstring cid, dsp_cid;
+                       idocstringstream is2(subst(help, '|', ' '));
+                       is2 >> charid >> dsp_charid;
+               } else
                        is >> tmp.extra;
                // requires is optional
                if (is) {
@@ -286,6 +293,10 @@ void initSymbols()
                        } else if (isMathFontAvailable(tmp.inset) && canBeDisplayed(charid)) {
                                LYXERR(Debug::MATHED, "symbol available for " << to_utf8(tmp.name));
                                tmp.draw.push_back(char_type(charid));
+                               if (dsp_charid && canBeDisplayed(dsp_charid)) {
+                                       LYXERR(Debug::MATHED, "large symbol available for " << to_utf8(tmp.name));
+                                       tmp.dsp_draw.push_back(char_type(dsp_charid));
+                               }
                        } else if (fallbackid && isMathFontAvailable(symbol_font) &&
                                   canBeDisplayed(fallbackid)) {
                                if (tmp.inset == "cmex")
@@ -327,6 +338,7 @@ void initSymbols()
                        << "  inset: " << tmp.inset
                        << "  draw: " << int(tmp.draw.empty() ? 0 : tmp.draw[0])
                        << "  extra: " << to_utf8(tmp.extra)
+                       << "  html: " << to_utf8(tmp.htmlname)
                        << "  xml: " << to_utf8(tmp.xmlname)
                        << "  requires: " << tmp.required
                        << "  hidden: " << tmp.hidden << '\'');
@@ -368,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();
@@ -408,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()) {
@@ -432,9 +444,9 @@ latexkeys const * in_word_set(docstring const & str)
 {
        MathWordList::iterator it = theMathWordList.find(str);
        if (it == theMathWordList.end())
-               return 0;
+               return nullptr;
        if (it->second.inset == "macro")
-               return 0;
+               return nullptr;
        return &(it->second);
 }
 
@@ -612,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")