mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
* 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
This commit is contained in:
parent
4e61a40a92
commit
d4f11c17e9
@ -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 {
|
||||
|
@ -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<bool, int> 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 &&
|
||||
|
Loading…
Reference in New Issue
Block a user