From: Richard Heck Date: Mon, 6 Oct 2008 14:58:22 +0000 (+0000) Subject: Update counter containing files to new format. X-Git-Tag: 1.6.10~3138 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b32b4a545c3d4b5e6b3b22b1339360a7ed07ae07;p=lyx.git Update counter containing files to new format. Actually, not all of these do contain counters, but my grepping wasn't sophisticated enough to catch them. Not a big deal.... I don't think there are errors here, but if you see weird behavior with counters in some file or other, it's possible I missed something. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26782 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/lib/layouts/agu_stdcounters.inc b/lib/layouts/agu_stdcounters.inc index 260191ba15..c1a8b72bf0 100644 --- a/lib/layouts/agu_stdcounters.inc +++ b/lib/layouts/agu_stdcounters.inc @@ -4,32 +4,26 @@ # This include file contains all the counters that are defined as standard # in AGU-Article LyX layouts. -Format 9 -Counter - Name sect1 +Format 10 +Counter sect1 Within section End -Counter - Name sect2 +Counter sect2 Within sect1 End -Counter - Name sect3 +Counter sect3 Within sect2 End -Counter - Name sect4 +Counter sect4 Within sect3 End -Counter - Name sect5 +Counter sect5 Within sect4 End -Counter - Name p +Counter p End diff --git a/lib/layouts/aguplus.inc b/lib/layouts/aguplus.inc index f9ab418fa4..cabe6d1c9c 100644 --- a/lib/layouts/aguplus.inc +++ b/lib/layouts/aguplus.inc @@ -6,7 +6,7 @@ # ftp://ftp.agu.org/journals/latex/journals -Format 9 +Format 10 Input stdclass.inc SecNumDepth 4 @@ -214,13 +214,11 @@ Style Table_Caption End -Counter - Name plate +Counter plate Within none End -Counter - Name planotable +Counter planotable Within none End diff --git a/lib/layouts/amsbook.layout b/lib/layouts/amsbook.layout index 1de5ec9ce6..c35f429c0b 100644 --- a/lib/layouts/amsbook.layout +++ b/lib/layouts/amsbook.layout @@ -10,7 +10,7 @@ # Modularized Jan '08 by Richard Heck -Format 9 +Format 10 Columns 1 Sides 2 PageStyle Headers diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout index d81572b718..cc14648afe 100644 --- a/lib/layouts/apa.layout +++ b/lib/layouts/apa.layout @@ -2,7 +2,7 @@ # \DeclareLaTeXClass[apa,apacite.sty]{article (APA)} # Author: Randy Gobbel -Format 9 +Format 10 Columns 1 Sides 1 PageStyle Headers diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index 08bd1c4df1..3d4ab4916f 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -5,15 +5,14 @@ # $Header: /cvsroot/latex-beamer/latex-beamer/lyx/layouts/beamer.layout,v 1.16 2004/10/07 20:53:07 tantau Exp $ # Includes -Format 9 +Format 10 Input stdcounters.inc Input stdinsets.inc # local counters # Is this needed? Could probably go -- MV 16/05/2007 -Counter - Name figure +Counter figure Name lyxframeend{}\section End diff --git a/lib/layouts/broadway.layout b/lib/layouts/broadway.layout index 4c134ba8a6..989fdfc4ad 100644 --- a/lib/layouts/broadway.layout +++ b/lib/layouts/broadway.layout @@ -3,7 +3,7 @@ # For theater plays -Format 9 +Format 10 Columns 1 Sides 1 SecNumDepth 2 @@ -20,13 +20,11 @@ Input stdfloats.inc Input stdcounters.inc # Input lyxmacros.inc -Counter - Name act +Counter act End -Counter - Name scene +Counter scene End diff --git a/lib/layouts/db_stdcounters.inc b/lib/layouts/db_stdcounters.inc index bed70b04e0..dccf87883a 100644 --- a/lib/layouts/db_stdcounters.inc +++ b/lib/layouts/db_stdcounters.inc @@ -4,29 +4,24 @@ # This include file contains all the counters that are defined as standard # in Docbook LyX layouts. -Format 9 -Counter - Name sect1 +Format 10 +Counter sect1 Within chapter End -Counter - Name sect2 +Counter sect2 Within sect1 End -Counter - Name sect3 +Counter sect3 Within sect2 End -Counter - Name sect4 +Counter sect4 Within sect3 End -Counter - Name sect5 +Counter sect5 Within sect4 End diff --git a/lib/layouts/elsart.layout b/lib/layouts/elsart.layout index 4a9764f3e3..3fe3c2db0a 100644 --- a/lib/layouts/elsart.layout +++ b/lib/layouts/elsart.layout @@ -22,7 +22,7 @@ # numbered sections, as does the class file. -Format 9 +Format 10 Columns 1 Sides 2 PageStyle headings @@ -36,13 +36,11 @@ End TitleLatexType Environment TitleLatexName frontmatter -Counter - Name summ +Counter summ End -Counter - Name case +Counter case End @@ -251,8 +249,7 @@ End # - Acknowledgement # - Case -Counter - Name theorem +Counter theorem End diff --git a/lib/layouts/ijmpc.layout b/lib/layouts/ijmpc.layout index 8e066fcee5..145d7cd49c 100644 --- a/lib/layouts/ijmpc.layout +++ b/lib/layouts/ijmpc.layout @@ -9,7 +9,7 @@ # # Version 1 2006-04-09 - First version, for LyX 1.4.0. -Format 9 +Format 10 Input stdclass.inc Input numarticle.inc @@ -126,8 +126,7 @@ Style Subsubsection EndFont End -Counter - Name definition +Counter definition End Style Definition LatexType Environment @@ -146,8 +145,7 @@ Style Definition EndFont End -Counter - Name step +Counter step End Style Step CopyStyle Definition @@ -160,8 +158,7 @@ Style Step EndFont End -Counter - Name example +Counter example End Style Example CopyStyle Definition @@ -170,8 +167,7 @@ Style Example LabelString "Example \theexample." End -Counter - Name remark +Counter remark End Style Remark CopyStyle Definition @@ -180,8 +176,7 @@ Style Remark LabelString "Remark \theremark." End -Counter - Name notation +Counter notation End Style Notation CopyStyle Definition @@ -190,8 +185,7 @@ Style Notation LabelString "Notation \thenotation." End -Counter - Name theorem +Counter theorem End Style Theorem LatexType Environment @@ -230,8 +224,7 @@ Style Proof EndLabelType Box End -Counter - Name corollary +Counter corollary End Style Corollary CopyStyle Theorem @@ -240,8 +233,7 @@ Style Corollary LabelString "Corollary \thecorollary." End -Counter - Name lemma +Counter lemma End Style Lemma CopyStyle Theorem @@ -250,8 +242,7 @@ Style Lemma LabelString "Lemma \thelemma." End -Counter - Name proposition +Counter proposition End Style Proposition CopyStyle Theorem @@ -260,8 +251,7 @@ Style Proposition LabelString "Proposition \theproposition." End -Counter - Name prop +Counter prop End Style Prop CopyStyle Definition @@ -270,8 +260,7 @@ Style Prop LabelString "Prop \theprop." End -Counter - Name question +Counter question End Style Question CopyStyle Definition @@ -280,8 +269,7 @@ Style Question LabelString "Question \thequestion." End -Counter - Name claim +Counter claim End Style Claim CopyStyle Theorem @@ -290,8 +278,7 @@ Style Claim LabelString "Claim \theclaim." End -Counter - Name conjecture +Counter conjecture End Style Conjecture CopyStyle Theorem @@ -317,8 +304,7 @@ Style Appendices_Section EndFont End -Counter - Name appendix +Counter appendix End Style Appendix LatexType Command diff --git a/lib/layouts/ijmpd.layout b/lib/layouts/ijmpd.layout index 78d7c117b8..0a6c40854f 100644 --- a/lib/layouts/ijmpd.layout +++ b/lib/layouts/ijmpd.layout @@ -12,7 +12,7 @@ # Version 3 2006-04-09 - Updated for LyX 1.4.0; all environments defined by # ijmpd are now supported by LyX. -Format 9 +Format 10 Input stdclass.inc Input numarticle.inc @@ -122,8 +122,7 @@ Style Subsubsection EndFont End -Counter - Name definition +Counter definition Within section End Style Definition @@ -143,8 +142,7 @@ Style Definition EndFont End -Counter - Name step +Counter step End Style Step CopyStyle Definition @@ -156,8 +154,7 @@ Style Step EndFont End -Counter - Name example +Counter example Within section End Style Example @@ -167,8 +164,7 @@ Style Example LabelString "Example \theexample." End -Counter - Name remark +Counter remark Within section End Style Remark @@ -178,8 +174,7 @@ Style Remark LabelString "Remark \theremark." End -Counter - Name notation +Counter notation Within section End Style Notation @@ -192,8 +187,7 @@ Style Notation EndFont End -Counter - Name theorem +Counter theorem Within section End Style Theorem @@ -230,8 +224,7 @@ Style Proof EndLabelType Box End -Counter - Name corollary +Counter corollary Within section End Style Corollary @@ -244,8 +237,7 @@ Style Corollary EndFont End -Counter - Name lemma +Counter lemma Within section End Style Lemma @@ -255,8 +247,7 @@ Style Lemma LabelString "Lemma \thelemma." End -Counter - Name proposition +Counter proposition Within section End Style Proposition @@ -266,8 +257,7 @@ Style Proposition LabelString "Proposition \theproposition." End -Counter - Name prop +Counter prop Within section End Style Prop @@ -277,8 +267,7 @@ Style Prop LabelString "Prop \theprop." End -Counter - Name question +Counter question Within section End Style Question @@ -288,8 +277,7 @@ Style Question LabelString "Question \thequestion." End -Counter - Name claim +Counter claim Within section End Style Claim @@ -299,8 +287,7 @@ Style Claim LabelString "Claim \theclaim." End -Counter - Name conjecture +Counter conjecture Within section End Style Conjecture @@ -327,8 +314,7 @@ Style Appendices_Section EndFont End -Counter - Name appendix +Counter appendix Within section End Style Appendix diff --git a/lib/layouts/manpage.layout b/lib/layouts/manpage.layout index c9b73988e1..bfa7376b6e 100644 --- a/lib/layouts/manpage.layout +++ b/lib/layouts/manpage.layout @@ -4,7 +4,7 @@ # Author : José Matos -Format 9 +Format 10 Columns 1 Sides 1 PageStyle Plain diff --git a/lib/layouts/numarticle.inc b/lib/layouts/numarticle.inc index 678fe24577..3c97119662 100644 --- a/lib/layouts/numarticle.inc +++ b/lib/layouts/numarticle.inc @@ -1,11 +1,10 @@ # Author : André Pönitz # This include file contains label definitions for an article-like numbering. -Format 9 +Format 10 # appendix applies to sections. -Counter - Name section +Counter section Within "none" LabelString "\arabic{section}" LabelStringAppendix "\Alph{section}" diff --git a/lib/layouts/numreport.inc b/lib/layouts/numreport.inc index 52fe0506ae..9afa350033 100644 --- a/lib/layouts/numreport.inc +++ b/lib/layouts/numreport.inc @@ -1,21 +1,19 @@ # Author : André Pönitz # This include file contains label definitions for a report-like numbering. -Format 9 +Format 10 Style Part TocLevel -1 End -Counter - Name chapter +Counter chapter Within "" LabelString "\arabic{chapter}" LabelStringAppendix "\Alph{chapter}" End -Counter - Name section +Counter section Within chapter LabelString "" End @@ -37,13 +35,11 @@ Float NumberWithin chapter End -Counter - Name listing +Counter listing Within chapter End -Counter - Name footnote +Counter footnote Within chapter LabelString "\arabic{footnote}" End diff --git a/lib/layouts/numrevtex.inc b/lib/layouts/numrevtex.inc index 90d5d20e46..b114ea74a0 100644 --- a/lib/layouts/numrevtex.inc +++ b/lib/layouts/numrevtex.inc @@ -2,7 +2,7 @@ # This include files contains label definitions for a article-like numbering. -Format 9 +Format 10 Style Section LabelType Counter LabelCounter section diff --git a/lib/layouts/powerdot.layout b/lib/layouts/powerdot.layout index 46531a4d91..2d36b4b4ef 100644 --- a/lib/layouts/powerdot.layout +++ b/lib/layouts/powerdot.layout @@ -8,7 +8,7 @@ ### # General textclass parameters ### -Format 9 +Format 10 Columns 1 Sides 1 Provides url 1 @@ -405,37 +405,29 @@ End ### # Counters definitions ### -Counter - Name enumi +Counter enumi End -Counter - Name enumii +Counter enumii Within enumi End -Counter - Name enumiii +Counter enumiii Within enumii End -Counter - Name enumiv +Counter enumiv Within enumiii End -Counter - Name bibitem +Counter bibitem End -Counter - Name figure +Counter figure End -Counter - Name table +Counter table End -Counter - Name algorithm +Counter algorithm End diff --git a/lib/layouts/stdcounters.inc b/lib/layouts/stdcounters.inc index 9fe80af82e..e1110f48b6 100644 --- a/lib/layouts/stdcounters.inc +++ b/lib/layouts/stdcounters.inc @@ -4,72 +4,57 @@ # in most LyX layouts. -Format 9 -Counter - Name part +Format 10 +Counter part LabelString "\Roman{part}" End -Counter - Name chapter +Counter chapter End -Counter - Name section +Counter section Within chapter End -Counter - Name subsection +Counter subsection Within section End -Counter - Name subsubsection +Counter subsubsection Within subsection End -Counter - Name paragraph +Counter paragraph Within subsubsection End -Counter - Name subparagraph +Counter subparagraph Within paragraph End -Counter - Name enumi +Counter enumi End -Counter - Name enumii +Counter enumii Within enumi End -Counter - Name enumiii +Counter enumiii Within enumii End -Counter - Name enumiv +Counter enumiv Within enumiii End -Counter - Name bibitem +Counter bibitem End -Counter - Name listing +Counter listing End -Counter - Name equation +Counter equation End -Counter - Name footnote +Counter footnote End diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc index 6e5f40144c..ba9c39bafc 100644 --- a/lib/layouts/stdsections.inc +++ b/lib/layouts/stdsections.inc @@ -7,7 +7,7 @@ # commands that are useful for article-like document classes, but not # for letters. -Format 9 +Format 10 Style Part Category Section Margin Dynamic diff --git a/lib/layouts/stdstarsections.inc b/lib/layouts/stdstarsections.inc index 70d9233fa0..82fdbf06be 100644 --- a/lib/layouts/stdstarsections.inc +++ b/lib/layouts/stdstarsections.inc @@ -9,7 +9,7 @@ # modifying the style of the regular sectioning layouts. -Format 9 +Format 10 Style Part* CopyStyle Part Category Unnumbered diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc index 63dcc2929b..a6147ffea6 100644 --- a/lib/layouts/theorems-ams.inc +++ b/lib/layouts/theorems-ams.inc @@ -19,7 +19,7 @@ # - Proof # - Case (regular only -- defined as an enumeration) -Format 9 +Format 10 Style Theorem Category Theorem diff --git a/lib/layouts/theorems-ams.module b/lib/layouts/theorems-ams.module index ba1f8d54b5..b44da12ca8 100644 --- a/lib/layouts/theorems-ams.module +++ b/lib/layouts/theorems-ams.module @@ -13,12 +13,11 @@ # Tinkered with Sep. '07 by Paul Rubin # Modularized Jan 08 by Richard Heck -Format 9 +Format 10 Requires amsmath,amsthm -Counter - Name theorem +Counter theorem End AddToPreamble diff --git a/lib/layouts/theorems-chap.module b/lib/layouts/theorems-chap.module index b561620a5f..6dd56f6548 100644 --- a/lib/layouts/theorems-chap.module +++ b/lib/layouts/theorems-chap.module @@ -7,10 +7,9 @@ # Author: Richard Heck -Format 9 +Format 10 -Counter - Name theorem +Counter theorem Within chapter End diff --git a/lib/layouts/theorems-sec.module b/lib/layouts/theorems-sec.module index 3b2887dd2f..7c95bf0a43 100644 --- a/lib/layouts/theorems-sec.module +++ b/lib/layouts/theorems-sec.module @@ -6,10 +6,9 @@ # Author: Richard Heck -Format 9 +Format 10 -Counter - Name theorem +Counter theorem Within section End diff --git a/lib/layouts/theorems-std.module b/lib/layouts/theorems-std.module index 81f053333c..7bfc5bd865 100644 --- a/lib/layouts/theorems-std.module +++ b/lib/layouts/theorems-std.module @@ -8,10 +8,9 @@ # Author: Richard Heck -Format 9 +Format 10 -Counter - Name theorem +Counter theorem End Input theorems.inc diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc index 875f04a9bb..c5441a52a0 100644 --- a/lib/layouts/theorems.inc +++ b/lib/layouts/theorems.inc @@ -19,7 +19,7 @@ # - Proof # - Case (regular only -- defined as an enumeration) -Format 9 +Format 10 Style Theorem Category Theorem