Fix toc generation after rev25096.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25097 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index d8b2fd7cbc76aadd6e19441f7829da2f3b01c606..02537c05f60353e75903f4de61e51b2bca2ea906 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -279,6 +279,8 @@ void InsetBranch::addToToc(DocIterator const & cpit)
        Toc & toc = buffer().tocBackend().toc("branch");
        docstring const str = params_.branch + ": " + text_.getPar(0).asString();
        toc.push_back(TocItem(pit, 0, str));
+       // Proceed with the rest of the inset.
+       InsetCollapsable::addToToc(cpit);
 }
 
 

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 7dca728ee8ff32f441e13d44648ec82255362a5e..b00588f0b45597dfee4d2ae2def86c50c3f64e6e 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -113,6 +113,9 @@ void InsetCaption::addToToc(DocIterator const & cpit)
        Toc & toc = buffer().tocBackend().toc(type_);
        docstring const str = full_label_ + ". " + text_.getPar(0).asString();
        toc.push_back(TocItem(pit, 0, str));
+
+       // Proceed with the rest of the inset.
+       InsetText::addToToc(cpit);
 }
 
 

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index 9b5e1f65a8aed49c8801dc3cb73bd8168b310355..708eb3d1f86ef5d732f8e9dc0b89aecc04a3d83b 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -73,6 +73,8 @@ void InsetFoot::addToToc(DocIterator const & cpit)
        docstring str;
        str = custom_label_ + ": " + getNewLabel(str);
        toc.push_back(TocItem(pit, 0, str));
+       // Proceed with the rest of the inset.
+       InsetFootlike::addToToc(cpit);
 }
 
 

diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index 9733467679e0d8c2ba355f15abc659ca76f6e8f9..d56fa4a5b13ed1f06eb76b2fc525a6c49704baee 100644 (file)
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -102,6 +102,8 @@ void InsetIndex::addToToc(DocIterator const & cpit)
        docstring str;
        str = getNewLabel(str);
        toc.push_back(TocItem(pit, 0, str));
+       // Proceed with the rest of the inset.
+       InsetCollapsable::addToToc(cpit);
 }
 
 

diff --git a/src/insets/InsetMarginal.cpp b/src/insets/InsetMarginal.cpp
index d9deba880afb1d210403be8b8a08db8395acbfee..9a21a89a788d14207ad85569f2ab7dd2e6b8e754 100644 (file)
--- a/src/insets/InsetMarginal.cpp
+++ b/src/insets/InsetMarginal.cpp
@@ -75,6 +75,8 @@ void InsetMarginal::addToToc(DocIterator const & cpit)
        docstring str;
        str = getNewLabel(str);
        toc.push_back(TocItem(pit, 0, str));
+       // Proceed with the rest of the inset.
+       InsetFootlike::addToToc(cpit);
 }
 
 } // namespace lyx

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index c44d637a56ca55a1e2ba718ebca2233f71a52d80..92c44eec175507156d4d5e7b7d623ffe8831424b 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -231,6 +231,8 @@ void InsetNote::addToToc(DocIterator const & cpit)
        str = notetranslator_loc().find(params_.type) + from_ascii(": ")
                + getNewLabel(str);
        toc.push_back(TocItem(pit, 0, str));
+       // Proceed with the rest of the inset.
+       InsetCollapsable::addToToc(cpit);
 }
 
 

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 89216ba1c902e3849ca48559926ea2cccfeb7d6f..3ac62e8f2d894c56f5eaa05173f2058d804843cf 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -426,11 +426,6 @@ ParagraphList & InsetText::paragraphs()
 }
 
 
-//void InsetInclude::addToToc(DocIterator const & cpit)
-//{
-//}
-
-
 void InsetText::updateLabels(ParIterator const & it)
 {
        ParIterator it2 = it;