reduce line noise

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

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index f8df7a81a5728ebe0950ff826295eafdb26e40f8..923a5dc1c2d85b2b9922ff0283f0a8187cd94df6 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -15,21 +15,16 @@
 #include "InsetMathAMSArray.h"
 #include "InsetMathArray.h"
 #include "InsetMathBoldSymbol.h"
-#include "InsetMathBoxed.h"
 #include "InsetMathBox.h"
 #include "InsetMathCases.h"
 #include "InsetMathColor.h"
 #include "InsetMathDecoration.h"
 #include "InsetMathDots.h"
-#include "InsetMathFBox.h"
 #include "InsetMathFont.h"
 #include "InsetMathFontOld.h"
 #include "InsetMathFrac.h"
-#include "InsetMathFrameBox.h"
 #include "InsetMathKern.h"
 #include "InsetMathLefteqn.h"
-#include "MathMacro.h"
-#include "InsetMathMakebox.h"
 #include "InsetMathOverset.h"
 #include "InsetMathPhantom.h"
 #include "InsetMathRef.h"
@@ -46,8 +41,9 @@
 #include "InsetMathUnknown.h"
 #include "InsetMathXArrow.h"
 #include "InsetMathXYMatrix.h"
-#include "MathMacroArgument.h"
 #include "MacroTable.h"
+#include "MathMacro.h"
+#include "MathMacroArgument.h"
 #include "MathParser.h"
 #include "MathSupport.h"
 
@@ -55,6 +51,7 @@
 
 #include "insets/InsetCommand.h"
 
+#include "support/docstream.h"
 #include "support/filetools.h" // LibFileSearch
 #include "support/lstrings.h"
 
@@ -97,9 +94,8 @@ bool math_font_available(docstring & name)
                return true;
        }
 
-       LYXERR(Debug::MATHED)
-               << "font " << to_utf8(name) << " not available and I can't fake it"
-               << endl;
+       LYXERR(Debug::MATHED,
+               "font " << to_utf8(name) << " not available and I can't fake it");
        return false;
 }
 
@@ -107,7 +103,7 @@ bool math_font_available(docstring & name)
 void initSymbols()
 {
        support::FileName const filename = libFileSearch(string(), "symbols");
-       LYXERR(Debug::MATHED) << "read symbols from " << filename << endl;
+       LYXERR(Debug::MATHED, "read symbols from " << filename);
        if (filename.empty()) {
                lyxerr << "Could not find symbols file" << endl;
                return;
@@ -161,9 +157,9 @@ void initSymbols()
                if (is)
                        is >> tmp.requires;
                else {
-                       LYXERR(Debug::MATHED) << "skipping line '" << line << '\'' << endl;
-                       LYXERR(Debug::MATHED)
-                               << to_utf8(tmp.name) << ' ' << to_utf8(tmp.inset) << ' ' << to_utf8(tmp.extra) << endl;
+                       LYXERR(Debug::MATHED, "skipping line '" << line << "'\n"
+                               << to_utf8(tmp.name) << ' ' << to_utf8(tmp.inset) << ' '
+                               << to_utf8(tmp.extra));
                        continue;
                }
 
@@ -183,44 +179,40 @@ void initSymbols()
                        docstring symbol_font = from_ascii("lyxsymbol");
 
                        if (tmp.extra == "func" || tmp.extra == "funclim" || tmp.extra == "special") {
-                               LYXERR(Debug::MATHED) << "symbol abuse for " << to_utf8(tmp.name) << endl;
+                               LYXERR(Debug::MATHED, "symbol abuse for " << to_utf8(tmp.name));
                                tmp.draw = tmp.name;
                        } else if (math_font_available(tmp.inset)) {
-                               LYXERR(Debug::MATHED) << "symbol available for " << to_utf8(tmp.name) << endl;
+                               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)) {
                                if (tmp.inset == "cmex")
                                        tmp.inset = from_ascii("lyxsymbol");
                                else
                                        tmp.inset = from_ascii("lyxboldsymbol");
-                               LYXERR(Debug::MATHED) << "symbol fallback for " << to_utf8(tmp.name) << endl;
+                               LYXERR(Debug::MATHED, "symbol fallback for " << to_utf8(tmp.name));
                                tmp.draw.push_back(char_type(fallbackid));
                        } else {
-                               LYXERR(Debug::MATHED) << "faking " << to_utf8(tmp.name) << endl;
+                               LYXERR(Debug::MATHED, "faking " << to_utf8(tmp.name));
                                tmp.draw = tmp.name;
                                tmp.inset = from_ascii("lyxtex");
                        }
                } else {
                        // it's a proper inset
-                       LYXERR(Debug::MATHED) << "inset " << to_utf8(tmp.inset)
-                                             << " used for " << to_utf8(tmp.name)
-                                             << endl;
+                       LYXERR(Debug::MATHED, "inset " << to_utf8(tmp.inset)
+                                             << " used for " << to_utf8(tmp.name));
                }
 
                if (theWordList.find(tmp.name) != theWordList.end())
-                       LYXERR(Debug::MATHED)
-                               << "readSymbols: inset " << to_utf8(tmp.name)
-                               << " already exists." << endl;
+                       LYXERR(Debug::MATHED, "readSymbols: inset " << to_utf8(tmp.name)
+                               << " already exists.");
                else
                        theWordList[tmp.name] = tmp;
 
-               LYXERR(Debug::MATHED)
-                       << "read symbol '" << to_utf8(tmp.name)
+               LYXERR(Debug::MATHED, "read symbol '" << to_utf8(tmp.name)
                        << "  inset: " << to_utf8(tmp.inset)
                        << "  draw: " << int(tmp.draw.empty() ? 0 : tmp.draw[0])
                        << "  extra: " << to_utf8(tmp.extra)
-                       << "  requires: " << to_utf8(tmp.requires)
-                       << '\'' << endl;
+                       << "  requires: " << to_utf8(tmp.requires) << '\'');
        }
        docstring tmp = from_ascii("cmm");
        docstring tmp2 = from_ascii("cmsy");
@@ -403,15 +395,7 @@ MathAtom createInsetMath(docstring const & s)
        if (s == "vphantom")
                return MathAtom(new InsetMathPhantom(InsetMathPhantom::vphantom));
 
-       if (MacroTable::globalMacros().has(s))
-               return MathAtom(new MathMacro(s,
-                       MacroTable::globalMacros().get(s).numargs()));
-       //if (MacroTable::localMacros().has(s))
-       //      return MathAtom(new MathMacro(s,
-       //              MacroTable::localMacros().get(s).numargs()));
-
-       //lyxerr << "creating unknown inset '" << s << "'" << endl;
-       return MathAtom(new InsetMathUnknown(s));
+       return MathAtom(new MathMacro(s));
 }