Improve handling of top and bottom margin

[lyx.git] / src / insets / InsetCounter.h

diff --git a/src/insets/InsetCounter.h b/src/insets/InsetCounter.h
index 44d909c38460bac0f95e49358d39cd16b78e30ce..b50f71be5602b3777d5eebbde2959915cfacb34d 100644 (file)
--- a/src/insets/InsetCounter.h
+++ b/src/insets/InsetCounter.h
@@ -39,9 +39,9 @@ public:
        int plaintext(odocstringstream & ods, OutputParams const & op,
                      size_t max_length = INT_MAX) const;
        ///
-       int docbook(odocstream &, OutputParams const &) const;
+       void docbook(XMLStream &, OutputParams const &) const;
        ///
-       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const;
        ///
        void toString(odocstream &) const;
        ///
@@ -62,7 +62,7 @@ public:
        static bool isCompatibleCommand(std::string const & s);
        //@}
        /// keys are commands, values are GUI strings
-       static const std::map<std::string, std::string> counterTable;
+       static const std::vector<std::pair<std::string, std::string>> counterTable;
        static const std::map<std::string, std::string> valueTable;
 
 protected:
@@ -82,8 +82,6 @@ private:
        docstring screenLabel() const { return screen_label_; }
        //@}
        ///
-       docstring value() const;
-       ///
        docstring lyxSaveCounter() const;
        ///
        void trackCounters(std::string const & cmd) const;