From: Richard Heck Date: Fri, 10 May 2013 17:17:47 +0000 (-0400) Subject: Fix bug #8666. Parts should have toclevel -1. X-Git-Tag: 2.0.7~105 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4492a4a0f1f1a7b5153af32834fa81a4041de87a;p=features.git 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 b9f48eb945028d835ee93936a48b5fe611c6e4f9) Conflicts: lib/layouts/beamer.layout lib/layouts/memoir.layout lib/layouts/scrartcl.layout lib/layouts/stdsections.inc --- diff --git a/lib/layouts/agu_stdsections.inc b/lib/layouts/agu_stdsections.inc index 30f6adb9a1..89541f4e1f 100644 --- a/lib/layouts/agu_stdsections.inc +++ b/lib/layouts/agu_stdsections.inc @@ -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=" - TocLevel 1 End @@ -47,7 +44,6 @@ Style Subsection LabelTag label CommandDepth 3 LatexParam "id=" - TocLevel 2 End @@ -58,7 +54,6 @@ Style Subsubsection LabelTag label CommandDepth 4 LatexParam "id=" - TocLevel 3 End @@ -69,7 +64,6 @@ Style Paragraph LabelTag label CommandDepth 5 LatexParam "id=" - TocLevel 4 End @@ -80,7 +74,6 @@ Style Subparagraph LabelTag label CommandDepth 6 LatexParam "id=" - TocLevel 5 End Style Subsubparagraph diff --git a/lib/layouts/article.layout b/lib/layouts/article.layout index b3d7fea05e..bd3d035593 100644 --- a/lib/layouts/article.layout +++ b/lib/layouts/article.layout @@ -24,7 +24,6 @@ Style Part Font Size Larger EndFont - TocLevel 0 End diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index 28c5284990..08ba18548c 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -134,7 +134,7 @@ Style Part LabelFont Color Latex EndFont - TocLevel 0 + TocLevel -1 End # Section style definition diff --git a/lib/layouts/db_stdsections.inc b/lib/layouts/db_stdsections.inc index 4b0b27392b..f110f895b6 100644 --- a/lib/layouts/db_stdsections.inc +++ b/lib/layouts/db_stdsections.inc @@ -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 diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout index 938cb26e28..e823229444 100644 --- a/lib/layouts/memoir.layout +++ b/lib/layouts/memoir.layout @@ -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 diff --git a/lib/layouts/mwart.layout b/lib/layouts/mwart.layout index bb076f4a09..f527d51ee5 100644 --- a/lib/layouts/mwart.layout +++ b/lib/layouts/mwart.layout @@ -8,9 +8,9 @@ Format 35 Input stdclass.inc -NoStyle Chapter +NoStyle Chapter NoCounter chapter -NoStyle Chapter* +NoStyle Chapter* SecNumDepth 3 TocDepth 3 @@ -28,7 +28,6 @@ Style Part Font Size Larger EndFont - TocLevel 0 End diff --git a/lib/layouts/numreport.inc b/lib/layouts/numreport.inc index 005c7a73cc..264cde0490 100644 --- a/lib/layouts/numreport.inc +++ b/lib/layouts/numreport.inc @@ -3,10 +3,6 @@ Format 35 -Style Part - TocLevel -1 -End - Counter chapter Within "" LabelString "\arabic{chapter}" diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout index 192db97a89..bd4864e583 100644 --- a/lib/layouts/paper.layout +++ b/lib/layouts/paper.layout @@ -39,7 +39,7 @@ Input stdciteformats.inc # There are no chapters in a paper. NoStyle Chapter -NoCounter chapter +NoCounter chapter NoStyle Chapter* # All the section headings now use sans serif diff --git a/lib/layouts/scrartcl.layout b/lib/layouts/scrartcl.layout index 21277a3099..a0d3d07537 100644 --- a/lib/layouts/scrartcl.layout +++ b/lib/layouts/scrartcl.layout @@ -25,7 +25,6 @@ Style Part Font Size Larger EndFont - TocLevel 0 End Style Part* diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc index 36ac811580..226fe275fa 100644 --- a/lib/layouts/scrclass.inc +++ b/lib/layouts/scrclass.inc @@ -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 diff --git a/lib/layouts/tufte-handout.layout b/lib/layouts/tufte-handout.layout index 8378e29812..b875dd97ca 100644 --- a/lib/layouts/tufte-handout.layout +++ b/lib/layouts/tufte-handout.layout @@ -23,7 +23,7 @@ Style Part Category Section Margin Dynamic LabelType No_Label - TocLevel 0 + TocLevel -1 LatexType Command LatexName part NeedProtect 1 diff --git a/status.20x b/status.20x index aa9cd83bd8..325876d68f 100644 --- a/status.20x +++ b/status.20x @@ -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