#include "support/convert.h"
-
-namespace lyx {
-
-using std::vector;
using std::string;
+namespace lyx {
///////////////////////////////////////////////////////////////////////////
// TocItem implementation
docstring const & s)
: par_it_(par_it), depth_(d), str_(s)
{
-/*
- if (!uid_.empty())
- return;
-
- size_t pos = s.find(" ");
- if (pos == string::npos) {
- // Non labelled item
- uid_ = s;
- return;
- }
-
- string s2 = s.substr(0, pos);
-
- if (s2 == "Chapter" || s2 == "Part") {
- size_t pos2 = s.find(" ", pos + 1);
- if (pos2 == string::npos) {
- // Unnumbered Chapter?? This should not happen.
- uid_ = s.substr(pos + 1);
- return;
- }
- // Chapter or Part
- uid_ = s.substr(pos2 + 1);
- return;
- }
- // Numbered Item.
- uid_ = s.substr(pos + 1);
- */
-}
-
-bool const TocItem::isValid() const
-{
- return depth_ != -1;
}
}
-
-
-
///////////////////////////////////////////////////////////////////////////
// TocBackend implementation
void TocBackend::updateItem(ParConstIterator const & par_it)
{
+ if (toc("tableofcontents").empty()) {
+ // FIXME: should not happen,
+ // a call to TocBackend::update() is missing somewhere
+ lyxerr << "TocBackend::updateItem called but the TOC is empty!"
+ << std::endl;
+ 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);
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() + ' ';
}
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();
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() + ' ';
/// 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;
}