#include "Paragraph.h"
#include "TextClass.h"
-#include "insets/InsetText.h"
+#include "insets/InsetArgument.h"
#include "support/debug.h"
#include "support/docstream.h"
///////////////////////////////////////////////////////////////////////////
TocItem::TocItem(DocIterator const & dit, int d, docstring const & s,
- bool output_active, FuncRequest action)
+ bool output_active, FuncRequest const & action)
: dit_(dit), depth_(d), str_(s), output_(output_active),
action_(action)
{
// TocItem creation and update should be made in a dedicated function and
// updateItem should be rewritten to uniformly update the matching items from
// all TOCs.
-bool TocBackend::updateItem(DocIterator const & dit_in)
+bool TocBackend::updateItem(DocIterator const & dit_in) const
{
// we need a text
DocIterator dit = dit_in.getInnerText();
return false;
if (toc("tableofcontents")->empty()) {
- // FIXME: should not happen,
+ // FIXME: should not happen,
// a call to TocBackend::update() is missing somewhere
LYXERR0("TocBackend::updateItem called but the TOC is empty!");
return false;
//
// FIXME: This is supposed to accomplish the same as the body of
// InsetText::iterateForToc(), probably
- Paragraph & par = toc_item->dit().paragraph();
- InsetList::const_iterator it = par.insetList().begin();
- InsetList::const_iterator end = par.insetList().end();
- for (; it != end; ++it) {
- Inset & inset = *it->inset;
- if (inset.lyxCode() == ARG_CODE) {
+ Paragraph const & par = toc_item->dit().paragraph();
+ for (auto const & table : par.insetList())
+ if (InsetArgument const * arg = table.inset->asInsetArgument()) {
tocstring = par.labelString();
if (!tocstring.empty())
tocstring += ' ';
- inset.asInsetText()->text().forOutliner(tocstring,TOC_ENTRY_LENGTH);
+ arg->text().forOutliner(tocstring,TOC_ENTRY_LENGTH);
break;
}
- }
int const toclevel = toc_item->dit().text()->
getTocLevel(toc_item->dit().pit());
}
-void TocBackend::update(bool output_active, UpdateType utype)
+void TocBackend::reset()
{
- for (TocList::iterator it = tocs_.begin(); it != tocs_.end(); ++it)
- it->second->clear();
+ for (auto const & t: tocs_)
+ t.second->clear();
tocs_.clear();
builders_.clear();
resetOutlinerNames();
- if (!buffer_->isInternal()) {
- DocIterator dit;
- buffer_->inset().addToToc(dit, output_active, utype);
- }
+}
+
+
+void TocBackend::update(bool output_active, UpdateType utype)
+{
+ reset();
+ if (buffer_->isInternal())
+ return;
+
+ DocIterator dit;
+ buffer_->inset().addToToc(dit, output_active, utype, *this);
}
{
outliner_names_.clear();
// names from this document class
- for (pair<string, docstring> const & name
+ for (auto const & name
: buffer_->params().documentClass().outlinerNames())
addName(name.first, translateIfPossible(name.second));
// Hardcoded types
addName("senseless", _("Senseless"));
addName("citation", _("Citations"));
addName("label", _("Labels and References"));
+ addName("brokenrefs", _("Broken References and Citations"));
// Customizable, but the corresponding insets have no layout definition
addName("child", _("Child Documents"));
- addName("graphics", _("Graphics"));
+ addName("graphics", _("Graphics[[listof]]"));
addName("equation", _("Equations"));
addName("external", _("External Material"));
addName("math-macro", _("Math Macros"));