X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=827b44992fba64cc526bdf47432a4dd1579369ff;hb=1e519d1115f41f71c253cb9e2fbb7803e9a583a9;hp=bed11deff0af715b5fea336fb56bc2feb11bd37a;hpb=2067bff2cbf32607d7fa622e39869c4065778aeb;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index bed11deff0..827b44992f 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -747,7 +747,7 @@ void LaTeXFeatures::useLanguage(Language const * lang)
 	// They use the CJK package
 	if (lang->encoding()->package() == Encoding::CJK)
 		require("CJK");
-	// japanese package is special
+	// japanese babel language is special (tied to the pLaTeX engine).
 	if (lang->encoding()->package() == Encoding::japanese)
 		require("japanese");
 }
@@ -879,8 +879,7 @@ set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
 	set<string> encs;
 	for (auto const & lang : UsedLanguages_)
 		if (lang->encoding()->latexName() != doc_encoding &&
-		    (lang->encoding()->package() == Encoding::inputenc
-		     || lang->encoding()->package() == Encoding::japanese))
+		    lang->encoding()->package() == Encoding::inputenc)
 			encs.insert(lang->encoding()->latexName());
 	return encs;
 }
@@ -1604,21 +1603,6 @@ docstring const LaTeXFeatures::getBabelPostsettings() const
 }
 
 
-bool LaTeXFeatures::needBabelLangOptions() const
-{
-	if (!lyxrc.language_global_options || params_.language->asBabelOptions())
-		return true;
-
-	LanguageList::const_iterator it  = UsedLanguages_.begin();
-	LanguageList::const_iterator end = UsedLanguages_.end();
-	for (; it != end; ++it)
-		if ((*it)->asBabelOptions())
-			return true;
-
-	return false;
-}
-
-
 string const LaTeXFeatures::loadAMSPackages() const
 {
 	ostringstream tmp;
@@ -1914,9 +1898,11 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel,
 		// encodings, only with fixed width encodings. Therefore we
 		// need to force a fixed width encoding for
 		// \lstlistlistingname and \lstlistingname (bug 9382).
-		// This needs to be consistent with InsetListings::latex().
+		// This needs to be consistent with InsetListings::latex()
+		// rsp. InsetListings::forcedEncoding().
 		bool const need_fixedwidth = !use_minted &&
 					!runparams_.isFullUnicode() &&
+		  			buffer().params().encoding().package() != Encoding::japanese &&
 					it->second.fixedwidthpreambleencoding();
 		// language dependent commands (once per document)
 		snippets.insert(i18npreamble(it->second.langpreamble(),