using std::vector;
using std::max;
using std::ostream;
+using std::string;
namespace lyx {
namespace toc {
}
-int TocItem::action() const
+FuncRequest TocItem::action() const
{
- return lyxaction.getPseudoAction(LFUN_GOTO_PARAGRAPH,
- tostr(id_));
+ return FuncRequest(LFUN_GOTO_PARAGRAPH, tostr(id_));
}
TocList toclist;
BufferParams const & bufparams = buf.params();
- LyXTextClass const & textclass = bufparams.getLyXTextClass();
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 + bufparams.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));
+
+ int const toclevel = pit->layout()->toclevel;
+ if (toclevel > 0 && toclevel <= bufparams.tocdepth) {
+ // insert this into the table of contents
+ TocItem const item(pit->id(), toclevel - 1, pit->asString(buf, true));
toclist["TOC"].push_back(item);
}