X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLexer.h;h=6335fac8da28fc0dd258ba6726051c996d616002;hb=2de30c62f8d671a8c8d4d52a6a7310e2c5ca84de;hp=887f7f77fa55293e177b6aaa87602c667eef44ec;hpb=63844ddbf9974b252f6c988d354210d6f758cd22;p=lyx.git diff --git a/src/Lexer.h b/src/Lexer.h index 887f7f77fa..6335fac8da 100644 --- a/src/Lexer.h +++ b/src/Lexer.h @@ -18,7 +18,7 @@ #define LEXER_H #include "support/strfwd.h" - +#include namespace lyx { @@ -64,10 +64,10 @@ class Lexer { public: /// initialize Lexer with no special keywords. - Lexer(); + Lexer(); /// initialize Lexer with a bunch of keywords template Lexer(LexerKeyword (&table)[N]) - : pimpl_(0) { init(table, N); } + : pimpl_(0), lastReadOk_(false) { init(table, N); } /// ~Lexer(); @@ -137,9 +137,9 @@ public: /// double getFloat() const; /// - std::string const getString() const; + std::string const getString(bool trim = false) const; /// - docstring const getDocString() const; + docstring const getDocString(bool trim = false) 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 @@ -147,7 +147,7 @@ public: each following line. This mechanism does not work perfectly if you use tabs. */ - std::string const getLongString(std::string const & endtag); + docstring getLongString(docstring const & endtag); /// Pushes a token list on a stack and replaces it with a new one. template void pushTable(LexerKeyword (&table)[N])