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

diff --git a/src/tex2lyx/Context.h b/src/tex2lyx/Context.h
index cf006f3222..ad95f02b0b 100644
--- a/src/tex2lyx/Context.h
+++ b/src/tex2lyx/Context.h
@@ -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;