anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement IsTocCaption for normal layouts.

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

Fixes: #11045
(cherry picked from commit 8a703573ea)
This commit is contained in:
Juergen Spitzmueller 2018-02-21 16:37:07 +01:00
parent 31c7ce19fb
commit 721cc085a2
23 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/layouts/IEEEtran.layout
View File

@ -364,6 +364,7 @@ Style Bibliography
Size Larger
EndFont
TocLevel 1
IsTocCaption 0
End

1
lib/layouts/aguplus.inc
View File

@ -177,6 +177,7 @@ Style Bibliography
Size Huge
EndFont
TocLevel 1
IsTocCaption 0
End

1
lib/layouts/agutex.layout
View File

@ -228,5 +228,6 @@ Style Bibliography
Size Larger
EndFont
TocLevel 1
IsTocCaption 0
End

1
lib/layouts/amsdefs.inc
View File

@ -226,4 +226,5 @@ Style Bibliography
Shape Smallcaps
EndFont
TocLevel 1
IsTocCaption 0
End

1
lib/layouts/beamer.layout
View File

@ -1126,6 +1126,7 @@ Style Bibliography
Size Larger
EndFont
TocLevel 1
IsTocCaption 0
End

1
lib/layouts/cl2emult.layout
View File

@ -126,6 +126,7 @@ Style Bibliography
Size Larger
EndFont
TocLevel 1
IsTocCaption 0
End

1
lib/layouts/egs.layout
View File

@ -596,6 +596,7 @@ Style Bibliography
Series Bold
EndFont
TocLevel 1
IsTocCaption 0
End

1
lib/layouts/elsarticle.layout
View File

@ -326,5 +326,6 @@ Style Bibliography
Size Larger
EndFont
TocLevel 1
IsTocCaption 0
End

1
lib/layouts/ijmpc.layout
View File

@ -468,4 +468,5 @@ Style Bibliography
Size Larger
EndFont
TocLevel 1
IsTocCaption 0
End

1
lib/layouts/ijmpd.layout
View File

@ -481,4 +481,5 @@ Style Bibliography
Size Larger
EndFont
TocLevel 1
IsTocCaption 0
End

1
lib/layouts/iopart.layout
View File

@ -288,6 +288,7 @@ Style "Bibliography (plain)"
Size Larger
EndFont
TocLevel 1
IsTocCaption 0
End

1
lib/layouts/jasatex.layout
View File

@ -289,5 +289,6 @@ Style Bibliography
Size Larger
EndFont
TocLevel 1
IsTocCaption 0
End

1
lib/layouts/kluwer.layout
View File

@ -367,4 +367,5 @@ Style References
Series Bold
EndFont
TocLevel 1
IsTocCaption 0
End

1
lib/layouts/llncs.layout
View File

@ -288,6 +288,7 @@ Style Bibliography
Series Bold
EndFont
TocLevel 0
IsTocCaption 0
End

1
lib/layouts/moderncv.layout
View File

@ -520,6 +520,7 @@ Style Bibliography
Family Sans
EndFont
TocLevel 1
IsTocCaption 0
End
Style Recipient

3
lib/layouts/powerdot.layout
View File

@ -371,7 +371,8 @@ Style Bibliography
LabelType Bibliography
LabelString ""
LabelBottomSep 0
TocLevel 1
TocLevel 1
IsTocCaption 0
End
###

1
lib/layouts/siamltex.layout
View File

@ -349,6 +349,7 @@ Style Bibliography
Shape Smallcaps
EndFont
TocLevel 1
IsTocCaption 0
End
NoStyle Chapter

1
lib/layouts/simplecv.layout
View File

@ -165,4 +165,5 @@ Style Bibliography
Size Tiny
EndFont
TocLevel 1
IsTocCaption 0
End

1
lib/layouts/stdstruct.inc
View File

@ -82,4 +82,5 @@ Style Bibliography
span.bibitemlabel:after { content: "] "; }
EndHTMLStyle
TocLevel 1
ISTocCaption 0
End

1
lib/layouts/svcommon.inc
View File

@ -594,6 +594,7 @@ Style Bibliography
Series Bold
EndFont
TocLevel 0
IsTocCaption 0
End
Style Description

2
src/Layout.cpp
View File

@ -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;

2
src/Paragraph.cpp
View File

@ -3510,6 +3510,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;

3
status.23x
View File

@ -70,6 +70,9 @@ What's new
- Save the list of recent files when a file is open/saved so that it
is up to date after a crash (bug 10712).
- Only show header for bibliography in outliner (bug 11045).
* INTERNALS