Simplify CSS classes for floats.

Fixes bug #8605 and probably parts of #8755 and #9328.

(cherry picked from commit 50c139195083120fb79a215d21cedda516a3451c)

diff --git a/src/Floating.cpp b/src/Floating.cpp
index 03bde1fe249b9fee7ea0b3aebf09a25e12e9cb65..8309e79caa1297f47c313b4597f30dc3262e3e62 100644 (file)
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -44,7 +44,7 @@ Floating::Floating(string const & type, string const & placement,
 string const & Floating::htmlAttrib() const
 {
        if (html_attrib_.empty())
-               html_attrib_ = "class='float " + defaultCSSClass() + "'";
+               html_attrib_ = "class='" + defaultCSSClass() + "'";
        return html_attrib_;
 }
 

diff --git a/status.22x b/status.22x
index 89fd9173a2a18c49185a85c5435fc934d1cb71c7..1b4b5762ec4970b34823a5d83a6958bc33aab1a7 100644 (file)
--- a/status.22x
+++ b/status.22x
@@ -97,6 +97,8 @@ What's new
 
 - Fix output of floats, etc, inside environments (bug 9094).
 
+- Simplify XHTML output for floats, etc (bug 8605).
+
 - Add "dir='auto'" to body tag, which should help a lot with export of
   RTL languages (bug 8279, partly).