* GuiView.cpp:

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index a25bce28d3ede0a8c9d8ab1e91a37a664e0dd728..b22ec6acd990fb972de118879a8963d13fcbaf47 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -12,7 +12,6 @@
 
 #include <config.h>
 
-#include "BaseClassList.h"
 #include "buffer_funcs.h"
 #include "Buffer.h"
 #include "BufferList.h"
@@ -23,11 +22,9 @@
 #include "Floating.h"
 #include "FloatList.h"
 #include "InsetList.h"
-#include "InsetIterator.h"
 #include "Language.h"
 #include "LaTeX.h"
 #include "Layout.h"
-#include "LayoutPtr.h"
 #include "LyX.h"
 #include "TextClass.h"
 #include "Paragraph.h"
@@ -44,6 +41,7 @@
 #include "insets/InsetBibitem.h"
 #include "insets/InsetInclude.h"
 
+#include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/filetools.h"
@@ -235,7 +233,7 @@ depth_type getDepth(DocIterator const & it)
 depth_type getItemDepth(ParIterator const & it)
 {
        Paragraph const & par = *it;
-       LabelType const labeltype = par.layout()->labeltype;
+       LabelType const labeltype = par.layout().labeltype;
 
        if (labeltype != LABEL_ENUMERATE && labeltype != LABEL_ITEMIZE)
                return 0;
@@ -259,7 +257,7 @@ depth_type getItemDepth(ParIterator const & it)
                // that is not more deeply nested.
                Paragraph & prev_par = *prev_it;
                depth_type const prev_depth = getDepth(prev_it);
-               if (labeltype == prev_par.layout()->labeltype) {
+               if (labeltype == prev_par.layout().labeltype) {
                        if (prev_depth < min_depth)
                                return prev_par.itemdepth + 1;
                        if (prev_depth == min_depth)
@@ -277,14 +275,14 @@ depth_type getItemDepth(ParIterator const & it)
 bool needEnumCounterReset(ParIterator const & it)
 {
        Paragraph const & par = *it;
-       BOOST_ASSERT(par.layout()->labeltype == LABEL_ENUMERATE);
+       LASSERT(par.layout().labeltype == LABEL_ENUMERATE, /**/);
        depth_type const cur_depth = par.getDepth();
        ParIterator prev_it = it;
        while (prev_it.pit()) {
                --prev_it.top().pit();
                Paragraph const & prev_par = *prev_it;
                if (prev_par.getDepth() <= cur_depth)
-                       return  prev_par.layout()->labeltype != LABEL_ENUMERATE;
+                       return  prev_par.layout().labeltype != LABEL_ENUMERATE;
        }
        // start of nested inset: reset
        return true;
@@ -294,9 +292,10 @@ bool needEnumCounterReset(ParIterator const & it)
 // set the label of a paragraph. This includes the counters.
 void setLabel(Buffer const & buf, ParIterator & it)
 {
-       TextClass const & textclass = buf.params().textClass();
+       BufferParams const & bp = buf.masterBuffer()->params();
+       DocumentClass const & textclass = bp.documentClass();
        Paragraph & par = it.paragraph();
-       LayoutPtr const & layout = par.layout();
+       Layout const & layout = par.layout();
        Counters & counters = textclass.counters();
 
        if (par.params().startOfAppendix()) {
@@ -310,21 +309,21 @@ void setLabel(Buffer const & buf, ParIterator & it)
        // Compute the item depth of the paragraph
        par.itemdepth = getItemDepth(it);
 
-       if (layout->margintype == MARGIN_MANUAL) {
+       if (layout.margintype == MARGIN_MANUAL) {
                if (par.params().labelWidthString().empty())
-                       par.params().labelWidthString(par.translateIfPossible(layout->labelstring(), buf.params()));
+                       par.params().labelWidthString(par.translateIfPossible(layout.labelstring(), bp));
        } else {
                par.params().labelWidthString(docstring());
        }
 
-       switch(layout->labeltype) {
+       switch(layout.labeltype) {
        case LABEL_COUNTER:
-               if (layout->toclevel <= buf.params().secnumdepth
-                   && (layout->latextype != LATEX_ENVIRONMENT
+               if (layout.toclevel <= bp.secnumdepth
+                   && (layout.latextype != LATEX_ENVIRONMENT
                        || isFirstInSequence(it.pit(), it.plist()))) {
-                       counters.step(layout->counter);
+                       counters.step(layout.counter);
                        par.params().labelString(
-                               par.expandLabel(layout, buf.params()));
+                               par.expandLabel(layout, bp));
                } else
                        par.params().labelString(docstring());
                break;
@@ -333,7 +332,7 @@ void setLabel(Buffer const & buf, ParIterator & it)
                // At some point of time we should do something more
                // clever here, like:
                //   par.params().labelString(
-               //    buf.params().user_defined_bullet(par.itemdepth).getText());
+               //    bp.user_defined_bullet(par.itemdepth).getText());
                // for now, use a simple hardcoded label
                docstring itemlabel;
                switch (par.itemdepth) {
@@ -402,7 +401,7 @@ void setLabel(Buffer const & buf, ParIterator & it)
                }
 
                par.params().labelString(counters.counterLabel(
-                       par.translateIfPossible(from_ascii(format), buf.params())));
+                       par.translateIfPossible(from_ascii(format), bp)));
 
                break;
        }
@@ -436,8 +435,7 @@ void setLabel(Buffer const & buf, ParIterator & it)
        case LABEL_STATIC:      
        case LABEL_BIBLIO:
                par.params().labelString(
-                       par.translateIfPossible(layout->labelstring(), 
-                                               buf.params()));
+                       par.translateIfPossible(layout.labelstring(), bp));
                break;
        }
 }
@@ -446,7 +444,7 @@ void setLabel(Buffer const & buf, ParIterator & it)
 
 void updateLabels(Buffer const & buf, ParIterator & parit)
 {
-       BOOST_ASSERT(parit.pit() == 0);
+       LASSERT(parit.pit() == 0, /**/);
 
        // set the position of the text in the buffer to be able
        // to resolve macros in it. This has nothing to do with
@@ -469,10 +467,9 @@ void updateLabels(Buffer const & buf, ParIterator & parit)
                InsetList::const_iterator end = parit->insetList().end();
                for (; iit != end; ++iit) {
                        parit.pos() = iit->pos;
-                       iit->inset->updateLabels(buf, parit);
+                       iit->inset->updateLabels(parit);
                }
        }
-       
 }
 
 
@@ -482,7 +479,7 @@ void updateLabels(Buffer const & buf, bool childonly)
 {
        Buffer const * const master = buf.masterBuffer();
        // Use the master text class also for child documents
-       TextClass const & textclass = master->params().textClass();
+       DocumentClass const & textclass = master->params().documentClass();
 
        if (!childonly) {
                // If this is a child document start with the master
@@ -493,6 +490,8 @@ void updateLabels(Buffer const & buf, bool childonly)
 
                // start over the counters
                textclass.counters().reset();
+               buf.clearReferenceCache();
+               buf.updateMacros();
        }
 
        Buffer & cbuf = const_cast<Buffer &>(buf);
@@ -510,6 +509,10 @@ void updateLabels(Buffer const & buf, bool childonly)
        ParIterator parit = par_iterator_begin(buf.inset());
        updateLabels(buf, parit);
 
+       if (master != &buf)
+               // TocBackend update will be done later.
+               return;
+
        cbuf.tocBackend().update();
        if (!childonly)
                cbuf.structureChanged();