From 8790b9df74c6be439ccba2d4c53edfb57407ad6b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 9 Feb 2021 22:00:41 +0000 Subject: hyperref (9feb21) git-svn-id: svn://tug.org/texlive/trunk@57690 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/hyperref/doc/hyperref-doc.tex | 24 +++++++++-- .../texmf-dist/source/latex/hyperref/hluatex.dtx | 4 +- .../texmf-dist/source/latex/hyperref/hyperref.dtx | 47 ++++++++++++++++++---- .../texmf-dist/source/latex/hyperref/hyperref.ins | 1 + 4 files changed, 63 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/hyperref/doc/hyperref-doc.tex b/Master/texmf-dist/source/latex/hyperref/doc/hyperref-doc.tex index f1e1895645c..1fe069afbf5 100644 --- a/Master/texmf-dist/source/latex/hyperref/doc/hyperref-doc.tex +++ b/Master/texmf-dist/source/latex/hyperref/doc/hyperref-doc.tex @@ -177,7 +177,7 @@ } \makeatother \title{Hypertext marks in \hologo{LaTeX}: a manual for \xpackage{hyperref}} -\date{2021-02-07 v7.00h} +\date{2021-02-08 v7.00i} \begin{document} @@ -559,7 +559,7 @@ plainpages & boolean & false & Forces page anchors to be named by the Arabic raiselinks & boolean & true & In the hypertex driver, the height of links is normally calculated by the driver as simply the base line of contained text; this options forces \verb|\special| commands to reflect the real height of the link (which could contain a graphic) \\ -breaklinks & boolean & both & This option is in hyperref only used in the dviwindo driver, in all other cases it doesn't do anything sensible---it neither allows nor prevents links to be broken. The ocgx2 package +breaklinks & boolean & both & This option is in hyperref only used in the dviwindo driver, in all other cases it doesn't do anything sensible---it neither allows nor prevents links to be broken. The ocgx2 package checks the state of the boolean.\\ pageanchor & boolean & true & Determines whether every page is given an implicit anchor at the top left corner. If this is turned off, \verb|\printindex| will not contain @@ -1016,7 +1016,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{true} & Unicode encoded pdf strings, starting with version 2021-02-07 v7.00h set by default to true for all engines. \\ +unicode & \textit{true} & Unicode encoded pdf strings, starting with version v7.00g set by default to true for all engines. It will load a number of definitions in puenc.def. It can be set to false for pdflatex, but this is not recommended.\\ urlbordercolor & \textit{0 1 1} & color of border around URL links \\ urlcolor & \textit{magenta} & color of URL links \\ verbose & \textit{false} & be chatty \\ @@ -2219,6 +2219,24 @@ Now the entry in the table of contents (and bookmarks) for the index points to the start of the index page, not to a location before this page. +\subsection{puenc encoding and puenc-extra.def} + +The \texttt{unicode} option loads for the bookmarks \texttt{puenc.def} which contains +quite a lot definitions of commands for the bookmarks. +As \texttt{unicode} is now true for all engines, this file is now also loaded +with pdflatex. Some of the definitions in \texttt{puenc.def} clash with other uses. +To reduce the impact \xpackage{hyperref} uses two strategies. + +\begin{itemize} +\item A number of command are only defined conditionally: +The commands for the cyrillic block if \cs{CYRDZE} is defined, +greek if \cs{textBeta} is defined, and hebrew if \cs{hebdalet} is defined. + +\item Other commands are moved to an extra file \texttt{puenc-extra.def} +which is not loaded automatically, but can be loaded in the preamble if needed. +Currently this file contains all definitions for the accent \cs{G}. +\end{itemize} + \section{Acrobat-specific behavior} diff --git a/Master/texmf-dist/source/latex/hyperref/hluatex.dtx b/Master/texmf-dist/source/latex/hyperref/hluatex.dtx index 91f9abc0061..021fb802d97 100644 --- a/Master/texmf-dist/source/latex/hyperref/hluatex.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hluatex.dtx @@ -1,6 +1,6 @@ % \iffalse % Source File: hluatex.dtx -% 2021-02-07 v7.00h +% 2021-02-08 v7.00i % % Copyright % 2016-2019 Oberdiek Package Support Group @@ -31,7 +31,7 @@ % % \begin{macrocode} %<*luatex> -%% 2021-02-07 v7.00h +%% 2021-02-08 v7.00i %% force unicode encoding, see issue #101 %% code mostly copied from hxetex.def \HyPsd@LoadUnicode diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index 5ab411463a2..f0deae0fbd0 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -47,11 +47,12 @@ %\ProvidesFile{htex4ht.cfg} %\ProvidesFile{pd1enc.def} %\ProvidesFile{puenc.def} +%\ProvidesFile{puencextra.def} %\ProvidesFile{puvnenc.def} %\ProvidesFile{puarenc.def} %\ProvidesFile{psdextra.def} %\ProvidesFile{hyperref-langpatches.def} -% [2021-02-07 v7.00h % +% [2021-02-08 v7.00i % % Hypertext links for LaTeX] % Dummy hyperref (SR)] % Hyperref documentation driver file] @@ -87,6 +88,7 @@ % Hyperref configuration file for TeX4ht] % Hyperref: PDFDocEncoding definition (HO)] % Hyperref: PDF Unicode definition (HO)] +% Hyperref: PDF Unicode extra definition (HO)] % Hyperref: Additions to puenc.def for VnTeX] % Hyperref: Additions to puenc.def for Arabi] % Hyperref: Additions to PDF string support] @@ -1229,15 +1231,17 @@ % Because the box shifting % used in the \TeX{} logo does not work while writing to a file, % the standard \TeX{} logos are redefined. +% We use the direct PU code to avoid problems if +% \cs{textepsilon} is not defined. % \begin{macrocode} \def\TeX{TeX}% \def\LaTeX{La\TeX}% \def\LaTeXe{% \LaTeX2% - \ifHy@unicode\textepsilon\else e\fi + \ifHy@unicode\83\265\else e\fi }% \def\eTeX{% - \ifHy@unicode\textepsilon\else e\fi + \ifHy@unicode\83\265\else e\fi -\TeX% }% \def\SliTeX{Sli\TeX}% @@ -2811,7 +2815,7 @@ % \cs{HyPsd@hyspacetest} replaces the \cs{hspace} by a space, if % the length is greater than zero. % \begin{macrocode} -\def\HyPsd@hspacetest#1{\ifdim#1>\z@\space\fi} +\def\HyPsd@hspacetest#1{\ifdim\dimexpr#1\relax>\z@\space\fi} % \end{macrocode} % \end{macro} % @@ -4886,7 +4890,6 @@ % change 2020-08-14, use unicode by default: % \begin{macrocode} \let\HyPsd@pdfencoding\HyPsd@pdfencoding@unicode -\HyPsd@LoadUnicode \def\HyPsd@LoadStringEnc{% \RequirePackage{stringenc}[2009/12/15]% \let\HyPsd@LoadStringEnc\relax @@ -6818,6 +6821,12 @@ % \end{macrocode} % % After processing options. +% \subsection{Load unicode support} +% \begin{macrocode} +\ifHy@unicode + \HyPsd@LoadUnicode +\fi +% \end{macrocode} % % \subsection{Package xspace support} % @@ -20964,8 +20973,10 @@ \DeclareTextCommand{\H}{PU}[1]{#1\83\013}% U+030B % U+030C COMBINING CARON; caroncmb \DeclareTextCommand{\v}{PU}[1]{#1\83\014}% U+030C +% % U+030F COMBINING DOUBLE GRAVE ACCENT; dblgravecmb -\DeclareTextCommand{\G}{PU}[1]{#1\83\017}% U+030F +%\DeclareTextCommand{\G}{PU}[1]{#1\83\017}% U+030F +%<*puenc> \ifx\CYRDZE\@undefined \else \DeclareTextCommand{\C}{PU}[1]{#1\83\017}% U+030F \fi @@ -21016,7 +21027,9 @@ \DeclareTextCompositeCommand{\.}{PU}{\@empty}{\textdotaccent}% \DeclareTextCompositeCommand{\c}{PU}{\@empty}{\textcedilla}% \DeclareTextCompositeCommand{\u}{PU}{\@empty}{\textasciibreve}% -\DeclareTextCompositeCommand{\G}{PU}{\@empty}{\textdoublegrave}% +% +%\DeclareTextCompositeCommand{\G}{PU}{\@empty}{\textdoublegrave}% +%<*puenc> \DeclareTextCompositeCommand{\=}{PU}{\@empty}{\textasciimacron}% \DeclareTextCompositeCommand{\H}{PU}{\@empty}{\texthungarumlaut}% \DeclareTextCompositeCommand{\k}{PU}{\@empty}{\textogonek}% @@ -21045,7 +21058,9 @@ \DeclareTextCompositeCommand{\.}{PU}{\ }{\textdotaccent}% \DeclareTextCompositeCommand{\c}{PU}{\ }{\textcedilla}% \DeclareTextCompositeCommand{\u}{PU}{\ }{\textasciibreve}% -\DeclareTextCompositeCommand{\G}{PU}{\ }{\textdoublegrave}% +% +%\DeclareTextCompositeCommand{\G}{PU}{\ }{\textdoublegrave}% +%<*puenc> \DeclareTextCompositeCommand{\=}{PU}{\ }{\textasciimacron}% \DeclareTextCompositeCommand{\H}{PU}{\ }{\texthungarumlaut}% \DeclareTextCompositeCommand{\k}{PU}{\ }{\textogonek}% @@ -21841,6 +21856,8 @@ % U+01FF LATIN SMALL LETTER O WITH STROKE AND ACUTE; % *oslashacute, ostrokeacute \DeclareTextCompositeCommand{\'}{PU}{\o}{\81\377}% U+01FF +% +%<*puextra> % U+0200 LATIN CAPITAL LETTER A WITH DOUBLE GRAVE; Adblgrave \DeclareTextCompositeCommand{\G}{PU}{A}{\82\000}% U+0200 % U+0201 LATIN SMALL LETTER A WITH DOUBLE GRAVE; adblgrave @@ -21849,28 +21866,40 @@ \DeclareTextCompositeCommand{\G}{PU}{E}{\82\004}% U+0204 % U+0205 LATIN SMALL LETTER E WITH DOUBLE GRAVE; edblgrave \DeclareTextCompositeCommand{\G}{PU}{e}{\82\005}% U+0205 +% +%<*puenc> % U+0206 LATIN CAPITAL LETTER E WITH INVERTED BREVE; Einvertedbreve \DeclareTextCompositeCommand{\textinvbreve}{PU}{E}{\82\006}% U+0206 % U+0207 LATIN SMALL LETTER E WITH INVERTED BREVE; einvertedbreve \DeclareTextCompositeCommand{\textinvbreve}{PU}{e}{\82\007}% U+0207 +% +%<*puextra> % U+0208 LATIN CAPITAL LETTER I WITH DOUBLE GRAVE; Idblgrave \DeclareTextCompositeCommand{\G}{PU}{I}{\82\010}% U+0208 % U+0209 LATIN SMALL LETTER I WITH DOUBLE GRAVE; idblgrave \DeclareTextCompositeCommand{\G}{PU}{\i}{\82\011}% U+0209 \DeclareTextCompositeCommand{\G}{PU}{i}{\82\011}% U+0209 +% +%<*puenc> % U+020A LATIN CAPITAL LETTER I WITH INVERTED BREVE; Iinvertedbreve \DeclareTextCompositeCommand{\textinvbreve}{PU}{I}{\82\012}% U+020A % U+020B LATIN SMALL LETTER I WITH INVERTED BREVE; iinvertedbreve \DeclareTextCompositeCommand{\textinvbreve}{PU}{i}{\82\013}% U+020B \DeclareTextCompositeCommand{\textinvbreve}{PU}{\i}{\82\013}% U+020B +% +%<*puextra> % U+020C LATIN CAPITAL LETTER O WITH DOUBLE GRAVE; Odblgrave \DeclareTextCompositeCommand{\G}{PU}{O}{\82\014}% U+020C % U+020D LATIN SMALL LETTER O WITH DOUBLE GRAVE; odblgrave \DeclareTextCompositeCommand{\G}{PU}{o}{\82\015}% U+020D +% +%<*puenc> % U+020E LATIN CAPITAL LETTER O WITH INVERTED BREVE; Oinvertedbreve \DeclareTextCompositeCommand{\textinvbreve}{PU}{O}{\82\016}% U+020E % U+020F LATIN SMALL LETTER O WITH INVERTED BREVE; oinvertedbreve \DeclareTextCompositeCommand{\textinvbreve}{PU}{o}{\82\017}% U+020F +% +%<*puextra> % U+0210 LATIN CAPITAL LETTER R WITH DOUBLE GRAVE; Rdblgrave \DeclareTextCompositeCommand{\G}{PU}{R}{\82\020}% U+0210 % U+0211 LATIN SMALL LETTER R WITH DOUBLE GRAVE; rdblgrave @@ -21879,6 +21908,8 @@ \DeclareTextCompositeCommand{\G}{PU}{U}{\82\024}% U+0214 % U+0215 LATIN SMALL LETTER U WITH DOUBLE GRAVE; udblgrave \DeclareTextCompositeCommand{\G}{PU}{u}{\82\025}% U+0215 +% +%<*puenc> % U+0216 LATIN CAPITAL LETTER U WITH INVERTED BREVE; Uinvertedbreve \DeclareTextCompositeCommand{\textinvbreve}{PU}{U}{\82\026}% U+0216 % U+0217 LATIN SMALL LETTER U WITH INVERTED BREVE; uinvertedbreve diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.ins b/Master/texmf-dist/source/latex/hyperref/hyperref.ins index 43b531fba5e..46aff3f9c34 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.ins +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.ins @@ -83,6 +83,7 @@ \file{hxetex.def}{\from{hyperref.dtx}{xetex,pdfform,outlines}} \file{pd1enc.def}{\from{hyperref.dtx}{pd1enc}} \file{puenc.def}{\from{hyperref.dtx}{puenc}} + \file{puenc-extra.def}{\from{hyperref.dtx}{puextra}} \file{puvnenc.def}{\from{hyperref.dtx}{puvnenc}} \file{puarenc.def}{\from{hyperref.dtx}{puarenc}} \file{psdextra.def}{\from{hyperref.dtx}{psdextra}} -- cgit v1.2.3