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

diff --git a/src/tex2lyx/Context.cpp b/src/tex2lyx/Context.cpp
index ecf6a14199..2f49a071f5 100644
--- a/src/tex2lyx/Context.cpp
+++ b/src/tex2lyx/Context.cpp
@@ -82,7 +82,8 @@ Context::Context(bool need_layout_,
 	: need_layout(need_layout_),
 	  need_end_layout(false), need_end_deeper(false),
 	  has_item(false), deeper_paragraph(false),
-	  new_layout_allowed(true), textclass(textclass_),
+	  new_layout_allowed(true), merging_hyphens_allowed(true),
+	  textclass(textclass_),
 	  layout(layout_), parent_layout(parent_layout_),
 	  font(font_)
 {
@@ -96,7 +97,7 @@ Context::Context(bool need_layout_,
 Context::~Context()
 {
 	if (!par_extra_stuff.empty())
-		cerr << "Bug: Ignoring par-level extra stuff '" 
+		cerr << "Bug: Ignoring par-level extra stuff '"
 		     << par_extra_stuff << '\'' << endl;
 }
 
@@ -115,7 +116,7 @@ void Context::begin_layout(ostream & os, Layout const * const & l)
 	// \\Huge par1 \\par par2
 	// FIXME: If the document language is not english this outputs a
 	// superflous language change. Fortunately this is only file format
-	// bloat an does not change the TeX export of LyX.
+	// bloat and does not change the TeX export of LyX.
 	output_font_change(os, normalfont, font);
 }
 
@@ -153,7 +154,6 @@ void Context::check_layout(ostream & os)
 		}
 		need_layout = false;
 		need_end_layout = true;
-		os << "\n";
 		empty = false;
 	}
 }
@@ -241,6 +241,8 @@ void Context::dump(ostream & os, string const & desc) const
 		os << "deeper_paragraph ";
 	if (new_layout_allowed)
 		os << "new_layout_allowed ";
+	if (merging_hyphens_allowed)
+		os << "merging_hyphens_allowed ";
 	if (!extra_stuff.empty())
 		os << "extrastuff=[" << extra_stuff << "] ";
 	if (!par_extra_stuff.empty())