>>>>> "G" == G Milde <[EMAIL PROTECTED]> writes:
G> On 10.06.05, Juergen Spitzmueller wrote:
>> G. Milde wrote: > So we have to weight the arguments for 3 possible
>> options: > 1. Call the lyx-list/labeling style "List" in all
>> layouts. [...] > 2. Call the style "Labeling" in koma and "List"
>> elsewhere. [...] > 3. Call the style "Labeling" in all layouts.
>> [...] > Personally, I'd favour variant 3 (without insisting on it,
>> as I cannot > provide a complete set of patches).
>>
>> I'd favour variant 2, but I'm also fine with variant 3, as long as
>> the docs are updated.
G> So, will my patch 2 be accepted?
I applied the following patch. Please confirm that it does what you
want (I just noticed I forgot the ChangeLog. Will do).
JMarc
Index: lib/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/Makefile.am,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile.am
--- lib/Makefile.am 4 May 2005 16:42:06 -0000 1.71
+++ lib/Makefile.am 20 Jun 2005 13:17:48 -0000
@@ -792,7 +792,6 @@ dist_layouts_DATA =\
layouts/mwart.layout \
layouts/mwbk.layout \
layouts/mwrep.layout \
- layouts/obsolete.inc \
layouts/paper.layout \
layouts/report.layout \
layouts/revtex.layout \
@@ -802,7 +801,6 @@ dist_layouts_DATA =\
layouts/scrclass.inc \
layouts/scrlettr.layout \
layouts/scrlttr2.layout \
- layouts/scrmacros.inc \
layouts/scrreprt.layout \
layouts/seminar.layout \
layouts/siamltex.layout \
Index: lib/layouts/obsolete.inc
===================================================================
RCS file: lib/layouts/obsolete.inc
diff -N lib/layouts/obsolete.inc
--- lib/layouts/obsolete.inc 13 Oct 2003 09:50:10 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-# Standard textclass definition file. Taken from initial LyX source code
-# Author : Matthias Ettrich <[EMAIL PROTECTED]>
-# Transposed by Pascal André <[EMAIL PROTECTED]>
-# Heavily modifed and enhanced by several developers.
-
-# This include files contains all obsolete layouts, kept for
-# historical reasons
-
-# Title style definition
-Style LaTeX_Title
- ObsoletedBy Title
-End
-
-Style LaTeX
- ObsoletedBy Standard
-End
-
-Style Comment
- ObsoletedBy Standard
-End
Index: lib/layouts/scrclass.inc
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/scrclass.inc,v
retrieving revision 1.14
diff -u -p -r1.14 scrclass.inc
--- lib/layouts/scrclass.inc 13 Jun 2005 09:36:58 -0000 1.14
+++ lib/layouts/scrclass.inc 20 Jun 2005 13:17:48 -0000
@@ -3,6 +3,8 @@
# Bernd Rellermeyer <[EMAIL PROTECTED]>, 1998/7/23.
# Update for Koma Script Release >=2.8q
# Juergen Spitzmueller <[EMAIL PROTECTED]>, 2003/2/08.
+# Mapped List to Labeling
+# Guenter Milde <g.milde web.de>
SecNumDepth 2
@@ -20,8 +22,6 @@ Input stdlists.inc
Input stdcounters.inc
Input stdfloats.inc
-NoStyle List
-
Style Description
LabelFont
Family Sans
@@ -29,21 +29,15 @@ Style Description
End
Style Labeling
- Margin Manual
- LatexType List_Environment
+ CopyStyle List
LatexName labeling
- NextNoindent 1
- LabelSep xxx
- ParSkip 0.4
- TopSep 0.7
- BottomSep 0.7
- ParSep 0.5
- Align Block
- AlignPossible Block, Left
- LabelType Manual
- LabelString "00.00.0000"
+ Preamble # overwrite the preamble code definition
+ EndPreamble
End
+Style List
+ Obsoletedby Labeling
+End
Input stdsections.inc
@@ -260,5 +254,4 @@ Style Dictum
End
Input lyxmacros.inc
-Input scrmacros.inc
Index: lib/layouts/scrmacros.inc
===================================================================
RCS file: lib/layouts/scrmacros.inc
diff -N lib/layouts/scrmacros.inc
--- lib/layouts/scrmacros.inc 15 Sep 2003 15:20:19 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-# KOMA script textclass definition file.
-# Extensions for the KOMA script classes.
-# Bernd Rellermeyer <[EMAIL PROTECTED]>, 1998/7/12.
-
-# List style definition
-Style List
- ObsoletedBy Labeling
-End
