X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=6526c57537ae53acadfef5079c6e5a31a1dd82e4;hb=1639abb8edaa492c649e69d093436f8a96f07bec;hp=f0750c61bda9ac16a2a84a73ce3158ebf5b366d9;hpb=d5a5fbb8ee87d4a8ae1c55f9ba72819251bb6fb7;p=lyx.git diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp index f0750c61bd..6526c57537 100644 --- a/src/TocBackend.cpp +++ b/src/TocBackend.cpp @@ -17,6 +17,7 @@ #include "Buffer.h" #include "BufferParams.h" +#include "Cursor.h" #include "FloatList.h" #include "FuncRequest.h" #include "InsetList.h" @@ -31,8 +32,9 @@ #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; @@ -68,18 +70,18 @@ docstring const & TocItem::tooltip() const docstring const TocItem::asString() const { - // U+2327 X IN A RECTANGLE BOX - // char_type const cross = 0x2327; - // U+274E NEGATIVE SQUARED CROSS MARK - char_type const cross = 0x274e; + 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 += " "; + prefix += thin; } return prefix + str_; } +namespace { + // convert a DocIterator into an argument to LFUN_PARAGRAPH_GOTO docstring paragraph_goto_arg(DocIterator const & dit) { @@ -88,6 +90,8 @@ docstring paragraph_goto_arg(DocIterator const & dit) convert(s.pos()); } +} // namespace anon + FuncRequest TocItem::action() const { if (action_.action() == LFUN_UNKNOWN_ACTION) { @@ -103,21 +107,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 @@ -134,12 +132,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; @@ -155,7 +153,7 @@ Toc::iterator Toc::item(int depth, docstring const & str) /////////////////////////////////////////////////////////////////////////// TocBuilder::TocBuilder(shared_ptr toc) - : toc_(toc ? toc : make_shared()), + : toc_(toc ? toc : lyx::make_shared()), stack_() { LATTEST(toc); @@ -181,7 +179,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. @@ -221,7 +219,7 @@ shared_ptr TocBuilderStore::get(string const & type, map_t::const_iterator it = map_.find(type); if (it == map_.end()) { it = map_.insert(std::make_pair(type, - make_shared(toc))).first; + lyx::make_shared(toc))).first; } return it->second; } @@ -238,7 +236,7 @@ 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 make_shared(); }); + LASSERT(it != tocs_.end(), { return lyx::make_shared(); }); return it->second; } @@ -247,7 +245,7 @@ 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, make_shared())).first; + it = tocs_.insert(std::make_pair(type, lyx::make_shared())).first; } return it->second; } @@ -259,8 +257,16 @@ shared_ptr TocBackend::builder(string const & type) } -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; @@ -274,34 +280,36 @@ 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); + support::truncateWithEllipsis(tocstring, TOC_ENTRY_LENGTH); const_cast(*toc_item).str(tocstring); buffer_->updateTocItem("tableofcontents", dit); @@ -322,14 +330,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); } @@ -338,8 +346,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) @@ -349,4 +357,11 @@ void TocBackend::writePlaintextTocList(string const & type, } +docstring TocBackend::outlinerName(std::string const & type) const +{ + return translateIfPossible( + buffer_->params().documentClass().outlinerName(type)); +} + + } // namespace lyx