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 c55b0d60c8f2957bdbec5d422211504eef9135c1..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 64
+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
@@ -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
@@ -87,6 +88,8 @@ InsetLayout Foot
        EndHTMLStyle
        AddToToc              footnote
        IsTocCaption          true
+       DocBookTag            footnote
+       DocBookTagType        inline
 End
 
 InsetLayout Foot:InTitle
@@ -122,6 +125,13 @@ InsetLayout Foot:InTitle
        EndHTMLStyle
 End
 
+InsetLayout Foot:InFloatTable
+       CopyStyle             Foot
+       LatexName             tablefootnote
+       Requires              tablefootnote
+End
+
+
 InsetLayout Note:Comment
        LabelString           Comment
        LatexType             environment
@@ -143,6 +153,7 @@ InsetLayout Note:Comment
        EndHTMLStyle
        AddToToc              note
        IsTocCaption          true
+       NeedCProtect          true
 End
 
 
@@ -169,6 +180,7 @@ InsetLayout Note:Greyedout
        Requires              color,lyxgreyedout
        BgColor               greyedoutbg
        Font
+         Size                Normal
          Color               greyedouttext
        EndFont
        LabelFont
@@ -189,6 +201,7 @@ InsetLayout Note:Greyedout
        HTMLIsBlock           false
        AddToToc              note
        IsTocCaption          true
+       NeedCProtect          true
 End
 
 InsetLayout ERT
@@ -211,6 +224,7 @@ InsetLayout ERT
        KeepEmpty             true
        FreeSpacing           true
        ForceLTR              true
+       EditExternal          true
 End
 
 InsetLayout Phantom
@@ -254,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; }
@@ -352,7 +366,10 @@ InsetLayout Listings
        KeepEmpty             true
        FreeSpacing           true
        ForceLTR              true
+       ForcePlain            true
+       NeedCProtect          true
        RefPrefix             lst
+       EditExternal          true
        HTMLTag               pre
        HTMLStyle
                div.float-listings {
@@ -367,6 +384,7 @@ InsetLayout Listings
                        margin: 1ex;
        }
        EndHTMLStyle
+       DocBookTag            programlisting
 End
 
 InsetLayout MintedListings
@@ -419,6 +437,8 @@ InsetLayout Box
          Size                Small
        EndFont
        MultiPar              true
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
 End
 
 InsetLayout Box:Frameless
@@ -426,6 +446,9 @@ InsetLayout Box:Frameless
        HTMLStyle
                div.Frameless { margin: 1em; }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='frameless'
 End
 
 InsetLayout Box:Shaded
@@ -437,6 +460,9 @@ InsetLayout Box:Shaded
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='shaded'
 End
 
 InsetLayout Box:Boxed
@@ -447,6 +473,9 @@ InsetLayout Box:Boxed
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='boxed'
 End
 
 InsetLayout Box:Framed
@@ -457,6 +486,9 @@ InsetLayout Box:Framed
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='framed'
 End
 
 InsetLayout Box:ovalbox
@@ -467,6 +499,9 @@ InsetLayout Box:ovalbox
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='ovalbox'
 End
 
 InsetLayout Box:Ovalbox
@@ -477,6 +512,9 @@ InsetLayout Box:Ovalbox
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='ovalbox-var'
 End
 
 InsetLayout Box:Shadowbox
@@ -484,6 +522,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
@@ -494,11 +535,15 @@ InsetLayout Box:Doublebox
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='doublebox'
 End
 
 InsetLayout Float
+       LaTeXType             environment
        LabelFont
-         Color               collapsable
+         Color               collapsible
          Size                Small
        EndFont
        MultiPar              true
@@ -516,7 +561,7 @@ OutlinerName figure       "Figures" #no AddToToc (built-in)
 
 InsetLayout Wrap
        LabelFont
-         Color               collapsable
+         Color               collapsible
          Size                Small
        EndFont
        MultiPar              true
@@ -545,6 +590,7 @@ InsetLayout "Flex:URL"
        PassThru              true
        FreeSpacing           true
        ForceLTR              true
+       NeedCProtect          true
        Font
          Family              Typewriter
          Color               urltext
@@ -555,12 +601,14 @@ InsetLayout "Flex:URL"
          Size                Small
        EndFont
        HTMLIsBlock           false
+       DocBookTag            link
+       DocBookTagType        inline
 End
 
 InsetLayout Argument
        LabelString           Argument
        LabelFont
-         Color               collapsable
+         Color               collapsible
          Size                Small
        EndFont
        MultiPar              false
@@ -574,6 +622,7 @@ InsetLayout Info
        EndHTMLStyle
        HTMLTag               span
        MultiPar              false
+       SpellCheck            false
 End
 
 InsetLayout Info:menu
@@ -591,6 +640,8 @@ InsetLayout Info:menu
        HTMLStyle
                span.menu { font-family: sans-serif; }
        EndHTMLStyle
+       DocBookTag            guimenu
+       DocBookTagType        inline
 End
 
 InsetLayout Info:shortcut
@@ -608,6 +659,10 @@ InsetLayout Info:shortcut
        HTMLStyle
                span.shortcut { font-family: sans-serif; }
        EndHTMLStyle
+       DocBookWrapperTag     keycombo
+       DocBookWrapperTagType inline
+       DocBookTag            keycap
+       DocBookTagType        inline
 End
 
 InsetLayout Info:shortcuts
@@ -625,6 +680,10 @@ InsetLayout Info:shortcuts
        HTMLStyle
                span.shortcuts { font-family: sans-serif; }
        EndHTMLStyle
+       DocBookWrapperTag     keycombo
+       DocBookWrapperTagType inline
+       DocBookTag            keycap
+       DocBookTagType        inline
 End
 
 InsetLayout Caption:Standard
@@ -637,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 {
@@ -691,7 +752,21 @@ End
 
 
 InsetLayout PrintNomencl
-  HTMLTag h2
+       BabelPreamble
+               \addto\captions$$lang{%
+                       \def\eqdeclaration#1{, _(see equation[[nomencl]])\nobreakspace(#1)}%
+                       \def\pagedeclaration#1{, _(page[[nomencl]])\nobreakspace#1}%
+                       \def\nomname{_(Nomenclature[[output]])}%
+               }
+       EndBabelPreamble
+       # The command is defined for several languages in nomencl.sty. However, we need to define
+       # it anyway for the other, non suppported languages.
+       LangPreamble
+               \def\eqdeclaration#1{, _(see equation[[nomencl]])\nobreakspace(#1)}
+               \def\pagedeclaration#1{, _(page[[nomencl]])\nobreakspace#1}
+               \def\nomname{_(Nomenclature[[output]])}
+       EndLangPreamble
+       HTMLTag h2
 End
 
 InsetLayout Tabular
@@ -701,7 +776,6 @@ InsetLayout Tabular
                        display: inline-block;
                }
                td {
-                       border: 1px solid black;
                        padding: 0.5ex;
                }
        EndHTMLStyle