Hi Jean-Marc,
the following patch to 1.3.x, fixes:
* warnings when using docbook counters
* space missing in lib/scripts/general_command_wrapper.py warning
Adds an optional argument to author and address styles in elsart.layout.
Without the optional argument I am forced to use ert for all authours and
addresses.
Comments?
--
José Abílio
LyX and docbook, a perfect match. :-)
Index: lib/layouts/db_stdclass.inc
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/db_stdclass.inc,v
retrieving revision 1.3
diff -u -p -r1.3 db_stdclass.inc
--- lib/layouts/db_stdclass.inc 4 Feb 2003 15:44:11 -0000 1.3
+++ lib/layouts/db_stdclass.inc 16 Dec 2003 15:43:01 -0000
@@ -44,4 +44,5 @@ Input db_stdstruct.inc
Input db_lyxmacros.inc
Input db_stdlayouts.inc
Input stdcounters.inc
+Input db_stdcounters.inc
Input stdfloats.inc
Index: lib/layouts/db_stdcounters.inc
===================================================================
RCS file: lib/layouts/db_stdcounters.inc
diff -N lib/layouts/db_stdcounters.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lib/layouts/db_stdcounters.inc 16 Dec 2003 15:43:01 -0000
@@ -0,0 +1,29 @@
+# Author : José Matos <[EMAIL PROTECTED]>
+
+# This include file contains all the counters that are defined as standard
+# in docbook LyX layouts.
+
+Counter
+ Name sect1
+ Within chapter
+End
+
+Counter
+ Name sect2
+ Within sect1
+End
+
+Counter
+ Name sect3
+ Within sect2
+End
+
+Counter
+ Name sect4
+ Within sect3
+End
+
+Counter
+ Name sect5
+ Within sect4
+End
Index: lib/layouts/elsart.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/elsart.layout,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 elsart.layout
--- lib/layouts/elsart.layout 31 Jul 2003 10:53:10 -0000 1.1.2.3
+++ lib/layouts/elsart.layout 16 Dec 2003 15:43:01 -0000
@@ -125,13 +125,14 @@ Style Author
ParSep 0
Align Center
AlignPossible Center
+ OptionalArgs 1
# standard font definition
Font
Series Bold
EndFont
End
-# Author Adress
+# Author Address
Style Author_Address
Margin Static
LatexType Command
@@ -141,6 +142,7 @@ Style Author_Address
AlignPossible Center
Labeltype Static
LabelString "Address: "
+ OptionalArgs 1
LabelFont
Shape Italic
EndFont
Index: lib/scripts/general_command_wrapper.py
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/scripts/Attic/general_command_wrapper.py,v
retrieving revision 1.3
diff -u -p -r1.3 general_command_wrapper.py
--- lib/scripts/general_command_wrapper.py 10 Sep 2002 10:14:10 -0000 1.3
+++ lib/scripts/general_command_wrapper.py 16 Dec 2003 15:43:01 -0000
@@ -13,7 +13,7 @@ if sys.argv[1] != "-":
os.close(0)
sys.stdin = open(sys.argv[1],"r")
if sys.argv[2] != "-":
- print "Redirecting" + sys.argv[2]
+ print "Redirecting " + sys.argv[2]
os.close(1)
os.close(2)
sys.stdout = open(sys.argv[2],"w")
