Fix the tab ordering of PanelStack and PrefsUi.

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

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 79b9676cf240edd0db82eb24737481d2db73ffa7..89c8d6bdaec0d8d47a17e420d418f9a061179e1d 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -4,7 +4,7 @@
 #
 # Detailled format description is available in the customization manual
 
-Format 29
+Format 35
 
 Provides stdinsets 1
 
@@ -23,10 +23,10 @@ InsetLayout Marginal
        NeedProtect           true
        HTMLStyle
                div.marginal {
-                       border: 2px solid black; 
-                       padding: 1ex; 
-                       margin: 1ex; 
-                       background-color: #F0F0F0; 
+                       border: 2px solid black;
+                       padding: 1ex;
+                       margin: 1ex;
+                       background-color: #F0F0F0;
                        float:right;
                        font-size: small;
                        font-weight: medium;
@@ -58,8 +58,8 @@ InsetLayout Foot
                        font-weight: bold;
                        text-decoration: underline;
                }
-               div.foot { 
-                       display: inline; 
+               div.foot {
+                       display: inline;
                        font-size: small;
                        font-weight: medium;
                        font-family: serif;
@@ -67,9 +67,9 @@ InsetLayout Foot
                        font-style: normal;
                }
                div.foot_inner { display: none; }
-               div.foot:hover div.foot_inner { 
-                       display: block; 
-                       border: 1px double black; 
+               div.foot:hover div.foot_inner {
+                       display: block;
+                       border: 1px double black;
                        margin: 0em 1em;
                        padding: 1em;
                }
@@ -77,7 +77,7 @@ InsetLayout Foot
 End
 
 InsetLayout Note:Comment
-       LabelString           comment
+       LabelString           Comment
        LatexType             environment
        LatexName             comment
        BgColor               commentbg
@@ -86,13 +86,14 @@ InsetLayout Note:Comment
          Size                Small
        EndFont
        MultiPar              true
+       Display               false
        HTMLTag               !--
        HTMLIsBlock           false
 End
 
 
 InsetLayout Note:Note
-       LabelString           note
+       LabelString           Note
        LatexType             command
        LatexName             note
        BgColor               notebg
@@ -107,7 +108,7 @@ End
 
 
 InsetLayout Note:Greyedout
-       LabelString           greyedout
+       LabelString           Greyedout
        LatexType             environment
        LatexName             lyxgreyedout
        BgColor               greyedoutbg
@@ -119,10 +120,11 @@ InsetLayout Note:Greyedout
          Size                Small
        EndFont
        MultiPar              true
+       Display               false
        HTMLStyle
-               div.note_greyedout { 
+               div.note_greyedout {
                        display: inline;
-                       color: #A0A0A0; 
+                       color: #A0A0A0;
                        padding-left: 1ex;
                        padding-right: 1ex;
                }
@@ -157,6 +159,7 @@ InsetLayout Phantom
        Font
          Color               phantomtext
        EndFont
+       MultiPar              false
        CustomPars            false
        ForcePlain            true
 End
@@ -216,18 +219,81 @@ InsetLayout Box
          Size                Small
        EndFont
        MultiPar              true
+End
+
+InsetLayout Box:Frameless
+       CopyStyle Box
        HTMLStyle
-               div.Frameless { font-family: sans-serif; }
+               div.Frameless { margin: 1em; }
        EndHTMLStyle
 End
 
 InsetLayout Box:Shaded
-       BgColor               shaded
-       LabelFont
-         Color               foreground
-         Size                Small
-       EndFont
-       MultiPar              true
+       CopyStyle Box
+       BgColor shaded
+       HTMLStyle
+               div.Shaded {
+                       background-color: gray;
+                       padding: 0.5ex;
+               }
+       EndHTMLStyle
+End
+
+InsetLayout Box:Boxed
+       CopyStyle Box
+       HTMLStyle
+               div.Boxed {
+                       border: solid thick black;
+                       padding: 0.5ex;
+               }
+       EndHTMLStyle
+End
+
+InsetLayout Box:Framed
+       CopyStyle Box
+       HTMLStyle
+               div.Framed {
+                       border: solid thick black;
+                       padding: 0.5ex;
+               }
+       EndHTMLStyle
+End
+
+InsetLayout Box:ovalbox
+       CopyStyle Box
+       HTMLStyle
+               div.ovalbox {
+                       border: groove medium black;
+                       padding: 0.5ex;
+               }
+       EndHTMLStyle
+End
+
+InsetLayout Box:Ovalbox
+       CopyStyle Box
+       HTMLStyle
+               div.Ovalbox {
+                       border: ridge thick black;
+                       padding: 0.5ex;
+               }
+       EndHTMLStyle
+End
+
+InsetLayout Box:Shadowbox
+       CopyStyle Box
+       HTMLStyle
+               div.Shadowbox { border: solid gray medium; border-bottom: solid black 1ex; border-right: solid black 1ex; padding: 0.5ex; }
+       EndHTMLStyle
+End
+
+InsetLayout Box:Doublebox
+       CopyStyle Box
+       HTMLStyle
+               div.Doublebox {
+                       border: double thick black;
+                       padding: 0.5ex;
+               }
+       EndHTMLStyle
 End
 
 InsetLayout Float
@@ -252,7 +318,7 @@ InsetLayout Wrap
        MultiPar              true
        RefPrefix             wrap
        HTMLStyle
-               div.wrap { 
+               div.wrap {
                        float: right;
                        border: 2px solid black;
                        padding: 1ex;
@@ -261,7 +327,7 @@ InsetLayout Wrap
        EndHTMLStyle
 End
 
-InsetLayout URL
+InsetLayout "Flex:URL"
        LyXType               standard
        Decoration            classic
        LabelString           URL
@@ -301,8 +367,8 @@ InsetLayout Info
        HTMLStyle
                span.info { font-family: sans-serif; }
        EndHTMLStyle
-       HTMLTag            span
-       MultiPar           false
+       HTMLTag               span
+       MultiPar              false
 End
 
 InsetLayout Info:menu
@@ -316,7 +382,7 @@ InsetLayout Info:menu
        Font
          Family              sans
        EndFont
-       HTMLAttr          "class='info menu'"
+       HTMLAttr              "class='info menu'"
        HTMLStyle
                span.menu { font-family: sans-serif; }
        EndHTMLStyle
@@ -333,7 +399,7 @@ InsetLayout Info:shortcut
        Font
          Family              sans
        EndFont
-       HTMLAttr          "class='info shortcut'"
+       HTMLAttr              "class='info shortcut'"
        HTMLStyle
                span.shortcut { font-family: sans-serif; }
        EndHTMLStyle
@@ -350,7 +416,7 @@ InsetLayout Info:shortcuts
        Font
          Family              sans
        EndFont
-       HTMLAttr          "class='info shortcut'"
+       HTMLAttr              "class='info shortcut'"
        HTMLStyle
                span.shortcuts { font-family: sans-serif; }
        EndHTMLStyle