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

[lyx.git] / lib / layouts / stdinsets.inc

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index a83f82cd3985ec3a7fbe57f2ffcbdd8790ba812a..d7db30d6ecd6dbcc29feeb443b1dc4f7b9117887 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -35,7 +35,13 @@
 #      EndFont               Nothing to put here, it's just a markup to indicate that we are
 #                         finished with the LabelFont definition.
 #      MultiPar              Indicates that multiple paragraphs are allowed within the inset
-#                         or not. FIXME: what is the default?
+#                         or not. Defaults to false. Sets CustomPars, as well, to the same
+#                         value, and sets ForcePlain to the opposite value. If you want
+#                         those to be different, then, you must set them after you set 
+#                         MultiPar.
+# CustomPars            Whether to allow the use of the Paragraph Settings dialog. Default is
+#                         false.
+# ForcePlain            Whether to force the PlainLayout. Default is true.
 #      Decoration:           Classic, Minimalistic, Conglomerate. Decoration styles
 #      PassThru              Do not do various LaTeX conversions, like the phrases
 #                              LaTeX, LyX, quote commands, etc.
@@ -47,7 +53,7 @@
 #                         be comma-separated.
 #End
 
-Format 6
+Format 10
 
 Provides stdinsets 1
 
@@ -143,6 +149,8 @@ InsetLayout ERT
          Size                Small
        EndFont
        MultiPar              true
+       CustomPars            false
+       ForcePlain            true
        PassThru              true
        KeepEmpty             true
        FreeSpacing           true
@@ -161,10 +169,12 @@ InsetLayout Listings
          Color               foreground
          Size                Small
        EndFont
+       BgColor               listingsbg
        MultiPar              true
        PassThru              true
        KeepEmpty             true
        FreeSpacing           true
+       ForceLTR              true
 End
 
 InsetLayout Branch
@@ -182,7 +192,7 @@ InsetLayout Index
        LatexName             index
        Decoration            classic
        Font
-         Color               latex
+         Color               foreground
          Size                Small
          Family              Roman
          Shape               Up
@@ -196,6 +206,8 @@ InsetLayout Index
          Size                Small
        EndFont
        MultiPar              false
+#      CustomPars            false
+#      ForcePlain            true
        NeedProtect           true
 End
 
@@ -260,7 +272,7 @@ InsetLayout URL
          Color               urllabel
          Size                Small
        EndFont
-       Requires              url
+       Requires              url
 End
 
 InsetLayout OptArg
@@ -269,5 +281,45 @@ InsetLayout OptArg
          Color               collapsable
          Size                Small
        EndFont
-       MultiPar              false
+#      MultiPar              false
+End
+
+InsetLayout Info
+       Decoration            conglomerate
+End
+
+InsetLayout Info:menu
+       LatexType             command
+       LatexName             menuitem
+       Preamble
+         \providecommand{\menuitem}[1]{\textsf{#1}}
+       EndPreamble
+       Decoration            conglomerate
+       Font
+         Family              sans
+       EndFont
+End
+
+InsetLayout Info:shortcut
+       LatexType             command
+       LatexName             shortcut
+       Preamble
+         \providecommand{\shortcut}[1]{\mbox{\textsf{#1}}}
+       EndPreamble
+       Decoration            conglomerate
+       Font
+         Family              sans
+       EndFont
+End
+
+InsetLayout Info:shortcuts
+       LatexType             command
+       LatexName             shortcut
+       Preamble
+         \providecommand{\shortcut}[1]{\textsf{#1}}
+       EndPreamble
+       Decoration            conglomerate
+       Font
+         Family              sans
+       EndFont
 End