Dekel Tsur <[EMAIL PROTECTED]> writes:
| Also, llncs.layout is currently broken as it does not include stdfloats.inc
| and stdcounters.inc. As there are other layouts with this behavior, I think
| that the best solution for this is to create a base .inc file which will be
| included by all the article/book classes.
This is the changes I have in my tree now. I belive this changes
everything needed for all the layouts, but I might have added too much
also...
Please have a look at this. If nobody complains I'll commit it and
fix up remaining stuff as they are reported.
Index: layouts/IEEEtran.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/IEEEtran.layout,v
retrieving revision 1.4
diff -u -p -r1.4 IEEEtran.layout
--- layouts/IEEEtran.layout 6 Jul 2001 20:15:29 -0000 1.4
+++ layouts/IEEEtran.layout 24 Oct 2002 12:00:16 -0000
@@ -512,5 +512,7 @@ End
##
## Others
##
+Input stdfloats.inc
+Input stdcounters.inc
Input lyxmacros.inc
Input obsolete.inc
Index: layouts/aa.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/aa.layout,v
retrieving revision 1.2
diff -u -p -r1.2 aa.layout
--- layouts/aa.layout 13 Jun 2001 13:45:50 -0000 1.2
+++ layouts/aa.layout 24 Oct 2002 12:00:16 -0000
@@ -86,7 +86,8 @@ Input stdlists.inc
Input stdsections.inc
Input stdtitle.inc
Input stdstruct.inc
-
+Input stdfloats.inc
+Input stdcounters.inc
# Remove unwanted Styles
NoStyle Chapter
Index: layouts/aapaper.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/aapaper.layout,v
retrieving revision 1.4
diff -u -p -r1.4 aapaper.layout
--- layouts/aapaper.layout 13 Jun 2001 13:45:50 -0000 1.4
+++ layouts/aapaper.layout 24 Oct 2002 12:00:16 -0000
@@ -94,7 +94,8 @@ Input stdlayouts.inc
Input stdsections.inc
Input stdtitle.inc
Input stdstruct.inc
-
+Input stdfloats.inc
+Input stdcounters.inc
# Remove unwanted Styles
NoStyle Quotation
Index: layouts/aastex.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/aastex.layout,v
retrieving revision 1.3
diff -u -p -r1.3 aastex.layout
--- layouts/aastex.layout 23 Apr 2002 22:34:23 -0000 1.3
+++ layouts/aastex.layout 24 Oct 2002 12:00:16 -0000
@@ -126,7 +126,8 @@ Input stdsections.inc
Input stdtitle.inc
Input stdstruct.inc
Input stdlists.inc
-
+Input stdfloats.inc
+Input stdcounters.inc
# Remove unwanted Styles
NoStyle Part
NoStyle Chapter
Index: layouts/amsart.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/amsart.layout,v
retrieving revision 1.2
diff -u -p -r1.2 amsart.layout
--- layouts/amsart.layout 4 Oct 2000 14:24:42 -0000 1.2
+++ layouts/amsart.layout 24 Oct 2002 12:00:16 -0000
@@ -100,6 +100,8 @@ NoStyle Verse # Although mathematicia
Input stdlists.inc
Input lyxmacros.inc
+Input stdfloats.inc
+Input stdcounters.inc
### Finally a few obsolete definitions for compatibility
Input obsolete.inc
Index: layouts/amsbook.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/amsbook.layout,v
retrieving revision 1.2
diff -u -p -r1.2 amsbook.layout
--- layouts/amsbook.layout 4 Oct 2000 14:24:42 -0000 1.2
+++ layouts/amsbook.layout 24 Oct 2002 12:00:16 -0000
@@ -92,7 +92,8 @@ NoStyle Verse # Although mathematicia
NoStyle Abstract # there are no abstract in a book.
Input stdlists.inc
-
+Input stdfloats.inc
+Input stdcounters.inc
# End-of Chapter exercises I need a way to do this.
Index: layouts/apa.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/apa.layout,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 apa.layout
--- layouts/apa.layout 27 Sep 1999 18:44:33 -0000 1.1.1.1
+++ layouts/apa.layout 24 Oct 2002 12:00:16 -0000
@@ -245,6 +245,9 @@ Input stdsections.inc
# then define the unumbered sections, based on the numbered ones.
Input stdstarsections.inc
+Input stdfloats.inc
+Input stdcounters.inc
+
# remove the layouts that we do not need.
NoStyle Part
NoStyle Section
Index: layouts/broadway.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/broadway.layout,v
retrieving revision 1.6
diff -u -p -r1.6 broadway.layout
--- layouts/broadway.layout 22 May 2000 13:20:51 -0000 1.6
+++ layouts/broadway.layout 24 Oct 2002 12:00:17 -0000
@@ -227,6 +227,8 @@ End
Input stdtitle.inc
Input stdstruct.inc
+Input stdfloats.inc
+Input stdcounters.inc
# Input lyxmacros.inc
NoStyle Abstract
NoStyle Bibliography
Index: layouts/cl2emult.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/cl2emult.layout,v
retrieving revision 1.2
diff -u -p -r1.2 cl2emult.layout
--- layouts/cl2emult.layout 23 Aug 2002 09:01:12 -0000 1.2
+++ layouts/cl2emult.layout 24 Oct 2002 12:00:17 -0000
@@ -18,6 +18,8 @@ Input stdsections.inc
Input stdstarsections.inc
Input stdstruct.inc
Input stdlayouts.inc
+Input stdfloats.inc
+Input stdcounters.inc
NoStyle Chapter
NoStyle Chapter*
Index: layouts/cv.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/cv.layout,v
retrieving revision 1.4
diff -u -p -r1.4 cv.layout
--- layouts/cv.layout 6 Sep 2001 12:42:46 -0000 1.4
+++ layouts/cv.layout 24 Oct 2002 12:00:17 -0000
@@ -165,3 +165,5 @@ Style Bibliography
End
+Include stdfloats.inc
+Include stdcounters.inc
Index: layouts/dtk.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/dtk.layout,v
retrieving revision 1.1
diff -u -p -r1.1 dtk.layout
--- layouts/dtk.layout 27 Mar 2002 12:27:16 -0000 1.1
+++ layouts/dtk.layout 24 Oct 2002 12:00:17 -0000
@@ -49,6 +49,8 @@ NoStyle Chapter*
Input stdtitle.inc
Input stdstruct.inc
Input stdlayouts.inc
+Input stdfloats.inc
+Input stdcounters.inc
# no lyxmacros!
Index: layouts/egs.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/egs.layout,v
retrieving revision 1.3
diff -u -p -r1.3 egs.layout
--- layouts/egs.layout 7 Sep 2001 15:41:32 -0000 1.3
+++ layouts/egs.layout 24 Oct 2002 12:00:17 -0000
@@ -766,3 +766,6 @@ Style LyX-Code
EndFont
End
+
+Include stdfloats.inc
+Include stdcounters.inc
Index: layouts/foils.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/foils.layout,v
retrieving revision 1.4
diff -u -p -r1.4 foils.layout
--- layouts/foils.layout 21 Oct 2002 10:29:43 -0000 1.4
+++ layouts/foils.layout 24 Oct 2002 12:00:17 -0000
@@ -353,6 +353,8 @@ End
# all the standard LaTeX environments
Input stdlayouts.inc
+Input stdfloats.inc
+Input stdcounters.inc
# Finally add a few weird LyX environments.
Input lyxmacros.inc
Index: layouts/g-brief-de.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/g-brief-de.layout,v
retrieving revision 1.3
diff -u -p -r1.3 g-brief-de.layout
--- layouts/g-brief-de.layout 6 Mar 2002 15:55:04 -0000 1.3
+++ layouts/g-brief-de.layout 24 Oct 2002 12:00:17 -0000
@@ -613,7 +613,8 @@ End
-
+Input stdfloats.inc
+Input stdcounters.inc
Index: layouts/g-brief-en.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/g-brief-en.layout,v
retrieving revision 1.4
diff -u -p -r1.4 g-brief-en.layout
--- layouts/g-brief-en.layout 6 Mar 2002 15:55:04 -0000 1.4
+++ layouts/g-brief-en.layout 24 Oct 2002 12:00:17 -0000
@@ -621,8 +621,8 @@ End
-
-
+Input stdfloats.inc
+Input stdcounters.inc
Index: layouts/hollywood.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/hollywood.layout,v
retrieving revision 1.9
diff -u -p -r1.9 hollywood.layout
--- layouts/hollywood.layout 28 May 2002 23:04:56 -0000 1.9
+++ layouts/hollywood.layout 24 Oct 2002 12:00:17 -0000
@@ -371,6 +371,8 @@ End
Input stdtitle.inc
Input stdstruct.inc
+Input stdfloats.inc
+Input stdcounters.inc
# Input lyxmacros.inc
NoStyle Abstract
NoStyle Bibliography
Index: layouts/letter.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/letter.layout,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 letter.layout
--- layouts/letter.layout 27 Sep 1999 18:44:33 -0000 1.1.1.1
+++ layouts/letter.layout 24 Oct 2002 12:00:17 -0000
@@ -8,6 +8,8 @@
Input stdletter.inc
Input stdlists.inc
Input lyxmacros.inc
+Input stdfloats.inc
+Input stdcounters.inc
# Remove some unwanted styles.
NoStyle Right_Address
Index: layouts/llncs.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/llncs.layout,v
retrieving revision 1.1
diff -u -p -r1.1 llncs.layout
--- layouts/llncs.layout 28 Feb 2000 15:22:46 -0000 1.1
+++ layouts/llncs.layout 24 Oct 2002 12:00:17 -0000
@@ -599,5 +599,7 @@ Style Theorem
LabelString "Theorem #. "
End
+Input stdcounters.inc
+
#Finally a few older definitions for compatibility
Input obsolete.inc
Index: layouts/ltugboat.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/ltugboat.layout,v
retrieving revision 1.1
diff -u -p -r1.1 ltugboat.layout
--- layouts/ltugboat.layout 27 Mar 2002 12:27:16 -0000 1.1
+++ layouts/ltugboat.layout 24 Oct 2002 12:00:17 -0000
@@ -141,6 +141,9 @@ End
#
Input stdstruct.inc
Input stdlayouts.inc
+Input stdfloats.inc
+Input stdcounters.inc
+
#
# Create and Overwrite some styles
#
Index: layouts/paper.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/paper.layout,v
retrieving revision 1.3
diff -u -p -r1.3 paper.layout
--- layouts/paper.layout 4 Feb 2001 07:01:47 -0000 1.3
+++ layouts/paper.layout 24 Oct 2002 12:00:17 -0000
@@ -94,6 +94,8 @@ Input stdtitle.inc
Input stdstruct.inc
Input lyxmacros.inc
Input stdlayouts.inc
+Input stdfloats.inc
+Input stdcounters.inc
Input obsolete.inc
### The description environment also uses sans serif labels.
Index: layouts/revtex.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/revtex.layout,v
retrieving revision 1.2
diff -u -p -r1.2 revtex.layout
--- layouts/revtex.layout 20 Mar 2000 14:49:53 -0000 1.2
+++ layouts/revtex.layout 24 Oct 2002 12:00:17 -0000
@@ -166,6 +166,9 @@ Style Abstract
EndFont
End
+Input stdfloats.inc
+Input stdcounters.inc
+
### Finally a few obsolete definitions for compatibility
Input obsolete.inc
Index: layouts/revtex4.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/revtex4.layout,v
retrieving revision 1.5
diff -u -p -r1.5 revtex4.layout
--- layouts/revtex4.layout 11 Apr 2002 13:24:44 -0000 1.5
+++ layouts/revtex4.layout 24 Oct 2002 12:00:17 -0000
@@ -247,6 +247,9 @@ Style Keywords
LabelString "Keywords: "
End
+Input stdfloats.inc
+Input stdcounters.inc
+
### Finally a few obsolete definitions for compatibility
Input obsolete.inc
Index: layouts/scrclass.inc
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/scrclass.inc,v
retrieving revision 1.4
diff -u -p -r1.4 scrclass.inc
--- layouts/scrclass.inc 24 Oct 2002 11:33:51 -0000 1.4
+++ layouts/scrclass.inc 24 Oct 2002 12:00:17 -0000
@@ -17,6 +17,7 @@ End
Input stdlists.inc
Input stdcounters.inc
+Input stdfloats.inc
# Modify Description
Style Description
Index: layouts/siamltex.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/siamltex.layout,v
retrieving revision 1.1
diff -u -p -r1.1 siamltex.layout
--- layouts/siamltex.layout 26 Sep 2000 16:29:51 -0000 1.1
+++ layouts/siamltex.layout 24 Oct 2002 12:00:17 -0000
@@ -32,6 +32,8 @@ End
Input stdlists.inc
Input stdlayouts.inc
+Input stdcounters.inc
+Input stdfloats.inc
Style Section
CopyStyle Standard
Index: layouts/slides.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/slides.layout,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 slides.layout
--- layouts/slides.layout 27 Sep 1999 18:44:34 -0000 1.1.1.1
+++ layouts/slides.layout 24 Oct 2002 12:00:17 -0000
@@ -286,6 +286,9 @@ End
Input stdlists.inc
Input stdlayouts.inc
Input lyxmacros.inc
+Input stdcounters.inc
+Input stdfloats.inc
+
#Input obsolete.inc
# Style definition for end of a slide
--
Lgb
