[latex3-commits] [git/LaTeX3-latex3-latex3] master: More LuaTeX adjustments (bec4ce9)

[Joseph Wright]

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

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

commit bec4ce9b45ab86bfe2de2d3053ee307c8dc58f0d
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu May 30 18:31:18 2019 +0100

    More LuaTeX adjustments


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

bec4ce9b45ab86bfe2de2d3053ee307c8dc58f0d
 l3kernel/l3drivers-pdf.dtx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/l3kernel/l3drivers-pdf.dtx b/l3kernel/l3drivers-pdf.dtx
index 6813904..83c3ef4 100644
--- a/l3kernel/l3drivers-pdf.dtx
+++ b/l3kernel/l3drivers-pdf.dtx
@@ -1258,9 +1258,10 @@
 %    \begin{macrocode}
 \cs_new:Npx \driver_pdf_annotation_last:
   {
+    \exp_not:N \int_value:w
     \cs_if_exist:NTF \tex_pdffeedback:D
       { \exp_not:N \tex_pdffeedback:D annot ~ }
-      { \exp_not:N \tex_the:D \exp_not:N \tex_pdflastannot:D }
+      { \exp_not:N \tex_pdflastannot:D }
       \c_space_tl 0 ~ R
   }
 %    \end{macrocode}
@@ -1300,9 +1301,10 @@
 %    \begin{macrocode}
 \cs_new:Npx \driver_pdf_link_last:
   {
+    \exp_not:N \int_value:w 
     \cs_if_exist:NTF \tex_pdffeedback:D
-      { \exp_not:N \tex_pdffeedback:D lastlink \scan_stop: }
-      { \exp_not:N \tex_the:D \exp_not:N \tex_pdflastlink:D }
+      { \exp_not:N \tex_pdffeedback:D lastlink ~ }
+      { \exp_not:N \tex_pdflastlink:D }
       \c_space_tl 0 ~ R
   }
 %    \end{macrocode}
@@ -1507,9 +1509,10 @@
 %    \begin{macrocode}
 \cs_new:Npx \driver_pdf_object_last:
   {
+    \exp_not:N \int_value:w
     \cs_if_exist:NTF \tex_pdffeedback:D
-      { \exp_not:N \tex_pdffeedback:D lastobj }
-      { \exp_not:N \tex_the:D \exp_not:N \tex_pdflastobj:D }
+      { \exp_not:N \tex_pdffeedback:D lastobj ~ }
+      { \exp_not:N \tex_pdflastobj:D }
       \c_space_tl 0 ~ R
   }
 %    \end{macrocode}