Allow listings insets to be edited externally.

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

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 6ee56de25ba2ee9ae198c8648400c3fabb5b78d1..e4fec966135028f1cdb11a45021dcff242d854b5 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 63
+Format 89
 
 Provides stdinsets 1
 
@@ -44,6 +44,7 @@ InsetLayout Marginal
        EndHTMLStyle
        AddToToc              marginalnote
        IsTocCaption          true
+       DocBookTag            para
 End
 
 InsetLayout Foot
@@ -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
 
 
@@ -189,6 +200,7 @@ InsetLayout Note:Greyedout
        HTMLIsBlock           false
        AddToToc              note
        IsTocCaption          true
+       NeedCProtect          true
 End
 
 InsetLayout ERT
@@ -211,6 +223,7 @@ InsetLayout ERT
        KeepEmpty             true
        FreeSpacing           true
        ForceLTR              true
+       EditExternal          true
 End
 
 InsetLayout Phantom
@@ -297,21 +310,18 @@ InsetLayout TOC:Listings
 End
 
 InsetLayout TOC:MintedListings
-       # We need the [[List of Listings]] context, since "Listings" is also
-       # the name of the inset and translated differently.
-       # "Listings[[List of Listings]]" is the name of the "List of listings"
-       # ("Listings" is the predefined english name) in minted.sty so it
-       # must be used here as well.
+       # "List of Listings" is the name of the "List of listings"
+       # in minted.sty so it must be used here as well.
        BabelPreamble
-               \addto\captions$$lang{\renewcommand{\listoflistingscaption}{_(Listings[[List of Listings]])}}
+               \addto\captions$$lang{\renewcommand{\listoflistingscaption}{_(List of Listings)}}
        EndBabelPreamble
        # The command does not need to be defined in LangPreamble, since
        # minted.sty does that already. However it needs to be redefined
        # in order to be used for non-english single-language documents.
        LangPreamble
-               \renewcommand{\listoflistingscaption}{_(Listings[[List of Listings]])}
+               \renewcommand{\listoflistingscaption}{_(List of Listings)}
        EndLangPreamble
-       FixedWidthPreambleEncoding true
+       FixedWidthPreambleEncoding false
   HTMLTag h2
   HTMLStyle
     div.lyxtoc-flat {
@@ -355,7 +365,10 @@ InsetLayout Listings
        KeepEmpty             true
        FreeSpacing           true
        ForceLTR              true
+       ForcePlain            true
+       NeedCProtect          true
        RefPrefix             lst
+       EditExternal          true
        HTMLTag               pre
        HTMLStyle
                div.float-listings {
@@ -370,6 +383,7 @@ InsetLayout Listings
                        margin: 1ex;
        }
        EndHTMLStyle
+       DocBookTag            programlisting
 End
 
 InsetLayout MintedListings
@@ -383,7 +397,7 @@ InsetLayout MintedListings
        LangPreamble
                \renewcommand{\listingscaption}{_(Listing)}
        EndLangPreamble
-       FixedWidthPreambleEncoding true
+       FixedWidthPreambleEncoding false
 End
 
 InsetLayout Branch
@@ -422,6 +436,8 @@ InsetLayout Box
          Size                Small
        EndFont
        MultiPar              true
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
 End
 
 InsetLayout Box:Frameless
@@ -429,6 +445,9 @@ InsetLayout Box:Frameless
        HTMLStyle
                div.Frameless { margin: 1em; }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='frameless'
 End
 
 InsetLayout Box:Shaded
@@ -440,6 +459,9 @@ InsetLayout Box:Shaded
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='shaded'
 End
 
 InsetLayout Box:Boxed
@@ -450,6 +472,9 @@ InsetLayout Box:Boxed
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='boxed'
 End
 
 InsetLayout Box:Framed
@@ -460,6 +485,9 @@ InsetLayout Box:Framed
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='framed'
 End
 
 InsetLayout Box:ovalbox
@@ -470,6 +498,9 @@ InsetLayout Box:ovalbox
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='ovalbox'
 End
 
 InsetLayout Box:Ovalbox
@@ -480,6 +511,9 @@ InsetLayout Box:Ovalbox
                        padding: 0.5ex;
                }
        EndHTMLStyle
+       DocBookWrapperTag     sidebar
+       DocBookTag            para
+       DocBookWrapperAttr    role='ovalbox-var'
 End
 
 InsetLayout Box:Shadowbox
@@ -487,6 +521,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
@@ -497,11 +534,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
@@ -519,7 +560,7 @@ OutlinerName figure       "Figures" #no AddToToc (built-in)
 
 InsetLayout Wrap
        LabelFont
-         Color               collapsable
+         Color               collapsible
          Size                Small
        EndFont
        MultiPar              true
@@ -548,6 +589,7 @@ InsetLayout "Flex:URL"
        PassThru              true
        FreeSpacing           true
        ForceLTR              true
+       NeedCProtect          true
        Font
          Family              Typewriter
          Color               urltext
@@ -558,12 +600,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
@@ -594,6 +638,8 @@ InsetLayout Info:menu
        HTMLStyle
                span.menu { font-family: sans-serif; }
        EndHTMLStyle
+       DocBookTag            guimenu
+       DocBookTagType        inline
 End
 
 InsetLayout Info:shortcut
@@ -611,6 +657,10 @@ InsetLayout Info:shortcut
        HTMLStyle
                span.shortcut { font-family: sans-serif; }
        EndHTMLStyle
+       DocBookWrapperTag     keycombo
+       DocBookWrapperTagType inline
+       DocBookTag            keycap
+       DocBookTagType        inline
 End
 
 InsetLayout Info:shortcuts
@@ -628,6 +678,10 @@ InsetLayout Info:shortcuts
        HTMLStyle
                span.shortcuts { font-family: sans-serif; }
        EndHTMLStyle
+       DocBookWrapperTag     keycombo
+       DocBookWrapperTagType inline
+       DocBookTag            keycap
+       DocBookTagType        inline
 End
 
 InsetLayout Caption:Standard
@@ -694,7 +748,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