do not output empty language switch commands (bug #8216, the actual fix)

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 103a8bc42a11b88b05907a1053f9a458ad41bea5..e6deb6179a12df84e084c062e3addf917d7c7f96 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -583,7 +583,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",
@@ -644,7 +645,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",