X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FContext.cpp;h=5a04cde46e0ff3db76078bcca41bcd3bc8760309;hb=0d6c64a4eb0a3b6f1e27ba7fd342bf5cff0314a8;hp=fecc11aedfb5a6ba4babd9d2002f1dcb9600a85b;hpb=275b889501b61ae9efa266ea96a6c730b2de1f56;p=lyx.git

diff --git a/src/tex2lyx/Context.cpp b/src/tex2lyx/Context.cpp
index fecc11aedf..5a04cde46e 100644
--- a/src/tex2lyx/Context.cpp
+++ b/src/tex2lyx/Context.cpp
@@ -78,11 +78,12 @@ bool Context::empty = true;
 Context::Context(bool need_layout_,
 		 TeX2LyXDocClass const & textclass_,
 		 Layout const * layout_, Layout const * parent_layout_,
-		 TeXFont font_)
+		 TeXFont const & font_)
 	: 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_)
 {
@@ -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);
 }
 
@@ -240,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())