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

diff --git a/src/tex2lyx/Context.h b/src/tex2lyx/Context.h
index ccd9c0541b..ad95f02b0b 100644
--- a/src/tex2lyx/Context.h
+++ b/src/tex2lyx/Context.h
@@ -40,7 +40,7 @@ public:
 		family = "default";
 		series = "default";
 		shape = "default";
-		language = "default";
+		language = "english";
 	}
 	std::string size;
 	std::string family;
@@ -113,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()
 	 */
@@ -146,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;