]> git.lyx.org Git - lyx.git/commitdiff
Do not check for diverging input encoding if the files use XeTeX/LuaTeX
authorJuergen Spitzmueller <spitz@lyx.org>
Tue, 2 Jul 2024 14:59:28 +0000 (16:59 +0200)
committerJuergen Spitzmueller <spitz@lyx.org>
Tue, 2 Jul 2024 14:59:28 +0000 (16:59 +0200)
Fixes the problem reported at
https://marc.info/?l=lyx-users&m=171986173131406

src/insets/InsetInclude.cpp

index 92ec17169c724cea454c27d4f640a67c6742bb50..f4ecaae8a07565ed407557f6ab9fe2db4e6704f5 100644 (file)
@@ -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]."),