#include "toc.h"
#include "buffer.h"
#include "frontends/LyXView.h"
-#include "lyxfunc.h"
#include "LyXAction.h"
#include "paragraph.h"
-#include "lyxtextclasslist.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
{
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);
+ lv_.dispatch(FuncRequest(LFUN_GOTO_PARAGRAPH, tmp));
}
TocList const getTocList(Buffer const * buf)
{
TocList toclist;
- Paragraph * par = buf->paragraph;
+ if (!buf)
+ return toclist;
+
+ LyXTextClass const & textclass = buf->params.getLyXTextClass();
- LyXTextClass const & textclass = textclasslist[buf->params.textclass];
- bool found = textclass.hasLayout("Caption");
- string const layout("Caption");
+ ParConstIterator pit = buf->par_iterator_begin();
+ ParConstIterator end = buf->par_iterator_end();
+ for (; pit != end; ++pit) {
+ Paragraph const * par = *pit;
- while (par) {
#ifdef WITH_WARNINGS
#warning bogus type (Lgb)
#endif
par->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::iterator it = par->insetlist.begin();
+ InsetList::iterator end = par->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);
}
- } else {
- lyxerr << "Caption not found" << endl;
}
-
- par = par->next();
}
return toclist;
}
} // namespace toc
-