-// -*- 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>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "support/lstrings.h"
#include "toc.h"
#include "buffer.h"
-#include "frontends/LyXView.h"
-#include "lyxfunc.h"
+#include "funcrequest.h"
#include "LyXAction.h"
#include "paragraph.h"
-#include "lyxtextclasslist.h"
-#include "insets/insetfloat.h"
#include "debug.h"
+#include "iterators.h"
-using std::vector;
+#include "insets/insetfloat.h"
+#include "insets/insetwrap.h"
-extern LyXAction lyxaction;
+#include "support/tostr.h"
-namespace toc
-{
+#include "frontends/LyXView.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(par->id());
- lv_.getLyXFunc()->dispatch(LFUN_GOTO_PARAGRAPH, tmp, false);
+ string const tmp = tostr(id_);
+ lv_.dispatch(FuncRequest(LFUN_GOTO_PARAGRAPH, tmp));
}
int TocItem::action() const
{
return lyxaction.getPseudoAction(LFUN_GOTO_PARAGRAPH,
- tostr(par->id()));
+ tostr(id_));
}
}
-TocList const getTocList(Buffer const * buf)
+TocList const getTocList(Buffer const & buf)
{
TocList toclist;
- Paragraph * par = buf->paragraph;
- LyXTextClass const & textclass = textclasslist[buf->params.textclass];
- bool found = textclass.hasLayout("Caption");
- string const layout("Caption");
+ LyXTextClass const & textclass = buf.params.getLyXTextClass();
- while (par) {
+ 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 = par->layout()->labeltype;
+ char const labeltype = pit->layout()->labeltype;
if (labeltype >= LABEL_COUNTER_CHAPTER
- && labeltype <= LABEL_COUNTER_CHAPTER + buf->params.tocdepth) {
+ && 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));
+ TocItem const item(pit->id(), depth,
+ pit->asString(buf, true));
toclist["TOC"].push_back(item);
}
+
// For each paragraph, traverse its insets and look for
- // FLOAT_CODE
-
- if (found) {
- Paragraph::inset_iterator it =
- par->inset_iterator_begin();
- Paragraph::inset_iterator end =
- par->inset_iterator_end();
-
- for (; it != end; ++it) {
- if ((*it)->lyxCode() == Inset::FLOAT_CODE) {
- InsetFloat * il =
- static_cast<InsetFloat*>(*it);
-
- string const type = il->type();
-
- // Now find the caption in the float...
- // We now tranverse the paragraphs of
- // the inset...
- Paragraph * tmp = il->inset.paragraph();
- while (tmp) {
- if (tmp->layout()->name() == layout) {
- string const str =
- tostr(toclist[type].size()+1) + ". " + tmp->asString(buf, false);
- TocItem const item(tmp, 0 , str);
- toclist[type].push_back(item);
- }
- tmp = tmp->next();
- }
- }
+ // 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<InsetFloat*>(it->inset);
+ il->addToToc(toclist, buf);
+ } else if (it->inset->lyxCode() == InsetOld::WRAP_CODE) {
+ InsetWrap * il =
+ static_cast<InsetWrap*>(it->inset);
+
+ il->addToToc(toclist, buf);
}
- } else {
- lyxerr << "Caption not found" << endl;
}
-
- par = par->next();
}
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