anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 21:45:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Fix encoding problem following a Listing (bug 5783).

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28830 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2009-03-17 09:25:52 +00:00
parent 4e61a40a92
commit d4f11c17e9
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/insets/InsetListings.cpp
View File

@ -238,7 +238,6 @@ int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
OutputParams rp = runparams; OutputParams rp = runparams;
rp.moving_arg = true; rp.moving_arg = true;
docstring const caption = getCaption(rp); docstring const caption = getCaption(rp);
runparams.encoding = rp.encoding;
if (param_string.empty() && caption.empty()) if (param_string.empty() && caption.empty())
os << "\n\\begin{lstlisting}\n"; os << "\n\\begin{lstlisting}\n";
else { else {

3
src/output_latex.cpp
View File

@ -442,11 +442,8 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
// With CJK, only add switch if we have CJK content at the beginning // With CJK, only add switch if we have CJK content at the beginning
// of the paragraph // of the paragraph
if (encoding->package() != Encoding::CJK || i == 0) { if (encoding->package() != Encoding::CJK || i == 0) {
OutputParams tmp_rp = runparams;
runparams.moving_arg = false;
pair<bool, int> enc_switch = switchEncoding(os, bparams, runparams, pair<bool, int> enc_switch = switchEncoding(os, bparams, runparams,
*encoding); *encoding);
runparams = tmp_rp;
// the following is necessary after a CJK environment in a multilingual // the following is necessary after a CJK environment in a multilingual
// context (nesting issue). // context (nesting issue).
if (par_language->encoding()->package() == Encoding::CJK && if (par_language->encoding()->package() == Encoding::CJK &&