* linguistics.module:

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

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 79d008d22c605fa146a1fcda5bca44f561c98914..d277bdcc1fcdc94f56ede208f3ee994bf420b384 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -53,7 +53,7 @@
 #                         be comma-separated.
 #End
 
-Format 16
+Format 18
 
 Provides stdinsets 1
 
@@ -76,12 +76,20 @@ InsetLayout Marginal
          Size                Small
        EndFont
        MultiPar              true
+       NeedProtect           true
+       HTMLStyle
+               div.marginal {
+                       border: 2px solid black; 
+                       padding: 1ex; 
+                       margin: 1ex; 
+                       background-color: #F0F0F0; 
+                       float:right;
+               }
+       EndHTMLStyle
 End
 
 InsetLayout Foot
        LabelString           foot
-       LatexType             command
-       LatexName             footnote
        Counter               footnote
        Font
          Color               foreground
@@ -98,24 +106,18 @@ InsetLayout Foot
          Size                Small
        EndFont
        MultiPar              true
-       HTMLTag               span
-       HTMLAttr              class='footwrapper'
-       HTMLLabel             "<span class='notenum'>\arabic{footnote}</span>"
-       HTMLInnerTag          span
-       HTMLInnerAttr         class='footnote'
+       HTMLLabel             \arabic{footnote}
+       HTMLInnerTag          div
        HTMLStyle
-               span.notenum { 
-                       vertical-align: super; 
-                       font-size: smaller; 
-               }
-               span.footnote {
-                       display: none;
-                       font-size: medium;
-                       font-weight: normal;
-                       font-style: normal;
-                       font-variant: normal;
+               span.foot_label {
+                       vertical-align: super;
+                       font-size: smaller;
+                       font-weight: bold;
+                       text-decoration: underline;
                }
-               span.footwrapper:hover span.footnote { 
+    div.foot { display: inline; }
+               div.foot_inner { display: none; }
+               div.foot:hover div.foot_inner { 
                        display: block; 
                        border: 1px double black; 
                        margin: 0em 1em;
@@ -135,6 +137,7 @@ InsetLayout Note:Comment
        EndFont
        MultiPar              true
        HTMLTag               !--
+       HTMLIsBlock           false
 End
 
 
@@ -148,8 +151,11 @@ InsetLayout Note:Note
          Size                Small
        EndFont
        MultiPar              true
+       HTMLIsBlock           false
+# FIXME HTML Need CSS
 End
 
+
 InsetLayout Note:Greyedout
        LabelString           greyedout
        LatexType             environment
@@ -160,11 +166,14 @@ InsetLayout Note:Greyedout
          Size                Small
        EndFont
        MultiPar              true
-       HTMLTag               span
-       HTMLAttr              class='notegrey'
        HTMLStyle
-               span.notegrey { color: gray; }
+               div.note_greyedout { 
+                       background-color: #A0A0A0; 
+                       padding-left: 1ex;
+                       padding-right: 1ex;
+               }
        EndHTMLStyle
+       HTMLIsBlock           false
 End
 
 InsetLayout ERT
@@ -225,12 +234,11 @@ InsetLayout Branch
        EndFont
        MultiPar              true
        InToc                 true
+       HTMLIsBlock           false
 End
 
 InsetLayout Index
        LabelString           Idx
-       LatexType             command
-       LatexName             index
        Decoration            classic
        Font
          Color               foreground
@@ -249,7 +257,6 @@ InsetLayout Index
        MultiPar              false
        CustomPars            false
        ForcePlain            true
-       NeedProtect           true
 End
 
 InsetLayout Box
@@ -283,15 +290,29 @@ InsetLayout Wrap
          Size                Small
        EndFont
        MultiPar              true
+       HTMLStyle
+               div.wrap { 
+                       float: right;
+                       width: 40%;
+                       border: 2px solid black;
+                       padding: 1ex;
+                       margin: 1ex;
+               }
+       EndHTMLStyle
 End
 
 InsetLayout URL
        LyXType               standard
-       LatexName             url
-       LatexType             command
        Decoration            classic
        LabelString           URL
+       LatexName             url
+       LatexType             command
+       Requires              url
+       MultiPar              false
+       CustomPars            false
+       ForcePlain            true
        PassThru              true
+       FreeSpacing           true
        ForceLTR              true
        Font
          Family              Typewriter
@@ -302,7 +323,7 @@ InsetLayout URL
          Color               urllabel
          Size                Small
        EndFont
-       Requires              url
+       HTMLIsBlock           false
 End
 
 InsetLayout OptArg
@@ -316,9 +337,15 @@ End
 
 InsetLayout Info
        Decoration            conglomerate
+       HTMLStyle
+               span.info { font-family: sans-serif; }
+       EndHTMLStyle
+       HTMLTag            span
+       MultiPar           false
 End
 
 InsetLayout Info:menu
+       CopyStyle             Info
        LatexType             command
        LatexName             menuitem
        Preamble
@@ -328,9 +355,14 @@ InsetLayout Info:menu
        Font
          Family              sans
        EndFont
+       HTMLAttr          "class='info menu'"
+       HTMLStyle
+               span.menu { font-family: sans-serif; }
+       EndHTMLStyle
 End
 
 InsetLayout Info:shortcut
+       CopyStyle             Info
        LatexType             command
        LatexName             shortcut
        Preamble
@@ -340,9 +372,14 @@ InsetLayout Info:shortcut
        Font
          Family              sans
        EndFont
+       HTMLAttr          "class='info shortcut'"
+       HTMLStyle
+               span.shortcut { font-family: sans-serif; }
+       EndHTMLStyle
 End
 
 InsetLayout Info:shortcuts
+       CopyStyle             Info
        LatexType             command
        LatexName             shortcut
        Preamble
@@ -352,10 +389,14 @@ InsetLayout Info:shortcuts
        Font
          Family              sans
        EndFont
+       HTMLAttr          "class='info shortcut'"
+       HTMLStyle
+               span.shortcuts { font-family: sans-serif; }
+       EndHTMLStyle
 End
 
 InsetLayout Box
        HTMLStyle
-               span.Frameless { font-family: sans-serif; }
+               div.Frameless { font-family: sans-serif; }
        EndHTMLStyle
 End