*static_cast<InsetOptArg&>(inset).paragraphs().begin();
if (!par.labelString().empty())
tocstring = par.labelString() + ' ';
- tocstring += inset_par.asString();
+ tocstring += inset_par.asString(AS_STR_INSETS);
break;
}
}
int const toclevel = par.layout().toclevel;
if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel
&& tocstring.empty())
- tocstring = par.asString(AS_STR_LABEL);
+ tocstring = par.asString(AS_STR_LABEL | AS_STR_INSETS);
const_cast<TocItem &>(*toc_item).str_ = tocstring;
}
-TocIterator Toc::item(int depth, docstring const & str) const
+Toc::iterator Toc::item(int depth, docstring const & str)
{
if (empty())
return end();
- TocIterator it = begin();
- TocIterator itend = end();
- for (; it != itend; --it) {
+ iterator it = begin();
+ iterator itend = end();
+ for (; it != itend; ++it) {
if (it->depth() == depth && it->str() == str)
break;
}