#include "insets/InsetBibitem.h"
#include "insets/InsetInclude.h"
-#include "support/assert.h"
+#include "support/lassert.h"
#include "support/convert.h"
#include "support/debug.h"
#include "support/filetools.h"
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;
{
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);
}
// 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();
Layout const & layout = par.layout();
Counters & counters = textclass.counters();
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) {
case LABEL_COUNTER:
- if (layout.toclevel <= buf.params().secnumdepth
+ if (layout.toclevel <= bp.secnumdepth
&& (layout.latextype != LATEX_ENVIRONMENT
|| isFirstInSequence(it.pit(), it.plist()))) {
counters.step(layout.counter);
par.params().labelString(
- par.expandLabel(layout, buf.params()));
+ par.expandLabel(layout, bp));
} else
par.params().labelString(docstring());
break;
// 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) {
}
par.params().labelString(counters.counterLabel(
- par.translateIfPossible(from_ascii(format), buf.params())));
+ par.translateIfPossible(from_ascii(format), bp)));
break;
}
case LABEL_STATIC:
case LABEL_BIBLIO:
par.params().labelString(
- par.translateIfPossible(layout.labelstring(),
- buf.params()));
+ par.translateIfPossible(layout.labelstring(), bp));
break;
}
}
// the contents of the paragraphs.
void updateLabels(Buffer const & buf, bool childonly)
{
- Buffer const * const master = buf.masterBuffer();
// Use the master text class also for child documents
+ Buffer const * const master = buf.masterBuffer();
DocumentClass const & textclass = master->params().documentClass();
+ // keep the buffers to be children in this set. If the call from the
+ // master comes back we can see which of them were actually seen (i.e.
+ // via an InsetInclude). The remaining ones in the set need still be updated.
+ static std::set<Buffer const *> bufToUpdate;
if (!childonly) {
// If this is a child document start with the master
if (master != &buf) {
+ bufToUpdate.insert(&buf);
updateLabels(*master);
- return;
+
+ // was buf referenced from the master (i.e. not in bufToUpdate anymore)?
+ if (bufToUpdate.find(&buf) == bufToUpdate.end())
+ return;
}
- // start over the counters
+ // start over the counters in the master
textclass.counters().reset();
- buf.clearReferenceCache();
- buf.updateMacros();
}
+ // update will be done below for buf
+ bufToUpdate.erase(&buf);
+
+ // update all caches
+ 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();