merge develop

latex3 · Feb 6, 2025 · e21199c · e21199c
2 parents a93f2a2 + d6d1da6
commit e21199c
Show file tree

Hide file tree

Showing 168 changed files with 10,154 additions and 10,315 deletions.
diff --git a/base/doc/tlc3.err b/base/doc/tlc3.err
@@ -1,4 +1,4 @@
-\newcommand\erratafiledate{2025/01/14}        % needs / and not -
+\newcommand\erratafiledate{2025/02/06}        % needs / and not -
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % To produce a printed version of this errata file run this file through
@@ -831,6 +831,14 @@ Correct hyphenation: stan-dalone \> stand-alone
 \CHAPTER{Chapter 9 --- Font Selection and Encodings}
 
 
+\erroronpage{I-664}{para -5, l. 4}{HVo}{2025/02/06}{s}
+
+Change:
+\cs{ulcshape}\cs{upshape}  \> \cs{upshape}\cs{ulcshape}  \\
+because this is the default as defined in the format (though in practice
+the order makes no difference)
+
+
 \erroronpage{I-687}{table 9.6, l.21}{YvH}{2024/06/19}{s}
   cmdh \> lmdh
 
@@ -1618,6 +1626,7 @@ Appendix title not properly capitalized.
 \contributor{DFl}{Daniel Flipo}
 \contributor{EOl}{Edgar Olthof}
 \contributor{FMi}{Frank Mittelbach}
+\contributor{HVo}{Herbert Voß}
 \contributor{MBe}{Matthew Bertucci}
 \contributor{MJo}{Maciej Jończyk}
 \contributor{MRu}{Mark Rudolph}

diff --git a/base/ltpage.dtx b/base/ltpage.dtx
@@ -204,7 +204,7 @@
 %                             error (pr/3203).}
 % \changes{v1.0m}{2020/07/27}{Don't make the command \cs{long} (gh/354)}
 % \changes{v1.0n}{2022/04/04}{Interface with new mark mechanism}
-% \changes{v1.1a}{2025/06/01}{}
+% \changes{v1.0o}{2024/11/16}{Drop legacy mark support}
 %    \begin{macrocode}
 \ExplSyntaxOn
 \DeclareRobustCommand*\markboth[2]{%
@@ -216,7 +216,7 @@
 %
 % \changes{v1.0m}{2020/07/27}{Don't make the command \cs{long} (gh/354)}
 % \changes{v1.0n}{2022/04/04}{Interface with new mark mechanism}
-% \changes{v1.1a}{2025/06/01}{}
+% \changes{v1.0o}{2024/11/16}{Drop legacy mark support}
 %    \begin{macrocode}
 \DeclareRobustCommand*\markright[1]{%
     \mark_insert:nn{2e-right}{#1}

diff --git a/base/testfiles-lthooks/ltcmdhooks-001.tlg b/base/testfiles-lthooks/ltcmdhooks-001.tlg
@@ -264,7 +264,7 @@ Data structure for label rules:
  package/chemnum/after -> \__hook_toplevel package/chemnum/after \FirstAidNeededT {chemnum}{sty}{....-..-.. v... a comprehensive approach for the numbering of chemical compounds (CN)} {\UseName {prop_new:c}{l__chemnum_tmpa_prop}}\__hook_next package/chemnum/after  
  package/cleveref/after -> \__hook_toplevel package/cleveref/after \FirstAidNeededT {cleveref}{sty}{....-..-.. v... Intelligent cross-referencing} {\def \cref@getref ##1##2{\expandafter \let \expandafter ##2\csname r@##1@cref\endcsname \expandafter \expandafter \expandafter \def \expandafter \expandafter \expandafter ##2\expandafter \expandafter \expandafter {\expandafter \@firstoffive ##2}}\def \cpageref@getref ##1##2{\expandafter \let \expandafter ##2\csname r@##1@cref\endcsname \expandafter \expandafter \expandafter \def \expandafter \expandafter \expandafter ##2\expandafter \expandafter \expandafter {\expandafter \@secondoffive ##2}}\AddToHook {begindocument}[cleveref]{\def \label@noarg ##1{\cref@old@label {##1}\@bsphack \edef \@tempa {{page}{\the \c@page }}\setcounter {page}{1}\edef \@tempb {\thepage }\expandafter \setcounter \@tempa \cref@constructprefix {page}{\cref@result }\protected@write \@auxout {}{\string \newlabel {##1@cref}{{\cref@currentlabel }{[\@tempb ][\arabic {page}][\cref@result ]\thepage }{}{}{}}}\@esphack }\def \label@optarg [##1]##2{\cref@old@label {##2}\@bsphack \edef \@tempa {{page}{\the \c@page }}\setcounter {page}{1}\edef \@tempb {\thepage }\expandafter \setcounter \@tempa \cref@constructprefix {page}{\cref@result }\protected@edef \cref@currentlabel {\expandafter \cref@override@label@type \cref@currentlabel \@nil {##1}}\protected@write \@auxout {}{\string \newlabel {##2@cref}{{\cref@currentlabel }{[\@tempb ][\arabic {page}][\cref@result ]\thepage }{}{}{}}}\@esphack }} \newcommand \firstaid@cref@smugglelabel {\let \cref@currentlabel \cref@gcurrentlabel@temp } \newcommand \firstaid@cref@updatelabeldata [1]{\cref@constructprefix {##1}{\cref@result }\@ifundefined {cref@##1@alias}{\def \@tempa {##1}}{\def \@tempa {\csname cref@##1@alias\endcsname }}\protected@xdef \cref@gcurrentlabel@temp {[\@tempa ][\arabic {##1}][\cref@result ]\csname p@##1\expandafter \endcsname \csname the##1\endcsname }\aftergroup \firstaid@cref@smugglelabel } \newif \iftag@ \AddToHook {label}[firstaid/cleveref] {\ifx \@currentcounter \@empty \else \iftag@ \else \firstaid@cref@updatelabeldata {\@currentcounter }\fi \fi } }\__hook_next package/cleveref/after  
  package/arydshln/after -> \__hook_toplevel package/arydshln/after \FirstAidNeededT {arydshln}{sty}{....-..-.. v... } {\protected \def \adl@@vlineL ##1##2##3##4{\adl@ivline ##4\@nil {##1}{##2}\xdef \adl@colsL {\adl@colsL \@elt {##3}{\number \@tempcnta }{\number \@tempcntb }{\adl@dashcolor }{\adl@gapcolor }}}\protected \def \adl@@vlineR ##1##2##3##4{\adl@ivline ##4\@nil {##1}{##2}\xdef \adl@colsR {\@elt {##3}{\number \@tempcnta }{\number \@tempcntb }{\adl@dashcolor }{\adl@gapcolor }\adl@colsR }}\let \adl@act@@vlineL \adl@@vlineL \let \adl@act@@vlineR \adl@@vlineR }\__hook_next package/arydshln/after  
- package/index/after -> \__hook_toplevel package/index/after \FirstAidNeededT {index}{sty}{....-..-.. v...eta Improved index support (dmj)}{\DeclareRobustCommand *\markboth [2]{\mark_insert:nn {2e-left}{##1}\mark_insert:nn {2e-right}{##2}\tl_if_empty:nF {##2}{\mark_insert:nn {2e-right-nonempty}{##2}}}\DeclareRobustCommand *\markright [1]{\mark_insert:nn {2e-right}{##1}\tl_if_empty:nF {##1}{\mark_insert:nn {2e-right-nonempty}{##1}}}\protected \def \index {\protect \p@index }}\__hook_next package/index/after  
+ package/index/after -> \__hook_toplevel package/index/after \FirstAidNeededT {index}{sty}{....-..-.. v... Improved index support (dmj)}{\DeclareRobustCommand *\markboth [2]{\mark_insert:nn {2e-left}{##1}\mark_insert:nn {2e-right}{##2}\tl_if_empty:nF {##2}{\mark_insert:nn {2e-right-nonempty}{##2}}}\DeclareRobustCommand *\markright [1]{\mark_insert:nn {2e-right}{##1}\tl_if_empty:nF {##1}{\mark_insert:nn {2e-right-nonempty}{##1}}}\protected \def \index {\protect \p@index }}\__hook_next package/index/after  
  package/l3graphics/after -> \__hook_toplevel package/l3graphics/after \seq_set_from_clist:Nn \l_graphics_search_ext_seq {.pdf,.eps,.ps,.png,.jpg,.jpeg}\__hook_next package/l3graphics/after  
  cmd/foo/before -> before 1 before 2 \__hook_toplevel cmd/foo/before {#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}{#9}\__hook_next cmd/foo/before {#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}{#9} 
  cmd/foo/after -> \__hook_toplevel cmd/foo/after {#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}{#9}after 2 after 1 \__hook_next cmd/foo/after {#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}{#9} 

diff --git a/base/testfiles-lthooks/lthooks-000.tlg b/base/testfiles-lthooks/lthooks-000.tlg
@@ -184,7 +184,7 @@ Data structure for label rules:
  package/chemnum/after -> \__hook_toplevel package/chemnum/after \FirstAidNeededT {chemnum}{sty}{....-..-.. v... a comprehensive approach for the numbering of chemical compounds (CN)} {\UseName {prop_new:c}{l__chemnum_tmpa_prop}}\__hook_next package/chemnum/after  
  package/cleveref/after -> \__hook_toplevel package/cleveref/after \FirstAidNeededT {cleveref}{sty}{....-..-.. v... Intelligent cross-referencing} {\def \cref@getref ##1##2{\expandafter \let \expandafter ##2\csname r@##1@cref\endcsname \expandafter \expandafter \expandafter \def \expandafter \expandafter \expandafter ##2\expandafter \expandafter \expandafter {\expandafter \@firstoffive ##2}}\def \cpageref@getref ##1##2{\expandafter \let \expandafter ##2\csname r@##1@cref\endcsname \expandafter \expandafter \expandafter \def \expandafter \expandafter \expandafter ##2\expandafter \expandafter \expandafter {\expandafter \@secondoffive ##2}}\AddToHook {begindocument}[cleveref]{\def \label@noarg ##1{\cref@old@label {##1}\@bsphack \edef \@tempa {{page}{\the \c@page }}\setcounter {page}{1}\edef \@tempb {\thepage }\expandafter \setcounter \@tempa \cref@constructprefix {page}{\cref@result }\protected@write \@auxout {}{\string \newlabel {##1@cref}{{\cref@currentlabel }{[\@tempb ][\arabic {page}][\cref@result ]\thepage }{}{}{}}}\@esphack }\def \label@optarg [##1]##2{\cref@old@label {##2}\@bsphack \edef \@tempa {{page}{\the \c@page }}\setcounter {page}{1}\edef \@tempb {\thepage }\expandafter \setcounter \@tempa \cref@constructprefix {page}{\cref@result }\protected@edef \cref@currentlabel {\expandafter \cref@override@label@type \cref@currentlabel \@nil {##1}}\protected@write \@auxout {}{\string \newlabel {##2@cref}{{\cref@currentlabel }{[\@tempb ][\arabic {page}][\cref@result ]\thepage }{}{}{}}}\@esphack }} \newcommand \firstaid@cref@smugglelabel {\let \cref@currentlabel \cref@gcurrentlabel@temp } \newcommand \firstaid@cref@updatelabeldata [1]{\cref@constructprefix {##1}{\cref@result }\@ifundefined {cref@##1@alias}{\def \@tempa {##1}}{\def \@tempa {\csname cref@##1@alias\endcsname }}\protected@xdef \cref@gcurrentlabel@temp {[\@tempa ][\arabic {##1}][\cref@result ]\csname p@##1\expandafter \endcsname \csname the##1\endcsname }\aftergroup \firstaid@cref@smugglelabel } \newif \iftag@ \AddToHook {label}[firstaid/cleveref] {\ifx \@currentcounter \@empty \else \iftag@ \else \firstaid@cref@updatelabeldata {\@currentcounter }\fi \fi } }\__hook_next package/cleveref/after  
  package/arydshln/after -> \__hook_toplevel package/arydshln/after \FirstAidNeededT {arydshln}{sty}{....-..-.. v... } {\protected \def \adl@@vlineL ##1##2##3##4{\adl@ivline ##4\@nil {##1}{##2}\xdef \adl@colsL {\adl@colsL \@elt {##3}{\number \@tempcnta }{\number \@tempcntb }{\adl@dashcolor }{\adl@gapcolor }}}\protected \def \adl@@vlineR ##1##2##3##4{\adl@ivline ##4\@nil {##1}{##2}\xdef \adl@colsR {\@elt {##3}{\number \@tempcnta }{\number \@tempcntb }{\adl@dashcolor }{\adl@gapcolor }\adl@colsR }}\let \adl@act@@vlineL \adl@@vlineL \let \adl@act@@vlineR \adl@@vlineR }\__hook_next package/arydshln/after  
- package/index/after -> \__hook_toplevel package/index/after \FirstAidNeededT {index}{sty}{....-..-.. v...eta Improved index support (dmj)}{\DeclareRobustCommand *\markboth [2]{\mark_insert:nn {2e-left}{##1}\mark_insert:nn {2e-right}{##2}\tl_if_empty:nF {##2}{\mark_insert:nn {2e-right-nonempty}{##2}}}\DeclareRobustCommand *\markright [1]{\mark_insert:nn {2e-right}{##1}\tl_if_empty:nF {##1}{\mark_insert:nn {2e-right-nonempty}{##1}}}\protected \def \index {\protect \p@index }}\__hook_next package/index/after  
+ package/index/after -> \__hook_toplevel package/index/after \FirstAidNeededT {index}{sty}{....-..-.. v... Improved index support (dmj)}{\DeclareRobustCommand *\markboth [2]{\mark_insert:nn {2e-left}{##1}\mark_insert:nn {2e-right}{##2}\tl_if_empty:nF {##2}{\mark_insert:nn {2e-right-nonempty}{##2}}}\DeclareRobustCommand *\markright [1]{\mark_insert:nn {2e-right}{##1}\tl_if_empty:nF {##1}{\mark_insert:nn {2e-right-nonempty}{##1}}}\protected \def \index {\protect \p@index }}\__hook_next package/index/after  
  package/l3graphics/after -> \__hook_toplevel package/l3graphics/after \seq_set_from_clist:Nn \l_graphics_search_ext_seq {.pdf,.eps,.ps,.png,.jpg,.jpeg}\__hook_next package/l3graphics/after  
 No file lthooks-000.aux.
 LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line ....

diff --git a/base/testfiles-lthooks/lthooks-001.tlg b/base/testfiles-lthooks/lthooks-001.tlg
@@ -193,7 +193,7 @@ Data structure for label rules:
  package/chemnum/after -> \__hook_toplevel package/chemnum/after \FirstAidNeededT {chemnum}{sty}{....-..-.. v... a comprehensive approach for the numbering of chemical compounds (CN)} {\UseName {prop_new:c}{l__chemnum_tmpa_prop}}\__hook_next package/chemnum/after  
  package/cleveref/after -> \__hook_toplevel package/cleveref/after \FirstAidNeededT {cleveref}{sty}{....-..-.. v... Intelligent cross-referencing} {\def \cref@getref ##1##2{\expandafter \let \expandafter ##2\csname r@##1@cref\endcsname \expandafter \expandafter \expandafter \def \expandafter \expandafter \expandafter ##2\expandafter \expandafter \expandafter {\expandafter \@firstoffive ##2}}\def \cpageref@getref ##1##2{\expandafter \let \expandafter ##2\csname r@##1@cref\endcsname \expandafter \expandafter \expandafter \def \expandafter \expandafter \expandafter ##2\expandafter \expandafter \expandafter {\expandafter \@secondoffive ##2}}\AddToHook {begindocument}[cleveref]{\def \label@noarg ##1{\cref@old@label {##1}\@bsphack \edef \@tempa {{page}{\the \c@page }}\setcounter {page}{1}\edef \@tempb {\thepage }\expandafter \setcounter \@tempa \cref@constructprefix {page}{\cref@result }\protected@write \@auxout {}{\string \newlabel {##1@cref}{{\cref@currentlabel }{[\@tempb ][\arabic {page}][\cref@result ]\thepage }{}{}{}}}\@esphack }\def \label@optarg [##1]##2{\cref@old@label {##2}\@bsphack \edef \@tempa {{page}{\the \c@page }}\setcounter {page}{1}\edef \@tempb {\thepage }\expandafter \setcounter \@tempa \cref@constructprefix {page}{\cref@result }\protected@edef \cref@currentlabel {\expandafter \cref@override@label@type \cref@currentlabel \@nil {##1}}\protected@write \@auxout {}{\string \newlabel {##2@cref}{{\cref@currentlabel }{[\@tempb ][\arabic {page}][\cref@result ]\thepage }{}{}{}}}\@esphack }} \newcommand \firstaid@cref@smugglelabel {\let \cref@currentlabel \cref@gcurrentlabel@temp } \newcommand \firstaid@cref@updatelabeldata [1]{\cref@constructprefix {##1}{\cref@result }\@ifundefined {cref@##1@alias}{\def \@tempa {##1}}{\def \@tempa {\csname cref@##1@alias\endcsname }}\protected@xdef \cref@gcurrentlabel@temp {[\@tempa ][\arabic {##1}][\cref@result ]\csname p@##1\expandafter \endcsname \csname the##1\endcsname }\aftergroup \firstaid@cref@smugglelabel } \newif \iftag@ \AddToHook {label}[firstaid/cleveref] {\ifx \@currentcounter \@empty \else \iftag@ \else \firstaid@cref@updatelabeldata {\@currentcounter }\fi \fi } }\__hook_next package/cleveref/after  
  package/arydshln/after -> \__hook_toplevel package/arydshln/after \FirstAidNeededT {arydshln}{sty}{....-..-.. v... } {\protected \def \adl@@vlineL ##1##2##3##4{\adl@ivline ##4\@nil {##1}{##2}\xdef \adl@colsL {\adl@colsL \@elt {##3}{\number \@tempcnta }{\number \@tempcntb }{\adl@dashcolor }{\adl@gapcolor }}}\protected \def \adl@@vlineR ##1##2##3##4{\adl@ivline ##4\@nil {##1}{##2}\xdef \adl@colsR {\@elt {##3}{\number \@tempcnta }{\number \@tempcntb }{\adl@dashcolor }{\adl@gapcolor }\adl@colsR }}\let \adl@act@@vlineL \adl@@vlineL \let \adl@act@@vlineR \adl@@vlineR }\__hook_next package/arydshln/after  
- package/index/after -> \__hook_toplevel package/index/after \FirstAidNeededT {index}{sty}{....-..-.. v...eta Improved index support (dmj)}{\DeclareRobustCommand *\markboth [2]{\mark_insert:nn {2e-left}{##1}\mark_insert:nn {2e-right}{##2}\tl_if_empty:nF {##2}{\mark_insert:nn {2e-right-nonempty}{##2}}}\DeclareRobustCommand *\markright [1]{\mark_insert:nn {2e-right}{##1}\tl_if_empty:nF {##1}{\mark_insert:nn {2e-right-nonempty}{##1}}}\protected \def \index {\protect \p@index }}\__hook_next package/index/after  
+ package/index/after -> \__hook_toplevel package/index/after \FirstAidNeededT {index}{sty}{....-..-.. v... Improved index support (dmj)}{\DeclareRobustCommand *\markboth [2]{\mark_insert:nn {2e-left}{##1}\mark_insert:nn {2e-right}{##2}\tl_if_empty:nF {##2}{\mark_insert:nn {2e-right-nonempty}{##2}}}\DeclareRobustCommand *\markright [1]{\mark_insert:nn {2e-right}{##1}\tl_if_empty:nF {##1}{\mark_insert:nn {2e-right-nonempty}{##1}}}\protected \def \index {\protect \p@index }}\__hook_next package/index/after  
  xxx -> foobar\__hook_toplevel xxx \__hook_next xxx  
 LaTeX hooks Warning: Cannot remove chunk 'label3' from hook 'xxx' because it does not exist in that hook.
 LaTeX hooks Warning: Cannot remove chunk 'label3' from hook 'yyy' because the hook does not exist.
@@ -445,6 +445,6 @@ Data structure for label rules:
  package/chemnum/after -> \__hook_toplevel package/chemnum/after \FirstAidNeededT {chemnum}{sty}{....-..-.. v... a comprehensive approach for the numbering of chemical compounds (CN)} {\UseName {prop_new:c}{l__chemnum_tmpa_prop}}\__hook_next package/chemnum/after  
  package/cleveref/after -> \__hook_toplevel package/cleveref/after \FirstAidNeededT {cleveref}{sty}{....-..-.. v... Intelligent cross-referencing} {\def \cref@getref ##1##2{\expandafter \let \expandafter ##2\csname r@##1@cref\endcsname \expandafter \expandafter \expandafter \def \expandafter \expandafter \expandafter ##2\expandafter \expandafter \expandafter {\expandafter \@firstoffive ##2}}\def \cpageref@getref ##1##2{\expandafter \let \expandafter ##2\csname r@##1@cref\endcsname \expandafter \expandafter \expandafter \def \expandafter \expandafter \expandafter ##2\expandafter \expandafter \expandafter {\expandafter \@secondoffive ##2}}\AddToHook {begindocument}[cleveref]{\def \label@noarg ##1{\cref@old@label {##1}\@bsphack \edef \@tempa {{page}{\the \c@page }}\setcounter {page}{1}\edef \@tempb {\thepage }\expandafter \setcounter \@tempa \cref@constructprefix {page}{\cref@result }\protected@write \@auxout {}{\string \newlabel {##1@cref}{{\cref@currentlabel }{[\@tempb ][\arabic {page}][\cref@result ]\thepage }{}{}{}}}\@esphack }\def \label@optarg [##1]##2{\cref@old@label {##2}\@bsphack \edef \@tempa {{page}{\the \c@page }}\setcounter {page}{1}\edef \@tempb {\thepage }\expandafter \setcounter \@tempa \cref@constructprefix {page}{\cref@result }\protected@edef \cref@currentlabel {\expandafter \cref@override@label@type \cref@currentlabel \@nil {##1}}\protected@write \@auxout {}{\string \newlabel {##2@cref}{{\cref@currentlabel }{[\@tempb ][\arabic {page}][\cref@result ]\thepage }{}{}{}}}\@esphack }} \newcommand \firstaid@cref@smugglelabel {\let \cref@currentlabel \cref@gcurrentlabel@temp } \newcommand \firstaid@cref@updatelabeldata [1]{\cref@constructprefix {##1}{\cref@result }\@ifundefined {cref@##1@alias}{\def \@tempa {##1}}{\def \@tempa {\csname cref@##1@alias\endcsname }}\protected@xdef \cref@gcurrentlabel@temp {[\@tempa ][\arabic {##1}][\cref@result ]\csname p@##1\expandafter \endcsname \csname the##1\endcsname }\aftergroup \firstaid@cref@smugglelabel } \newif \iftag@ \AddToHook {label}[firstaid/cleveref] {\ifx \@currentcounter \@empty \else \iftag@ \else \firstaid@cref@updatelabeldata {\@currentcounter }\fi \fi } }\__hook_next package/cleveref/after  
  package/arydshln/after -> \__hook_toplevel package/arydshln/after \FirstAidNeededT {arydshln}{sty}{....-..-.. v... } {\protected \def \adl@@vlineL ##1##2##3##4{\adl@ivline ##4\@nil {##1}{##2}\xdef \adl@colsL {\adl@colsL \@elt {##3}{\number \@tempcnta }{\number \@tempcntb }{\adl@dashcolor }{\adl@gapcolor }}}\protected \def \adl@@vlineR ##1##2##3##4{\adl@ivline ##4\@nil {##1}{##2}\xdef \adl@colsR {\@elt {##3}{\number \@tempcnta }{\number \@tempcntb }{\adl@dashcolor }{\adl@gapcolor }\adl@colsR }}\let \adl@act@@vlineL \adl@@vlineL \let \adl@act@@vlineR \adl@@vlineR }\__hook_next package/arydshln/after  
- package/index/after -> \__hook_toplevel package/index/after \FirstAidNeededT {index}{sty}{....-..-.. v...eta Improved index support (dmj)}{\DeclareRobustCommand *\markboth [2]{\mark_insert:nn {2e-left}{##1}\mark_insert:nn {2e-right}{##2}\tl_if_empty:nF {##2}{\mark_insert:nn {2e-right-nonempty}{##2}}}\DeclareRobustCommand *\markright [1]{\mark_insert:nn {2e-right}{##1}\tl_if_empty:nF {##1}{\mark_insert:nn {2e-right-nonempty}{##1}}}\protected \def \index {\protect \p@index }}\__hook_next package/index/after  
+ package/index/after -> \__hook_toplevel package/index/after \FirstAidNeededT {index}{sty}{....-..-.. v... Improved index support (dmj)}{\DeclareRobustCommand *\markboth [2]{\mark_insert:nn {2e-left}{##1}\mark_insert:nn {2e-right}{##2}\tl_if_empty:nF {##2}{\mark_insert:nn {2e-right-nonempty}{##2}}}\DeclareRobustCommand *\markright [1]{\mark_insert:nn {2e-right}{##1}\tl_if_empty:nF {##1}{\mark_insert:nn {2e-right-nonempty}{##1}}}\protected \def \index {\protect \p@index }}\__hook_next package/index/after  
  xxx -> foo\__hook_toplevel xxx \__hook_next xxx  
 The hook xxx contains the rules: