#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;
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();
}
-void MathMacroTable::createTemplate
- (string const & name, int na, string const & text)
+void MathMacroTable::create(string const & name, int na, string const & text)
{
- MathMacroTemplate t(name, na);
- t.cell(0) = mathed_parse_cell(text);
- insertTemplate(t);
+ MathAtom t(new MathMacroTemplate(name, na));
+ mathed_parse_cell(t->cell(0), text);
+ macro_table[name] = t;
}
-bool MathMacroTable::hasTemplate(string const & name)
+
+void MathMacroTable::create(string const & name, int na, MathArray const & ar)
{
- builtinMacros();
- return macro_table.find(name) != macro_table.end();
+ MathAtom t(new MathMacroTemplate(name, na));
+ t->cell(0) = ar;
+ macro_table[name] = t;
}
-MathMacro * MathMacroTable::cloneTemplate(string const & name)
+
+bool MathMacroTable::has(string const & name)
{
- return new MathMacro(provideTemplate(name));
+ builtinMacros();
+ return macro_table.find(name) != macro_table.end();
}
built = true;
//lyxerr[Debug::MATHED] << "Building macros\n";
-
- //createTemplate("emptyset", 0, "\\not0");
- createTemplate("notin", 0, "\\not\\in");
- createTemplate("slash", 0, "/");
+ //create("emptyset", 0, "\\not0");
+ create("notin", 0, "\\not\\in");
+ create("slash", 0, "/");
// fontmath.ltx
- createTemplate("lnot", 0, "\\neg");
- createTemplate("land", 0, "\\wedge");
- createTemplate("lor", 0, "\\vee");
- 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("|", 0, "\\parallel");
+ 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");
- createTemplate("longleftrightarrow", 0, "\\leftarrow\\kern-6mu\\rightarrow");
- createTemplate("Longleftrightarrow", 0, "\\Leftarrow\\kern-6mu\\Rightarrow");
- createTemplate("doteq", 0, "\\stackrel{\\cdot}{=}");
+ create("longleftrightarrow", 0, "\\leftarrow\\kern-8mu\\rightarrow");
+ create("Longleftrightarrow", 0, "\\Leftarrow\\kern-8mu\\Rightarrow");
+ create("doteq", 0, "\\stackrel{\\cdot}{=}");
- //createTemplate("models", 0, "|\\kern-9mu=");
+ //create("models", 0, "|\\kern-9mu=");
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");
+ 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)) {
- createTemplate("Longrightarrow", 0, "\\lyxeq\\kern-3mu\\Rightarrow");
- createTemplate("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)) {
- createTemplate("hookrightarrow", 0, "\\lhook\\kern-5mu\\rightarrow");
- createTemplate("hookleftarrow", 0, "\\leftarrow\\kern-5mu\\rhook");
- createTemplate("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)) {
//amsfonts.sty
- 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");
+ 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");
// 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");
+ create("restriction", 0, "\\upharpoonright");
+ create("Doteq", 0, "\\doteqdot");
+ create("doublecup", 0, "\\Cup");
+ create("doublecap", 0, "\\Cap");
+ create("llless", 0, "\\lll");
+ create("gggtr", 0, "\\ggg");
}
- //createTemplate("lint", 4, "\\int_#1^#2#3 d#4");
- //createTemplate("silentmult", 0, "\\cdot");
- //createTemplate("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)");
}