Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/latex3/hyperref into main
Browse files Browse the repository at this point in the history
  • Loading branch information
u-fischer committed Mar 28, 2021
2 parents ab8cbab + 380a669 commit 0a07a10
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 44 deletions.
5 changes: 5 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2021-02-27 Ulrike Fischer/David Carlisle
* rename puenc-greek.def to puenc-greekbasic.def to resolve
name conflict with a file in greek-fontenc, issue #177
* some documentation improvements (PR #174)

2021-02-10 Ulrike Fischer/David Carlisle
* moved the PU-declarations for greek to an extra file
puenc-greek.ldf and force loading if the options psdextra is
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# README for hyperref bundle

Version 2021-02-10 v7.00j
Version 2021-02-27 v7.00k

## INTRODUCTION

Expand Down
4 changes: 2 additions & 2 deletions build.lua
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ tdslocations = {
"tex/latex/hyperref/puarenc.def",
"tex/latex/hyperref/puenc.def",
"tex/latex/hyperref/puenc-extra.def",
"tex/latex/hyperref/puenc-greek.def",
"tex/latex/hyperref/puenc-greekbasic.def",
"tex/latex/hyperref/puvnenc.def",
"tex/latex/hyperref/xr-hyper.sty"
}
Expand Down Expand Up @@ -98,7 +98,7 @@ for line in pipe:lines() do
end
pipe:close()
if (dvipdfmxversion <= 20200315) then
excludetests={"unicode-test"}
excludetests={"unicode-test","87-pdfversion"}
end
end

Expand Down
47 changes: 16 additions & 31 deletions doc/hyperref-doc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,15 @@
\def\mydate{January 2020}

\RequirePackage{iftex}
\ifpdf % We are running pdfTeX in pdf mode
\ifx\directlua\undefinded
\documentclass[pdftex]{article}
\else
\documentclass[luatex]{article}
\fi
\else

\documentclass{article}
\fi


\usepackage{pifont}
\usepackage{calc}

\usepackage{hologo}

\def\OzTeX{O\kern-0.03em z\kern-0.15em \TeX}

\newcommand*{\cs}[1]{%
\texttt{\textbackslash #1}%
}
Expand Down Expand Up @@ -136,19 +127,17 @@
\makeatother

\usepackage{array,longtable}
\ifnum 0\ifluatex 1\else\ifxetex 1\fi\fi=0 %
\ifTUTeX%
\usepackage{fontspec}%
\renewcommand*{\ttdefault}{lmvtt}%
\else % not \XeTeX* nor \LuaTeX*
\usepackage[T1]{fontenc}%
\usepackage{lmodern}%
\renewcommand*{\ttdefault}{lmvtt}%
\else
\usepackage{fontspec}%
\renewcommand*{\ttdefault}{lmvtt}%
\fi

\newcommand*{\Quote}[1]{\textquotedblleft#1\textquotedblright}

\def\Hanh{H\`an Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh}

\ifpdf
\usepackage[%
% pdftex,% might be luatex, just allow automatic default
Expand Down Expand Up @@ -177,7 +166,7 @@
}
\makeatother
\title{Hypertext marks in \hologo{LaTeX}: a manual for \xpackage{hyperref}}
\date{2021-02-10 v7.00j}
\date{2021-02-27 v7.00k}

\begin{document}

Expand All @@ -190,7 +179,7 @@
\section{Introduction}

The package derives from, and builds on, the work of the Hyper\hologo{TeX}
project, described at \texttt{http://xxx.lanl.gov/hypertex/}\footnote{Now: \url{https://ctan.org/tex-archive/support/hypertex/hypertex}}. It extends
project, described at \nolinkurl{http://xxx.lanl.gov/hypertex/}\footnote{Now: \url{https://ctan.org/tex-archive/support/hypertex/hypertex}}. It extends
the functionality of all the \hologo{LaTeX} cross-referencing commands
(including the table of contents, bibliographies etc) to produce
\cs{special} commands which a driver can turn into hypertext links;
Expand Down Expand Up @@ -251,13 +240,13 @@ \section{Introduction}

\begin{description}
\item[hypertex] DVI processors conforming to the Hyper\TeX\ guidelines (i.e.\ \textsf{xdvi}, \textsf{dvips} (with
the \textsf{-z} option), \textsf{\OzTeX}, and \textsf{Textures})
the \textsf{-z} option), \textsf{\hologo{OzTeX}}, and \textsf{Textures})
\item[dvips] produces \verb|\special| commands tailored for \textsf{dvips}
\item[dvipsone] produces \verb|\special| commands tailored for \textsf{dvipsone}
\item[ps2pdf] a special case of output suitable for processing by earlier versions of Ghost\-script's
PDF writer; this is basically the same as that for \textsf{dvips}, but a few variations remained before version 5.21
\item[tex4ht] produces \verb|\special| commands for use with \textsf{\TeX4ht}
\item[pdftex] pdf\TeX, \Hanh{}'s \TeX{} variant that writes PDF directly
\item[pdftex] pdf\TeX, \hologo{HanTheThanh}'s \TeX{} variant that writes PDF directly
\item[luatex] lua\TeX, Unicode \TeX{} variant that writes PDF directly
\item[dvipdfm] produces \verb|\special| commands for Mark Wicks' DVI to PDF driver \textsf{dvipdfm}
\item[dvipdfmx] produces \verb|\special| commands for driver
Expand Down Expand Up @@ -379,9 +368,6 @@ \section{Package options}
\hypersetup{pdfborder=0 0 0}
\end{verbatim}

Package `kvoptions-patch' patches \LaTeX\ to make it aware
of key value options and to prevent premature value expansions.

Some options can be given at any time, but many are restricted: before
\verb|\begin{document}|, only in \verb|\usepackage[...]{hyperref}|,
before first use, etc.
Expand Down Expand Up @@ -710,11 +696,10 @@ \subsection{PDF-specific display options}
but the colorlinks option resets it to produce no border.
\end{longtable}

Note that the color of link borders can be specified \emph{only} as 3
numbers in the range 0..1, giving an RGB color. You cannot use colors
defined in \TeX. Since version 6.76a this is no longer true.
Especially with the help of package \xpackage{xcolor} the usual
color specifications of package \xpackage{(x)color} can be used.
The color of link borders used to be specified \emph{only} as 3
numbers in the range 0..1, giving an RGB color. Since version 6.76a, the usual
color specifications of package \xpackage{(x)color} can be used if \xpackage{xcolor}
has been loaded.
For further information see description of package \xpackage{hycolor}.

The bookmark commands are stored in a file called
Expand Down Expand Up @@ -1636,7 +1621,7 @@ \subsection{\textbackslash ifpdfstringunicode}


As example we take a macro definition for the Vietnamese
name of Han The Thanh. Correctly written it needs some
name of \hologo{HanTheThanh}. Correctly written it needs some
accented characters, one character even with a double accent.
Class `tugboat.cls' defines a macro for the typesetted name:
\begin{verbatim}
Expand Down Expand Up @@ -1968,7 +1953,7 @@ \subsection{Option `pdfencoding'}
are used for most characters, surrogates need four bytes.
\item \xoption{auto} PDFDocEncoding if the string does not contain characters
outside the encoding (outside ascii if an unicode engine is used)
and Unicode otherwise. This option is normally no suited for the unicode engines.
and Unicode otherwise. This option is not intended for the unicode engines.
\end{itemize}

All drivers use \xoption{unicode} by default now. If another encoding should be forced,
Expand Down Expand Up @@ -3360,7 +3345,7 @@ \section{History and acknowledgments}

Berthold Horn provided help, encouragement and sponsorship for the
\textsf{dvipsone} and \textsf{dviwindo} drivers. Sergey Lesenko provided
the changes needed for \textsf{dvipdf}, and \Hanh{} supplied all the
the changes needed for \textsf{dvipdf}, and \Hologo{HanTheThanh} supplied all the
information needed for \textsf{pdftex}. Patrick Daly kindly updated his
\xpackage{natbib} package to allow easy integration with
\xpackage{hyperref}. Michael Mehlich's \xpackage{hyper} package (developed
Expand Down
4 changes: 2 additions & 2 deletions hluatex.dtx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
% \iffalse
% Source File: hluatex.dtx
% 2021-02-10 v7.00j
% 2021-02-27 v7.00k
%
% Copyright
% 2016-2019 Oberdiek Package Support Group
Expand Down Expand Up @@ -31,7 +31,7 @@
%
% \begin{macrocode}
%<*luatex>
%% 2021-02-10 v7.00j
%% 2021-02-27 v7.00k
%% force unicode encoding, see issue #101
%% code mostly copied from hxetex.def
\HyPsd@LoadUnicode
Expand Down
10 changes: 5 additions & 5 deletions hyperref.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
%<pd1enc>\ProvidesFile{pd1enc.def}
%<puenc>\ProvidesFile{puenc.def}
%<puextra>\ProvidesFile{puenc-extra.def}
%<pugreek>\ProvidesFile{puenc-greek.def}
%<pugreek>\ProvidesFile{puenc-greekbasic.def}
%<puvnenc>\ProvidesFile{puvnenc.def}
%<puarenc>\ProvidesFile{puarenc.def}
%<psdextra>\ProvidesFile{psdextra.def}
%<lang>\ProvidesFile{hyperref-langpatches.def}
%<!none> [2021-02-10 v7.00j %
%<!none> [2021-02-27 v7.00k %
%<package> Hypertext links for LaTeX]
%<nohyperref> Dummy hyperref (SR)]
%<driver> Hyperref documentation driver file]
Expand Down Expand Up @@ -2071,9 +2071,9 @@
\def\HyPsd@LoadExtra{%
\ifHy@psdextra
\ltx@iffileloaded{puenc.def}{%
\ltx@iffileloaded{puenc-greek.def}{}{%
\ltx@iffileloaded{puenc-greekbasic.def}{}{%
\Hy@SaveCatcodeSettings{pu}%
\input{puenc-greek.def}%
\input{puenc-greekbasic.def}%
\Hy@RestoreCatcodeSettings{pu}}%
\Hy@SaveCatcodeSettings{psdextra}%
\input{psdextra.def}%
Expand Down Expand Up @@ -22366,7 +22366,7 @@
% Greek is only loaded if \cs{textBeta} is defined.
% \begin{macrocode}
\ifx\textBeta\@undefined \else
\input{puenc-greek.def}
\input{puenc-greekbasic.def}
\fi
%</puenc>
%<*pugreek>
Expand Down
2 changes: 1 addition & 1 deletion hyperref.ins
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +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-greekbasic.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}}
Expand Down
2 changes: 1 addition & 1 deletion manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ hxetex.def
pd1enc.def
puenc.def
puenc-extra.def
puenc-greek.def
puenc-greekbasic.def
puvnenc.def
puarenc.def
psdextra.def
Expand Down
2 changes: 1 addition & 1 deletion xr-hyper.sty
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{xr-hyper}
[2021-02-10 v7.00j eXternal References (DPC)]
[2021-02-27 v7.00k eXternal References (DPC)]

\def\externaldocument{\@testopt\XR@cite{}}
\let\externalcitedocument\externaldocument
Expand Down

0 comments on commit 0a07a10

Please sign in to comment.