* 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 d3dd3bbc2ab0ed462a6c03b74262d9b3640fad2e..2b39813c518a1d6f8531b42df50f8cc961ffa183 100644 (file)
--- 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 81e295c84b62ba84908a02199b51cf8053add01f..3b66a68de395f3966f2e0bf8ea039f3c309a927c 100644 (file)
--- 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 7407fc4834852ee69aa86c338eba51f79c65d4ba..069ad92565efa65bd5c56a8f69d94dd68d382082 100644 (file)
--- 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 db7f4ebb2d1e60550e511b0f6a8bd948023fc312..886306fdd3ba872d07115c20c33d76e2308b78b6 100644 (file)
--- 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