* InsetMathHull:

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

diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index 37c393e01014de2f76573dce245b8158efccd9eb..bf6132630a7f60b0721c0c810768b77a3eee0094 100644 (file)
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -13,9 +13,11 @@
 #include <config.h>
 
 #include "MathMacro.h"
-#include "MathSupport.h"
+
+#include "MathCompletionList.h"
 #include "MathExtern.h"
 #include "MathStream.h"
+#include "MathSupport.h"
 
 #include "Buffer.h"
 #include "BufferView.h"
@@ -30,6 +32,7 @@
 
 #include "frontends/Painter.h"
 
+#include "support/lassert.h"
 #include "support/debug.h"
 
 #include <ostream>
@@ -192,7 +195,7 @@ void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
                   && editing_[mi.base.bv]) {
                // Macro will be edited in a old-style list mode here:
 
-               BOOST_ASSERT(macro_ != 0);
+               LASSERT(macro_ != 0, /**/);
                Dimension fontDim;
                FontInfo labelFont = sane_font;
                math_font_max_dim(labelFont, fontDim.asc, fontDim.des);
@@ -229,7 +232,7 @@ void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
                dim.wid += 2;
                metricsMarkers2(dim);
        } else {
-               BOOST_ASSERT(macro_ != 0);
+               LASSERT(macro_ != 0, /**/);
 
                // metrics are computed here for the cells,
                // in the proxy we will then use the dim from the cache
@@ -283,7 +286,7 @@ void MathMacro::updateMacro(MacroContext const & mc)
 }
 
 
-void MathMacro::updateRepresentation(Cursor const * bvCur)
+void MathMacro::updateRepresentation()
 {
        // known macro?
        if (macro_ == 0)
@@ -297,30 +300,30 @@ void MathMacro::updateRepresentation(Cursor const * bvCur)
                return;
 
        // macro changed?
-       if (needsUpdate_) {
-               needsUpdate_ = false;
-               
-               // get default values of macro
-               vector<docstring> const & defaults = macro_->defaults();
-               
-               // create MathMacroArgumentValue objects pointing to the cells of the macro
-               vector<MathData> values(nargs());
-               for (size_t i = 0; i < nargs(); ++i) {
-                       ArgumentProxy * proxy;
-                       if (i < defaults.size()) 
-                               proxy = new ArgumentProxy(*this, i, defaults[i]);
-                       else
-                               proxy = new ArgumentProxy(*this, i);
-                       values[i].insert(0, MathAtom(proxy));
-               }
-               
-               // expanding macro with the values
-               macro_->expand(values, expanded_.cell(0));
-
-               // get definition for list edit mode
-               docstring const & display = macro_->display();
-               asArray(display.empty() ? macro_->definition() : display, definition_);
+       if (!needsUpdate_)
+               return;
+       
+       needsUpdate_ = false;
+       
+       // get default values of macro
+       vector<docstring> const & defaults = macro_->defaults();
+       
+       // create MathMacroArgumentValue objects pointing to the cells of the macro
+       vector<MathData> values(nargs());
+       for (size_t i = 0; i < nargs(); ++i) {
+               ArgumentProxy * proxy;
+               if (i < defaults.size()) 
+                       proxy = new ArgumentProxy(*this, i, defaults[i]);
+               else
+                       proxy = new ArgumentProxy(*this, i);
+               values[i].insert(0, MathAtom(proxy));
        }
+       
+       // expanding macro with the values
+       macro_->expand(values, expanded_.cell(0));
+               // get definition for list edit mode
+       docstring const & display = macro_->display();
+       asArray(display.empty() ? macro_->definition() : display, definition_);
 }
 
 
@@ -515,6 +518,12 @@ void MathMacro::validate(LaTeXFeatures & features) const
 
        if (name() == "binom" || name() == "mathcircumflex")
                features.require(to_utf8(name()));
+       
+       // validate the cells and the definition
+       if (displayMode() == DISPLAY_NORMAL) {
+               definition_.validate(features);
+               InsetMathNest::validate(features);
+       }
 }
 
 
@@ -538,7 +547,7 @@ Inset * MathMacro::editXY(Cursor & cur, int x, int y)
 
 void MathMacro::removeArgument(Inset::pos_type pos) {
        if (displayMode_ == DISPLAY_NORMAL) {
-               BOOST_ASSERT(size_t(pos) < cells_.size());
+               LASSERT(size_t(pos) < cells_.size(), /**/);
                cells_.erase(cells_.begin() + pos);
                if (size_t(pos) < attachedArgsNum_)
                        --attachedArgsNum_;
@@ -553,7 +562,7 @@ void MathMacro::removeArgument(Inset::pos_type pos) {
 
 void MathMacro::insertArgument(Inset::pos_type pos) {
        if (displayMode_ == DISPLAY_NORMAL) {
-               BOOST_ASSERT(size_t(pos) <= cells_.size());
+               LASSERT(size_t(pos) <= cells_.size(), /**/);
                cells_.insert(cells_.begin() + pos, MathData());
                if (size_t(pos) < attachedArgsNum_)
                        ++attachedArgsNum_;
@@ -567,7 +576,7 @@ void MathMacro::insertArgument(Inset::pos_type pos) {
 
 void MathMacro::detachArguments(vector<MathData> & args, bool strip)
 {
-       BOOST_ASSERT(displayMode_ == DISPLAY_NORMAL);   
+       LASSERT(displayMode_ == DISPLAY_NORMAL, /**/);  
        args = cells_;
 
        // strip off empty cells, but not more than arity-attachedArgsNum_
@@ -588,7 +597,7 @@ void MathMacro::detachArguments(vector<MathData> & args, bool strip)
 
 void MathMacro::attachArguments(vector<MathData> const & args, size_t arity, int optionals)
 {
-       BOOST_ASSERT(displayMode_ == DISPLAY_NORMAL);
+       LASSERT(displayMode_ == DISPLAY_NORMAL, /**/);
        cells_ = args;
        attachedArgsNum_ = args.size();
        cells_.resize(arity);
@@ -654,7 +663,7 @@ void MathMacro::write(WriteStream & os) const
        }
 
        // normal mode
-       BOOST_ASSERT(macro_);
+       LASSERT(macro_, /**/);
 
        // optional arguments make macros fragile
        if (optionals_ > 0 && os.fragile())
@@ -770,7 +779,7 @@ bool MathMacro::automaticPopupCompletion() const
 }
 
 
-Inset::CompletionList const * 
+CompletionList const * 
 MathMacro::createCompletionList(Cursor const & cur) const
 {
        if (displayMode() != DISPLAY_UNFOLDED)