Remove 3rdparty/boost/Makefile.am

[lyx.git] / src / tex2lyx / Parser.h

diff --git a/src/tex2lyx/Parser.h b/src/tex2lyx/Parser.h
index 19f0c5fbe33a61ab5bbbb5af4a06fcef8dce8fb4..d28036710e9e4503f2538f0b6cbe2b85afa20612 100644 (file)
--- a/src/tex2lyx/Parser.h
+++ b/src/tex2lyx/Parser.h
@@ -67,7 +67,8 @@ enum {
        FLAG_OPTION     = 1 << 11, //  read [...] style option
        FLAG_BRACED     = 1 << 12, //  read {...} style argument
        FLAG_CELL       = 1 << 13, //  read table cell
-       FLAG_TABBING    = 1 << 14  //  We are inside a tabbing environment
+       FLAG_TABBING    = 1 << 14,  //  We are inside a tabbing environment
+       FLAG_RDELIM     = 1 << 15,  //  next right delimiter ends the parsing
 };
 
 
@@ -138,7 +139,7 @@ public:
 
        // add to the list of characters to read before actually reading
        // the stream
-       void putback(docstring s);
+       void putback(const docstring &s);
 
        /// Like std::istream::get()
        iparserdocstream & get(char_type &c);
@@ -186,7 +187,7 @@ public:
 
        /// change the encoding of the input stream according to \p encoding
        /// (latex name) and package \p package
-       bool setEncoding(std::string const & encoding, int const & package);
+       bool setEncoding(std::string const & encoding, int package);
        /// change the encoding of the input stream to \p encoding (iconv name)
        bool setEncoding(std::string const & encoding);
        /// get the current iconv encoding of the input stream
@@ -213,7 +214,7 @@ public:
        void dump() const;
 
        /// Does an optional argument follow after the current token?
-       bool hasOpt();
+       bool hasOpt(std::string const & l = "[");
        ///
        typedef std::pair<bool, std::string> Arg;
        /*!
@@ -221,7 +222,7 @@ public:
         * If \p allow_escaping is true, a right delimiter escaped by a
         * backslash does not count as delimiter, but is included in the
         * argument.
-        * \returns wether an argument was found in \p Arg.first and the
+        * \returns whether an argument was found in \p Arg.first and the
         * argument in \p Arg.second. \see getArg().
         */
        Arg getFullArg(char left, char right, bool allow_escaping = true);
@@ -232,7 +233,7 @@ public:
         * argument.
         * \returns the argument (without \p left and \p right) or the empty
         * string if the next non-space token is not \p left. Use
-        * getFullArg() if you need to know wether there was an empty
+        * getFullArg() if you need to know whether there was an empty
         * argument or no argument at all.
         */
        std::string getArg(char left, char right, bool allow_escaping = true);
@@ -240,7 +241,8 @@ public:
         * Like getOpt(), but distinguishes between a missing argument ""
         * and an empty argument "[]".
         */
-       std::string getFullOpt(bool keepws = false);
+       std::string getFullOpt(bool keepws = false,
+                              char left = '[', char right = ']');
        /*!
         * \returns getArg('[', ']') including the brackets or the
         * empty string if there is no such argument.
@@ -257,6 +259,8 @@ public:
         * empty string if there is no such argument.
         */
        std::string getFullParentheseArg();
+       /// Check if we have a list preamble
+       bool hasListPreamble(std::string const & itemcmd);
        /*!
         * \returns the contents of the environment \p name.
         * <tt>\begin{name}</tt> must be parsed already, <tt>\end{name}</tt>
@@ -276,6 +280,11 @@ public:
         * This function is designed to parse verbatim commands.
         */
        std::string const plainCommand(char left, char right, std::string const & name);
+       /*
+        * Returns everything before the main command argument.
+        * This is where the LaTeXParam value of a layout is output.
+        */
+       std::string const getCommandLatexParam();
        /*
         * Basically the same as plainEnvironment() but the parsing is
         * stopped at string \p end_string. Contrary to the other
@@ -286,7 +295,7 @@ public:
         * found and the member \p second is the value. If \p
         * allow_linebreak is false, then the parsing is limited to one line
         */
-       Arg verbatimStuff(std::string const & end_string, 
+       Arg verbatimStuff(std::string const & end_string,
                          bool allow_linebreak = true);
        /*
         * \returns the contents of the environment \p name.
@@ -301,7 +310,7 @@ public:
        ///
        std::string verbatimOption();
        ///
-       void error(std::string const & msg);
+       void error(std::string const & msg) const;
        /// The previous token.
        Token const prev_token() const;
        /// The current token.
@@ -325,7 +334,7 @@ public:
        /// Is any further input pending()? This is not like
        /// std::istream::good(), which returns true if all available input
        /// was read, and the next attempt to read would return EOF.
-       bool good();
+       bool good() const;
        /// resets the parser to initial state
        void reset();