The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit b9f48eb945028d835ee93936a48b5fe611c6e4f9
Author: Richard Heck <rgh...@lyx.org>
Date: Fri May 10 13:17:47 2013 -0400
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.
diff --git a/lib/layouts/agu_stdsections.inc b/lib/layouts/agu_stdsections.inc
index 7ac0e91..38a8106 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=<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
diff --git a/lib/layouts/article.layout b/lib/layouts/article.layout
index 06da371..0b2b36d 100644
--- a/lib/layouts/article.layout
+++ b/lib/layouts/article.layout
@@ -25,7 +25,6 @@ Style Part
Font
Size Larger
EndFont
- TocLevel 0
End
diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index 6e0be1b..2c0ff8b 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -226,7 +226,7 @@ Style Part
LabelFont
Color Latex
EndFont
- TocLevel 0
+ TocLevel -1
End
Style Section
diff --git a/lib/layouts/db_stdsections.inc b/lib/layouts/db_stdsections.inc
index c5ec507..d78b854 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 28b6903..4034ada 100644
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -56,7 +56,6 @@ Style Part
LabelString "Short Title|S"
Tooltip "The part as it appears in the table of
contents/running headers"
EndArgument
- TocLevel -1
End
@@ -71,7 +70,6 @@ Style Chapter
Tooltip "The chapter as it appears in the running headers"
Requires 1
EndArgument
- TocLevel 0
End
@@ -93,7 +91,6 @@ Style Section
Tooltip "The section as it appears in the running headers"
Requires 1
EndArgument
- TocLevel 1
End
@@ -107,7 +104,6 @@ Style Subsection
Tooltip "The subsection as it appears in the running
headers"
Requires 1
EndArgument
- TocLevel 2
End
@@ -121,7 +117,6 @@ Style Subsubsection
Tooltip "The subsubsection as it appears in the running
headers"
Requires 1
EndArgument
- TocLevel 3
End
@@ -135,7 +130,6 @@ Style Paragraph
Tooltip "The paragraph as it appears in the running
headers"
Requires 1
EndArgument
- TocLevel 4
End
@@ -149,7 +143,6 @@ Style Subparagraph
Tooltip "The subparagraph as it appears in the running
headers"
Requires 1
EndArgument
- TocLevel 5
End
diff --git a/lib/layouts/mwart.layout b/lib/layouts/mwart.layout
index b5bf8e2..2ddaf35 100644
--- a/lib/layouts/mwart.layout
+++ b/lib/layouts/mwart.layout
@@ -9,9 +9,9 @@
Format 45
Input stdclass.inc
-NoStyle Chapter
+NoStyle Chapter
NoCounter chapter
-NoStyle Chapter*
+NoStyle Chapter*
SecNumDepth 3
TocDepth 3
@@ -29,7 +29,6 @@ Style Part
Font
Size Larger
EndFont
- TocLevel 0
End
diff --git a/lib/layouts/numreport.inc b/lib/layouts/numreport.inc
index c88fab8..08fc062 100644
--- a/lib/layouts/numreport.inc
+++ b/lib/layouts/numreport.inc
@@ -3,10 +3,6 @@
Format 45
-Style Part
- TocLevel -1
-End
-
Counter chapter
Within ""
LabelString "\arabic{chapter}"
diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout
index ac003d8..160a9ba 100644
--- a/lib/layouts/paper.layout
+++ b/lib/layouts/paper.layout
@@ -41,7 +41,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 3ee8751..403fc90 100644
--- a/lib/layouts/scrartcl.layout
+++ b/lib/layouts/scrartcl.layout
@@ -26,7 +26,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 670bb95..f8fbde5 100644
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -54,7 +54,6 @@ Style Part
Font
Family Sans
EndFont
- TocLevel 0
End
@@ -67,7 +66,6 @@ Style Chapter
Family Sans
Size Largest
EndFont
- TocLevel 0
End
@@ -76,7 +74,6 @@ Style Section
Font
Family Sans
EndFont
- TocLevel 1
End
@@ -85,7 +82,6 @@ Style Subsection
Font
Family Sans
EndFont
- TocLevel 2
End
@@ -94,7 +90,6 @@ Style Subsubsection
Font
Family Sans
EndFont
- TocLevel 3
End
@@ -103,7 +98,6 @@ Style Paragraph
Font
Family Sans
EndFont
- TocLevel 4
End
@@ -113,7 +107,6 @@ Style Subparagraph
Font
Family Sans
EndFont
- TocLevel 5
End
Input stdstarsections.inc
diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc
index 12d68e3..3b330c2 100644
--- a/lib/layouts/stdsections.inc
+++ b/lib/layouts/stdsections.inc
@@ -14,7 +14,7 @@ Style Part
Margin Dynamic
LabelString "Part \thepart"
LabelType Static
- TocLevel 0
+ TocLevel -1
LabelCounter part
LatexType Command
LatexName part
diff --git a/lib/layouts/tufte-handout.layout b/lib/layouts/tufte-handout.layout
index 2cf3abd..d456736 100644
--- a/lib/layouts/tufte-handout.layout
+++ b/lib/layouts/tufte-handout.layout
@@ -24,7 +24,7 @@ Style Part
Category Sectioning
Margin Dynamic
LabelType No_Label
- TocLevel 0
+ TocLevel -1
LatexType Command
LatexName part
NeedProtect 1
-----------------------------------------------------------------------
Summary of changes:
lib/layouts/agu_stdsections.inc | 7 -------
lib/layouts/article.layout | 1 -
lib/layouts/beamer.layout | 2 +-
lib/layouts/db_stdsections.inc | 7 -------
lib/layouts/memoir.layout | 7 -------
lib/layouts/mwart.layout | 5 ++---
lib/layouts/numreport.inc | 4 ----
lib/layouts/paper.layout | 2 +-
lib/layouts/scrartcl.layout | 1 -
lib/layouts/scrclass.inc | 7 -------
lib/layouts/stdsections.inc | 2 +-
lib/layouts/tufte-handout.layout | 2 +-
12 files changed, 6 insertions(+), 41 deletions(-)
hooks/post-receive
--
The LyX Source Repository
