#include "support/debug.h"
#include "support/docstream.h"
+#include "support/lassert.h"
+
using namespace std;
+
namespace lyx {
///////////////////////////////////////////////////////////////////////////
{
// Is the type already supported?
TocList::const_iterator it = tocs_.find(type);
- BOOST_ASSERT(it != tocs_.end());
+ LASSERT(it != tocs_.end(), /**/);
return it->second;
}
}
BufferParams const & bufparams = buffer_->params();
- const int min_toclevel = bufparams.getTextClass().min_toclevel();
+ const int min_toclevel = bufparams.documentClass().min_toclevel();
TocIterator toc_item = item("tableofcontents", par_it);
*static_cast<InsetOptArg&>(inset).paragraphs().begin();
if (!toc_item->par_it_->labelString().empty())
tocstring = toc_item->par_it_->labelString() + ' ';
- tocstring += par.asString(*buffer_, false);
+ tocstring += par.asString(false);
break;
}
}
- int const toclevel = toc_item->par_it_->layout()->toclevel;
- if (toclevel != Layout::NOT_IN_TOC
- && toclevel >= min_toclevel
+ int const toclevel = toc_item->par_it_->layout().toclevel;
+ if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel
&& tocstring.empty())
- tocstring = toc_item->par_it_->asString(*buffer_, true);
+ tocstring = toc_item->par_it_->asString(true);
const_cast<TocItem &>(*toc_item).str_ = tocstring;
}
tocs_.clear();
BufferParams const & bufparams = buffer_->params();
- const int min_toclevel = bufparams.getTextClass().min_toclevel();
+ const int min_toclevel = bufparams.documentClass().min_toclevel();
Toc & toc = tocs_["tableofcontents"];
ParConstIterator pit = buffer_->par_iterator_begin();
InsetList::const_iterator end = pit->insetList().end();
for (; it != end; ++it) {
Inset & inset = *it->inset;
- inset.addToToc(*buffer_, pit);
+ //lyxerr << (void*)&inset << " code: " << inset.lyxCode() << std::endl;
+ inset.addToToc(pit);
switch (inset.lyxCode()) {
case OPTARG_CODE: {
if (!tocstring.empty())
*static_cast<InsetOptArg&>(inset).paragraphs().begin();
if (!pit->labelString().empty())
tocstring = pit->labelString() + ' ';
- tocstring += par.asString(*buffer_, false);
+ tocstring += par.asString(false);
break;
}
default:
}
/// now the toc entry for the paragraph
- int const toclevel = pit->layout()->toclevel;
+ int const toclevel = pit->layout().toclevel;
if (toclevel != Layout::NOT_IN_TOC
&& toclevel >= min_toclevel) {
// insert this into the table of contents
if (tocstring.empty())
- tocstring = pit->asString(*buffer_, true);
+ tocstring = pit->asString(true);
toc.push_back(TocItem(pit, toclevel - min_toclevel,
tocstring));
}
{
TocList::const_iterator toclist_it = tocs_.find(type);
// Is the type supported?
- BOOST_ASSERT(toclist_it != tocs_.end());
+ LASSERT(toclist_it != tocs_.end(), /**/);
Toc const & toc_vector = toclist_it->second;
TocIterator last = toc_vector.begin();