Fix bug #7212: Paragraph::forToc has to include the labelString.

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index 52074751bd2aeeea5a9c1d8868df8c3be3f1757f..f3d2197278b4617562ceea27195ef2acd25a94fd 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -306,6 +306,8 @@ protected:
        int max_toclevel_;
        /// Citation formatting information
        std::map<std::string, std::string> cite_formats_;
+       /// Citation macros
+       std::map<std::string, std::string> cite_macros_;
 private:
        ///////////////////////////////////////////////////////////////////
        // helper routines for reading layout files
@@ -329,7 +331,7 @@ private:
        ///
        void readCharStyle(Lexer &, std::string const &);
        ///
-       void readFloat(Lexer &);
+       bool readFloat(Lexer &);
        ///
        void readCiteFormat(Lexer &);
 };
@@ -429,6 +431,8 @@ public:
        bool hasTocLevels() const;
        ///
        std::string const & getCiteFormat(std::string const & entry_type) const;
+       ///
+       std::string const & getCiteMacro(std::string const & macro) const;
 protected:
        /// Constructs a DocumentClass based upon a LayoutFile.
        DocumentClass(LayoutFile const & tc);
@@ -476,6 +480,9 @@ private:
 /// convert page sides option to text 1 or 2
 std::ostream & operator<<(std::ostream & os, PageSides p);
 
+/// current format of layout files
+extern int const LAYOUT_FORMAT;
+
 
 } // namespace lyx