stdtoolbars.inc: correct place for \Diamond

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

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 9b4014a00b2f417bd480a6882bd391c46aa89898..08811b2ce5ac43279d8053a4d6d2f198752b3b5d 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -53,7 +53,7 @@
 #                         be comma-separated.
 #End
 
-Format 18
+Format 19
 
 Provides stdinsets 1
 
@@ -62,14 +62,7 @@ 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
@@ -77,7 +70,6 @@ InsetLayout Marginal
        EndFont
        MultiPar              true
        NeedProtect           true
-       HTMLTag               div
        HTMLStyle
                div.marginal {
                        border: 2px solid black; 
@@ -85,6 +77,11 @@ InsetLayout Marginal
                        margin: 1ex; 
                        background-color: #F0F0F0; 
                        float:right;
+                       font-size: small;
+                       font-weight: medium;
+                       font-family: serif;
+                       font-variant: normal;
+                       font-style: normal;
                }
        EndHTMLStyle
 End
@@ -93,21 +90,13 @@ InsetLayout Foot
        LabelString           foot
        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               div
        HTMLLabel             \arabic{footnote}
        HTMLInnerTag          div
        HTMLStyle
@@ -117,7 +106,14 @@ 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;
+                       font-variant: normal;
+                       font-style: normal;
+               }
                div.foot_inner { display: none; }
                div.foot:hover div.foot_inner { 
                        display: block; 
@@ -153,7 +149,6 @@ InsetLayout Note:Note
          Size                Small
        EndFont
        MultiPar              true
-       HTMLTag               div
        HTMLIsBlock           false
 # FIXME HTML Need CSS
 End
@@ -170,13 +165,13 @@ InsetLayout Note:Greyedout
        EndFont
        MultiPar              true
        HTMLStyle
-               span.note_greyedout { 
+               div.note_greyedout { 
+                       display: inline;
                        background-color: #A0A0A0; 
                        padding-left: 1ex;
                        padding-right: 1ex;
                }
        EndHTMLStyle
-       HTMLTag               div
        HTMLIsBlock           false
 End
 
@@ -245,14 +240,7 @@ InsetLayout Index
        LabelString           Idx
        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
@@ -269,6 +257,9 @@ InsetLayout Box
          Size                Small
        EndFont
        MultiPar              true
+       HTMLStyle
+               div.Frameless { font-family: sans-serif; }
+       EndHTMLStyle
 End
 
 InsetLayout Box:Shaded
@@ -286,7 +277,6 @@ InsetLayout Float
          Size                Small
        EndFont
        MultiPar              true
-       HTMLTag               div
 End
 
 InsetLayout Wrap
@@ -296,9 +286,8 @@ InsetLayout Wrap
        EndFont
        MultiPar              true
        HTMLStyle
-               span.wrap { 
+               div.wrap { 
                        float: right;
-                       width: 40%;
                        border: 2px solid black;
                        padding: 1ex;
                        margin: 1ex;
@@ -345,6 +334,7 @@ InsetLayout Info
        HTMLStyle
                span.info { font-family: sans-serif; }
        EndHTMLStyle
+       HTMLTag            span
        MultiPar           false
 End
 
@@ -359,7 +349,6 @@ InsetLayout Info:menu
        Font
          Family              sans
        EndFont
-       HTMLTag           span
        HTMLAttr          "class='info menu'"
        HTMLStyle
                span.menu { font-family: sans-serif; }
@@ -377,7 +366,6 @@ InsetLayout Info:shortcut
        Font
          Family              sans
        EndFont
-       HTMLTag           span
        HTMLAttr          "class='info shortcut'"
        HTMLStyle
                span.shortcut { font-family: sans-serif; }
@@ -395,15 +383,8 @@ InsetLayout Info:shortcuts
        Font
          Family              sans
        EndFont
-       HTMLTag           span
        HTMLAttr          "class='info shortcut'"
        HTMLStyle
-               span.shortcut { font-family: sans-serif; }
-       EndHTMLStyle
-End
-
-InsetLayout Box
-       HTMLStyle
-               span.Frameless { font-family: sans-serif; }
+               span.shortcuts { font-family: sans-serif; }
        EndHTMLStyle
 End