several smallish changes/bugfixes/left overs from Porto

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

diff --git a/src/mathed/math_macrotable.C b/src/mathed/math_macrotable.C
index 9d373a71d3afd00a449bfec18070d83a1209e05d..b7cd35d2d36afc409ca0c60f704d8600dfc75b34 100644 (file)
--- a/src/mathed/math_macrotable.C
+++ b/src/mathed/math_macrotable.C
@@ -47,15 +47,12 @@ MathAtom & MathMacroTable::provide(string const & name)
 }
 
 
-void MathMacroTable::create(string const & name, int na, string const & text)
+void MathMacroTable::create(string const & name, int na)
 {
-       MathAtom t(new MathMacroTemplate(name, na));
-       mathed_parse_cell(t->cell(0), text);
-       macro_table[name] = t;
+       macro_table[name] = MathAtom(new MathMacroTemplate(name, na));
 }
 
 
-
 void MathMacroTable::create
        (string const & name, int na, MathArray const & ar1, MathArray const & ar2)
 {
@@ -66,6 +63,12 @@ void MathMacroTable::create
 }
 
 
+void MathMacroTable::define(string const & display)
+{
+       string name;
+       mathed_parse_macro(name, display);
+}
+
 
 bool MathMacroTable::has(string const & name)
 {
@@ -83,71 +86,75 @@ void MathMacroTable::builtinMacros()
 
        built = true;
        //lyxerr[Debug::MATHED] << "Building macros\n";
-       //create("emptyset",     0, "\\not0");
-       create("notin",        0, "\\not\\in");
-       create("slash",        0, "/");
+       //define("\\def\\emptyset{\\not0}");
+       define("\\def\\notin{\\not\\in}");
+       define("\\def\\slash{/}");
+       //define("\\def\\mathcircumflex{\\^}");
 
        // fontmath.ltx
 
-       create("lnot",         0, "\\neg");
-       create("land",         0, "\\wedge");
-       create("lor",          0, "\\vee");
-       create("ne",           0, "\\neq");
-       create("le",           0, "\\leq");
-       create("ge",           0, "\\geq");
-       create("owns",         0, "\\ni");
-       create("gets",         0, "\\leftarrow");
-       create("to",           0, "\\rightarrow");
-       create("|",            0, "\\Vert");
-
-       create("longleftrightarrow", 0, "\\leftarrow\\kern-8mu\\rightarrow");
-       create("Longleftrightarrow", 0, "\\Leftarrow\\kern-8mu\\Rightarrow");
-       create("doteq", 0, "\\stackrel{\\cdot}{=}");
-
-       if (math_font_available(LM_TC_CMSY)) {
-               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) && math_font_available(LM_TC_CMSY)) {
-               create("Longrightarrow", 0, "\\lyxeq\\kern-5mu\\Rightarrow");
-               create("Longleftarrow",  0, "\\Leftarrow\\kern-5mu\\lyxeq");
-               create("models",         0, "\\vert\\kern-3mu\\lyxeq");
-       }
-
-       if (math_font_available(LM_TC_CMM)) {
-               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)) {
+       define("\\def\\lnot{\\neg}");
+       define("\\def\\land{\\wedge}");
+       define("\\def\\lor{\\vee}");
+       define("\\def\\ne{\\neq}");
+       define("\\def\\le{\\leq}");
+       define("\\def\\ge{\\geq}");
+       define("\\def\\owns{\\ni}");
+       define("\\def\\gets{\\leftarrow}");
+       define("\\def\\to{\\rightarrow}");
+       define("\\def\\|{\\Vert}");
+
+       define("\\def\\longleftrightarrow{\\leftarrow\\kern-8mu\\rightarrow}");
+       define("\\def\\Longleftrightarrow{\\Leftarrow\\kern-8mu\\Rightarrow}");
+       define("\\def\\doteq{\\stackrel{\\cdot}{\\=}}");
+
+       //if (math_font_available(LM_TC_CMSY)) {
+               define("\\def\\longrightarrow{\\lyxbar\\kern-6mu\\rightarrow}");
+               define("\\def\\longleftarrow{\\leftarrow\\kern-6mu\\lyxbar}");
+               define("\\def\\mapsto{\\mapstochar\\kern-4mu\\rightarrow}");
+               define("\\def\\longmapsto{\\mapstochar\\kern-3mu\\lyxbar\\kern-6mu\\rightarrow}");
+       //}
+
+       //if (math_font_available(LM_TC_CMR) && math_font_available(LM_TC_CMSY)) {
+               define("\\def\\Longrightarrow{\\lyxeq\\kern-5mu\\Rightarrow}");
+               define("\\def\\Longleftarrow{\\Leftarrow\\kern-5mu\\lyxeq}");
+               define("\\def\\models{\\vert\\kern-3mu\\lyxeq}");
+       //}
+
+       //if (math_font_available(LM_TC_CMM)) {
+               define("\\def\\hookrightarrow{\\lhook\\kern-8mu\\rightarrow}");
+               define("\\def\\hookleftarrow{\\leftarrow\\kern-8mu\\rhook}");
+               define("\\def\\bowtie{\\triangleright\\kern-2mu\\triangleleft}");
+       //}
+
+       //if (math_font_available(LM_TC_MSA)) {
                //amsfonts.sty
 
-               create("dashrightarrow", 0, "\\lyxdabar\\lyxdabar\\lyxright");
-               create("dashleftarrow", 0, "\\lyxleft\\lyxdabar\\lyxdabar");
-               create("dasharrow",    0, "\\dashrightarrow");
-               create("Box",          0, "\\square");
-               create("Diamond",      0, "\\lozenge");
-               create("leadsto",      0, "\\rightsquigarrow");
+               define("\\def\\dashrightarrow{\\lyxdabar\\lyxdabar\\lyxright}");
+               define("\\def\\dashleftarrow{\\lyxleft\\lyxdabar\\lyxdabar}");
+               define("\\def\\dasharrow{\\dashrightarrow}");
+               define("\\def\\Box{\\square}");
+               define("\\def\\Diamond{\\lozenge}");
+               define("\\def\\leadsto{\\rightsquigarrow}");
 
                // amssymb.sty
 
-               create("restriction",  0, "\\upharpoonright");
-               create("Doteq",        0, "\\doteqdot");
-               create("doublecup",    0, "\\Cup");
-               create("doublecap",    0, "\\Cap");
-               create("llless",       0, "\\lll");
-               create("gggtr",        0, "\\ggg");
-       }
+               define("\\def\\restriction{\\upharpoonright}");
+               define("\\def\\Doteq{\\doteqdot}");
+               define("\\def\\doublecup{\\Cup}");
+               define("\\def\\doublecap{\\Cap}");
+               define("\\def\\llless{\\lll}");
+               define("\\def\\gggtr{\\ggg}");
+       //}
 
-       if (math_font_available(LM_TC_MSB)) {
-               create("Join",         0, "\\ltimes\\kern-12mu\\rtimes");
-       }
+       //if (math_font_available(LM_TC_MSB)) {
+               define("\\def\\Join{\\ltimes\\kern-12mu\\rtimes}");
+       //}
+
+       //
+       define("\\def\\mathcircumflex{\\mbox{\\^{}}}\n"   "{\\hat{}}");
 
-       //create("lint",       4, "\\int_#1^#2#3 d#4");
-       //create("silentmult", 0, "\\cdot");
-       //create("binom",        2, "\\left(\\frac#1#2\\right)");
+       //define("\def\lint",       4, "\\int_#1^#2#3 d#4}");
+       //define("\\def\\silentmult{\\cdot}");
+       //define("\def\binom",        2, "\\left(\\frac#1#2\\right)}");
 }