void TocBackend::updateItem(ParConstIterator const & par_it)
{
- if (toc("tableofcontents").empty()) {
- // TODO should not happen,
- // a call to TocBackend::update() is missing somewhere
- LYXERR(Debug::INFO)
- << "TocBackend.cpp: TocBackend::updateItem"
- << "called but the TOC is empty" << std::endl;
+ // 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.getTextClass().min_toclevel();
if (inset.lyxCode() == Inset::OPTARG_CODE) {
if (!tocstring.empty())
break;
- Paragraph const & par =
+ Paragraph const & par =
*static_cast<InsetOptArg&>(inset).paragraphs().begin();
if (!toc_item->par_it_->getLabelstring().empty())
tocstring = toc_item->par_it_->getLabelstring() + ' ';
InsetList::const_iterator end = pit->insetlist.end();
for (; it != end; ++it) {
Inset & inset = *it->inset;
- inset.addToToc(tocs_, *buffer_);
+ inset.addToToc(tocs_, *buffer_, pit);
switch (inset.lyxCode()) {
case Inset::OPTARG_CODE: {
if (!tocstring.empty())
break;
- Paragraph const & par =
+ Paragraph const & par =
*static_cast<InsetOptArg&>(inset).paragraphs().begin();
if (!pit->getLabelstring().empty())
tocstring = pit->getLabelstring() + ' ';
// 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;
}