cosmetics

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21477 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index c144bdcb50715fd4a5baf90ede6053b1844e3ad3..2b1c8883169917c7c1b9a4a3d18cdbc4fe85749d 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -53,8 +53,6 @@
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
 
-#include <boost/bind.hpp>
-
 #include <sstream>
 
 

diff --git a/src/mathed/MacroTable.cpp b/src/mathed/MacroTable.cpp
index ac2ac88a7602af5c77bf07aaaa530c94edfe77fe..fdfceb4124f2dbab2bd1be3499ab288eda1c9ed9 100644 (file)
--- a/src/mathed/MacroTable.cpp
+++ b/src/mathed/MacroTable.cpp
@@ -38,16 +38,24 @@ using std::vector;
 using std::size_t;
 
 
+/////////////////////////////////////////////////////////////////////
+//
+// MacroData
+//
+/////////////////////////////////////////////////////////////////////
+
 MacroData::MacroData()
        : numargs_(0), lockCount_(0), redefinition_(false)
 {}
 
 
-MacroData::MacroData(docstring const & definition, std::vector<docstring> const & defaults, 
-                                                                                int numargs, int optionals, docstring const & display, string const & requires)
+MacroData::MacroData(docstring const & definition,
+               std::vector<docstring> const & defaults, 
+               int numargs, int optionals, docstring const & display,
+               string const & requires)
        : definition_(definition), numargs_(numargs), display_(display),
-               requires_(requires), lockCount_(0), redefinition_(false), optionals_(optionals),
-               defaults_(defaults)
+               requires_(requires), lockCount_(0), redefinition_(false),
+               optionals_(optionals), defaults_(defaults)
 {
        defaults_.resize(optionals);
 }
@@ -90,7 +98,19 @@ std::vector<docstring> const &  MacroData::defaults() const
 }
 
 
-// The global table.
+void MacroData::unlock() const
+{
+       --lockCount_;
+       BOOST_ASSERT(lockCount_ >= 0);
+}
+
+
+/////////////////////////////////////////////////////////////////////
+//
+// The global table of macros
+//
+/////////////////////////////////////////////////////////////////////
+
 MacroTable & MacroTable::globalMacros()
 {
        static MacroTable theGlobalMacros;

diff --git a/src/mathed/MacroTable.h b/src/mathed/MacroTable.h
index 082cf675d63f0d1547bfcfec70d17e016e239368..709fd3b61fcc35a80f09ae7b0994d97b2286bf78 100644 (file)
--- a/src/mathed/MacroTable.h
+++ b/src/mathed/MacroTable.h
@@ -15,8 +15,6 @@
 
 #include "support/docstring.h"
 
-#include <boost/assert.hpp>
-
 #include <map>
 #include <vector>
 
@@ -32,16 +30,17 @@ public:
        ///
        MacroData();
        ///
-       MacroData(docstring const & definition, std::vector<docstring> const & defaults, 
-                                               int nargs, int optionals, 
-                                               docstring const & display, std::string const & requires);
+       MacroData(docstring const & definition,
+               std::vector<docstring> const & defaults, int nargs, int optionals, 
+               docstring const & display, std::string const & requires);
        ///
        docstring const & definition() const { return definition_; }
        ///
        docstring const & display() const { return display_; }
        /// arity including optional arguments (if there is any)
        size_t numargs() const { return numargs_; }
-       /// replace #1,#2,... by given MathAtom 0,1,.., _including_ the possible optional argument
+       /// replace #1,#2,... by given MathAtom 0,1,.., _including_ the possible
+       /// optional argument
        void expand(std::vector<MathData> const & from, MathData & to) const;
        /// number of optional arguments
        size_t optionals() const;
@@ -57,7 +56,7 @@ public:
        /// is it being drawn?
        bool locked() const { return lockCount_ != 0; }
        ///
-       void unlock() const { --lockCount_; BOOST_ASSERT(lockCount_ >= 0); }
+       void unlock() const;
        
        ///
        bool redefinition() const { return redefinition_; }
@@ -132,7 +131,8 @@ public:
  **/
 class MacroContext {
 public:
-       /// construct context for insets in par (not including the ones defined in par itself)
+       /// construct context for insets in par (not including the ones
+       /// defined in par itself)
        MacroContext(Buffer const & buf, Paragraph const & par);
        
        /// Look for macro