#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 "LyXAction.h"
#include "paragraph.h"
#include "insets/insetfloat.h"
+#include "insets/insetwrap.h"
#include "debug.h"
+#include "iterators.h"
using std::vector;
using std::max;
using std::endl;
using std::ostream;
-extern LyXAction lyxaction;
-
namespace toc
{
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 toclist;
if (!buf)
return toclist;
- Paragraph * par = buf->paragraph;
LyXTextClass const & textclass = buf->params.getLyXTextClass();
- while (par) {
+ 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
&& 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,
+ TocItem const item(par->id(), depth,
par->asString(buf, true));
toclist["TOC"].push_back(item);
}
// For each paragraph, traverse its insets and look for
- // FLOAT_CODE
- Paragraph::inset_iterator it = par->inset_iterator_begin();
- Paragraph::inset_iterator end = par->inset_iterator_end();
+ // FLOAT_CODE or WRAP_CODE
+ InsetList::iterator it = par->insetlist.begin();
+ InsetList::iterator end = par->insetlist.end();
for (; it != end; ++it) {
- if ((*it)->lyxCode() == Inset::FLOAT_CODE) {
+ if (it.getInset()->lyxCode() == Inset::FLOAT_CODE) {
InsetFloat * il =
- static_cast<InsetFloat*>(*it);
+ 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);
}
}
-
- par = par->next();
}
return toclist;
}