X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=2b13d1febfa8d37de5a673ed6d41be971abe4345;hb=b874bdfd402a94428c8f5fe7ef2180146069120a;hp=9bd435f2f209283245b5ae9d7ad2ef9c7115a5ff;hpb=3c9b62a69d894b5ea020c18d0bec676dc00fe378;p=lyx.git diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp index 9bd435f2f2..2b13d1febf 100644 --- a/src/TocBackend.cpp +++ b/src/TocBackend.cpp @@ -49,9 +49,9 @@ namespace lyx { /////////////////////////////////////////////////////////////////////////// TocItem::TocItem(DocIterator const & dit, int d, docstring const & s, - bool output_active, docstring const & t, FuncRequest action) : - dit_(dit), depth_(d), str_(s), tooltip_(t), output_(output_active), - action_(action) + bool output_active, FuncRequest action) + : dit_(dit), depth_(d), str_(s), output_(output_active), + action_(action) { } @@ -62,12 +62,6 @@ int TocItem::id() const } -docstring const & TocItem::tooltip() const -{ - return tooltip_.empty() ? str_ : tooltip_; -} - - docstring const TocItem::asString() const { static char_type const cross = 0x2716; // ✖ U+2716 HEAVY MULTIPLICATION X @@ -107,21 +101,15 @@ FuncRequest TocItem::action() const // /////////////////////////////////////////////////////////////////////////// -TocIterator Toc::item(DocIterator const & dit) const +Toc::const_iterator TocBackend::findItem(Toc const & toc, + DocIterator const & dit) { - TocIterator last = begin(); - TocIterator it = end(); + Toc::const_iterator last = toc.begin(); + Toc::const_iterator it = toc.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(); - } + DocIterator dit_text = dit.getInnerText(); for (; it != last; --it) { // We verify that we don't compare contents of two @@ -138,12 +126,12 @@ TocIterator Toc::item(DocIterator const & dit) const } -Toc::iterator Toc::item(int depth, docstring const & str) +Toc::iterator TocBackend::findItem(Toc & toc, int depth, docstring const & str) { - if (empty()) - return end(); - iterator it = begin(); - iterator itend = end(); + 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; @@ -159,14 +147,14 @@ Toc::iterator Toc::item(int depth, docstring const & str) /////////////////////////////////////////////////////////////////////////// TocBuilder::TocBuilder(shared_ptr toc) - : toc_(toc ? toc : lyx::make_shared()), + : toc_(toc ? toc : make_shared()), stack_() { LATTEST(toc); } void TocBuilder::pushItem(DocIterator const & dit, docstring const & s, - bool output_active, bool is_captioned) + bool output_active, bool is_captioned) { toc_->push_back(TocItem(dit, stack_.size(), s, output_active)); frame f = { @@ -177,7 +165,7 @@ void TocBuilder::pushItem(DocIterator const & dit, docstring const & s, } void TocBuilder::captionItem(DocIterator const & dit, docstring const & s, - bool output_active) + bool output_active) { // first show the float before moving to the caption docstring arg = "paragraph-goto " + paragraph_goto_arg(dit); @@ -185,7 +173,7 @@ void TocBuilder::captionItem(DocIterator const & dit, docstring const & s, 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. @@ -213,25 +201,6 @@ void TocBuilder::pop() -/////////////////////////////////////////////////////////////////////////// -// -// TocBuilderStore implementation -// -/////////////////////////////////////////////////////////////////////////// - -shared_ptr TocBuilderStore::get(string const & type, - shared_ptr toc) -{ - map_t::const_iterator it = map_.find(type); - if (it == map_.end()) { - it = map_.insert(std::make_pair(type, - lyx::make_shared(toc))).first; - } - return it->second; -} - - - /////////////////////////////////////////////////////////////////////////// // // TocBackend implementation @@ -242,24 +211,24 @@ shared_ptr TocBackend::toc(string const & type) const { // Is the type already supported? TocList::const_iterator it = tocs_.find(type); - LASSERT(it != tocs_.end(), { return lyx::make_shared(); }); + LASSERT(it != tocs_.end(), { return make_shared(); }); return it->second; } shared_ptr TocBackend::toc(string const & type) { - TocList::const_iterator it = tocs_.find(type); - if (it == tocs_.end()) { - it = tocs_.insert(std::make_pair(type, lyx::make_shared())).first; - } - return it->second; + // 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; } -shared_ptr TocBackend::builder(string const & type) +TocBuilder & TocBackend::builder(string const & type) { - return builders_.get(type, toc(type)); + auto p = make_unique(toc(type)); + return * builders_.insert(make_pair(type, move(p))).first->second; } @@ -286,7 +255,7 @@ bool TocBackend::updateItem(DocIterator const & dit_in) 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; @@ -336,14 +305,14 @@ void TocBackend::update(bool output_active, UpdateType 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? // 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); + return findItem(*toclist_it->second, dit); } @@ -352,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) @@ -363,7 +332,7 @@ void TocBackend::writePlaintextTocList(string const & type, } -docstring TocBackend::outlinerName(std::string const & type) const +docstring TocBackend::outlinerName(string const & type) const { return translateIfPossible( buffer_->params().documentClass().outlinerName(type));