X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FContext.h;h=ad95f02b0b8bd374be5b90532146e9faeb2f468f;hb=ce8929e9b237af569934b434154d199634363268;hp=4e0c75695c677cebe28ee8d82992e7c055eb04c8;hpb=835d051ae3e6b6486f95b0871cfe3b662b5ee1db;p=lyx.git

diff --git a/src/tex2lyx/Context.h b/src/tex2lyx/Context.h
index 4e0c75695c..ad95f02b0b 100644
--- a/src/tex2lyx/Context.h
+++ b/src/tex2lyx/Context.h
@@ -40,11 +40,13 @@ public:
 		family = "default";
 		series = "default";
 		shape = "default";
+		language = "english";
 	}
 	std::string size;
 	std::string family;
 	std::string series;
 	std::string shape;
+	std::string language;
 };
 
 
@@ -111,13 +113,21 @@ public:
 	/// Add extra stuff if not already there
 	void add_extra_stuff(std::string const &);
 
+	/*!
+	 *  Add paragraph-level extra stuff if not already there. This
+	 *  will be reset at the next check_layout()
+	 */
+	void add_par_extra_stuff(std::string const &);
+
 	/// Do we need to output some \\begin_layout command before the
 	/// next characters?
 	bool need_layout;
 	/// Do we need to output some \\end_layout command
 	bool need_end_layout;
-	/// We may need to add something after this \\begin_layout command
+	/// We may need to add something after each \\begin_layout command
 	std::string extra_stuff;
+	/// We may need to add something after this \\begin_layout command
+	std::string par_extra_stuff;
 	/// If there has been an \\begin_deeper, we'll need a matching
 	/// \\end_deeper
 	bool need_end_deeper;
@@ -136,6 +146,8 @@ public:
 	 * would not work.
 	 */
 	bool new_layout_allowed;
+	/// May -- be converted to endash and --- to emdash?
+	bool merging_hyphens_allowed;
 	/// Did we output anything yet in any context?
 	static bool empty;
 
@@ -149,6 +161,9 @@ public:
 	TeXFont font;
 	/// font attributes of normal text
 	static TeXFont normalfont;
+
+private:
+	void begin_layout(std::ostream & os, Layout const * const & l);
 };