unify toclevel for articles and reports/books; proper numbering of Paragraph/SubParag...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9830 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 241b08acad39fdb65641b2c5e28c91f0550997f5..72ed85e8ccbcfedb369bf24e5a7c59000d581598 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,14 @@
+2005-04-14  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * layouts/scrclass.inc: do not assign a toclevel to addchap or
+       addsec. 
+
+       * layouts/numreport.inc: use data from numarticle.inc, so that
+       changes from article are obvious.
+
+       * layouts/numarticle.inc: add numbering stuff for Paragraph and
+       SubParagraph; set Part TocLevel to 0.
+
 2005-04-18  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * ui/stdtoolbars.ui:

diff --git a/lib/layouts/numarticle.inc b/lib/layouts/numarticle.inc
index 7c29c2c9dc0d95f30e4f639195b0f81380f7edff..641cfbb7b774f2576b81f900b9ea29faa2a699d9 100644 (file)
--- a/lib/layouts/numarticle.inc
+++ b/lib/layouts/numarticle.inc
@@ -1,10 +1,11 @@
 # Author : André Pönitz
-# This include files contains label definitions for a article-like numbering.
+# This include file contains label definitions for an article-like numbering.
 
 Style Part
        LabelType             Counter
        LabelCounter          part
        LabelString           "Part \Roman{part}"
+       TocLevel              0
 End
 
 
@@ -36,10 +37,18 @@ End
 
 
 Style Paragraph
+       LabelType             Counter
+       LabelCounter          paragraph
+       LabelString           "@Subsubsection@.\arabic{paragraph}"
+       LabelStringAppendix   "@Subsubsection@.\arabic{paragraph}"
        TocLevel              4
 End
 
 
 Style Subparagraph
+       LabelType             Counter
+       LabelCounter          subparagraph
+       LabelString           "@Paragraph@.\arabic{subparagraph}"
+       LabelStringAppendix   "@Paragraph@.\arabic{subparagraph}"
        TocLevel              5
 End

diff --git a/lib/layouts/numreport.inc b/lib/layouts/numreport.inc
index 6d7b5085332ab8a177fecd8b4af94f98cadb274f..c337987feb404622c6a6cc051d742953fb8150cf 100644 (file)
--- a/lib/layouts/numreport.inc
+++ b/lib/layouts/numreport.inc
@@ -1,10 +1,10 @@
 # Author : André Pönitz
-# This include files contains a label definitions for a report-like numbering.
+# This include file contains label definitions for a report-like numbering.
+
+Input numarticle.inc
 
 Style Part
-       LabelType             Counter
-       LabelCounter          part
-       LabelString           "Part \Roman{part}"
+       TocLevel              -1
 End
 
 
@@ -13,42 +13,12 @@ Style Chapter
        LabelCounter          chapter
        LabelString           "Chapter \arabic{chapter}"
        LabelStringAppendix   "Appendix \Alph{chapter}"
-       TocLevel              1
+       TocLevel              0
 End
 
 
 Style Section
-       LabelType             Counter
-       LabelCounter          section
        LabelString           "\arabic{chapter}.\arabic{section}"
        LabelStringAppendix   "\Alph{chapter}.\arabic{section}"
-       TocLevel              2
-End
-
-
-Style Subsection
-       LabelType             Counter
-       LabelCounter          subsection
-       LabelString           "@Section@.\arabic{subsection}"
-       LabelStringAppendix   "@Section@.\arabic{subsection}"
-       TocLevel              3
-End
-
-
-Style Subsubsection
-       LabelType             Counter
-       LabelCounter          subsubsection
-       LabelString           "@Subsection@.\arabic{subsubsection}"
-       LabelStringAppendix   "@Subsection@.\arabic{subsubsection}"
-       TocLevel              4
-End
-
-
-Style Paragraph
-       TocLevel              5
 End
 
-
-Style Subparagraph
-       TocLevel              6
-End

diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index 5f4d01a3e2a5d5f24aef4fc3d700706efd67ce43..d7c054fcc3aeb766825c0cd6bd5a382c10b1def5 100644 (file)
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -109,14 +109,12 @@ End
 Style Addchap
        CopyStyle             Chapter*
        LatexName             addchap
-       TocLevel              1
 End
 
 
 Style Addsec
        CopyStyle             Section*
        LatexName             addsec
-       TocLevel              2
 End