#include "Floating.h"
#include "FloatList.h"
#include "gettext.h"
+#include "InsetIterator.h"
#include "Language.h"
#include "LaTeX.h"
+#include "Layout.h"
+#include "LyX.h"
+#include "lyxlayout_ptr_fwd.h"
#include "TextClass.h"
+#include "TextClassList.h"
#include "Paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphList.h"
#include "ParIterator.h"
#include "LyXVC.h"
#include "TexRow.h"
+#include "Text.h"
#include "TocBackend.h"
#include "VCBackend.h"
#include "frontends/alert.h"
#include "insets/InsetBibitem.h"
-#include "insets/InsetCaption.h"
#include "insets/InsetInclude.h"
-#include "insets/InsetTabular.h"
-#include "support/convert.h"
#include "support/filetools.h"
#include "support/fs_extras.h"
#include "support/lyxlib.h"
depth_type getItemDepth(ParIterator const & it)
{
Paragraph const & par = *it;
- LYX_LABEL_TYPES const labeltype = par.layout()->labeltype;
+ LabelType const labeltype = par.layout()->labeltype;
if (labeltype != LABEL_ENUMERATE && labeltype != LABEL_ITEMIZE)
return 0;
{
TextClass const & textclass = buf.params().getTextClass();
Paragraph & par = it.paragraph();
- Layout_ptr const & layout = par.layout();
+ LayoutPtr const & layout = par.layout();
Counters & counters = textclass.counters();
if (par.params().startOfAppendix()) {
par.params().labelWidthString(docstring());
}
- // is it a layout that has an automatic label?
- if (layout->labeltype == LABEL_COUNTER) {
+ switch(layout->labeltype) {
+ case LABEL_COUNTER:
if (layout->toclevel <= buf.params().secnumdepth
&& (layout->latextype != LATEX_ENVIRONMENT
|| isFirstInSequence(it.pit(), it.plist()))) {
par.expandLabel(layout, buf.params()));
} else
par.params().labelString(docstring());
+ break;
- } else if (layout->labeltype == LABEL_ITEMIZE) {
+ case LABEL_ITEMIZE: {
// At some point of time we should do something more
// clever here, like:
// par.params().labelString(
break;
}
par.params().labelString(itemlabel);
+ break;
+ }
- } else if (layout->labeltype == LABEL_ENUMERATE) {
- // FIXME
- // Yes I know this is a really, really! bad solution
+ case LABEL_ENUMERATE: {
+ // FIXME: Yes I know this is a really, really! bad solution
// (Lgb)
docstring enumcounter = from_ascii("enum");
par.params().labelString(counters.counterLabel(
par.translateIfPossible(from_ascii(format), buf.params())));
- } else if (layout->labeltype == LABEL_BIBLIO) {// ale970302
- counters.step(from_ascii("bibitem"));
- int number = counters.value(from_ascii("bibitem"));
- if (par.bibitem())
- par.bibitem()->setCounter(number);
+ break;
+ }
- par.params().labelString(
- par.translateIfPossible(layout->labelstring(), buf.params()));
- // In biblio shouldn't be following counters but...
- } else if (layout->labeltype == LABEL_SENSITIVE) {
+ case LABEL_SENSITIVE: {
string const & type = counters.current_float();
docstring full_label;
if (type.empty())
counters.step(from_utf8(type));
full_label = bformat(from_ascii("%1$s %2$s:"),
name,
- convert<docstring>(counters.value(from_utf8(type))));
+ counters.theCounter(from_utf8(type)));
} else
full_label = bformat(from_ascii("%1$s #:"), name);
}
par.params().labelString(full_label);
+ break;
+ }
- } else if (layout->labeltype == LABEL_NO_LABEL)
+ case LABEL_NO_LABEL:
par.params().labelString(docstring());
- else
+ break;
+
+ case LABEL_MANUAL:
+ case LABEL_TOP_ENVIRONMENT:
+ case LABEL_CENTERED_TOP_ENVIRONMENT:
+ case LABEL_STATIC:
+ case LABEL_BIBLIO:
par.params().labelString(
- par.translateIfPossible(layout->labelstring(), buf.params()));
+ par.translateIfPossible(layout->labelstring(),
+ buf.params()));
+ break;
+ }
}
} // anon namespace
}
+// FIXME: buf should should be const because updateLabels() modifies
+// the contents of the paragraphs.
void updateLabels(Buffer const & buf, bool childonly)
{
Buffer const * const master = buf.getMasterBuffer();
textclass.counters().reset();
}
+ 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;
+ }
+
// do the real work
ParIterator parit = par_iterator_begin(buf.inset());
- parit.forwardPos();
updateLabels(buf, parit);
- Buffer & cbuf = const_cast<Buffer &>(buf);
cbuf.tocBackend().update();
if (!childonly)
cbuf.structureChanged();
+ // FIXME
+ // the embedding signal is emitted with structureChanged signal
+ // this is inaccurate so these two will be separated later.
+ //cbuf.embeddedFiles().update();
+ //cbuf.embeddingChanged();
}
}
}
+textclass_type defaultTextclass()
+{
+ // We want to return the article class. if `first' is
+ // true in the returned pair, then `second' is the textclass
+ // number; if it is false, second is 0. In both cases, second
+ // is what we want.
+ return textclasslist.numberOfClass("article").second;
+}
+
+
+void loadChildDocuments(Buffer const & buf)
+{
+ bool parse_error = false;
+
+ for (InsetIterator it = inset_iterator_begin(buf.inset()); it; ++it) {
+ if (it->lyxCode() != Inset::INCLUDE_CODE)
+ continue;
+ InsetInclude const & inset = static_cast<InsetInclude const &>(*it);
+ InsetCommandParams const & ip = inset.params();
+ Buffer * child = loadIfNeeded(buf, ip);
+ if (!child)
+ continue;
+ parse_error |= !child->errorList("Parse").empty();
+ loadChildDocuments(*child);
+ }
+
+ if (use_gui && buf.getMasterBuffer() == &buf)
+ updateLabels(buf);
+}
} // namespace lyx
projects / lyx.git / blobdiff