From Jean-Marc: Make sure that standard sectioning styles have proper counters

	* lib/layouts/stdsections.inc: include numarticle.inc here instead
	of the following files:
	* lib/layouts/kluwer.layout
	* lib/layouts/aapaper.layout
	* lib/layouts/llncs.layout
	* lib/layouts/docbook.layout
	* lib/layouts/article.layout
	* lib/layouts/IEEEtran.layout
	* lib/layouts/ijmpd.layout
	* lib/layouts/paper.layout
	* lib/layouts/aa.layout
	* lib/layouts/aastex.layout
	* lib/layouts/cl2emult.layout
	* lib/layouts/docbook-section.layout
	* lib/layouts/svjour.inc
	* lib/layouts/amsart.layout
	* lib/layouts/spie.layout
	* lib/layouts/docbook-chapter.layout
	* lib/layouts/aguplus.inc
	* lib/layouts/scrartcl.layout
	* lib/layouts/dtk.layout
	* lib/layouts/agu-dtd.layout
	* lib/layouts/elsart.layout
	* lib/layouts/mwart.layout
	* lib/layouts/seminar.layout

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

diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout
index d09540e181c5234c8ffefee540cc4d963d29ce74..b6cccce4f10b43ed2cf23e68928f1f15b0fc7fab 100644 (file)
--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@@ -467,7 +467,6 @@ End
 ## Others
 ##
 
-Input numarticle.inc
 Input stdfloats.inc
 Input stdcounters.inc
 Input lyxmacros.inc

diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index 1b2f534b9591658588eb7a6421438d723d69f87c..9abe69b3eb72d49aebc028a43a27f524a15a764e 100644 (file)
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -94,7 +94,6 @@ End
 
 Input stdlists.inc
 Input stdsections.inc
-Input numarticle.inc
 Input stdtitle.inc
 Input stdstruct.inc
 Input stdfloats.inc

diff --git a/lib/layouts/aapaper.layout b/lib/layouts/aapaper.layout
index c3231a5110a0ea561b8cea55447c653330f00953..8fbc145c2e9a726a0f20e3ae6e6ca59a99934f3b 100644 (file)
--- a/lib/layouts/aapaper.layout
+++ b/lib/layouts/aapaper.layout
@@ -113,7 +113,6 @@ Input stdlayouts.inc
 Input stdsections.inc
 Input stdtitle.inc
 Input stdstruct.inc
-Input numarticle.inc
 Input stdfloats.inc
 Input stdcounters.inc
 

diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index 17ba120e4863ff555a941e3101b82d594ec96842..284dd52580a1b6fd4aa4f8e9363a30af2d5a3bab 100644 (file)
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -152,7 +152,6 @@ End
 # definitions. First, the standard includes
 
 Input stdsections.inc
-Input numarticle.inc
 Input stdtitle.inc
 Input stdstruct.inc
 Input stdlists.inc

diff --git a/lib/layouts/agu-dtd.layout b/lib/layouts/agu-dtd.layout
index f1e605cef3f73954879cce2a718c488681844426..c8442521793f8e39a677d7e7cb29ebb1bc5aca78 100644 (file)
--- a/lib/layouts/agu-dtd.layout
+++ b/lib/layouts/agu-dtd.layout
@@ -7,8 +7,6 @@
 
 Format 2
 Input agu_stdclass.inc
-Input numarticle.inc
-
 
 # Exclude higher, or equal, sections:
 NoStyle Part

diff --git a/lib/layouts/aguplus.inc b/lib/layouts/aguplus.inc
index 0d2737ab7337d929308ded6bbf04ce66b810e6ca..8c5c039e09569268a61efeae11cdf181f00cb035 100644 (file)
--- a/lib/layouts/aguplus.inc
+++ b/lib/layouts/aguplus.inc
@@ -8,7 +8,6 @@
 
 Format 2
 Input stdclass.inc
-Input numarticle.inc
 
 SecNumDepth             4
 

diff --git a/lib/layouts/amsart.layout b/lib/layouts/amsart.layout
index b9c2c75cf9480a4dd2a829ad82382b403afb3ac9..af4a8688b30b36b07b0e0d483d2bde0bd320315d 100644 (file)
--- a/lib/layouts/amsart.layout
+++ b/lib/layouts/amsart.layout
@@ -40,7 +40,6 @@ EndPreamble
 
 Input stdsections.inc
 Input stdstarsections.inc
-Input numarticle.inc
 Input lyxmacros.inc
 Input amsdefs.inc
 Input stdlayouts.inc

diff --git a/lib/layouts/article.layout b/lib/layouts/article.layout
index 6269aa7734857da5775c4bf98a89686f648e0113..69d3205c80029858a747b5e8c79e91aca1aa144f 100644 (file)
--- a/lib/layouts/article.layout
+++ b/lib/layouts/article.layout
@@ -7,7 +7,6 @@
 
 Format 2
 Input stdclass.inc
-Input numarticle.inc
 
 SecNumDepth             3
 TocDepth                3

diff --git a/lib/layouts/cl2emult.layout b/lib/layouts/cl2emult.layout
index 22c257bd8716eae3d81217e19a43e86b8d67fa82..a62989c3078235647e4d7c8c656291bc78d341a0 100644 (file)
--- a/lib/layouts/cl2emult.layout
+++ b/lib/layouts/cl2emult.layout
@@ -11,7 +11,6 @@ TocDepth                  2
 DefaultStyle              Standard
 
 Input stdsections.inc
-Input numarticle.inc
 Input stdlists.inc
 Input stdstruct.inc
 Input stdlayouts.inc

diff --git a/lib/layouts/docbook-chapter.layout b/lib/layouts/docbook-chapter.layout
index 8f866dfa288b56f931b9ba3fdcd7bad883a9f731..832921394203de1cc47022c7fe54463271e299d3 100644 (file)
--- a/lib/layouts/docbook-chapter.layout
+++ b/lib/layouts/docbook-chapter.layout
@@ -4,7 +4,6 @@
 # Author : Jose' Matos <jamatos@lyx.org>
 
 Format 2
-Input stdnumarticle.inc
 Input db_stdclass.inc
 
 Style Title

diff --git a/lib/layouts/docbook-section.layout b/lib/layouts/docbook-section.layout
index d24f8882f339395a198c7fa835ed7f5b672184e6..b00e4d94dfb471f72ad1066c9e6d7eb634d2ce61 100644 (file)
--- a/lib/layouts/docbook-section.layout
+++ b/lib/layouts/docbook-section.layout
@@ -4,7 +4,6 @@
 # Author : Jose' Matos <jamatos@lyx.org>
 
 Format 2
-Input numarticle.inc
 Input db_stdclass.inc
 
 Style Title

diff --git a/lib/layouts/docbook.layout b/lib/layouts/docbook.layout
index fb6089157ce4142d496eb203e6a9fe90b3368cac..19a3b949a096b6bfb7f8a95ac636cb1f9f43dc65 100644 (file)
--- a/lib/layouts/docbook.layout
+++ b/lib/layouts/docbook.layout
@@ -4,7 +4,6 @@
 # Author : Jose' Matos <jamatos@lyx.org>
 
 Format 2
-Input numarticle.inc
 Input db_stdclass.inc
 
 # Exclude higher, or equal, sections:

diff --git a/lib/layouts/dtk.layout b/lib/layouts/dtk.layout
index 1f87df94cc3cdb83bd98b94512da271e57a9212e..99bdf51d823ae7a42f5e52a7a543ac7081d4c8ec 100644 (file)
--- a/lib/layouts/dtk.layout
+++ b/lib/layouts/dtk.layout
@@ -41,7 +41,6 @@ End
 
 Input stdlists.inc
 Input stdsections.inc
-Input numarticle.inc
 Input stdstarsections.inc
 
 NoStyle Chapter

diff --git a/lib/layouts/elsart.layout b/lib/layouts/elsart.layout
index bae98c4210f5bbc2b776c3210f4c1d2a7c4e0e33..82c06d0a29ab3758e78fbdb1eac906cb9a1ade68 100644 (file)
--- a/lib/layouts/elsart.layout
+++ b/lib/layouts/elsart.layout
@@ -81,7 +81,6 @@ End
 
 
 Input stdsections.inc
-Input numarticle.inc
 Input stdstarsections.inc
 Input stdlists.inc
 Input stdstruct.inc

diff --git a/lib/layouts/ijmpd.layout b/lib/layouts/ijmpd.layout
index 92620660ad2bf1d5396cd2a68a59f93894ddedd7..40a0f29a93dd9ea16d3b94aac0c36aea8269aa17 100644 (file)
--- a/lib/layouts/ijmpd.layout
+++ b/lib/layouts/ijmpd.layout
@@ -13,7 +13,6 @@
 
 Format 2
 Input stdclass.inc
-Input numarticle.inc
 
 NoStyle Chapter
 NoStyle Chapter*

diff --git a/lib/layouts/kluwer.layout b/lib/layouts/kluwer.layout
index b6e10c98f4b8f4584fcf5f42dc62ab6e21ccbf11..8e8a99aeb0cc78c782eb8373e1e4ceff7fce635f 100644 (file)
--- a/lib/layouts/kluwer.layout
+++ b/lib/layouts/kluwer.layout
@@ -43,7 +43,6 @@ End
 
 
 Input stdsections.inc
-Input numarticle.inc
 Input stdstruct.inc
 Input stdlists.inc
 Input stdfloats.inc

diff --git a/lib/layouts/llncs.layout b/lib/layouts/llncs.layout
index 1c662d377bb235f876dff8416d9df5934e720ee3..90895f7412bb75f79028c635bfb703a303559756 100644 (file)
--- a/lib/layouts/llncs.layout
+++ b/lib/layouts/llncs.layout
@@ -33,7 +33,6 @@ End
 
 
 Input stdsections.inc
-Input numarticle.inc
 
 
 Style Chapter

diff --git a/lib/layouts/mwart.layout b/lib/layouts/mwart.layout
index 631eaa2c16ac13aedb0f33ee8f597e1a4eb2b5fd..2b9db82440c0d961e3bffe576e5dea0f84080d49 100644 (file)
--- a/lib/layouts/mwart.layout
+++ b/lib/layouts/mwart.layout
@@ -7,7 +7,6 @@
 
 Format 2
 Input stdclass.inc
-Input numarticle.inc
 
 NoStyle Chapter
 NoStyle Chapter*

diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout
index 5234ad1c72a0738ef93971d3bba4225b47fcceb0..f0a629e80a5fedd5a4e9a1a9aa2acb3d11040fd1 100644 (file)
--- a/lib/layouts/paper.layout
+++ b/lib/layouts/paper.layout
@@ -25,7 +25,6 @@ End
 
 Input stdlists.inc
 Input stdsections.inc
-Input numarticle.inc
 
 
 # All the section headings now use sans serif

diff --git a/lib/layouts/scrartcl.layout b/lib/layouts/scrartcl.layout
index 7a861713aa5b7fd83483480fd177ed216731a394..49407aeae58a11b8169d0938c5af26bac8039c49 100644 (file)
--- a/lib/layouts/scrartcl.layout
+++ b/lib/layouts/scrartcl.layout
@@ -5,7 +5,6 @@
 
 Format 2
 Input scrclass.inc
-Input numarticle.inc
 
 SecNumDepth             3
 TocDepth                3

diff --git a/lib/layouts/seminar.layout b/lib/layouts/seminar.layout
index 8b86977ed3ef781036293e968ae80e0a5ce6304a..0840322502a6eb80e8c3801d4b48c2cba5e41bb2 100644 (file)
--- a/lib/layouts/seminar.layout
+++ b/lib/layouts/seminar.layout
@@ -5,7 +5,6 @@
 
 Format 2
 Input stdclass.inc
-Input numarticle.inc
 
 NoStyle Chapter
 NoStyle Chapter*

diff --git a/lib/layouts/spie.layout b/lib/layouts/spie.layout
index 138df3a04f3ab37dd168c9f62938a15b606603c9..310a38e281bac304d7163a37d83afec14c803a23 100644 (file)
--- a/lib/layouts/spie.layout
+++ b/lib/layouts/spie.layout
@@ -7,7 +7,6 @@
 
 Format 2
 Input stdclass.inc
-Input numarticle.inc
 
 NoStyle Chapter
 NoStyle Chapter*

diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc
index 75e4b9e3996a363e14b1fdf1565bc9c7c46bc3af..b198bad568afe4516c9867056d2030c23132f7d8 100644 (file)
--- a/lib/layouts/stdsections.inc
+++ b/lib/layouts/stdsections.inc
@@ -108,3 +108,5 @@ Style Subparagraph
        NextNoIndent          0
        LeftMargin            MM
 End
+
+Input numarticle.inc

diff --git a/lib/layouts/svjour.inc b/lib/layouts/svjour.inc
index aa55d0098f9dae4b20f364f8bfa1a11bd5e07157..49e1fc4346d1b4f559016eb58f4fb92a5b547b26 100644 (file)
--- a/lib/layouts/svjour.inc
+++ b/lib/layouts/svjour.inc
@@ -37,7 +37,6 @@ End
 
 
 Input stdsections.inc
-Input numarticle.inc
 Input stdstarsections.inc
 Input stdlayouts.inc
 Input stdlists.inc