dashundergaps (5mar21) (branch)

git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58153 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 27 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/dashundergaps/README.md b/Master/texmf-dist/doc/latex/dashundergaps/README.md
index aa95e95f5a1..636df7db530 100644
--- a/Master/texmf-dist/doc/latex/dashundergaps/README.md
+++ b/Master/texmf-dist/doc/latex/dashundergaps/README.md
@@ -16,7 +16,7 @@ The license is LPPL 1.3c.
 
 -----
 
-Copyright (C) 2018-2020 Frank Mittelbach<br />
+Copyright (C) 2018-2021 Frank Mittelbach<br />
 <https://latex-project.org/> <br />
 All rights reserved.
 
diff --git a/Master/texmf-dist/doc/latex/dashundergaps/changes.txt b/Master/texmf-dist/doc/latex/dashundergaps/changes.txt
index 46239c6a30f..89d9a0545b1 100644
--- a/Master/texmf-dist/doc/latex/dashundergaps/changes.txt
+++ b/Master/texmf-dist/doc/latex/dashundergaps/changes.txt
@@ -1,3 +1,7 @@
+2021-03-05  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* dashundergaps.dtx: xparse now part of the LaTeX kernel
+
 2020-02-11  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
 
 	* dashundergaps.dtx: Expand argument up front to work around
diff --git a/Master/texmf-dist/doc/latex/dashundergaps/dashundergaps-code.pdf b/Master/texmf-dist/doc/latex/dashundergaps/dashundergaps-code.pdf
index 3e16abdcf3c..16038487d97 100644
--- a/Master/texmf-dist/doc/latex/dashundergaps/dashundergaps-code.pdf
+++ b/Master/texmf-dist/doc/latex/dashundergaps/dashundergaps-code.pdf
diff --git a/Master/texmf-dist/doc/latex/dashundergaps/dashundergaps-doc.pdf b/Master/texmf-dist/doc/latex/dashundergaps/dashundergaps-doc.pdf
index 798c0496f9d..b69dd0d1e02 100644
--- a/Master/texmf-dist/doc/latex/dashundergaps/dashundergaps-doc.pdf
+++ b/Master/texmf-dist/doc/latex/dashundergaps/dashundergaps-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/dashundergaps/l3doc-TUB.cls b/Master/texmf-dist/doc/latex/dashundergaps/l3doc-TUB.cls
index e3f9138d731..50a8a9a9d90 100644
--- a/Master/texmf-dist/doc/latex/dashundergaps/l3doc-TUB.cls
+++ b/Master/texmf-dist/doc/latex/dashundergaps/l3doc-TUB.cls
@@ -20,20 +20,20 @@
 %%
 %% This is really a temporary file intended for a single article
 %% written for TugBoat It is a copy of l3doc.cls with a couple of
-%% changes, nothing more Eventually this will get replaced by a real
+%% changes, nothing more. Eventually this will get replaced by a real
 %% class once l3doc.cls gets properly split into a class part and a
 %% support part.
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% If you use this for anything other than processing the documents it
-%% was meant for (which so far is 1) you are on your own :-)
+%% was meant for (which so far is 2) you are on your own :-)
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \RequirePackage{expl3,xparse,calc}
-\ProvidesExplClass{l3doc-TUB}{2018/02/21}{}
-  {L3 Experimental documentation class (special version for TUGboat)}
+\ProvidesExplClass{l3doc-TUB}{2021/03/02}{}
+  {L3 Experimental documentation class (special version for TUGboat with fixes)}
 \clist_new:N \g_docinput_clist
 \seq_new:N \g_doc_functions_seq
 \seq_new:N \g_doc_macros_seq
@@ -1091,7 +1091,7 @@
     \dim_set:Nn \l__codedoc_trial_width_dim
       { \box_wd:N \l__codedoc_functions_coffin }
     \bool_set:Nn \l__codedoc_long_name_bool
-      { \dim_compare_p:nNn \l__codedoc_trial_width_dim > \marginparwidth }
+      { \dim_compare_p:nNn \l__codedoc_trial_width_dim > {\marginparwidth + 1cm} }  % FMi crude fix
   }
 \cs_new_protected:Npn \__codedoc_function_descr_start:w
   {
@@ -1400,10 +1400,10 @@
       {
         \llap
           {
-            \hbox_unpack_clear:N \l__codedoc_macro_index_box
+            \hbox_unpack_drop:N \l__codedoc_macro_index_box
             \vtop to \baselineskip
               {
-                \vbox_unpack_clear:N \l__codedoc_macro_box
+                \vbox_unpack_drop:N \l__codedoc_macro_box
                 \vss
               }
           }
@@ -1443,7 +1443,7 @@
         \__codedoc_if_macro_internal:nF {#1}
           { \seq_gput_right:Nn \g_doc_macros_seq {#1} }
         \hbox_set:Nw \l__codedoc_macro_index_box
-          \hbox_unpack_clear:N \l__codedoc_macro_index_box
+          \hbox_unpack_drop:N \l__codedoc_macro_index_box
           \int_gincr:N \c@CodelineNo
           \__codedoc_special_index:nn {#1} { main }
           \int_gdecr:N \c@CodelineNo
@@ -1455,7 +1455,7 @@
   {
     \vbox_set:Nn \l__codedoc_macro_box
       {
-        \vbox_unpack_clear:N \l__codedoc_macro_box
+        \vbox_unpack_drop:N \l__codedoc_macro_box
         \hbox { \llap { \__codedoc_print_macroname:nN {#1} #2 \ } }
       }
     \int_incr:N \l__codedoc_macro_int
diff --git a/Master/texmf-dist/source/latex/dashundergaps/dashundergaps.dtx b/Master/texmf-dist/source/latex/dashundergaps/dashundergaps.dtx
index 5b1f91a45e2..26ee414b726 100644
--- a/Master/texmf-dist/source/latex/dashundergaps/dashundergaps.dtx
+++ b/Master/texmf-dist/source/latex/dashundergaps/dashundergaps.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: dashundergaps.dtx (C) Copyright 2018-2020 Frank Mittelbach
+%% File: dashundergaps.dtx (C) Copyright 2018-2021 Frank Mittelbach
 %
 % It may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -17,8 +17,8 @@
 % for those people who are interested or want to report an issue.
 %
 
-\def\dashundergapsdate   {2020-02-11}    % don't forget to also adjust build.lua!
-\def\dashundergapsversion{v2.0g}
+\def\dashundergapsdate   {2021-03-05}    % don't forget to also adjust build.lua!
+\def\dashundergapsversion{v2.0h}
 
 %<*driver>
 \let\fmipagebreak\pagebreak
@@ -638,9 +638,10 @@
 % We need the package \pkg{xparse} for specifying the document-level
 %    interface commands and \pkg{l3keys2e} to use the \pkg{expl3} key
 %    value  methods within \LaTeXe{}. These packages automatically
-%    require \pkg{expl3} so there is no need to load that explicitly.
+%    require \pkg{expl3} so there is no need to load that explicitly
+%    and nowadays the core of \pkg{xparse} is part of the \LaTeX{} kernel.
 %    \begin{macrocode}
-\RequirePackage{xparse,l3keys2e}
+\RequirePackage{l3keys2e}
 %    \end{macrocode}
 %
 %    As the code uses some functions from \pkg{expl3} that got
diff --git a/Master/texmf-dist/source/latex/dashundergaps/dashundergaps.ins b/Master/texmf-dist/source/latex/dashundergaps/dashundergaps.ins
index 935cdce4886..bca8837b422 100644
--- a/Master/texmf-dist/source/latex/dashundergaps/dashundergaps.ins
+++ b/Master/texmf-dist/source/latex/dashundergaps/dashundergaps.ins
@@ -3,7 +3,7 @@
 %% driver files from the dtx file(s) in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 2018-2020 Frank Mittelbach
+%% Copyright 2018-2021 Frank Mittelbach
 %% 
 %% 
 %% This file is part of the dashundergaps Bundle for LaTeX.
@@ -35,7 +35,7 @@
 
 This is a generated file.
 
-Copyright 2018-2020 Frank Mittelbach
+Copyright 2018-2021 Frank Mittelbach
 
 This file was generated from file(s) of the LaTeX `dashundergaps Bundle'.
 --------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/dashundergaps/dashundergaps.sty b/Master/texmf-dist/tex/latex/dashundergaps/dashundergaps.sty
index 29b36d13414..61587cc0d96 100644
--- a/Master/texmf-dist/tex/latex/dashundergaps/dashundergaps.sty
+++ b/Master/texmf-dist/tex/latex/dashundergaps/dashundergaps.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 2018-2020 Frank Mittelbach
+%% Copyright 2018-2021 Frank Mittelbach
 %% 
 %% This file was generated from file(s) of the LaTeX `dashundergaps Bundle'.
 %% --------------------------------------------------------------------------
@@ -32,10 +32,10 @@
 %% where one can also log issues in case there are any.
 %% 
 %% 
-%% File: dashundergaps.dtx (C) Copyright 2018-2020 Frank Mittelbach
+%% File: dashundergaps.dtx (C) Copyright 2018-2021 Frank Mittelbach
 
-\def\dashundergapsdate   {2020-02-11}    % don't forget to also adjust build.lua!
-\def\dashundergapsversion{v2.0g}
+\def\dashundergapsdate   {2021-03-05}    % don't forget to also adjust build.lua!
+\def\dashundergapsversion{v2.0h}
 
 \RequirePackage[normalem]{ulem}
 \protected\def\dotuline{\leavevmode\bgroup
@@ -61,7 +61,7 @@
   \fmdug@box\UL@box  \fi}
 \let\fmdug@box\box
 
-\RequirePackage{xparse,l3keys2e}
+\RequirePackage{l3keys2e}
 \@ifpackagelater{expl3}{2018-06-24}
   {}
   {%