commit a7c58e2ff3899fc9544296575efb6ae1061ef3f8
Author: Juergen Spitzmueller <[email protected]>
Date: Fri Feb 11 17:07:57 2022 +0100
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
---
lib/chkconfig.ltx | 3 +++
src/PDFOptions.cpp | 15 +++++++++------
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index fe3ce0d..660710b 100644
--- 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 ee2193f..1a15b0b 100644
--- 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');
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
