Jean-Marc's fix for wrong descent

[lyx.git] / src / mathed / math_macrotable.C

diff --git a/src/mathed/math_macrotable.C b/src/mathed/math_macrotable.C
index 08d7d5becb822e8102501ce91a72b33903867339..30c18023e1d2d44aaba47c63de0149a000fe317b 100644 (file)
--- a/src/mathed/math_macrotable.C
+++ b/src/mathed/math_macrotable.C
@@ -2,19 +2,14 @@
 
 #include <iostream>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_macrotable.h"
 #include "math_macro.h"
 #include "math_macrotemplate.h"
 #include "math_parser.h"
-#include "math_fracinset.h"
+#include "math_mathmlstream.h"
 #include "debug.h"
-
-
-MathArray mathed_parse_cell(string const &);
+#include "math_support.h" // math_font_available
 
 
 MathMacroTable::table_type MathMacroTable::macro_table;
@@ -22,81 +17,36 @@ MathMacroTable::table_type MathMacroTable::macro_table;
 
 void MathMacroTable::dump()
 {
+/*
        lyxerr << "\n------------------------------------------\n";
        table_type::const_iterator it;
        for (it = macro_table.begin(); it != macro_table.end(); ++it)
-               lyxerr << it->first << " [" << it->second.nargs() << "] : "
-                       << it->second << "\n";
+               lyxerr << it->first
+                       << " [" << it->second->asMacroTemplate()->nargs() << "] : "
+                       << it->second->cell(0) << "\n";
        lyxerr << "------------------------------------------\n";
+*/
 }
 
 
-void MathMacroTable::insertTemplate(MathMacroTemplate const & p)
-{
-       if (macro_table.find(p.name()) != macro_table.end()) 
-               lyxerr << "macro '" << p.name() << "' not new\n";
-       macro_table[p.name()] = p;
-}
-
-
-MathMacroTemplate & MathMacroTable::provideTemplate(string const & name)
+MathAtom & MathMacroTable::provide(string const & name)
 {
-       builtinMacros();
-       
        table_type::iterator pos = macro_table.find(name);
-
        if (pos == macro_table.end()) {
                lyxerr << "MathMacroTable::provideTemplate: no template with name '"
                       << name << "' available.\n";
        }
-               
        return pos->second;
 }
 
 
-void MathMacroTable::createTemplate
-       (string const & name, int na, string const & text)
+void MathMacroTable::create(MathAtom const & at)
 {
-       MathMacroTemplate t(name, na);
-       t.cell(0) = mathed_parse_cell(text);
-       insertTemplate(t);
+       macro_table[at->asMacroTemplate()->name()] = at;
 }
 
 
-bool MathMacroTable::hasTemplate(string const & name)
+bool MathMacroTable::has(string const & name)
 {
-       builtinMacros();
        return macro_table.find(name) != macro_table.end();
 }
-
-
-MathMacro * MathMacroTable::cloneTemplate(string const & name)
-{
-       return new MathMacro(provideTemplate(name));
-}
-
-
-void MathMacroTable::builtinMacros()
-{
-       static bool built = false;
-       
-       if (built)
-               return; 
-
-       built = true;
-       //lyxerr[Debug::MATHED] << "Building macros\n";
-   
-       createTemplate("emptyset",     0, "\\not0");
-       createTemplate("ge",           0, "\\geq");
-       createTemplate("gets",         0, "\\leftarrow");
-       createTemplate("land",         0, "\\wedge");
-       createTemplate("le",           0, "\\leq");
-       createTemplate("lor",          0, "\\vee");
-       createTemplate("notin",        0, "\\not\\in");
-       createTemplate("perp",         0, "\\bot");
-       createTemplate("owns",         0, "\\ni");
-       createTemplate("to",           0, "\\rightarrow");
-       //createTemplate("lint",       4, "\\int_#1^#2#3 d#4");
-       //createTemplate("silentmult", 0, "\\cdot");
-       //createTemplate("binom",        2, "\\left(\\frac#1#2\\right)");
-}