#include <config.h>
+#include <iostream>
+
#ifdef __GNUG__
#pragma implementation
#endif
#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;
MathMacroTable::table_type MathMacroTable::macro_table;
-bool MathMacroTable::built = false;
-
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->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();
+ 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);
+ 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;
}
-MathMacroTemplate &
-MathMacroTable::provideTemplate(string const & name)
+void MathMacroTable::create(string const & name, int na, string const & text)
{
- if (!built)
- builtinMacros();
-
- return *macro_table[name];
+ MathAtom t(new MathMacroTemplate(name, na));
+ mathed_parse_cell(t->cell(0), text);
+ macro_table[name] = t;
}
-bool MathMacroTable::hasTemplate(string const & name)
+
+void MathMacroTable::create(string const & name, int na, MathArray const & ar)
{
- if (!built)
- builtinMacros();
-
- return macro_table.find(name) != macro_table.end();
+ 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();
}
void MathMacroTable::builtinMacros()
{
+ static bool built = false;
+
+ if (built)
+ return;
+
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);
+ //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");
}
- // 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);
+ if (math_font_available(LM_TC_CMR)) {
+ create("Longrightarrow", 0, "\\lyxeq\\kern-5mu\\Rightarrow");
+ create("Longleftarrow", 0, "\\Leftarrow\\kern-5mu\\lyxeq");
}
- {
- MathMacroTemplate & m = provideTemplate("perp", 0);
- MathedIter iter(&m.GetData());
- iter.insert(LM_bot, LM_TC_BOP);
+ 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");
}
- // binom has two arguments
- {
- MathMacroTemplate & m = provideTemplate("binom", 2);
- MathedIter iter(&m.GetData());
-
- MathParInset * inset = new MathDelimInset('(', ')');
- iter.insertInset(inset, LM_TC_ACTIVE_INSET);
+ if (math_font_available(LM_TC_MSA)) {
+ //amsfonts.sty
- MathedArray array2;
- MathedIter iter2(&array2);
- MathFracInset * frac = new MathFracInset(LM_OT_ATOP);
- iter2.insertInset(frac, LM_TC_ACTIVE_INSET);
- frac->setData(array2);
+ 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");
- MathedArray array3;
- MathedIter iter3(&array3);
- iter3.insertInset(new MathMacroArgument(1), LM_TC_INSET);
+ // amssymb.sty
- MathedArray array4;
- MathedIter iter4(&array4);
- iter4.insertInset(new MathMacroArgument(2), LM_TC_INSET);
-
- frac->SetData(array3, array4);
- }
-
-/*
- {
- 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);
+ create("restriction", 0, "\\upharpoonright");
+ create("Doteq", 0, "\\doteqdot");
+ create("doublecup", 0, "\\Cup");
+ create("doublecap", 0, "\\Cap");
+ create("llless", 0, "\\lll");
+ create("gggtr", 0, "\\ggg");
}
- // 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);
- }
-*/
+ //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