anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not check for diverging input encoding if the files use XeTeX/LuaTeX

Browse Source 
Fixes the problem reported at
https://marc.info/?l=lyx-users&m=171986173131406

(cherry picked from commit 4ed8bfb974)
This commit is contained in:
Juergen Spitzmueller 2024-07-02 16:59:28 +02:00 committed by Richard Kimberly Heck
parent a1141c32eb
commit b295b39de1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ANNOUNCE
View File

@ -73,7 +73,7 @@ What's new
* DOCUMENT INPUT/OUTPUT
- Set cursor font after pasting to PassThru (e.g., ERT) inset (bug 12592).
-Do not check for diverging input encoding if the files use XeTeX/LuaTeX
- The g-brief and g-brief2 letter classes load babel internally. LyX now
is aware of that.
@ -97,6 +97,8 @@ What's new
- Fix crash when deleting rows or columns from table.
- Set cursor font after pasting to PassThru (e.g., ERT) inset (bug 12592).
- Do not ask about unapplied changes if dialog has been closed.
- Fix wrong position of conversion windows of the input method (bugs 11723,

3
src/insets/InsetInclude.cpp
View 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]."),