X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FBufferParams.cpp;h=d25dd05bac2e55da31f0afe52be4446e7a0e0fb1;hb=e6b93f7489fc0738b6097d49cb7b16eed2b4fb1e;hp=95aa9136d25c59ce5aad57f45b9ebb6bc17bd453;hpb=b296941d90ef1b09bb8c64d9f312e1fedf2c9720;p=lyx.git

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 95aa9136d2..d25dd05bac 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2191,7 +2191,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 			os << from_utf8(output_sync_macro) +"\n";
 		else if (features.runparams().flavor == Flavor::LaTeX)
 			os << "\\usepackage[active]{srcltx}\n";
-		else if (features.runparams().flavor == Flavor::PdfLaTeX)
+		else
 			os << "\\synctex=-1\n";
 	}
 
@@ -3440,8 +3440,20 @@ void BufferParams::writeEncodingPreamble(otexstream & os,
 			if (features.isRequired("japanese")
 			    || features.isProvided("inputenc"))
 				break;
-			os << "\\usepackage[" << from_ascii(encoding().latexName());
-		   	if (features.runparams().flavor == Flavor::LuaTeX
+			string const doc_encoding = encoding().latexName();
+			// The 2022 release of ucs.sty uses the default utf8
+			// inputenc encoding with 'utf8x' inputenc if the ucs
+			// package is not loaded before inputenc.
+			// This breaks existing documents that use utf8x
+			// and also makes utf8x redundant.
+			// Thus we load ucs.sty in order to keep functionality
+			// that would otherwise be silently dropped.
+			if (doc_encoding == "utf8x"
+			    && features.isAvailable("ucs-2022/08/07")
+			    && !features.isProvided("ucs"))
+				os << "\\usepackage{ucs}\n";
+			os << "\\usepackage[" << from_ascii(doc_encoding);
+			if (features.runparams().flavor == Flavor::LuaTeX
 			    || features.runparams().flavor == Flavor::DviLuaTeX)
 				os << "]{luainputenc}\n";
 			else
@@ -3805,6 +3817,7 @@ void BufferParams::copyForAdvFR(const BufferParams & bp)
 {
 	string const & lang = bp.language->lang();
 	setLanguage(lang);
+	quotes_style = bp.quotes_style;
 	layout_modules_ = bp.layout_modules_;
 	string const & doc_class = bp.documentClass().name();
 	setBaseClass(doc_class);