X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=a66b307d5d9e3e7595a42d71847fc904d8f2cc4c;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=7c0084420e1fcf71e0a30d36254cd3778a6719f9;hpb=2e7d1199dfa7ec7b7d963c374a014f2a2227ae7c;p=lyx.git diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp index 7c0084420e..a66b307d5d 100644 --- a/src/TocBackend.cpp +++ b/src/TocBackend.cpp @@ -22,16 +22,20 @@ #include "Layout.h" #include "LyXAction.h" #include "Paragraph.h" +#include "ParIterator.h" #include "TextClass.h" -#include "insets/InsetOptArg.h" +#include "insets/InsetArgument.h" #include "support/convert.h" #include "support/debug.h" #include "support/docstream.h" +#include "support/lassert.h" + using namespace std; + namespace lyx { /////////////////////////////////////////////////////////////////////////// @@ -40,15 +44,15 @@ namespace lyx { // /////////////////////////////////////////////////////////////////////////// -TocItem::TocItem(ParConstIterator const & par_it, int d, docstring const & s) - : par_it_(par_it), depth_(d), str_(s) +TocItem::TocItem(DocIterator const & dit, int d, docstring const & s, + docstring const & t) : dit_(dit), depth_(d), str_(s), tooltip_(t) { } int TocItem::id() const { - return par_it_->id(); + return dit_.paragraph().id(); } @@ -64,15 +68,29 @@ docstring const & TocItem::str() const } +docstring const & TocItem::tooltip() const +{ + return tooltip_; +} + + docstring const TocItem::asString() const { return docstring(4 * depth_, ' ') + str_; } +DocIterator const & TocItem::dit() const +{ + return dit_; +} + + FuncRequest TocItem::action() const { - return FuncRequest(LFUN_PARAGRAPH_GOTO, convert(id())); + string const arg = convert(dit_.paragraph().id()) + + ' ' + convert(dit_.pos()); + return FuncRequest(LFUN_PARAGRAPH_GOTO, arg); } @@ -86,7 +104,7 @@ Toc const & TocBackend::toc(string const & type) const { // Is the type already supported? TocList::const_iterator it = tocs_.find(type); - BOOST_ASSERT(it != tocs_.end()); + LASSERT(it != tocs_.end(), /**/); return it->second; } @@ -98,131 +116,99 @@ Toc & TocBackend::toc(string const & type) } -void TocBackend::updateItem(ParConstIterator const & par_it) +bool TocBackend::updateItem(DocIterator const & dit) { + if (dit.paragraph().layout().toclevel == Layout::NOT_IN_TOC) + return false; + 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; + return false; } BufferParams const & bufparams = buffer_->params(); - const int min_toclevel = bufparams.getTextClass().min_toclevel(); + const int min_toclevel = bufparams.documentClass().min_toclevel(); - TocIterator toc_item = item("tableofcontents", par_it); + TocIterator toc_item = item("tableofcontents", dit); docstring tocstring; // 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(); + Paragraph & par = toc_item->dit_.paragraph(); + InsetList::const_iterator it = par.insetList().begin(); + InsetList::const_iterator end = par.insetList().end(); for (; it != end; ++it) { Inset & inset = *it->inset; - if (inset.lyxCode() == OPTARG_CODE) { + if (inset.lyxCode() == ARG_CODE) { if (!tocstring.empty()) break; - Paragraph const & par = - *static_cast(inset).paragraphs().begin(); - if (!toc_item->par_it_->labelString().empty()) - tocstring = toc_item->par_it_->labelString() + ' '; - tocstring += par.asString(*buffer_, false); + Paragraph const & inset_par = + *static_cast(inset).paragraphs().begin(); + if (!par.labelString().empty()) + tocstring = par.labelString() + ' '; + tocstring += inset_par.asString(AS_STR_INSETS); break; } } - int const toclevel = toc_item->par_it_->layout()->toclevel; - if (toclevel != Layout::NOT_IN_TOC - && toclevel >= min_toclevel + int const toclevel = par.layout().toclevel; + if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel && tocstring.empty()) - tocstring = toc_item->par_it_->asString(*buffer_, true); + tocstring = par.asString(AS_STR_LABEL | AS_STR_INSETS); const_cast(*toc_item).str_ = tocstring; + + buffer_->updateTocItem("tableofcontents", dit); + return true; } void TocBackend::update() { tocs_.clear(); - - BufferParams const & bufparams = buffer_->params(); - const int min_toclevel = bufparams.getTextClass().min_toclevel(); - - Toc & toc = tocs_["tableofcontents"]; - ParConstIterator pit = buffer_->par_iterator_begin(); - ParConstIterator end = buffer_->par_iterator_end(); - for (; pit != end; ++pit) { - - // the string that goes to the toc (could be the optarg) - docstring tocstring; - - // 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(); - for (; it != end; ++it) { - Inset & inset = *it->inset; - inset.addToToc(*buffer_, pit); - switch (inset.lyxCode()) { - case OPTARG_CODE: { - if (!tocstring.empty()) - break; - Paragraph const & par = - *static_cast(inset).paragraphs().begin(); - if (!pit->labelString().empty()) - tocstring = pit->labelString() + ' '; - tocstring += par.asString(*buffer_, false); - break; - } - default: - break; - } - } - - /// now the toc entry for the paragraph - int const toclevel = pit->layout()->toclevel; - 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)); - } + if (!buffer_->isInternal()) { + DocIterator dit; + buffer_->inset().addToToc(dit); } } TocIterator TocBackend::item(string const & type, - ParConstIterator const & par_it) const + DocIterator const & dit) const { TocList::const_iterator toclist_it = tocs_.find(type); // Is the type supported? - BOOST_ASSERT(toclist_it != tocs_.end()); + LASSERT(toclist_it != tocs_.end(), /**/); + return toclist_it->second.item(dit); +} + - Toc const & toc_vector = toclist_it->second; - TocIterator last = toc_vector.begin(); - TocIterator it = toc_vector.end(); +TocIterator Toc::item(DocIterator const & dit) const +{ + TocIterator last = begin(); + TocIterator it = end(); if (it == last) return it; --it; - ParConstIterator par_it_text = par_it; - if (par_it_text.inMathed()) { + DocIterator dit_text = dit; + if (dit_text.inMathed()) { // We are only interested in text so remove the math CursorSlice. - while (par_it_text.inMathed()) - par_it_text.pop_back(); + while (dit_text.inMathed()) + dit_text.pop_back(); } for (; it != last; --it) { // 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()) + if (&it->dit_[0].inset() != &dit_text[0].inset()) continue; - if (it->par_it_ <= par_it_text) + if (it->dit_ <= dit_text) return it; } @@ -231,6 +217,20 @@ TocIterator TocBackend::item(string const & type, } +Toc::iterator Toc::item(int depth, docstring const & str) +{ + if (empty()) + return end(); + iterator it = begin(); + iterator itend = end(); + for (; it != itend; ++it) { + if (it->depth() == depth && it->str() == str) + break; + } + return it; +} + + void TocBackend::writePlaintextTocList(string const & type, odocstream & os) const { TocList::const_iterator cit = tocs_.find(type);