mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-25 14:04:25 +00:00
Fix bug #8666. Parts should have toclevel -1.
A lot of this involves removing toclevel tags. They got introduced
by the automatic update of some layout files to format 19.
(cherry picked from commit b9f48eb945
)
Conflicts:
lib/layouts/beamer.layout
lib/layouts/memoir.layout
lib/layouts/scrartcl.layout
lib/layouts/stdsections.inc
This commit is contained in:
parent
e1610a86c4
commit
4492a4a0f1
@ -15,7 +15,6 @@ Style Part
|
||||
InnerTag head
|
||||
LabelTag label
|
||||
CommandDepth 0
|
||||
TocLevel 0
|
||||
End
|
||||
|
||||
|
||||
@ -25,7 +24,6 @@ Style Chapter
|
||||
InnerTag head
|
||||
LabelTag label
|
||||
CommandDepth 1
|
||||
TocLevel 0
|
||||
End
|
||||
|
||||
|
||||
@ -36,7 +34,6 @@ Style Section
|
||||
LabelTag label
|
||||
CommandDepth 2
|
||||
LatexParam "id=<s#>"
|
||||
TocLevel 1
|
||||
End
|
||||
|
||||
|
||||
@ -47,7 +44,6 @@ Style Subsection
|
||||
LabelTag label
|
||||
CommandDepth 3
|
||||
LatexParam "id=<s#>"
|
||||
TocLevel 2
|
||||
End
|
||||
|
||||
|
||||
@ -58,7 +54,6 @@ Style Subsubsection
|
||||
LabelTag label
|
||||
CommandDepth 4
|
||||
LatexParam "id=<s#>"
|
||||
TocLevel 3
|
||||
End
|
||||
|
||||
|
||||
@ -69,7 +64,6 @@ Style Paragraph
|
||||
LabelTag label
|
||||
CommandDepth 5
|
||||
LatexParam "id=<s#>"
|
||||
TocLevel 4
|
||||
End
|
||||
|
||||
|
||||
@ -80,7 +74,6 @@ Style Subparagraph
|
||||
LabelTag label
|
||||
CommandDepth 6
|
||||
LatexParam "id=<s#>"
|
||||
TocLevel 5
|
||||
End
|
||||
|
||||
Style Subsubparagraph
|
||||
|
@ -24,7 +24,6 @@ Style Part
|
||||
Font
|
||||
Size Larger
|
||||
EndFont
|
||||
TocLevel 0
|
||||
End
|
||||
|
||||
|
||||
|
@ -134,7 +134,7 @@ Style Part
|
||||
LabelFont
|
||||
Color Latex
|
||||
EndFont
|
||||
TocLevel 0
|
||||
TocLevel -1
|
||||
End
|
||||
|
||||
# Section style definition
|
||||
|
@ -14,7 +14,6 @@ Style Part
|
||||
LatexName part
|
||||
InnerTag "title"
|
||||
CommandDepth 0
|
||||
TocLevel 0
|
||||
End
|
||||
|
||||
|
||||
@ -23,7 +22,6 @@ Style Chapter
|
||||
LatexName chapter
|
||||
InnerTag "title"
|
||||
CommandDepth 1
|
||||
TocLevel 0
|
||||
End
|
||||
|
||||
|
||||
@ -32,7 +30,6 @@ Style Section
|
||||
LatexName sect1
|
||||
InnerTag "title"
|
||||
CommandDepth 2
|
||||
TocLevel 1
|
||||
End
|
||||
|
||||
|
||||
@ -41,7 +38,6 @@ Style Subsection
|
||||
LatexName sect2
|
||||
InnerTag "title"
|
||||
CommandDepth 3
|
||||
TocLevel 2
|
||||
End
|
||||
|
||||
|
||||
@ -50,7 +46,6 @@ Style Subsubsection
|
||||
LatexName sect3
|
||||
InnerTag "title"
|
||||
CommandDepth 4
|
||||
TocLevel 3
|
||||
End
|
||||
|
||||
|
||||
@ -59,7 +54,6 @@ Style Paragraph
|
||||
LatexName sect4
|
||||
InnerTag "title"
|
||||
CommandDepth 5
|
||||
TocLevel 4
|
||||
End
|
||||
|
||||
|
||||
@ -68,6 +62,5 @@ Style Subparagraph
|
||||
LatexName sect5
|
||||
InnerTag "title"
|
||||
CommandDepth 6
|
||||
TocLevel 5
|
||||
End
|
||||
|
||||
|
@ -51,14 +51,12 @@ Input numreport.inc
|
||||
|
||||
Style Part
|
||||
OptionalArgs 1
|
||||
TocLevel -1
|
||||
End
|
||||
|
||||
|
||||
|
||||
Style Chapter
|
||||
OptionalArgs 2
|
||||
TocLevel 0
|
||||
End
|
||||
|
||||
|
||||
@ -69,31 +67,26 @@ End
|
||||
|
||||
Style Section
|
||||
OptionalArgs 2
|
||||
TocLevel 1
|
||||
End
|
||||
|
||||
|
||||
Style Subsection
|
||||
OptionalArgs 2
|
||||
TocLevel 2
|
||||
End
|
||||
|
||||
|
||||
Style Subsubsection
|
||||
OptionalArgs 2
|
||||
TocLevel 3
|
||||
End
|
||||
|
||||
|
||||
Style Paragraph
|
||||
OptionalArgs 2
|
||||
TocLevel 4
|
||||
End
|
||||
|
||||
|
||||
Style Subparagraph
|
||||
OptionalArgs 2
|
||||
TocLevel 5
|
||||
End
|
||||
|
||||
|
||||
|
@ -28,7 +28,6 @@ Style Part
|
||||
Font
|
||||
Size Larger
|
||||
EndFont
|
||||
TocLevel 0
|
||||
End
|
||||
|
||||
|
||||
|
@ -3,10 +3,6 @@
|
||||
|
||||
Format 35
|
||||
|
||||
Style Part
|
||||
TocLevel -1
|
||||
End
|
||||
|
||||
Counter chapter
|
||||
Within ""
|
||||
LabelString "\arabic{chapter}"
|
||||
|
@ -25,7 +25,6 @@ Style Part
|
||||
Font
|
||||
Size Larger
|
||||
EndFont
|
||||
TocLevel 0
|
||||
End
|
||||
|
||||
Style Part*
|
||||
|
@ -52,7 +52,6 @@ Style Part
|
||||
Font
|
||||
Family Sans
|
||||
EndFont
|
||||
TocLevel 0
|
||||
End
|
||||
|
||||
|
||||
@ -61,7 +60,6 @@ Style Chapter
|
||||
Family Sans
|
||||
Size Largest
|
||||
EndFont
|
||||
TocLevel 0
|
||||
End
|
||||
|
||||
|
||||
@ -69,7 +67,6 @@ Style Section
|
||||
Font
|
||||
Family Sans
|
||||
EndFont
|
||||
TocLevel 1
|
||||
End
|
||||
|
||||
|
||||
@ -77,7 +74,6 @@ Style Subsection
|
||||
Font
|
||||
Family Sans
|
||||
EndFont
|
||||
TocLevel 2
|
||||
End
|
||||
|
||||
|
||||
@ -85,7 +81,6 @@ Style Subsubsection
|
||||
Font
|
||||
Family Sans
|
||||
EndFont
|
||||
TocLevel 3
|
||||
End
|
||||
|
||||
|
||||
@ -93,7 +88,6 @@ Style Paragraph
|
||||
Font
|
||||
Family Sans
|
||||
EndFont
|
||||
TocLevel 4
|
||||
End
|
||||
|
||||
|
||||
@ -102,7 +96,6 @@ Style Subparagraph
|
||||
Font
|
||||
Family Sans
|
||||
EndFont
|
||||
TocLevel 5
|
||||
End
|
||||
|
||||
Input stdstarsections.inc
|
||||
|
@ -23,7 +23,7 @@ Style Part
|
||||
Category Section
|
||||
Margin Dynamic
|
||||
LabelType No_Label
|
||||
TocLevel 0
|
||||
TocLevel -1
|
||||
LatexType Command
|
||||
LatexName part
|
||||
NeedProtect 1
|
||||
|
@ -63,8 +63,11 @@ What's new
|
||||
|
||||
- Fix activation of branches from command line (bug 8627).
|
||||
|
||||
- Fix display of appendix counters in some classes (bug 8666).
|
||||
|
||||
- Handle correctly undo when a branch is (de)activated.
|
||||
|
||||
|
||||
* DOCUMENTATION AND LOCALIZATION
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user