InsetMathHull.cpp: whitespace

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

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index a3a77d1123d141ea9a7679d1df977f3fa2463ae5..13159b7b43dffa5150e2ce4eb90ea42c4d0f20f3 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -45,18 +45,21 @@
 #include "MathMacro.h"
 #include "MathMacroArgument.h"
 #include "MathParser.h"
+#include "MathStream.h"
 #include "MathSupport.h"
 
-#include "support/debug.h"
-
 #include "insets/InsetCommand.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/FileName.h"
 #include "support/filetools.h" // LibFileSearch
 #include "support/lstrings.h"
 
 #include "frontends/FontLoader.h"
 
+#include "LyX.h" // use_gui
+
 using namespace std;
 using namespace lyx::support;
 
@@ -67,13 +70,10 @@ bool has_math_fonts;
 
 namespace {
 
-// file scope
-typedef map<docstring, latexkeys> WordList;
-
-WordList theWordList;
+MathWordList theWordList;
 
 
-bool math_font_available(docstring & name)
+bool isMathFontAvailable(docstring & name)
 {
        FontInfo f;
        augmentFont(f, name);
@@ -96,6 +96,9 @@ bool math_font_available(docstring & name)
 
 void initSymbols()
 {
+       if (!use_gui)
+               return;
+
        FileName const filename = libFileSearch(string(), "symbols");
        LYXERR(Debug::MATHED, "read symbols from " << filename);
        if (filename.empty()) {
@@ -119,7 +122,7 @@ void initSymbols()
                        is >> tmp;
                        is >> tmp;
                        docstring t = from_utf8(tmp);
-                       skip = !math_font_available(t);
+                       skip = !isMathFontAvailable(t);
                        continue;
                } else if (line.size() >= 4 && line.substr(0, 4) == "else") {
                        skip = !skip;
@@ -175,10 +178,10 @@ void initSymbols()
                        if (tmp.extra == "func" || tmp.extra == "funclim" || tmp.extra == "special") {
                                LYXERR(Debug::MATHED, "symbol abuse for " << to_utf8(tmp.name));
                                tmp.draw = tmp.name;
-                       } else if (math_font_available(tmp.inset)) {
+                       } else if (isMathFontAvailable(tmp.inset)) {
                                LYXERR(Debug::MATHED, "symbol available for " << to_utf8(tmp.name));
                                tmp.draw.push_back(char_type(charid));
-                       } else if (fallbackid && math_font_available(symbol_font)) {
+                       } else if (fallbackid && isMathFontAvailable(symbol_font)) {
                                if (tmp.inset == "cmex")
                                        tmp.inset = from_ascii("lyxsymbol");
                                else
@@ -210,12 +213,17 @@ void initSymbols()
        }
        docstring tmp = from_ascii("cmm");
        docstring tmp2 = from_ascii("cmsy");
-       has_math_fonts = math_font_available(tmp) && math_font_available(tmp2);
+       has_math_fonts = isMathFontAvailable(tmp) && isMathFontAvailable(tmp2);
 }
 
 
 } // namespace anon
 
+MathWordList const & mathedWordList()
+{
+       return theWordList;
+}
+
 
 void initMath()
 {
@@ -228,9 +236,46 @@ void initMath()
 }
 
 
+bool ensureMath(WriteStream & os, bool needs_math_mode, bool macro)
+{
+       bool brace = os.pendingBrace();
+       os.pendingBrace(false);
+       if (!os.latex())
+               return brace;
+       if (os.textMode() && needs_math_mode) {
+               os << "\\ensuremath{";
+               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 << '}';
+               os.textMode(true);
+               brace = false;
+       }
+       return brace;
+}
+
+
+bool ensureMode(WriteStream & os, InsetMath::mode_type mode)
+{
+       bool textmode = mode == InsetMath::TEXT_MODE;
+       if (os.latex() && textmode && os.pendingBrace()) {
+               os.os() << '}';
+               os.pendingBrace(false);
+               os.pendingSpace(false);
+               os.textMode(true);
+       }
+       bool oldmode = os.textMode();
+       os.textMode(textmode);
+       return oldmode;
+}
+
+
 latexkeys const * in_word_set(docstring const & str)
 {
-       WordList::iterator it = theWordList.find(str);
+       MathWordList::iterator it = theWordList.find(str);
        return it != theWordList.end() ? &(it->second) : 0;
 }
 
@@ -295,9 +340,9 @@ MathAtom createInsetMath(docstring const & s)
        if (s == "fbox")
                return MathAtom(new InsetMathFBox());
        if (s == "framebox")
-               return MathAtom(new InsetMathFrameBox);
+               return MathAtom(new InsetMathMakebox(true));
        if (s == "makebox")
-               return MathAtom(new InsetMathMakebox);
+               return MathAtom(new InsetMathMakebox(false));
        if (s == "kern")
                return MathAtom(new InsetMathKern);
        if (s.substr(0, 8) == "xymatrix") {
@@ -345,8 +390,14 @@ MathAtom createInsetMath(docstring const & s)
                return MathAtom(new InsetMathTabular(s, 1, 1));
        if (s == "stackrel")
                return MathAtom(new InsetMathStackrel);
-       if (s == "binom" || s == "choose")
-               return MathAtom(new InsetMathBinom(s == "choose"));
+       if (s == "binom")
+               return MathAtom(new InsetMathBinom(InsetMathBinom::BINOM));
+       if (s == "choose")
+               return MathAtom(new InsetMathBinom(InsetMathBinom::CHOOSE));
+       if (s == "brace")
+               return MathAtom(new InsetMathBinom(InsetMathBinom::BRACE));
+       if (s == "brack")
+               return MathAtom(new InsetMathBinom(InsetMathBinom::BRACK));
        if (s == "frac")
                return MathAtom(new InsetMathFrac);
        if (s == "over")
@@ -369,7 +420,11 @@ MathAtom createInsetMath(docstring const & s)
        if (s == "lefteqn")
                return MathAtom(new InsetMathLefteqn);
        if (s == "boldsymbol")
-               return MathAtom(new InsetMathBoldSymbol);
+               return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::AMS_BOLD));
+       if (s == "bm")
+               return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::BM_BOLD));
+       if (s == "heavysymbol" || s == "hm")
+               return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::BM_HEAVY));
        if (s == "color" || s == "normalcolor")
                return MathAtom(new InsetMathColor(true));
        if (s == "textcolor")
@@ -405,7 +460,7 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar)
 
        InsetCommandParams icp(REF_CODE);
        // FIXME UNICODE
-       InsetCommandMailer::string2params("ref", to_utf8(str), icp);
+       InsetCommand::string2params("ref", to_utf8(str), icp);
        mathed_parse_cell(ar, icp.getCommand());
        if (ar.size() != 1)
                return false;