remove spaces from label strings, part 2

[lyx.git] / lib / layouts / linuxdoc.layout

diff --git a/lib/layouts/linuxdoc.layout b/lib/layouts/linuxdoc.layout
index c75874f11bc3ee9e58e90c1a973555394589dad7..84f2a326c8a8a460efc2b9d6670c4cc96265abd7 100644 (file)
--- a/lib/layouts/linuxdoc.layout
+++ b/lib/layouts/linuxdoc.layout
@@ -1,20 +1,23 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLinuxDocClass[article]{SGML (LinuxDoc article)}
-# LinuxDoc textclass definition file. 
+#  \DeclareLinuxDocClass[article]{LinuxDoc article (SGML)}
+# LinuxDoc textclass definition file.
 # Author : Pascal André <andre@via.ecp.fr>
 
 
-# General textclass parameters
 Columns                 1
 Sides                   1
 PageStyle               Plain
-MaxCounter              Counter_Section
 OutputType              linuxdoc
 DefaultStyle            Standard
 
+ClassOptions
+    Header              "<!doctype linuxdoc system"
+End
+
 
 Input stdcounters.inc
 Input stdfloats.inc
+Input numarticle.inc
 
 
 Style Standard
@@ -51,14 +54,12 @@ Style Title
        LabelType             No_Label
        Fill_Top              1
        Fill_Bottom           1
-
-       Font 
+       Font
          Family              Sans
          Series              Bold
          Size                Largest
        EndFont
-
-       LabelFont 
+       LabelFont
          Family              Sans
          Series              Bold
          Size                Largest
@@ -77,13 +78,11 @@ Style Section
        ParSep                0.7
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Counter_Section
-       Font 
+       Font
          Series              Bold
          Size                Larger
        EndFont
-
-       LabelFont 
+       LabelFont
          Series              Bold
          Size                Larger
        EndFont
@@ -101,14 +100,11 @@ Style Subsection
        ParSep                0.5
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Counter_Subsection
-
-       Font 
+       Font
          Series              Bold
          Size                Large
        EndFont
-
-       LabelFont 
+       LabelFont
          Series              Bold
          Size                Large
        EndFont
@@ -126,13 +122,10 @@ Style Subsubsection
        ParSep                0.4
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Counter_SubSubSection
-
-       Font 
+       Font
          Series              Bold
        EndFont
-
-       LabelFont 
+       LabelFont
          Series              Bold
        EndFont
 End
@@ -148,38 +141,19 @@ Style Paragraph
        BottomSep             0.4
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Counter_Paragraph
-
-       Font 
+       Font
          Series              Bold
        EndFont
-
-       LabelFont 
+       LabelFont
          Series              Bold
        EndFont
 End
 
 
 Style Subparagraph
-       Margin                Dynamic
-       LatexType             Command
+       CopyStyle             Paragraph
        LatexName             sect4
        LeftMargin            MM
-       LabelSep              xxx
-       ParSkip               0.4
-       TopSep                0.4
-       ParSep                0.4
-       Align                 Block
-       AlignPossible         Block, Left
-       LabelType             Counter_SubParagraph
-
-       Font 
-         Series              Bold
-       EndFont
-
-       LabelFont 
-         Series              Bold
-       EndFont
 End
 
 
@@ -195,7 +169,7 @@ Style Enumerate
        ParSep                0.3
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Counter_EnumI
+       LabelType             Enumerate
 End
 
 
@@ -211,8 +185,8 @@ Style Itemize
        ParSep                0.3
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Static
-       LabelString           *
+       LabelType             Itemize
+       LabelString           "*"
 End
 
 
@@ -230,9 +204,8 @@ Style Description
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Manual
-       LabelString           MM
-
-       LabelFont 
+       LabelString           "MM"
+       LabelFont
          Series              Bold
        EndFont
 End
@@ -252,12 +225,10 @@ Style Verbatim
        AlignPossible         Block
        FreeSpacing           1
        LabelType             No_Label
-
-       Font 
+       Font
          Family              Typewriter
        EndFont
-
-       LabelFont 
+       LabelFont
          Family              Typewriter
        EndFont
 End
@@ -293,12 +264,10 @@ Style Author
        Align                 Center
        AlignPossible         Center
        LabelType             No_Label
-
-       Font 
+       Font
          Size                Larger
        EndFont
-
-       LabelFont 
+       LabelFont
          Size                Larger
        EndFont
 End
@@ -316,12 +285,10 @@ Style Date
        Align                 Center
        AlignPossible         Center
        LabelType             No_Label
-
-       Font 
+       Font
          Size                Large
        EndFont
-
-       LabelFont 
+       LabelFont
          Size                Large
        EndFont
 End
@@ -340,15 +307,13 @@ Style Abstract
        Align                 Block
        AlignPossible         Block
        LabelType             No_Label
-
-       Font 
+       Font
          Shape               Italic
        EndFont
-
-       LabelFont 
+       LabelFont
          Shape               Italic
        EndFont
-End 
+End
 
 
 Style SGML
@@ -378,10 +343,9 @@ Style Caption
        Align                 Center
        AlignPossible         Center
        LabelType             Sensitive
-       LabelString             Caption
+       LabelString           "Caption"
        OptionalArgs          1
-
-       LabelFont 
+       LabelFont
          Series              Bold
        EndFont
 End