From 1891a47167e1e153a4175f7a58e384bf5d700e16 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 5 Oct 2019 20:50:08 +0000 Subject: hyperref (5oct19) git-svn-id: svn://tug.org/texlive/trunk@52295 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/hyperref/backref.sty | 7 +- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 7 +- Master/texmf-dist/tex/latex/hyperref/hdvips.def | 7 +- Master/texmf-dist/tex/latex/hyperref/hdvipson.def | 7 +- Master/texmf-dist/tex/latex/hyperref/hdviwind.def | 7 +- Master/texmf-dist/tex/latex/hyperref/hluatex.def | 14 +++- Master/texmf-dist/tex/latex/hyperref/hpdftex.def | 7 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg | 7 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.def | 7 +- Master/texmf-dist/tex/latex/hyperref/htexture.def | 7 +- Master/texmf-dist/tex/latex/hyperref/hvtex.def | 7 +- Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def | 7 +- Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def | 7 +- Master/texmf-dist/tex/latex/hyperref/hxetex.def | 7 +- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 62 ++++++++------ Master/texmf-dist/tex/latex/hyperref/hypertex.def | 7 +- Master/texmf-dist/tex/latex/hyperref/nameref.sty | 96 ++++++++++++++++++++-- .../texmf-dist/tex/latex/hyperref/nohyperref.sty | 7 +- Master/texmf-dist/tex/latex/hyperref/pd1enc.def | 7 +- Master/texmf-dist/tex/latex/hyperref/pdfmark.def | 7 +- Master/texmf-dist/tex/latex/hyperref/psdextra.def | 7 +- Master/texmf-dist/tex/latex/hyperref/puarenc.def | 7 +- Master/texmf-dist/tex/latex/hyperref/puenc.def | 7 +- Master/texmf-dist/tex/latex/hyperref/puvnenc.def | 7 +- Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty | 70 ++++++++++++---- 25 files changed, 279 insertions(+), 110 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/hyperref/backref.sty b/Master/texmf-dist/tex/latex/hyperref/backref.sty index cf521492949..bb04d32f9c2 100644 --- a/Master/texmf-dist/tex/latex/hyperref/backref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/backref.sty @@ -9,8 +9,9 @@ %% File: backref.dtx %% Copyright (C) 1995-2000 David Carlisle, Sebastian Rahtz, Heiko Oberdiek %% 2001-2012 Heiko Oberdiek -%% 2016 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2016-2019 Oberdiek Package Suport Group +%% 2019- The LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,7 +26,7 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is The LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index e1cfc1b1bad..233db043464 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % Hyperref driver for dvipdfm] \Hy@VersionCheck{hdvipdfm.def} \def\Hy@PutCatalog#1{\@pdfm@mark{docview <<#1>>}} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index a59c7a7ce64..f9b45473bb4 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 1e01db7ef8b..9eb1fa943f6 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 80cfb45063c..34a66d46914 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{hdviwind.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 1454eac37e1..48bf0f1368d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hluatex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hluatex.def @@ -11,7 +11,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -26,23 +27,30 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{hluatex.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 +%% code mostly copied from hxetex.def +\HyPsd@LoadUnicode +\Hy@unicodetrue +\let\HyPsd@pdfencoding\HyPsd@pdfencoding@unicode +\HyPsd@LoadStringEnc %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \protected\def\pdfcatalog {\pdfextension catalog } diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index b00d7c7afbf..f5e65814d0f 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % Hyperref driver for pdfTeX] \Hy@VersionCheck{hpdftex.def} \pdf@ifdraftmode{% diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 76f32db39b9..5d4590f095c 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.cfg} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 b65907a4456..dd109ef8aa4 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 1ccefa9b9ce..50b58c696cd 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{htexture.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 749f8f96ad2..85239a65e6e 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{hvtex.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % Hyperref driver for VTeX in PDF/PS mode] \Hy@VersionCheck{hvtex.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index 0efa0fc7dfe..4ecc583edf9 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexhtml.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 872741d406a..8536d06b396 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 c1638f040c2..b65b753e6e2 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{hxetex.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % Hyperref driver for XeTeX] \Hy@VersionCheck{hxetex.def} \HyPsd@LoadUnicode diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 4fe241da4c6..fe8d0462c76 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,14 +26,14 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{hyperref} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -2632,7 +2633,7 @@ #3% }% } -\def\Hy@realDisableOption#1{% +\def\Hy@DisableOption#1{% \ltx@ifundefined{KV@Hyp@#1@default}{% \define@key{Hyp}{#1}% }{% @@ -2641,17 +2642,6 @@ {\Hy@WarnOptionDisabled{#1}}% } -\def\Hy@DisableOption#1{% - \ifnum\currentgrouplevel>0 - \expandafter\@firstoftwo - \else - \expandafter\@secondoftwo - \fi - {% - \expandafter\gdef\csname Hy@smuggleout#1\endcsname{\Hy@DisableOption{#1}}% - \expandafter\aftergroup\csname Hy@smuggleout#1\endcsname - } - {\Hy@realDisableOption{#1}}} \def\Hy@WarnOptionDisabled#1{% \Hy@Warning{% Option `#1' has already been used,\MessageBreak @@ -4933,6 +4923,12 @@ \DeclareRobustCommand*{\nameref}{% \@ifstar\@namerefstar\T@nameref }% + \ifHy@implicit + \else + \let \@pagerefstar\T@pageref + \let \@refstar\T@ref + \let \@namerefstar\T@nameref + \fi } \Hy@AtBeginDocument{% \ifHy@texht @@ -6092,6 +6088,7 @@ \else \def\@currValue{#2}% \fi + \expandafter\Hy@pdfstringdef\expandafter\@currValue\expandafter{\@currValue}% } \define@key{Field}{loc}{% \def\Fld@loc{#1}% @@ -6201,7 +6198,7 @@ \def\Fld@bordersep{#1}% } \define@key{Field}{default}{% - \def\Fld@default{#1}% + \Hy@pdfstringdef\Fld@default{#1}% } \define@key{Field}{align}{% \def\Fld@align{#1}% @@ -6356,13 +6353,28 @@ \@ifnextchar[{\@Reset}{\@Reset[]}% } \def\LayoutTextField#1#2{% label, field - #1 #2% + \def\Hy@temp{#1}% + \ifx\Hy@temp\@empty + #2% + \else + #1 #2% + \fi } \def\LayoutChoiceField#1#2{% label, field - #1 #2% + \def\Hy@temp{#1}% + \ifx\Hy@temp\@empty + #2% + \else + #1 #2% + \fi } \def\LayoutCheckField#1#2{% label, field - #1 #2% + \def\Hy@temp{#1}% + \ifx\Hy@temp\@empty + #2% + \else + #1 #2% + \fi } \def\LayoutPushButtonField#1{% button #1% @@ -6389,12 +6401,12 @@ \def\DefaultWidthofSubmit{2cm} \def\DefaultHeightofReset{14pt} \def\DefaultWidthofReset{2cm} -\def\DefaultHeightofCheckBox{\baselineskip} -\def\DefaultWidthofCheckBox{\baselineskip} -\def\DefaultHeightofChoiceMenu{\baselineskip} -\def\DefaultWidthofChoiceMenu{\baselineskip} -\def\DefaultHeightofText{\baselineskip} -\def\DefaultHeightofTextMultiline{4\baselineskip} +\def\DefaultHeightofCheckBox{\normalbaselineskip} +\def\DefaultWidthofCheckBox{\normalbaselineskip} +\def\DefaultHeightofChoiceMenu{\normalbaselineskip} +\def\DefaultWidthofChoiceMenu{\normalbaselineskip} +\def\DefaultHeightofText{\normalbaselineskip} +\def\DefaultHeightofTextMultiline{4\normalbaselineskip} \def\DefaultWidthofText{3cm} \def\DefaultOptionsofSubmit{print,name=Submit,noexport} \def\DefaultOptionsofReset{print,name=Reset,noexport} diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index b64ac5fb91f..e97cd807566 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{hypertex.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % Hyperref driver for HyperTeX specials] \Hy@VersionCheck{hypertex.def} \providecommand*{\XR@ext}{dvi} diff --git a/Master/texmf-dist/tex/latex/hyperref/nameref.sty b/Master/texmf-dist/tex/latex/hyperref/nameref.sty index 223af8d259e..39f275e642b 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nameref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nameref.sty @@ -10,8 +10,9 @@ %% Copyright (C) 1995-1999 Sebastian Rahtz %% 2000 Sebastian Rahtz, Heiko Oberdiek %% 2001-2012 Heiko Oberdiek -%% 2016 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2016-2019 Oberdiek Package Suport Group +%% 2019- The LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -26,13 +27,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is The LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nameref} - [2019/09/12 v2.45 Cross-referencing by name of section]% + [2019/09/16 v2.46 Cross-referencing by name of section]% \RequirePackage{refcount}[2006/02/12] \RequirePackage{gettitlestring}[2009/12/18] \RequirePackage{ltxcmds}[2009/12/12] @@ -395,7 +396,92 @@ \AtBeginDocument{% \ifx\csname @@vpageref\endcsname\relax \else - \let\NR@@vpageref\@@vpageref + \ifdefined\vp@gerefstar + \let\NR@@vpageref\@@vpageref + \else + \def\NR@@vpageref#1[#2]#3{% + \leavevmode\unskip + \global\advance\c@vrcnt\@ne + \@ifundefined{r@\the\c@vrcnt @vr}% + {\@namedef{r@\the\c@vrcnt @vr}{{??}{??}{}{}{}}}{}% + \edef\@tempa{% + \expandafter\expandafter\expandafter + \@secondoffive\csname r@\the\c@vrcnt @vr\endcsname + }% + \@ifundefined{r@\the\c@vrcnt @xvr}% + {\@namedef{r@\the\c@vrcnt @xvr}{{??}{??}{}{}{}}}{}% + \edef\@tempb{% + \expandafter\expandafter\expandafter + \@secondoffive\csname r@\the\c@vrcnt @xvr\endcsname + }% + {% + \let\@currentlabel\@empty + \expandafter\label\expandafter{\the\c@vrcnt @xvr}% + }% + \ifx\@tempa\@tempb + \else + \vref@err{% + \noexpand\vref at page boundary % + \@tempb-\@tempa\space (may loop)% + }% + \fi + \@ifundefined{r@#3}{\@namedef{r@#3}{{??}{??}{}{}{}}}{}% + \edef\thevpagerefnum{% + \expandafter\expandafter\expandafter + \@secondoffive\csname r@#3\endcsname + }% + \ifx\vref@space\@undefined + \space + \else + \vref@space + \fi + \ifx\@tempa\thevpagerefnum + #1% + \else + #2% + \is@pos@number\thevpagerefnum{% + \is@pos@number\@tempa{% + \@tempcnta\@tempa + \advance\@tempcnta\@ne + }{% + \@tempcnta\maxdimen + }% + \ifnum \thevpagerefnum =\@tempcnta + \ifodd\@tempcnta + \if@twoside + \reftextfaceafter + \else + \reftextafter + \fi + \else + \reftextafter + \fi + \else + \advance\@tempcnta-2 % + \ifnum \thevpagerefnum =\@tempcnta + \ifodd\@tempcnta + \reftextbefore + \else + \if@twoside + \reftextfacebefore + \else + \reftextbefore + \fi + \fi + \else + \reftextfaraway{#3}% + \fi + \fi + }{% + \reftextfaraway{#3}% + }% + \fi + {% + \let\@currentlabel\@empty + \expandafter\label\expandafter{\the\c@vrcnt @vr}% + }% + }% + \fi \def\@@vpageref#1[#2]#3{% \begingroup \csname @safe@activestrue\endcsname diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index 78ad773eba4..01d04a668a7 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,14 +26,14 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{nohyperref} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 4a61f2e79a4..7b2f9369b0e 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def +++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{pd1enc.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 24e32bd1886..d5d5a06766a 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{pdfmark.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % Hyperref definitions for pdfmark specials] \Hy@VersionCheck{pdfmark.def} \begingroup diff --git a/Master/texmf-dist/tex/latex/hyperref/psdextra.def b/Master/texmf-dist/tex/latex/hyperref/psdextra.def index 9012ab98857..9570f398cd2 100644 --- a/Master/texmf-dist/tex/latex/hyperref/psdextra.def +++ b/Master/texmf-dist/tex/latex/hyperref/psdextra.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{psdextra.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 3ecdc442a22..012a9c69ef7 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{puarenc.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 8e79e3f04e3..ce7c2874fd1 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{puenc.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 b4a7ed2b412..56d292036c5 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,13 +26,13 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \ProvidesFile{puvnenc.def} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % 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 0f36f39a11d..aeca59dd4e8 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) -%% Copyright (C) 1993-1997 David Carlisle +%% Copyright (C) 1993-2019 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 @@ -9,7 +9,7 @@ %% If no problems are reported the version in the tools distribution %% will be updated to match this at the next LaTeX release. -%% \externaldocument[prefix]{document}[URL] +%% \externaldocument[prefix][nocite]{document}[URL] %% The `document' referred to by the main argument is the file %% document.aux @@ -40,6 +40,25 @@ %% remote directory, which is then explicitly prepended to the names of %% any included aux files. %% +%% +%% Version 6.1 incorporates linking to citations in external documents +%% (originally from xcite package and now included in xr. +%% +%% Many packages have variant citation commands (natbib, +%% biblatex,....) and the external document may or may not have used +%% hyperref. Because of these differences the citation linking may not +%% always work, it can be disabled by specifying [nocite] after the +%% prefix: +%% +%% \externaldocument[][nocite]{somefile} +%% +%% In the case of \ref, if the external document has not used +%% hyperref, this package will work like xr and produce the correct +%% text, but can not produce a well formed link as the target document +%% is not set up. In this case you may prefer to use \ref* rather than +%% \ref to avoid generating a hyperlink. +%% +%% %% History %% %% 1997/10/06 v6.00beta2 @@ -50,28 +69,44 @@ %% 2000/03/22 v6.00beta4 %% \xdef changed to \protected@xdef. %% +%% 2019/10/03 v6.1 +%% Incorporate updates to xr (including citation support) +%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{xr-hyper} - [2000/03/22 v6.00beta4 eXternal References (DPC)] + [2019/10/03 v6.1 eXternal References (DPC)] -\def\externaldocument{\@testopt\XR@{}} -\def\XR@[#1]#2{\@testopt{\XR@@{#1}{#2}}{#2.\XR@ext}} +\def\externaldocument{\@testopt\XR@cite{}} +\let\externalcitedocument\externaldocument +\def\XR@cite[#1]{\@testopt{\XR@[#1]}{}} +\def\XR@[#1][#2]#3{\@testopt{\XR@@{#1}{#2}{#3}}{#3.\XR@ext}} -\def\XR@@#1#2[#3]{{% +\def\XR@@#1#2#3[#4]{{% \makeatletter \def\XR@prefix{#1}% - \def\XR@URL{#3}% - \filename@parse{#2}% - \XR@next#2.aux\relax\\}} + \def\XR@nocite{#2}% + \ifx\XR@nocite\XR@@nocite + \let\XR@bibcite\vadjust + \else + \let\XR@bibcite\bibcite + \fi + \def\XR@URL{#4}% + \filename@parse{#3}% + \XR@next#3.aux\relax\\}} +\def\XR@@nocite{nocite} \def\XR@next#1\relax#2\\{% \edef\XR@list{#2}% \XR@loop{#1}} \def\XR@aux{% \ifx\XR@list\@empty\else\expandafter\XR@explist\fi} +\long\def\@gobblethree #1#2#3{} +\long\def\@firstofthree #1#2#3{#1} +\long\def\@secondofthree#1#2#3{#2} +\long\def\@thirdofthree #1#2#3{#3} + \def\XR@explist{\expandafter\XR@next\XR@list\\} \def\XR@loop#1{% -\def\f{#1}%\show\f \openin\@inputcheck#1\relax \ifeof\@inputcheck \PackageWarning{xr}{^^JNo file #1^^JLABELS NOT IMPORTED.^^J}% @@ -82,13 +117,20 @@ \def\XR@read{% \read\@inputcheck to\XR@line \expandafter\XR@test\XR@line...\XR@} +% 2019 update to match xr \long\def\XR@test#1#2#3#4\XR@{% + \let\XR@tempa\@gobblethree \ifx#1\newlabel - \expandafter\protected@xdef\csname r@\XR@prefix#2\endcsname - {\XR@addURL{#3}}% + \let\XR@tempa\@firstofthree + \else\ifx#1\XR@bibcite + \let\XR@tempa\@secondofthree \else\ifx#1\@input - \edef\XR@list{\XR@list\filename@area#2\relax}% - \fi\fi + \let\XR@tempa\@thirdofthree + \fi\fi\fi + \XR@tempa + {\expandafter\protected@xdef\csname r@\XR@prefix#2\endcsname{\XR@addURL{#3}{}{}{}}}% + {\expandafter\bibcite\expandafter{\XR@prefix#2}{#3}}% + {\edef\XR@list{\XR@list\filename@area#2\relax}}% \ifeof\@inputcheck\expandafter\XR@aux \else\expandafter\XR@read\fi} -- cgit v1.2.3