Assure correct spacing of colored items in mathed

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

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index d21af7795001f21f4200c7cadce24de1701ce5ee..afee57ef1c305a4ca1ed9c010b280984cc7d3712 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -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 requires;
+                       string required;
                        string extra;
+                       string htmlname;
                        string xmlname;
                        bool hidden = false;
-                       is >> setw(65536) >> macro >> requires;
-                       if ((is >> xmlname)) {
-                               extra = requires;
-                               if (!(is >> requires))
-                                       requires = "";
+                       is >> setw(65536) >> macro >> required;
+                       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() || !requires.empty()) {
+                       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,12 +214,13 @@ 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 (requires == "hiddensymbol") {
-                                               requires = "";
+                                       if (required == "hiddensymbol") {
+                                               required = "";
                                                tmp.hidden = hidden = true;
                                        } else
-                                               tmp.requires = requires;
+                                               tmp.required = required;
                                        theMathWordList[it->first] = tmp;
                                        wit = theMathWordList.find(it->first);
                                        it->second.setSymbol(&(wit->second));
@@ -226,11 +229,12 @@ 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
-                               << "  requires: " << requires
+                           << "  inset: macro"
+                           << "  draw: 0"
+                           << "  extra: " << extra
+                           << "  html: " << htmlname
+                           << "  xml: " << xmlname
+                               << "  requires: " << required
                                << "  hidden: " << hidden << '\'');
                        continue;
                }
@@ -240,18 +244,21 @@ 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) {
                        if ((is >> help)) {
                                // backward compatibility
                                if (help == "esintoramsmath")
-                                       tmp.requires = "esint|amsmath";
+                                       tmp.required = "esint|amsmath";
                                else
-                                       tmp.requires = to_ascii(help);
+                                       tmp.required = to_ascii(help);
                        }
                } else {
                        LYXERR(Debug::MATHED, "skipping line '" << line << "'\n"
@@ -265,13 +272,15 @@ void initSymbols()
                        // create fallbacks if necessary
 
                        // store requirements as long as we can
-                       if (tmp.requires.empty()) {
+                       if (tmp.required.empty()) {
                                if (tmp.inset == "msa" || tmp.inset == "msb")
-                                       tmp.requires = "amssymb";
+                                       tmp.required = "amssymb";
                                else if (tmp.inset == "wasy")
-                                       tmp.requires = "wasysym";
+                                       tmp.required = "wasysym";
                                else if (tmp.inset == "mathscr")
-                                       tmp.requires = "mathrsfs";
+                                       tmp.required = "mathrsfs";
+                               else if (tmp.inset == "mathds")
+                                       tmp.required = "dsfont";
                        }
 
                        // symbol font is not available sometimes
@@ -284,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")
@@ -307,9 +320,9 @@ void initSymbols()
                                              << " used for " << to_utf8(tmp.name));
                }
 
-               if (tmp.requires == "hiddensymbol")
+               if (tmp.required == "hiddensymbol")
                {
-                       tmp.requires = "";
+                       tmp.required = "";
                        tmp.hidden = true;
                }
 
@@ -325,8 +338,9 @@ 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.requires
+                       << "  requires: " << tmp.required
                        << "  hidden: " << tmp.hidden << '\'');
        }
        string tmp = "cmm";