#include "math_macro.h"
#include "math_macrotemplate.h"
#include "math_parser.h"
-#include "array.h"
-#include "math_accentinset.h"
-#include "math_deliminset.h"
-#include "math_fracinset.h"
-#include "math_inset.h"
+#include "math_mathmlstream.h"
#include "debug.h"
-#include "support/LAssert.h"
-
-
-using namespace std;
+#include "math_support.h" // math_font_available
MathMacroTable::table_type MathMacroTable::macro_table;
void MathMacroTable::dump()
{
- cerr << "\n------------------------------------------\n";
+/*
+ lyxerr << "\n------------------------------------------\n";
table_type::const_iterator it;
for (it = macro_table.begin(); it != macro_table.end(); ++it)
- cerr << it->first << " [" << it->second->nargs() << "] : "
- << it->second << endl;
- cerr << "------------------------------------------\n";
-}
-
-
-void MathMacroTable::updateTemplate(MathMacroTemplate * par)
-{
- table_type::iterator pos = macro_table.find(par->name());
-
- if (pos == macro_table.end())
- lyxerr << "MathMacroTable::updateTemplate: no template with name '"
- << par->name() << "' available.\n";
- else
- pos->second = par;
-}
-
-
-void MathMacroTable::insertTemplate(MathMacroTemplate * p)
-{
- macro_table[p->name()] = p;
+ lyxerr << it->first
+ << " [" << it->second->asMacroTemplate()->nargs() << "] : "
+ << it->second->cell(0) << "\n";
+ lyxerr << "------------------------------------------\n";
+*/
}
-MathMacroTemplate & MathMacroTable::provideTemplate(string const & name)
+MathAtom & MathMacroTable::provide(string const & name)
{
builtinMacros();
if (pos == macro_table.end()) {
lyxerr << "MathMacroTable::provideTemplate: no template with name '"
- << name << "' available.\n";
+ << name << "' available.\n";
}
- return *pos->second;
+ return pos->second;
}
-bool MathMacroTable::hasTemplate(string const & name)
+void MathMacroTable::create(string const & name, int na, string const & text)
{
- builtinMacros();
- return macro_table.find(name) != macro_table.end();
+ MathAtom t(new MathMacroTemplate(name, na));
+ 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));
+ 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();
}
return;
built = true;
-
- lyxerr[Debug::MATHED] << "Building macros\n";
-
- // This macro doesn't have arguments
- {
- MathMacroTemplate * t = new MathMacroTemplate("notin", 0);
- t->push_back(new MathAccentInset(LM_in, LM_TC_BOPS, LM_not));
- insertTemplate(t);
+ //lyxerr[Debug::MATHED] << "Building macros\n";
+ //create("emptyset", 0, "\\not0");
+ create("notin", 0, "\\not\\in");
+ create("slash", 0, "/");
+
+ // 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}{=}");
+
+ //create("models", 0, "|\\kern-9mu=");
+
+ 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");
}
-/*
- // This macro doesn't have arguments
- {
- MathMacroTemplate & m = createTemplate("silentmult", 0);
- istringstream is("\\cdot\0");
- mathed_parser_file(is, 0);
- MathMatrixInset * p = &m;
- mathed_parse(m.array, p, 0);
+ if (math_font_available(LM_TC_CMR)) {
+ create("Longrightarrow", 0, "\\lyxeq\\kern-5mu\\Rightarrow");
+ create("Longleftarrow", 0, "\\Leftarrow\\kern-5mu\\lyxeq");
}
-*/
- {
- MathMacroTemplate * t = new MathMacroTemplate("emptyset", 0);
- t->push_back(new MathAccentInset('0', LM_TC_RM, LM_not));
- insertTemplate(t);
+ 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");
}
- {
- MathMacroTemplate * t = new MathMacroTemplate("perp", 0);
- t->push_back(LM_bot, LM_TC_BOP);
- insertTemplate(t);
- }
-/*
- {
- MathMacroTemplate & m = createTemplate("lint", 4);
- istringstream is("\\int_{#1}^{#2}#3 d#4\0");
- mathed_parser_file(is, 0);
- MathMatrixInset * p = &m;
- mathed_parse(m.array, p, 0);
- }
-*/
-/*
- {
- MathMacroTemplate * t = new MathMacroTemplate("binomii", 2);
- istringstream is("\\left(\\frac{#1}{#2}\\right)\0");
- mathed_parser_file(is, 0);
- mathed_parse(t->array, t, 0);
- insertTemplate(t);
- }
-*/
+ if (math_font_available(LM_TC_MSA)) {
+ //amsfonts.sty
- // binom has two arguments
- {
- MathFracInset * frac = new MathFracInset(LM_OT_ATOP);
- frac->cell(0).push_back(new MathMacroArgument(1));
- frac->cell(1).push_back(new MathMacroArgument(2));
+ 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");
- MathInset * inset = new MathDelimInset('(', ')');
- inset->push_back(frac);
+ // amssymb.sty
- MathMacroTemplate * t = new MathMacroTemplate("binom", 2);
- t->push_back(inset);
-
- insertTemplate(t);
+ create("restriction", 0, "\\upharpoonright");
+ create("Doteq", 0, "\\doteqdot");
+ create("doublecup", 0, "\\Cup");
+ create("doublecap", 0, "\\Cap");
+ create("llless", 0, "\\lll");
+ create("gggtr", 0, "\\ggg");
}
-/*
- {
- MathFracInset * frac = new MathFracInset(LM_OT_ATOP);
- frac->cell(0)->push_back(new MathMacroArgument(1));
- frac->cell(1)->push_back(new MathMacroArgument(2));
-
- MathMacroTemplate * t = new MathMacroTemplate("choose", 2);
- t->push_back(frac);
-
- insertTemplate(t);
- }
-*/
+ //create("lint", 4, "\\int_#1^#2#3 d#4");
+ //create("silentmult", 0, "\\cdot");
+ //create("binom", 2, "\\left(\\frac#1#2\\right)");
}
projects / lyx.git / blobdiff