fix typos.

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

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 060d4da2711026bae332d626c5c0bb2b65be60b6..32e54a62df4a30255c05bf2bbcf16bb1e2350442 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
 
@@ -62,24 +62,16 @@ InsetLayout Marginal
        LatexType             command
        LatexName             marginpar
        Font
-         Color               foreground
          Size                Small
-         Family              Roman
-         Shape               Up
-         Series              Medium
-         Misc                No_Emph
-         Misc                No_Noun
-         Misc                No_Bar
        EndFont
        LabelFont
          Color               marginlabel
          Size                Small
        EndFont
        MultiPar              true
-       HTMLTag               span
-       HTMLAttr              class='marginal'
+       NeedProtect           true
        HTMLStyle
-               span.marginal {
+               div.marginal {
                        border: 2px solid black; 
                        padding: 1ex; 
                        margin: 1ex; 
@@ -91,42 +83,27 @@ End
 
 InsetLayout Foot
        LabelString           foot
-       LatexType             command
-       LatexName             footnote
        Counter               footnote
        Font
-         Color               foreground
          Size                Small
-         Family              Roman
-         Shape               Up
-         Series              Medium
-         Misc                No_Emph
-         Misc                No_Noun
-         Misc                No_Bar
        EndFont
        LabelFont
          Color               footlabel
          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;
@@ -146,6 +123,7 @@ InsetLayout Note:Comment
        EndFont
        MultiPar              true
        HTMLTag               !--
+       HTMLIsBlock           false
 End
 
 
@@ -159,8 +137,11 @@ InsetLayout Note:Note
          Size                Small
        EndFont
        MultiPar              true
+       HTMLIsBlock           false
+# FIXME HTML Need CSS
 End
 
+
 InsetLayout Note:Greyedout
        LabelString           greyedout
        LatexType             environment
@@ -171,11 +152,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
@@ -236,22 +220,14 @@ InsetLayout Branch
        EndFont
        MultiPar              true
        InToc                 true
+       HTMLIsBlock           false
 End
 
 InsetLayout Index
        LabelString           Idx
-       LatexType             command
-       LatexName             index
        Decoration            classic
        Font
-         Color               foreground
          Size                Small
-         Family              Roman
-         Shape               Up
-         Series              Medium
-         Misc                No_Emph
-         Misc                No_Noun
-         Misc                No_Bar
        EndFont
        LabelFont
          Color               indexlabel
@@ -260,7 +236,6 @@ InsetLayout Index
        MultiPar              false
        CustomPars            false
        ForcePlain            true
-       NeedProtect           true
 End
 
 InsetLayout Box
@@ -295,9 +270,8 @@ InsetLayout Wrap
        EndFont
        MultiPar              true
        HTMLStyle
-               span.wrap { 
+               div.wrap { 
                        float: right;
-                       width: 40%;
                        border: 2px solid black;
                        padding: 1ex;
                        margin: 1ex;
@@ -307,11 +281,16 @@ 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
@@ -322,7 +301,7 @@ InsetLayout URL
          Color               urllabel
          Size                Small
        EndFont
-       Requires              url
+       HTMLIsBlock           false
 End
 
 InsetLayout OptArg
@@ -336,14 +315,15 @@ End
 
 InsetLayout Info
        Decoration            conglomerate
-       HTMLTag           span
-       HTMLAttr          class='info'
        HTMLStyle
                span.info { font-family: sans-serif; }
        EndHTMLStyle
+       HTMLTag            span
+       MultiPar           false
 End
 
 InsetLayout Info:menu
+       CopyStyle             Info
        LatexType             command
        LatexName             menuitem
        Preamble
@@ -353,7 +333,6 @@ InsetLayout Info:menu
        Font
          Family              sans
        EndFont
-       HTMLTag           span
        HTMLAttr          "class='info menu'"
        HTMLStyle
                span.menu { font-family: sans-serif; }
@@ -361,6 +340,7 @@ InsetLayout Info:menu
 End
 
 InsetLayout Info:shortcut
+       CopyStyle             Info
        LatexType             command
        LatexName             shortcut
        Preamble
@@ -370,7 +350,6 @@ InsetLayout Info:shortcut
        Font
          Family              sans
        EndFont
-       HTMLTag           span
        HTMLAttr          "class='info shortcut'"
        HTMLStyle
                span.shortcut { font-family: sans-serif; }
@@ -378,6 +357,7 @@ InsetLayout Info:shortcut
 End
 
 InsetLayout Info:shortcuts
+       CopyStyle             Info
        LatexType             command
        LatexName             shortcut
        Preamble
@@ -387,15 +367,14 @@ InsetLayout Info:shortcuts
        Font
          Family              sans
        EndFont
-       HTMLTag           span
        HTMLAttr          "class='info shortcut'"
        HTMLStyle
-               span.shortcut { font-family: sans-serif; }
+               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