#include "BufferParams.h"
#include "FloatList.h"
#include "FuncRequest.h"
+#include "InsetList.h"
+#include "Layout.h"
#include "LyXAction.h"
#include "Paragraph.h"
-#include "debug.h"
+#include "TextClass.h"
#include "insets/InsetOptArg.h"
#include "support/convert.h"
+#include "support/debug.h"
+#include "support/docstream.h"
+
+#include <boost/assert.hpp>
+
+using namespace std;
-using std::string;
namespace lyx {
///////////////////////////////////////////////////////////////////////////
+//
// TocItem implementation
+//
+///////////////////////////////////////////////////////////////////////////
-TocItem::TocItem(ParConstIterator const & par_it, int d,
- docstring const & s)
- : par_it_(par_it), depth_(d), str_(s)
+TocItem::TocItem(ParConstIterator const & par_it, int d, docstring const & s)
+ : par_it_(par_it), depth_(d), str_(s)
{
}
///////////////////////////////////////////////////////////////////////////
+//
// TocBackend implementation
+//
+///////////////////////////////////////////////////////////////////////////
-Toc const & TocBackend::toc(std::string const & type) const
+Toc const & TocBackend::toc(string const & type) const
{
// Is the type already supported?
TocList::const_iterator it = tocs_.find(type);
}
+Toc & TocBackend::toc(string const & type)
+{
+ return tocs_[type];
+}
+
+
void TocBackend::updateItem(ParConstIterator const & par_it)
{
if (toc("tableofcontents").empty()) {
// FIXME: should not happen,
// a call to TocBackend::update() is missing somewhere
- lyxerr << "TocBackend::updateItem called but the TOC is empty!"
- << std::endl;
+ LYXERR0("TocBackend::updateItem called but the TOC is empty!");
return;
}
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);
// For each paragraph, traverse its insets and let them add
// their toc items
- InsetList::const_iterator it = toc_item->par_it_->insetlist.begin();
- InsetList::const_iterator end = toc_item->par_it_->insetlist.end();
+ InsetList::const_iterator it = toc_item->par_it_->insetList().begin();
+ InsetList::const_iterator end = toc_item->par_it_->insetList().end();
for (; it != end; ++it) {
Inset & inset = *it->inset;
- if (inset.lyxCode() == Inset::OPTARG_CODE) {
+ if (inset.lyxCode() == OPTARG_CODE) {
if (!tocstring.empty())
break;
Paragraph const & par =
*static_cast<InsetOptArg&>(inset).paragraphs().begin();
- if (!toc_item->par_it_->getLabelstring().empty())
- tocstring = toc_item->par_it_->getLabelstring() + ' ';
- tocstring += par.asString(*buffer_, false);
+ if (!toc_item->par_it_->labelString().empty())
+ tocstring = toc_item->par_it_->labelString() + ' ';
+ 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();
// For each paragraph, traverse its insets and let them add
// their toc items
- InsetList::const_iterator it = pit->insetlist.begin();
- InsetList::const_iterator end = pit->insetlist.end();
+ InsetList::const_iterator it = pit->insetList().begin();
+ InsetList::const_iterator end = pit->insetList().end();
for (; it != end; ++it) {
Inset & inset = *it->inset;
- inset.addToToc(tocs_, *buffer_, pit);
+ //lyxerr << (void*)&inset << " code: " << inset.lyxCode() << std::endl;
+ inset.addToToc(pit);
switch (inset.lyxCode()) {
- case Inset::OPTARG_CODE: {
+ case OPTARG_CODE: {
if (!tocstring.empty())
break;
Paragraph const & par =
*static_cast<InsetOptArg&>(inset).paragraphs().begin();
- if (!pit->getLabelstring().empty())
- tocstring = pit->getLabelstring() + ' ';
- tocstring += par.asString(*buffer_, false);
+ if (!pit->labelString().empty())
+ tocstring = pit->labelString() + ' ';
+ 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));
}
}
-TocIterator const TocBackend::item(std::string const & type,
+TocIterator TocBackend::item(string const & type,
ParConstIterator const & par_it) const
{
TocList::const_iterator toclist_it = tocs_.find(type);
--it;
ParConstIterator par_it_text = par_it;
- if (par_it_text.inMathed())
- // It would be better to do
- // par_it_text.backwardInset();
- // but this method does not exist.
+ if (par_it_text.inMathed()) {
+ // We are only interested in text so remove the math CursorSlice.
while (par_it_text.inMathed())
- par_it_text.backwardPos();
+ par_it_text.pop_back();
+ }
for (; it != last; --it) {
// We verify that we don't compare contents of two
TocIterator ccit = cit->second.begin();
TocIterator end = cit->second.end();
for (; ccit != end; ++ccit)
- os << ccit->asString() << '\n';
+ os << ccit->asString() << from_utf8("\n");
}
}
projects / lyx.git / blobdiff