Add In nsetOld * argument to updateInset to rebreak the correct par.

[lyx.git] / src / mathed / math_macrotable.C

diff --git a/src/mathed/math_macrotable.C b/src/mathed/math_macrotable.C
index c5ab680d3933c6f5b0cec651ee71e820f8a7ff88..885bd5b3b3738e00df1d4d466397937c7348cea7 100644 (file)
--- a/src/mathed/math_macrotable.C
+++ b/src/mathed/math_macrotable.C
@@ -1,160 +1,63 @@
-#include <config.h>
+/**
+ * \file math_macrotable.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #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
+
+#include <iostream>
 
 using std::endl;
 
-MathMacroTable::table_type MathMacroTable::macro_table;
 
-bool MathMacroTable::built = false;
+MathMacroTable::table_type MathMacroTable::macro_table;
 
 
 void MathMacroTable::dump()
 {
-       cerr << "\n------------------------------------------\n";
+/*
+       lyxerr << "\n------------------------------------------" << endl;
        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) << endl;
+       lyxerr << "------------------------------------------" << endl;
+*/
 }
 
 
-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);
+       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;
 }
 
 
-MathMacroTemplate &
-MathMacroTable::provideTemplate(string const & name)
+void MathMacroTable::create(MathAtom const & at)
 {
-       if (!built)
-               builtinMacros();
-       
-       return *macro_table[name];
+       macro_table[at->asMacroTemplate()->name()] = at;
 }
 
 
-bool MathMacroTable::hasTemplate(string const & name)
+bool MathMacroTable::has(string const & name)
 {
-       if (!built)
-               builtinMacros();
-       
        return macro_table.find(name) != macro_table.end();
 }
-
-
-MathMacro * MathMacroTable::cloneTemplate(string const & name)
-{
-       return new MathMacro(provideTemplate(name));
-}
-
-
-void MathMacroTable::builtinMacros()
-{
-       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);
-       }
-
-       // 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);
-       }
-
-       // binom has two arguments
-       {
-               MathMacroTemplate & m = provideTemplate("binom", 2);
-               MathedIter iter(&m.GetData());
-
-               MathParInset * inset = new MathDelimInset('(', ')');
-               iter.insertInset(inset, LM_TC_ACTIVE_INSET);
-
-               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);
-
-               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);
-       }
-
-       // 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);
-       }
-*/
-}