X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FContext.cpp;h=c565a960856242e919435128a012462918683b4f;hb=5e290e4bf9fb8e7d94912dd0126751d5f6649859;hp=ecf6a14199824cbc49fa6219009a66aa8d34c219;hpb=2801f40ad2a5de39b1a9815c5b2cd7531a9ad2f3;p=lyx.git

diff --git a/src/tex2lyx/Context.cpp b/src/tex2lyx/Context.cpp
index ecf6a14199..c565a96085 100644
--- a/src/tex2lyx/Context.cpp
+++ b/src/tex2lyx/Context.cpp
@@ -41,7 +41,7 @@ void end_deeper(ostream & os)
 	os << "\n\\end_deeper";
 }
 
-}
+} // namespace
 
 
 bool operator==(TeXFont const & f1, TeXFont const & f2)
@@ -78,25 +78,27 @@ 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_),
+	  has_item(false), in_list_preamble(false), deeper_paragraph(false),
+	  new_layout_allowed(true), merging_hyphens_allowed(true),
+	  textclass(textclass_),
 	  layout(layout_), parent_layout(parent_layout_),
-	  font(font_)
+	  font(font_), tablerotation(0), in_table_cell(false), cell_align('c')
 {
 	if (!layout)
 		layout = &textclass.defaultLayout();
 	if (!parent_layout)
 		parent_layout = &textclass.defaultLayout();
+	pass_thru_cmds.clear();
 }
 
 
 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;
 }
 
@@ -114,8 +116,8 @@ void Context::begin_layout(ostream & os, Layout const * const & l)
 	// FIXME: This is not enough for things like
 	// \\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.
+	// superfluous language change. Fortunately this is only file format
+	// bloat and does not change the TeX export of LyX.
 	output_font_change(os, normalfont, font);
 }
 
@@ -139,9 +141,9 @@ void Context::check_layout(ostream & os)
 				begin_layout(os, layout);
 				has_item = false;
 			} else {
-				// a standard paragraph in an
-				// enumeration. We have to recognize
-				// that this may require a begin_deeper.
+				// A standard paragraph in a list.
+				// We have to recognize that this
+				// may require a begin_deeper.
 				if (!deeper_paragraph)
 					begin_deeper(os);
 				begin_layout(os, &textclass.defaultLayout());
@@ -153,7 +155,6 @@ void Context::check_layout(ostream & os)
 		}
 		need_layout = false;
 		need_end_layout = true;
-		os << "\n";
 		empty = false;
 	}
 }
@@ -241,10 +242,14 @@ 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())
 		os << "parextrastuff=[" << par_extra_stuff << "] ";
+	if (!list_extra_stuff.empty())
+		os << "listextrastuff=[" << list_extra_stuff << "] ";
 	os << "textclass=" << textclass.name()
 	   << " layout=" << to_utf8(layout->name())
 	   << " parent_layout=" << to_utf8(parent_layout->name()) << "] font=["