X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=f46b3c8418ba6c0514d5708c107cdde8f77b8873;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=f2fabd9bdca4fe06767653a15ca5ed3288215d73;hpb=2dfc84a22cafff1de7869b92e85c838da8def49f;p=lyx.git diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp index f2fabd9bdc..f46b3c8418 100644 --- a/src/TocBackend.cpp +++ b/src/TocBackend.cpp @@ -25,7 +25,7 @@ #include "ParIterator.h" #include "TextClass.h" -#include "insets/InsetOptArg.h" +#include "insets/InsetArgument.h" #include "support/convert.h" #include "support/debug.h" @@ -44,8 +44,9 @@ namespace lyx { // /////////////////////////////////////////////////////////////////////////// -TocItem::TocItem(DocIterator const & dit, int d, docstring const & s) - : dit_(dit), depth_(d), str_(s) +TocItem::TocItem(DocIterator const & dit, int d, docstring const & s, + bool output_active, docstring const & t) : + dit_(dit), depth_(d), str_(s), tooltip_(t), output_(output_active) { } @@ -68,12 +69,24 @@ docstring const & TocItem::str() const } +docstring const & TocItem::tooltip() const +{ + return tooltip_.empty() ? str_ : tooltip_; +} + + docstring const TocItem::asString() const { return docstring(4 * depth_, ' ') + str_; } +DocIterator const & TocItem::dit() const +{ + return dit_; +} + + FuncRequest TocItem::action() const { string const arg = convert(dit_.paragraph().id()) @@ -92,7 +105,7 @@ Toc const & TocBackend::toc(string const & type) const { // Is the type already supported? TocList::const_iterator it = tocs_.find(type); - LASSERT(it != tocs_.end(), /**/); + LASSERT(it != tocs_.end(), { static Toc dummy; return dummy; }); return it->second; } @@ -104,13 +117,16 @@ Toc & TocBackend::toc(string const & type) } -void TocBackend::updateItem(DocIterator const & dit) +bool TocBackend::updateItem(DocIterator const & dit) { + if (dit.text()->getTocLevel(dit.pit()) == 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(); @@ -127,77 +143,36 @@ void TocBackend::updateItem(DocIterator const & dit) 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 & inset_par = - *static_cast(inset).paragraphs().begin(); + *static_cast(inset).paragraphs().begin(); if (!par.labelString().empty()) tocstring = par.labelString() + ' '; - tocstring += inset_par.asString(false); + tocstring += inset_par.asString(AS_STR_INSETS); break; } } - int const toclevel = par.layout().toclevel; + int const toclevel = toc_item->dit_.text()->getTocLevel(toc_item->dit_.pit()); if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel && tocstring.empty()) - tocstring = par.asString(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() +void TocBackend::update(bool output_active) { tocs_.clear(); - - BufferParams const & bufparams = buffer_->params(); - const int min_toclevel = bufparams.documentClass().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; - pit.pos() = it->pos; - //lyxerr << (void*)&inset << " code: " << inset.lyxCode() << std::endl; - inset.addToToc(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(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(true); - toc.push_back(TocItem(pit, toclevel - min_toclevel, - tocstring)); - } + if (!buffer_->isInternal()) { + DocIterator dit; + buffer_->inset().addToToc(dit, output_active); } } @@ -207,30 +182,35 @@ TocIterator TocBackend::item(string const & type, { TocList::const_iterator toclist_it = tocs_.find(type); // Is the type supported? - LASSERT(toclist_it != tocs_.end(), /**/); + // We will try to make the best of it in release mode + LASSERT(toclist_it != tocs_.end(), toclist_it = tocs_.begin()); + 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(dit); - 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->dit_[0].inset() != &par_it_text[0].inset()) + if (&it->dit_[0].inset() != &dit_text[0].inset()) continue; - if (it->dit_ <= par_it_text) + if (it->dit_ <= dit_text) return it; } @@ -239,14 +219,32 @@ TocIterator TocBackend::item(string const & type, } -void TocBackend::writePlaintextTocList(string const & type, odocstream & os) const +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, + odocstringstream & os, size_t max_length) const { TocList::const_iterator cit = tocs_.find(type); if (cit != tocs_.end()) { TocIterator ccit = cit->second.begin(); TocIterator end = cit->second.end(); - for (; ccit != end; ++ccit) + for (; ccit != end; ++ccit) { os << ccit->asString() << from_utf8("\n"); + if (os.str().size() > max_length) + break; + } } }