Change the "empty layout" to the "plain layout", to try to avoid confusion.

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 0f2f4d89d2404773c68e31c04803263d1c3eed33..17aab767c2c91c04b3a86a78533a7c5d97cd87da 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -25,7 +25,6 @@
 #include "Language.h"
 #include "LaTeX.h"
 #include "Layout.h"
-#include "LayoutPtr.h"
 #include "LyX.h"
 #include "TextClass.h"
 #include "Paragraph.h"
@@ -42,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"
@@ -60,7 +60,7 @@ namespace Alert = frontend::Alert;
 Buffer * checkAndLoadLyXFile(FileName const & filename)
 {
        // File already open?
-       Buffer * checkBuffer = theBufferList().getBuffer(filename.absFilename());
+       Buffer * checkBuffer = theBufferList().getBuffer(filename);
        if (checkBuffer) {
                if (checkBuffer->isClean())
                        return checkBuffer;
@@ -153,16 +153,15 @@ Buffer * newUnnamedFile(string const & templatename, FileName const & path)
 {
        static int newfile_number;
 
-       string document_path = path.absFilename();
-       string filename = addName(document_path,
+       FileName filename(path, 
                "newfile" + convert<string>(++newfile_number) + ".lyx");
        while (theBufferList().exists(filename)
-               || FileName(filename).isReadableFile()) {
+               || filename.isReadableFile()) {
                ++newfile_number;
-               filename = addName(document_path,
+               filename.set(path,
                        "newfile" +     convert<string>(newfile_number) + ".lyx");
        }
-       return newFile(filename, templatename, false);
+       return newFile(filename.absFilename(), templatename, false);
 }
 
 
@@ -233,7 +232,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;
@@ -257,7 +256,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)
@@ -275,14 +274,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;
@@ -292,9 +291,10 @@ bool needEnumCounterReset(ParIterator const & it)
 // set the label of a paragraph. This includes the counters.
 void setLabel(Buffer const & buf, ParIterator & it)
 {
-       DocumentClass const & textclass = buf.params().documentClass();
+       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()) {
@@ -308,21 +308,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;
@@ -331,7 +331,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) {
@@ -400,7 +400,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;
        }
@@ -434,8 +434,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;
        }
 }
@@ -444,7 +443,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
@@ -491,23 +490,22 @@ void updateLabels(Buffer const & buf, bool childonly)
                // start over the counters
                textclass.counters().reset();
                buf.clearReferenceCache();
+               buf.inset().setBuffer(const_cast<Buffer &>(buf));
+               buf.updateMacros();
        }
 
        Buffer & cbuf = const_cast<Buffer &>(buf);
 
-       if (buf.text().empty()) {
-               // FIXME: we don't call continue with updateLabels()
-               // here because it crashes on newly created documents.
-               // But the TocBackend needs to be initialised
-               // nonetheless so we update the tocBackend manually.
-               cbuf.tocBackend().update();
-               return;
-       }
+       BOOST_ASSERT(!buf.text().paragraphs().empty());
 
        // do the real work
        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();