[latex3-commits] [git/LaTeX3-latex3-latex3] master: Get last link working with dvips (5a6a992)

[Joseph Wright]

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

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

commit 5a6a992271a2bb1e3b0c552dfe2d5d269584c41f
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Apr 11 16:13:15 2019 +0100

    Get last link working with dvips
    
    Also stick to "driver.<thing>" here for naming.


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

5a6a992271a2bb1e3b0c552dfe2d5d269584c41f
 l3kernel/l3drivers-pdf.dtx |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/l3kernel/l3drivers-pdf.dtx b/l3kernel/l3drivers-pdf.dtx
index 52325bb..b618835 100644
--- a/l3kernel/l3drivers-pdf.dtx
+++ b/l3kernel/l3drivers-pdf.dtx
@@ -228,7 +228,7 @@
     \group_end:
     \@@_postscript:n
       {
-          mark ~ /_objdef ~ { l3obj \int_use:N \g_@@_pdf_object_int }
+          mark ~ /_objdef ~ { driver.obj \int_use:N \g_@@_pdf_object_int }
           /Rect ~ [ driver.llx ~ driver.lly ~ driver.urx ~ driver.ury ]
           #4
           /ANN ~ pdfmark
@@ -243,10 +243,17 @@
 %   other packages are loaded.
 %    \begin{macrocode}
 \cs_new:Npn \driver_pdf_annotation_last:
-  { { l3obj \int_use:N \g_@@_pdf_annotation_int } }
+  { { driver.obj \int_use:N \g_@@_pdf_annotation_int } }
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{variable}{\g_@@_pdf_link_int}
+%   To track annotations which are links.
+%    \begin{macrocode}
+\int_new:N \g_@@_pdf_link_int
+%    \end{macrocode}
+% \end{variable}
+%
 % \begin{macro}{\driver_pdf_link_goto:nnn, \driver_pdf_link_user:nnn}
 % \begin{macro}{\@@_pdf_link:nnnn}
 %   The approach here is based on \pkg{pdfbase}. It is likely to be revised
@@ -267,6 +274,7 @@
         { \box_dp:N \l_@@_tmp_box }
         { /Subtype /Link #1 #2 #3 }
       \box_use_drop:N \l_@@_tmp_box
+      \int_gset_eq:NN \g_@@_pdf_link_int \g_@@_pdf_annotation_int
     \group_end:
   }
 %    \end{macrocode}
@@ -274,10 +282,10 @@
 % \end{macro}
 %
 % \begin{macro}{\driver_pdf_link_last:}
+%   The same as annotations, but with a custom integer.
 %    \begin{macrocode}
 \cs_new:Npn \driver_pdf_link_last:
-  {
-  }
+  { { driver.obj \int_use:N \g_@@_pdf_link_int } }
 %    \end{macrocode}
 % \end{macro}
 %