typo

[lyx.git] / src / mathed / MacroTable.cpp

diff --git a/src/mathed/MacroTable.cpp b/src/mathed/MacroTable.cpp
index 2899e40c2e7e75b76d55d5ef040ecd83a6b9fab5..1cc5a1521fe2992169a2697bcddee5ea3e225643 100644 (file)
--- a/src/mathed/MacroTable.cpp
+++ b/src/mathed/MacroTable.cpp
@@ -10,17 +10,17 @@
 
 #include <config.h>
 
-#include "InsetMathSqrt.h"
 #include "MacroTable.h"
-#include "MathMacroTemplate.h"
-#include "MathMacroArgument.h"
+
+#include "InsetMathSqrt.h"
+#include "InsetMathMacroTemplate.h"
+#include "InsetMathMacroArgument.h"
 #include "MathParser.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "InsetMathNest.h"
 
 #include "Buffer.h"
-#include "DocIterator.h"
 #include "InsetList.h"
 #include "Text.h"
 
@@ -41,29 +41,24 @@ namespace lyx {
 //
 /////////////////////////////////////////////////////////////////////
 
-MacroData::MacroData(Buffer * buf)
-       : buffer_(buf), queried_(true), numargs_(0), sym_(0), optionals_(0),
-         lockCount_(0), redefinition_(false), type_(MacroTypeNewcommand)
+MacroData::MacroData(const Buffer * buf)
+       : buffer_(buf), queried_(true)
 {}
 
 
-MacroData::MacroData(Buffer * buf, DocIterator const & pos)
-       : buffer_(buf), pos_(pos), queried_(false), numargs_(0), sym_(0),
-         optionals_(0), lockCount_(0), redefinition_(false),
-         type_(MacroTypeNewcommand)
-{
-}
+MacroData::MacroData(Buffer const * buf, DocIterator const & pos)
+       : buffer_(buf), pos_(pos)
+{}
 
 
-MacroData::MacroData(Buffer * buf, MathMacroTemplate const & macro)
-       : buffer_(buf), queried_(false), numargs_(0), sym_(0), optionals_(0),
-         lockCount_(0), redefinition_(false), type_(MacroTypeNewcommand)
+MacroData::MacroData(Buffer const * buf, InsetMathMacroTemplate const & macro)
+       : buffer_(buf)
 {
        queryData(macro);
 }
 
 
-bool MacroData::expand(vector<MathData> const & args, MathData & to) const
+bool MacroData::expand(vector<MathData> const & from, MathData & to) const
 {
        updateData();
 
@@ -81,10 +76,10 @@ bool MacroData::expand(vector<MathData> const & args, MathData & to) const
                        continue;
                //it.cell().erase(it.pos());
                //it.cell().insert(it.pos(), it.nextInset()->asInsetMath()
-               size_t n = static_cast<MathMacroArgument*>(it.nextInset())->number();
-               if (n <= args.size()) {
+               size_t n = static_cast<InsetMathMacroArgument*>(it.nextInset())->number();
+               if (n <= from.size()) {
                        it.cell().erase(it.pos());
-                       it.cell().insert(it.pos(), args[n - 1]);
+                       it.cell().insert(it.pos(), from[n - 1]);
                }
        }
        //LYXERR0("MathData::expand: res: " << inset.cell(0));
@@ -110,10 +105,10 @@ vector<docstring> const & MacroData::defaults() const
 }
 
 
-string const MacroData::requires() const
+string const MacroData::required() const
 {
        if (sym_)
-               return sym_->requires;
+               return sym_->required;
        return string();
 }
 
@@ -126,6 +121,14 @@ bool MacroData::hidden() const
 }
 
 
+docstring const MacroData::htmlname() const
+{
+       if (sym_)
+               return sym_->htmlname;
+       return docstring();
+}
+
+
 docstring const MacroData::xmlname() const
 {
        if (sym_)
@@ -147,7 +150,7 @@ void MacroData::unlock() const
 }
 
 
-void MacroData::queryData(MathMacroTemplate const & macro) const
+void MacroData::queryData(InsetMathMacroTemplate const & macro) const
 {
        if (queried_)
                return;
@@ -182,7 +185,7 @@ void MacroData::updateData() const
        }
 
        // query the data from the macro template
-       queryData(static_cast<MathMacroTemplate const &>(*inset));
+       queryData(static_cast<InsetMathMacroTemplate const &>(*inset));
 }
 
 
@@ -198,10 +201,10 @@ int MacroData::write(odocstream & os, bool overwriteRedefinition) const
        }
 
        // output template
-       MathMacroTemplate const & tmpl =
-               static_cast<MathMacroTemplate const &>(*inset);
+       InsetMathMacroTemplate const & tmpl =
+               static_cast<InsetMathMacroTemplate const &>(*inset);
        otexrowstream ots(os);
-       WriteStream wi(ots, false, true, WriteStream::wsDefault);
+       TeXMathStream wi(ots, false, true, TeXMathStream::wsDefault);
        return tmpl.write(wi, overwriteRedefinition);
 }
 
@@ -241,11 +244,11 @@ MacroTable::insert(docstring const & name, MacroData const & data)
 
 
 MacroTable::iterator
-MacroTable::insert(Buffer * buf, docstring const & def)
+MacroTable::insert(Buffer * buf, docstring const & definition)
 {
        //lyxerr << "MacroTable::insert, def: " << to_utf8(def) << endl;
-       MathMacroTemplate mac(buf);
-       mac.fromString(def);
+       InsetMathMacroTemplate mac(buf);
+       mac.fromString(definition);
        MacroData data(buf, mac);
        return insert(mac.name(), data);
 }