mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Implement IsTocCaption for normal layouts.
But use default "true" to maintain current behavior if not explicitly stated otherwise. Fixes: #11045
This commit is contained in:
parent
8adba3896c
commit
8a703573ea
@ -364,6 +364,7 @@ Style Bibliography
|
||||
Size Larger
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
||||
|
||||
|
@ -177,6 +177,7 @@ Style Bibliography
|
||||
Size Huge
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
||||
|
||||
|
@ -228,5 +228,6 @@ Style Bibliography
|
||||
Size Larger
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
||||
|
@ -226,4 +226,5 @@ Style Bibliography
|
||||
Shape Smallcaps
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
@ -1126,6 +1126,7 @@ Style Bibliography
|
||||
Size Larger
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
||||
|
||||
|
@ -126,6 +126,7 @@ Style Bibliography
|
||||
Size Larger
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
||||
|
||||
|
@ -596,6 +596,7 @@ Style Bibliography
|
||||
Series Bold
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
||||
|
||||
|
@ -326,5 +326,6 @@ Style Bibliography
|
||||
Size Larger
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
||||
|
@ -468,4 +468,5 @@ Style Bibliography
|
||||
Size Larger
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
@ -481,4 +481,5 @@ Style Bibliography
|
||||
Size Larger
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
@ -288,6 +288,7 @@ Style "Bibliography (plain)"
|
||||
Size Larger
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
||||
|
||||
|
@ -289,5 +289,6 @@ Style Bibliography
|
||||
Size Larger
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
||||
|
@ -367,4 +367,5 @@ Style References
|
||||
Series Bold
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
@ -288,6 +288,7 @@ Style Bibliography
|
||||
Series Bold
|
||||
EndFont
|
||||
TocLevel 0
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
||||
|
||||
|
@ -520,6 +520,7 @@ Style Bibliography
|
||||
Family Sans
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
||||
Style Recipient
|
||||
|
@ -371,7 +371,8 @@ Style Bibliography
|
||||
LabelType Bibliography
|
||||
LabelString ""
|
||||
LabelBottomSep 0
|
||||
TocLevel 1
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
||||
###
|
||||
|
@ -349,6 +349,7 @@ Style Bibliography
|
||||
Shape Smallcaps
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
||||
NoStyle Chapter
|
||||
|
@ -165,4 +165,5 @@ Style Bibliography
|
||||
Size Tiny
|
||||
EndFont
|
||||
TocLevel 1
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
@ -82,4 +82,5 @@ Style Bibliography
|
||||
span.bibitemlabel:after { content: "] "; }
|
||||
EndHTMLStyle
|
||||
TocLevel 1
|
||||
ISTocCaption 0
|
||||
End
|
||||
|
@ -594,6 +594,7 @@ Style Bibliography
|
||||
Series Bold
|
||||
EndFont
|
||||
TocLevel 0
|
||||
IsTocCaption 0
|
||||
End
|
||||
|
||||
Style Description
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user