From c7d381cb401ac7ed825998d0ebdb163d1bb26c5d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 11 Feb 2021 22:54:15 +0000 Subject: hyperref (11feb21) git-svn-id: svn://tug.org/texlive/trunk@57713 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/hyperref/doc/hyperref-doc.tex | 17 ++++--- .../texmf-dist/source/latex/hyperref/hluatex.dtx | 4 +- .../texmf-dist/source/latex/hyperref/hyperref.dtx | 53 +++++++++++++++++----- .../texmf-dist/source/latex/hyperref/hyperref.ins | 1 + 4 files changed, 55 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/source/latex') 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 1fe069afbf5..6f80fc226a3 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-08 v7.00i} +\date{2021-02-10 v7.00j} \begin{document} @@ -2219,11 +2219,11 @@ 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} +\subsection{puenc encoding, puenc-greek.def 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 +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. @@ -2232,6 +2232,9 @@ To reduce the impact \xpackage{hyperref} uses two strategies. The commands for the cyrillic block if \cs{CYRDZE} is defined, greek if \cs{textBeta} is defined, and hebrew if \cs{hebdalet} is defined. +The greek block is in an extra file, \texttt{puenc-greek.def}, which can +be loaded manually if needed. + \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}. @@ -2281,7 +2284,9 @@ Help(Windows) & About \end{longtable} \section{PDF and HTML forms} -You must put your fields inside a \texttt{Form} environment (only one per file). +You must put your fields inside a \texttt{Form} environment. +The environment does some general setups, so should be used only once in a document. +Using simply \cs{Form} at the begin of the document is possible too. There are six macros to prepare fields: diff --git a/Master/texmf-dist/source/latex/hyperref/hluatex.dtx b/Master/texmf-dist/source/latex/hyperref/hluatex.dtx index 021fb802d97..fcfaabde9cf 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-08 v7.00i +% 2021-02-10 v7.00j % % Copyright % 2016-2019 Oberdiek Package Support Group @@ -31,7 +31,7 @@ % % \begin{macrocode} %<*luatex> -%% 2021-02-08 v7.00i +%% 2021-02-10 v7.00j %% 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 f0deae0fbd0..f72ba828003 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -47,12 +47,13 @@ %\ProvidesFile{htex4ht.cfg} %\ProvidesFile{pd1enc.def} %\ProvidesFile{puenc.def} -%\ProvidesFile{puencextra.def} +%\ProvidesFile{puenc-extra.def} +%\ProvidesFile{puenc-greek.def} %\ProvidesFile{puvnenc.def} %\ProvidesFile{puarenc.def} %\ProvidesFile{psdextra.def} %\ProvidesFile{hyperref-langpatches.def} -% [2021-02-08 v7.00i % +% [2021-02-10 v7.00j % % Hypertext links for LaTeX] % Dummy hyperref (SR)] % Hyperref documentation driver file] @@ -87,8 +88,9 @@ %\Hy@VersionCheck{htex4ht.def} % Hyperref configuration file for TeX4ht] % Hyperref: PDFDocEncoding definition (HO)] -% Hyperref: PDF Unicode definition (HO)] +% Hyperref: PDF Unicode definition (HO)] % Hyperref: PDF Unicode extra definition (HO)] +% Hyperref: PDF Unicode definition (greek block) (HO)] % Hyperref: Additions to puenc.def for VnTeX] % Hyperref: Additions to puenc.def for Arabi] % Hyperref: Additions to PDF string support] @@ -883,6 +885,12 @@ \Hy@pdftoolbartrue \Hy@typexmlfalse \Hy@unicodetrue +\ifx\kanjiskip\@undefined +\else + \ifx\forcecjktoken\@undefined + \Hy@unicodefalse + \fi +\fi \Hy@pdfusetitlefalse \Hy@verbosefalse \Hy@pdfwindowuitrue @@ -2063,6 +2071,10 @@ \def\HyPsd@LoadExtra{% \ifHy@psdextra \ltx@iffileloaded{puenc.def}{% + \ltx@iffileloaded{puenc-greek.def}{}{% + \Hy@SaveCatcodeSettings{pu}% + \input{puenc-greek.def}% + \Hy@RestoreCatcodeSettings{pu}}% \Hy@SaveCatcodeSettings{psdextra}% \input{psdextra.def}% \Hy@RestoreCatcodeSettings{psdextra}% @@ -4439,7 +4451,11 @@ \let\Hy@RestoreLastskip\relax \ifvmode \ifdim\lastskip=\z@ - \let\Hy@RestoreLastskip\nobreak + \ifnum\lastnodetype=11 % + \let\Hy@RestoreLastskip\nobreak + \else + \let\Hy@RestoreLastskip\relax + \fi \else \begingroup \skip@=-\lastskip @@ -4890,6 +4906,7 @@ % 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 @@ -6821,12 +6838,6 @@ % \end{macrocode} % % After processing options. -% \subsection{Load unicode support} -% \begin{macrocode} -\ifHy@unicode - \HyPsd@LoadUnicode -\fi -% \end{macrocode} % % \subsection{Package xspace support} % @@ -10241,7 +10252,13 @@ \endgroup} % % \end{macrocode} -% +% set the pdf version +% \begin{macrocode} +%<*dvipdfm|xetex> +\special{pdf:majorversion \Hy@pdf@majorversion} +\special{pdf:minorversion \Hy@pdf@minorversion} +% +% \end{macrocode} % \subsubsection{pdfmarkbase, dvipdfm, xetex} % % \begin{macrocode} @@ -14552,7 +14569,12 @@ % \end{macrocode} % \subsection{dvipdfm/xetex dvi to PDF converter} % Provided by Mark Wicks (mwicks@kettering.edu) +% +% (x)dvipdfmx replaces destination names by numbers. This makes it impossible +% to link from an external document with xr-hyper, so from version 7.00j on +% this is suppressed with a config special. % \begin{macrocode} +\special{dvipdfmx:config C 0x0010} \providecommand*{\XR@ext}{pdf} \Hy@setbreaklinks{true} \def\HyPat@ObjRef{% @@ -20962,7 +20984,9 @@ \DeclareTextCommand{\=}{PU}[1]{#1\83\004}% U+0304 % U+0306 COMBINING BREVE; brevecmb \DeclareTextCommand{\u}{PU}[1]{#1\83\006}% U+0306 +\ifx\CYRDZE\@undefined \else \DeclareTextCommand{\U}{PU}[1]{#1\83\006}% U+0306 +\fi % U+0307 COMBINING DOT ABOVE; dotaccentcmb \DeclareTextCommand{\.}{PU}[1]{#1\83\007}% U+0307 % U+0308 COMBINING DIAERESIS; dieresiscmb @@ -22341,6 +22365,10 @@ % Greek is only loaded if \cs{textBeta} is defined. % \begin{macrocode} \ifx\textBeta\@undefined \else +\input{puenc-greek.def} +\fi +% +%<*pugreek> % U+0374 GREEK NUMERAL SIGN; numeralsigngreek \DeclareTextCommand{\textnumeralsigngreek}{PU}{\83\164}% U+0374 \DeclareTextCommand{\textdexiakeraia}{PU}{\83\164}% U+0374 @@ -22522,7 +22550,7 @@ % U+03F6 GREEK REVERSED LUNATE EPSILON SYMBOL; % \backepsilon (AmS) \DeclareTextCommand{\textbackepsilon}{PU}{\83\366}% U+03F6 -\fi +% % \end{macrocode} % % \subsubsection{Cyrillic: U+0400 to U+04FF} @@ -22531,6 +22559,7 @@ % the help with the Cyrillic glyph names. % Cyrillic only loaded if \cs{CYRDZE} is defined. % \begin{macrocode} +%<*puenc> \ifx\CYRDZE\@undefined \else % U+0400 CYRILLIC CAPITAL LETTER IE WITH GRAVE \DeclareTextCompositeCommand{\`}{PU}{\CYRE}{\84\000}% U+0400 diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.ins b/Master/texmf-dist/source/latex/hyperref/hyperref.ins index 46aff3f9c34..a8943829822 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-greek.def}{\from{hyperref.dtx}{pugreek}} \file{puenc-extra.def}{\from{hyperref.dtx}{puextra}} \file{puvnenc.def}{\from{hyperref.dtx}{puvnenc}} \file{puarenc.def}{\from{hyperref.dtx}{puarenc}} -- cgit v1.2.3