stdletter.inc, letter.lyx: fix http://bugzilla.lyx.org/show_bug.cgi?id=5684

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

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index febb75d466b1c832effee6cb10de5a6d0da8b291..989e67e197bb63de51a88e083f995f6f6543eaa5 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 8
+Format 11
 
 Provides stdinsets 1
 
@@ -143,6 +149,8 @@ InsetLayout ERT
          Size                Small
        EndFont
        MultiPar              true
+       CustomPars            false
+       ForcePlain            true
        PassThru              true
        KeepEmpty             true
        FreeSpacing           true
@@ -198,6 +206,8 @@ InsetLayout Index
          Size                Small
        EndFont
        MultiPar              false
+#      CustomPars            false
+#      ForcePlain            true
        NeedProtect           true
 End
 
@@ -218,8 +228,7 @@ InsetLayout Box:Shaded
        MultiPar              true
 End
 
-InsetLayout figure
-       LabelString           Figure
+InsetLayout Float
        LabelFont
          Color               collapsable
          Size                Small
@@ -227,17 +236,7 @@ InsetLayout figure
        MultiPar              true
 End
 
-InsetLayout table
-       LabelString           Table
-       LabelFont
-         Color               collapsable
-         Size                Small
-       EndFont
-       MultiPar              true
-End
-
-InsetLayout algorithm
-       LabelString           Algorithm
+InsetLayout Wrap
        LabelFont
          Color               collapsable
          Size                Small
@@ -271,7 +270,7 @@ InsetLayout OptArg
          Color               collapsable
          Size                Small
        EndFont
-       MultiPar              false
+#      MultiPar              false
 End
 
 InsetLayout Info
@@ -294,7 +293,7 @@ InsetLayout Info:shortcut
        LatexType             command
        LatexName             shortcut
        Preamble
-         \providecommand{\shortcut}[1]{\textsf{#1}}
+         \providecommand{\shortcut}[1]{\mbox{\textsf{#1}}}
        EndPreamble
        Decoration            conglomerate
        Font