]> git.lyx.org Git - lyx.git/blobdiff - src/toc.C
* Painter.h:
[lyx.git] / src / toc.C
index c20c0b171d6c140d53c5cbf23da1807029b7fe35..7892295ce3ea561cdd980eab2f029938c0dcbbf4 100644 (file)
--- a/src/toc.C
+++ b/src/toc.C
@@ -22,8 +22,7 @@
 #include "paragraph.h"
 #include "cursor.h"
 #include "debug.h"
-
-#include "frontends/LyXView.h"
+#include "undo.h"
 
 #include "insets/insetfloat.h"
 #include "insets/insetoptarg.h"
 
 #include "support/convert.h"
 
+#include <iostream>
+#include <map>
+
+using std::map;
+using std::pair;
+using std::make_pair;
 using std::vector;
 using std::max;
 using std::ostream;
 using std::string;
+using std::cout;
+using std::endl;
 
 namespace lyx {
 namespace toc {
 
-string const TocItem::asString() const
-{
-       return string(4 * depth, ' ') + str;
-}
+typedef map<Buffer const *, TocBackend> TocMap;
+static TocMap toc_backend_;
 
+///////////////////////////////////////////////////////////////////////////
+// Interface to toc_backend_
 
-void TocItem::goTo(LyXView & lv_) const
+void updateToc(Buffer const & buf)
 {
-       string const tmp = convert<string>(id_);
-       lv_.dispatch(FuncRequest(LFUN_GOTO_PARAGRAPH, tmp));
+       TocMap::iterator it = toc_backend_.find(&buf);
+       if (it == toc_backend_.end()) {
+               pair<TocMap::iterator, bool> result
+                       = toc_backend_.insert(make_pair(&buf, TocBackend(&buf)));
+               if (!result.second)
+                       return;
+
+               it = result.first;
+       }
+
+       it->second.update();
 }
 
 
-FuncRequest TocItem::action() const
+TocList const & getTocList(Buffer const & buf)
 {
-       return FuncRequest(LFUN_GOTO_PARAGRAPH, convert<string>(id_));
+       return toc_backend_[&buf].tocs();
 }
 
 
-string const getType(string const & cmdName)
+Toc const & getToc(Buffer const & buf, std::string const & type)
 {
-       // special case
-       if (cmdName == "tableofcontents")
-               return "TOC";
-       else
-               return cmdName;
+       return toc_backend_[&buf].toc(type);
 }
 
 
-string const getGuiName(string const & type, Buffer const & buffer)
+TocIterator const getCurrentTocItem(Buffer const & buf, LCursor const & cur,
+                                                               std::string const & type)
 {
-       FloatList const & floats =
-               buffer.params().getLyXTextClass().floats();
-       if (floats.typeExist(type))
-               return floats.getType(type).name();
-       else
-               return type;
+       return toc_backend_[&buf].item(type, ParConstIterator(cur));
 }
 
 
-TocList const getTocList(Buffer const & buf)
+vector<string> const & getTypes(Buffer const & buf)
 {
-       TocList toclist;
-
-       BufferParams const & bufparams = buf.params();
-       const int min_toclevel = bufparams.getLyXTextClass().min_toclevel();
-
-       ParConstIterator pit = buf.par_iterator_begin();
-       ParConstIterator end = buf.par_iterator_end();
-       for (; pit != end; ++pit) {
-
-               // the string that goes to the toc (could be the optarg)
-               string tocstring;
-
-               // 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) {
-                       switch (it->inset->lyxCode()) {
-                       case InsetBase::FLOAT_CODE:
-                               static_cast<InsetFloat*>(it->inset)
-                                       ->addToToc(toclist, buf);
-                               break;
-                       case InsetBase::WRAP_CODE:
-                               static_cast<InsetWrap*>(it->inset)
-                                       ->addToToc(toclist, buf);
-                               break;
-                       case InsetBase::OPTARG_CODE: {
-                               if (!tocstring.empty())
-                                       break;
-                               Paragraph const & par = *static_cast<InsetOptArg*>(it->inset)->paragraphs().begin();
-                               if (!pit->getLabelstring().empty())
-                                       tocstring = pit->getLabelstring()
-                                               + ' ';
-                               tocstring += par.asString(buf, false);
-                               break;
-                       }
-                       default:
-                               break;
-                       }
-               }
-
-               /// now the toc entry for the paragraph
-               int const toclevel = pit->layout()->toclevel;
-               if (toclevel != LyXLayout::NOT_IN_TOC
-                   && toclevel >= min_toclevel
-                   && toclevel <= bufparams.tocdepth) {
-                       // insert this into the table of contents
-                       if (tocstring.empty())
-                               tocstring = pit->asString(buf, true);
-                       TocItem const item(pit->id(), toclevel - min_toclevel,
-                                          tocstring);
-                       toclist["TOC"].push_back(item);
-               }
-       }
-       return toclist;
+       return toc_backend_[&buf].types();
 }
 
 
-TocItem const getCurrentTocItem(Buffer const & buf, LCursor const & cur,
-                                                               std::string const & type)
+void asciiTocList(string const & type, Buffer const & buf, odocstream & os)
 {
-       // This should be cached:
-       TocList tmp = getTocList(buf);
-
-       // Is the type supported?
-       /// \todo TocItem() should create an invalid TocItem()
-       /// \todo create TocItem::isValid()
-       TocList::iterator toclist_it = tmp.find(type);
-       if (toclist_it == tmp.end())
-               return TocItem(-1, -1, string());
-
-       Toc const toc_vector = toclist_it->second;
-       ParConstIterator const current(cur);
-       int start = toc_vector.size() - 1;
-
-       /// \todo cache the ParConstIterator values inside TocItem
-       for (int i = start; i >= 0; --i) {
-               
-               ParConstIterator const it 
-                       = buf.getParFromID(toc_vector[i].id_);
-
-               // A good solution for TocItems inside insets would be to do:
-               //
-               //if (std::distance(it, current) <= 0)
-               //      return toc_vector[i];
-               //
-               // But for an unknown reason, std::distance(current, it) always
-               // returns  a positive value and std::distance(it, current) takes forever...
-               // So for now, we do:
-               if (it.pit() <= current.pit())
-                       return toc_vector[i];
-       }
-
-       // We are before the first TocItem:
-       return toc_vector[0];
+       toc_backend_[&buf].asciiTocList(type, os);
 }
 
+///////////////////////////////////////////////////////////////////////////
+// Other functions
 
-vector<string> const getTypes(Buffer const & buffer)
+string const getType(string const & cmdName)
 {
-       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;
+       // special case
+       if (cmdName == "tableofcontents")
+               return "TOC";
+       else
+               return cmdName;
 }
 
 
-void asciiTocList(string const & type, Buffer const & buffer, ostream & os)
+string const getGuiName(string const & type, Buffer const & buffer)
 {
-       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';
-       }
+       FloatList const & floats =
+               buffer.params().getLyXTextClass().floats();
+       if (floats.typeExist(type))
+               return floats.getType(type).name();
+       else
+               return type;
 }
 
 
-void outline(OutlineOp mode, Buffer * buf, pit_type & pit)
+void outline(OutlineOp mode,  LCursor & cur)
 {
+       recordUndo(cur);
+       Buffer * buf = & cur.buffer();
+       pit_type & pit = cur.pit();
        ParagraphList & pars = buf->text().paragraphs();
        ParagraphList::iterator bgn = pars.begin();
        ParagraphList::iterator s = boost::next(bgn, pit);
@@ -225,7 +141,7 @@ void outline(OutlineOp mode, Buffer * buf, pit_type & pit)
        int const thistoclevel = s->layout()->toclevel;
        int toclevel;
        switch (mode) {
-               case UP: {
+               case Up: {
                        if (p != end)
                                ++p;
                        for (; p != end; ++p) {
@@ -257,7 +173,7 @@ void outline(OutlineOp mode, Buffer * buf, pit_type & pit)
                        pars.erase(s, t);
                break;
                }
-               case DOWN: {
+               case Down: {
                           if (p != end)
                                ++p;
                        for (; p != end; ++p) {
@@ -288,17 +204,19 @@ void outline(OutlineOp mode, Buffer * buf, pit_type & pit)
                        pars.erase(s, t);
                break;
                }
-               case IN:
+               case In:
                        for (; lit != lend; ++lit) {
-                               if ((*lit)->toclevel == thistoclevel + 1) {
+                               if ((*lit)->toclevel == thistoclevel + 1 &&
+                                   s->layout()->labeltype == (*lit)->labeltype) {
                                        s->layout((*lit));
                                        break;
                                }
                        }
                break;
-               case OUT:
+               case Out:
                        for (; lit != lend; ++lit) {
-                               if ((*lit)->toclevel == thistoclevel - 1) {
+                               if ((*lit)->toclevel == thistoclevel - 1 &&
+                                   s->layout()->labeltype == (*lit)->labeltype) {
                                        s->layout((*lit));
                                        break;
                                }