-// -*- 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 "support/lstrings.h"
#include "toc.h"
+
#include "buffer.h"
-#include "frontends/LyXView.h"
+#include "bufferparams.h"
+#include "FloatList.h"
+#include "funcrequest.h"
#include "LyXAction.h"
#include "paragraph.h"
+#include "pariterator.h"
+
+#include "frontends/LyXView.h"
+
#include "insets/insetfloat.h"
+#include "insets/insetoptarg.h"
#include "insets/insetwrap.h"
-#include "debug.h"
-#include "iterators.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
{
void TocItem::goTo(LyXView & lv_) const
{
- string const tmp = tostr(par->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(par->id()));
+ return FuncRequest(LFUN_GOTO_PARAGRAPH, convert<string>(id_));
}
}
-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) {
- Paragraph const * par = *pit;
-
-#ifdef WITH_WARNINGS
-#warning bogus type (Lgb)
-#endif
- char const labeltype = par->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(par, depth,
- par->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::iterator it = par->insetlist.begin();
- InsetList::iterator end = par->insetlist.end();
+ InsetList::const_iterator it = pit->insetlist.begin();
+ InsetList::const_iterator end = pit->insetlist.end();
for (; it != end; ++it) {
- if (it.getInset()->lyxCode() == Inset::FLOAT_CODE) {
- InsetFloat * il =
- static_cast<InsetFloat*>(it.getInset());
- il->addToToc(toclist, buf);
- } else if (it.getInset()->lyxCode() == Inset::WRAP_CODE) {
- InsetWrap * il =
- static_cast<InsetWrap*>(it.getInset());
- 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;
}
-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);
} // namespace toc
+} // namespace lyx
projects / lyx.git / blobdiff