summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-05-16 21:25:43 +0000
committerKarl Berry <karl@freefriends.org>2020-05-16 21:25:43 +0000
commit74dfa355b56ae4ff3cde96e2b636198c15bcf1fc (patch)
tree35a2f503b35fdc9ad269b3b610ddf9965a260ec1 /Master/texmf-dist/tex
parent74237231bc12e187c52de51818182997c2fb3158 (diff)
hyperref (16may20)
git-svn-id: svn://tug.org/texlive/trunk@55161 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def4
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvips.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvipson.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdviwind.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hluatex.def16
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hpdftex.def4
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htex4ht.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htexture.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtex.def3
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hxetex.def4
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hyperref.sty85
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hypertex.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/nohyperref.sty2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/pd1enc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/pdfmark.def4
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/psdextra.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puarenc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puenc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puvnenc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty22
23 files changed, 39 insertions, 133 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index f1af0069261..5a732de9a03 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvipdfm.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref driver for dvipdfm]
\Hy@VersionCheck{hdvipdfm.def}
\def\Hy@PutCatalog#1{\@pdfm@mark{docview <<#1>>}}
@@ -1091,7 +1091,6 @@
\Hy@unicodefalse
\fi
\fi
- \HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@gtemp#1%
\endgroup
\let#1\Hy@gtemp
@@ -1447,7 +1446,6 @@
\let\partnumberline\@gobble
\let\chapternumberline\@gobble
\fi
- \HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@tempa{#2}%
\HyPsd@SanitizeForOutFile\Hy@tempa
\if@filesw
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index da9d4e3b5e9..00a48a73690 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvips.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref driver for dvips]
\Hy@VersionCheck{hdvips.def}
\providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
index 1148c23168d..0e38129d79e 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvipson.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref driver for dvipsone]
\Hy@VersionCheck{hdvipson.def}
\providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
index 533f86f8bb1..4f3877cf9dc 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdviwind.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref driver for dviwindo]
\Hy@VersionCheck{hdviwind.def}
\begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hluatex.def b/Master/texmf-dist/tex/latex/hyperref/hluatex.def
index 86bc1ee3a85..ae3b3e2f51d 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hluatex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hluatex.def
@@ -34,19 +34,11 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hluatex.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref driver for luaTeX]
\Hy@VersionCheck{hluatex.def}
-%% Source File: hluatex.dtx
-%% Copyright 2016 Oberdiek Package Support Group
-%% Copyright 2019 The LaTeX3 Project
-%%
-%%
-%% Derived from hpdftex.def
-%%
-%% This file may be distributed under the terms of the LPPL.
-%% See README for details.
-%% 2019-09-17,v 6.88j force unicode encoding, see issue #101
+%% 2020-05-15 v7.00e
+%% force unicode encoding, see issue #101
%% code mostly copied from hxetex.def
\HyPsd@LoadUnicode
\Hy@unicodetrue
@@ -1379,7 +1371,6 @@
\Hy@unicodefalse
\fi
\fi
- \HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@gtemp#1%
\endgroup
\let#1\Hy@gtemp
@@ -1735,7 +1726,6 @@
\let\partnumberline\@gobble
\let\chapternumberline\@gobble
\fi
- \HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@tempa{#2}%
\HyPsd@SanitizeForOutFile\Hy@tempa
\if@filesw
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index a77a540e481..6ecd504a2c8 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hpdftex.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref driver for pdfTeX]
\Hy@VersionCheck{hpdftex.def}
\pdf@ifdraftmode{%
@@ -1352,7 +1352,6 @@
\Hy@unicodefalse
\fi
\fi
- \HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@gtemp#1%
\endgroup
\let#1\Hy@gtemp
@@ -1708,7 +1707,6 @@
\let\partnumberline\@gobble
\let\chapternumberline\@gobble
\fi
- \HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@tempa{#2}%
\HyPsd@SanitizeForOutFile\Hy@tempa
\if@filesw
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index 58381fe55cf..c9062922bd3 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htex4ht.cfg}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref configuration file for TeX4ht]
\IfFileExists{\jobname.cfg}{\endinput}{}
\Preamble{html}
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
index 8076b8c5c66..4c6ace7069b 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htex4ht.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref driver for TeX4ht]
\Hy@VersionCheck{htex4ht.def}
\providecommand*{\XR@ext}{html}
diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def
index f3f5a245870..a9f822ae7ba 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htexture.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htexture.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref driver for Textures]
\Hy@VersionCheck{htexture.def}
\providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
index 11e8adf1b55..4ac9f0876fd 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtex.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref driver for VTeX in PDF/PS mode]
\Hy@VersionCheck{hvtex.def}
\providecommand*{\XR@ext}{pdf}
@@ -699,7 +699,6 @@
\let\partnumberline\@gobble
\let\chapternumberline\@gobble
\fi
- \HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@tempa{#2}%
\HyPsd@SanitizeForOutFile\Hy@tempa
\if@filesw
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index 14e148135be..c5780ff1fe3 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtexhtml.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref driver for VTeX in HTML mode]
\Hy@VersionCheck{hvtexhtm.def}
\providecommand*{\XR@ext}{htm}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
index 89a716d95db..9da511201f4 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtexmrk.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)]
\Hy@VersionCheck{hvtexmrk.def}
\providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
index 65402ed7892..2f2487e69da 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hxetex.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref driver for XeTeX]
\Hy@VersionCheck{hxetex.def}
\HyPsd@LoadUnicode
@@ -1158,7 +1158,6 @@
\Hy@unicodefalse
\fi
\fi
- \HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@gtemp#1%
\endgroup
\let#1\Hy@gtemp
@@ -1514,7 +1513,6 @@
\let\partnumberline\@gobble
\let\chapternumberline\@gobble
\fi
- \HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@tempa{#2}%
\HyPsd@SanitizeForOutFile\Hy@tempa
\if@filesw
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index 333436f3fe9..94390c4be71 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
@@ -34,7 +34,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{hyperref}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hypertext links for LaTeX]
\begingroup
\@makeother\`%
@@ -679,7 +679,6 @@
\HyPsd@EscapeTeX#1%
\Hy@unicodefalse
}{%
- \HyPsd@ToBigChars#1%
\HyPsd@EscapeTeX#1%
}%
\else
@@ -694,7 +693,6 @@
}%
\fi
\fi
- \HyPsd@XeTeXBigCharsfalse
\pdfstringdefPostHook#1%
\endgroup
}
@@ -702,79 +700,6 @@
\pdfstringdef\Hy@gtemp{#2}%
\let#1\Hy@gtemp
}
-\edef\Hy@temp{\catcode0=\the\catcode0\relax}
-\catcode\z@=12 %
-\ifxetex
- \expandafter\@firstofone
-\else
- \let\HyPsd@XeTeXBigCharstrue\@empty
- \let\HyPsd@XeTeXBigCharsfalse\@empty
- \expandafter\@gobble
-\fi
-{%
- \newif\ifHyPsd@XeTeXBigChars
- \def\HyPsd@XeTeXBigCharsfalse{%
- \global\let\ifHyPsd@XeTeXBigChars\iffalse
- }%
- \def\HyPsd@XeTeXBigCharstrue{%
- \global\let\ifHyPsd@XeTeXBigChars\iftrue
- }%
- \def\HyPsd@ToBigChars#1{%
- \ifHyPsd@XeTeXBigChars
- \EdefEscapeHex\HyPsd@UnescapedString{%
- \expandafter\@gobbletwo\HyPsd@UnescapedString
- }%
- \begingroup
- \toks@{}%
- \escapechar=92\relax
- \let\x\HyPsd@ToBigChar
- \expandafter\HyPsd@ToBigChar\HyPsd@UnescapedString
- \relax\relax\relax\relax\relax\relax\relax
- \edef\x{%
- \endgroup
- \gdef\noexpand#1{\the\toks@}%
- }%
- \x
- \fi
- }%
- \def\HyPsd@ToBigChar#1#2#3#4{%
- \ifx\relax#1\relax
- \let\x\relax
- \else
- \count@="#1#2#3#4\relax
- \let\y\@empty
- \lccode\z@=\count@
- \ifnum\count@=40 % (
- \let\y\@backslashchar
- \else
- \ifnum\count@=41 % )
- \let\y\@backslashchar
- \else
- \ifnum\count@=92 % backslash
- \let\y\@backslashchar
- \else
- \ifnum\count@=10 % newline
- \edef\y##1{\string\n}%
- \else
- \ifnum\count@=13 % carriage return
- \edef\y##1{\string\r}%
- \fi
- \fi
- \fi
- \fi
- \fi
- \lowercase{%
- \toks@\expandafter{%
- \the\expandafter\toks@
- \y
- ^^@%
- }%
- }%
- \fi
- \x
- }%
-}
-\Hy@temp
\@ifpackageloaded{linguex}{%
\let\HyLinguex@OrgB\b
\let\HyLinguex@OrgC\c
@@ -3896,31 +3821,26 @@
}
\define@key{Hyp}{pdftitle}{%
\HyXeTeX@CheckUnicode
- \HyPsd@XeTeXBigCharstrue
\HyPsd@PrerenderUnicode{#1}%
\pdfstringdef\@pdftitle{#1}%
}
\define@key{Hyp}{pdfauthor}{%
\HyXeTeX@CheckUnicode
- \HyPsd@XeTeXBigCharstrue
\HyPsd@PrerenderUnicode{#1}%
\pdfstringdef\@pdfauthor{#1}%
}
\define@key{Hyp}{pdfproducer}{%
\HyXeTeX@CheckUnicode
- \HyPsd@XeTeXBigCharstrue
\HyPsd@PrerenderUnicode{#1}%
\pdfstringdef\@pdfproducer{#1}%
}
\define@key{Hyp}{pdfcreator}{%
\HyXeTeX@CheckUnicode
- \HyPsd@XeTeXBigCharstrue
\HyPsd@PrerenderUnicode{#1}%
\pdfstringdef\@pdfcreator{#1}%
}
\define@key{Hyp}{addtopdfcreator}{%
\HyXeTeX@CheckUnicode
- \HyPsd@XeTeXBigCharstrue
\HyPsd@PrerenderUnicode{#1}%
\pdfstringdef\@pdfcreator{\@pdfcreator, #1}%
}
@@ -3938,13 +3858,11 @@
}
\define@key{Hyp}{pdfsubject}{%
\HyXeTeX@CheckUnicode
- \HyPsd@XeTeXBigCharstrue
\HyPsd@PrerenderUnicode{#1}%
\pdfstringdef\@pdfsubject{#1}%
}
\define@key{Hyp}{pdfkeywords}{%
\HyXeTeX@CheckUnicode
- \HyPsd@XeTeXBigCharstrue
\HyPsd@PrerenderUnicode{#1}%
\pdfstringdef\@pdfkeywords{#1}%
}
@@ -4025,7 +3943,6 @@
\def\HyInfo@tmp##1{%
\kv@define@key{pdfinfo}{##1}{%
\HyXeTeX@CheckUnicode
- \HyPsd@XeTeXBigCharstrue
\HyPsd@PrerenderUnicode{####1}%
\pdfstringdef\HyInfo@Value{####1}%
\global\expandafter
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index 1d63bdad66c..9ab2c5e0e64 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hypertex.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref driver for HyperTeX specials]
\Hy@VersionCheck{hypertex.def}
\providecommand*{\XR@ext}{dvi}
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index 35de390e72f..d01f0805cc1 100644
--- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
@@ -34,7 +34,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{nohyperref}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Dummy hyperref (SR)]
\RequirePackage{letltxmacro}[2008/06/13]
\let\hyper@@anchor\@gobble
diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
index 7e751022bb6..105fac05d1f 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{pd1enc.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref: PDFDocEncoding definition (HO)]
\DeclareFontEncoding{PD1}{}{}
\DeclareTextAccent{\`}{PD1}{\textasciigrave}
diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
index 8d465e25e76..4ba70e306dc 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{pdfmark.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref definitions for pdfmark specials]
\Hy@VersionCheck{pdfmark.def}
\begingroup
@@ -1368,7 +1368,6 @@
\Hy@unicodefalse
\fi
\fi
- \HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@gtemp#1%
\endgroup
\let#1\Hy@gtemp
@@ -1724,7 +1723,6 @@
\let\partnumberline\@gobble
\let\chapternumberline\@gobble
\fi
- \HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@tempa{#2}%
\HyPsd@SanitizeForOutFile\Hy@tempa
\if@filesw
diff --git a/Master/texmf-dist/tex/latex/hyperref/psdextra.def b/Master/texmf-dist/tex/latex/hyperref/psdextra.def
index a2f2956d84f..01cb6a6f064 100644
--- a/Master/texmf-dist/tex/latex/hyperref/psdextra.def
+++ b/Master/texmf-dist/tex/latex/hyperref/psdextra.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{psdextra.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref: Additions to PDF string support]
\Hy@VersionCheck{psdextra.def}
\newcommand*{\psdmapshortnames}{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index a127d3460a6..1dcabf08306 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puarenc.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref: Additions to puenc.def for Arabi]
\DeclareTextCommand{\hamza}{PU}{\86\041}% U+0621
\DeclareTextCommand{\alefmadda}{PU}{\86\042}% U+0622
diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def
index 79a43228156..314a259a0fa 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puenc.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref: PDF Unicode definition (HO)]
\DeclareFontEncoding{PU}{}{}
\DeclareTextCommand{\`}{PU}[1]{#1\83\000}% U+0300
diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
index da0483077ee..17264532d6f 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
@@ -33,7 +33,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puvnenc.def}
- [2020/01/14 v7.00d %
+ [2020-05-15 v7.00e %
Hyperref: Additions to puenc.def for VnTeX]
\DeclareTextCommand{\abreve}{PU}{\81\003}% U+0103
\DeclareTextCommand{\acircumflex}{PU}{\80\342}% U+00E2
diff --git a/Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty b/Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty
index aeca59dd4e8..d73ba4013fa 100644
--- a/Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty
@@ -1,6 +1,6 @@
-%% xr package (beta release)
+%% xr-hyper package (beta release)
-%% Copyright (C) 1993-2019 David Carlisle
+%% Copyright (C) 1993-2020 David Carlisle
%% This is a modified version of the xr package from the Standard LaTeX
%% tools distribution. It has some internal changes to cooperate with
@@ -72,9 +72,13 @@
%% 2019/10/03 v6.1
%% Incorporate updates to xr (including citation support)
%%
+%% 2020-05-14 v7.00e
+%% add additional braces to \r@ only if hyperref is not detected in the aux
+%% of the source document (https://github.com/latex3/hyperref/issues/118)
+%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{xr-hyper}
- [2019/10/03 v6.1 eXternal References (DPC)]
+ [2020-05-15 v7.00e eXternal References (DPC)]
\def\externaldocument{\@testopt\XR@cite{}}
\let\externalcitedocument\externaldocument
@@ -118,8 +122,14 @@
\read\@inputcheck to\XR@line
\expandafter\XR@test\XR@line...\XR@}
% 2019 update to match xr
+% 2020 don't extend r@-arguments if hyperref has been detected in the source
+% newlabel has already the right number of arguments
+\def\XR@HYPcompargs{{}{}{}}
\long\def\XR@test#1#2#3#4\XR@{%
\let\XR@tempa\@gobblethree
+ \ifx#1\HyperFirstAtBeginDocument
+ \def\XR@HYPcompargs{}%
+ \fi
\ifx#1\newlabel
\let\XR@tempa\@firstofthree
\else\ifx#1\XR@bibcite
@@ -128,7 +138,7 @@
\let\XR@tempa\@thirdofthree
\fi\fi\fi
\XR@tempa
- {\expandafter\protected@xdef\csname r@\XR@prefix#2\endcsname{\XR@addURL{#3}{}{}{}}}%
+ {\expandafter\protected@xdef\csname r@\XR@prefix#2\endcsname{\XR@addURL{#3}\XR@HYPcompargs}}%
{\expandafter\bibcite\expandafter{\XR@prefix#2}{#3}}%
{\edef\XR@list{\XR@list\filename@area#2\relax}}%
\ifeof\@inputcheck\expandafter\XR@aux
@@ -157,6 +167,4 @@
\endinput
%%
-%% End of file `xr.sty'.
-
-
+%% End of file `xr-hyper.sty'.