#include "math_macro.h"
#include "math_macrotemplate.h"
#include "math_parser.h"
-#include "array.h"
-#include "math_decorationinset.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 std::endl;
-
-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 << endl;
- lyxerr << "------------------------------------------" << endl;;
+ lyxerr << it->first
+ << " [" << it->second->asMacroTemplate()->nargs() << "] : "
+ << it->second->cell(0) << "\n";
+ lyxerr << "------------------------------------------\n";
+*/
}
-void MathMacroTable::updateTemplate(MathMacroTemplate * par)
+MathAtom & MathMacroTable::provide(string const & name)
{
- table_type::iterator pos = macro_table.find(par->name());
+ builtinMacros();
- if (pos == macro_table.end())
- lyxerr << "MathMacroTable::updateTemplate: no template with name '"
- << par->name() << "' available." << endl;
- else
- pos->second = par;
-}
+ table_type::iterator pos = macro_table.find(name);
+ if (pos == macro_table.end()) {
+ lyxerr << "MathMacroTable::provideTemplate: no template with name '"
+ << name << "' available.\n";
+ }
-void MathMacroTable::insertTemplate(MathMacroTemplate * p)
-{
- macro_table[p->name()] = p;
+ return pos->second;
}
-MathMacroTemplate & MathMacroTable::provideTemplate(string const & name)
+void MathMacroTable::create(string const & name, int na)
{
- builtinMacros();
-
- table_type::iterator pos = macro_table.find(name);
-
- if (pos == macro_table.end()) {
- lyxerr << "MathMacroTable::provideTemplate: no template with name '"
- << name << "' available." << endl;
- }
-
- return *pos->second;
+ macro_table[name] = MathAtom(new MathMacroTemplate(name, na));
}
-void MathMacroTable::createTemplate
- (string const & name, int na, string const & text)
+void MathMacroTable::create
+ (string const & name, int na, MathArray const & ar1, MathArray const & ar2)
{
- MathMacroTemplate * t = new MathMacroTemplate(name, na);
- t->cell(0) = mathed_parse_cell(text);
- insertTemplate(t);
+ MathAtom t(new MathMacroTemplate(name, na));
+ t->cell(0) = ar1;
+ t->cell(1) = ar2;
+ macro_table[name] = t;
}
-bool MathMacroTable::hasTemplate(string const & name)
+void MathMacroTable::define(string const & display)
{
- builtinMacros();
- return macro_table.find(name) != macro_table.end();
+ string name;
+ mathed_parse_macro(name, display);
}
-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();
}
void MathMacroTable::builtinMacros()
{
static bool built = false;
-
+
if (built)
- return;
+ return;
built = true;
-
- //lyxerr[Debug::MATHED] << "Building macros" << endl;
-
-/*
- // This macro doesn't have arguments
- {
- MathMacroTemplate * t = new MathMacroTemplate("notin", 0);
- MathDecorationInset * p = new MathDecorationInset("not");
- p->cell(0).push_back(LM_in, LM_TC_SYMB);
- t->push_back(p);
- insertTemplate(t);
- }
-*/
-
- createTemplate("silentmult", 0, "\\cdot");
- createTemplate("emptyset", 0, "\\not0");
- createTemplate("notin", 0, "\\not\\in");
-
-
-
-/*
- {
- MathMacroTemplate * t = new MathMacroTemplate("emptyset", 0);
- MathDecorationInset * p = new MathDecorationInset("not", LM_not);
- p->cell(0).push_back('O', LM_TC_VAR);
- t->push_back(p);
- insertTemplate(t);
- }
-*/
-
- {
-
- MathMacroTemplate * t = new MathMacroTemplate("land", 0);
- t->push_back(LM_wedge, LM_TC_SYMB);
- insertTemplate(t);
- }
-
- {
- MathMacroTemplate * t = new MathMacroTemplate("lor", 0);
- t->push_back(LM_vee, LM_TC_SYMB);
- insertTemplate(t);
- }
-
- {
- MathMacroTemplate * t = new MathMacroTemplate("to", 0);
- t->push_back(LM_rightarrow, LM_TC_SYMB);
- insertTemplate(t);
- }
-
- {
- 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);
- }
-*/
-
- // 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));
-
- MathInset * inset = new MathDelimInset('(', ')');
- inset->push_back(frac);
-
- MathMacroTemplate * t = new MathMacroTemplate("binom", 2);
- t->push_back(inset);
-
- insertTemplate(t);
- }
-
-/*
- {
- 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);
- }
-*/
+ //lyxerr[Debug::MATHED] << "Building macros\n";
+ //define("\\def\\emptyset{\\not0}");
+ define("\\def\\notin{\\not\\in}");
+ define("\\def\\slash{/}");
+ //define("\\def\\mathcircumflex{\\^}");
+
+ // fontmath.ltx
+
+ 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
+
+ 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
+
+ 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)) {
+ define("\\def\\Join{\\ltimes\\kern-12mu\\rtimes}");
+ //}
+
+ //
+ define("\\def\\mathcircumflex{\\mbox{\\^{}}}\n" "{\\hat{}}");
+
+ //define("\def\lint", 4, "\\int_#1^#2#3 d#4}");
+ //define("\\def\\silentmult{\\cdot}");
+ //define("\def\binom", 2, "\\left(\\frac#1#2\\right)}");
}
projects / lyx.git / blobdiff