From d4f11c17e9c553de0b48188b0e6bea3b8986a0bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Tue, 17 Mar 2009 09:25:52 +0000 Subject: [PATCH] * Fix encoding problem following a Listing (bug 5783). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28830 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/InsetListings.cpp | 1 - src/output_latex.cpp | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp index 0b37de7829..0ce91d7b3e 100644 --- a/src/insets/InsetListings.cpp +++ b/src/insets/InsetListings.cpp @@ -238,7 +238,6 @@ int InsetListings::latex(odocstream & os, OutputParams const & runparams) const OutputParams rp = runparams; rp.moving_arg = true; docstring const caption = getCaption(rp); - runparams.encoding = rp.encoding; if (param_string.empty() && caption.empty()) os << "\n\\begin{lstlisting}\n"; else { diff --git a/src/output_latex.cpp b/src/output_latex.cpp index be294b74dd..c9538ca9a6 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -442,11 +442,8 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, // With CJK, only add switch if we have CJK content at the beginning // of the paragraph if (encoding->package() != Encoding::CJK || i == 0) { - OutputParams tmp_rp = runparams; - runparams.moving_arg = false; pair enc_switch = switchEncoding(os, bparams, runparams, *encoding); - runparams = tmp_rp; // the following is necessary after a CJK environment in a multilingual // context (nesting issue). if (par_language->encoding()->package() == Encoding::CJK &&