diff options
Diffstat (limited to 'Master/texmf-dist/source')
6 files changed, 176 insertions, 48 deletions
diff --git a/Master/texmf-dist/source/latex/hyperref/backref.dtx b/Master/texmf-dist/source/latex/hyperref/backref.dtx index dd31e66d710..35c37252f5e 100644 --- a/Master/texmf-dist/source/latex/hyperref/backref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/backref.dtx @@ -2,8 +2,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'. %% ------------------------------------------- @@ -18,7 +19,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/source/latex/hyperref/doc/manual.tex b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex index 0e443c8a90f..574df948038 100644 --- a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex +++ b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex @@ -4,6 +4,7 @@ % Copyright (C) 2003 Steve Peter and Karl Berry % Copyright (C) 2006-2012 Heiko Oberdiek. % Copyright (C) 2017-2019 David Carlisle Ulrike Fischer +% Copyright (C) 2019- The LaTeX3 Project % % Permission is granted to copy, distribute and/or modify this document % under the terms of the GNU Free Documentation License, Version 1.1 or @@ -192,6 +193,9 @@ the functionality of all the \hologo{LaTeX} cross-referencing commands it also provides new commands to allow the user to write \emph{ad hoc} hypertext links, including those to external documents and URLs. +The package is currently maintained at \url{https://github.com/latex3/hyperref/} and issues should +be reported there. + This manual provides a brief overview of the \xpackage{hyperref} package. For more details, you should read the additional documentation distributed with the package, as well as the complete documentation by @@ -646,7 +650,7 @@ colorlinks & boolean & false & Colors the text of links and anchors. The c Unlike colored boxes, the colored text remains when printing.\\ linkcolor & color & red & Color for normal internal links. \\ -anchorcolor & color & black & Color for anchor text. \\ +anchorcolor & color & black & Color for anchor text. Ignored by most drivers. \\ citecolor & color & green & Color for bibliographical citations in text. \\ filecolor & color & cyan & Color for URLs which open local files. \\ menucolor & color & red & Color for Acrobat menu items. \\ @@ -859,7 +863,7 @@ The following is a complete listing of available options for \textsf{hyperref}, arranged alphabetically. \begin{longtable}{@{}>{\ttfamily}llp{7cm}@{}} -anchorcolor & \textit{black} & set color of anchors \\ +anchorcolor & \textit{black} & set color of anchors, ignored by most drivers. \\ backref & \textit{false} & do bibliographical back references \\ baseurl & \textit{empty} & set base URL for document \\ bookmarks & \textit{true} & make bookmarks \\ @@ -963,7 +967,7 @@ runcolor & \textit{filecolor} & color of `run' links\\ setpagesize & \textit{true} & set page size by special driver commands \\ tex4ht & & use \textsf{\TeX4ht} backend \\ textures & & use \textsf{Textures} backend \\ -unicode & \textit{false} & Unicode encoded pdf strings \\ +unicode & \textit{false} & Unicode encoded pdf strings, by defaut true with \textsf{Xe\TeX} and \textsf{Lu\TeX} \\ urlbordercolor & \textit{0 1 1} & color of border around URL links \\ urlcolor & \textit{magenta} & color of URL links \\ verbose & \textit{false} & be chatty \\ @@ -1191,7 +1195,8 @@ the page reference. First \ci{pageautorefname} is checked before \ci{pagename}. For instances where you want a reference to use the correct counter, but -not to create a link, there are starred forms: +not to create a link, there are starred forms (these starred forms exist even if +hyperref has been loaded with \verb|implicit=false|): \begin{cmdsyntax} \ci{ref*}\verb|{|\emph{label}\verb|}| @@ -1399,7 +1404,7 @@ sequence error would arise. \item[xetex] \begin{itemize} \item Settings must be done in the preamble or the first page and then have global effect. - The key inserts the new (x)dvipdfmx special \verb|\special{dvipdfmx:config g #1}| (with the unit removed). + The key inserts the new (x)dvipdfmx special \verb|\special{dvipdfmx:config g #1}| (with the unit removed). \end{itemize} \item[Other drivers] @@ -1583,7 +1588,7 @@ sequence error would arise. an acute, but a hook. However standard LaTeX does not provide such an accent. - Now we can extend the defintion to support hyperref. + Now we can extend the definition to support hyperref. The first and the last word are already supported automatically. Characters with two or more accents are a difficult business in LaTeX, because the NFSS2 macros of the LaTeX kernel do not support @@ -1656,6 +1661,9 @@ sequence error would arise. The idea are colored links, when viewed, but printed without colors. This new experimental option `ocgcolorlinks' uses Optional Content Groups, a feature introduced in PDF 1.5. + + A better implementation which hasn't the disadvantage to prevent line breaks is + in the ocgx2 package. Check its documentation for details how to use it. \begin{itemize} \item The option must be given for package loading: \verb|\usepackage[ocgcolorlinks]{hyperref}| @@ -1669,8 +1677,7 @@ sequence error would arise. inside the document. \item Supported drivers: pdftex, dvipdfm \item The PDF version should be at least 1.5. It is automatically - set for pdfTeX. Users of dvipdfmx set the version on the command - line: dvipdfmx -V 5 + set for pdfTeX, LuaTeX and dvipdfmx. \end{itemize} \subsection{Option `pdfa'} @@ -1901,6 +1908,9 @@ sequence error would arise. outside the encoding and Unicode otherwise. \end{itemize} + The luatex driver uses "unicode" by default. If another encoding should be forced, + it should be done in \verb|hypersetup|. + \subsection{Color options/package hycolor} See documentation of package `hycolor'. diff --git a/Master/texmf-dist/source/latex/hyperref/hluatex.dtx b/Master/texmf-dist/source/latex/hyperref/hluatex.dtx index 364e9d60c2f..6d94245ef31 100644 --- a/Master/texmf-dist/source/latex/hyperref/hluatex.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hluatex.dtx @@ -1,6 +1,7 @@ % \iffalse %% Source File: hluatex.dtx %% Copyright 2016 Oberdiek Package Support Group +%% Copyright 2019 The LaTeX3 Project %% %% %% Derived from hpdftex.def @@ -15,7 +16,9 @@ \GetFileInfo{hluatex.def}% \title{hluatex.def} \date{}% - \author{Oberdiek Package Support Group} + \author{Maintained by The \LaTeX3 Project\\% + \texttt{https://github.com/latex3/hyperref/issues}% +} \maketitle \DocInput{hluatex.dtx}% \end{document} @@ -25,6 +28,12 @@ % % \begin{macrocode} %<*luatex> +%% 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 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % remains of luatex85 package \protected\def\pdfcatalog {\pdfextension catalog } diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index 9c2096a4027..92a4cad56dc 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -3,7 +3,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'. %% ------------------------------------------- @@ -18,7 +19,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'. @@ -48,7 +49,7 @@ %<puvnenc>\ProvidesFile{puvnenc.def} %<puarenc>\ProvidesFile{puarenc.def} %<psdextra>\ProvidesFile{psdextra.def} -%<!none> [2019/09/12 v6.88i % +%<!none> [2019/09/28 v7.00a % %<package> Hypertext links for LaTeX] %<nohyperref> Dummy hyperref (SR)] %<driver> Hyperref documentation driver file] @@ -119,8 +120,9 @@ \GetFileInfo{hyperref.sty}% \title{Hypertext marks in \LaTeX}% \author{Sebastian Rahtz (deceased)\\% - Heiko Oberdiek (maintainer)\\% - \texttt{https://github.com/ho-tex/hyperref/issues}}% + Heiko Oberdiek (inactive)\\% + The \LaTeX3 Project\\% + \texttt{https://github.com/latex3/hyperref/issues}}% % \date{processed \today}% \date{\filedate\space\fileversion}% \maketitle @@ -1223,7 +1225,7 @@ % printable ASCII area that don't obey the NFSS, so they have % to be redefined here. % UF 29.09.2017: added a mapping for \cs{noboundary}, see issue |#37| -% \url{https://github.com/ho-tex/hyperref/issues/37} +% \url{https://github.com/latex3/hyperref/issues/37} % No test for PU, if some definition for PD1 is added it will work too. % \begin{macrocode} \let\{\textbraceleft @@ -4929,7 +4931,7 @@ % % \begin{macro}{\Hy@DisableOption} % \begin{macrocode} -\def\Hy@realDisableOption#1{% +\def\Hy@DisableOption#1{% \ltx@ifundefined{KV@Hyp@#1@default}{% \define@key{Hyp}{#1}% }{% @@ -4938,17 +4940,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}}} % \end{macrocode} % \end{macro} % @@ -7756,6 +7747,12 @@ \@ifstar\@namerefstar\T@nameref }% % }% + \ifHy@implicit + \else + \let \@pagerefstar\T@pageref + \let \@refstar\T@ref + \let \@namerefstar\T@nameref + \fi } \Hy@AtBeginDocument{% \ifHy@texht @@ -9369,6 +9366,7 @@ \else \def\@currValue{#2}% \fi + \expandafter\Hy@pdfstringdef\expandafter\@currValue\expandafter{\@currValue}% } \define@key{Field}{loc}{% \def\Fld@loc{#1}% @@ -9478,7 +9476,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}% @@ -9645,13 +9643,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% @@ -9678,12 +9691,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/source/latex/hyperref/nameref.dtx b/Master/texmf-dist/source/latex/hyperref/nameref.dtx index d955ff41ed0..d8801b576b1 100644 --- a/Master/texmf-dist/source/latex/hyperref/nameref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/nameref.dtx @@ -3,8 +3,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'. %% ------------------------------------------- @@ -19,7 +20,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'. @@ -32,7 +33,7 @@ %<driver>\ProvidesFile{nameref.drv} % \fi % \ProvidesFile{nameref.dtx} - [2019/09/12 v2.45 Cross-referencing by name of section]% + [2019/09/16 v2.46 Cross-referencing by name of section]% % % % \iffalse @@ -54,8 +55,9 @@ }% }% \author{Sebastian Rahtz (deceased)\\% - Heiko Oberdiek (maintainer)\\% - \texttt{https://github.com/ho-tex/hyperref/issues}}% + Heiko Oberdiek (inactive)\\% + The \LaTeX3 Project\\% + \texttt{https://github.com/latex3/hyperref/issues}}% \date{\filedate}% \maketitle \makeatletter @@ -757,7 +759,100 @@ \AtBeginDocument{% \ifx\csname @@vpageref\endcsname\relax \else - \let\NR@@vpageref\@@vpageref +%FMi +% \end{macrocode} +% Test if we are using the new varioref ... +% \begin{macrocode} + \ifdefined\vp@gerefstar + \let\NR@@vpageref\@@vpageref +% \end{macrocode} +% if not then old patching code +% \begin{macrocode} + \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 +%FM - end mod \def\@@vpageref#1[#2]#3{% \begingroup \csname @safe@activestrue\endcsname diff --git a/Master/texmf-dist/source/latex/hyperref/psdmapshortnames.pl b/Master/texmf-dist/source/latex/hyperref/psdmapshortnames.pl index 4af924c932d..9b2f280db8d 100755 --- a/Master/texmf-dist/source/latex/hyperref/psdmapshortnames.pl +++ b/Master/texmf-dist/source/latex/hyperref/psdmapshortnames.pl @@ -19,7 +19,7 @@ $^W=1; # # 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'. |