Merge pull request #388 from latex3/gh386

Gh386, 387 and tagging issue 920

Author: u-fischer

ChangeLog.txt

@@ -1,3 +1,13 @@
+2025-06-20 Ulrike Fischer
+	* hyperref.dtx: test if \ifmeasuring@ already exists, tagging-project issue #920
+
+2025-06-17 Ulrike Fischer
+	* hyperref.dtx: set the pdfa key automatically if an A-standard is 
+      set in \DocumentMetadata. issue #387
+
+2025-06-01 Ulrike Fischer
+	* hyperref.dtx: change hyperindexformat to hyperxindexformat, issue #386
+
 2025-05-20 Ulrike Fischer
 	* hyperref.dtx: added a group in the xetex driver, issue #380.
 	* hyperref.dtx: renamed \textin to \textinsymbol, issue #377

doc/hyperref-doc.tex

@@ -2148,7 +2148,7 @@ \subsection{Option `pdfa'}
   the loading of the package and cannot be changed after \xpackage{hyperref} is
   loaded (\verb|\usepackage{hyperref}|).
 
-
+If the PDF management is loaded with \cs{DocumentMetadata} the option is automatically set/unset depending on if an A-standard is set with the `pdfstandard` key. The manual setting of `pdfa` is then ignored. 
 
 \subsection{Option `linktoc' added}
 

hyperref.dtx

@@ -6502,9 +6502,18 @@
 \define@key{Hyp}{pdfdisplaydoctitle}[true]{%
   \Hy@boolkey{pdfdisplaydoctitle}{#1}%
 }
-\define@key{Hyp}{pdfa}[true]{%
-  \Hy@boolkey{pdfa}{#1}%
+\define@key{Hyp}{pdfa}[true]{%  
+ \IfDocumentMetadataTF
+  {
+    \PackageWarning{hyperref}{%
+     \string\DocumentMetadata\space detected.\MessageBreak
+     The 'pdfa' key will be ignored.\MessageBreak
+     Please set the PDF/A standard in \string\DocumentMetadata\MessageBreak
+     with the 'pdfstandard' key.}  
+  }
+  {\Hy@boolkey{pdfa}{#1}}%  
 }
+
 \define@key{Hyp}{pdfnewwindow}[true]{%
   \def\Hy@temp{#1}%
   \ifx\Hy@temp\@empty
@@ -6833,8 +6842,21 @@
 %    \end{macrocode}
 %
 % \subsection{PDF/A}
-%
+% If an A-standard has been set in \cs{DocumentMetadata} hyperref should set the pdfa
+% key too.
 %    \begin{macrocode}
+\ExplSyntaxOn
+\IfDocumentMetadataT
+ {
+   \tl_if_empty:eTF{\GetDocumentProperties{document/pdfstandard}}
+    {
+      \Hy@pdfafalse
+    }
+    {
+      \Hy@pdfatrue
+    }
+ }
+\ExplSyntaxOff 
 \Hy@DisableOption{pdfa}
 %    \end{macrocode}
 %
@@ -10438,8 +10460,12 @@
 % AMS\LaTeX\ processes all equations twice; we want to make sure
 % that the hyper stuff is not executed twice, so we use the AMS
 % |\ifmeasuring@|, initialized if AMS math is not used.
+% change 2025-06-20: test if the switch already exist, see tagging-project issue 920.
 %    \begin{macrocode}
-\newif\ifmeasuring@\measuring@false
+\ifcsname ifmeasuring@\endcsname  
+\else     
+ \expandafter\newif\csname ifmeasuring@\endcsname\measuring@false
+\fi
 \newcommand\Hy@ifnotmeasuring[1]{#1}
 \AddToHook{package/amsmath/after}
  {
@@ -12259,13 +12285,17 @@
 %    \begin{macrocode}
 \ifHy@hyperindex
   \def\HyInd@ParenLeft{(}%
-  \def\HyInd@ParenRight{)}%
-  \def\hyperindexformat#1#2{%
+  \def\HyInd@ParenRight{)}%  
+  \def\hyperxindexformat#1#2{%
     \let\HyOrg@hyperpage\hyperpage
     \let\hyperpage\@firstofone
     #1{\HyOrg@hyperpage{#2}}%
     \let\hyperpage\HyOrg@hyperpage
   }%
+%    \end{macrocode}
+% keep the old name for compability.
+%    \begin{macrocode}
+  \let\hyperindexformat\hyperxindexformat
   \Hy@nextfalse
   \@ifpackageloaded{multind}{\Hy@nexttrue}{}%
   \@ifpackageloaded{index}{\Hy@nexttrue}{}%
@@ -12290,7 +12320,7 @@
                 \ifx\Hy@temp@A\HyInd@ParenRight 1\fi
                 \relax
           \HyInd@org@wrindex{#1}{%
-            #2|hyperindexformat{/#3#4}%
+            #2|hyperxindexformat{/#3#4}%
           }%
         \else
           \ifx\\#4\\%
@@ -12301,7 +12331,7 @@
             \fi
           \else
             \HyInd@org@wrindex{#1}{%
-              #2|#3hyperindexformat{/#4}%
+              #2|#3hyperxindexformat{/#4}%
             }%
           \fi
         \fi
@@ -12328,7 +12358,7 @@
                 \relax
           \protected@write\@indexfile{}{%
             \string\indexentry{%
-              #1|hyperindexformat{/#2#3}%
+              #1|hyperxindexformat{/#2#3}%
             }{\thepage}%
           }%
         \else
@@ -12357,14 +12387,14 @@
           \else
             \protected@write\@indexfile{}{%
                \string\indexentry{%
-                 #1|#2hyperindexformat{/#3}%
+                 #1|#2hyperxindexformat{/#3}%
                }{\thepage}%
             }%
             \ifx\Hy@temp@A\HyInd@ParenLeft
               \HyInd@DefKey{#1}%
               \expandafter
               \gdef\csname HyInd@(\HyInd@key)\endcsname{%
-                hyperindexformat{/#3}%
+                hyperxindexformat{/#3}%
               }%
             \fi
           \fi

testfiles-pdftex/nopatch-amsmath-1.tlg

@@ -28,7 +28,7 @@ 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 521.94424fil
+...\vbox(550.0+0.0)x345.0, glue set 519.44452fil
 ....\write-{}
 ....\pdfdest name{Doc-Start} xyz
 ....\pdfdest name{section*.1} xyz
@@ -62,7 +62,6 @@ Completed box being shipped out [1]
 ......\write1{\newlabel{aaa}{{{x}}{\thepage }{}{section*.1}{}}}
 ....\penalty 0
 ....\glue(\belowdisplayshortskip) 6.0 plus 3.0 minus 3.0
-....\glue -2.5
 ....\glue 0.0 plus 1.0fil
 ....\glue 0.0
 ....\glue 0.0 plus 0.0001fil

testfiles-pdftex/nopatch.tlg

@@ -5,7 +5,7 @@ Don't change this file in any respect.
 <argument> \make@df@tag@@ 
 l. ...\ShowCommand\make@df@tag@@
 > \LT@array=macro:
-[#1]#2->\UseTaggingSocket {tbl/init}\tl_if_empty:eTF {\LTcaptype }{\tl_gset:Ne \@currentHref {LT@tables.\theHLT@tables }}{\@kernel@refstepcounter {\LTcaptype }\stepcounter {LT@tables}\tl_gset:Ne \@currentHref {\LTcaptype .\cs_if_exist_use:c {theH\LTcaptype }}}\tbl_gzero_row_count: \UseTaggingSocket {tbl/longtable/init}\if l#1\LTleft \z@ \LTright \fill \else \if r#1\LTleft \fill \LTright \z@ \else \if c#1\LTleft \fill \LTright \fill \fi \fi \fi \let \LT@mcol \multicolumn \let \LT@@tabarray \@tabarray \let \LT@@hl \hline \def \@tabarray {\let \hline \LT@@hl \LT@@tabarray }\let \\\LT@tabularcr \let \tabularnewline \\\def \newpage {\noalign {\break }}\def \pagebreak {\noalign {\ifnum `}=0\fi \@testopt {\LT@no@pgbk -}4}\def \nopagebreak {\noalign {\ifnum `}=0\fi \@testopt \LT@no@pgbk 4}\let \hline \LT@hline \let \kill \LT@kill \let \caption \LT@caption \@tempdima \ht \strutbox \let \@endpbox \LT@endpbox \ifx \extrarowheight \@undefined \let \@acol \@tabacol \let \@classz \@tabclassz \let \@classiv \@tabclassiv \def \@startpbox {\vtop \LT@startpbox }\let \@@startpbox \@startpbox \let \@@endpbox \@endpbox \let \LT@LL@FM@cr \@tabularcr \else \advance \@tempdima \extrarowheight \col@sep \tabcolsep \let \@startpbox \LT@startpbox \let \LT@LL@FM@cr \@arraycr \fi \setbox \@arstrutbox \hbox {\vrule \@height \arraystretch \@tempdima \@depth \arraystretch \dp \strutbox \@width \z@ }\let \@sharp ##\let \protect \relax \begingroup \@mkpream {#2}\tbl_count_table_cols: \xdef \LT@bchunk {\tbl_inbetween_rows: \global \advance \c@LT@chunks \@ne \global \LT@rows \z@ \setbox \z@ \vbox \bgroup \LT@setprevdepth \tabskip \LTleft \noexpand \halign to\hsize \bgroup \tabskip \z@ \@arstrut \UseTaggingSocket {tbl/row/begin}\tbl_init_cell_data_for_row: \@preamble \tabskip \LTright \cr }\endgroup \expandafter \LT@nofcols \LT@bchunk &\LT@nofcols \LT@make@row \m@th \let \par \@empty \everycr {\noalign {\__tbl_trace:n {--longtable--> chunk row: \the \LT@rows \space row: \the \g__tbl_row_int \space column: \the \g__tbl_col_int }\tbl_if_row_was_started:T {\UseTaggingSocket {tbl/row/end}\tbl_inbetween_rows: }\int_compare:nNnT \LT@rows <\LTchunksize {\tbl_gincr_row_count: }}}\lineskip \z@ \baselineskip \z@ \LT@bchunk .
+[#1]#2->\UseTaggingSocket {tbl/init}\tl_if_empty:eTF {\LTcaptype }{\tl_gset:Ne \@currentHref {LT@tables.\theHLT@tables }}{\@kernel@refstepcounter {\LTcaptype }\stepcounter {LT@tables}\tl_gset:Ne \@currentHref {\LTcaptype .\cs_if_exist_use:c {theH\LTcaptype }}}\tbl_gzero_row_count: \UseTaggingSocket {tbl/longtable/init}\if l#1\LTleft \z@ \LTright \fill \else \if r#1\LTleft \fill \LTright \z@ \else \if c#1\LTleft \fill \LTright \fill \fi \fi \fi \let \LT@mcol \multicolumn \let \LT@@tabarray \@tabarray \let \LT@@hl \hline \def \@tabarray {\let \hline \LT@@hl \LT@@tabarray }\let \\\LT@tabularcr \let \tabularnewline \\\def \newpage {\noalign {\break }}\def \pagebreak {\noalign {\ifnum `}=0\fi \@testopt {\LT@no@pgbk -}4}\def \nopagebreak {\noalign {\ifnum `}=0\fi \@testopt \LT@no@pgbk 4}\let \hline \LT@hline \let \kill \LT@kill \let \caption \LT@caption \@tempdima \ht \strutbox \let \@endpbox \LT@endpbox \ifx \extrarowheight \@undefined \let \@acol \@tabacol \let \@classz \@tabclassz \let \@classiv \@tabclassiv \def \@startpbox {\vtop \LT@startpbox }\let \@@startpbox \@startpbox \let \@@endpbox \@endpbox \let \LT@LL@FM@cr \@tabularcr \else \advance \@tempdima \extrarowheight \col@sep \tabcolsep \let \@startpbox@action \LT@startpbox \let \LT@LL@FM@cr \@arraycr \fi \setbox \@arstrutbox \hbox {\vrule \@height \arraystretch \@tempdima \@depth \arraystretch \dp \strutbox \@width \z@ }\let \@sharp ##\let \protect \relax \begingroup \@mkpream {#2}\tbl_count_table_cols: \xdef \LT@bchunk {\tbl_inbetween_rows: \global \advance \c@LT@chunks \@ne \global \LT@rows \z@ \setbox \z@ \vbox \bgroup \LT@setprevdepth \tabskip \LTleft \noexpand \halign to\hsize \bgroup \tabskip \z@ \@arstrut \UseTaggingSocket {tbl/row/begin}\tbl_init_cell_data_for_row: \@preamble \tabskip \LTright \cr }\endgroup \expandafter \LT@nofcols \LT@bchunk &\LT@nofcols \LT@make@row \m@th \let \par \@empty \everycr {\noalign {\__tbl_trace:n {--longtable--> chunk row: \the \LT@rows \space row: \the \g__tbl_row_int \space column: \the \g__tbl_col_int }\tbl_if_row_was_started:T {\UseTaggingSocket {tbl/row/end}\tbl_inbetween_rows: }\int_compare:nNnT \LT@rows <\LTchunksize {\tbl_gincr_row_count: }}}\lineskip \z@ \baselineskip \z@ \LT@bchunk .
 <argument> \LT@array 
 l. ...\ShowCommand\LT@array
 > \LT@start=macro:

testfiles-pdftex/patch.tlg

@@ -5,7 +5,7 @@ Don't change this file in any respect.
 <argument> \make@df@tag@@ 
 l. ...\ShowCommand\make@df@tag@@
 > \LT@array=macro:
-[#1]#2->\UseTaggingSocket {tbl/init}\tl_if_empty:eTF {\LTcaptype }{\tl_gset:Ne \@currentHref {LT@tables.\theHLT@tables }}{\@kernel@refstepcounter {\LTcaptype }\stepcounter {LT@tables}\tl_gset:Ne \@currentHref {\LTcaptype .\cs_if_exist_use:c {theH\LTcaptype }}}\tbl_gzero_row_count: \UseTaggingSocket {tbl/longtable/init}\if l#1\LTleft \z@ \LTright \fill \else \if r#1\LTleft \fill \LTright \z@ \else \if c#1\LTleft \fill \LTright \fill \fi \fi \fi \let \LT@mcol \multicolumn \let \LT@@tabarray \@tabarray \let \LT@@hl \hline \def \@tabarray {\let \hline \LT@@hl \LT@@tabarray }\let \\\LT@tabularcr \let \tabularnewline \\\def \newpage {\noalign {\break }}\def \pagebreak {\noalign {\ifnum `}=0\fi \@testopt {\LT@no@pgbk -}4}\def \nopagebreak {\noalign {\ifnum `}=0\fi \@testopt \LT@no@pgbk 4}\let \hline \LT@hline \let \kill \LT@kill \let \caption \LT@caption \@tempdima \ht \strutbox \let \@endpbox \LT@endpbox \ifx \extrarowheight \@undefined \let \@acol \@tabacol \let \@classz \@tabclassz \let \@classiv \@tabclassiv \def \@startpbox {\vtop \LT@startpbox }\let \@@startpbox \@startpbox \let \@@endpbox \@endpbox \let \LT@LL@FM@cr \@tabularcr \else \advance \@tempdima \extrarowheight \col@sep \tabcolsep \let \@startpbox \LT@startpbox \let \LT@LL@FM@cr \@arraycr \fi \setbox \@arstrutbox \hbox {\vrule \@height \arraystretch \@tempdima \@depth \arraystretch \dp \strutbox \@width \z@ }\let \@sharp ##\let \protect \relax \begingroup \@mkpream {#2}\tbl_count_table_cols: \xdef \LT@bchunk {\tbl_inbetween_rows: \global \advance \c@LT@chunks \@ne \global \LT@rows \z@ \setbox \z@ \vbox \bgroup \LT@setprevdepth \tabskip \LTleft \noexpand \halign to\hsize \bgroup \tabskip \z@ \@arstrut \UseTaggingSocket {tbl/row/begin}\tbl_init_cell_data_for_row: \@preamble \tabskip \LTright \cr }\endgroup \expandafter \LT@nofcols \LT@bchunk &\LT@nofcols \LT@make@row \m@th \let \par \@empty \everycr {\noalign {\__tbl_trace:n {--longtable--> chunk row: \the \LT@rows \space row: \the \g__tbl_row_int \space column: \the \g__tbl_col_int }\tbl_if_row_was_started:T {\UseTaggingSocket {tbl/row/end}\tbl_inbetween_rows: }\int_compare:nNnT \LT@rows <\LTchunksize {\tbl_gincr_row_count: }}}\lineskip \z@ \baselineskip \z@ \LT@bchunk .
+[#1]#2->\UseTaggingSocket {tbl/init}\tl_if_empty:eTF {\LTcaptype }{\tl_gset:Ne \@currentHref {LT@tables.\theHLT@tables }}{\@kernel@refstepcounter {\LTcaptype }\stepcounter {LT@tables}\tl_gset:Ne \@currentHref {\LTcaptype .\cs_if_exist_use:c {theH\LTcaptype }}}\tbl_gzero_row_count: \UseTaggingSocket {tbl/longtable/init}\if l#1\LTleft \z@ \LTright \fill \else \if r#1\LTleft \fill \LTright \z@ \else \if c#1\LTleft \fill \LTright \fill \fi \fi \fi \let \LT@mcol \multicolumn \let \LT@@tabarray \@tabarray \let \LT@@hl \hline \def \@tabarray {\let \hline \LT@@hl \LT@@tabarray }\let \\\LT@tabularcr \let \tabularnewline \\\def \newpage {\noalign {\break }}\def \pagebreak {\noalign {\ifnum `}=0\fi \@testopt {\LT@no@pgbk -}4}\def \nopagebreak {\noalign {\ifnum `}=0\fi \@testopt \LT@no@pgbk 4}\let \hline \LT@hline \let \kill \LT@kill \let \caption \LT@caption \@tempdima \ht \strutbox \let \@endpbox \LT@endpbox \ifx \extrarowheight \@undefined \let \@acol \@tabacol \let \@classz \@tabclassz \let \@classiv \@tabclassiv \def \@startpbox {\vtop \LT@startpbox }\let \@@startpbox \@startpbox \let \@@endpbox \@endpbox \let \LT@LL@FM@cr \@tabularcr \else \advance \@tempdima \extrarowheight \col@sep \tabcolsep \let \@startpbox@action \LT@startpbox \let \LT@LL@FM@cr \@arraycr \fi \setbox \@arstrutbox \hbox {\vrule \@height \arraystretch \@tempdima \@depth \arraystretch \dp \strutbox \@width \z@ }\let \@sharp ##\let \protect \relax \begingroup \@mkpream {#2}\tbl_count_table_cols: \xdef \LT@bchunk {\tbl_inbetween_rows: \global \advance \c@LT@chunks \@ne \global \LT@rows \z@ \setbox \z@ \vbox \bgroup \LT@setprevdepth \tabskip \LTleft \noexpand \halign to\hsize \bgroup \tabskip \z@ \@arstrut \UseTaggingSocket {tbl/row/begin}\tbl_init_cell_data_for_row: \@preamble \tabskip \LTright \cr }\endgroup \expandafter \LT@nofcols \LT@bchunk &\LT@nofcols \LT@make@row \m@th \let \par \@empty \everycr {\noalign {\__tbl_trace:n {--longtable--> chunk row: \the \LT@rows \space row: \the \g__tbl_row_int \space column: \the \g__tbl_col_int }\tbl_if_row_was_started:T {\UseTaggingSocket {tbl/row/end}\tbl_inbetween_rows: }\int_compare:nNnT \LT@rows <\LTchunksize {\tbl_gincr_row_count: }}}\lineskip \z@ \baselineskip \z@ \LT@bchunk .
 <argument> \LT@array 
 l. ...\ShowCommand\LT@array
 > \LT@start=macro:

testfiles-pdftex/thm-001.tlg

@@ -29,7 +29,7 @@ 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 499.9466fil
+...\vbox(550.0+0.0)x345.0, glue set 498.00237fil
 ....\write-{}
 ....\pdfdest name{Doc-Start} xyz
 ....\glue(\topskip) 3.05556
@@ -162,7 +162,6 @@ Completed box being shipped out [1]
 .....\glue(\rightskip) 0.0
 ....\penalty -51
 ....\glue 8.0 plus 2.0 minus 4.0
-....\glue -1.94444
 ....\glue 0.0 plus 1.0fil
 ....\glue 0.0
 ....\glue 0.0 plus 0.0001fil

testfiles-pdftex/thm-002.tlg

@@ -114,7 +114,7 @@ Completed box being shipped out [2]
 .....\hbox(0.0+0.0)x345.0
 ...\glue 25.0
 ...\glue(\lineskip) 0.0
-...\vbox(550.0+0.0)x345.0, glue set 529.94339fil
+...\vbox(550.0+0.0)x345.0, glue set 527.99916fil
 ....\write-{}
 ....\write1{\newlabel{thm:1}{{1}{\thepage }{}{theorem.1}{}}}
 ....\glue(\topskip) 3.05556
@@ -176,7 +176,6 @@ Completed box being shipped out [2]
 .....\glue(\rightskip) 0.0
 ....\penalty -51
 ....\glue 10.0 plus 3.0 minus 5.0
-....\glue -1.94444
 ....\glue 0.0 plus 1.0fil
 ....\glue 0.0
 ....\glue 0.0 plus 0.0001fil

testfiles-pdftex/thm-003-cleveref.tlg

@@ -34,7 +34,7 @@ Completed box being shipped out [1]
 .....\hbox(0.0+0.0)x390.0
 ...\glue 25.0
 ...\glue(\lineskip) 0.0
-...\vbox(592.0+0.0)x390.0, glue set 155.98334fil
+...\vbox(592.0+0.0)x390.0, glue set 153.65027fil
 ....\write-{}
 ....\pdfdest name{Doc-Start} xyz
 ....\write-{}
@@ -1174,7 +1174,6 @@ Completed box being shipped out [1]
 .....\glue(\rightskip) 0.0
 ....\penalty -51
 ....\glue 10.0 plus 4.0 minus 6.0
-....\glue -2.33331
 ....\glue 0.0 plus 1.0fil
 ....\glue 0.0
 ....\glue 0.0 plus 0.0001fil

testfiles-pdftex/thm-003.tlg

@@ -34,7 +34,7 @@ Completed box being shipped out [1]
 .....\hbox(0.0+0.0)x390.0
 ...\glue 25.0
 ...\glue(\lineskip) 0.0
-...\vbox(592.0+0.0)x390.0, glue set 143.98462fil
+...\vbox(592.0+0.0)x390.0, glue set 141.65155fil
 ....\write-{}
 ....\pdfdest name{Doc-Start} xyz
 ....\write-{}
@@ -1178,7 +1178,6 @@ Completed box being shipped out [1]
 .....\glue(\rightskip) 0.0
 ....\penalty -51
 ....\glue 13.0 plus 6.0 minus 8.0
-....\glue -2.33331
 ....\glue 0.0 plus 1.0fil
 ....\glue 0.0
 ....\glue 0.0 plus 0.0001fil

testfiles-pdftex/thm-007-gh360.tlg

@@ -25,7 +25,7 @@ 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 533.94296fil
+...\vbox(550.0+0.0)x345.0, glue set 530.34332fil
 ....\write-{}
 ....\pdfdest name{Doc-Start} xyz
 ....\pdfdest name{lstlisting.-1} xyz
@@ -78,7 +78,6 @@ Completed box being shipped out [1]
 ....\penalty -50
 ....\glue 6.0 plus 2.0 minus 2.0
 ....\glue 0.0
-....\glue -3.60004
 ....\glue 0.0 plus 1.0fil
 ....\glue 0.0
 ....\glue 0.0 plus 0.0001fil