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

Do not output hyperref option unicode with recent hyperref versions

Browse Source 
unicode is true by default anyway, and it is now easier to opt out
via PackageOptions
This commit is contained in:
Juergen Spitzmueller 2022-02-11 17:07:57 +01:00
parent cd995a2bc6
commit a7c58e2ff3
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/chkconfig.ltx
View File

@ -586,6 +586,9 @@
\TestPackageVersion{babel}{2017/11/03} \TestPackageVersion{babel}{2017/11/03}
% This introduces multiple paragraphs in multirows % This introduces multiple paragraphs in multirows
\TestPackageVersion{multirow}{2021/01/29} \TestPackageVersion{multirow}{2021/01/29}
% With this version, hyperref option unicode is true
% by default
\TestPackageVersion{hyperref}{2021/02/04}
%%% Document classes %%% Document classes
% The list of layout files has been put in this file here by the % The list of layout files has been put in this file here by the

15
src/PDFOptions.cpp
View File

@ -14,6 +14,7 @@
#include "PDFOptions.h" #include "PDFOptions.h"
#include "Encoding.h" #include "Encoding.h"
#include "LaTeXFeatures.h"
#include "Lexer.h" #include "Lexer.h"
#include "OutputParams.h" #include "OutputParams.h"
#include "texstream.h" #include "texstream.h"
@ -105,10 +106,10 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
opt += runparams.hyperref_driver + ","; opt += runparams.hyperref_driver + ",";
// Since LyX uses unicode, also set the PDF strings to unicode strings // Since LyX uses unicode, also set the PDF strings to unicode strings
// with the hyperref option "unicode". (With Xe/LuaTeX and pTeX, // with the hyperref option "unicode". This is only needed with pdflatex.
// unicode=true is the default, with Japanese (platex), the option // As of 2021/02/04, unicode=true is default.
// leads to errors (even if the input encoding is UTF-8).) if (!LaTeXFeatures::isAvailable("hyperref-2021/02/04")
if (!runparams.isFullUnicode() && !runparams.use_japanese) && !runparams.isFullUnicode() && !runparams.use_japanese)
opt += "unicode=true,"; opt += "unicode=true,";
// only use the hyperref settings if hyperref is enabled by the user // only use the hyperref settings if hyperref is enabled by the user
@ -118,7 +119,8 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
// explicitly given // explicitly given
if (pdfusetitle && title.empty() && author.empty()) if (pdfusetitle && title.empty() && author.empty())
opt += "pdfusetitle,"; opt += "pdfusetitle,";
opt += "\n "; if (!opt.empty())
opt += "\n ";
opt += "bookmarks=" + convert<string>(bookmarks) + ','; opt += "bookmarks=" + convert<string>(bookmarks) + ',';
if (bookmarks) { if (bookmarks) {
opt += "bookmarksnumbered=" + convert<string>(bookmarksnumbered) + ','; opt += "bookmarksnumbered=" + convert<string>(bookmarksnumbered) + ',';
@ -127,7 +129,8 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
opt += "bookmarksopenlevel=" opt += "bookmarksopenlevel="
+ convert<string>(bookmarksopenlevel) + ','; + convert<string>(bookmarksopenlevel) + ',';
} }
opt += "\n "; if (!opt.empty())
opt += "\n ";
opt += "breaklinks=" + convert<string>(breaklinks) + ','; opt += "breaklinks=" + convert<string>(breaklinks) + ',';
opt += "pdfborder={0 0 "; opt += "pdfborder={0 0 ";
opt += (pdfborder ? '0' : '1'); opt += (pdfborder ? '0' : '1');