Do not output hyperref option unicode with recent hyperref versions

unicode is true by default anyway, and it is now easier to opt out
via PackageOptions

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index fe3ce0d068b1aef90b92e266cd60b59f604679da..660710b1e7049f0b120c7641f2ce6620ea63c79f 100644 (file)
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -586,6 +586,9 @@
 \TestPackageVersion{babel}{2017/11/03}
 % This introduces multiple paragraphs in multirows
 \TestPackageVersion{multirow}{2021/01/29}
+% With this version, hyperref option unicode is true
+% by default
+\TestPackageVersion{hyperref}{2021/02/04}
 
 %%% Document classes
 % The list of layout files has been put in this file here by the

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