summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-07-27 20:09:22 +0000
committerKarl Berry <karl@freefriends.org>2022-07-27 20:09:22 +0000
commit886393078c2df85ede646a53827872d7db9f0256 (patch)
treec39729227b8afaa1a2a6c12d05e2642e5e95b133 /Master
parent9dbd4bb036778a4b3f6dfa3b6faa2a4cb55c4463 (diff)
intopdf (27jul22)
git-svn-id: svn://tug.org/texlive/trunk@63987 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/intopdf/intopdf.pdfbin378812 -> 379897 bytes
-rw-r--r--Master/texmf-dist/source/latex/intopdf/intopdf.dtx12
-rw-r--r--Master/texmf-dist/tex/latex/intopdf/intopdf.sty8
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds2
4 files changed, 14 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/latex/intopdf/intopdf.pdf b/Master/texmf-dist/doc/latex/intopdf/intopdf.pdf
index 99a5f4338f1..e361d415803 100644
--- a/Master/texmf-dist/doc/latex/intopdf/intopdf.pdf
+++ b/Master/texmf-dist/doc/latex/intopdf/intopdf.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/intopdf/intopdf.dtx b/Master/texmf-dist/source/latex/intopdf/intopdf.dtx
index 86d1454acc7..aa474573bb9 100644
--- a/Master/texmf-dist/source/latex/intopdf/intopdf.dtx
+++ b/Master/texmf-dist/source/latex/intopdf/intopdf.dtx
@@ -35,6 +35,7 @@
\usepackage{intopdf,metalogo}
\begin{document}
\DocInput{intopdf.dtx}
+\clearpage
\PrintIndex
\PrintChanges
\end{document}
@@ -46,7 +47,7 @@
%
% \GetFileInfo{intopdf.dtx}
% \title{The \pkg{intopdf} package\thanks{This document
-% corresponds to \pkg{intopdf}~0.4.0, dated~2021/02/26.}}
+% corresponds to \pkg{intopdf}~0.4.1, dated~2022/07/21.}}
% \author{Marcel Kr\"uger \\ \href{mailto:tex@2krueger.de}{tex@2krueger.de}}
%
% \maketitle
@@ -89,8 +90,8 @@
\RequirePackage{expl3,xparse}
\ProvidesExplPackage
{intopdf}
- {2021/02/26}
- {0.4.0}
+ {2022/07/21}
+ {v0.4.1}
{Embed non-PDF files into PDF with hyperlink}
\RequirePackage{hyperref}
@@ -100,6 +101,7 @@
% \changes{v0.2.0}{2019/05/21}{Added filespec support. (The first optional argument) Added \cs{intopdf_attach_link:nnnnn}.}
% \changes{v0.3.0}{2020/03/13}{Switched to \texttt{l3pdf} instead of using primitives directly. Currently some internal functions from \texttt{l3backend} are needed too for handling links.}
% \changes{v0.4.0}{2021/02/26}{Update to new \texttt{l3pdf} names and support more engines.}
+% \changes{v0.4.1}{2022/07/21}{Properly separate legacy and Unicode filenames}
% The main functionality.
% \begin{macrocode}
\str_new:N \l__intopdf_mime_str
@@ -112,11 +114,13 @@
\pdf_object_unnamed_write:nx {fstream} { {
/Subtype /\l__intopdf_mime_str
} { #2 } }
- \str_set_convert:Nnnn \l__intopdf_filename_str { #1 } { default } { utf16/string }
+ \str_set_convert:Nnnn \l__intopdf_filename_str { #1 } { default } { utf8/string }
+ \str_set_convert:Nnnn \l__intopdf_filename_unicode_str { #1 } { default } { utf16/string }
\str_set_convert:Nnnn \l__intopdf_description_str { #4 } { default } { utf16/string }
\pdf_object_unnamed_write:nx {dict} {
/Type /Filespec
/F (\l__intopdf_filename_str)
+ /UF (\l__intopdf_filename_unicode_str)
/EF << /F~\pdf_object_ref_last: >>
/Desc (\l__intopdf_description_str)
}
diff --git a/Master/texmf-dist/tex/latex/intopdf/intopdf.sty b/Master/texmf-dist/tex/latex/intopdf/intopdf.sty
index d2dad029939..9884757bc6d 100644
--- a/Master/texmf-dist/tex/latex/intopdf/intopdf.sty
+++ b/Master/texmf-dist/tex/latex/intopdf/intopdf.sty
@@ -21,8 +21,8 @@
\RequirePackage{expl3,xparse}
\ProvidesExplPackage
{intopdf}
- {2021/02/26}
- {0.4.0}
+ {2022/07/21}
+ {v0.4.1}
{Embed non-PDF files into PDF with hyperlink}
\RequirePackage{hyperref}
@@ -36,11 +36,13 @@
\pdf_object_unnamed_write:nx {fstream} { {
/Subtype /\l__intopdf_mime_str
} { #2 } }
- \str_set_convert:Nnnn \l__intopdf_filename_str { #1 } { default } { utf16/string }
+ \str_set_convert:Nnnn \l__intopdf_filename_str { #1 } { default } { utf8/string }
+ \str_set_convert:Nnnn \l__intopdf_filename_unicode_str { #1 } { default } { utf16/string }
\str_set_convert:Nnnn \l__intopdf_description_str { #4 } { default } { utf16/string }
\pdf_object_unnamed_write:nx {dict} {
/Type /Filespec
/F (\l__intopdf_filename_str)
+ /UF (\l__intopdf_filename_unicode_str)
/EF << /F~\pdf_object_ref_last: >>
/Desc (\l__intopdf_description_str)
}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 274416be23d..db6be4e68a1 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -3093,7 +3093,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
'hypdoc' => 'tex',
'hyperbar' => 'tex',
'inputnormalization' => 'etex -8bit',
- 'intopdf', => 'tex',
+ 'intopdf', => 'etex-answer-y',
'icite', => 'lualatex',
'isodoc' => 'luatex',
'japanese' => 'platex',