revert recent change to development/FORMAT (don't change history)

[lyx.git] / src / lyxlex.h

diff --git a/src/lyxlex.h b/src/lyxlex.h
index 9797b8a8a9cd81b3c48d1c83fd054662a51a1c2e..3dd942eea82c963bfccc5ca9ac5d356d5f382620 100644 (file)
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -17,6 +17,8 @@
 #ifndef LYXLEX_H
 #define LYXLEX_H
 
+#include "support/types.h"
+
 #include <boost/utility.hpp>
 
 #include <iosfwd>
@@ -96,10 +98,13 @@ public:
        ///
        bool getBool() const;
        ///
-       float getFloat() const;
+       double getFloat() const;
        ///
        std::string const getString() const;
 
+       ///
+       lyx::docstring const getDocString() const;
+
        /** Get a long string, ended by the tag `endtag'.
            This string can span several lines. The first line
            serves as a template for how many spaces the lines
@@ -131,8 +136,6 @@ public:
 
        /// extract string
        LyXLex & operator>>(std::string &);
-       /// extract float
-       LyXLex & operator>>(float &);
        /// extract double
        LyXLex & operator>>(double &);
        /// extract integer
@@ -142,8 +145,12 @@ public:
        /// extract bool
        LyXLex & operator>>(bool &);
 
+       /// Quotes a string so that reading it again with LyXLex::next(true)
+       /// gets the original string
+       static std::string const quoteString(std::string const &);
+
 private:
-       struct Pimpl;
+       class Pimpl;
        ///
        Pimpl * pimpl_;
 };
@@ -155,7 +162,8 @@ private:
     exceptions.
     @author Lgb
 */
-struct pushpophelper {
+class pushpophelper {
+public:
        ///
        pushpophelper(LyXLex & lexrc, keyword_item * i, int s) : lex(lexrc) {
                lex.pushTable(i, s);