Implement IsTocCaption for normal layouts.

But use default "true" to maintain current behavior if not explicitly
stated otherwise.

Fixes: #11045

diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout
index 52b867af101d1d234fc57260df480e3dadffca91..21e117f499f7443c6c7817320810fd11d50e2139 100644 (file)
--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@@ -364,6 +364,7 @@ Style Bibliography
     Size       Larger
   EndFont
   TocLevel      1
+  IsTocCaption  0
 End
 
 

diff --git a/lib/layouts/aguplus.inc b/lib/layouts/aguplus.inc
index 57ebab331c34a47b6e886d1d60b6cd47e5ee55b2..6c23fc97a0015560a13e49fe34c7a75aaf0e605d 100644 (file)
--- a/lib/layouts/aguplus.inc
+++ b/lib/layouts/aguplus.inc
@@ -177,6 +177,7 @@ Style Bibliography
          Size                Huge
        EndFont
        TocLevel              1
+       IsTocCaption          0
 End
 
 

diff --git a/lib/layouts/agutex.layout b/lib/layouts/agutex.layout
index eacc73eac5c2929da2527e88db52d35fbc84cb58..ee812d3e9e39a4a4ec23b3a7a6fcf7afad3c1a77 100644 (file)
--- a/lib/layouts/agutex.layout
+++ b/lib/layouts/agutex.layout
@@ -228,5 +228,6 @@ Style Bibliography
          Size          Larger
        EndFont
        TocLevel        1
+       IsTocCaption    0
 End
 

diff --git a/lib/layouts/amsdefs.inc b/lib/layouts/amsdefs.inc
index 3820739bc78f05a04317573ed6937bc5b0a26da6..0744ecdd061a10eebbef1a828d9e5b8397d89796 100644 (file)
--- a/lib/layouts/amsdefs.inc
+++ b/lib/layouts/amsdefs.inc
@@ -226,4 +226,5 @@ Style Bibliography
          Shape               Smallcaps
        EndFont
        TocLevel             1
+       IsTocCaption         0
 End

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index 9d51a526c71e448dee29e224d470598b25812715..eaf2ce263de26acc99fbef68127433f1b5dadeed 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -1126,6 +1126,7 @@ Style Bibliography
     Size           Larger
   EndFont
   TocLevel         1
+  IsTocCaption     0
 End
 
 

diff --git a/lib/layouts/cl2emult.layout b/lib/layouts/cl2emult.layout
index 0dadd2af7db26e75200635091c49ba7b17e0a8ec..69e5fbbac7ff0410ea1c3606dce96f98341f5632 100644 (file)
--- a/lib/layouts/cl2emult.layout
+++ b/lib/layouts/cl2emult.layout
@@ -126,6 +126,7 @@ Style Bibliography
          Size                Larger
        EndFont
        TocLevel              1
+       IsTocCaption          0
 End
 
 

diff --git a/lib/layouts/egs.layout b/lib/layouts/egs.layout
index ac53e616ddf424f6b6c3cd376eee1ba8b1c12af5..b411c4384f9dea99d348f235c401aa9469ae7068 100644 (file)
--- a/lib/layouts/egs.layout
+++ b/lib/layouts/egs.layout
@@ -596,6 +596,7 @@ Style Bibliography
          Series              Bold
        EndFont
        TocLevel              1
+       IsTocCaption          0
 End
 
 

diff --git a/lib/layouts/elsarticle.layout b/lib/layouts/elsarticle.layout
index 42e86fec1f43b99aaab3fb4889a018abbf2e1b8d..89a6a20cd08d078f3363cb8f69f67b921bc5ec6a 100644 (file)
--- a/lib/layouts/elsarticle.layout
+++ b/lib/layouts/elsarticle.layout
@@ -326,5 +326,6 @@ Style Bibliography
          Size                  Larger
        EndFont
        TocLevel                1
+       IsTocCaption            0
 End
 

diff --git a/lib/layouts/ijmpc.layout b/lib/layouts/ijmpc.layout
index 38b43131e147cf89fdeeeb7ecb70f677ec3d20c5..0f2b25c6094e649b86bba92ec04bf473e35de9ad 100644 (file)
--- a/lib/layouts/ijmpc.layout
+++ b/lib/layouts/ijmpc.layout
@@ -468,4 +468,5 @@ Style Bibliography
     Size       Larger
   EndFont
   TocLevel      1
+  IsTocCaption  0
 End

diff --git a/lib/layouts/ijmpd.layout b/lib/layouts/ijmpd.layout
index c3835b828b8ad7775887b491a10d13bdfbca6616..e35f852bcc1cca0ea5a314472bc00ae0f750f756 100644 (file)
--- a/lib/layouts/ijmpd.layout
+++ b/lib/layouts/ijmpd.layout
@@ -481,4 +481,5 @@ Style Bibliography
     Size       Larger
   EndFont
   TocLevel      1
+  IsTocCaption  0
 End

diff --git a/lib/layouts/iopart.layout b/lib/layouts/iopart.layout
index 3ff99ef7b67508a58526b7c69a9c4896c40c383e..cea40c800f1029561efcf9401bdb8525a51d2ff4 100644 (file)
--- a/lib/layouts/iopart.layout
+++ b/lib/layouts/iopart.layout
@@ -288,6 +288,7 @@ Style "Bibliography (plain)"
          Size          Larger
        EndFont
        TocLevel        1
+       IsTocCaption    0
 End
 
 

diff --git a/lib/layouts/jasatex.layout b/lib/layouts/jasatex.layout
index 4c1f46e80c17aba84d10b2f88e5531f43ae9ba49..6dc7b2b6c456d1bda1c1300d22319572f7ba25bc 100644 (file)
--- a/lib/layouts/jasatex.layout
+++ b/lib/layouts/jasatex.layout
@@ -289,5 +289,6 @@ Style Bibliography
          Size          Larger
        EndFont
        TocLevel        1
+       IsTocCaption    0
 End
 

diff --git a/lib/layouts/kluwer.layout b/lib/layouts/kluwer.layout
index 9fed36753dd07662c15a08025d7f42878589271b..8e8ee3428b666d56f6caa60364b8588cd3d8648c 100644 (file)
--- a/lib/layouts/kluwer.layout
+++ b/lib/layouts/kluwer.layout
@@ -367,4 +367,5 @@ Style References
          Series              Bold
        EndFont
        TocLevel              1
+       IsTocCaption          0
 End

diff --git a/lib/layouts/llncs.layout b/lib/layouts/llncs.layout
index 0787825b15c7f97c0d545256b96dc1c24c7b4f73..6942f224a6744ecbba044df349e245163f66c1f4 100644 (file)
--- a/lib/layouts/llncs.layout
+++ b/lib/layouts/llncs.layout
@@ -288,6 +288,7 @@ Style Bibliography
          Series              Bold
        EndFont
        TocLevel              0
+       IsTocCaption          0
 End
 
 

diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index afcfd1e11523c58b84501fd810ffeee6ec84b1cb..03c2ed8582aa9c79d827268efe46703cb2f03a52 100644 (file)
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -520,6 +520,7 @@ Style Bibliography
          Family        Sans
        EndFont
        TocLevel        1
+       IsTocCaption    0
 End
 
 Style Recipient

diff --git a/lib/layouts/powerdot.layout b/lib/layouts/powerdot.layout
index 4c3e37edf84ad0d7792fce73115b0989e35cdc9d..f59b48b2da1c9ea3458af86bac33ec82a37a194e 100644 (file)
--- a/lib/layouts/powerdot.layout
+++ b/lib/layouts/powerdot.layout
@@ -371,7 +371,8 @@ Style Bibliography
   LabelType     Bibliography
   LabelString   ""
   LabelBottomSep 0
-  TocLevel      1
+  TocLevel       1
+  IsTocCaption   0
 End
 
 ###

diff --git a/lib/layouts/siamltex.layout b/lib/layouts/siamltex.layout
index a0f4565bb3c0746bca778aa9c6372443da1aa177..2515d4912579bff48cdaaca91b1e814d7a58e775 100644 (file)
--- a/lib/layouts/siamltex.layout
+++ b/lib/layouts/siamltex.layout
@@ -349,6 +349,7 @@ Style Bibliography
          Shape               Smallcaps
        EndFont
        TocLevel              1
+       IsTocCaption          0
 End
 
 NoStyle                 Chapter

diff --git a/lib/layouts/simplecv.layout b/lib/layouts/simplecv.layout
index 88a452f43a4945d3a4acefa9c1a346cdc1603db8..dc3654e6fee518ac2f2d1b43ec758e068bbb00f2 100644 (file)
--- a/lib/layouts/simplecv.layout
+++ b/lib/layouts/simplecv.layout
@@ -165,4 +165,5 @@ Style Bibliography
          Size                Tiny
        EndFont
        TocLevel              1
+       IsTocCaption          0
 End

diff --git a/lib/layouts/stdstruct.inc b/lib/layouts/stdstruct.inc
index b323cf37ea366146cffe7d2726e30fc3d79bdbdc..1c2c8c60edb21a877406cc727e0a8be8ee86b0f0 100644 (file)
--- a/lib/layouts/stdstruct.inc
+++ b/lib/layouts/stdstruct.inc
@@ -82,4 +82,5 @@ Style Bibliography
                span.bibitemlabel:after { content: "] "; }
        EndHTMLStyle
        TocLevel              1
+       ISTocCaption          0
 End

diff --git a/lib/layouts/svcommon.inc b/lib/layouts/svcommon.inc
index 3b1ea043ab75825ff1f848bc94a5ae2be4f2bf24..1adc110a49d77eae012ff0d817d8eace17ef7a4e 100644 (file)
--- a/lib/layouts/svcommon.inc
+++ b/lib/layouts/svcommon.inc
@@ -594,6 +594,7 @@ Style Bibliography
          Series        Bold
        EndFont
        TocLevel        0
+       IsTocCaption    0
 End
 
 Style Description

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 0a783d0aad1542fb5e2124be8c62521dd2716b3c..005acb22581fddc7a122312216e812cfdc023c23 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -120,7 +120,7 @@ enum LayoutTags {
 /////////////////////
 
 Layout::Layout()
-       : add_to_toc_(false), is_toc_caption_(false)
+       : add_to_toc_(false), is_toc_caption_(true)
 {
        unknown_ = false;
        margintype = MARGIN_STATIC;

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index bc7bbee08f3e9c968e85f836d5ccc7e0bb23b56f..5bd9224c17b17a0cc75a724b8c569f9a80636af5 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -3503,6 +3503,8 @@ void Paragraph::forOutliner(docstring & os, size_t const maxlen,
        size_t tmplen = shorten ? maxlen + 1 : maxlen;
        if (label && !labelString().empty())
                os += labelString() + ' ';
+       if (!layout().isTocCaption())
+               return;
        for (pos_type i = 0; i < size() && os.length() < tmplen; ++i) {
                if (isDeleted(i))
                        continue;