X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=8646bc504869b86d6148f5111883ad58eff3a294;hb=6b651f2ad9f698c01993dcc6e340682c279f1c55;hp=17c421a64ea6cb6672e8b154b8f0e5ee79635577;hpb=0bf9ac02a8988b2747c15520780cbf4343dd6a45;p=lyx.git diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp index 17c421a64e..8646bc5048 100644 --- a/src/TocBackend.cpp +++ b/src/TocBackend.cpp @@ -18,70 +18,42 @@ #include "BufferParams.h" #include "FloatList.h" #include "FuncRequest.h" +#include "InsetList.h" +#include "Layout.h" #include "LyXAction.h" #include "Paragraph.h" -#include "debug.h" +#include "TextClass.h" #include "insets/InsetOptArg.h" #include "support/convert.h" +#include "support/debug.h" +#include "support/docstream.h" +using namespace std; namespace lyx { -using std::vector; -using std::string; - - /////////////////////////////////////////////////////////////////////////// +// // TocItem implementation +// +/////////////////////////////////////////////////////////////////////////// TocItem::TocItem(ParConstIterator const & par_it, int d, 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; } -int const TocItem::id() const +int TocItem::id() const { return par_it_->id(); } -int const TocItem::depth() const +int TocItem::depth() const { return depth_; } @@ -105,13 +77,13 @@ FuncRequest TocItem::action() const } - - - /////////////////////////////////////////////////////////////////////////// +// // TocBackend implementation +// +/////////////////////////////////////////////////////////////////////////// -Toc const & TocBackend::toc(std::string const & type) const +Toc const & TocBackend::toc(string const & type) const { // Is the type already supported? TocList::const_iterator it = tocs_.find(type); @@ -123,8 +95,15 @@ Toc const & TocBackend::toc(std::string const & type) const void TocBackend::updateItem(ParConstIterator const & par_it) { + if (toc("tableofcontents").empty()) { + // FIXME: should not happen, + // a call to TocBackend::update() is missing somewhere + LYXERR0("TocBackend::updateItem called but the TOC is 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); @@ -132,14 +111,14 @@ void TocBackend::updateItem(ParConstIterator const & par_it) // For each paragraph, traverse its insets and let them add // their toc items - InsetList::const_iterator it = toc_item->par_it_->insetlist.begin(); - InsetList::const_iterator end = toc_item->par_it_->insetlist.end(); + InsetList::const_iterator it = toc_item->par_it_->insetList().begin(); + InsetList::const_iterator end = toc_item->par_it_->insetList().end(); for (; it != end; ++it) { Inset & inset = *it->inset; - if (inset.lyxCode() == Inset::OPTARG_CODE) { + if (inset.lyxCode() == OPTARG_CODE) { if (!tocstring.empty()) break; - Paragraph const & par = + Paragraph const & par = *static_cast(inset).paragraphs().begin(); if (!toc_item->par_it_->getLabelstring().empty()) tocstring = toc_item->par_it_->getLabelstring() + ' '; @@ -151,7 +130,6 @@ void TocBackend::updateItem(ParConstIterator const & par_it) int const toclevel = toc_item->par_it_->layout()->toclevel; if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel - && toclevel <= bufparams.tocdepth && tocstring.empty()) tocstring = toc_item->par_it_->asString(*buffer_, true); @@ -164,7 +142,7 @@ void TocBackend::update() 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(); @@ -176,16 +154,16 @@ void TocBackend::update() // For each paragraph, traverse its insets and let them add // their toc items - InsetList::const_iterator it = pit->insetlist.begin(); - InsetList::const_iterator end = pit->insetlist.end(); + InsetList::const_iterator it = pit->insetList().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: { + case OPTARG_CODE: { if (!tocstring.empty()) break; - Paragraph const & par = + Paragraph const & par = *static_cast(inset).paragraphs().begin(); if (!pit->getLabelstring().empty()) tocstring = pit->getLabelstring() + ' '; @@ -200,20 +178,19 @@ void TocBackend::update() /// now the toc entry for the paragraph int const toclevel = pit->layout()->toclevel; if (toclevel != Layout::NOT_IN_TOC - && toclevel >= min_toclevel - && toclevel <= bufparams.tocdepth) { + && 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(string const & type, + ParConstIterator const & par_it) const { TocList::const_iterator toclist_it = tocs_.find(type); // Is the type supported? @@ -236,16 +213,12 @@ TocIterator const TocBackend::item( 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; } @@ -261,7 +234,7 @@ void TocBackend::writePlaintextTocList(string const & type, odocstream & os) con TocIterator ccit = cit->second.begin(); TocIterator end = cit->second.end(); for (; ccit != end; ++ccit) - os << ccit->asString() << '\n'; + os << ccit->asString() << from_utf8("\n"); } }