Fix a bug involving module conflicts. We need to check not only that we

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

diff --git a/lib/layouts/manpage.layout b/lib/layouts/manpage.layout
index 718103c78fe2a1a6e4b51e53e1c38c7c0d4a321a..bfa7376b6e492faf61031af34551a00eb792f05a 100644 (file)
--- a/lib/layouts/manpage.layout
+++ b/lib/layouts/manpage.layout
@@ -1,17 +1,18 @@
 #% Do not delete he line below; configure depends on this
-#  \DeclareLinuxDocClass[manpage]{SGML (LinuxDoc manpage)}
-# LinuxDoc manpage textclass definition file. 
-# Author : José Matos <jamatos@novalis.fc.up.pt>
+#  \DeclareLinuxDocClass[manpage]{LinuxDoc manpage (SGML)}
+# LinuxDoc manpage textclass definition file.
+# Author : José Matos <jamatos@novalis.fc.up.pt>
 
-# General textclass parameters
+
+Format 10
 Columns                 1
 Sides                   1
 PageStyle               Plain
-MaxCounter              Counter_Section
 OutputType              linuxdoc
 DefaultStyle            Standard
 
 Input stdcounters.inc
+Input stdinsets.inc
 
 
 Style Standard
@@ -21,7 +22,6 @@ Style Standard
        ParIndent             MM
        ParSkip               0.4
        Align                 Block
-       AlignPossible         Block
        LabelType             No_Label
 End
 
@@ -33,7 +33,6 @@ Style Quote
        ParIndent             MM
        ParSkip               0.4
        Align                 Block
-       AlignPossible         Block
        LabelType             No_Label
 End
 
@@ -51,13 +50,11 @@ Style Section
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Counter_Subsection
-
-       Font 
+       Font
          Series              Bold
          Size                Large
        EndFont
-
-       LabelFont 
+       LabelFont
          Series              Bold
          Size                Large
        EndFont
@@ -77,7 +74,7 @@ Style Enumerate
        ParSep                0.3
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Counter_EnumI
+       LabelType             Enumerate
 End
 
 
@@ -94,12 +91,11 @@ Style Itemize
        ParSep                0.3
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Static
-       LabelString           *
+       LabelType             Itemize
+       LabelString           "*"
 End
 
 
-
 Style Description
        Margin                First_Dynamic
        LatexType             Item_environment
@@ -115,9 +111,8 @@ Style Description
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Manual
-       LabelString           MM
-
-       LabelFont 
+       LabelString           "MM"
+       LabelFont
          Series              Bold
        EndFont
 End
@@ -135,14 +130,11 @@ Style Verbatim
        BottomSep             0.7
        ParSep                0.3
        Align                 Block
-       AlignPossible         Block
        LabelType             No_Label
-
-       Font 
+       Font
          Family              Typewriter
        EndFont
-
-       LabelFont 
+       LabelFont
          Family              Typewriter
        EndFont
 End
@@ -160,7 +152,6 @@ Style Code
        BottomSep             0.7
        ParSep                0.3
        Align                 Block
-       AlignPossible         Block
        LabelType             No_Label
        FreeSpacing           1
 End
@@ -175,7 +166,6 @@ Style SGML
        ParSkip               0.4
        ParSep                0.5
        Align                 Left
-       AlignPossible         Block
        LabelType             No_Label
        FreeSpacing           1
        PassThru              1