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 9112be9382aca78803c4865f2d6266346fc701aa..84f2a326c8a8a460efc2b9d6670c4cc96265abd7 100644 (file)
--- a/lib/layouts/linuxdoc.layout
+++ b/lib/layouts/linuxdoc.layout
@@ -1,19 +1,25 @@
 #% 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
+
 
-# Standard style definition
 Style Standard
        Margin                Static
        LatexType             Paragraph
@@ -24,7 +30,7 @@ Style Standard
        LabelType             No_Label
 End
 
-# Quote style definition
+
 Style Quote
        Margin                Static
        LatexType             Environment
@@ -36,7 +42,7 @@ Style Quote
        LabelType             No_Label
 End
 
-# Title style definition
+
 Style Title
        Margin                Static
        LatexType             Paragraph
@@ -48,23 +54,19 @@ Style Title
        LabelType             No_Label
        Fill_Top              1
        Fill_Bottom           1
-
-       # standard font definition
-       Font 
+       Font
          Family              Sans
          Series              Bold
          Size                Largest
        EndFont
-
-       # label font definition
-       LabelFont 
+       LabelFont
          Family              Sans
          Series              Bold
          Size                Largest
        EndFont
 End
 
-# Section style definition
+
 Style Section
        Margin                Dynamic
        LatexType             Command
@@ -76,21 +78,17 @@ Style Section
        ParSep                0.7
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Counter_Section
-       # standard font definition
-       Font 
+       Font
          Series              Bold
          Size                Larger
        EndFont
-
-       # label font definition
-       LabelFont 
+       LabelFont
          Series              Bold
          Size                Larger
        EndFont
 End
 
-# Subsection style definition
+
 Style Subsection
        Margin                Dynamic
        LatexType             Command
@@ -102,22 +100,17 @@ Style Subsection
        ParSep                0.5
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Counter_Subsection
-
-       # standard font definition
-       Font 
+       Font
          Series              Bold
          Size                Large
        EndFont
-
-       # label font definition
-       LabelFont 
+       LabelFont
          Series              Bold
          Size                Large
        EndFont
 End
 
-# Subsubsection style definition
+
 Style Subsubsection
        Margin                Dynamic
        LatexType             Command
@@ -129,20 +122,15 @@ Style Subsubsection
        ParSep                0.4
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Counter_SubSubSection
-
-       # standard font definition
-       Font 
+       Font
          Series              Bold
        EndFont
-
-       # label font definition
-       LabelFont 
+       LabelFont
          Series              Bold
        EndFont
 End
 
-# Paragraph style definition
+
 Style Paragraph
        Margin                Dynamic
        LatexType             Command
@@ -153,45 +141,22 @@ Style Paragraph
        BottomSep             0.4
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Counter_Paragraph
-
-       # standard font definition
-       Font 
+       Font
          Series              Bold
        EndFont
-
-       # label font definition
-       LabelFont 
+       LabelFont
          Series              Bold
        EndFont
 End
 
-# Subparagraph style definition
+
 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
-
-       # standard font definition
-       Font 
-         Series              Bold
-       EndFont
-
-       # label font definition
-       LabelFont 
-         Series              Bold
-       EndFont
 End
 
-# Enumerate style definition
+
 Style Enumerate
        Margin                Static
        LatexType             Item_Environment
@@ -204,10 +169,10 @@ Style Enumerate
        ParSep                0.3
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Counter_EnumI
+       LabelType             Enumerate
 End
 
-# Itemize style definition
+
 Style Itemize
        Margin                Static
        LatexType             Item_Environment
@@ -220,11 +185,11 @@ Style Itemize
        ParSep                0.3
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Static
-       LabelString           *
+       LabelType             Itemize
+       LabelString           "*"
 End
 
-# Description style definition
+
 Style Description
        Margin                First_Dynamic
        LatexType             Item_environment
@@ -239,15 +204,13 @@ Style Description
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Manual
-       LabelString           MM
-
-       # label font definition
-       LabelFont 
+       LabelString           "MM"
+       LabelFont
          Series              Bold
        EndFont
 End
 
-# Verbatim style definition
+
 Style Verbatim
        Margin                Static
        LatexType             environment
@@ -262,19 +225,15 @@ Style Verbatim
        AlignPossible         Block
        FreeSpacing           1
        LabelType             No_Label
-
-       # standard font definition
-       Font 
+       Font
          Family              Typewriter
        EndFont
-
-       # label font definition
-       LabelFont 
+       LabelFont
          Family              Typewriter
        EndFont
 End
 
-# Code style definition
+
 Style Code
        Margin                Static
        LatexType             Environment
@@ -292,7 +251,7 @@ Style Code
        FreeSpacing           1
 End
 
-# Author style definition
+
 Style Author
        Margin                Dynamic
        LatexType             Paragraph
@@ -305,19 +264,15 @@ Style Author
        Align                 Center
        AlignPossible         Center
        LabelType             No_Label
-
-       # standard font definition
-       Font 
+       Font
          Size                Larger
        EndFont
-
-       # label font definition
-       LabelFont 
+       LabelFont
          Size                Larger
        EndFont
 End
 
-# Date style definition
+
 Style Date
        Margin                Dynamic
        LatexType             Paragraph
@@ -330,19 +285,15 @@ Style Date
        Align                 Center
        AlignPossible         Center
        LabelType             No_Label
-
-       # standard font definition
-       Font 
+       Font
          Size                Large
        EndFont
-
-       # label font definition
-       LabelFont 
+       LabelFont
          Size                Large
        EndFont
 End
 
-# Abstract style definition
+
 Style Abstract
        Margin                Static
        LatexType             Paragraph
@@ -356,19 +307,15 @@ Style Abstract
        Align                 Block
        AlignPossible         Block
        LabelType             No_Label
-
-       # standard font definition
-       Font 
+       Font
          Shape               Italic
        EndFont
-
-       # label font definition
-       LabelFont 
+       LabelFont
          Shape               Italic
        EndFont
-End 
+End
+
 
-# SGML style definition
 Style SGML
        Margin                Static
        LatexType             Paragraph
@@ -383,3 +330,22 @@ Style SGML
        FreeSpacing           1
        PassThru              1
 End
+
+
+Style Caption
+       Margin                First_Dynamic
+       LatexType             Paragraph
+       LatexName             caption
+       NeedProtect           1
+       LabelSep              xx
+       ParSkip               0.4
+       TopSep                0.5
+       Align                 Center
+       AlignPossible         Center
+       LabelType             Sensitive
+       LabelString           "Caption"
+       OptionalArgs          1
+       LabelFont
+         Series              Bold
+       EndFont
+End