From 0c76a87dac88c3c9ad88534548f911b76008d383 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 16 Mar 2018 21:30:59 +0000 Subject: intopdf (16mar18)% git-svn-id: svn://tug.org/texlive/trunk@46988 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/intopdf/intopdf.sty | 91 +++++++++++++++++-------- 1 file changed, 64 insertions(+), 27 deletions(-) (limited to 'Master/texmf-dist/tex/latex/intopdf') diff --git a/Master/texmf-dist/tex/latex/intopdf/intopdf.sty b/Master/texmf-dist/tex/latex/intopdf/intopdf.sty index 40214d20e89..528bdf0648c 100644 --- a/Master/texmf-dist/tex/latex/intopdf/intopdf.sty +++ b/Master/texmf-dist/tex/latex/intopdf/intopdf.sty @@ -21,33 +21,70 @@ \RequirePackage{expl3} \ProvidesExplPackage {intopdf} - {2018/03/13} - {0.0.1} + {2018/03/15} + {0.1.0} {Embed non-PDF files into PDF with hyperlink} \RequirePackage{hyperref} -\cs_new_eq:NN\__intopdf_escape_name:n\pdfescapename -\cs_new_eq:NN\__intopdf_escape_string:n\pdfescapestring -\cs_new:Nn\__intopdf_pdfobj:n{ - \tex_immediate:D\pdftex_pdfobj:D{<<#1>>} -} -\cs_new:Nn\__intopdf_pdfstream_file:nn{ - \tex_immediate:D\pdftex_pdfobj:D stream attr {#1} file {#2} -} -\cs_new:Nn\__intopdf_lastobj_ref:{ - \c_space_tl - \int_use:N\pdftex_pdflastobj:D - \c_space_tl - 0 - \c_space_tl - R -} -\cs_new:Npn\__intopdf_annot:nnw#1#2{ - \leavevmode - \pdftex_pdfstartlink:D attr{#1} user {#2} -} -\cs_new:Nn\__intopdf_annot_end:{ - \pdftex_pdfendlink:D +\msg_new:nnnn{intopdf}{engine-unsupported} + {Your~TeX~engine~is~not~supported~by~intopdf.} + {To~use~intopdf,~you~have~to~use~pdfLaTeX~or~LuaLaTeX.} +\cs_generate_variant:Nn\str_case:nnF{VnF} +\str_case:VnF\c_sys_engine_str{ + {pdftex}{ + \cs_new:Nn\__intopdf_escape_name:n{\pdfescapename{#1}} + \cs_new:Nn\__intopdf_escape_string:n{(\pdfescapestring{#1})} + \cs_new:Nn\__intopdf_pdfobj:n{ + \tex_immediate:D\pdftex_pdfobj:D{<<#1>>} + } + \cs_new:Nn\__intopdf_pdfstream_file:nn{ + \tex_immediate:D\pdftex_pdfobj:D stream attr {#1} file {#2} + } + \cs_new:Nn\__intopdf_lastobj_ref:{ + \c_space_tl + \int_use:N\pdftex_pdflastobj:D + \c_space_tl + 0 + \c_space_tl + R + } + \cs_new:Npn\__intopdf_annot:nnw#1#2{ + \leavevmode + \pdftex_pdfstartlink:D attr{#1} user {#2} + } + \cs_new:Nn\__intopdf_annot_end:{ + \pdftex_pdfendlink:D + } + } + {luatex}{ + \RequirePackage{pdftexcmds} + \cs_new:Nn\__intopdf_escape_name:n{\pdf@escapename{#1}} + \cs_new:Nn\__intopdf_escape_string:n{(\pdf@escapestring{#1})} + \cs_new:Nn\__intopdf_pdfobj:n{ + \tex_immediate:D\luatex_pdfextension:D obj{<<#1>>} + } + \cs_new:Nn\__intopdf_pdfstream_file:nn{ + \tex_immediate:D\luatex_pdfextension:D obj stream attr {#1} file {#2} + } + \cs_new:Nn\__intopdf_lastobj_ref:{ + \c_space_tl + \luatex_pdffeedback:D lastobj + \c_space_tl + 0 + \c_space_tl + R + } + \cs_new:Npn\__intopdf_annot:nnw#1#2{ + \leavevmode + \luatex_pdfextension:D startlink attr{#1} user {#2} + } + \cs_new:Nn\__intopdf_annot_end:{ + \luatex_pdfextension:D endlink + \scan_stop: + } + } +}{ + \msg_critical:nn{intopdf}{engine-unsupported} } \cs_new:Nn\__intopdf_annot:nnn{ \__intopdf_annot:nnw{#1}{#2} @@ -60,9 +97,9 @@ }{#1} \__intopdf_pdfobj:n{ /Type /Filespec - /F (\__intopdf_escape_string:n{#1}) + /F \__intopdf_escape_string:n{#1} /EF << /F \__intopdf_lastobj_ref: >> - /Desc (\__intopdf_escape_string:n{#3}) + /Desc \__intopdf_escape_string:n{#3} }% \__intopdf_annot:nnn{ \Hy@setpdfborder @@ -80,7 +117,7 @@ /FS \__intopdf_lastobj_ref: /F\c_space_tl 416 /CA\c_space_tl 0 - /Contents (\__intopdf_escape_string:n{#3}) + /Contents \__intopdf_escape_string:n{#3} }{ #4 } -- cgit v1.2.3