// TocItem implementation
TocItem::TocItem(ParConstIterator const & par_it, int d,
- docstring const & s, bool child)
- : par_it_(par_it), depth_(d), str_(s), child_(child)
+ docstring const & s)
+ : par_it_(par_it), depth_(d), str_(s)
{
/*
if (!uid_.empty())
void TocBackend::updateItem(ParConstIterator const & par_it)
{
- // TODO should not happen,
+ // TODO should not happen,
// a call to TocBackend::update() is missing somewhere
if (toc("tableofcontents").empty())
return;
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() + ' ';
BufferParams const & bufparams = buffer_->params();
const int min_toclevel = bufparams.getTextClass().min_toclevel();
- // Is this a child document?
- bool const child_document = buffer_->getMasterBuffer() != buffer_;
-
Toc & toc = tocs_["tableofcontents"];
ParConstIterator pit = buffer_->par_iterator_begin();
ParConstIterator end = buffer_->par_iterator_end();
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() + ' ';
if (tocstring.empty())
tocstring = pit->asString(*buffer_, true);
toc.push_back(TocItem(pit, toclevel - min_toclevel,
- tocstring, child_document));
+ 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) {
- if (it->child_)
+ // 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;