X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=2b13d1febfa8d37de5a673ed6d41be971abe4345;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=1df2adc57680124eadb5bc14ba15acff1cb84cc9;hpb=7a6b717f5e50eda25321156cf9c8cf91ec9b18bb;p=lyx.git diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp index 1df2adc576..2b13d1febf 100644 --- a/src/TocBackend.cpp +++ b/src/TocBackend.cpp @@ -6,6 +6,7 @@ * \author Jean-Marc Lasgouttes * \author Angus Leeming * \author Abdelrazak Younes + * \author Guillaume Munch * * Full author contact details are available in file CREDITS. */ @@ -16,6 +17,7 @@ #include "Buffer.h" #include "BufferParams.h" +#include "Cursor.h" #include "FloatList.h" #include "FuncRequest.h" #include "InsetList.h" @@ -30,14 +32,16 @@ #include "support/convert.h" #include "support/debug.h" #include "support/docstream.h" - +#include "support/gettext.h" #include "support/lassert.h" +#include "support/lstrings.h" using namespace std; namespace lyx { + /////////////////////////////////////////////////////////////////////////// // // TocItem implementation @@ -45,8 +49,9 @@ namespace lyx { /////////////////////////////////////////////////////////////////////////// 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) + bool output_active, FuncRequest action) + : dit_(dit), depth_(d), str_(s), output_(output_active), + action_(action) { } @@ -57,72 +62,190 @@ int TocItem::id() const } -int TocItem::depth() const +docstring const TocItem::asString() const { - return depth_; + static char_type const cross = 0x2716; // ✖ U+2716 HEAVY MULTIPLICATION X + static char_type const thin = 0x2009; // U+2009 THIN SPACE + docstring prefix; + if (!output_) { + prefix += cross; + prefix += thin; + } + return prefix + str_; } +namespace { -docstring const & TocItem::str() const +// convert a DocIterator into an argument to LFUN_PARAGRAPH_GOTO +docstring paragraph_goto_arg(DocIterator const & dit) { - return str_; + CursorSlice const & s = dit.innerTextSlice(); + return convert(s.paragraph().id()) + ' ' + + convert(s.pos()); } +} // namespace anon -docstring const & TocItem::tooltip() const +FuncRequest TocItem::action() const { - return tooltip_.empty() ? str_ : tooltip_; + if (action_.action() == LFUN_UNKNOWN_ACTION) { + return FuncRequest(LFUN_PARAGRAPH_GOTO, paragraph_goto_arg(dit_)); + } else + return action_; } -docstring const TocItem::asString() const +/////////////////////////////////////////////////////////////////////////// +// +// Toc implementation +// +/////////////////////////////////////////////////////////////////////////// + +Toc::const_iterator TocBackend::findItem(Toc const & toc, + DocIterator const & dit) +{ + Toc::const_iterator last = toc.begin(); + Toc::const_iterator it = toc.end(); + if (it == last) + return it; + --it; + DocIterator dit_text = dit.getInnerText(); + + 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() != &dit_text[0].inset()) + continue; + if (it->dit_ <= dit_text) + return it; + } + + // We are before the first Toc Item: + return last; +} + + +Toc::iterator TocBackend::findItem(Toc & toc, int depth, docstring const & str) { - return docstring(4 * depth_, ' ') + str_; + if (toc.empty()) + return toc.end(); + Toc::iterator it = toc.begin(); + Toc::iterator itend = toc.end(); + for (; it != itend; ++it) { + if (it->depth() == depth && it->str() == str) + break; + } + return it; } -DocIterator const & TocItem::dit() const +/////////////////////////////////////////////////////////////////////////// +// +// TocBuilder implementation +// +/////////////////////////////////////////////////////////////////////////// + +TocBuilder::TocBuilder(shared_ptr toc) + : toc_(toc ? toc : make_shared()), + stack_() { - return dit_; + LATTEST(toc); } +void TocBuilder::pushItem(DocIterator const & dit, docstring const & s, + bool output_active, bool is_captioned) +{ + toc_->push_back(TocItem(dit, stack_.size(), s, output_active)); + frame f = { + toc_->size() - 1, //pos + is_captioned, //is_captioned + }; + stack_.push(f); +} -FuncRequest TocItem::action() const +void TocBuilder::captionItem(DocIterator const & dit, docstring const & s, + bool output_active) +{ + // first show the float before moving to the caption + docstring arg = "paragraph-goto " + paragraph_goto_arg(dit); + if (!stack_.empty()) + arg = "paragraph-goto " + + paragraph_goto_arg((*toc_)[stack_.top().pos].dit_) + ";" + arg; + FuncRequest func(LFUN_COMMAND_SEQUENCE, arg); + + if (!stack_.empty() && !stack_.top().is_captioned) { + // The float we entered has not yet been assigned a caption. + // Assign the caption string to it. + TocItem & captionable = (*toc_)[stack_.top().pos]; + captionable.str(s); + captionable.setAction(func); + stack_.top().is_captioned = true; + } else { + // This is a new entry. + pop(); + // the dit is at the float's level, e.g. for the contextual menu of + // outliner entries + DocIterator captionable_dit = dit; + captionable_dit.pop_back(); + pushItem(captionable_dit, s, output_active, true); + (*toc_)[stack_.top().pos].setAction(func); + } +} + +void TocBuilder::pop() { - string const arg = convert(dit_.paragraph().id()) - + ' ' + convert(dit_.pos()); - return FuncRequest(LFUN_PARAGRAPH_GOTO, arg); + if (!stack_.empty()) + stack_.pop(); } + /////////////////////////////////////////////////////////////////////////// // // TocBackend implementation // /////////////////////////////////////////////////////////////////////////// -Toc const & TocBackend::toc(string const & type) const +shared_ptr TocBackend::toc(string const & type) const { // Is the type already supported? TocList::const_iterator it = tocs_.find(type); - LASSERT(it != tocs_.end(), { static Toc dummy; return dummy; }); - + LASSERT(it != tocs_.end(), { return make_shared(); }); return it->second; } -Toc & TocBackend::toc(string const & type) +shared_ptr TocBackend::toc(string const & type) +{ + // std::map::insert only really performs the insertion if the key is not + // already bound, and otherwise returns an iterator to the element already + // there, see manual. + return tocs_.insert({type, make_shared()}).first->second; +} + + +TocBuilder & TocBackend::builder(string const & type) { - return tocs_[type]; + auto p = make_unique(toc(type)); + return * builders_.insert(make_pair(type, move(p))).first->second; } -bool TocBackend::updateItem(DocIterator const & dit) +// FIXME: This function duplicates functionality from InsetText::iterateForToc. +// Both have their own way of computing the TocItem for "tableofcontents". The +// TocItem creation and update should be made in a dedicated function and +// updateItem should be rewritten to uniformly update the matching items from +// all TOCs. +bool TocBackend::updateItem(DocIterator const & dit_in) { + // we need a text + DocIterator dit = dit_in.getInnerText(); + if (dit.text()->getTocLevel(dit.pit()) == Layout::NOT_IN_TOC) return false; - if (toc("tableofcontents").empty()) { + 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!"); @@ -132,103 +255,64 @@ bool TocBackend::updateItem(DocIterator const & dit) BufferParams const & bufparams = buffer_->params(); const int min_toclevel = bufparams.documentClass().min_toclevel(); - TocIterator toc_item = item("tableofcontents", dit); + Toc::const_iterator toc_item = item("tableofcontents", dit); docstring tocstring; // For each paragraph, traverse its insets and let them add // their toc items + // + // FIXME: This is supposed to accomplish the same as the body of + // InsetText::iterateForToc(), probably 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() == ARG_CODE) { + tocstring = par.labelString(); if (!tocstring.empty()) - break; - Paragraph const & inset_par = - *static_cast(inset).paragraphs().begin(); - if (!par.labelString().empty()) - tocstring = par.labelString() + ' '; - tocstring += inset_par.asString(AS_STR_INSETS); + tocstring += ' '; + inset.asInsetText()->text().forOutliner(tocstring,TOC_ENTRY_LENGTH); break; } } - int const toclevel = toc_item->dit_.text()->getTocLevel(toc_item->dit_.pit()); + 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(AS_STR_LABEL | AS_STR_INSETS); + par.forOutliner(tocstring, TOC_ENTRY_LENGTH); - const_cast(*toc_item).str_ = tocstring; + support::truncateWithEllipsis(tocstring, TOC_ENTRY_LENGTH); + const_cast(*toc_item).str(tocstring); buffer_->updateTocItem("tableofcontents", dit); return true; } -void TocBackend::update(bool output_active) +void TocBackend::update(bool output_active, UpdateType utype) { + for (TocList::iterator it = tocs_.begin(); it != tocs_.end(); ++it) + it->second->clear(); tocs_.clear(); + builders_.clear(); if (!buffer_->isInternal()) { DocIterator dit; - buffer_->inset().addToToc(dit, output_active); + buffer_->inset().addToToc(dit, output_active, utype); } } -TocIterator TocBackend::item(string const & type, - DocIterator const & dit) const +Toc::const_iterator TocBackend::item(string const & type, + DocIterator const & dit) const { TocList::const_iterator toclist_it = tocs_.find(type); // Is the type supported? - LASSERT(toclist_it != tocs_.end(), /**/); - return toclist_it->second.item(dit); -} - - -TocIterator Toc::item(DocIterator const & dit) const -{ - TocIterator last = begin(); - TocIterator it = end(); - if (it == last) - return it; - - --it; - - DocIterator dit_text = dit; - if (dit_text.inMathed()) { - // We are only interested in text so remove the math CursorSlice. - 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() != &dit_text[0].inset()) - continue; - if (it->dit_ <= dit_text) - return it; - } - - // We are before the first Toc Item: - return last; -} - - -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; + // We will try to make the best of it in release mode + LASSERT(toclist_it != tocs_.end(), toclist_it = tocs_.begin()); + return findItem(*toclist_it->second, dit); } @@ -237,8 +321,8 @@ void TocBackend::writePlaintextTocList(string const & type, { TocList::const_iterator cit = tocs_.find(type); if (cit != tocs_.end()) { - TocIterator ccit = cit->second.begin(); - TocIterator end = cit->second.end(); + Toc::const_iterator ccit = cit->second->begin(); + Toc::const_iterator end = cit->second->end(); for (; ccit != end; ++ccit) { os << ccit->asString() << from_utf8("\n"); if (os.str().size() > max_length) @@ -248,4 +332,11 @@ void TocBackend::writePlaintextTocList(string const & type, } +docstring TocBackend::outlinerName(string const & type) const +{ + return translateIfPossible( + buffer_->params().documentClass().outlinerName(type)); +} + + } // namespace lyx