diff options
author | Karl Berry <karl@freefriends.org> | 2021-03-07 22:06:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-03-07 22:06:31 +0000 |
commit | 2cc352a1342a94d7290ae414cc9ab937b17ed16c (patch) | |
tree | a533b3553363e7ad54073a871f0b37c4ccc85d50 /Master/texmf-dist/source | |
parent | 53b65a24ca867fb68dc17b9d69fb39c21b9f16c7 (diff) |
newpax (7mar21) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58203 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/newpax/newpax.dtx (renamed from Master/texmf-dist/source/lualatex/newpax/newpax.dtx) | 50 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/newpax/newpax.ins (renamed from Master/texmf-dist/source/lualatex/newpax/newpax.ins) | 0 |
2 files changed, 26 insertions, 24 deletions
diff --git a/Master/texmf-dist/source/lualatex/newpax/newpax.dtx b/Master/texmf-dist/source/latex/newpax/newpax.dtx index 15958c04168..44c6dbe16a8 100644 --- a/Master/texmf-dist/source/lualatex/newpax/newpax.dtx +++ b/Master/texmf-dist/source/latex/newpax/newpax.dtx @@ -29,7 +29,7 @@ %<@@=newpax> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{newpax}% - [2021-02-26 v0.5 Annotation support for PDF graphics based on pax.sty adapted by (UF)]% + [2021-03-07 v0.51 Annotation support for PDF graphics based on pax.sty adapted by (UF)]% \ExplSyntaxOn \bool_if:nF { @@ -67,7 +67,7 @@ \tl_new:N \l_@@_destsuffix_tl \tl_new:N \NEWPAX@fileextension -\cs_generate_variant:Nn \pdfannot_dict_put:nnn {nnx} +\cs_generate_variant:Nn \pdfannot_dict_put:nnn {nnx,xnx,xnn} \NewDocumentCommand\newpaxsetup { m } { \keys_set:nn {newpax}{ #1} @@ -134,7 +134,7 @@ } -\cs_set_eq:NN \@NEWPAX@annotation@nnnn \pdfannot_box:nnnn + \cs_new_protected:Npn \@NEWPAX@linkgoto@xnn #1 #2 #3 %#1 dest #2 width #3 height { @@ -143,18 +143,27 @@ \leavevmode \exp_args:Nx\pdfannot_link_goto_begin:nw { #1 } - \hbox_to_wd:nn {#2}{\@NEWPAX@ensurelinkbox@n { \rule{0pt}{#3} }\hfill} + \@NEWPAX@ensurelinkbox@n{\hbox_to_wd:nn {#2}{ { \rule{0pt}{#3} }\hfill}} \pdfannot_link_goto_end: \group_end: } -\cs_generate_variant:Nn \pdfannot_box:nnnnn {xnnnx} +\cs_new_protected:Npn \@NEWPAX@link@setaction@nn #1 #2 + { + \pdfannot_dict_put:nnn{link/#1}{Subtype}{/Link} + \pdfannot_dict_put:nnx{link/#1}{A} + {<</Type/Action/S/#1 #2>>} + } + + -\cs_new_protected:Npn \@NEWPAX@annotboxlink@xnnx #1 #2 #3 #4 %#1 type, #2 width #3 height #4 spec +\cs_new_protected:Npn \@NEWPAX@annotboxlink@nnn #1 #2 #3 %#1 type, #2 width #3 height { \group_begin: \exp_args:Nx\@NEWPAX@setattributes@n {#1} - \leavevmode\pdfannot_box:xnnnx {link/#1}{#2}{#3}{0pt}{#4} + \leavevmode + \pdfannot_box:nnnx {#2}{#3}{0pt} + {\pdfannot_dict_use:n{link/#1}} \group_end: } @@ -163,7 +172,6 @@ \exp_args:Nxx \pdf_destination:nn {#1}{#2} } - % only defined if hyperref is loaded ... \sys_if_engine_xetex:TF { @@ -309,10 +317,9 @@ \def\<{<}% \def\>{>}% \endlinechar=-1 % - \InputIfFileExists\NEWPAX@file{% - }{% - \typeout{* Missing: \NEWPAX@file}% - }% + \begingroup + \catcode`\#=12 \catcode`\%=12 + \InputIfFileExists\NEWPAX@file{}{\typeout{* Missing: \NEWPAX@file}}\endgroup } \def\NEWPAX@parser#1{\NEWPAX@call{cmd}{#1}{}}% \def\NEWPAX@call#1#2#3{% @@ -469,15 +476,10 @@ }% \else \hbox{% - \@NEWPAX@annotboxlink@xnnx {\NEWPAX@link@type}{\NEWPAX@width}{\NEWPAX@height} - { - /Subtype/Link% - /A<<% - /Type/Action% - /S/\NEWPAX@link@type - #1% - >>% - }}% + \expandafter\@NEWPAX@link@setaction@nn\expandafter{\NEWPAX@link@type}{#1}% + \expandafter + \@NEWPAX@annotboxlink@nnn + \expandafter {\NEWPAX@link@type}{\NEWPAX@width}{\NEWPAX@height}{}}% \fi \hss }% @@ -699,8 +701,8 @@ %<*lua> local ProvidesLuaModule = { name = "newpax", - version = "0.5", --TAGVERSION - date = "2021-02-26", --TAGDATE + version = "0.51", --TAGVERSION + date = "2021-03-07", --TAGDATE description = "newpax lua code", license = "The LATEX Project Public License 1.3c" } @@ -1119,7 +1121,7 @@ end -- the main function local function __writepax (ext,file) - local fileVAR = assert(kpse.find_file(file ..".pdf"),"file not found") + local fileVAR = assert(kpse.find_file(file ..".pdf"),"file `"..file..".pdf` not found") local filebaseVAR = FILENAMEONLY(fileVAR) -- getting the data for the concrete document: local writeVAR = io.open (filebaseVAR .."."..ext,"w") -- always in current directory diff --git a/Master/texmf-dist/source/lualatex/newpax/newpax.ins b/Master/texmf-dist/source/latex/newpax/newpax.ins index 62ec48b0c9f..62ec48b0c9f 100644 --- a/Master/texmf-dist/source/lualatex/newpax/newpax.ins +++ b/Master/texmf-dist/source/latex/newpax/newpax.ins |