Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 383da773cc0c740b7521ff05f826974759c25449..9df4f50c8dbece9a6db460636db4eb27ad0e3eb9 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -4,7 +4,7 @@
 #
 # Detailed format description is available in the customization manual
 
-Format 49
+Format 58
 
 Provides stdinsets 1
 
@@ -267,6 +267,7 @@ InsetLayout TOC:Listings
        LangPreamble
                \renewcommand{\lstlistlistingname}{_(Listings[[List of Listings]])}
        EndLangPreamble
+       FixedWidthPreambleEncoding true
   HTMLTag h2
   HTMLStyle
     div.lyxtoc-flat {
@@ -287,6 +288,7 @@ InsetLayout Include:Listings
        LangPreamble
                \renewcommand{\lstlistingname}{_(Listing)}
        EndLangPreamble
+       FixedWidthPreambleEncoding true
 End
 
 InsetLayout Listings
@@ -554,9 +556,12 @@ InsetLayout Caption:Standard
        LabelString          standard
        LaTeXType            command
        LatexName            caption
+       NeedProtect          1
+       MultiPar             false
        Argument 1
                LabelString   "Short Title|S"
                Tooltip       "The caption as it appears in the list of figures/tables"
+               InsertCotext  1
        EndArgument
        HTMLStyle
                div.float-caption {