Forgot these.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30180 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/HTML/HTML.notes b/development/HTML/HTML.notes
index df20bbd977e2d3af3d9ecca28d5adb8e4a2988b0..bf7a870ebf77e5cdf23eba325171c8dd482a53fc 100644 (file)
--- a/development/HTML/HTML.notes
+++ b/development/HTML/HTML.notes
@@ -11,7 +11,7 @@ Known issues:
 
 These insets are basically done, though there are probably issues here and there,
        and there are even some FIXMEs:
-       Bibitem, Branch, Collapsable, Footnote, Hyperlink, Info, Label, Line, 
+       Bibitem, Branch, Caption, Collapsable, Footnote, Hyperlink, Info, Label, Line, 
        Marginal, Note, Newline, Newpage, Quotes, Space, SpecialChar, Wrap
 
 These insets do nothing for XHTML:
@@ -37,9 +37,7 @@ These insets work but still need work:
                the like, but calculating labels will be more complex---unless we just parse
                the bbl file, which of course is the only fully general solution.
        InsetFlex: I think this one is OK, but it needs some testing.
-
-These insets do not work but should be completely straightforward:
-       Caption
+       InsetFloat: This seems to work OK, but it will need testing and tweaking.
 
 These insets do not work and are not yet scheduled to work:
        InsetExternal: It may be that this won't be too hard, but I don't understand 
@@ -53,9 +51,6 @@ May need to make use here of TocWidget::itemInset, which should then be moved
 to TocBackend.
 
 These do not yet work and need some attention:
-       InsetFloat: This will need some work, again because I do not really understand
-               what these are meant to do. Presumably, we'll just use a div or something, but
-               it's not clear what subfloat means, etc.
        InsetGraphics: This should be fairly straightforward, but I'll need to learn a bit
                about export formats, etc, to get it completely right. We'll also want to make
                some use of the params, eg, on width and height. I guess there is also some

diff --git a/lib/layouts/stdfloats.inc b/lib/layouts/stdfloats.inc
index c77778e22bb4938cd8e9121e88a48637ab8de3bb..eb15ef6a45df5dc3cd85aca9b380e899c7b1d13a 100644 (file)
--- a/lib/layouts/stdfloats.inc
+++ b/lib/layouts/stdfloats.inc
@@ -4,7 +4,23 @@
 # in most LyX layouts.
 
 
-Format 11
+Format 16
+
+AddToHTMLPreamble
+       <style type="text/css">
+               div.float {
+                       border: 2px solid black;
+               }
+               div.float-caption {
+                       text-align: center;
+                       border: 2px solid black;
+                       padding: 1ex;
+                       margin-bottom: 1ex;
+               }
+       </style>
+EndPreamble
+
+
 Float
        Type                  table
        GuiName               Table

diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index e354bdfafedaa433b22c8f8fd84ad8ce78ead537..60f3cd8f90a487faed0ec146143a93ec49b82159 100644 (file)
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -60,6 +60,9 @@ import os, re, string, sys
 #   HTMLStyle, and HTMLPreamble
 # For InsetLayout:
 #   HTMLTag, HTMLAttr, HTMLStyle, and HTMLPreamble
+# For Floats:
+#   HTMLType, HTMLClass, HTMLStyle
+# These are still to be documented, once everything stabilizes.
 
 # Do not forget to document format change in Customization
 # Manual (section "Declaring a new text class").