commit 4ed8bfb974e9bf5c626f00f4a57989c64320a568
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Tue Jul 2 16:59:28 2024 +0200
Do not check for diverging input encoding if the files use XeTeX/LuaTeX
Fixes the problem reported at
https://marc.info/?l=lyx-users&m=171986173131406
---
src/insets/InsetInclude.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 92ec17169c..f4ecaae8a0 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -846,7 +846,8 @@ void InsetInclude::latex(otexstream & os, OutputParams
const & runparams) const
from_utf8(master_tf));
Alert::warning(_("Different use-non-TeX-fonts
settings"), text, true);
}
- else if (tmp->params().inputenc !=
masterBuffer->params().inputenc) {
+ else if (!tmp->params().useNonTeXFonts // implies both files do
not use non-tex fonts
+ && tmp->params().inputenc !=
masterBuffer->params().inputenc) {
docstring text = bformat(_("Included file `%1$s'\n"
"uses input encoding \"%2$s\" [%3$s]\n"
"while parent file uses input encoding \"%4$s\"
[%5$s]."),
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
