further code uglification to make Jean-Marc's compiler happy

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

diff --git a/src/mathed/math_macrotable.C b/src/mathed/math_macrotable.C
index e054d218f9fa4d2d37793dadda019520783a86c6..8f3e6383d377edd40bfdaf5c6a0e903e394ad02a 100644 (file)
--- a/src/mathed/math_macrotable.C
+++ b/src/mathed/math_macrotable.C
@@ -10,10 +10,8 @@
 #include "math_macro.h"
 #include "math_macrotemplate.h"
 #include "math_parser.h"
-#include "math_deliminset.h"
-#include "math_fracinset.h"
 #include "debug.h"
-
+#include "support.h" // math_font_available
 
 MathArray mathed_parse_cell(string const &);
 
@@ -26,15 +24,17 @@ 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() << "] : "
+               lyxerr << it->first << " [" << it->second.nargs() << "] : "
                        << it->second << "\n";
        lyxerr << "------------------------------------------\n";
 }
 
 
-void MathMacroTable::insertTemplate(MathMacroTemplate const * p)
+void MathMacroTable::insertTemplate(MathMacroTemplate const & p)
 {
-       macro_table[p->name()] = const_cast<MathMacroTemplate *>(p);
+       if (macro_table.find(p.name()) != macro_table.end()) 
+               lyxerr << "macro '" << p.name() << "' not new\n";
+       macro_table[p.name()] = p;
 }
 
 
@@ -49,19 +49,16 @@ MathMacroTemplate & MathMacroTable::provideTemplate(string const & name)
                       << name << "' available.\n";
        }
                
-       return *pos->second;
+       return pos->second;
 }
 
 
 void MathMacroTable::createTemplate
        (string const & name, int na, string const & text)
 {
-       MathMacroTemplate * t = new MathMacroTemplate(name, na);
-       t->cell(0) = mathed_parse_cell(text);
+       MathMacroTemplate t(name, na);
+       t.cell(0) = mathed_parse_cell(text);
        insertTemplate(t);
-#ifdef WITH_WARNINGS
-#warning who frees this?
-#endif
 }
 
 
@@ -88,44 +85,68 @@ void MathMacroTable::builtinMacros()
        built = true;
        //lyxerr[Debug::MATHED] << "Building macros\n";
    
-       createTemplate("emptyset",     0, "\\not0");
-       createTemplate("ge",           0, "\\geq");
-       createTemplate("gets",         0, "\\leftarrow");
+       //createTemplate("emptyset",     0, "\\not0");
+       createTemplate("notin",        0, "\\not\\in");
+       createTemplate("slash",        0, "/");
+
+       // fontmath.ltx
+
+       createTemplate("lnot",         0, "\\neg");
        createTemplate("land",         0, "\\wedge");
-       createTemplate("le",           0, "\\leq");
        createTemplate("lor",          0, "\\vee");
-       createTemplate("notin",        0, "\\not\\in");
-       createTemplate("perp",         0, "\\bot");
+       createTemplate("ne",           0, "\\neq");
+       createTemplate("le",           0, "\\leq");
+       createTemplate("ge",           0, "\\geq");
+       createTemplate("owns",         0, "\\ni");
+       createTemplate("gets",         0, "\\leftarrow");
        createTemplate("to",           0, "\\rightarrow");
-       //createTemplate("lint",       4, "\\int_{#1}^{#2}#3 d#4");
-       //createTemplate("silentmult", 0, "\\cdot");
-       //createTemplate("binomi",     2, "\\left(\\frac{#1}{#2}\\right)");
+       createTemplate("|",            0, "\\parallel");
+
+       createTemplate("longleftrightarrow", 0, "\\leftarrow\\kern-6mu\\rightarrow");
+       createTemplate("Longleftrightarrow", 0, "\\Leftarrow\\kern-6mu\\Rightarrow");
+       createTemplate("doteq", 0, "\\stackrel{\\cdot}{=}");
 
-       // binom has two arguments
-       {
-               MathFracInset * frac = new MathFracInset("atop");
-               frac->cell(0).push_back(new MathMacroArgument(1));
-               frac->cell(1).push_back(new MathMacroArgument(2));
+       //createTemplate("models",         0, "|\\kern-9mu=");
 
-               MathInset * inset = new MathDelimInset('(', ')');
-               inset->push_back(frac);
+       if (math_font_available(LM_TC_CMSY)) {
+               createTemplate("longrightarrow", 0, "\\lyxbar\\kern-5mu\\rightarrow");
+               createTemplate("longleftarrow",  0, "\\leftarrow\\kern-5mu\\lyxbar");
+               createTemplate("mapsto",  0, "\\mapstochar\\rightarrow");
+               createTemplate("longmapsto",  0, "\\mapstochar\\lyxbar\\kern-5mu\\rightarrow");
+       }
 
-               MathMacroTemplate * t = new MathMacroTemplate("binom", 2);
-               t->push_back(inset);
+       if (math_font_available(LM_TC_CMR)) {
+               createTemplate("Longrightarrow", 0, "\\lyxeq\\kern-3mu\\Rightarrow");
+               createTemplate("Longleftarrow",  0, "\\Leftarrow\\kern-9mu\\lyxeq");
+       }
 
-               insertTemplate(t);
+       if (math_font_available(LM_TC_CMM)) {
+               createTemplate("hookrightarrow", 0, "\\lhook\\kern-5mu\\rightarrow");
+               createTemplate("hookleftarrow",  0, "\\leftarrow\\kern-5mu\\rhook");
+               createTemplate("bowtie",         0, "\\triangleright\\kern-3mu\\triangleleft");
        }
 
-/*
-       {
-               MathFracInset * frac = new MathFracInset(LM_OT_ATOP);
-               frac->cell(0)->push_back(new MathMacroArgument(1));
-               frac->cell(1)->push_back(new MathMacroArgument(2));
+       if (math_font_available(LM_TC_MSA)) {
+               //amsfonts.sty
 
-               MathMacroTemplate * t = new MathMacroTemplate("choose", 2);
-               t->push_back(frac);
+               createTemplate("dashrightarrow", 0, "\\lyxdabar\\lyxdabar\\lyxright");
+               createTemplate("dashleftarrow", 0, "\\lyxleft\\lyxdabar\\lyxdabar");
+               createTemplate("dasharrow",    0, "\\dashrightarrow");
+               createTemplate("Box",          0, "\\square");
+               createTemplate("Diamond",      0, "\\lozenge");
+               createTemplate("leadsto",      0, "\\rightsquigarrow");
 
-               insertTemplate(t);
+               // amssymb.sty
+
+               createTemplate("restriction",  0, "\\upharpoonright");
+               createTemplate("Doteq",        0, "\\doteqdot");
+               createTemplate("doublecup",    0, "\\Cup");
+               createTemplate("doublecap",    0, "\\Cap");
+               createTemplate("llless",       0, "\\lll");
+               createTemplate("gggtr",        0, "\\ggg");
        }
-*/
+
+       //createTemplate("lint",       4, "\\int_#1^#2#3 d#4");
+       //createTemplate("silentmult", 0, "\\cdot");
+       //createTemplate("binom",        2, "\\left(\\frac#1#2\\right)");
 }