From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Mon, 17 Dec 2007 10:53:38 +0000 (+0000)
Subject: * src/output_latex.{cpp,h}:
X-Git-Tag: 1.6.10~6898
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=908a11997372f2a96a27e5388c15387337a6166b;p=features.git

* src/output_latex.{cpp,h}:
* src/Font.cpp:
* src/Paragraph.cpp:
	- simplify switchEncoding.

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

diff --git a/src/Font.cpp b/src/Font.cpp
index d3dd3bbc2a..2b39813c51 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -450,8 +450,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 
 	if (language()->encoding()->package() == Encoding::CJK) {
 		pair<bool, int> const c = switchEncoding(os, bparams,
-				runparams, *(runparams.encoding),
-				*(language()->encoding()));
+				runparams, *(language()->encoding()));
 		if (c.first) {
 			open_encoding_ = true;
 			count += c.second;
@@ -621,8 +620,7 @@ int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
 		// to do correct environment nesting
 		Encoding const * const ascii = encodings.getFromLyXName("ascii");
 		pair<bool, int> const c = switchEncoding(os, bparams,
-				runparams, *(runparams.encoding),
-				*ascii);
+				runparams, *ascii);
 		BOOST_ASSERT(c.first);
 		count += c.second;
 		runparams.encoding = ascii;
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 81e295c84b..3b66a68de3 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1961,8 +1961,7 @@ bool Paragraph::latex(Buffer const & buf,
 		    runparams.encoding->package() == Encoding::none &&
 		    font.language()->encoding()->package() == Encoding::none) {
 			pair<bool, int> const enc_switch = switchEncoding(os, bparams,
-					runparams, *(runparams.encoding),
-					*(font.language()->encoding()));
+					runparams, *(font.language()->encoding()));
 			if (enc_switch.first) {
 				column += enc_switch.second;
 				runparams.encoding = font.language()->encoding();
diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 7407fc4834..069ad92565 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -455,7 +455,7 @@ TeXOnePar(Buffer const & buf,
 				OutputParams tmp_rp = runparams;
 				runparams.moving_arg = false;
 				pair<bool, int> enc_switch = switchEncoding(os, bparams, runparams,
-					*(runparams.encoding), *encoding);
+					*encoding);
 				runparams = tmp_rp;
 				// the following is necessary after a CJK environment in a multilingual
 				// context (nesting issue).
@@ -865,9 +865,9 @@ void latexParagraphs(Buffer const & buf,
 
 
 pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
-		   OutputParams const & runparams, Encoding const & oldEnc,
-		   Encoding const & newEnc)
+		   OutputParams const & runparams, Encoding const & newEnc)
 {
+	Encoding const oldEnc = *runparams.encoding;
 	bool moving_arg = runparams.moving_arg;
 	if ((bparams.inputenc != "auto" && bparams.inputenc != "default")
 		|| moving_arg)
diff --git a/src/output_latex.h b/src/output_latex.h
index db7f4ebb2d..886306fdd3 100644
--- a/src/output_latex.h
+++ b/src/output_latex.h
@@ -44,12 +44,11 @@ void latexParagraphs(Buffer const & buf,
 		     OutputParams const &,
 		     std::string const & everypar = std::string());
 
-/// Switch the encoding of \p os from \p oldEnc to \p newEnc if needed.
+/// Switch the encoding of \p os from runparams.encoding to \p newEnc if needed.
 /// \return (did the encoding change?, number of characters written to \p os)
-std::pair<bool, int> switchEncoding(odocstream & os, 
+std::pair<bool, int> switchEncoding(odocstream & os,
 		     BufferParams const & bparams,
-		     OutputParams const &, Encoding const & oldEnc,
-		     Encoding const & newEnc);
+		     OutputParams const &, Encoding const & newEnc);
 
 } // namespace lyx