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

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

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index c97824bd71ed35a67f0dfeaa89c38fac9c7cb54a..074b2748d52b11ad441b554a195e007d7416d22c 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 85
+Format 95
 
 Provides stdinsets 1
 
@@ -16,7 +16,7 @@ OutlinerName index        "Index Entries" #no AddToToc (built-in)
 OutlinerName listing      "Listings" #no AddToToc (built-in)
 
 InsetLayout Marginal
-       LabelString           margin
+       LabelString           Margin
        LatexType             command
        LatexName             marginpar
        Font
@@ -48,7 +48,7 @@ InsetLayout Marginal
 End
 
 InsetLayout Foot
-       LabelString           foot
+       LabelString           Foot
        LatexType             Command
        LatexName             footnote
        Counter               footnote
@@ -180,6 +180,7 @@ InsetLayout Note:Greyedout
        Requires              color,lyxgreyedout
        BgColor               greyedoutbg
        Font
+         Size                Normal
          Color               greyedouttext
        EndFont
        LabelFont
@@ -267,11 +268,11 @@ InsetLayout TOC
       font-weight: bold;
     }
     div.lyxtoc-2 {
-      margin: 0em 0.1em 0em 1em;
+      margin: 0.5em 0.1em 0em 1em;
       font-size: large;
       font-weight: normal;
     }
-    div.lyxtoc-3 { margin: 0em 0.1em 0em 0.5em; font-size: medium; }
+    div.lyxtoc-3 { margin: 0.2em 0.1em 0em 0.5em; font-size: medium; }
     div.lyxtoc-4 { margin: 0em 0.1em 0em 0.5em; }
     div.lyxtoc-5 { margin: 0em 0.1em 0em 0.5em; }
     div.lyxtoc-6 { margin: 0em 0.1em 0em 0.5em; }
@@ -368,6 +369,7 @@ InsetLayout Listings
        ForcePlain            true
        NeedCProtect          true
        RefPrefix             lst
+       EditExternal          true
        HTMLTag               pre
        HTMLStyle
                div.float-listings {
@@ -620,6 +622,7 @@ InsetLayout Info
        EndHTMLStyle
        HTMLTag               span
        MultiPar              false
+       SpellCheck            false
 End
 
 InsetLayout Info:menu
@@ -693,6 +696,8 @@ InsetLayout Caption:Standard
                LabelString   "Short Title|S"
                Tooltip       "The caption as it appears in the list of figures/tables"
                InsertCotext  1
+        DocBookTag    titleabbrev
+        DocBookArgumentAfterMainTag  true
        EndArgument
        HTMLStyle
                div.float-caption {
@@ -771,7 +776,6 @@ InsetLayout Tabular
                        display: inline-block;
                }
                td {
-                       border: 1px solid black;
                        padding: 0.5ex;
                }
        EndHTMLStyle