[latex3-commits] [git/LaTeX3-latex3-latex3] master: Fix GoTo links with DVI-based routes (fa48e63)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/fa48e63696579aa46ce60153c50bc39f6550d37e

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

commit fa48e63696579aa46ce60153c50bc39f6550d37e
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Apr 21 19:39:15 2019 +0100

    Fix GoTo links with DVI-based routes


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

fa48e63696579aa46ce60153c50bc39f6550d37e
 l3kernel/l3drivers-pdf.dtx             |   26 +++++++++++++-------------
 l3kernel/testfiles/m3expl001.ptex.tlg  |    2 +-
 l3kernel/testfiles/m3expl001.xetex.tlg |    2 +-
 l3kernel/testfiles/m3expl003.ptex.tlg  |    2 +-
 l3kernel/testfiles/m3expl003.xetex.tlg |    2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/l3kernel/l3drivers-pdf.dtx b/l3kernel/l3drivers-pdf.dtx
index ec60238..027c369 100644
--- a/l3kernel/l3drivers-pdf.dtx
+++ b/l3kernel/l3drivers-pdf.dtx
@@ -755,7 +755,7 @@
 % \end{variable}
 %
 % \begin{macro}{\driver_pdf_link_begin_goto:nnw, \driver_pdf_link_begin_user:nnw}
-% \begin{macro}{\@@_pdf_link:nnnw, \@@_pdf_link_aux:nnnw}
+% \begin{macro}{\@@_pdf_link:n, \@@_pdf_link_aux:n}
 % \begin{macro}{\driver_pdf_link_end:, \@@_pdf_link_end:}
 % \begin{macro}{\@@_pdf_link_minima:}
 % \begin{macro}{\@@_pdf_link_outerbox:n}
@@ -793,20 +793,20 @@
 %   approach and |\tex_savepos:D|. That plus format mode are still to re-examine.
 %    \begin{macrocode}
 \cs_new_protected:Npn \driver_pdf_link_begin_goto:nnw #1#2
-  { \@@_pdf_link_begin:nnnw {#1} { /GoTo } {#2} }
+  { \@@_pdf_link_begin:n { #1 /A << /S /GoTo /D ( #2 ) >> } }
 \cs_new_protected:Npn \driver_pdf_link_begin_user:nnw #1#2
-  { \@@_pdf_link_begin:nnnw {#1} { } {#2} }
-\cs_new_protected:Npn \@@_pdf_link_begin:nnnw #1#2#3
+  { \@@_pdf_link_begin:n {#1#2} }
+\cs_new_protected:Npn \@@_pdf_link_begin:n #1
   {
     \bool_if:NF \g_@@_pdf_link_bool
-      { \@@_pdf_link_begin_aux:nnnw {#1} {#2} {#3} }
+      { \@@_pdf_link_begin_aux:n {#1} }
   }
-\cs_new_protected:Npn \@@_pdf_link_begin_aux:nnnw #1#2#3
+\cs_new_protected:Npn \@@_pdf_link_begin_aux:nw #1
   {
     \bool_gset_true:N \g_@@_pdf_link_bool
     \@@_pdf_annotation:nnnn { 3pt } { 3pt } { 0pt } { }
     \@@_postscript:n
-      { /driver.link.dict ( #1 ~ #2 ~ #3 ~ /Subtype /Link ) def }
+      { /driver.link.dict ( /Subtype /Link #1 ) def }
     \int_gincr:N \g_@@_pdf_object_int
     \int_gset_eq:NN \g_@@_pdf_link_int \g_@@_pdf_object_int
     \@@_postscript:x
@@ -817,7 +817,7 @@
           }
             def
       }
-    \tl_gset:Nn \g_@@_pdf_link_dict_tl { #1 ~ #2 ~ #3 }
+    \tl_gset:Nn \g_@@_pdf_link_dict_tl {#1}
     \@@_pdf_link_sf_save:
     \mode_if_math:TF
       { \bool_gset_true:N \g_@@_pdf_link_math_bool }
@@ -1497,15 +1497,15 @@
 %
 % \begin{macro}
 %   {\driver_pdf_link_begin_goto:nnw, \driver_pdf_link_begin_user:nnw}
+% \begin{macro}{\@@_pdf_link_begin:n}
 % \begin{macro}{\driver_pdf_link_end:}
-% \begin{macro}{\@@_pdf_link_begin:nnn}
 %   All created using the same internals.
 %    \begin{macrocode}
 \cs_new_protected:Npn \driver_pdf_link_begin_goto:nnw #1#2
-  { \@@_pdf_link_begin:nnnw {#1} { /GoTo } {#2} }
+  { \@@_pdf_link_begin:n { #1 /A << /S /GoTo /D ( #2 ) >> } }
 \cs_new_protected:Npn \driver_pdf_link_begin_user:nnw #1#2
-  { \@@_pdf_link_begin:nnnw {#1} { } {#2} }
-\cs_new_protected:Npn \@@_pdf_link_begin:nnnw #1#2#3
+  { \@@_pdf_link_begin:n {#1#2} }
+\cs_new_protected:Npn \@@_pdf_link_begin:n #1
   {
     \@@_pdf_AR_fix:
     \@@_pdf:n
@@ -1514,7 +1514,7 @@
          <<
            /Type /Annot
            /Subtype /Link
-           #1 ~ #2 ~ #3
+           #1
          >>
       }
   }
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 533a4b5..33bcdf3 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -6527,7 +6527,7 @@ Defining \driver_pdf_annotation:nnnn on line ...
 Defining \__driver_pdf_annotation:nnnn on line ...
 Defining \driver_pdf_link_begin_goto:nnw on line ...
 Defining \driver_pdf_link_begin_user:nnw on line ...
-Defining \__driver_pdf_link_begin:nnnw on line ...
+Defining \__driver_pdf_link_begin:n on line ...
 Defining \driver_pdf_link_end: on line ...
 Defining \driver_pdf_link_last: on line ...
 Defining \driver_pdf_link_margin:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index f79b938..243f4e8 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -6503,7 +6503,7 @@ Defining \driver_pdf_annotation:nnnn on line ...
 Defining \__driver_pdf_annotation:nnnn on line ...
 Defining \driver_pdf_link_begin_goto:nnw on line ...
 Defining \driver_pdf_link_begin_user:nnw on line ...
-Defining \__driver_pdf_link_begin:nnnw on line ...
+Defining \__driver_pdf_link_begin:n on line ...
 Defining \driver_pdf_link_end: on line ...
 Defining \driver_pdf_link_last: on line ...
 Defining \driver_pdf_link_margin:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 533a4b5..33bcdf3 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -6527,7 +6527,7 @@ Defining \driver_pdf_annotation:nnnn on line ...
 Defining \__driver_pdf_annotation:nnnn on line ...
 Defining \driver_pdf_link_begin_goto:nnw on line ...
 Defining \driver_pdf_link_begin_user:nnw on line ...
-Defining \__driver_pdf_link_begin:nnnw on line ...
+Defining \__driver_pdf_link_begin:n on line ...
 Defining \driver_pdf_link_end: on line ...
 Defining \driver_pdf_link_last: on line ...
 Defining \driver_pdf_link_margin:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index f79b938..243f4e8 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -6503,7 +6503,7 @@ Defining \driver_pdf_annotation:nnnn on line ...
 Defining \__driver_pdf_annotation:nnnn on line ...
 Defining \driver_pdf_link_begin_goto:nnw on line ...
 Defining \driver_pdf_link_begin_user:nnw on line ...
-Defining \__driver_pdf_link_begin:nnnw on line ...
+Defining \__driver_pdf_link_begin:n on line ...
 Defining \driver_pdf_link_end: on line ...
 Defining \driver_pdf_link_last: on line ...
 Defining \driver_pdf_link_margin:n on line ...