The branch, master, has been updated. - Log -----------------------------------------------------------------
commit dac9ec0c13f50a5b1edc01372a0f068cdb431726 Merge: 5b374e0 a3f4f2d Author: Juergen Spitzmueller <[email protected]> Date: Sun Jun 24 10:57:02 2012 +0200 Merge branch 'master' of git.lyx.org:lyx commit 5b374e0c29ac5e89ffe248792028612799424505 Author: Juergen Spitzmueller <[email protected]> Date: Sun Jun 24 10:56:08 2012 +0200 do not output empty language switch commands (bug #8216) diff --git a/src/output_latex.cpp b/src/output_latex.cpp index c5f8306..92913af 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -581,7 +581,8 @@ void TeXOnePar(Buffer const & buf, os << "\\L{"; } // With CJK, the CJK tag has to be closed first (see below) - if (runparams.encoding->package() != Encoding::CJK) { + if (runparams.encoding->package() != Encoding::CJK + && !par_lang.empty()) { os << from_ascii(subst( lang_begin_command, "$$lang", @@ -642,7 +643,8 @@ void TeXOnePar(Buffer const & buf, os << "%\n"; } // With CJK, the CJK tag had to be closed first (see above) - if (runparams.encoding->package() == Encoding::CJK) { + if (runparams.encoding->package() == Encoding::CJK + && !par_lang.empty()) { os << from_ascii(subst( lang_begin_command, "$$lang", ----------------------------------------------------------------------- Summary of changes: src/output_latex.cpp | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
