void TocBackend::updateItem(ParConstIterator const & par_it)
{
+ // TODO should not happen,
+ // a call to TocBackend::update() is missing somewhere
+ if (toc("tableofcontents").empty())
+ return;
+
BufferParams const & bufparams = buffer_->params();
- const int min_toclevel = bufparams.getLyXTextClass().min_toclevel();
+ const int min_toclevel = bufparams.getTextClass().min_toclevel();
TocIterator toc_item = item("tableofcontents", par_it);
}
int const toclevel = toc_item->par_it_->layout()->toclevel;
- if (toclevel != LyXLayout::NOT_IN_TOC
+ if (toclevel != Layout::NOT_IN_TOC
&& toclevel >= min_toclevel
- && toclevel <= bufparams.tocdepth
&& tocstring.empty())
tocstring = toc_item->par_it_->asString(*buffer_, true);
tocs_.clear();
BufferParams const & bufparams = buffer_->params();
- const int min_toclevel = bufparams.getLyXTextClass().min_toclevel();
+ const int min_toclevel = bufparams.getTextClass().min_toclevel();
Toc & toc = tocs_["tableofcontents"];
ParConstIterator pit = buffer_->par_iterator_begin();
/// now the toc entry for the paragraph
int const toclevel = pit->layout()->toclevel;
- if (toclevel != LyXLayout::NOT_IN_TOC
- && toclevel >= min_toclevel
- && toclevel <= bufparams.tocdepth) {
+ if (toclevel != Layout::NOT_IN_TOC
+ && toclevel >= min_toclevel) {
// insert this into the table of contents
if (tocstring.empty())
tocstring = pit->asString(*buffer_, true);
- toc.push_back(
- TocItem(pit, toclevel - min_toclevel, tocstring));
+ toc.push_back(TocItem(pit, toclevel - min_toclevel,
+ tocstring));
}
}
}
-TocIterator const TocBackend::item(
- std::string const & type, ParConstIterator const & par_it) const
+TocIterator const TocBackend::item(std::string const & type,
+ ParConstIterator const & par_it) const
{
TocList::const_iterator toclist_it = tocs_.find(type);
// Is the type supported?
par_it_text.backwardPos();
for (; it != last; --it) {
-
- // A good solution for Items inside insets would be to do:
- //
- //if (std::distance(it->par_it_, current) <= 0)
- // return it;
- //
- // But for an unknown reason, std::distance(current, it->par_it_) always
- // returns a positive value and std::distance(it->par_it_, current) takes forever...
- // So for now, we do:
- if (it->par_it_.pit() <= par_it_text.pit())
+ // We verify that we don't compare contents of two
+ // different document. This happens when you
+ // have parent and child documents.
+ if (&it->par_it_[0].inset() != &par_it_text[0].inset())
+ continue;
+ if (it->par_it_ <= par_it_text)
return it;
}