From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Sat, 27 Sep 2008 15:32:43 +0000 (+0000)
Subject: attempt to fix bug 5282:
X-Git-Tag: 1.6.10~3294
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4cb08129a39eff1c0bc6c1b0ed72b3ee8ad785b3;p=features.git

attempt to fix bug 5282:

* src/insets/InsetTabular.cpp:
	- keep track of encoding after passing a copy of the OutputParams.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26592 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index b87aa84cf5..433d22fbd9 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -2168,7 +2168,7 @@ int Tabular::TeXRow(odocstream & os, row_type i,
 	idx_type cell = cellIndex(i, 0);
 	shared_ptr<InsetTableCell> inset = cellInset(cell);
 	Paragraph const & par = inset->paragraphs().front();
-	string const lang =	par.getParLanguage(buffer().params())->lang();
+	string const lang = par.getParLanguage(buffer().params())->lang();
 
 	//output the top line
 	int ret = TeXTopHLine(os, i, lang);
@@ -2218,11 +2218,12 @@ int Tabular::TeXRow(odocstream & os, row_type i,
 		// pass to the OutputParams that we are in a cell and
 		// which alignment we have set.
 		// InsetNewline needs this context information.
-		OutputParams newrp = runparams;
+		OutputParams newrp(runparams);
 		newrp.inTableCell = (getAlignment(cell) == LYX_ALIGN_BLOCK)
 				    ? OutputParams::PLAIN
 				    : OutputParams::ALIGNED;
 		ret += inset->latex(os, newrp);
+		runparams.encoding = newrp.encoding;
 		if (rtl)
 			os << '}';