make \newcommand{\bb}[1]{\mathbf{#1}} work for read/write/display.

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

diff --git a/src/mathed/math_macrotable.C b/src/mathed/math_macrotable.C
index 1e6902618a859d42125047ab9d8dc9540ca3fba7..793ab5e495de6858dfc86249676d155cc5acd397 100644 (file)
--- a/src/mathed/math_macrotable.C
+++ b/src/mathed/math_macrotable.C
@@ -10,10 +10,9 @@
 #include "math_macro.h"
 #include "math_macrotemplate.h"
 #include "math_parser.h"
+#include "math_mathmlstream.h"
 #include "debug.h"
-#include "support.h" // math_font_available
-
-MathArray mathed_parse_cell(string const &);
+#include "math_support.h" // math_font_available
 
 
 MathMacroTable::table_type MathMacroTable::macro_table;
@@ -21,6 +20,7 @@ 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)
@@ -28,6 +28,7 @@ void MathMacroTable::dump()
                        << " [" << it->second->asMacroTemplate()->nargs() << "] : "
                        << it->second->cell(0) << "\n";
        lyxerr << "------------------------------------------\n";
+*/
 }
 
 
@@ -49,11 +50,12 @@ MathAtom & MathMacroTable::provide(string const & name)
 void MathMacroTable::create(string const & name, int na, string const & text)
 {
        MathAtom t(new MathMacroTemplate(name, na));
-       t->cell(0) = mathed_parse_cell(text);
+       mathed_parse_cell(t->cell(0), text);
        macro_table[name] = t;
 }
 
 
+
 void MathMacroTable::create(string const & name, int na, MathArray const & ar)
 {
        MathAtom t(new MathMacroTemplate(name, na));
@@ -79,7 +81,6 @@ void MathMacroTable::builtinMacros()
 
        built = true;
        //lyxerr[Debug::MATHED] << "Building macros\n";
-   
        //create("emptyset",     0, "\\not0");
        create("notin",        0, "\\not\\in");
        create("slash",        0, "/");
@@ -95,30 +96,30 @@ void MathMacroTable::builtinMacros()
        create("owns",         0, "\\ni");
        create("gets",         0, "\\leftarrow");
        create("to",           0, "\\rightarrow");
-       create("|",            0, "\\parallel");
+       create("|",            0, "\\Vert");
 
-       create("longleftrightarrow", 0, "\\leftarrow\\kern-6mu\\rightarrow");
-       create("Longleftrightarrow", 0, "\\Leftarrow\\kern-6mu\\Rightarrow");
+       create("longleftrightarrow", 0, "\\leftarrow\\kern-8mu\\rightarrow");
+       create("Longleftrightarrow", 0, "\\Leftarrow\\kern-8mu\\Rightarrow");
        create("doteq", 0, "\\stackrel{\\cdot}{=}");
 
        //create("models",         0, "|\\kern-9mu=");
 
        if (math_font_available(LM_TC_CMSY)) {
-               create("longrightarrow", 0, "\\lyxbar\\kern-5mu\\rightarrow");
-               create("longleftarrow",  0, "\\leftarrow\\kern-5mu\\lyxbar");
-               create("mapsto",  0, "\\mapstochar\\rightarrow");
-               create("longmapsto",  0, "\\mapstochar\\lyxbar\\kern-5mu\\rightarrow");
+               create("longrightarrow", 0, "\\lyxbar\\kern-6mu\\rightarrow");
+               create("longleftarrow",  0, "\\leftarrow\\kern-6mu\\lyxbar");
+               create("mapsto",  0, "\\mapstochar\\kern-4mu\\rightarrow");
+               create("longmapsto",  0, "\\mapstochar\\kern-3mu\\lyxbar\\kern-6mu\\rightarrow");
        }
 
        if (math_font_available(LM_TC_CMR)) {
-               create("Longrightarrow", 0, "\\lyxeq\\kern-3mu\\Rightarrow");
-               create("Longleftarrow",  0, "\\Leftarrow\\kern-9mu\\lyxeq");
+               create("Longrightarrow", 0, "\\lyxeq\\kern-5mu\\Rightarrow");
+               create("Longleftarrow",  0, "\\Leftarrow\\kern-5mu\\lyxeq");
        }
 
        if (math_font_available(LM_TC_CMM)) {
-               create("hookrightarrow", 0, "\\lhook\\kern-5mu\\rightarrow");
-               create("hookleftarrow",  0, "\\leftarrow\\kern-5mu\\rhook");
-               create("bowtie",         0, "\\triangleright\\kern-3mu\\triangleleft");
+               create("hookrightarrow", 0, "\\lhook\\kern-8mu\\rightarrow");
+               create("hookleftarrow",  0, "\\leftarrow\\kern-8mu\\rhook");
+               create("bowtie",         0, "\\triangleright\\kern-2mu\\triangleleft");
        }
 
        if (math_font_available(LM_TC_MSA)) {
@@ -141,7 +142,7 @@ void MathMacroTable::builtinMacros()
                create("gggtr",        0, "\\ggg");
        }
 
-       //create("lint",       4, "\\int_#1^#2#3 d#4");
-       //create("silentmult", 0, "\\cdot");
-       //create("binom",        2, "\\left(\\frac#1#2\\right)");
+       //create("lint",       4, "\\int_#1^#2#3 d#4");
+       //create("silentmult", 0, "\\cdot");
+       //create("binom",        2, "\\left(\\frac#1#2\\right)");
 }