fix typos.

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

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 19068860efbc27dad124891264048d572d99ca2f..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,52 +62,48 @@ 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
+       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
          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='footnote'
+       HTMLLabel             \arabic{footnote}
+       HTMLInnerTag          div
        HTMLStyle
-               span.notenum { 
-                       vertical-align: super; 
-                       font-size: smaller; 
+               span.foot_label {
+                       vertical-align: super;
+                       font-size: smaller;
+                       font-weight: bold;
+                       text-decoration: underline;
                }
-               span.footnote {
-                       display: none;
-               }
-               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;
@@ -126,6 +122,8 @@ InsetLayout Note:Comment
          Size                Small
        EndFont
        MultiPar              true
+       HTMLTag               !--
+       HTMLIsBlock           false
 End
 
 
@@ -139,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
@@ -151,6 +152,14 @@ InsetLayout Note:Greyedout
          Size                Small
        EndFont
        MultiPar              true
+       HTMLStyle
+               div.note_greyedout { 
+                       background-color: #A0A0A0; 
+                       padding-left: 1ex;
+                       padding-right: 1ex;
+               }
+       EndHTMLStyle
+       HTMLIsBlock           false
 End
 
 InsetLayout ERT
@@ -211,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
@@ -235,7 +236,6 @@ InsetLayout Index
        MultiPar              false
        CustomPars            false
        ForcePlain            true
-       NeedProtect           true
 End
 
 InsetLayout Box
@@ -269,15 +269,28 @@ InsetLayout Wrap
          Size                Small
        EndFont
        MultiPar              true
+       HTMLStyle
+               div.wrap { 
+                       float: right;
+                       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
@@ -288,7 +301,7 @@ InsetLayout URL
          Color               urllabel
          Size                Small
        EndFont
-       Requires              url
+       HTMLIsBlock           false
 End
 
 InsetLayout OptArg
@@ -302,9 +315,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
@@ -314,9 +333,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
@@ -326,9 +350,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
@@ -338,10 +367,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