]> git.lyx.org Git - lyx.git/blobdiff - src/toc.C
Small formatting and comment cleanup.
[lyx.git] / src / toc.C
index 65bcc5673bc5c64d33ad4961b1f30dab690ff868..26d537e2d5b0f1fb13efc9d4b6bfc97e60366bcb 100644 (file)
--- 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.
  */
 #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::ostream;
-using std::string;
 
 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));
-}
-
-
-FuncRequest TocItem::action() const
+void outline(OutlineOp mode,  LCursor & cur)
 {
-       return FuncRequest(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;
-
-       BufferParams const & bufparams = buf.params();
-
-       ParConstIterator pit = buf.par_iterator_begin();
-       ParConstIterator end = buf.par_iterator_end();
-       for (; pit != end; ++pit) {
-
-               int const toclevel = pit->layout()->toclevel;
-               if (toclevel > 0 && toclevel <= bufparams.tocdepth) {
-                       // insert this into the table of contents
-                       TocItem const item(pit->id(), toclevel - 1, 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) {
-                               static_cast<InsetFloat*>(it->inset)
-                                       ->addToToc(toclist, buf);
-                       } else if (it->inset->lyxCode() == InsetOld::WRAP_CODE) {
-                               static_cast<InsetWrap*>(it->inset)
-                                       ->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<string> const getTypes(Buffer const & buffer)
-{
-       vector<string> 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;
        }
 }