Merge branch 'develop'

u-fischer · u-fischer · commit 1b0b2db5a9e6 · 2025-07-12T15:10:55.000+02:00
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,14 @@
+2025-07-12 Ulrike Fischer
+	* hyperref.dtx: prepare disabling patches if DocumentMetadata is used.
+
+2025-07-04 Ulrike Fischer
+	* hyperref.dtx: set default pdf version in xetex driver to 1.7
+	* hyperref-linktarget.dtx: at missing recordtarget tagging socket.
+
+2025-06-22 Ulrike Fischer
+	* hyperref.dtx: fix default values of choice field, see https://tex.stackexchange.com/a/669186/2388
+
+
 Version: 2025-06-21 v7.01n
 
 2025-06-21 Ulrike Fischer
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # README for hyperref bundle
 
-Version 2025-06-21 v7.01n
+Version 2025-07-12 v7.01o
 
 ## INTRODUCTION
 
diff --git a/doc/hyperref-doc.tex b/doc/hyperref-doc.tex
@@ -166,7 +166,7 @@
 }
 \makeatother
 \title{Hypertext marks in \hologo{LaTeX}: a manual for \xpackage{hyperref}}
-\date{2025-06-21 v7.01n}
+\date{2025-07-12 v7.01o}
 
 \begin{document}
 
diff --git a/hluatex.dtx b/hluatex.dtx
@@ -1,6 +1,6 @@
 % \iffalse
 % Source File: hluatex.dtx
-% 2025-06-21 v7.01n
+% 2025-07-12 v7.01o
 %
 % Copyright
 % 2016-2019 Oberdiek Package Support Group
@@ -31,7 +31,7 @@
 %
 %    \begin{macrocode}
 %<*luatex>
-%% 2025-06-21 v7.01n
+%% 2025-07-12 v7.01o
 %% force unicode encoding, see issue #101
 %% code mostly copied from hxetex.def
 \HyPsd@LoadUnicode
diff --git a/hyperref-linktarget.dtx b/hyperref-linktarget.dtx
@@ -52,7 +52,7 @@
 %    }^^A
 % }
 %
-% \date{Version 2025-06-21 v7.01n}
+% \date{Version 2025-07-12 v7.01o}
 %
 % \maketitle
 % \begin{documentation}
@@ -480,6 +480,7 @@
             \@@_target_counter:nn {#2}{#3}
           }
         \group_end:
+        \UseTaggingSocket{recordtarget}
       }
   }
 %    \end{macrocode}
diff --git a/hyperref-patches.dtx b/hyperref-patches.dtx
@@ -50,7 +50,7 @@
 %    }^^A
 % }
 %
-% \date{Version 2025-06-21 v7.01n}
+% \date{Version 2025-07-12 v7.01o}
 %
 % \maketitle
 % \begin{documentation}
diff --git a/hyperref.dtx b/hyperref.dtx
@@ -51,7 +51,7 @@
 %<puvnenc>\ProvidesFile{puvnenc.def}
 %<puarenc>\ProvidesFile{puarenc.def}
 %<psdextra>\ProvidesFile{psdextra.def}
-%<!none&!packageEnd>  [2025-06-21 v7.01n %
+%<!none&!packageEnd>  [2025-07-12 v7.01o %
 %<package>  Hypertext links for LaTeX]
 %<nohyperref>  Dummy hyperref (SR)]
 %<driver>  Hyperref documentation driver file]
@@ -589,6 +589,28 @@
 %    \begin{macrocode}
 \Hy@SetCatcodes
 %    \end{macrocode}
+%
+% \subsection{Disable patches}
+% 
+% If new latex interfaces are used with \cs{DocumentMetadata} various patches are unneeded or do
+% harm, so we disable them.
+% Not handled yet: \cs{hyper@nopatch@amsmath@tag}, \cs{hyper@nopatch@mathenv}
+%    \begin{macrocode}
+\IfFormatAtLeastT{2025-11-01}
+ {
+   \IfDocumentMetadataT
+    {
+      \def\hyper@nopatch@counter{} % disabled since 2024-11-01 anyway
+      \def\hyper@nopatch@bib{}
+      \def\hyper@nopatch@thm{}
+      \def\hyper@nopatch@caption{}
+      \def\hyper@nopatch@footnote{}
+      \def\hyper@nopatch@sectioning{}
+      \def\hyper@nopatch@toc{}
+      \def\hyper@nopatch@longtable{}
+    }
+ }
+%    \end{macrocode}
 % change 2020-07-24: require newer pdftexcmds and remove fallback code
 % for version older than 2010.
 % change 2021-08-14: require expl3
@@ -4876,7 +4898,7 @@
 \@namedef{Hy@pdfversion@1.6}{\def\Hy@pdf@majorversion{1}\def\Hy@pdf@minorversion{6}}%
 \@namedef{Hy@pdfversion@1.7}{\def\Hy@pdf@majorversion{1}\def\Hy@pdf@minorversion{7}}%
 \@namedef{Hy@pdfversion@2.0}{\def\Hy@pdf@majorversion{2}\def\Hy@pdf@minorversion{0}}%
-\def\Hy@pdf@majorversion{1}\def\Hy@pdf@minorversion{5}
+\def\Hy@pdf@majorversion{1}\def\Hy@pdf@minorversion{7}
 %    \end{macrocode}
 % Legacy name, earlier releases assumed  1.x
 %    \begin{macrocode}
@@ -8812,13 +8834,11 @@
     \else
       \ifx\Fld@default\relax
       \else
-        \pdfstringdef\Hy@gtemp\Fld@default
-        \xdef\Fld@choices{\Fld@choices/DV(\Hy@gtemp)}%
+        \xdef\Fld@choices{\Fld@choices/DV(\Fld@default)}%
       \fi
       \ifx\Fld@value\relax
-      \else
-        \pdfstringdef\Hy@gtemp\Fld@value
-        \xdef\Fld@choices{\Fld@choices/V(\Hy@gtemp)}%
+      \else        
+        \xdef\Fld@choices{\Fld@choices/V(\Fld@value)}%
       \fi
     \fi
   \endgroup
diff --git a/testfiles-pvt/testform.luatex.tpf b/testfiles-pvt/testform.luatex.tpf
@@ -120,7 +120,7 @@ endobj
 endobj
 16 0 obj
 << /Type /Annot /Rect [ 262.874 550.359 408.867 586.281 ]
- /Subtype/Widget/F 4/T(\376\377\000t\000r\000a\000v\000e\000l)/FT/Ch/Q 0/BS<</W 1/S/S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/Opt[(\376\377\000T\000r\000o\000l\000l\000s)(\376\377\000M\000i\000s\000t\000y\000\040\000M\000o\000u\000n\000t\000a\000i\000n\000s)(\376\377\000B\000e\000o\000r\000n)(\376\377\000M\000i\000r\000k\000w\000o\000o\000d)(\376\377\000E\000l\000v\000e\000s)(\376\377\000L\000a\000k\000e\000t\000o\000w\000n)(\376\377\000S\000m\000a\000u\000g)(\376\377\000T\000h\000e\000\040\000B\000a\000t\000t\000l\000e)]/DV(\376\377\376\377\000\000B\000\000e\000\000o\000\000r\000\000n)/V(\376\377\376\377\000\000B\000\000e\000\000o\000\000r\000\000n)
+ /Subtype/Widget/F 4/T(\376\377\000t\000r\000a\000v\000e\000l)/FT/Ch/Q 0/BS<</W 1/S/S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/Opt[(\376\377\000T\000r\000o\000l\000l\000s)(\376\377\000M\000i\000s\000t\000y\000\040\000M\000o\000u\000n\000t\000a\000i\000n\000s)(\376\377\000B\000e\000o\000r\000n)(\376\377\000M\000i\000r\000k\000w\000o\000o\000d)(\376\377\000E\000l\000v\000e\000s)(\376\377\000L\000a\000k\000e\000t\000o\000w\000n)(\376\377\000S\000m\000a\000u\000g)(\376\377\000T\000h\000e\000\040\000B\000a\000t\000t\000l\000e)]/DV(\376\377\000B\000e\000o\000r\000n)/V(\376\377\000B\000e\000o\000r\000n)
  >>
 endobj
 17 0 obj
@@ -160,7 +160,7 @@ endobj
 endobj
 24 0 obj
 << /Type /Annot /Rect [ 278.695 437.562 330.311 453.432 ]
- /Subtype/Widget/F 4/T(\376\377\000w\000h\000a\000t\000d\000w\000a\000r\000f)/FT/Ch/Ff 917504/Q 0/BS<</W 1/S/S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/Opt[(\376\377\000B\000o\000f\000u\000r)(\376\377\000T\000h\000o\000r\000i\000n)(\376\377\000G\000o\000l\000l\000u\000m)(\376\377\000S\000m\000a\000u\000g)(\376\377\000G\000a\000n\000d\000a\000l\000f)]/DV(\376\377\376\377\000\000B\000\000o\000\000f\000\000u\000\000r)/V(\376\377\376\377\000\000B\000\000o\000\000f\000\000u\000\000r)
+ /Subtype/Widget/F 4/T(\376\377\000w\000h\000a\000t\000d\000w\000a\000r\000f)/FT/Ch/Ff 917504/Q 0/BS<</W 1/S/S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/Opt[(\376\377\000B\000o\000f\000u\000r)(\376\377\000T\000h\000o\000r\000i\000n)(\376\377\000G\000o\000l\000l\000u\000m)(\376\377\000S\000m\000a\000u\000g)(\376\377\000G\000a\000n\000d\000a\000l\000f)]/DV(\376\377\000B\000o\000f\000u\000r)/V(\376\377\000B\000o\000f\000u\000r)
  >>
 endobj
 25 0 obj
@@ -434,62 +434,62 @@ xref
 0000004705 00000 n 
 0000000068 00000 n 
 0000000281 00000 n 
-0000025563 00000 n 
+0000025451 00000 n 
 0000000349 00000 n 
 0000000848 00000 n 
-0000022337 00000 n 
+0000022225 00000 n 
 0000000918 00000 n 
 0000001421 00000 n 
 0000004793 00000 n 
 0000005093 00000 n 
 0000005491 00000 n 
-0000006242 00000 n 
-0000006504 00000 n 
-0000006760 00000 n 
-0000007016 00000 n 
-0000007366 00000 n 
-0000007721 00000 n 
-0000008071 00000 n 
-0000008298 00000 n 
-0000008873 00000 n 
-0000009086 00000 n 
-0000009328 00000 n 
-0000009652 00000 n 
+0000006186 00000 n 
+0000006448 00000 n 
+0000006704 00000 n 
+0000006960 00000 n 
+0000007310 00000 n 
+0000007665 00000 n 
+0000008015 00000 n 
+0000008242 00000 n 
+0000008761 00000 n 
+0000008974 00000 n 
+0000009216 00000 n 
+0000009540 00000 n 
 0000001491 00000 n 
-0000009531 00000 n 
-0000009591 00000 n 
-0000019634 00000 n 
-0000012128 00000 n 
-0000025706 00000 n 
+0000009419 00000 n 
+0000009479 00000 n 
+0000019522 00000 n 
+0000012016 00000 n 
+0000025594 00000 n 
 0000003329 00000 n 
-0000009734 00000 n 
-0000009926 00000 n 
-0000011141 00000 n 
-0000009980 00000 n 
-0000010055 00000 n 
-0000011379 00000 n 
-0000012281 00000 n 
-0000012480 00000 n 
-0000018167 00000 n 
-0000012786 00000 n 
-0000012861 00000 n 
-0000018403 00000 n 
-0000019788 00000 n 
-0000019988 00000 n 
-0000021297 00000 n 
-0000020087 00000 n 
-0000020161 00000 n 
-0000021532 00000 n 
-0000022490 00000 n 
-0000022689 00000 n 
-0000025345 00000 n 
-0000022712 00000 n 
-0000025767 00000 n 
-0000025868 00000 n 
-0000025904 00000 n 
-0000026021 00000 n 
+0000009622 00000 n 
+0000009814 00000 n 
+0000011029 00000 n 
+0000009868 00000 n 
+0000009943 00000 n 
+0000011267 00000 n 
+0000012169 00000 n 
+0000012368 00000 n 
+0000018055 00000 n 
+0000012674 00000 n 
+0000012749 00000 n 
+0000018291 00000 n 
+0000019676 00000 n 
+0000019876 00000 n 
+0000021185 00000 n 
+0000019975 00000 n 
+0000020049 00000 n 
+0000021420 00000 n 
+0000022378 00000 n 
+0000022577 00000 n 
+0000025233 00000 n 
+0000022600 00000 n 
+0000025655 00000 n 
+0000025756 00000 n 
+0000025792 00000 n 
+0000025909 00000 n 
 trailer
 << /Size 62 /Root 60 0 R /Info 61 0 R >>
 startxref
-26145
+26033
 %%EOF
diff --git a/testfiles-pvt/testform.tpf b/testfiles-pvt/testform.tpf
@@ -151,7 +151,7 @@ endobj
 <<
 /Type /Annot
 /Rect [262.868 550.683 408.86 586.501]
-/Subtype/Widget/F 4/T(\376\377\000t\000r\000a\000v\000e\000l)/FT/Ch/Q 0/BS<</W 1/S/S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/Opt[(\376\377\000T\000r\000o\000l\000l\000s)(\376\377\000M\000i\000s\000t\000y\000\040\000M\000o\000u\000n\000t\000a\000i\000n\000s)(\376\377\000B\000e\000o\000r\000n)(\376\377\000M\000i\000r\000k\000w\000o\000o\000d)(\376\377\000E\000l\000v\000e\000s)(\376\377\000L\000a\000k\000e\000t\000o\000w\000n)(\376\377\000S\000m\000a\000u\000g)(\376\377\000T\000h\000e\000\040\000B\000a\000t\000t\000l\000e)]/DV(\376\377\376\377\000\000B\000\000e\000\000o\000\000r\000\000n)/V(\376\377\376\377\000\000B\000\000e\000\000o\000\000r\000\000n)
+/Subtype/Widget/F 4/T(\376\377\000t\000r\000a\000v\000e\000l)/FT/Ch/Q 0/BS<</W 1/S/S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/Opt[(\376\377\000T\000r\000o\000l\000l\000s)(\376\377\000M\000i\000s\000t\000y\000\040\000M\000o\000u\000n\000t\000a\000i\000n\000s)(\376\377\000B\000e\000o\000r\000n)(\376\377\000M\000i\000r\000k\000w\000o\000o\000d)(\376\377\000E\000l\000v\000e\000s)(\376\377\000L\000a\000k\000e\000t\000o\000w\000n)(\376\377\000S\000m\000a\000u\000g)(\376\377\000T\000h\000e\000\040\000B\000a\000t\000t\000l\000e)]/DV(\376\377\000B\000e\000o\000r\000n)/V(\376\377\000B\000e\000o\000r\000n)
 >>
 endobj
 17 0 obj
@@ -207,7 +207,7 @@ endobj
 <<
 /Type /Annot
 /Rect [278.697 439.323 330.296 455.208]
-/Subtype/Widget/F 4/T(\376\377\000w\000h\000a\000t\000d\000w\000a\000r\000f)/FT/Ch/Ff 917504/Q 0/BS<</W 1/S/S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/Opt[(\376\377\000B\000o\000f\000u\000r)(\376\377\000T\000h\000o\000r\000i\000n)(\376\377\000G\000o\000l\000l\000u\000m)(\376\377\000S\000m\000a\000u\000g)(\376\377\000G\000a\000n\000d\000a\000l\000f)]/DV(\376\377\376\377\000\000B\000\000o\000\000f\000\000u\000\000r)/V(\376\377\376\377\000\000B\000\000o\000\000f\000\000u\000\000r)
+/Subtype/Widget/F 4/T(\376\377\000w\000h\000a\000t\000d\000w\000a\000r\000f)/FT/Ch/Ff 917504/Q 0/BS<</W 1/S/S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/Opt[(\376\377\000B\000o\000f\000u\000r)(\376\377\000T\000h\000o\000r\000i\000n)(\376\377\000G\000o\000l\000l\000u\000m)(\376\377\000S\000m\000a\000u\000g)(\376\377\000G\000a\000n\000d\000a\000l\000f)]/DV(\376\377\000B\000o\000f\000u\000r)/V(\376\377\000B\000o\000f\000u\000r)
 >>
 endobj
 25 0 obj
@@ -888,59 +888,59 @@ xref
 0000003867 00000 n 
 0000000061 00000 n 
 0000000284 00000 n 
-0000054163 00000 n 
+0000054051 00000 n 
 0000000352 00000 n 
 0000000843 00000 n 
-0000050945 00000 n 
+0000050833 00000 n 
 0000000913 00000 n 
 0000001406 00000 n 
 0000003955 00000 n 
 0000004251 00000 n 
 0000004644 00000 n 
-0000005390 00000 n 
-0000005648 00000 n 
-0000005901 00000 n 
-0000006154 00000 n 
-0000006499 00000 n 
-0000006850 00000 n 
-0000007196 00000 n 
-0000007418 00000 n 
-0000007989 00000 n 
-0000008198 00000 n 
-0000008436 00000 n 
-0000008752 00000 n 
+0000005334 00000 n 
+0000005592 00000 n 
+0000005845 00000 n 
+0000006098 00000 n 
+0000006443 00000 n 
+0000006794 00000 n 
+0000007140 00000 n 
+0000007362 00000 n 
+0000007877 00000 n 
+0000008086 00000 n 
+0000008324 00000 n 
+0000008640 00000 n 
 0000001476 00000 n 
-0000008635 00000 n 
-0000008693 00000 n 
-0000048999 00000 n 
-0000052916 00000 n 
-0000054324 00000 n 
-0000008834 00000 n 
-0000009026 00000 n 
-0000009184 00000 n 
-0000009683 00000 n 
-0000009921 00000 n 
-0000009943 00000 n 
-0000027184 00000 n 
-0000027495 00000 n 
-0000035911 00000 n 
-0000036140 00000 n 
-0000044144 00000 n 
-0000044368 00000 n 
-0000047000 00000 n 
-0000047216 00000 n 
-0000049157 00000 n 
-0000051104 00000 n 
-0000053075 00000 n 
-0000054382 00000 n 
-0000054479 00000 n 
-0000054515 00000 n 
-0000054632 00000 n 
+0000008523 00000 n 
+0000008581 00000 n 
+0000048887 00000 n 
+0000052804 00000 n 
+0000054212 00000 n 
+0000008722 00000 n 
+0000008914 00000 n 
+0000009072 00000 n 
+0000009571 00000 n 
+0000009809 00000 n 
+0000009831 00000 n 
+0000027072 00000 n 
+0000027383 00000 n 
+0000035799 00000 n 
+0000036028 00000 n 
+0000044032 00000 n 
+0000044256 00000 n 
+0000046888 00000 n 
+0000047104 00000 n 
+0000049045 00000 n 
+0000050992 00000 n 
+0000052963 00000 n 
+0000054270 00000 n 
+0000054367 00000 n 
+0000054403 00000 n 
+0000054520 00000 n 
 trailer
 << /Size 56
 /Root 54 0 R
 /Info 55 0 R
  >>
 startxref
-54756
+54644
 %%EOF
diff --git a/testfiles-xetex/unicode-test.tpf b/testfiles-xetex/unicode-test.tpf
@@ -1,4 +1,4 @@
-%PDF-1.5
+%PDF-1.7
 %����
 15 0 obj
 <</Length 204>>
diff --git a/testfiles/makeuppercase-language.etex.tlg b/testfiles/makeuppercase-language.etex.tlg
diff --git a/testfiles/makeuppercase-language.tlg b/testfiles/makeuppercase-language.tlg
diff --git a/xr-hyper.dtx b/xr-hyper.dtx

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@`
`166`	`166`	`}`
`167`	`167`	`\makeatother`
`168`	`168`	`\title{Hypertext marks in \hologo{LaTeX}: a manual for \xpackage{hyperref}}`
`169`		`-\date{2025-06-21 v7.01n}`
	`169`	`+\date{2025-07-12 v7.01o}`
`170`	`170`
`171`	`171`	`\begin{document}`
`172`	`172`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`% }^^A`
`53`	`53`	`% }`
`54`	`54`	`%`
`55`		`-% \date{Version 2025-06-21 v7.01n}`
	`55`	`+% \date{Version 2025-07-12 v7.01o}`
`56`	`56`	`%`
`57`	`57`	`% \maketitle`
`58`	`58`	`% \begin{documentation}`
`@@ -480,6 +480,7 @@`
`480`	`480`	`\@@_target_counter:nn {#2}{#3}`
`481`	`481`	`}`
`482`	`482`	`\group_end:`
	`483`	`+ \UseTaggingSocket{recordtarget}`
`483`	`484`	`}`
`484`	`485`	`}`
`485`	`486`	`% \end{macrocode}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`% }^^A`
`51`	`51`	`% }`
`52`	`52`	`%`
`53`		`-% \date{Version 2025-06-21 v7.01n}`
	`53`	`+% \date{Version 2025-07-12 v7.01o}`
`54`	`54`	`%`
`55`	`55`	`% \maketitle`
`56`	`56`	`% \begin{documentation}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%PDF-1.5`
	`1`	`+%PDF-1.7`
`2`	`2`	`%��`
`3`	`3`	`15 0 obj`
`4`	`4`	`<</Length 204>>`