add Span in toc for nested links, latex3/tagging-issue#26, WIP [ci-skip]

latex3 · Nov 21, 2023 · 3cafcc5 · 3cafcc5
1 parent 74c88c3
commit 3cafcc5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/required/latex-lab/latex-lab-math.dtx b/required/latex-lab/latex-lab-math.dtx
@@ -1042,12 +1042,14 @@
 %  \typeout{==>~math~begin}
 % needs different handling if we support nesting
   \socket_use:n{tagsupport/math/content}
-  \tagstructbegin{tag=Formula,
-    AFinline-o=\l_@@_mathcontent_AF_source_tl,
-    title-o=\g_@@_grabbed_env_tl,
-    actualtext=\l_@@_mathcontent_actual_tl,
-    alt=\l_@@_mathcontent_alt_tl
-  }
+  \tag_struct_begin:n
+    {
+      tag=Formula,
+      AFinline-o  = \l_@@_mathcontent_AF_source_tl,
+      title-o     = \g_@@_grabbed_env_tl,
+      actualtext  = \l_@@_mathcontent_actual_tl,
+      alt         = \l_@@_mathcontent_alt_tl
+    }
 % inner formula if multiple parts (not really implemented yet)
   \grabaformulapartandstart
 % the above does:

diff --git a/required/latex-lab/latex-lab-toc-hyperref-changes.dtx b/required/latex-lab/latex-lab-toc-hyperref-changes.dtx
@@ -82,10 +82,10 @@
               \int_case:nnF {\Hy@linktoc}
                 {
                   {0}{} %none
-                  {1}{\hyper@linkstart{link}{#4}} %section
+                  {1}{\hyper@linkstart{link}{#4}\tag_struct_begin:n{tag=Span}} %section
                   {2}{} %page
                 }
-                {\hyper@linkstart{link}{#4}} %all
+                {\hyper@linkstart{link}{#4}\tag_struct_begin:n{tag=Span}} %all
             }
           }
       }
@@ -98,10 +98,10 @@
                \int_case:nnF {\Hy@linktoc}
                  {
                    {0}{} %none
-                   {1}{\hyper@linkend} %section
+                   {1}{\tag_struct_end:\hyper@linkend} %section
                    {2}{} %page
                  }
-                 {\hyper@linkend} %all
+                 {\tag_struct_end:\hyper@linkend} %all
              } % none
            }
        }