embedfile (14apr20)

git-svn-id: svn://tug.org/texlive/trunk@54739 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 36 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/embedfile/embedfile-example-collection.tex b/Master/texmf-dist/doc/latex/embedfile/embedfile-example-collection.tex
index 262742e183b..a5afc63ffbf 100644
--- a/Master/texmf-dist/doc/latex/embedfile/embedfile-example-collection.tex
+++ b/Master/texmf-dist/doc/latex/embedfile/embedfile-example-collection.tex
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: embedfile
-%% Version: 2019/12/03 v2.9
+%% Version: 2020-04-14 v2.10
 %% 
 %% Copyright (C)
 %%    2006-2011 Heiko Oberdiek
-%%    2016-2019 Oberdiek Package Support Group
+%%    2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/doc/latex/embedfile/embedfile-example-plain.tex b/Master/texmf-dist/doc/latex/embedfile/embedfile-example-plain.tex
index fb872ba55d9..12fc215ac58 100644
--- a/Master/texmf-dist/doc/latex/embedfile/embedfile-example-plain.tex
+++ b/Master/texmf-dist/doc/latex/embedfile/embedfile-example-plain.tex
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: embedfile
-%% Version: 2019/12/03 v2.9
+%% Version: 2020-04-14 v2.10
 %% 
 %% Copyright (C)
 %%    2006-2011 Heiko Oberdiek
-%%    2016-2019 Oberdiek Package Support Group
+%%    2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/doc/latex/embedfile/embedfile.pdf b/Master/texmf-dist/doc/latex/embedfile/embedfile.pdf
index a91594eaf59..66682ebd9fc 100644
--- a/Master/texmf-dist/doc/latex/embedfile/embedfile.pdf
+++ b/Master/texmf-dist/doc/latex/embedfile/embedfile.pdf
diff --git a/Master/texmf-dist/source/latex/embedfile/embedfile.dtx b/Master/texmf-dist/source/latex/embedfile/embedfile.dtx
index 1fb0ed84b68..dbdfbaeafc6 100644
--- a/Master/texmf-dist/source/latex/embedfile/embedfile.dtx
+++ b/Master/texmf-dist/source/latex/embedfile/embedfile.dtx
@@ -1,12 +1,12 @@
 % \iffalse meta-comment
 %
 % File: embedfile.dtx
-% Version: 2019/12/03 v2.9
+% Version: 2020-04-14 v2.10
 % Info: Embed files into PDF
 %
 % Copyright (C)
 %    2006-2011 Heiko Oberdiek
-%    2016-2019 Oberdiek Package Support Group
+%    2016-2020 Oberdiek Package Support Group
 %    https://github.com/ho-tex/embedfile/issues
 %
 % This work may be distributed and/or modified under the
@@ -89,7 +89,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: embedfile 2019/12/03 v2.9 Embed files into PDF (HO)}
+\Msg{* Package: embedfile 2020-04-14 v2.10 Embed files into PDF (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -101,11 +101,11 @@
 This is a generated file.
 
 Project: embedfile
-Version: 2019/12/03 v2.9
+Version: 2020-04-14 v2.10
 
 Copyright (C)
    2006-2011 Heiko Oberdiek
-   2016-2019 Oberdiek Package Support Group
+   2016-2020 Oberdiek Package Support Group
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -179,7 +179,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{embedfile.drv}%
-  [2019/12/03 v2.9 Embed files into PDF (HO)]%
+  [2020-04-14 v2.10 Embed files into PDF (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
 \begin{document}
@@ -193,7 +193,7 @@ and the derived files
 % \GetFileInfo{embedfile.drv}
 %
 % \title{The \xpackage{embedfile} package}
-% \date{2019/12/03 v2.9}
+% \date{2020-04-14 v2.10}
 % \author{Heiko Oberdiek\thanks
 % {Please report any issues at \url{https://github.com/ho-tex/embedfile/issues}}}
 %
@@ -201,7 +201,7 @@ and the derived files
 %
 % \begin{abstract}
 % This package embeds files to a PDF document.
-% Currently the only supported driver is \pdfTeX\ $>=$ 1.30 in PDF mode.
+% Currently the only supported drivers are \pdfTeX\ $>=$ 1.30 and lua\TeX\ in PDF mode.
 % \end{abstract}
 %
 % \tableofcontents
@@ -302,6 +302,9 @@ and the derived files
 %      for a list of officially registered types.
 %    \item[\xoption{desc}]
 %      The description for the file.
+%    \item[\xoption{afrelationship}]
+%      This adds the /AFRelationship key to the filespec dicrectory. The value is
+%      a pdf name with or without the leading slash.%
 %    \item[\xoption{stringmethod}]
 %      The package must convert the values of the keys \xoption{ucfilespec}
 %      and \xoption{desc} into a PDF string (before version 2.4: \xoption{filespec}
@@ -620,7 +623,7 @@ You need Acrobat Reader 8 or higher.
 %<*dtxattach>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{dtx-attach}
-  [2019/12/03 v2.9 Embed \string\jobname.dtx (HO)]%
+  [2020-04-14 v2.10 Embed \string\jobname.dtx (HO)]%
 \RequirePackage{embedfile}[2019/12/03]
 \embedfile[%
   stringmethod=escape,%
@@ -711,7 +714,7 @@ You need Acrobat Reader 8 or higher.
   \fi
 \expandafter\x\csname ver@embedfile.sty\endcsname
 \ProvidesPackage{embedfile}%
-  [2019/12/03 v2.9 Embed files into PDF (HO)]%
+  [2020-04-14 v2.10 Embed files into PDF (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Catcodes}
@@ -1376,6 +1379,7 @@ You need Acrobat Reader 8 or higher.
 %    \end{macro}
 %    \begin{macro}{\EmFi@embedfile}
 %    \begin{macrocode}
+\def\EmFi@removeslash#1{\if/#1\else#1\fi}%
 \def\EmFi@embedfile[#1]#2{%
   \ifEmFi@finished
     \EmFi@Error{%
@@ -1412,7 +1416,8 @@ You need Acrobat Reader 8 or higher.
         \ifx\EmFi@afrelationship\ltx@empty
           \let\EmFi@@afrelationship\ltx@empty
         \else
-          \EmFi@convert\EmFi@afrelationship\EmFi@@afrelationship
+          \expandafter\edef\expandafter\EmFi@@afrelationship\expandafter
+            {\expandafter\EmFi@removeslash\EmFi@afrelationship}
         \fi
         \ifEmFi@item
           \let\do\EmFi@do
@@ -1454,7 +1459,7 @@ You need Acrobat Reader 8 or higher.
             \fi
             \ifx\EmFi@@afrelationship\ltx@empty
             \else
-              /AFRelationship\EmFi@@afrelationship%
+              /AFRelationship/\pdf@escapename{\EmFi@@afrelationship}%
             \fi
             /EF<<%
               /F \the\pdflastobj\ltx@space 0 R%
@@ -1947,7 +1952,7 @@ You need Acrobat Reader 8 or higher.
 %   \end{Version}
 %   \begin{Version}{2018/11/01 v2.8}
 %   \item
-%     Remove luatex85 package depenency.
+%     Remove luatex85 package dependency.
 %   \end{Version}
 %   \begin{Version}{2019/12/03 v2.9}
 %    \item
@@ -1957,6 +1962,10 @@ You need Acrobat Reader 8 or higher.
 %    \item
 %      update to use \xpackage{iftex}
 %   \end{Version}
+%   \begin{Version}{2020-04-14 v2.10}
+%   \item Fix issue \#4, the value of afrelationship should not be
+%   converted but name escaped.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/tex/generic/embedfile/embedfile.sty b/Master/texmf-dist/tex/generic/embedfile/embedfile.sty
index 86e58515f18..656cddeec72 100644
--- a/Master/texmf-dist/tex/generic/embedfile/embedfile.sty
+++ b/Master/texmf-dist/tex/generic/embedfile/embedfile.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: embedfile
-%% Version: 2019/12/03 v2.9
+%% Version: 2020-04-14 v2.10
 %% 
 %% Copyright (C)
 %%    2006-2011 Heiko Oberdiek
-%%    2016-2019 Oberdiek Package Support Group
+%%    2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -109,7 +109,7 @@
   \fi
 \expandafter\x\csname ver@embedfile.sty\endcsname
 \ProvidesPackage{embedfile}%
-  [2019/12/03 v2.9 Embed files into PDF (HO)]%
+  [2020-04-14 v2.10 Embed files into PDF (HO)]%
 \begingroup\catcode61\catcode48\catcode32=10\relax%
   \catcode13=5 % ^^M
   \endlinechar=13 %
@@ -513,6 +513,7 @@
 \def\embedfile{%
   \ltx@ifnextchar[\EmFi@embedfile{\EmFi@embedfile[]}%
 }
+\def\EmFi@removeslash#1{\if/#1\else#1\fi}%
 \def\EmFi@embedfile[#1]#2{%
   \ifEmFi@finished
     \EmFi@Error{%
@@ -549,7 +550,8 @@
         \ifx\EmFi@afrelationship\ltx@empty
           \let\EmFi@@afrelationship\ltx@empty
         \else
-          \EmFi@convert\EmFi@afrelationship\EmFi@@afrelationship
+          \expandafter\edef\expandafter\EmFi@@afrelationship\expandafter
+            {\expandafter\EmFi@removeslash\EmFi@afrelationship}
         \fi
         \ifEmFi@item
           \let\do\EmFi@do
@@ -591,7 +593,7 @@
             \fi
             \ifx\EmFi@@afrelationship\ltx@empty
             \else
-              /AFRelationship\EmFi@@afrelationship%
+              /AFRelationship/\pdf@escapename{\EmFi@@afrelationship}%
             \fi
             /EF<<%
               /F \the\pdflastobj\ltx@space 0 R%
diff --git a/Master/texmf-dist/tex/latex/embedfile/dtx-attach.sty b/Master/texmf-dist/tex/latex/embedfile/dtx-attach.sty
index a22b7528edd..d8ea2971917 100644
--- a/Master/texmf-dist/tex/latex/embedfile/dtx-attach.sty
+++ b/Master/texmf-dist/tex/latex/embedfile/dtx-attach.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: embedfile
-%% Version: 2019/12/03 v2.9
+%% Version: 2020-04-14 v2.10
 %% 
 %% Copyright (C)
 %%    2006-2011 Heiko Oberdiek
-%%    2016-2019 Oberdiek Package Support Group
+%%    2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -45,7 +45,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{dtx-attach}
-  [2019/12/03 v2.9 Embed \string\jobname.dtx (HO)]%
+  [2020-04-14 v2.10 Embed \string\jobname.dtx (HO)]%
 \RequirePackage{embedfile}[2019/12/03]
 \embedfile[%
   stringmethod=escape,%