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

diff --git a/src/tex2lyx/Context.h b/src/tex2lyx/Context.h
index c5c45b06fb..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,7 +113,7 @@ 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()
 	 */
@@ -144,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;