askinclude (13apr20)

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

5 files changed, 56 insertions, 93 deletions

diff --git a/Master/texmf-dist/doc/latex/askinclude/askinclude.bib b/Master/texmf-dist/doc/latex/askinclude/askinclude.bib
new file mode 100644
index 00000000000..90010503462
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/askinclude/askinclude.bib
@@ -0,0 +1,32 @@
+@online{texlive,
+  author={Fairbairns, Robin},
+  title={[tex-live] licence on includeonly.sty},
+  date={2007-10-13},
+  url={https://www.tug.org/pipermail/tex-live/2007-October/014928.html},
+  urldate={2011-12-02},
+}
+@online{newsthread,
+  author={Vo{\ss}, Herbert},
+  title={askinclude.sty},
+  note={Thread in newsgroup {\xnewsgroup{comp.text.tex}};
+      Message-ID: {\texttt{fev72m\$b35\$02\$2@news.t-online.com}}},
+  date={2007-10-15},
+  url={https://groups.google.com/group/comp.text.tex/browse_thread/thread/728a3e73c04c6789/349e31865c40d00c},
+  urldate={2011-12-02},
+}
+@manual{makematch,
+  author={Kastrup, David},
+  title={makematch.sty: Pattern matching with wildcards},
+  date={2007-02-23},
+  version={1.7925},
+  url={https://ctan.org/pkg/qstest},
+  urldate={2011-12-02},
+}
+@manual{excludeonly,
+  author={Luecking, Daniel H. and Arseneau, Donald},
+  title={The excludeonly package},
+  date={2003-03-14},
+  url={https://ctan.org/pkg/excludeonly},
+  urldate={2011-12-02},
+}
+
diff --git a/Master/texmf-dist/doc/latex/askinclude/askinclude.pdf b/Master/texmf-dist/doc/latex/askinclude/askinclude.pdf
index fde6ef5e719..747acb995dc 100644
--- a/Master/texmf-dist/doc/latex/askinclude/askinclude.pdf
+++ b/Master/texmf-dist/doc/latex/askinclude/askinclude.pdf
diff --git a/Master/texmf-dist/source/latex/askinclude/askinclude.dtx b/Master/texmf-dist/source/latex/askinclude/askinclude.dtx
index ace5aba3e80..4044aa81280 100644
--- a/Master/texmf-dist/source/latex/askinclude/askinclude.dtx
+++ b/Master/texmf-dist/source/latex/askinclude/askinclude.dtx
@@ -1,13 +1,13 @@
 % \iffalse meta-comment
 %
 % File: askinclude.dtx
-% Version: 2019-12-10 v2.6
+% Version: 2020-04-12 v2.7
 % Info: Interactive asking of included files
 %
 % Copyright (C)
 %    1991-1994  Pablo A. Straub
 %    2007, 2008, 2011 Heiko Oberdiek
-%    2016-2019 Oberdiek Package Support Group
+%    2016-2020 Oberdiek Package Support Group
 %    https://github.com/ho-tex/askinclude/issues
 %
 % This work may be distributed and/or modified under the
@@ -81,7 +81,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: askinclude 2019-12-10 v2.6 Interactive asking of included files}
+\Msg{* Package: askinclude 2020-04-12 v2.7 Interactive asking of included files}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -93,12 +93,12 @@
 This is a generated file.
 
 Project: askinclude
-Version: 2019-12-10 v2.6
+Version: 2020-04-12 v2.7
 
 Copyright (C)
    1991-1994 Pablo A. Straub
    2007, 2008, 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
@@ -193,7 +193,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{askinclude.drv}%
-  [2019-12-10 v2.6 Interactive asking of included files]%
+  [2020-04-12 v2.7 Interactive asking of included files]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
 \usepackage{iftex}
@@ -221,12 +221,12 @@ and the derived files
 % \GetFileInfo{askinclude.drv}
 %
 % \title{The \xpackage{askinclude} package}
-% \date{2019-12-10 v2.6}
+% \date{2020-04-12 v2.7}
 % \author{
 %   Pablo A. Straub\\[1ex]
 %    Heiko Oberdiek\thanks
 % {Please report any issues at \url{https://github.com/ho-tex/askinclude/issues}}}
-% 
+%
 %
 % \maketitle
 %
@@ -608,7 +608,7 @@ and the derived files
 \TMP@EnsureCode{96}{12}% `
 \edef\AskInc@AtEnd{\AskInc@AtEnd\noexpand\endinput}
 \ProvidesPackage{askinclude}%
-  [2019-12-10 v2.6 Interactive asking of included files]%
+  [2020-04-12 v2.7 Interactive asking of included files]%
 %    \end{macrocode}
 %
 % Luatex compat
@@ -1266,9 +1266,9 @@ and the derived files
     \AskInc@DoMatch{##1}{%
       \AskInc@WriteAddMatch{##1}%
       \ifx\@partlist\@empty
-        \gdef\@partlist{##1}%
+        \expandafter\gdef\expandafter\@partlist\expandafter{\detokenize{##1}}%
       \else
-        \g@addto@macro\@partlist{,##1}%
+        \expandafter\g@addto@macro\expandafter\@partlist\expandafter{\expandafter,\detokenize{##1}}%
       \fi
     }%
   }%
@@ -1498,9 +1498,9 @@ and the derived files
   \AskInc@AskQuestion
   \ifx\AskInc@AskResult\AskInc@CharYes
     \ifx\AskInc@Answer\@empty
-      \gdef\AskInc@Answer{#1}%
+     \expandafter\gdef\expandafter\AskInc@Answer\expandafter{\detokenize{#1}}%
     \else
-      \g@addto@macro\AskInc@Answer{,#1}%
+     \expandafter\g@addto@macro\expandafter\AskInc@Answer\expandafter{\expandafter,\detokenize{#1}}%
     \fi
     \AskInc@SaveAnswer
     \let\@partlist\AskInc@Answer
@@ -1820,78 +1820,8 @@ and the derived files
 %   \begin{Version}{2019-12-10 v2.6}
 %   \item Updated
 %   \end{Version}
-% \end{History}
-%
-% \PrintIndex
-%
-% \Finale
-\endinput
-%   \begin{Version}{1991/11/05 v0.95}
-%   \item
-%     First beta-test version (asked two questions).
-%   \end{Version}
-%   \begin{Version}{1991/11/05 v0.99}
-%   \item
-%     Second beta-test version (asks one question; uses `|*|' and `|-|').
-%   \end{Version}
-%   \begin{Version}{1991/11/07 v1.0}
-%   \item
-%     Changed prompts (sent to \xnewsgroup{comp.text.tex}):
-%     \URL{``\link{Interactive inclusion of files in LaTeX}''}^^A
-%     {https://groups.google.com/group/comp.text.tex/msg/34b770a7c277e79c}
-%   \end{Version}
-%   \begin{Version}{1991/12/13 v1.1}
-%   \item
-%     \textit{Unknown}.
-%   \end{Version}
-%   \begin{Version}{1994/11/02 v1.2e}
-%   \item
-%     Two small changes to run under LaTeX2e [RF].
-%   \item
-%     Additional documentation [TRS].
-%   \end{Version}
-%   \begin{Version}{2007/10/15 v1.0 (askinc)}
-%   \item
-%     Reimplementation, published as \xpackage{askinc} in
-%     newsgroup \xnewsgroup{comp.text.tex}:\\
-%     \URL{``\link{Re: askinclude.sty}''}^^A
-%     {https://groups.google.com/group/comp.text.tex/msg/2d638b84a858fdc8}
-%   \item
-%     Listing of included files, collected from the previous run before
-%     the question.
-%   \item
-%     No error message by \xfile{.aux} file if package is removed.
-%   \end{Version}
-%   \begin{Version}{2007/10/23 v2.0}
-%   \item
-%     The next version of \xpackage{askinc} becomes
-%     version 2.0 of \xpackage{askinclude}.
-%   \item
-%     `|?|' added for questioning each file.
-%   \item
-%     \cs{includeonly} has precedence until package loading.
-%     Then it is disabled by a warning.
-%   \item
-%     Documentation rewritten/added.
-%   \item
-%     Tests added.
-%   \end{Version}
-%   \begin{Version}{2008/08/11 v2.1}
-%   \item
-%     Code is not changed.
-%   \item
-%     URLs updated.
-%   \end{Version}
-%   \begin{Version}{2011/12/02 v2.2}
-%   \item
-%     Bibliography rewritten for biblatex.
-%   \end{Version}
-%   \begin{Version}{2016/05/14 v2.3}
-%   \item
-%    Luatex compatibility
-%   \end{Version}
-%   \begin{Version}{2019-12-10 v2.6}
-%   \item Updated
+%   \begin{Version}{2020-04-12 v2.7}
+%   \item Fixed issue \#1, wrong catcode in filename match after kernel change.
 %   \end{Version}
 % \end{History}
 %
diff --git a/Master/texmf-dist/tex/latex/askinclude/askinclude.sty b/Master/texmf-dist/tex/latex/askinclude/askinclude.sty
index f558085fc88..6e27f30c174 100644
--- a/Master/texmf-dist/tex/latex/askinclude/askinclude.sty
+++ b/Master/texmf-dist/tex/latex/askinclude/askinclude.sty
@@ -9,12 +9,12 @@
 %% This is a generated file.
 %% 
 %% Project: askinclude
-%% Version: 2019-12-10 v2.6
+%% Version: 2020-04-12 v2.7
 %% 
 %% Copyright (C)
 %%    1991-1994 Pablo A. Straub
 %%    2007, 2008, 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
@@ -32,7 +32,6 @@
 %% Heiko Oberdiek and the Oberdiek Package Support Group
 %% https://github.com/ho-tex/askinclude/issues
 %% 
-%% 
 %% This work consists of the main source file askinclude.dtx
 %% and the derived files
 %%    askinclude.sty, askinclude.pdf, askinclude.ins, askinclude.drv,
@@ -88,7 +87,7 @@
 \TMP@EnsureCode{96}{12}% `
 \edef\AskInc@AtEnd{\AskInc@AtEnd\noexpand\endinput}
 \ProvidesPackage{askinclude}%
-  [2019-12-10 v2.6 Interactive asking of included files]%
+  [2020-04-12 v2.7 Interactive asking of included files]%
 \ifx\pdfextension\@undefined\else
     \protected\def\pdflastobj {\numexpr\pdffeedback lastobj\relax}
     \protected\def\pdfnames   {\pdfextension names }
@@ -477,9 +476,9 @@
     \AskInc@DoMatch{##1}{%
       \AskInc@WriteAddMatch{##1}%
       \ifx\@partlist\@empty
-        \gdef\@partlist{##1}%
+        \expandafter\gdef\expandafter\@partlist\expandafter{\detokenize{##1}}%
       \else
-        \g@addto@macro\@partlist{,##1}%
+        \expandafter\g@addto@macro\expandafter\@partlist\expandafter{\expandafter,\detokenize{##1}}%
       \fi
     }%
   }%
@@ -624,9 +623,9 @@
   \AskInc@AskQuestion
   \ifx\AskInc@AskResult\AskInc@CharYes
     \ifx\AskInc@Answer\@empty
-      \gdef\AskInc@Answer{#1}%
+     \expandafter\gdef\expandafter\AskInc@Answer\expandafter{\detokenize{#1}}%
     \else
-      \g@addto@macro\AskInc@Answer{,#1}%
+     \expandafter\g@addto@macro\expandafter\AskInc@Answer\expandafter{\expandafter,\detokenize{#1}}%
     \fi
     \AskInc@SaveAnswer
     \let\@partlist\AskInc@Answer
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 891b435300e..9032cbd24aa 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2712,6 +2712,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
  'apa7'		=> 'etex',
  'archaeologie' => 'pdftex', # else doc is generated
  'asciilist'	=> 'latex',  # requires interaction
+ 'askinclude'	=> 'tex',    # else doc is generated
  'babel'	=> 'etex',
  'babel-belarusian'	=> 'tex -8bit', # do not make doc, no ^^
  'babel-greek'		=> 'latex', # requires interaction
@@ -3321,6 +3322,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
  'accfonts'     => $standardclean . '|dvips.enc',       # dup enc
  'acmconf'      => $standardclean . '|flushend.sty',    # dup with sttools
  'apalike'      => "apalike2.bst",                      # does not belong
+ 'askinclude'	=> $standardclean . '|askinclude\.(drv|ins)', # made from dtx
  'axodraw2'     => 'axohelp.exe',			# done with binaries
  'bardiag'      => "example/.*(aux|log)",               # junk on CTAN
  'bibleref'	=> $standardclean . '|sample.tex|sample-.*', # derived uploaded