X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FParser.h;h=19f0c5fbe33a61ab5bbbb5af4a06fcef8dce8fb4;hb=237193f8a888777192981136469a5d4febb8e9d8;hp=3c55a7ebb093de8da33fe98983c6046f287334c6;hpb=5f3cd55f1dcd85626277968891e5e12bc07287fc;p=lyx.git

diff --git a/src/tex2lyx/Parser.h b/src/tex2lyx/Parser.h
index 3c55a7ebb0..19f0c5fbe3 100644
--- a/src/tex2lyx/Parser.h
+++ b/src/tex2lyx/Parser.h
@@ -117,25 +117,37 @@ std::ostream & operator<<(std::ostream & os, Token const & t);
 extern void debugToken(std::ostream & os, Token const & t, unsigned int flags);
 #endif
 
-// A docstream version that supports putback even when not buffered
+/// A docstream version that supports putback even when not buffered
 class iparserdocstream
 {
 public:
-	iparserdocstream(idocstream & is) : is_(is) {};
+	typedef idocstream::int_type int_type;
 
-	operator bool() const { return is_; };
+	iparserdocstream(idocstream & is) : is_(is) {}
 
-	idocstream & docstream() { return is_; };
+	/// Like std::istream::operator bool()
+	/// Do not convert is_ implicitly to bool, since that is forbidden in C++11.
+	explicit operator bool() const { return s_.empty() ? !is_.fail() : true; }
+
+	/// change the encoding of the input stream to \p e (iconv name)
+	void setEncoding(std::string const & e);
 
 	// add to the list of characters to read before actually reading
 	// the stream
 	void putback(char_type c);
 
-	// add before the list of characters to read before actually reading
+	// add to the list of characters to read before actually reading
 	// the stream
-	void put_almost_back(docstring s);
+	void putback(docstring s);
 
+	/// Like std::istream::get()
 	iparserdocstream & get(char_type &c);
+
+	/// Like std::istream::good()
+	bool good() const { return s_.empty() ? is_.good() : true; }
+
+	/// Like std::istream::peek()
+	int_type peek() const { return s_.empty() ? is_.peek() : s_[0]; }
 private:
 	///
 	idocstream & is_;
@@ -161,7 +173,7 @@ class Parser {
 	Parser & operator=(Parser const & p);
 public:
 	///
-	Parser(idocstream & is);
+	Parser(idocstream & is, std::string const & fixedenc);
 	///
 	Parser(std::string const & s);
 	///
@@ -172,11 +184,11 @@ public:
 	 * re-reading. Useful when changing catcodes. */
 	void deparse();
 
-	/// change the iconv encoding of the input stream
-	/// according to the latex encoding and package
-	void setEncoding(std::string const & encoding, int const & package);
-	/// change the iconv encoding of the input stream
-	void setEncoding(std::string const & encoding);
+	/// 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);
+	/// 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
 	std::string getEncoding() const { return encoding_iconv_; }
 
@@ -195,6 +207,8 @@ public:
 	void pushPosition();
 	/// restore previous position
 	void popPosition();
+	/// forget last saved position
+	void dropPosition();
 	/// dump contents to screen
 	void dump() const;
 
@@ -267,9 +281,13 @@ public:
 	 * stopped at string \p end_string. Contrary to the other
 	 * methods, this uses proper catcode setting. This function is
 	 * designed to parse verbatim environments and command. The
-	 * intention is to eventually replace all of its siblings.
+	 * intention is to eventually replace all of its siblings. the
+	 * member \p first of the result tells whether the arg was
+	 * found and the member \p second is the value. If \p
+	 * allow_linebreak is false, then the parsing is limited to one line
 	 */
-	std::string const 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.
 	 * <tt>\begin{name}</tt> must be parsed already,
@@ -288,9 +306,12 @@ public:
 	Token const prev_token() const;
 	/// The current token.
 	Token const curr_token() const;
-	/// The next token.
+	/// The next token. Caution: If this is called, an encoding change is
+	/// only possible again after get_token() has been called.
 	Token const next_token();
-	/// The next but one token.
+	/// The next but one token. Caution: If this is called, an encoding
+	/// change is only possible again after get_token() has been called
+	/// twice.
 	Token const next_next_token();
 	/// Make the next token current and return that.
 	Token const get_token();
@@ -301,7 +322,9 @@ public:
 	bool skip_spaces(bool skip_comments = false);
 	/// puts back spaces (and comments if \p skip_comments is true)
 	void unskip_spaces(bool skip_comments = false);
-	///
+	/// 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();
 	/// resets the parser to initial state
 	void reset();
@@ -329,10 +352,12 @@ private:
 	std::string encoding_iconv_;
 	///
 	CatCode theCatcode_[256];
-	//
+	///
 	cat_type theCatcodesType_;
-	//
+	///
 	cat_type curr_cat_;
+	///
+	bool fixed_enc_;
 };