Fix bug #7233: amsthm does not work with the redefined \[ command of fixltx2e.

[lyx.git] / src / Floating.h

diff --git a/src/Floating.h b/src/Floating.h
index d53c2dc15690b4b98fbfd510f206cbd566919321..d50fa90870e8b86d5a3eb895f243e2f3e53df84e 100644 (file)
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -12,8 +12,6 @@
 #ifndef FLOATING_H
 #define FLOATING_H
 
-#include "support/strfwd.h"
-
 #include <string>
 
 
@@ -33,9 +31,10 @@ public:
        Floating(std::string const & type, std::string const & placement,
                 std::string const & ext, std::string const & within,
                 std::string const & style, std::string const & name,
-                std::string const & listName, std::string const & htmlType,
-                std::string const & htmlClass, std::string const & htmlStyle,
-                bool builtin = false);
+                std::string const & listName, std::string const & listCmd,
+                std::string const & refPrefix,
+                std::string const & htmlType, std::string const & htmlClass, 
+                std::string const & htmlStyle, bool builtin = false);
        ///
        std::string const & floattype() const { return floattype_; }
        ///
@@ -50,11 +49,12 @@ public:
        std::string const & name() const { return name_; }
        /// the title of a list of this kind of float
        std::string const & listName() const { return listname_; }
-       /// the command used to generate that list, in LaTeX
-       /// if needsFloatPkg() is true, then this is
-       ///   \listof{floattype()}
-       /// otherwise it is hardcoded, at present.
-       docstring const & listCommand(std::string const & lang) const;
+       /// the command used to generate that list. this has to be given
+       /// if needsFloatPkg() is false. note that this should not contain
+       /// the leading "\".
+       std::string const & listCommand() const { return listcommand_; }
+       /// prefix to use for formatted references to such floats
+       std::string const & refPrefix() const { return refprefix_; }
        ///
        bool needsFloatPkg() const { return needsfloatpkg_; }
        /// style information, for preamble
@@ -81,7 +81,9 @@ private:
        ///
        std::string listname_;
        ///
-       mutable docstring listcommand_;
+       std::string listcommand_;
+       ///
+       std::string refprefix_;
        ///
        bool needsfloatpkg_;
        ///