[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lyx-devel
Subject:    Re: [patch] fix layout2layout
From:       Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes () inria ! fr>
Date:       2006-03-31 12:40:57
Message-ID: liyr74i4wiu.fsf () fantomas ! inria ! fr
[Download RAW message or body]

>>>>> "Georg" == Georg Baum <Georg.Baum@post.rwth-aachen.de> writes:

Georg> That would be like the attached then. I will put this in trunk
Georg> tomorrow if nobody objects, but I would really like somebody to
Georg> test it.

I tested it and it seems to work and I think you should apply it to
1.4. The best would be to ask people who reported bugs to test it. It
is only one file to put un user directory, after all.

I propose to apply also the following patch, which adds numarticle.inc
to stdsection.inc. It removes numarticle.inc in other places where it
is not needed anymore (I did check that db_stdclass and agu_stdclass
include stdsection.inc).

Thoughts? For 1.4, I propose to be conservative and patch only
stdsection.inc (so that at worse the same file gets included several
times).

JMarc


[Attachment #3 (text/x-patch)]

Index: lib/layouts/aapaper.layout
===================================================================
--- lib/layouts/aapaper.layout	(revision 13535)
+++ lib/layouts/aapaper.layout	(working copy)
@@ -113,7 +113,6 @@
 Input stdsections.inc
 Input stdtitle.inc
 Input stdstruct.inc
-Input numarticle.inc
 Input stdfloats.inc
 Input stdcounters.inc
 
Index: lib/layouts/kluwer.layout
===================================================================
--- lib/layouts/kluwer.layout	(revision 13535)
+++ lib/layouts/kluwer.layout	(working copy)
@@ -43,7 +43,6 @@
 
 
 Input stdsections.inc
-Input numarticle.inc
 Input stdstruct.inc
 Input stdlists.inc
 Input stdfloats.inc
Index: lib/layouts/llncs.layout
===================================================================
--- lib/layouts/llncs.layout	(revision 13535)
+++ lib/layouts/llncs.layout	(working copy)
@@ -33,7 +33,6 @@
 
 
 Input stdsections.inc
-Input numarticle.inc
 
 
 Style Chapter
Index: lib/layouts/docbook.layout
===================================================================
--- lib/layouts/docbook.layout	(revision 13535)
+++ lib/layouts/docbook.layout	(working copy)
@@ -4,7 +4,6 @@
 # Author : Jose' Matos <jamatos@lyx.org>
 
 Format 2
-Input numarticle.inc
 Input db_stdclass.inc
 
 # Exclude higher, or equal, sections:
Index: lib/layouts/article.layout
===================================================================
--- lib/layouts/article.layout	(revision 13535)
+++ lib/layouts/article.layout	(working copy)
@@ -7,7 +7,6 @@
 
 Format 2
 Input stdclass.inc
-Input numarticle.inc
 
 SecNumDepth             3
 TocDepth                3
Index: lib/layouts/IEEEtran.layout
===================================================================
--- lib/layouts/IEEEtran.layout	(revision 13535)
+++ lib/layouts/IEEEtran.layout	(working copy)
@@ -467,7 +467,6 @@
 ## Others
 ##
 
-Input numarticle.inc
 Input stdfloats.inc
 Input stdcounters.inc
 Input lyxmacros.inc
Index: lib/layouts/ijmpd.layout
===================================================================
--- lib/layouts/ijmpd.layout	(revision 13535)
+++ lib/layouts/ijmpd.layout	(working copy)
@@ -13,7 +13,6 @@
 
 Format 2
 Input stdclass.inc
-Input numarticle.inc
 
 NoStyle Chapter
 NoStyle Chapter*
Index: lib/layouts/paper.layout
===================================================================
--- lib/layouts/paper.layout	(revision 13535)
+++ lib/layouts/paper.layout	(working copy)
@@ -25,7 +25,6 @@
 
 Input stdlists.inc
 Input stdsections.inc
-Input numarticle.inc
 
 
 # All the section headings now use sans serif
Index: lib/layouts/aa.layout
===================================================================
--- lib/layouts/aa.layout	(revision 13535)
+++ lib/layouts/aa.layout	(working copy)
@@ -94,7 +94,6 @@
 
 Input stdlists.inc
 Input stdsections.inc
-Input numarticle.inc
 Input stdtitle.inc
 Input stdstruct.inc
 Input stdfloats.inc
Index: lib/layouts/aastex.layout
===================================================================
--- lib/layouts/aastex.layout	(revision 13535)
+++ lib/layouts/aastex.layout	(working copy)
@@ -152,7 +152,6 @@
 # definitions. First, the standard includes
 
 Input stdsections.inc
-Input numarticle.inc
 Input stdtitle.inc
 Input stdstruct.inc
 Input stdlists.inc
Index: lib/layouts/cl2emult.layout
===================================================================
--- lib/layouts/cl2emult.layout	(revision 13535)
+++ lib/layouts/cl2emult.layout	(working copy)
@@ -11,7 +11,6 @@
 DefaultStyle              Standard
 
 Input stdsections.inc
-Input numarticle.inc
 Input stdlists.inc
 Input stdstruct.inc
 Input stdlayouts.inc
Index: lib/layouts/stdsections.inc
===================================================================
--- lib/layouts/stdsections.inc	(revision 13535)
+++ lib/layouts/stdsections.inc	(working copy)
@@ -108,3 +108,5 @@
 	NextNoIndent          0
 	LeftMargin            MM
 End
+
+Input numarticle.inc
Index: lib/layouts/docbook-section.layout
===================================================================
--- lib/layouts/docbook-section.layout	(revision 13535)
+++ lib/layouts/docbook-section.layout	(working copy)
@@ -4,7 +4,6 @@
 # Author : Jose' Matos <jamatos@lyx.org>
 
 Format 2
-Input numarticle.inc
 Input db_stdclass.inc
 
 Style Title
Index: lib/layouts/svjour.inc
===================================================================
--- lib/layouts/svjour.inc	(revision 13535)
+++ lib/layouts/svjour.inc	(working copy)
@@ -37,7 +37,6 @@
 
 
 Input stdsections.inc
-Input numarticle.inc
 Input stdstarsections.inc
 Input stdlayouts.inc
 Input stdlists.inc
Index: lib/layouts/amsart.layout
===================================================================
--- lib/layouts/amsart.layout	(revision 13535)
+++ lib/layouts/amsart.layout	(working copy)
@@ -40,7 +40,6 @@
 
 Input stdsections.inc
 Input stdstarsections.inc
-Input numarticle.inc
 Input lyxmacros.inc
 Input amsdefs.inc
 Input stdlayouts.inc
Index: lib/layouts/spie.layout
===================================================================
--- lib/layouts/spie.layout	(revision 13535)
+++ lib/layouts/spie.layout	(working copy)
@@ -7,7 +7,6 @@
 
 Format 2
 Input stdclass.inc
-Input numarticle.inc
 
 NoStyle Chapter
 NoStyle Chapter*
Index: lib/layouts/docbook-chapter.layout
===================================================================
--- lib/layouts/docbook-chapter.layout	(revision 13535)
+++ lib/layouts/docbook-chapter.layout	(working copy)
@@ -4,7 +4,6 @@
 # Author : Jose' Matos <jamatos@lyx.org>
 
 Format 2
-Input stdnumarticle.inc
 Input db_stdclass.inc
 
 Style Title
Index: lib/layouts/aguplus.inc
===================================================================
--- lib/layouts/aguplus.inc	(revision 13535)
+++ lib/layouts/aguplus.inc	(working copy)
@@ -8,7 +8,6 @@
 
 Format 2
 Input stdclass.inc
-Input numarticle.inc
 
 SecNumDepth             4
 
Index: lib/layouts/scrartcl.layout
===================================================================
--- lib/layouts/scrartcl.layout	(revision 13535)
+++ lib/layouts/scrartcl.layout	(working copy)
@@ -5,7 +5,6 @@
 
 Format 2
 Input scrclass.inc
-Input numarticle.inc
 
 SecNumDepth             3
 TocDepth                3
Index: lib/layouts/dtk.layout
===================================================================
--- lib/layouts/dtk.layout	(revision 13535)
+++ lib/layouts/dtk.layout	(working copy)
@@ -41,7 +41,6 @@
 
 Input stdlists.inc
 Input stdsections.inc
-Input numarticle.inc
 Input stdstarsections.inc
 
 NoStyle Chapter
Index: lib/layouts/agu-dtd.layout
===================================================================
--- lib/layouts/agu-dtd.layout	(revision 13535)
+++ lib/layouts/agu-dtd.layout	(working copy)
@@ -7,9 +7,7 @@
 
 Format 2
 Input agu_stdclass.inc
-Input numarticle.inc
 
-
 # Exclude higher, or equal, sections:
 NoStyle Part
 NoStyle Chapter
Index: lib/layouts/elsart.layout
===================================================================
--- lib/layouts/elsart.layout	(revision 13535)
+++ lib/layouts/elsart.layout	(working copy)
@@ -81,7 +81,6 @@
 
 
 Input stdsections.inc
-Input numarticle.inc
 Input stdstarsections.inc
 Input stdlists.inc
 Input stdstruct.inc
Index: lib/layouts/mwart.layout
===================================================================
--- lib/layouts/mwart.layout	(revision 13535)
+++ lib/layouts/mwart.layout	(working copy)
@@ -7,7 +7,6 @@
 
 Format 2
 Input stdclass.inc
-Input numarticle.inc
 
 NoStyle Chapter
 NoStyle Chapter*
Index: lib/layouts/seminar.layout
===================================================================
--- lib/layouts/seminar.layout	(revision 13535)
+++ lib/layouts/seminar.layout	(working copy)
@@ -5,7 +5,6 @@
 
 Format 2
 Input stdclass.inc
-Input numarticle.inc
 
 NoStyle Chapter
 NoStyle Chapter*


[prev in list] [next in list] [prev in thread] [next in thread]