[latex3-commits] [latex3/latex2e] add-theHcount: merge develop (27e48f34)

github at latex-project.org github at latex-project.org
Thu Sep 26 21:08:12 CEST 2024


Repository : https://github.com/latex3/latex2e
On branch  : add-theHcount
Link       : https://github.com/latex3/latex2e/commit/27e48f34f013731372f19c2829d72a3ee70e9099

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

commit 27e48f34f013731372f19c2829d72a3ee70e9099
Merge: 1519f3bd 780e8468
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Thu Sep 26 21:08:12 2024 +0200

    merge develop


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

27e48f34f013731372f19c2829d72a3ee70e9099
 base/changes.txt                                   |    3 +
 base/ltproperties.dtx                              |    8 +-
 base/testfiles/properties-008-expansion.lvt        |    4 +-
 required/latex-lab/changes.txt                     |    8 +-
 required/latex-lab/latex-lab-footnotes.dtx         |   28 +-
 required/latex-lab/latex-lab-sec.dtx               |  138 +-
 required/latex-lab/latex-lab-toc.dtx               |   53 +-
 required/latex-lab/resave.bat                      |    6 +-
 .../testfiles-OR-luatex/footmisc-014-hang.tlg      |    2 +-
 .../latex-lab/testfiles-OR/check-declarations.tlg  |    2 +-
 required/latex-lab/testfiles-OR/footmisc-002.tlg   |    2 +-
 required/latex-lab/testfiles-OR/footmisc-003.tlg   |    2 +-
 required/latex-lab/testfiles-OR/footmisc-004.tlg   |    2 +-
 required/latex-lab/testfiles-OR/footmisc-005.tlg   |    2 +-
 required/latex-lab/testfiles-OR/footmisc-006.tlg   |    2 +-
 .../testfiles-OR/footmisc-007-rollback.tlg         |    2 +-
 .../testfiles-OR/footmisc-009-multiple-tagging.tlg |    2 +-
 .../testfiles-OR/footmisc-009-multiple.tlg         |    2 +-
 .../testfiles-OR/footmisc-010-setspace-tagging.tlg |    2 +-
 .../testfiles-OR/footmisc-010-setspace.tlg         |    2 +-
 .../latex-lab/testfiles-OR/footmisc-011-para.tlg   |    2 +-
 .../testfiles-OR/footmisc-012-side-hyperref.tlg    |    2 +-
 .../latex-lab/testfiles-OR/footmisc-012-side.tlg   |    2 +-
 .../testfiles-OR/footmisc-013-scrartcl.tlg         |    2 +-
 .../latex-lab/testfiles-OR/footmisc-014-hang.tlg   |    2 +-
 .../footmisc-floats-abovefloats-flushbottom.tlg    |    2 +-
 .../testfiles-OR/footmisc-floats-abovefloats.tlg   |    2 +-
 .../footmisc-floats-belowfloats-flushbottom.tlg    |    2 +-
 .../testfiles-OR/footmisc-floats-latex.tlg         |    2 +-
 .../testfiles-OR/footnote-float-above.tlg          |    2 +-
 .../testfiles-OR/footnote-hyperref-001.tlg         |    2 +-
 required/latex-lab/testfiles-OR/footnote-par.tlg   |    2 +-
 required/latex-lab/testfiles-OR/tagging-001.tlg    |    2 +-
 .../testfiles-OR/tagging-002-longtable.pvt         |   16 +
 .../testfiles-OR/tagging-002-longtable.tpf         | 1709 ++++++++++++++++++++
 35 files changed, 1868 insertions(+), 155 deletions(-)

diff --cc required/latex-lab/changes.txt
index 8c4d4ca1,6973d031..b661f160
--- a/required/latex-lab/changes.txt
+++ b/required/latex-lab/changes.txt
@@@ -1,7 -1,10 +1,13 @@@
--2024-09-24 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
++2024-09-26 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
 +	* latex-lab-toc.dtx, latex-lab-sec.dtx, latex-lab-toc-kernel-changes: move target
 +	handling (\MakeLinkTarget patches) into the kernel.
 +
+ 	* latex-lab-sec.dtx,latex-lab-footnotes.dtx: 
+ 	correct and improve footnotes in longtable
+ 
+ 2024-09-24 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
+ 	* latex-lab-toc.dtx,latex-lab-footnotes.dtx: adapt Ref handling to tagpdf 0.99f
+ 
  2024-09-18 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
  	* latex-lab-amsmath.dtx,latex-lab-graphic.dtc,
  	latex-lab-marginpar.dtx,latex-lab-math.dtx,latex-lab-mathtools.dtx,
diff --cc required/latex-lab/latex-lab-toc.dtx
index 83ed1259,37fde1e1..15dd403b
--- a/required/latex-lab/latex-lab-toc.dtx
+++ b/required/latex-lab/latex-lab-toc.dtx
@@@ -16,8 -16,8 +16,8 @@@
  %
  % for those people who are interested or want to report an issue.
  %
- \def\ltlabtocdate{2024-09-20}
 -\def\ltlabtocdate{2024-09-19}
--\def\ltlabtocversion{0.85d}
++\def\ltlabtocdate{2024-09-26}
++\def\ltlabtocversion{0.85e}
  %<*driver>
  \documentclass{l3doc}
  \EnableCrossrefs
@@@ -114,71 -114,28 +114,32 @@@
  % Defined by tagpdf.
  % \end{variable}
  %
 -% \cs{refstepcounter} doesn't use \cs{MakeLinkTarget} (yet) so
 -% we have to patch it too to store the relation between
 -% destination names/\cs{@currentHref} and structure numbers
 +% We have to to store the relation between
 +% destination names/\cs{@currentHref} and structure numbers.
 +% With a current kernel this is done in \cs{refstepcounter} 
 +% through the |recordtarget| socket. If that doesn't exist yet
 +% we patch:
  %
 -% The property is set up in tagpdf-test so that one
 -% doesn't has to check if the prop exists or not.
 +% TODO remove after release 2024/11
  %    \begin{macrocode}
 -\AddToHook{cmd/refstepcounter/after}
 - {
 -   \tl_if_blank:VF \@currentHref
 -    {
 -      \prop_gput:Nee \g_@@_struct_dest_num_prop {\@currentHref}{\tag_get:n{struct_num}}      
 -    }
 - }
 -\AddToHook{cmd/H at refstepcounter/after}
 - {
 -   \tl_if_blank:VF \@currentHref
 -    {
 -      \prop_gput:Nee \g_@@_struct_dest_num_prop {\@currentHref}{\tag_get:n{struct_num}}
 -    }
 - }
 +\str_if_exist:cF { l__socket_tagsupport/recordtarget_plug_str }
 +  {
 +    \AddToHook{cmd/refstepcounter/after}
 +     {
 +       \tl_if_blank:VF \@currentHref
 +        {
 +          \prop_gput:Nee \g_@@_struct_dest_num_prop {\@currentHref}{\tag_get:n{struct_num}}      
 +        }
 +     }
 +    \AddToHook{cmd/H at refstepcounter/after}
 +     {
 +       \tl_if_blank:VF \@currentHref
 +        {
 +          \prop_gput:Nee \g_@@_struct_dest_num_prop {\@currentHref}{\tag_get:n{struct_num}}
 +        }
 +     }
 +   }  
  %    \end{macrocode}
- 
- % \begin{variable}{\g_@@_struct_ref_by_dest_prop}
- % This variable contains structures whose Ref key should be updated
- % at the end to point to structured related with this destination.
- % As this is probably need in other places too, it is not only a toc-variable.
- % Moved into tagpdf!
- % \end{variable}
- %
- % \begin{macro}{\g_@@_struct_ref_by_dest:}
- %  This command is executed and update the Ref keys
- %  of the structures listed in |\g_@@_struct_ref_by_dest_prop|.
- %  It is currently only relevant for the |TOCI|. But other structures
- %  could need that later too.
- %  The command is executed in the |tagpdf/finish/before| hook.
- %    \begin{macrocode}
- \msg_new:nnn { tag } {struct-dest-unknown}
-  {
-    Destination~#1~has~no~related~structure.\\
-    /Ref~for~structure~#2~not~updated
-  }
- 
- \cs_new_protected:Npn \g_@@_struct_ref_by_dest:
-   {
-     \prop_map_inline:Nn\g_@@_struct_ref_by_dest_prop
-       {
-         \prop_get:NnNTF \g_@@_struct_dest_num_prop {##2} \l_@@_tmpa_tl
-           {
-             \@@_struct_gput_data_ref:ee
-               { ##1 }
-               { \tag_struct_object_ref:e{ \l_@@_tmpa_tl }}
-           }
-           {
-             \msg_warning:nnnn {tag}{struct-dest-unknown}{##2}{ ##1}
-           }
-       }
-   }
- \hook_gput_code:nnn {tagpdf/finish/before}{tagpdf/struct/Ref}{\g_@@_struct_ref_by_dest:}
- %    \end{macrocode}
- % \end{macro}
  %
  % \section{Toc code}
  % \begin{variable}{\g_@@_toc_level_int,\g_@@_toc_stack_seq}
diff --cc required/latex-lab/resave.bat
index 66940659,66940659..8d60938d
--- a/required/latex-lab/resave.bat
+++ b/required/latex-lab/resave.bat
@@@ -10,5 -10,5 +10,7 @@@ REM l3build save -c config-title title-
  REM l3build save -c config-firstaid test-ltugboat test-amsart-title
  REM l3build save -c config-toc -e luatex toc-ex-article-hyperref-2 toc-ex-book-tocdepth toc-ex-article-no-hyperref toc-ex-article-hyperref-3 toc-ex-book-no-hyperref toc-ex-article-hyperref-1 toc-ex-book-hyperref-1 toc-manual-addcontentsline toc-debug
  REM l3build save -c config-title -e luatex title-003 title-009 title-007 title-005 title-006 title-004 title-008 title-002
--l3build save -c config-bib -e luatex bib-009 bib-008-natbib bib-006 bib-007-natbib bib-005 bib-010-natbib
--l3build check --show-saves -c config-OR memoir-001 scrartcl-001
++
++l3build save -c config-block -e luatex blocks-hyperref-01
++l3build save -c config-block blocks-000
++ l3build check --show-saves -c config-block blocks-000 





More information about the latex3-commits mailing list.