Do not throw away runparams settings of InsetText in InsetFoot::latex

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

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index e1705d317f03547c1004b9cb040f8d279c33a849..4a7cfc308f45a3b53f4b43983cf8c91244b0671f 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 69
+Format 100
 
 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
@@ -36,7 +36,7 @@ InsetLayout Marginal
                        background-color: #F0F0F0;
                        float:right;
                        font-size: small;
-                       font-weight: medium;
+                       font-weight: normal;
                        font-family: serif;
                        font-variant: normal;
                        font-style: normal;
@@ -44,10 +44,11 @@ InsetLayout Marginal
        EndHTMLStyle
        AddToToc              marginalnote
        IsTocCaption          true
+       DocBookTag            para
 End
 
 InsetLayout Foot
-       LabelString           foot
+       LabelString           Foot
        LatexType             Command
        LatexName             footnote
        Counter               footnote
@@ -72,7 +73,7 @@ InsetLayout Foot
                div.foot {
                        display: inline;
                        font-size: small;
-                       font-weight: medium;
+                       font-weight: normal;
                        font-family: serif;
                        font-variant: normal;
                        font-style: normal;
@@ -87,6 +88,8 @@ InsetLayout Foot
        EndHTMLStyle
        AddToToc              footnote
        IsTocCaption          true
+       DocBookTag            footnote
+       DocBookTagType        inline
 End
 
 InsetLayout Foot:InTitle
@@ -107,7 +110,7 @@ InsetLayout Foot:InTitle
                span.foot_intitle {
                        display: inline;
                        font-size: small;
-                       font-weight: medium;
+                       font-weight: normal;
                        font-family: serif;
                        font-variant: normal;
                        font-style: normal;
@@ -177,6 +180,7 @@ InsetLayout Note:Greyedout
        Requires              color,lyxgreyedout
        BgColor               greyedoutbg
        Font
+         Size                Normal
          Color               greyedouttext
        EndFont
        LabelFont
@@ -220,6 +224,7 @@ InsetLayout ERT
        KeepEmpty             true
        FreeSpacing           true
        ForceLTR              true
+       EditExternal          true
 End
 
 InsetLayout Phantom
@@ -263,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; }
@@ -364,6 +369,7 @@ InsetLayout Listings
        ForcePlain            true
        NeedCProtect          true
        RefPrefix             lst
+       EditExternal          true
        HTMLTag               pre
        HTMLStyle
                div.float-listings {
@@ -378,6 +384,7 @@ InsetLayout Listings
                        margin: 1ex;
        }
        EndHTMLStyle
+       DocBookTag            programlisting
 End
 
 InsetLayout MintedListings
@@ -424,12 +431,44 @@ InsetLayout Index
        PassThruChars         @|!
 End
 
+InsetLayout IndexMacro:see
+       LabelString           See
+       Decoration            classic
+       Font
+         Size                Small
+       EndFont
+       LabelFont
+         Color               indexlabel
+         Size                Small
+       EndFont
+       MultiPar              false
+       CustomPars            false
+       ForcePlain            true
+End
+
+InsetLayout IndexMacro:seealso
+       CopyStyle             IndexMacro:see
+       LabelString           "See also"
+End
+
+InsetLayout IndexMacro:sortkey
+       CopyStyle             IndexMacro:see
+       LabelString           "Sort as"
+End
+
+InsetLayout IndexMacro:subentry
+       CopyStyle             IndexMacro:see
+       LabelString           "Subentry"
+End
+
 InsetLayout Box
        LabelFont
          Color               foreground
          Size                Small
        EndFont
        MultiPar              true
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
 End
 
 InsetLayout Box:Frameless
@@ -437,6 +476,9 @@ InsetLayout Box:Frameless
        HTMLStyle
                div.Frameless { margin: 1em; }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='frameless'
 End
 
 InsetLayout Box:Shaded
@@ -448,6 +490,9 @@ InsetLayout Box:Shaded
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='shaded'
 End
 
 InsetLayout Box:Boxed
@@ -458,6 +503,9 @@ InsetLayout Box:Boxed
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='boxed'
 End
 
 InsetLayout Box:Framed
@@ -468,6 +516,9 @@ InsetLayout Box:Framed
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='framed'
 End
 
 InsetLayout Box:ovalbox
@@ -478,6 +529,9 @@ InsetLayout Box:ovalbox
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='ovalbox'
 End
 
 InsetLayout Box:Ovalbox
@@ -488,6 +542,9 @@ InsetLayout Box:Ovalbox
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='ovalbox-var'
 End
 
 InsetLayout Box:Shadowbox
@@ -495,6 +552,9 @@ InsetLayout Box:Shadowbox
        HTMLStyle
                div.Shadowbox { border: solid gray medium; border-bottom: solid black 1ex; border-right: solid black 1ex; padding: 0.5ex; }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='shadowbox'
 End
 
 InsetLayout Box:Doublebox
@@ -505,6 +565,9 @@ InsetLayout Box:Doublebox
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='doublebox'
 End
 
 InsetLayout Float
@@ -568,6 +631,8 @@ InsetLayout "Flex:URL"
          Size                Small
        EndFont
        HTMLIsBlock           false
+       DocBookTag            link
+       DocBookTagType        inline
 End
 
 InsetLayout Argument
@@ -587,6 +652,7 @@ InsetLayout Info
        EndHTMLStyle
        HTMLTag               span
        MultiPar              false
+       SpellCheck            false
 End
 
 InsetLayout Info:menu
@@ -600,10 +666,12 @@ InsetLayout Info:menu
        Font
          Family              sans
        EndFont
-       HTMLAttr              "class='info menu'"
+       HTMLClass             "info menu"
        HTMLStyle
                span.menu { font-family: sans-serif; }
        EndHTMLStyle
+       DocBookTag            guimenu
+       DocBookTagType        inline
 End
 
 InsetLayout Info:shortcut
@@ -617,10 +685,14 @@ InsetLayout Info:shortcut
        Font
          Family              sans
        EndFont
-       HTMLAttr              "class='info shortcut'"
+       HTMLClass             "info shortcut"
        HTMLStyle
                span.shortcut { font-family: sans-serif; }
        EndHTMLStyle
+       DocBookWrapperTag     keycombo
+       DocBookWrapperTagType inline
+       DocBookTag            keycap
+       DocBookTagType        inline
 End
 
 InsetLayout Info:shortcuts
@@ -634,10 +706,14 @@ InsetLayout Info:shortcuts
        Font
          Family              sans
        EndFont
-       HTMLAttr              "class='info shortcut'"
+       HTMLClass             "info shortcut"
        HTMLStyle
                span.shortcuts { font-family: sans-serif; }
        EndHTMLStyle
+       DocBookWrapperTag     keycombo
+       DocBookWrapperTagType inline
+       DocBookTag            keycap
+       DocBookTagType        inline
 End
 
 InsetLayout Caption:Standard
@@ -650,6 +726,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 {
@@ -659,7 +737,7 @@ InsetLayout Caption:Standard
                        margin: 1ex;
                }
        EndHTMLStyle
-       HTMLAttr "class='float-caption float-caption-standard'"
+       HTMLClass             "float-caption float-caption-standard"
 End
 
 
@@ -728,7 +806,6 @@ InsetLayout Tabular
                        display: inline-block;
                }
                td {
-                       border: 1px solid black;
                        padding: 0.5ex;
                }
        EndHTMLStyle