get rid of scrmacros.inc and obsolete.inc

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 850d2ce19ea0d8e5db7f6db8f65f776d5e1ad4f9..92551f0bf7089c062a46f63c26997f99997daae0 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -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 \

diff --git a/lib/layouts/obsolete.inc b/lib/layouts/obsolete.inc
deleted file mode 100644 (file)
index 0b7b75e..0000000
--- a/lib/layouts/obsolete.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Standard textclass definition file. Taken from initial LyX source code
-# Author : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
-# Transposed by Pascal André <andre@via.ecp.fr>
-# 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

diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index 88b0382de429c96833d8cc9eb4583febdeeece93..af9efceb72f32f897cd1f7013a8a7205c937e522 100644 (file)
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -3,6 +3,8 @@
 # Bernd Rellermeyer <100.41728@germanynet.de>, 1998/7/23.
 # Update for Koma Script Release >=2.8q
 # Juergen Spitzmueller <j.spitzmueller@gmx.de>, 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
 

diff --git a/lib/layouts/scrmacros.inc b/lib/layouts/scrmacros.inc
deleted file mode 100644 (file)
index 0d34bea..0000000
--- a/lib/layouts/scrmacros.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-# KOMA script textclass definition file.
-# Extensions for the KOMA script classes.
-# Bernd Rellermeyer <100.41728@germanynet.de>, 1998/7/12.
-
-# List style definition
-Style List
-       ObsoletedBy           Labeling
-End