[latex3-commits] [git/LaTeX3-latex3-latex3] master: Fix creation of PDF annotations with dvips backend (629accb51)

[Joseph Wright]

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

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

commit 629accb515daf08eb81f0c8f441e85533112727a
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Mar 11 08:16:07 2020 +0000

    Fix creation of PDF annotations with dvips backend


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

629accb515daf08eb81f0c8f441e85533112727a
 l3backend/CHANGELOG.md      |  3 +++
 l3backend/l3backend-pdf.dtx | 23 +++--------------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/l3backend/CHANGELOG.md b/l3backend/CHANGELOG.md
index 93cf02a40..653584081 100644
--- a/l3backend/CHANGELOG.md
+++ b/l3backend/CHANGELOG.md
@@ -6,6 +6,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+- Creation of PDF annotations with `dvips` backend
+
 ## [2020-02-23]
 
 ### Fixed
diff --git a/l3backend/l3backend-pdf.dtx b/l3backend/l3backend-pdf.dtx
index fbc9fcd19..48aa35a20 100644
--- a/l3backend/l3backend-pdf.dtx
+++ b/l3backend/l3backend-pdf.dtx
@@ -253,35 +253,18 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{macro}{\@@_backend_annotation:nnnn, \@@_backend_annotation_aux:nnnn}
-% \begin{macro}{pdf.llx, pdf.lly, pdf.urx, pdf.ury}
+% \begin{macro}{\@@_backend_annotation:nnnn}
 %   Annotations are objects, but we track them separately. Notably, they are
 %   not in the object data lists. Here, to get the co-ordinates of the
 %   annotation, we need to have the data collected at the PostScript level.
 %   That requires a bit of box trickery (effectively a \LaTeXe{} |picture|
 %   of zero size). Once the data is collected, use it to set up the annotation
-%   border. There is a split into two parts here to allow an easy way of
-%   applying the Adobe Reader fix.
+%   border.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_annotation:nnnn #1#2#3#4
   {
-    \@@_backend_annotation_aux:nnnn {#1} {#2} {#3} {#4}
-    \int_gincr:N \g_@@_backend_object_int
-    \int_gset_eq:NN \g_@@_backend_annotation_int \g_@@_backend_object_int
-    \@@_backend_pdfmark:x
-      {
-
-        /_objdef { pdf.obj \int_use:N \g_@@_backend_object_int }
-        pdf.rect ~
-        #4 ~
-        /ANN
-      }
-  }
-\cs_new_protected:Npn \@@_backend_annotation_aux:nnnn #1#2#3#4
-  {
     \box_move_down:nn {#3}
       { \hbox:n { \__kernel_backend_postscript:n { pdf.save.ll } } }
-    \hbox:n {#4}
     \box_move_up:nn {#2}
       {
         \hbox:n
@@ -296,12 +279,12 @@
       {
         /_objdef { pdf.obj \int_use:N \g_@@_backend_object_int }
         pdf.rect
+        #4 ~
         /ANN
       }
   }
 %    \end{macrocode}
 % \end{macro}
-% \end{macro}
 %
 % \begin{macro}[EXP]{\@@_backend_annotation_last:}
 %   Provide the last annotation we created: could get tricky of course if