Fix output of formatted counters.

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

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 075a49af619aaa1b7a877417ccd2a37958a745ca..853662a9c4655a73fcab52b909fae2bbae667c77 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -53,7 +53,7 @@
 #                         be comma-separated.
 #End
 
-Format 11
+Format 22
 
 Provides stdinsets 1
 
@@ -62,41 +62,66 @@ 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;
+                       font-size: small;
+                       font-weight: medium;
+                       font-family: serif;
+                       font-variant: normal;
+                       font-style: normal;
+               }
+       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
+       HTMLLabel             \arabic{footnote}
+       HTMLInnerTag          div
+       HTMLStyle
+               span.foot_label {
+                       vertical-align: super;
+                       font-size: smaller;
+                       font-weight: bold;
+                       text-decoration: underline;
+               }
+               div.foot { 
+                       display: inline; 
+                       font-size: small;
+                       font-weight: medium;
+                       font-family: serif;
+                       font-variant: normal;
+                       font-style: normal;
+               }
+               div.foot_inner { display: none; }
+               div.foot:hover div.foot_inner { 
+                       display: block; 
+                       border: 1px double black; 
+                       margin: 0em 1em;
+                       padding: 1em;
+               }
+       EndHTMLStyle
 End
 
 InsetLayout Note:Comment
@@ -109,6 +134,8 @@ InsetLayout Note:Comment
          Size                Small
        EndFont
        MultiPar              true
+       HTMLTag               !--
+       HTMLIsBlock           false
 End
 
 
@@ -122,8 +149,11 @@ InsetLayout Note:Note
          Size                Small
        EndFont
        MultiPar              true
+       HTMLIsBlock           false
+# FIXME HTML Need CSS
 End
 
+
 InsetLayout Note:Greyedout
        LabelString           greyedout
        LatexType             environment
@@ -134,6 +164,15 @@ InsetLayout Note:Greyedout
          Size                Small
        EndFont
        MultiPar              true
+       HTMLStyle
+               div.note_greyedout { 
+                       display: inline;
+                       background-color: #A0A0A0; 
+                       padding-left: 1ex;
+                       padding-right: 1ex;
+               }
+       EndHTMLStyle
+       HTMLIsBlock           false
 End
 
 InsetLayout ERT
@@ -194,22 +233,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
@@ -218,7 +249,7 @@ InsetLayout Index
        MultiPar              false
        CustomPars            false
        ForcePlain            true
-       NeedProtect           true
+       ContentAsLabel        true
 End
 
 InsetLayout Box
@@ -227,6 +258,9 @@ InsetLayout Box
          Size                Small
        EndFont
        MultiPar              true
+       HTMLStyle
+               div.Frameless { font-family: sans-serif; }
+       EndHTMLStyle
 End
 
 InsetLayout Box:Shaded
@@ -244,6 +278,12 @@ InsetLayout Float
          Size                Small
        EndFont
        MultiPar              true
+       HTMLStyle
+               div.float {
+                       border: 2px solid black;
+                       text-align: center;
+               }
+       EndHTMLStyle
 End
 
 InsetLayout Wrap
@@ -252,15 +292,29 @@ 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
+       ContentAsLabel        true
+       LatexName             url
+       LatexType             command
+       Requires              url
+       MultiPar              false
+       CustomPars            false
+       ForcePlain            true
        PassThru              true
+       FreeSpacing           true
        ForceLTR              true
        Font
          Family              Typewriter
@@ -271,7 +325,7 @@ InsetLayout URL
          Color               urllabel
          Size                Small
        EndFont
-       Requires              url
+       HTMLIsBlock           false
 End
 
 InsetLayout OptArg
@@ -285,9 +339,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
@@ -297,9 +357,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
@@ -309,9 +374,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
@@ -321,4 +391,20 @@ InsetLayout Info:shortcuts
        Font
          Family              sans
        EndFont
+       HTMLAttr          "class='info shortcut'"
+       HTMLStyle
+               span.shortcuts { font-family: sans-serif; }
+       EndHTMLStyle
 End
+
+InsetLayout Caption
+       HTMLStyle
+               div.float-caption {
+                       text-align: center;
+                       border: 2px solid black;
+                       padding: 1ex;
+                       margin: 1ex;
+               }
+       EndHTMLStyle
+End
+