#include "math_macrotable.h"
#include "math_macro.h"
#include "math_macrotemplate.h"
-#include "array.h"
-#include "math_accentinset.h"
-#include "math_deliminset.h"
-#include "math_fracinset.h"
-#include "math_parinset.h"
+#include "math_parser.h"
#include "debug.h"
-#include "support/LAssert.h"
+#include "support.h" // math_font_available
-using std::endl;
-using std::make_pair;
+MathArray mathed_parse_cell(string const &);
-MathMacroTable::table_type MathMacroTable::macro_table;
-bool MathMacroTable::built = false;
+MathMacroTable::table_type MathMacroTable::macro_table;
void MathMacroTable::dump()
{
- using std::cerr;
-
- 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->GetData() << endl;
- cerr << "------------------------------------------\n";
+ lyxerr << it->first << " [" << it->second.nargs() << "] : "
+ << it->second << "\n";
+ lyxerr << "------------------------------------------\n";
}
-MathMacroTemplate &
-MathMacroTable::provideTemplate(string const & name, int na)
+void MathMacroTable::insertTemplate(MathMacroTemplate const & p)
{
- if (!built)
- builtinMacros();
-
- if (macro_table.find(name) == macro_table.end())
- macro_table.insert(make_pair(name, new MathMacroTemplate(name, na)));
-
- return *(macro_table.find(name)->second);
+ 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)
+MathMacroTemplate & MathMacroTable::provideTemplate(string const & name)
{
- if (!built)
- builtinMacros();
+ builtinMacros();
- return *macro_table[name];
+ table_type::iterator pos = macro_table.find(name);
+
+ if (pos == macro_table.end()) {
+ lyxerr << "MathMacroTable::provideTemplate: no template with name '"
+ << name << "' available.\n";
+ }
+
+ 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);
}
bool MathMacroTable::hasTemplate(string const & name)
{
- if (!built)
- builtinMacros();
-
+ builtinMacros();
return macro_table.find(name) != macro_table.end();
}
void MathMacroTable::builtinMacros()
{
- built = true;
-
- lyxerr[Debug::MATHED] << "Building macros" << endl;
-
- // This macro doesn't have arguments
- {
- MathMacroTemplate & m = provideTemplate("notin", 0);
- m.push_back(new MathAccentInset(LM_in, LM_TC_BOPS, LM_not), LM_TC_INSET);
- }
+ static bool built = false;
+
+ if (built)
+ return;
- // This macro doesn't have arguments
- {
- MathMacroTemplate & m = provideTemplate("silentmult", 0);
- istringstream is("\\cdot\0");
- mathed_parser_file(is, 0);
- MathParInset * p = &m;
- mathed_parse(m.array, p, 0);
+ built = true;
+ //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");
}
- {
- MathMacroTemplate & m = provideTemplate("emptyset", 0);
- m.push_back(new MathAccentInset('0', LM_TC_RM, LM_not), LM_TC_INSET);
+ if (math_font_available(LM_TC_CMR)) {
+ createTemplate("Longrightarrow", 0, "\\lyxeq\\kern-3mu\\Rightarrow");
+ createTemplate("Longleftarrow", 0, "\\Leftarrow\\kern-9mu\\lyxeq");
}
- {
- MathMacroTemplate & m = provideTemplate("perp", 0);
- m.GetData().push_back(LM_bot, LM_TC_BOP);
+ 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 & m = provideTemplate("lint", 4);
- istringstream is("\\int_{#1}^{#2}#3 d#4\0");
- mathed_parser_file(is, 0);
- MathParInset * p = &m;
- mathed_parse(m.array, p, 0);
- }
+ if (math_font_available(LM_TC_MSA)) {
+ //amsfonts.sty
- // binom has two arguments
- {
- MathFracInset * frac = new MathFracInset(LM_OT_ATOP);
- frac->push_back(new MathMacroArgument(1), LM_TC_INSET);
- frac->denom()->push_back(new MathMacroArgument(2), LM_TC_INSET);
+ 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");
- MathParInset * inset = new MathDelimInset('(', ')');
- inset->push_back(frac, LM_TC_ACTIVE_INSET);
+ // amssymb.sty
- MathMacroTemplate & m = provideTemplate("binom", 2);
- m.push_back(inset, LM_TC_ACTIVE_INSET);
+ createTemplate("restriction", 0, "\\upharpoonright");
+ createTemplate("Doteq", 0, "\\doteqdot");
+ createTemplate("doublecup", 0, "\\Cup");
+ createTemplate("doublecap", 0, "\\Cap");
+ createTemplate("llless", 0, "\\lll");
+ createTemplate("gggtr", 0, "\\ggg");
}
+
+ //createTemplate("lint", 4, "\\int_#1^#2#3 d#4");
+ //createTemplate("silentmult", 0, "\\cdot");
+ //createTemplate("binom", 2, "\\left(\\frac#1#2\\right)");
}