[latex3-commits] [git/LaTeX3-latex3-hyperref] cleanup-patches: don't redefine \@secondoffive and \@fifthoffive, issue #238 (34c7156)

Ulrike Fischer fischer at troubleshooting-tex.de
Sun May 22 17:39:45 CEST 2022


Repository : https://github.com/latex3/hyperref
On branch  : cleanup-patches
Link       : https://github.com/latex3/hyperref/commit/34c7156db0237940c6daf8be4019d914a5c5f1b6

>---------------------------------------------------------------

commit 34c7156db0237940c6daf8be4019d914a5c5f1b6
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Sun May 22 17:39:45 2022 +0200

    don't redefine \@secondoffive and \@fifthoffive, issue #238


>---------------------------------------------------------------

34c7156db0237940c6daf8be4019d914a5c5f1b6
 hyperref.dtx                                       |  2 -
 ...fminorversion.etex.tlg => gh238-draft.etex.tlg} | 58 +++++++++++++---------
 ...orversion.luatex.tlg => gh238-draft.luatex.tlg} | 58 +++++++++++++++-------
 testfiles/gh238-draft.lvt                          | 13 +++++
 .../{38-pdfminorversion.tlg => gh238-draft.tlg}    | 51 +++++++++++++------
 5 files changed, 124 insertions(+), 58 deletions(-)

diff --git a/hyperref.dtx b/hyperref.dtx
index edf82e4..15eaf57 100644
--- a/hyperref.dtx
+++ b/hyperref.dtx
@@ -6792,8 +6792,6 @@
     \def\Acrobatmenu#1#2{\leavevmode#2\Hy at xspace@end}%
     \let\PDF at SetupDoc\@empty
     \let\PDF at FinishDoc\@empty
-    \let\@fifthoffive\@secondoftwo
-    \let\@secondoffive\@secondoftwo
     \let\ReadBookmarks\relax
     \let\WriteBookmarks\relax
     \Hy at WarningNoLine{Draft mode on}%
diff --git a/testfiles/38-pdfminorversion.etex.tlg b/testfiles/gh238-draft.etex.tlg
similarity index 58%
copy from testfiles/38-pdfminorversion.etex.tlg
copy to testfiles/gh238-draft.etex.tlg
index 5f4e7ea..ad7247a 100644
--- a/testfiles/38-pdfminorversion.etex.tlg
+++ b/testfiles/gh238-draft.etex.tlg
@@ -4,7 +4,6 @@ Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0
 .\hbox(0.0+0.0)x0.0
 ..\special{! systemdict /pdfmark known{userdict /?pdfmark systemdict /exec get p\ETC.}
-..\special{ps:SDict begin [/Producer (dvips + Distiller)/Title ()/Subject ()/Cre\ETC.}
 ..\special{! /DvipsToPDF{72.27 mul Resolution div} def/PDFToDvips{72.27 div Reso\ETC.}
 .\special{ps:SDict begin /product where{pop product(Distiller)search{pop pop po\ETC.}
 .\vbox(0.0+0.0)x0.0, glue set - 14.99626fil
@@ -15,10 +14,6 @@ Completed box being shipped out [1]
 ...\kern 0.0
 ...\kern 62.0
 ...\kern -1.00374
-...\special{ps:SDict begin H.S end}
-...\special{ps:SDict begin H.R end}
-...\special{ps:SDict begin [/View [/XYZ H.V]/Dest (page.1) cvn /DEST pdfmark end}
-...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 .\glue(\lineskip) 0.0
@@ -31,29 +26,48 @@ Completed box being shipped out [1]
 .....\hbox(0.0+0.0)x345.0
 ...\glue 25.0
 ...\glue(\lineskip) 0.0
-...\vbox(550.0+0.0)x345.0, glue set 527.9436fil
+...\vbox(550.0+0.0)x345.0, glue set 484.97604fil
 ....\write-{}
-....\special{ps:SDict begin [/PageMode /UseOutlines/Page 1/View [/Fit] /DOCVIEW pd\ETC.}
-....\special{ps:SDict begin [ {Catalog}<<>> /PUT pdfmark end}
-....\special{ps:SDict begin H.S end}
-....\special{ps:SDict begin 12 H.A end}
-....\special{ps:SDict begin [/View [/XYZ H.V]/Dest (Doc-Start) cvn /DEST pdfmark e\ETC.}
-....\glue(\topskip) 3.55556
-....\hbox(6.44444+0.0)x345.0, glue set 324.99998fil
+....\glue(\topskip) 5.69446
+....\hbox(4.30554+0.0)x345.0, glue set 324.7222fil
 .....\hbox(0.0+0.0)x15.0
-.....\OT1/cmr/m/n/10 5
+.....\OT1/cmr/m/n/10 x
 .....\penalty 10000
 .....\glue(\parfillskip) 0.0 plus 1.0fil
 .....\glue(\rightskip) 0.0
+....\penalty -300
+....\glue 15.0694 plus 4.30554 minus 0.86108
+....\glue(\parskip) 0.0 plus 1.0
+....\glue(\parskip) 0.0
+....\glue(\baselineskip) 8.00002
+....\hbox(9.99998+0.0)x345.0, glue set 303.82506fil
+.....\hbox(9.27998+0.0)x24.29997
+......\glue 0.0
+......\OT1/cmr/bx/n/14.4 1
+......\glue 16.19998
+.....\OT1/cmr/bx/n/14.4 a
+.....\kern 0.0
+.....\OT1/cmr/bx/n/14.4 b
+.....\kern 0.0
+.....\penalty 10000
+.....\glue(\parfillskip) 0.0 plus 1.0fil
+.....\glue(\rightskip) 0.0
+....\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
+....\penalty 10000
+....\glue 9.90276 plus 0.86108
+....\write1{\newlabel{a}{{1}{\thepage }{a\textbf {b}}{section.1}{}}}
+....\penalty 10000
+....\penalty 10000
 ....\glue(\parskip) 0.0 plus 1.0
 ....\glue(\parskip) 0.0
 ....\glue(\baselineskip) 5.05556
-....\hbox(6.94444+0.0)x345.0, glue set 310.5555fil
-.....\hbox(0.0+0.0)x15.0
-.....\OT1/cmr/m/n/10 b
-.....\OT1/cmr/m/n/10 l
-.....\OT1/cmr/m/n/10 u
-.....\OT1/cmr/m/n/10 b
+....\hbox(6.94444+0.0)x345.0, glue set 325.27779fil
+.....\OT1/cmr/m/n/10 1
+.....\glue 3.33333 plus 1.66666 minus 1.11111
+.....\OT1/cmr/m/n/10 a
+.....\kern 0.0
+.....\OT1/cmr/bx/n/10 b
+.....\kern 0.0
 .....\penalty 10000
 .....\glue(\parfillskip) 0.0 plus 1.0fil
 .....\glue(\rightskip) 0.0
@@ -67,6 +81,4 @@ Completed box being shipped out [1]
 .....\OT1/cmr/m/n/10 1
 .....\glue 0.0 plus 1.0fil
 .\kern 0.0
-(38-pdfminorversion.aux)
-Package rerunfilecheck Info: File `38-pdfminorversion.out' has not changed.
-(rerunfilecheck)             Checksum: D41D8CD98F00B204E9800998ECF8427E;0.
+(gh238-draft.aux)
diff --git a/testfiles/38-pdfminorversion.luatex.tlg b/testfiles/gh238-draft.luatex.tlg
similarity index 55%
copy from testfiles/38-pdfminorversion.luatex.tlg
copy to testfiles/gh238-draft.luatex.tlg
index 629ef73..99e00e1 100644
--- a/testfiles/38-pdfminorversion.luatex.tlg
+++ b/testfiles/gh238-draft.luatex.tlg
@@ -11,8 +11,6 @@ Completed box being shipped out [1]
 ...\kern0.0
 ...\kern62.0
 ...\kern-1.00374
-...\pdfdest name{page.1} xyz
-...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 .\glue(\lineskip) 0.0
@@ -25,35 +23,63 @@ Completed box being shipped out [1]
 .....\hbox(0.0+0.0)x345.0, direction TLT
 ...\glue 25.0
 ...\glue(\lineskip) 0.0
-...\vbox(550.0+0.0)x345.0, glue set 527.9436fil, direction TLT
+...\vbox(550.0+0.0)x345.0, glue set 484.95023fil, direction TLT
 ....\write-{}
-....\pdfdest name{Doc-Start} xyz
-....\glue(\topskip) 3.34
-....\hbox(6.66+0.22)x345.0, glue set 325.0fil, direction TLT
+....\glue(\topskip) 5.69
+....\hbox(4.31+0.0)x345.0, glue set 324.72fil, direction TLT
 .....\localpar
 ......\localinterlinepenalty=0
 ......\localbrokenpenalty=0
 ......\localleftbox=null
 ......\localrightbox=null
 .....\hbox(0.0+0.0)x15.0, direction TLT
-.....\TU/lmr/m/n/10 6
+.....\TU/lmr/m/n/10 x
 .....\penalty 10000
 .....\glue(\parfillskip) 0.0 plus 1.0fil
 .....\glue(\rightskip) 0.0
+....\penalty -300
+....\glue 15.08499 plus 4.31 minus 0.86198
 ....\glue(\parskip) 0.0 plus 1.0
 ....\glue(\parskip) 0.0
-....\glue(\baselineskip) 4.84
-....\hbox(6.94+0.11)x345.0, glue set 310.54001fil, direction TLT
+....\glue(\baselineskip) 8.00641
+....\hbox(9.99359+0.0864)x345.0, glue set 305.61603fil, direction TLT
 .....\localpar
 ......\localinterlinepenalty=0
 ......\localbrokenpenalty=0
 ......\localleftbox=null
 ......\localrightbox=null
-.....\hbox(0.0+0.0)x15.0, direction TLT
-.....\TU/lmr/m/n/10 b
-.....\TU/lmr/m/n/10 l
-.....\TU/lmr/m/n/10 u
-.....\TU/lmr/m/n/10 b
+.....\hbox(9.4464+0.0)x22.50719, direction TLT
+......\glue 0.0
+......\TU/lmr/bx/n/14.4 1
+......\glue 14.4
+.....\TU/lmr/bx/n/14.4 a
+.....\kern0.0 (italic)
+.....\TU/lmr/bx/n/14.4 b
+.....\kern0.0 (italic)
+.....\penalty 10000
+.....\glue(\parfillskip) 0.0 plus 1.0fil
+.....\glue(\rightskip) 0.0
+....\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
+....\penalty 10000
+....\glue 9.913 plus 0.86198
+....\write1{\newlabel{a}{{1}{\thepage }{a\textbf {b}}{section.1}{}}}
+....\penalty 10000
+....\penalty 10000
+....\glue(\parskip) 0.0 plus 1.0
+....\glue(\parskip) 0.0
+....\glue(\baselineskip) 4.9736
+....\hbox(6.94+0.11)x345.0, glue set 325.28fil, direction TLT
+.....\localpar
+......\localinterlinepenalty=0
+......\localbrokenpenalty=0
+......\localleftbox=null
+......\localrightbox=null
+.....\TU/lmr/m/n/10 1
+.....\glue(\spaceskip) 3.33 plus 1.665 minus 1.11
+.....\TU/lmr/m/n/10 a
+.....\kern0.0 (italic)
+.....\TU/lmr/bx/n/10 b
+.....\kern0.0 (italic)
 .....\penalty 10000
 .....\glue(\parfillskip) 0.0 plus 1.0fil
 .....\glue(\rightskip) 0.0
@@ -68,6 +94,4 @@ Completed box being shipped out [1]
 .....\TU/lmr/m/n/10 1
 .....\glue 0.0 plus 1.0fil
 .\kern0.0
-(38-pdfminorversion.aux)
-Package rerunfilecheck Info: File `38-pdfminorversion.out' has not changed.
-(rerunfilecheck)             Checksum: D41D8CD98F00B204E9800998ECF8427E;0.
+(gh238-draft.aux)
diff --git a/testfiles/gh238-draft.lvt b/testfiles/gh238-draft.lvt
new file mode 100644
index 0000000..44891d6
--- /dev/null
+++ b/testfiles/gh238-draft.lvt
@@ -0,0 +1,13 @@
+
+\input{regression-test}
+\documentclass{article}
+\usepackage[draft]{hyperref}
+\begin{document}
+x
+\START
+\showoutput
+\section{a\textbf{b}}\label{a}
+\pageref{a}
+\nameref{a}
+
+\end{document}
\ No newline at end of file
diff --git a/testfiles/38-pdfminorversion.tlg b/testfiles/gh238-draft.tlg
similarity index 53%
copy from testfiles/38-pdfminorversion.tlg
copy to testfiles/gh238-draft.tlg
index a886a78..c1aa5f9 100644
--- a/testfiles/38-pdfminorversion.tlg
+++ b/testfiles/gh238-draft.tlg
@@ -11,8 +11,6 @@ Completed box being shipped out [1]
 ...\kern 0.0
 ...\kern 62.0
 ...\kern -1.00374
-...\pdfdest name{page.1} xyz
-...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 .\glue(\lineskip) 0.0
@@ -25,25 +23,48 @@ Completed box being shipped out [1]
 .....\hbox(0.0+0.0)x345.0
 ...\glue 25.0
 ...\glue(\lineskip) 0.0
-...\vbox(550.0+0.0)x345.0, glue set 527.9436fil
+...\vbox(550.0+0.0)x345.0, glue set 484.97604fil
 ....\write-{}
-....\pdfdest name{Doc-Start} xyz
-....\glue(\topskip) 3.55556
-....\hbox(6.44444+0.0)x345.0, glue set 324.99998fil
+....\glue(\topskip) 5.69446
+....\hbox(4.30554+0.0)x345.0, glue set 324.7222fil
 .....\hbox(0.0+0.0)x15.0
-.....\OT1/cmr/m/n/10 6
+.....\OT1/cmr/m/n/10 x
 .....\penalty 10000
 .....\glue(\parfillskip) 0.0 plus 1.0fil
 .....\glue(\rightskip) 0.0
+....\penalty -300
+....\glue 15.0694 plus 4.30554 minus 0.86108
+....\glue(\parskip) 0.0 plus 1.0
+....\glue(\parskip) 0.0
+....\glue(\baselineskip) 8.00002
+....\hbox(9.99998+0.0)x345.0, glue set 303.82506fil
+.....\hbox(9.27998+0.0)x24.29997
+......\glue 0.0
+......\OT1/cmr/bx/n/14.4 1
+......\glue 16.19998
+.....\OT1/cmr/bx/n/14.4 a
+.....\kern 0.0
+.....\OT1/cmr/bx/n/14.4 b
+.....\kern 0.0
+.....\penalty 10000
+.....\glue(\parfillskip) 0.0 plus 1.0fil
+.....\glue(\rightskip) 0.0
+....\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
+....\penalty 10000
+....\glue 9.90276 plus 0.86108
+....\write1{\newlabel{a}{{1}{\thepage }{a\textbf {b}}{section.1}{}}}
+....\penalty 10000
+....\penalty 10000
 ....\glue(\parskip) 0.0 plus 1.0
 ....\glue(\parskip) 0.0
 ....\glue(\baselineskip) 5.05556
-....\hbox(6.94444+0.0)x345.0, glue set 310.5555fil
-.....\hbox(0.0+0.0)x15.0
-.....\OT1/cmr/m/n/10 b
-.....\OT1/cmr/m/n/10 l
-.....\OT1/cmr/m/n/10 u
-.....\OT1/cmr/m/n/10 b
+....\hbox(6.94444+0.0)x345.0, glue set 325.27779fil
+.....\OT1/cmr/m/n/10 1
+.....\glue 3.33333 plus 1.66666 minus 1.11111
+.....\OT1/cmr/m/n/10 a
+.....\kern 0.0
+.....\OT1/cmr/bx/n/10 b
+.....\kern 0.0
 .....\penalty 10000
 .....\glue(\parfillskip) 0.0 plus 1.0fil
 .....\glue(\rightskip) 0.0
@@ -57,6 +78,4 @@ Completed box being shipped out [1]
 .....\OT1/cmr/m/n/10 1
 .....\glue 0.0 plus 1.0fil
 .\kern 0.0
-(38-pdfminorversion.aux)
-Package rerunfilecheck Info: File `38-pdfminorversion.out' has not changed.
-(rerunfilecheck)             Checksum: D41D8CD98F00B204E9800998ECF8427E;0.
+(gh238-draft.aux)





More information about the latex3-commits mailing list.