X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftoc.C;h=d90cab6e37812c83ce88fc07193b6ce72ecda316;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=de0ce39226d10b3e3e54ed8b913c882e2960294e;hpb=596dec65923b0526df37a693880c173b646ec59d;p=lyx.git

diff --git a/src/toc.C b/src/toc.C
index de0ce39226..d90cab6e37 100644
--- a/src/toc.C
+++ b/src/toc.C
@@ -1,41 +1,41 @@
-// -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2002 The LyX Team.
+/**
+ * \file toc.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ======================================================
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
  *
- * \file toc.C
- * \author Angus Leeming <a.leeming@ic.ac.uk>
- * \author Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "toc.h"
+
 #include "buffer.h"
+#include "bufferparams.h"
+#include "FloatList.h"
+#include "funcrequest.h"
 #include "LyXAction.h"
 #include "paragraph.h"
-#include "debug.h"
-#include "iterators.h"
+#include "pariterator.h"
+
+#include "frontends/LyXView.h"
 
 #include "insets/insetfloat.h"
+#include "insets/insetoptarg.h"
 #include "insets/insetwrap.h"
 
-#include "support/tostr.h"
-
-#include "frontends/LyXView.h"
+#include "support/convert.h"
 
 using std::vector;
 using std::max;
-using std::endl;
 using std::ostream;
+using std::string;
 
-namespace toc
-{
+namespace lyx {
+namespace toc {
 
 string const TocItem::asString() const
 {
@@ -45,15 +45,14 @@ string const TocItem::asString() const
 
 void TocItem::goTo(LyXView & lv_) const
 {
-	string const tmp = tostr(id_);
+	string const tmp = convert<string>(id_);
 	lv_.dispatch(FuncRequest(LFUN_GOTO_PARAGRAPH, tmp));
 }
 
 
-int TocItem::action() const
+FuncRequest TocItem::action() const
 {
-	return lyxaction.getPseudoAction(LFUN_GOTO_PARAGRAPH,
-					 tostr(id_));
+	return FuncRequest(LFUN_GOTO_PARAGRAPH, convert<string>(id_));
 }
 
 
@@ -67,52 +66,78 @@ string const getType(string const & cmdName)
 }
 
 
-TocList const getTocList(Buffer const * buf)
+string const getGuiName(string const & type, Buffer const & buffer)
+{
+	FloatList const & floats =
+		buffer.params().getLyXTextClass().floats();
+	if (floats.typeExist(type))
+		return floats.getType(type).name();
+	else
+		return type;
+}
+
+
+TocList const getTocList(Buffer const & buf)
 {
 	TocList toclist;
-	if (!buf)
-		return toclist;
 
-	LyXTextClass const & textclass = buf->params.getLyXTextClass();
+	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();
+	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);
-		}
+
+		// 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) {
-			if (it->inset->lyxCode() == Inset::FLOAT_CODE) {
-				InsetFloat * il =
-					static_cast<InsetFloat*>(it->inset);
-				il->addToToc(toclist, buf);
-			} else if (it->inset->lyxCode() == Inset::WRAP_CODE) {
-				InsetWrap * il =
-					static_cast<InsetWrap*>(it->inset);
-				il->addToToc(toclist, buf);
+			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;
 }
 
 
-vector<string> const getTypes(Buffer const * buffer)
+vector<string> const getTypes(Buffer const & buffer)
 {
 	vector<string> types;
 
@@ -129,7 +154,7 @@ vector<string> const getTypes(Buffer const * buffer)
 }
 
 
-void asciiTocList(string const & type, Buffer const * buffer, ostream & os)
+void asciiTocList(string const & type, Buffer const & buffer, ostream & os)
 {
 	TocList const toc_list = getTocList(buffer);
 	TocList::const_iterator cit = toc_list.find(type);
@@ -143,3 +168,4 @@ void asciiTocList(string const & type, Buffer const * buffer, ostream & os)
 
 
 } // namespace toc
+} // namespace lyx