Bug 5562: Fix command line output of subfigure insets by introducing new OutputParams...

[features.git] / src / OutputParams.h

diff --git a/src/OutputParams.h b/src/OutputParams.h
index b4bf7f9283affddb7efc62b06348897ace218d5f..00a1e11030e896b973a35a4ddc372b82a91f0fdd 100644 (file)
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -12,13 +12,12 @@
 #ifndef OUTPUTPARAMS_H
 #define OUTPUTPARAMS_H
 
-#include "support/types.h"
+#include <string>
 
+#include "support/types.h"
+#include <boost/shared_ptr.hpp>
 #include "Changes.h"
 
-#include <string>
-#include <tr1/memory>
-
 
 namespace lyx {
 
@@ -42,6 +41,12 @@ public:
                ALIGNED
        };
 
+       enum Float {
+               NONFLOAT,
+               MAINFLOAT,
+               SUBFLOAT
+       };
+
        OutputParams(Encoding const *);
        ~OutputParams();
 
@@ -122,7 +127,7 @@ public:
            This is a hack: Make it possible to add stuff to constant
            OutputParams instances.
        */
-       std::tr1::shared_ptr<ExportData> exportdata;
+       boost::shared_ptr<ExportData> exportdata;
 
        /** Whether we are inside a comment inset. Insets that are including
         *  external files like InsetGraphics, InsetInclude and InsetExternal
@@ -137,6 +142,11 @@ public:
          */
        TableCell inTableCell;
 
+       /** Whether we are inside a float or subfloat.
+        *  Needed for subfloat detection on the command line.
+        */
+       Float inFloat;
+
        /** Whether we are inside an inset that is logically deleted.
         *  A value > 0 indicates a deleted inset.
          */