Fix horizontal lines in math arrays

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

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 34131278b5b52d6c173ca0534830f90d32f54d89..bb7be8ba6ba25744d15bdf55c2d33f8bee729c54 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -73,6 +73,7 @@
 #include "LyX.h" // use_gui
 #include "OutputParams.h"
 
+
 using namespace std;
 using namespace lyx::support;
 
@@ -92,7 +93,7 @@ bool isMathFontAvailable(string & name)
                return false;
 
        FontInfo f;
-       augmentFont(f, from_ascii(name));
+       augmentFont(f, name);
 
        // Do we have the font proper?
        if (theFontLoader().available(f))
@@ -185,6 +186,7 @@ void initSymbols()
                        string requires;
                        string extra;
                        string xmlname;
+                       bool hidden = false;
                        is >> macro >> requires;
                        if ((is >> xmlname)) {
                                extra = requires;
@@ -205,7 +207,11 @@ void initSymbols()
                                        tmp.name = it->first;
                                        tmp.extra = from_utf8(extra);
                                        tmp.xmlname = from_utf8(xmlname);
-                                       tmp.requires = requires;
+                                       if (requires == "hiddensymbol") {
+                                               requires = "";
+                                               tmp.hidden = hidden = true;
+                                       } else
+                                               tmp.requires = requires;
                                        theMathWordList[it->first] = tmp;
                                        wit = theMathWordList.find(it->first);
                                        it->second.setSymbol(&(wit->second));
@@ -218,7 +224,8 @@ void initSymbols()
                                << "  draw: 0"
                                << "  extra: " << extra
                                << "  xml: " << xmlname
-                               << "  requires: " << requires << '\'');
+                               << "  requires: " << requires
+                               << "  hidden: " << hidden << '\'');
                        continue;
                }
 
@@ -227,7 +234,7 @@ void initSymbols()
                docstring help;
                is >> tmp.name >> help;
                tmp.inset = to_ascii(help);
-               if (isFontName(help))
+               if (isFontName(tmp.inset))
                        is >> charid >> fallbackid >> tmp.extra >> tmp.xmlname;
                else
                        is >> tmp.extra;
@@ -247,7 +254,7 @@ void initSymbols()
                        continue;
                }
 
-               if (isFontName(from_ascii(tmp.inset))) {
+               if (isFontName(tmp.inset)) {
                        // tmp.inset _is_ the fontname here.
                        // create fallbacks if necessary
 
@@ -294,6 +301,12 @@ void initSymbols()
                                              << " used for " << to_utf8(tmp.name));
                }
 
+               if (tmp.requires == "hiddensymbol")
+               {
+                       tmp.requires = "";
+                       tmp.hidden = true;
+               }
+
                if (theMathWordList.find(tmp.name) != theMathWordList.end())
                        LYXERR(Debug::MATHED, "readSymbols: inset " << to_utf8(tmp.name)
                                << " already exists.");
@@ -307,7 +320,8 @@ void initSymbols()
                        << "  draw: " << int(tmp.draw.empty() ? 0 : tmp.draw[0])
                        << "  extra: " << to_utf8(tmp.extra)
                        << "  xml: " << to_utf8(tmp.xmlname)
-                       << "  requires: " << tmp.requires << '\'');
+                       << "  requires: " << tmp.requires
+                       << "  hidden: " << tmp.hidden << '\'');
        }
        string tmp = "cmm";
        string tmp2 = "cmsy";
@@ -346,23 +360,41 @@ void initMath()
 }
 
 
-bool ensureMath(WriteStream & os, bool needs_math_mode, bool macro)
+bool ensureMath(WriteStream & os, bool needs_mathmode, bool macro,
+                bool textmode_macro)
 {
        bool brace = os.pendingBrace();
        os.pendingBrace(false);
        if (!os.latex())
                return brace;
-       if (os.textMode() && needs_math_mode) {
-               os << "\\ensuremath{";
+       if (os.textMode() && needs_mathmode) {
+               if (brace) {
+                       // close \lyxmathsym
+                       os << '}';
+                       brace = false;
+               } else {
+                       os << "\\ensuremath{";
+                       brace = true;
+               }
                os.textMode(false);
-               brace = true;
-       } else if (macro && brace && !needs_math_mode) {
-               // This is a user defined macro, but not a MathMacro, so we
-               // cannot be sure what mode is needed. As it was entered in
-               // a text box, we restore the text mode.
-               os << '}';
+       } else if (macro && textmode_macro && !os.textMode()) {
+               if (brace) {
+                       // close \ensuremath
+                       os << '}';
+                       brace = false;
+               } else {
+                       os << "\\lyxmathsym{";
+                       brace = true;
+               }
                os.textMode(true);
+       } else if (macro && brace && !needs_mathmode && !textmode_macro) {
+               // This is a user defined macro, not a MathMacro, so we
+               // cannot be sure what mode is needed. We leave it in the
+               // same environment it was entered by closing either \lyxmathsym
+               // or \ensuremath, whichever was opened.
+               os << '}';
                brace = false;
+               os.textMode(!os.textMode());
        }
        return brace;
 }
@@ -656,9 +688,8 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar)
                InsetSpaceParams isp(true);
                InsetSpace::string2params(to_utf8(str), isp);
                InsetSpace is(isp);
-               TexRow texrow;
                odocstringstream ods;
-               otexstream os(ods, texrow);
+               otexstream os(ods);
                Encoding const * const ascii = encodings.fromLyXName("ascii");
                OutputParams op(ascii);
                is.latex(os, op);