[latex3-commits] [git/LaTeX3-latex3-latex3] master: Remove 'AR fix' at present (e00a8d3)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon May 6 11:27:29 CEST 2019
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/e00a8d3392466befbe44b3d913d27a1868792b17
>---------------------------------------------------------------
commit e00a8d3392466befbe44b3d913d27a1868792b17
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon May 6 10:27:29 2019 +0100
Remove 'AR fix' at present
This is only needed for OCG support and then once per page.
To return once OCG concepts start to get added!
>---------------------------------------------------------------
e00a8d3392466befbe44b3d913d27a1868792b17
l3kernel/l3drivers-pdf.dtx | 46 +------------------------------
l3kernel/testfiles/m3expl001.luatex.tlg | 2 --
l3kernel/testfiles/m3expl001.ptex.tlg | 2 --
l3kernel/testfiles/m3expl001.tlg | 2 --
l3kernel/testfiles/m3expl001.uptex.tlg | 2 --
l3kernel/testfiles/m3expl001.xetex.tlg | 2 --
l3kernel/testfiles/m3expl003.luatex.tlg | 2 --
l3kernel/testfiles/m3expl003.ptex.tlg | 2 --
l3kernel/testfiles/m3expl003.tlg | 2 --
l3kernel/testfiles/m3expl003.uptex.tlg | 2 --
l3kernel/testfiles/m3expl003.xetex.tlg | 2 --
11 files changed, 1 insertion(+), 65 deletions(-)
diff --git a/l3kernel/l3drivers-pdf.dtx b/l3kernel/l3drivers-pdf.dtx
index b351862..5c60b16 100644
--- a/l3kernel/l3drivers-pdf.dtx
+++ b/l3kernel/l3drivers-pdf.dtx
@@ -71,17 +71,6 @@
% A very small number of items that belong at the driver level but which
% are common to all drivers.
%
-% \begin{variable}{\c_@@_pdf_AR_fix_tl}
-% Part of a fix for a bug in Adobe Reader: see
-% \url{https://forums.adobe.com/message/5787612#5787612}. The workaround
-% is taken from \pkg{pdfbase}: this \enquote{magic} dictionary entry has to
-% be passed correctly to each driver.
-% \begin{macrocode}
-\tl_const:Nn \c_@@_pdf_AR_fix_tl
- { /Ff ~ 65537 /FT /Btn /Subtype /Widget }
-% \end{macrocode}
-% \end{variable}
-%
% \begin{variable}{\l_@@_pdf_tmp_box}
% For fitting destinations.
% \begin{macrocode}
@@ -800,8 +789,7 @@
\@@_pdfmark:x
{
/_objdef { driver.obj \int_use:N \g_@@_pdf_object_int }
- driver.rect ~
- \c_@@_pdf_AR_fix_tl
+ driver.rect
/ANN
}
}
@@ -1237,26 +1225,11 @@
%
% \subsubsection{Annotations}
%
-% \begin{macro}{\@@_pdf_AR_fix:}
-% The fix for the Adobe Reader bug: needed for generic annotations and links.
-% \begin{macrocode}
-\cs_new_protected:Npx \@@_pdf_AR_fix:
- {
- \cs_if_exist:NTF \tex_pdfextension:D
- { \tex_pdfextension:D annot ~ }
- { \tex_pdfannot:D }
- width ~ 3pt ~ height ~ 3pt ~ depth ~ 0pt
- { \c_@@_pdf_AR_fix_tl }
- }
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}{\driver_pdf_annotation:nnnn}
% Simply pass the raw data through, just dealing with evaluation of dimensions.
% \begin{macrocode}
\cs_new_protected:Npx \driver_pdf_annotation:nnnn #1#2#3#4
{
- \@@_pdf_AR_fix:
\cs_if_exist:NTF \tex_pdfextension:D
{ \tex_pdfextension:D annot ~ }
{ \tex_pdfannot:D }
@@ -1294,7 +1267,6 @@
{ \@@_pdf_link_begin:nnnw {#1} { user } {#2} }
\cs_new_protected:Npx \@@_pdf_link_begin:nnnw #1#2#3
{
- \@@_pdf_AR_fix:
\cs_if_exist:NTF \tex_pdfextension:D
{ \tex_pdfextension:D startlink ~ }
{ \tex_pdfstartlink:D }
@@ -1710,20 +1682,6 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\@@_pdf_AR_fix:}
-% The fix for the Adobe Reader bug: needed for generic annotations and links.
-% \begin{macrocode}
-\cs_new_protected:Npx \@@_pdf_AR_fix:
- {
- \@@_pdf:n
- {
- ann ~ width ~ 3pt ~ height ~ 3pt ~ depth ~ 0pt
- << \c_@@_pdf_AR_fix_tl >>
- }
- }
-% \end{macrocode}
-% \end{macro}
-%
% \begin{variable}{\g_@@_pdf_annotation_int}
% Needed as objects which are not annotations could be created.
% \begin{macrocode}
@@ -1752,7 +1710,6 @@
}
\cs_new_protected:Npn \@@_pdf_annotation:nnnn #1#2#3#4
{
- \@@_pdf_AR_fix:
\int_gincr:N \g_@@_pdf_object_int
\int_gset_eq:NN \g_@@_pdf_annotation_int \g_@@_pdf_object_int
\@@_pdf:x
@@ -1779,7 +1736,6 @@
{ \@@_pdf_link_begin:n {#1#2} }
\cs_new_protected:Npn \@@_pdf_link_begin:n #1
{
- \@@_pdf_AR_fix:
\@@_pdf:n
{
bann
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 8f5253c..ae75fe6 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -6482,10 +6482,8 @@ Defining \__driver_image_getbb_auxii:n on line ...
Defining \__driver_image_include_jpg:n on line ...
Defining \__driver_image_include_pdf:n on line ...
Defining \__driver_image_include_png:n on line ...
-Defining \c__driver_pdf_AR_fix_tl on line ...
Defining \l__driver_pdf_tmp_box on line ...
\l__driver_pdf_tmp_box=\box...
-Defining \__driver_pdf_AR_fix: on line ...
Defining \driver_pdf_annotation:nnnn on line ...
Defining \driver_pdf_annotation_last: on line ...
Defining \driver_pdf_link_begin_goto:nnw on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 7c651ee..bcc8184 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -6481,7 +6481,6 @@ Defining \__driver_image_include_auxi:nn on line ...
Defining \__driver_image_include_auxii:nnn on line ...
Defining \__driver_image_include_auxii:xnn on line ...
Defining \__driver_image_include_auxiii:nnn on line ...
-Defining \c__driver_pdf_AR_fix_tl on line ...
Defining \l__driver_pdf_tmp_box on line ...
\l__driver_pdf_tmp_box=\box...
Defining \__driver_pdf:n on line ...
@@ -6501,7 +6500,6 @@ Defining \__driver_pdf_object_write_fstream:nn on line ...
Defining \__driver_pdf_object_write_stream:nn on line ...
Defining \__driver_pdf_object_write_stream:nnnn on line ...
Defining \g__driver_landscape_bool on line ...
-Defining \__driver_pdf_AR_fix: on line ...
Defining \g__driver_pdf_annotation_int on line ...
\g__driver_pdf_annotation_int=\count...
Defining \driver_pdf_annotation:nnnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 38d496c..b0ec9eb 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -6780,10 +6780,8 @@ Defining \__driver_image_getbb_auxii:n on line ...
Defining \__driver_image_include_jpg:n on line ...
Defining \__driver_image_include_pdf:n on line ...
Defining \__driver_image_include_png:n on line ...
-Defining \c__driver_pdf_AR_fix_tl on line ...
Defining \l__driver_pdf_tmp_box on line ...
\l__driver_pdf_tmp_box=\box...
-Defining \__driver_pdf_AR_fix: on line ...
Defining \driver_pdf_annotation:nnnn on line ...
Defining \driver_pdf_annotation_last: on line ...
Defining \driver_pdf_link_begin_goto:nnw on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index f929770..763089e 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -6778,7 +6778,6 @@ Defining \__driver_image_include_auxi:nn on line ...
Defining \__driver_image_include_auxii:nnn on line ...
Defining \__driver_image_include_auxii:xnn on line ...
Defining \__driver_image_include_auxiii:nnn on line ...
-Defining \c__driver_pdf_AR_fix_tl on line ...
Defining \l__driver_pdf_tmp_box on line ...
\l__driver_pdf_tmp_box=\box...
Defining \__driver_pdf:n on line ...
@@ -6798,7 +6797,6 @@ Defining \__driver_pdf_object_write_fstream:nn on line ...
Defining \__driver_pdf_object_write_stream:nn on line ...
Defining \__driver_pdf_object_write_stream:nnnn on line ...
Defining \g__driver_landscape_bool on line ...
-Defining \__driver_pdf_AR_fix: on line ...
Defining \g__driver_pdf_annotation_int on line ...
\g__driver_pdf_annotation_int=\count...
Defining \driver_pdf_annotation:nnnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index db58937..215d8b2 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -6491,7 +6491,6 @@ Defining \__driver_image_getbb_auxv:nNnn on line ...
Defining \__driver_image_getbb_auxvi:nNnn on line ...
Defining \__driver_image_getbb_pagebox:w on line ...
Defining \__driver_image_include_pdf:n on line ...
-Defining \c__driver_pdf_AR_fix_tl on line ...
Defining \l__driver_pdf_tmp_box on line ...
\l__driver_pdf_tmp_box=\box...
Defining \__driver_pdf:n on line ...
@@ -6511,7 +6510,6 @@ Defining \__driver_pdf_object_write_fstream:nn on line ...
Defining \__driver_pdf_object_write_stream:nn on line ...
Defining \__driver_pdf_object_write_stream:nnnn on line ...
Defining \g__driver_landscape_bool on line ...
-Defining \__driver_pdf_AR_fix: on line ...
Defining \g__driver_pdf_annotation_int on line ...
\g__driver_pdf_annotation_int=\count...
Defining \driver_pdf_annotation:nnnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 8f5253c..ae75fe6 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -6482,10 +6482,8 @@ Defining \__driver_image_getbb_auxii:n on line ...
Defining \__driver_image_include_jpg:n on line ...
Defining \__driver_image_include_pdf:n on line ...
Defining \__driver_image_include_png:n on line ...
-Defining \c__driver_pdf_AR_fix_tl on line ...
Defining \l__driver_pdf_tmp_box on line ...
\l__driver_pdf_tmp_box=\box...
-Defining \__driver_pdf_AR_fix: on line ...
Defining \driver_pdf_annotation:nnnn on line ...
Defining \driver_pdf_annotation_last: on line ...
Defining \driver_pdf_link_begin_goto:nnw on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 7c651ee..bcc8184 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -6481,7 +6481,6 @@ Defining \__driver_image_include_auxi:nn on line ...
Defining \__driver_image_include_auxii:nnn on line ...
Defining \__driver_image_include_auxii:xnn on line ...
Defining \__driver_image_include_auxiii:nnn on line ...
-Defining \c__driver_pdf_AR_fix_tl on line ...
Defining \l__driver_pdf_tmp_box on line ...
\l__driver_pdf_tmp_box=\box...
Defining \__driver_pdf:n on line ...
@@ -6501,7 +6500,6 @@ Defining \__driver_pdf_object_write_fstream:nn on line ...
Defining \__driver_pdf_object_write_stream:nn on line ...
Defining \__driver_pdf_object_write_stream:nnnn on line ...
Defining \g__driver_landscape_bool on line ...
-Defining \__driver_pdf_AR_fix: on line ...
Defining \g__driver_pdf_annotation_int on line ...
\g__driver_pdf_annotation_int=\count...
Defining \driver_pdf_annotation:nnnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 38d496c..b0ec9eb 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -6780,10 +6780,8 @@ Defining \__driver_image_getbb_auxii:n on line ...
Defining \__driver_image_include_jpg:n on line ...
Defining \__driver_image_include_pdf:n on line ...
Defining \__driver_image_include_png:n on line ...
-Defining \c__driver_pdf_AR_fix_tl on line ...
Defining \l__driver_pdf_tmp_box on line ...
\l__driver_pdf_tmp_box=\box...
-Defining \__driver_pdf_AR_fix: on line ...
Defining \driver_pdf_annotation:nnnn on line ...
Defining \driver_pdf_annotation_last: on line ...
Defining \driver_pdf_link_begin_goto:nnw on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index f929770..763089e 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -6778,7 +6778,6 @@ Defining \__driver_image_include_auxi:nn on line ...
Defining \__driver_image_include_auxii:nnn on line ...
Defining \__driver_image_include_auxii:xnn on line ...
Defining \__driver_image_include_auxiii:nnn on line ...
-Defining \c__driver_pdf_AR_fix_tl on line ...
Defining \l__driver_pdf_tmp_box on line ...
\l__driver_pdf_tmp_box=\box...
Defining \__driver_pdf:n on line ...
@@ -6798,7 +6797,6 @@ Defining \__driver_pdf_object_write_fstream:nn on line ...
Defining \__driver_pdf_object_write_stream:nn on line ...
Defining \__driver_pdf_object_write_stream:nnnn on line ...
Defining \g__driver_landscape_bool on line ...
-Defining \__driver_pdf_AR_fix: on line ...
Defining \g__driver_pdf_annotation_int on line ...
\g__driver_pdf_annotation_int=\count...
Defining \driver_pdf_annotation:nnnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index db58937..215d8b2 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -6491,7 +6491,6 @@ Defining \__driver_image_getbb_auxv:nNnn on line ...
Defining \__driver_image_getbb_auxvi:nNnn on line ...
Defining \__driver_image_getbb_pagebox:w on line ...
Defining \__driver_image_include_pdf:n on line ...
-Defining \c__driver_pdf_AR_fix_tl on line ...
Defining \l__driver_pdf_tmp_box on line ...
\l__driver_pdf_tmp_box=\box...
Defining \__driver_pdf:n on line ...
@@ -6511,7 +6510,6 @@ Defining \__driver_pdf_object_write_fstream:nn on line ...
Defining \__driver_pdf_object_write_stream:nn on line ...
Defining \__driver_pdf_object_write_stream:nnnn on line ...
Defining \g__driver_landscape_bool on line ...
-Defining \__driver_pdf_AR_fix: on line ...
Defining \g__driver_pdf_annotation_int on line ...
\g__driver_pdf_annotation_int=\count...
Defining \driver_pdf_annotation:nnnn on line ...
More information about the latex3-commits
mailing list