X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftoc.C;h=26d537e2d5b0f1fb13efc9d4b6bfc97e60366bcb;hb=024275f0690b41634e26dabe8758e3dc6cd31ee2;hp=12bf0d9c03e0955081118d09776df8326a50b26f;hpb=462eca7d1a1c15d520b89288f8bd83201092a88d;p=lyx.git diff --git a/src/toc.C b/src/toc.C index 12bf0d9c03..26d537e2d5 100644 --- a/src/toc.C +++ b/src/toc.C @@ -5,6 +5,7 @@ * * \author Jean-Marc Lasgouttes * \author Angus Leeming + * \author Abdelrazak Younes * * Full author contact details are available in file CREDITS. */ @@ -14,126 +15,138 @@ #include "toc.h" #include "buffer.h" +#include "bufferparams.h" #include "funcrequest.h" -#include "iterators.h" +#include "lyxtext.h" #include "LyXAction.h" #include "paragraph.h" +#include "pariterator.h" +#include "cursor.h" +#include "debug.h" +#include "undo.h" -#include "frontends/LyXView.h" - -#include "insets/insetfloat.h" -#include "insets/insetwrap.h" - -#include "support/tostr.h" - -using std::vector; -using std::max; -using std::endl; -using std::ostream; namespace lyx { namespace toc { -string const TocItem::asString() const -{ - return string(4 * depth, ' ') + str; -} - - -void TocItem::goTo(LyXView & lv_) const -{ - string const tmp = tostr(id_); - lv_.dispatch(FuncRequest(LFUN_GOTO_PARAGRAPH, tmp)); -} - - -int TocItem::action() const +void outline(OutlineOp mode, LCursor & cur) { - return lyxaction.getPseudoAction(LFUN_GOTO_PARAGRAPH, - tostr(id_)); -} - - -string const getType(string const & cmdName) -{ - // special case - if (cmdName == "tableofcontents") - return "TOC"; - else - return cmdName; -} - - -TocList const getTocList(Buffer const & buf) -{ - TocList toclist; - - LyXTextClass const & textclass = buf.params.getLyXTextClass(); - - ParConstIterator pit = buf.par_iterator_begin(); - ParConstIterator end = buf.par_iterator_end(); - for (; pit != end; ++pit) { -#ifdef WITH_WARNINGS -#warning bogus type (Lgb) -#endif - char const labeltype = pit->layout()->labeltype; - - if (labeltype >= LABEL_COUNTER_CHAPTER - && labeltype <= LABEL_COUNTER_CHAPTER + buf.params.tocdepth) { - // insert this into the table of contents - const int depth = max(0, labeltype - textclass.maxcounter()); - TocItem const item(pit->id(), depth, - pit->asString(buf, true)); - toclist["TOC"].push_back(item); + Buffer * buf = & cur.buffer(); + pit_type & pit = cur.pit(); + ParagraphList & pars = buf->text().paragraphs(); + ParagraphList::iterator bgn = pars.begin(); + // The first paragraph of the area to be copied: + ParagraphList::iterator start = boost::next(bgn, pit); + // The final paragraph of area to be copied: + ParagraphList::iterator finish = start; + ParagraphList::iterator end = pars.end(); + + LyXTextClass::const_iterator lit = + buf->params().getLyXTextClass().begin(); + LyXTextClass::const_iterator const lend = + buf->params().getLyXTextClass().end(); + + int const thistoclevel = start->layout()->toclevel; + int toclevel; + switch (mode) { + case Up: { + // Move out (down) from this section header + if (finish != end) + ++finish; + // Seek the one (on same level) below + for (; finish != end; ++finish) { + toclevel = finish->layout()->toclevel; + if (toclevel != LyXLayout::NOT_IN_TOC + && toclevel <= thistoclevel) { + break; + } + } + ParagraphList::iterator dest = start; + // Move out (up) from this header + if (dest != bgn) + --dest; + else + break; + // Search previous same-level header above + for (; dest != bgn; --dest) { + toclevel = dest->layout()->toclevel; + if (toclevel != LyXLayout::NOT_IN_TOC + && toclevel <= thistoclevel) { + break; + } + } + // Not found; do nothing + if (dest == bgn) + break; + pit_type const newpit = std::distance(bgn, dest); + pit_type const len = std::distance(start, finish); + pit += len; + pit = std::min(pit, cur.lastpit()); + recordUndo(cur, Undo::ATOMIC, newpit, pit); + pars.insert(dest, start, finish); + start = boost::next(bgn, pit); + pit = newpit; + pars.erase(start, finish); + break; } - - // For each paragraph, traverse its insets and look for - // FLOAT_CODE or WRAP_CODE - InsetList::const_iterator it = pit->insetlist.begin(); - InsetList::const_iterator end = pit->insetlist.end(); - for (; it != end; ++it) { - if (it->inset->lyxCode() == InsetOld::FLOAT_CODE) { - InsetFloat * il = - static_cast(it->inset); - il->addToToc(toclist, buf); - } else if (it->inset->lyxCode() == InsetOld::WRAP_CODE) { - InsetWrap * il = - static_cast(it->inset); - - il->addToToc(toclist, buf); + case Down: { + // Go down out of current header: + if (finish != end) + ++finish; + // Find next same-level header: + for (; finish != end; ++finish) { + toclevel = finish->layout()->toclevel; + if (toclevel != LyXLayout::NOT_IN_TOC + && toclevel <= thistoclevel) { + break; + } + } + ParagraphList::iterator dest = finish; + // Go one down from *this* header: + if (dest != end) + ++dest; + else + break; + // Go further down to find header to insert in front of: + for (; dest != end; ++dest) { + toclevel = dest->layout()->toclevel; + if (toclevel != LyXLayout::NOT_IN_TOC + && toclevel <= thistoclevel) { + break; + } } + // One such was found: + pit_type newpit = std::distance(bgn, dest); + pit_type const len = std::distance(start, finish); + recordUndo(cur, Undo::ATOMIC, pit, newpit -1); + pars.insert(dest, start, finish); + start = boost::next(bgn, pit); + pit = newpit - len; + pars.erase(start, finish); + break; } - } - return toclist; -} - - -vector const getTypes(Buffer const & buffer) -{ - vector types; - - TocList const tmp = getTocList(buffer); - - TocList::const_iterator cit = tmp.begin(); - TocList::const_iterator end = tmp.end(); - - for (; cit != end; ++cit) { - types.push_back(cit->first); - } - - return types; -} - - -void asciiTocList(string const & type, Buffer const & buffer, ostream & os) -{ - TocList const toc_list = getTocList(buffer); - TocList::const_iterator cit = toc_list.find(type); - if (cit != toc_list.end()) { - Toc::const_iterator ccit = cit->second.begin(); - Toc::const_iterator end = cit->second.end(); - for (; ccit != end; ++ccit) - os << ccit->asString() << '\n'; + case In: + recordUndo(cur); + for (; lit != lend; ++lit) { + if ((*lit)->toclevel == thistoclevel + 1 && + start->layout()->labeltype == (*lit)->labeltype) { + start->layout((*lit)); + break; + } + } + break; + case Out: + recordUndo(cur); + for (; lit != lend; ++lit) { + if ((*lit)->toclevel == thistoclevel - 1 && + start->layout()->labeltype == (*lit)->labeltype) { + start->layout((*lit)); + break; + } + } + break; + default: + break; } }