11 files changed, 94 insertions, 62 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
index 77eb6e431dc..1e87a90bc36 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: fmtutil.pl 59143 2021-05-09 02:23:44Z preining $
+# $Id: fmtutil.pl 59207 2021-05-15 13:58:40Z preining $
 # fmtutil - utility to maintain format files.
 # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
 # 
@@ -24,11 +24,11 @@ BEGIN {
   TeX::Update->import();
 }
 
-my $svnid = '$Id: fmtutil.pl 59143 2021-05-09 02:23:44Z preining $';
-my $lastchdate = '$Date: 2021-05-09 04:23:44 +0200 (Sun, 09 May 2021) $';
+my $svnid = '$Id: fmtutil.pl 59207 2021-05-15 13:58:40Z preining $';
+my $lastchdate = '$Date: 2021-05-15 15:58:40 +0200 (Sat, 15 May 2021) $';
 $lastchdate =~ s/^\$Date:\s*//;
 $lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 59143 $';
+my $svnrev = '$Revision: 59207 $';
 $svnrev =~ s/^\$Revision:\s*//;
 $svnrev =~ s/\s*\$$//;
 my $version = "r$svnrev ($lastchdate)";
@@ -616,7 +616,7 @@ sub select_and_rebuild_format {
 sub check_and_warn_on_user_format {
   my ($fmt, $eng) = @_;
   # do nothing if we are updating files in $TEXMFVAR
-  return if ($opts{'fmtdir'} eq $TEXMFVAR);
+  return if ($opts{'fmtdir'} eq "$TEXMFVAR/web2c");
   my $saved_fmtdir = $opts{'fmtdir'};
   $opts{'fmtdir'} = "$TEXMFVAR/web2c";
   my ($kpsefmt, $destdir, $fmtfile, $logfile) = compute_format_destination($fmt, $eng);
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 85267df4a4c..7e0d5995ffb 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 59154 2021-05-09 22:00:07Z karl $
+# $Id: tlmgr.pl 59208 2021-05-15 17:45:58Z karl $
 #
 # Copyright 2008-2021 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
-my $svnrev = '$Revision: 59154 $';
-my $datrev = '$Date: 2021-05-10 00:00:07 +0200 (Mon, 10 May 2021) $';
+my $svnrev = '$Revision: 59208 $';
+my $datrev = '$Date: 2021-05-15 19:45:58 +0200 (Sat, 15 May 2021) $';
 my $tlmgrrevision;
 my $tlmgrversion;
 my $prg;
@@ -5653,17 +5653,20 @@ sub check_runfiles {
     }
     # special case for koma-script where doc/src files are in runfiles section
     if ($tlpn eq "koma-script") {
-      @files = grep {!m;^texmf-dist/source/latex/koma-script/;} @files;
-      @files = grep {!m;^texmf-dist/doc/latex/koma-script/;} @files;
+      @files = grep { !m;^texmf-dist/source/latex/koma-script/; } @files;
+      @files = grep { !m;^texmf-dist/doc/latex/koma-script/; } @files;
     }
     push @runtime_files, @files;
   }
 
-  # build the duplicates list.
+  # build the duplicates list; only one duplicate in list, no matter how
+  # many clashing files there actually are.
   my @duplicates = (""); # just to use $duplicates[-1] freely
   my $prev = "";
-  foreach my $f (sort map { TeXLive::TLUtils::basename($_) } @runtime_files) {
-    push (@duplicates, $f) if (($f eq $prev) and not ($f eq $duplicates[-1]));
+  for my $f (sort map { lc(TeXLive::TLUtils::basename($_)) } @runtime_files) {
+    if ($f eq $prev && !($f eq $duplicates[-1])) {
+      push(@duplicates, $f);
+    }
     $prev = $f;
   }
   shift @duplicates; # get rid of the fake 1st value
@@ -5693,13 +5696,12 @@ sub check_runfiles {
             |.*-noEmbed\.map
             |ps2mfbas\.mf
             |pstricks\.con
-            |readme.*
             |sample\.bib
             |tex4ht\.env
             |test\.mf
             |texutil\.rb
             |tlmgrgui\.pl
-           )$/x;
+           )$/xi;
     # For the a_.* line above: source*pro has .enc files which differ
     # only in comments, hence the otftotfm-hashed name is the same.
     # Seems like it could happen more or at random with other fonts too.
@@ -5714,30 +5716,36 @@ sub check_runfiles {
     # https://tug.org/pipermail/tex-live/2019-December/044530.html
     next if $f
       =~ /^( afoot\.sty
+            |cherokee\.tfm
             |gamma\.mf
             |lexer\.lua
             |ligature\.mf
             |md-utrma\.pfb
             |ot1\.cmap
             |t1\.cmap
-           )$/x;
+            |ut1omlgc\.fd
+           )$/xi;
 
-    my @copies = grep (/\/$f$/, @runtime_files);
+    my @copies = grep (/\/$f$/i, @runtime_files);
     # map files can be duplicated between (but not within) formats.
     if ($f =~ /\.map$/) {
       my $need_check = 0;
       my $prev_dir = "";
       my @cop = @copies; # don't break the outside list
-      map { s#^texmf-dist/fonts/map/(.*?)/.*#$1# } @cop;
-      foreach my $dir (sort @cop ) {
+      map { s!^texmf-dist/fonts/map/(.*?)/.*!$1!; } @cop;
+      foreach my $dir (sort @cop) {
         last if ($need_check = ($dir eq $prev_dir));
         $prev_dir = $dir;
       }
       next unless $need_check;
     }
-    # if all copies are identical, ok, else, complain
+    # if all copies are identical, ok, else complain.
     my $diff = 0;
-    for (my $i = 1; $i < scalar(@copies); $i++) {
+    for (my $i = 1; $i < @copies; $i++) {
+      # there are many duplicates between asymptote/GUI and
+      # asymptote/GUI/pyUIClass; don't omit checks for other .py files.
+      next if $copies[$i] =~ m!asymptote/.*\.py$!;
+      #
       if ($diff = tlcmp("$Master/$copies[$i-1]", "$Master/$copies[$i]")) {
         print "# $f\ndiff $Master/$copies[$i-1] $Master/$copies[$i]\n";
         last;
@@ -10216,7 +10224,7 @@ This script and its documentation were written for the TeX Live
 distribution (L<https://tug.org/texlive>) and both are licensed under the
 GNU General Public License Version 2 or later.
 
-$Id: tlmgr.pl 59154 2021-05-09 22:00:07Z karl $
+$Id: tlmgr.pl 59208 2021-05-15 17:45:58Z karl $
 =cut
 
 # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
diff --git a/Master/texmf-dist/doc/generic/musixtex/README b/Master/texmf-dist/doc/generic/musixtex/README
index 248beeb18bd..da1567d60da 100644
--- a/Master/texmf-dist/doc/generic/musixtex/README
+++ b/Master/texmf-dist/doc/generic/musixtex/README
@@ -1,4 +1,4 @@
-This is MusiXTeX, version 1.31 (2021-01-07).
+This is MusiXTeX, version 1.32a (2021-05-16).
 MusiXTeX is a TeX-based system for typesetting music.
 
 The main author was Daniel Taupin, who died in a climbing
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf b/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf
index 8503c824110..ec5eac06421 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex
index 6cf562a9c3c..dbf57e2eb46 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex
@@ -622,6 +622,6 @@ In this example we see not only multiple uses of \keyindex{nextstaff} and
 
 
  \section{Discontinuities in Long Beams}
-Beams are normally produced by \texttt{musixtex} using special fonts.  Unfortunately, very long beams may have
+By default, \texttt{musixtex} produces beams using special fonts.  Unfortunately, long beams may have
 unsightly discontinuities (gaps or bumps). See Section~\ref{musixvbm}
-for an experimental solution to this problem.
+for a solution to this problem.
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
index 5bf8dd667d8..c31772897eb 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
@@ -2178,38 +2178,52 @@ Available are:
 
  \section{musixvbm}\ixtt{musixvbm.tex}
 \label{musixvbm}
-Beams are normally produced by \texttt{musixtex} using special fonts.  Unfortunately, very long beams may have
-unsightly discontinuities (gaps or bumps). This experimental add-on
-(by Hiroaki \textsc{Morimoto}) produces vectorized beams without these
-discontinuities.  Compare
-\begin{description}
-\item{}
+By default, \texttt{musixtex} produces beams using special fonts.  Unfortunately, long beams may have
+unsightly discontinuities (gaps or bumps). The \texttt{musixvbm}  add-on
+by Hiroaki \textsc{Morimoto} produces smooth vectorized beams.
+Compare
+
+\medskip
 \begin{music}
+\let\extractline\hbox
+\vectorizedbeamfalse
 \nostartrule
 \setclef1{\bass}
+\hbox to \hsize{%
+\hss
 \startextract
 \nnotes\ibbl0G1\qb0{GJKLMLMLMLMLMLMK}\tqb0L\en
-\endextract
-\end{music}
-\end{description}
-and
-\begin{description}
-\item{}
-\begin{music}
-\input musixvbm
-\nostartrule
-\setclef1{\bass}
+\zendextract
+\hss
+\raise20pt\hbox{ and }
+\hss
+\vectorizedbeamtrue
 \startextract
 \nnotes\ibbl0G1\qb0{GJKLMLMLMLMLMLMK}\tqb0L\en
-\endextract
+\zendextract
+\hss}
 \end{music}
-\end{description}
-especially when magnified.
-
-The only known disadvantage is that some \texttt{dvi} viewers
-including \texttt{xdvi} and \texttt{yap} do not support the \texttt{tpic} specials
-that implement the vectorized beams so that no beams are shown; however, Postscript and PDF
-output generated using \texttt{dvips} and \texttt{ps2pdf} (or \texttt{dvipdfm}) should be satisfactory.  
+\medskip
+\noindent
+with various magnifications. The output on the left shows a font-based beam; the one
+on the right (like all the other beams in this report) shows the same beam with
+\texttt{musixvbm} activated.  
+
+
+The only known disadvantage with use of \texttt{musixvbm} is that many \texttt{dvi} viewers
+(including \texttt{xdvi} and \texttt{yap}) do not support the ``\texttt{tpic} specials''
+that implement vectorized beams in \texttt{dvi} output, so that no beams are shown\footnote{%
+The \texttt{dviout} program for Windows supports \texttt{tpic} specials;
+it is available from CTAN and in the Win32 distribution of TeXLive.};
+however, Postscript and PDF
+output generated using \texttt{dvips} and \texttt{ps2pdf} (or using
+\texttt{dvipdfm},
+or by processing the score using \texttt{pdfetex}) should be satisfactory.  
+
+If Postscript hairpins
+as described in Section~\ref{PostscriptSlurs} are not being used,
+the \texttt{musixvbm} add-on also vectorizes crescendos and
+decrescendos. 
 
 \section{tuplet}
 
@@ -2218,9 +2232,7 @@ This file does nothing; it is provided for compatibility with
 Since version 1.21, \verb|musixtex.tex| itself contains all the functions 
 of the older \texttt{tuplet.tex}, namely 
 definitions of 
-\begin{itemize}
-\item \keyindex{tuplettxt}
-\item \keyindex{uptuplet}
-\item \keyindex{downtuplet}
-\end{itemize}
+\keyindex{tuplettxt}, 
+\keyindex{uptuplet} and
+\keyindex{downtuplet}.
 See Section~\ref{tuplet}.
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
index e0d9515830c..3eedf3665ca 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
@@ -1,6 +1,6 @@
 \title{\Huge\bfseries\musixtex\\[\bigskipamount]
 \LARGE\bfseries Using \TeX{} to write polyphonic\\or
-instrumental music\\\Large\itshape Version 1.32}
+instrumental music\\\Large\itshape Version 1.32a}
 \author{}
 
 
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty
index 95b9c5a2915..d06328eb8eb 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty
@@ -47,7 +47,7 @@
 \usepackage{textcomp}
 
 \input musixtex
-%\input musixvbm  % experimental vectorized beams
+\input musixvbm  % experimental vectorized beams
 \input musixbm
 \input musixcho
 \input musixdat
diff --git a/Master/texmf-dist/scripts/musixtex/musixflx.bat b/Master/texmf-dist/scripts/musixtex/musixflx.bat
new file mode 100755
index 00000000000..684441ebb3d
--- /dev/null
+++ b/Master/texmf-dist/scripts/musixtex/musixflx.bat
@@ -0,0 +1,6 @@
+:: wrapper script to call musixflx.lua
+:: Usage: musixflx basename[.mx1 | .tex] [debug mode]
+:: Suggested by Tomasz Luczak (Tomek) t34www@googlemail.com
+
+@for /f "delims=" %%I in ('kpsewhich --format=texmfscripts %~n0.lua') do texlua "%%I" %*
+:end
diff --git a/Master/texmf-dist/scripts/musixtex/musixtex.bat b/Master/texmf-dist/scripts/musixtex/musixtex.bat
new file mode 100755
index 00000000000..249ae595c43
--- /dev/null
+++ b/Master/texmf-dist/scripts/musixtex/musixtex.bat
@@ -0,0 +1,6 @@
+:: wrapper script to call musixtex.lua
+:: Usage: musixtex [options] basename[.tex|.ltx|.mtx|.pmx|.aspc]
+:: Suggested by Tomasz Luczak (Tomek) t34www@googlemail.com
+
+@for /f "delims=" %%I in ('kpsewhich --format=texmfscripts %~n0.lua') do texlua "%%I" %*
+:end
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixvbm.tex b/Master/texmf-dist/tex/generic/musixtex/musixvbm.tex
index 09fa03da422..a22a60e4c91 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixvbm.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixvbm.tex
@@ -1,5 +1,5 @@
 %%
-%% musixvbm.tex - MusiXTeX Extention, Vectorized Beams (& crescendos)
+%% musixvbm.tex - MusiXTeX Extension, Vectorized Beams (& crescendos)
 %%                by tpic specials / pdfTeX raw literal
 %%
 %% Copyright (C) 2000-2007 Hiroaki MORIMOTO (Kuuku)
@@ -31,7 +31,7 @@
 %% This is a successor of `musixtpb.tex' ver.1.10.
 %%
 \ifx\ifvectorizedbeam\undefined\else\endinput\fi
-\immediate\write16{MusiXTeX Extention, Vectorized Beams and crescendos v1.20-beta6 <2007/01/01>}%
+\immediate\write16{MusiXTeX Extension, Vectorized Beams and crescendos v1.20-beta6 <2007/01/01>}%
 %
 \edef\catcodeat{\the\catcode`\@}\catcode`\@=11
 %
@@ -87,13 +87,13 @@
   \advance\y@iv \tw@\b@amthick
   \@dimentomil{-\y@iv}{\@Yend@u}%
 %  \special{pn 1}% 
-  \special{sh 1}%
-  \@addbeampath{0}{\@Ystart@l}%
+  \special{sh 1}%                     set beam shading to black
+  \@addbeampath{0}{\@Ystart@l}%       add points to define the beam perimeter
   \@addbeampath{\@Xend}{\@Yend@l}%
   \@addbeampath{\@Xend}{\@Yend@u}%
   \@addbeampath{0}{\@Ystart@u}%
-  \@addbeampath{0}{\@Ystart@l}%
-  \special{ip}%
+  \@addbeampath{0}{\@Ystart@l}%       close the perimeter
+  \special{ip}%                       draw the beam (without the outline) 
   \kern\y@ii
 }%
 %