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

tex2lyx: consider utf8 default encoding in newer LaTeX

Browse Source
This commit is contained in:
Juergen Spitzmueller 2022-12-28 11:42:59 +01:00
parent 9df0e943db
commit 32b5d253d1
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tex2lyx/Preamble.cpp
View File

@ -17,6 +17,7 @@
#include "tex2lyx.h" #include "tex2lyx.h"
#include "Encoding.h" #include "Encoding.h"
#include "LaTeXPackages.h"
#include "LayoutFile.h" #include "LayoutFile.h"
#include "Lexer.h" #include "Lexer.h"
#include "TextClass.h" #include "TextClass.h"
@ -757,7 +758,11 @@ void Preamble::handle_package(Parser &p, string const & name,
registerAutomaticallyLoadedPackage("fontspec"); registerAutomaticallyLoadedPackage("fontspec");
if (h_inputencoding == "auto-legacy") if (h_inputencoding == "auto-legacy")
p.setEncoding("UTF-8"); p.setEncoding("UTF-8");
} } else if (h_inputencoding == "auto-legacy"
&& LaTeXPackages::isAvailableAtLeastFrom("LaTeX", 2018, 04))
// As of LaTeX 2018/04/01, utf8 is the default input encoding
// So use that if no inputencoding is set
h_inputencoding = "utf8";
// vector of all options for easier parsing and // vector of all options for easier parsing and
// skipping // skipping
@ -1694,8 +1699,10 @@ void Preamble::handle_package(Parser &p, string const & name,
cerr << "Unknown encoding " << encoding cerr << "Unknown encoding " << encoding
<< ". Ignoring." << std::endl; << ". Ignoring." << std::endl;
} else { } else {
if (!enc->unsafe() && options.size() == 1 && one_language == true) if (!enc->unsafe() && options.size() == 1 && one_language == true) {
h_inputencoding = enc->name(); h_inputencoding = enc->name();
docencoding = enc->iconvName();
}
p.setEncoding(enc->iconvName()); p.setEncoding(enc->iconvName());
} }
options.clear(); options.clear();