#include "math_macrotable.h"
#include "math_macro.h"
#include "math_macrotemplate.h"
-#include "math_iter.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 "math_mathmlstream.h"
#include "debug.h"
-#include "support/LAssert.h"
+#include "math_support.h" // math_font_available
-using std::endl;
-using std::make_pair;
MathMacroTable::table_type MathMacroTable::macro_table;
-bool MathMacroTable::built = false;
-
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->asMacroTemplate()->nargs() << "] : "
+ << it->second->cell(0) << "\n";
+ lyxerr << "------------------------------------------\n";
+*/
}
-MathMacroTemplate &
-MathMacroTable::provideTemplate(string const & name, int na)
+MathAtom & MathMacroTable::provide(string const & name)
{
- 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);
-}
+ builtinMacros();
+ table_type::iterator pos = macro_table.find(name);
-MathMacroTemplate &
-MathMacroTable::provideTemplate(string const & name)
-{
- if (!built)
- builtinMacros();
-
- return *macro_table[name];
+ if (pos == macro_table.end()) {
+ lyxerr << "MathMacroTable::provideTemplate: no template with name '"
+ << name << "' available.\n";
+ }
+
+ return pos->second;
}
-bool MathMacroTable::hasTemplate(string const & name)
+void MathMacroTable::create(string const & name, int na)
{
- if (!built)
- builtinMacros();
-
- return macro_table.find(name) != macro_table.end();
+ macro_table[name] = MathAtom(new MathMacroTemplate(name, na));
}
-MathMacro * MathMacroTable::cloneTemplate(string const & name)
+void MathMacroTable::create
+ (string const & name, int na, MathArray const & ar1, MathArray const & ar2)
{
- return new MathMacro(provideTemplate(name));
+ MathAtom t(new MathMacroTemplate(name, na));
+ t->cell(0) = ar1;
+ t->cell(1) = ar2;
+ macro_table[name] = t;
}
-void MathMacroTable::builtinMacros()
+void MathMacroTable::define(string const & display)
{
- built = true;
-
- lyxerr[Debug::MATHED] << "Building macros" << endl;
-
- // This macro doesn't have arguments
- {
- MathMacroTemplate & m = provideTemplate("notin", 0);
- MathedIter iter(&m.GetData());
- iter.insertInset(new MathAccentInset(LM_in, LM_TC_BOPS, LM_not),
- LM_TC_INSET);
- }
-
- // 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);
- }
-
- // These two are only while we are still with LyX 2.x
- {
- MathMacroTemplate & m = provideTemplate("emptyset", 0);
- MathedIter iter(&m.GetData());
- iter.insertInset(new MathAccentInset('0', LM_TC_RM, LM_not),
- LM_TC_INSET);
- }
-
- {
- MathMacroTemplate & m = provideTemplate("perp", 0);
- MathedIter iter(&m.GetData());
- iter.insert(LM_bot, LM_TC_BOP);
- }
-
- {
- 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);
- }
-
- {
- MathMacroTemplate & m = provideTemplate("binom", 2);
- istringstream is("\\choose{#1}{#2}");
- mathed_parser_file(is, 0);
- MathParInset * p = &m;
- mathed_parse(m.array, p, 0);
- }
-
- // binom has two arguments
- {
- MathMacroTemplate & m = provideTemplate("binom1", 2);
- MathedIter iter(&m.GetData());
-
- MathParInset * inset = new MathDelimInset('(', ')');
- iter.insertInset(inset, LM_TC_ACTIVE_INSET);
+ string name;
+ mathed_parse_macro(name, display);
+}
- MathedArray array2;
- MathedIter iter2(&array2);
- MathFracInset * frac = new MathFracInset(LM_OT_ATOP);
- iter2.insertInset(frac, LM_TC_ACTIVE_INSET);
- frac->setData(array2);
- MathedArray array3;
- MathedIter iter3(&array3);
- iter3.insertInset(new MathMacroArgument(1), LM_TC_INSET);
+bool MathMacroTable::has(string const & name)
+{
+ builtinMacros();
+ return macro_table.find(name) != macro_table.end();
+}
- MathedArray array4;
- MathedIter iter4(&array4);
- iter4.insertInset(new MathMacroArgument(2), LM_TC_INSET);
- frac->SetData(array3, array4);
- }
+void MathMacroTable::builtinMacros()
+{
+ static bool built = false;
-/*
- {
- boost::shared_ptr<MathMacroTemplate> m(new MathMacroTemplate("perp", 0));
- addTemplate(m);
- MathedArray array;
- MathedIter iter(&array);
- iter.insert(LM_bot, LM_TC_BOP);
- m->setData(array);
- }
+ if (built)
+ return;
- // binom has two arguments
- {
- boost::shared_ptr<MathMacroTemplate> m(new MathMacroTemplate("binom", 2));
- addTemplate(m);
- MathedArray array;
- m->setData(array);
- MathedIter iter(&array);
- MathParInset * inset = new MathDelimInset('(', ')');
- iter.insertInset(inset, LM_TC_ACTIVE_INSET);
- array = MathedArray();
- MathedIter iter2(&array);
- MathFracInset * frac = new MathFracInset(LM_OT_ATOP);
- iter2.insertInset(frac, LM_TC_ACTIVE_INSET);
- inset->setData(array);
- array = MathedArray();
- MathedArray array2;
- MathedIter iter3(&array);
- iter3.insertInset(m->getMacroPar(0), LM_TC_INSET);
- MathedIter iter4(&array2);
- iter4.insertInset(m->getMacroPar(1), LM_TC_INSET);
- frac->SetData(array, array2);
- }
-*/
+ built = true;
+ //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