#include "Buffer.h"
#include "BufferParams.h"
+#include "debug.h"
#include "FloatList.h"
#include "FuncRequest.h"
+#include "Layout.h"
#include "LyXAction.h"
#include "Paragraph.h"
-#include "debug.h"
#include "insets/InsetOptArg.h"
#include "support/convert.h"
-
-namespace lyx {
-
-using std::vector;
using std::string;
+namespace lyx {
///////////////////////////////////////////////////////////////////////////
+//
// TocItem implementation
+//
+///////////////////////////////////////////////////////////////////////////
TocItem::TocItem(ParConstIterator const & par_it, int d,
- docstring const & s, bool child)
- : par_it_(par_it), depth_(d), str_(s), child_(child)
+ docstring const & s)
+ : par_it_(par_it), depth_(d), str_(s)
{
-/*
- if (!uid_.empty())
- return;
-
- size_t pos = s.find(" ");
- if (pos == string::npos) {
- // Non labelled item
- uid_ = s;
- return;
- }
-
- string s2 = s.substr(0, pos);
-
- if (s2 == "Chapter" || s2 == "Part") {
- size_t pos2 = s.find(" ", pos + 1);
- if (pos2 == string::npos) {
- // Unnumbered Chapter?? This should not happen.
- uid_ = s.substr(pos + 1);
- return;
- }
- // Chapter or Part
- uid_ = s.substr(pos2 + 1);
- return;
- }
- // Numbered Item.
- uid_ = s.substr(pos + 1);
- */
-}
-
-bool const TocItem::isValid() const
-{
- return depth_ != -1;
}
-int const TocItem::id() const
+int TocItem::id() const
{
return par_it_->id();
}
-int const TocItem::depth() const
+int TocItem::depth() const
{
return depth_;
}
}
-
-
-
///////////////////////////////////////////////////////////////////////////
+//
// TocBackend implementation
+//
+///////////////////////////////////////////////////////////////////////////
Toc const & TocBackend::toc(std::string const & type) const
{
void TocBackend::updateItem(ParConstIterator const & par_it)
{
- // TODO should not happen,
- // a call to TocBackend::update() is missing somewhere
- if (toc("tableofcontents").empty())
+ 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;
return;
+ }
BufferParams const & bufparams = buffer_->params();
const int min_toclevel = bufparams.getTextClass().min_toclevel();
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 =
+ Paragraph const & par =
*static_cast<InsetOptArg&>(inset).paragraphs().begin();
if (!toc_item->par_it_->getLabelstring().empty())
tocstring = toc_item->par_it_->getLabelstring() + ' ';
BufferParams const & bufparams = buffer_->params();
const int min_toclevel = bufparams.getTextClass().min_toclevel();
- // Is this a child document?
- bool const child_document = buffer_->getMasterBuffer() != buffer_;
-
Toc & toc = tocs_["tableofcontents"];
ParConstIterator pit = buffer_->par_iterator_begin();
ParConstIterator end = buffer_->par_iterator_end();
InsetList::const_iterator end = pit->insetlist.end();
for (; it != end; ++it) {
Inset & inset = *it->inset;
- inset.addToToc(tocs_, *buffer_);
+ inset.addToToc(tocs_, *buffer_, pit);
switch (inset.lyxCode()) {
- case Inset::OPTARG_CODE: {
+ case OPTARG_CODE: {
if (!tocstring.empty())
break;
- Paragraph const & par =
+ Paragraph const & par =
*static_cast<InsetOptArg&>(inset).paragraphs().begin();
if (!pit->getLabelstring().empty())
tocstring = pit->getLabelstring() + ' ';
if (tocstring.empty())
tocstring = pit->asString(*buffer_, true);
toc.push_back(TocItem(pit, toclevel - min_toclevel,
- tocstring, child_document));
+ tocstring));
}
}
}
-TocIterator const TocBackend::item(
- std::string const & type, ParConstIterator const & par_it) const
+TocIterator const TocBackend::item(std::string const & type,
+ ParConstIterator const & par_it) const
{
TocList::const_iterator toclist_it = tocs_.find(type);
// Is the type supported?
par_it_text.backwardPos();
for (; it != last; --it) {
- if (it->child_)
+ // We verify that we don't compare contents of two
+ // different document. This happens when you
+ // have parent and child documents.
+ if (&it->par_it_[0].inset() != &par_it_text[0].inset())
continue;
if (it->par_it_ <= par_it_text)
return it;