[latex3-commits] [git/LaTeX3-latex3-latex3] master: Various dvips link fixes (0f6a67c)

[Joseph Wright]

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

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

commit 0f6a67c61799ffb5cd87db6cf938da588b9db69d
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Apr 10 22:04:23 2019 +0100

    Various dvips link fixes


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

0f6a67c61799ffb5cd87db6cf938da588b9db69d
 l3kernel/l3drivers-pdf.dtx |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/l3kernel/l3drivers-pdf.dtx b/l3kernel/l3drivers-pdf.dtx
index 2ca48bf..e64803f 100644
--- a/l3kernel/l3drivers-pdf.dtx
+++ b/l3kernel/l3drivers-pdf.dtx
@@ -189,7 +189,7 @@
 %   of zero size). Once the data is collected, use it to set up the annotation
 %   border.
 %    \begin{macrocode}
-\cs_new_protected:Npn \driver_annotation:nnnn #1#2#3#4
+\cs_new_protected:Npn \driver_pdf_annotation:nnnn #1#2#3#4
   {
     \int_gincr:N \g_@@_pdf_object_int
     \int_gset_eq:NN \g_@@_pdf_annotation_int \g_@@_pdf_object_int
@@ -222,15 +222,16 @@
                 }
             }
         }
-      \box_resize_to_ht:Nn \l_@@_tmp_box { 0pt }
+      \box_set_ht:Nn \l_@@_tmp_box { 0pt }
       \box_use_drop:N \l_@@_tmp_box
     \group_end:
-    \@@_literal_postscript:x
+    \@@_literal:n
       {
-        mark ~ /_objdef ~ l3obj \int_use:N \g_@@_pdf_object_int \c_space_tl
-        /Rect ~ [ l3llx ~ l3lly ~ l3urx  ~ l3ury ]
-        #4
-        /ANN ~ pdfmark
+        ps:
+          mark ~ /_objdef ~ { l3obj \int_use:N \g_@@_pdf_object_int }
+          /Rect ~ [ l3llx ~ l3lly ~ l3urx  ~ l3ury ]
+          #4
+          /ANN ~ pdfmark
       }
   }
 %    \end{macrocode}
@@ -259,7 +260,7 @@
   {
     \group_begin:
       \hbox_set:Nn \l_@@_tmp_box {#4}
-      \driver_annotation:nnnn
+      \driver_pdf_annotation:nnnn
         { \box_wd:N \l_@@_tmp_box }
         { \box_ht:N \l_@@_tmp_box }
         { \box_dp:N \l_@@_tmp_box }