#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 "debug.h"
-#include "support/LAssert.h"
+#include "support.h" // math_font_available
+
+MathArray mathed_parse_cell(string const &);
-using std::endl;
MathMacroTable::table_type MathMacroTable::macro_table;
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 << endl;
- lyxerr << "------------------------------------------" << endl;;
+ lyxerr << it->first << " [" << it->second.nargs() << "] : "
+ << it->second << "\n";
+ lyxerr << "------------------------------------------\n";
}
-void MathMacroTable::updateTemplate(MathMacroTemplate * par)
+void MathMacroTable::insertTemplate(MathMacroTemplate const & p)
{
- table_type::iterator pos = macro_table.find(par->name());
-
- if (pos == macro_table.end())
- lyxerr << "MathMacroTable::updateTemplate: no template with name '"
- << par->name() << "' available." << endl;
- else
- pos->second = par;
-}
-
-
-void MathMacroTable::insertTemplate(MathMacroTemplate * p)
-{
- macro_table[p->name()] = p;
+ if (macro_table.find(p.name()) != macro_table.end())
+ lyxerr << "macro '" << p.name() << "' not new\n";
+ macro_table[p.name()] = p;
}
if (pos == macro_table.end()) {
lyxerr << "MathMacroTable::provideTemplate: no template with name '"
- << name << "' available." << endl;
+ << name << "' available.\n";
}
- return *pos->second;
+ return pos->second;
+}
+
+
+void MathMacroTable::createTemplate
+ (string const & name, int na, string const & text)
+{
+ MathMacroTemplate t(name, na);
+ t.cell(0) = mathed_parse_cell(text);
+ insertTemplate(t);
}
return;
built = true;
-
- lyxerr[Debug::MATHED] << "Building macros" << endl;
-
- // This macro doesn't have arguments
- {
- MathMacroTemplate * t = new MathMacroTemplate("notin", 0);
- MathAccentInset * p = new MathAccentInset(LM_not);
- p->cell(0).push_back(LM_in, LM_TC_BOPS);
- t->push_back(p);
- insertTemplate(t);
+ //lyxerr[Debug::MATHED] << "Building macros\n";
+
+ //createTemplate("emptyset", 0, "\\not0");
+ createTemplate("notin", 0, "\\not\\in");
+ createTemplate("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");
+
+ createTemplate("longleftrightarrow", 0, "\\leftarrow\\kern-6mu\\rightarrow");
+ createTemplate("Longleftrightarrow", 0, "\\Leftarrow\\kern-6mu\\Rightarrow");
+ createTemplate("doteq", 0, "\\stackrel{\\cdot}{=}");
+
+ //createTemplate("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");
}
-/*
- // 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);
- }
-*/
-
- {
- MathMacroTemplate * t = new MathMacroTemplate("emptyset", 0);
- MathAccentInset * p = new MathAccentInset(LM_not);
- p->cell(0).push_back('0', LM_TC_VAR);
- t->push_back(p);
- insertTemplate(t);
+ if (math_font_available(LM_TC_CMR)) {
+ createTemplate("Longrightarrow", 0, "\\lyxeq\\kern-3mu\\Rightarrow");
+ createTemplate("Longleftarrow", 0, "\\Leftarrow\\kern-9mu\\lyxeq");
}
- {
- MathMacroTemplate * t = new MathMacroTemplate("to", 0);
- t->push_back(LM_rightarrow, LM_TC_SYMB);
- 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");
}
- {
- 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("atop");
- frac->cell(0).push_back(new MathMacroArgument(1));
- frac->cell(1).push_back(new MathMacroArgument(2));
+ 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");
- MathInset * inset = new MathDelimInset('(', ')');
- inset->push_back(frac);
+ // amssymb.sty
- MathMacroTemplate * t = new MathMacroTemplate("binom", 2);
- t->push_back(inset);
-
- insertTemplate(t);
+ createTemplate("restriction", 0, "\\upharpoonright");
+ createTemplate("Doteq", 0, "\\doteqdot");
+ createTemplate("doublecup", 0, "\\Cup");
+ createTemplate("doublecap", 0, "\\Cap");
+ createTemplate("llless", 0, "\\lll");
+ createTemplate("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);
- }
-*/
+ //createTemplate("lint", 4, "\\int_#1^#2#3 d#4");
+ //createTemplate("silentmult", 0, "\\cdot");
+ //createTemplate("binom", 2, "\\left(\\frac#1#2\\right)");
}
projects / lyx.git / blobdiff