From bdb7ac9c2d3d7ef690d7499162aa15f0b8e51d21 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 16 Nov 2017 22:15:04 +0000 Subject: musixtex (16nov17) git-svn-id: svn://tug.org/texlive/trunk@45833 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 12 ++++---- .../doc/generic/musixtex/ChangeLog-126.txt | 5 ++++ Master/texmf-dist/doc/generic/musixtex/README | 2 +- .../texmf-dist/doc/generic/musixtex/musixdoc.pdf | Bin 1301392 -> 1301725 bytes .../doc/generic/musixtex/musixdoc/frontmatter.tex | 4 +-- .../generic/musixtex/musixdoc/miscellaneous.tex | 4 +-- .../doc/generic/musixtex/musixdoc/musixtex.log | 32 --------------------- .../doc/generic/musixtex/musixdoc/preparing.tex | 4 ++- .../texmf-dist/tex/generic/musixtex/musixtex.tex | 31 +++++++++++--------- 9 files changed, 37 insertions(+), 57 deletions(-) create mode 100644 Master/texmf-dist/doc/generic/musixtex/ChangeLog-126.txt delete mode 100644 Master/texmf-dist/doc/generic/musixtex/musixdoc/musixtex.log diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index e20b80d9a94..ccbf7a22a42 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 45806 2017-11-14 21:16:47Z karl $ +# $Id: tlmgr.pl 45815 2017-11-15 03:45:40Z preining $ # # Copyright 2008-2017 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # -my $svnrev = '$Revision: 45806 $'; -my $datrev = '$Date: 2017-11-14 22:16:47 +0100 (Tue, 14 Nov 2017) $'; +my $svnrev = '$Revision: 45815 $'; +my $datrev = '$Date: 2017-11-15 04:45:40 +0100 (Wed, 15 Nov 2017) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -1500,7 +1500,7 @@ sub action_info { @whattolist = $tlm->list_packages; } # add also the local packages - TeXLive::TLUtils::push_uniq(@whattolist, $localtlpdb->list_packages); + TeXLive::TLUtils::push_uniq(\@whattolist, $localtlpdb->list_packages); } else { @whattolist = ($what, @todo); } @@ -6731,7 +6731,7 @@ END_NO_INTERNET } if (!$local_copy_tlpdb_used) { $remotetlpdb = TeXLive::TLPDB->new(root => $location, verify => 1); - if ($is_main) { + if ($is_main && $remotetlpdb) { if ($remotetlpdb->verification_status == $VS_UNSIGNED) { # we don't allow unsigned main data bases! tldie("$prg: main database at $location is not signed\n"); @@ -9259,7 +9259,7 @@ This script and its documentation were written for the TeX Live distribution (L) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 45806 2017-11-14 21:16:47Z karl $ +$Id: tlmgr.pl 45815 2017-11-15 03:45:40Z preining $ =cut # to remake HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html diff --git a/Master/texmf-dist/doc/generic/musixtex/ChangeLog-126.txt b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-126.txt new file mode 100644 index 00000000000..1c162068824 --- /dev/null +++ b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-126.txt @@ -0,0 +1,5 @@ + +Changes from MusiXTeX 125 to 126: + +* Corrected minor bugs in the implementation of + \setinterstaff that were causing Overfull hboxes. diff --git a/Master/texmf-dist/doc/generic/musixtex/README b/Master/texmf-dist/doc/generic/musixtex/README index daa19eb3bdc..a772fbe7c86 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.25 (2017-07-25). +This is MusiXTeX, version 1.26 (2017-11-15). 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 158bf8b468a..fe7cb5178f0 100644 Binary files a/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf and b/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf differ diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex index 3cc4609c7d4..9c1e58a964c 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.25} +instrumental music\\\Large\itshape Version 1.26} %\author{\Large\rm Daniel \sc Taupin\\\large\sl @@ -67,7 +67,7 @@ Since then, the only significant update to \musixtex\ has been in version 1.15 ( takes advantage of the greater capacity of the e\TeX\ version of \TeX. This manual is the definitive reference to all features of -\musixtex\ version~1.25. +\musixtex\ version~1.26. Novice users need not start here. Most diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex index a6506ef27b4..9a909c34389 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex @@ -72,9 +72,9 @@ solid vertical wedge below a note head at pitch $p$, ``dunce cap'' above a note head at pitch $p$, \item \keyindex{lsfz}\pitchp~(lower \ital{forzato}) to put an inverted ``dunce cap'' below a note head at pitch $p$, - \item \keyindex{upzst}\pitchp~(upper \itxem{staccato/tenuto}) to put a + \item \keyindex{upzst}\pitchp~(upper \itxem{mezzo-staccato/portato}) to put a dot and a hyphen above a note head at pitch $p$, - \item \keyindex{lpzst}\pitchp~(lower \ital{staccato/tenuto}) to put a + \item \keyindex{lpzst}\pitchp~(lower \ital{mezzo-staccato/portato}) to put a dot and a hyphen below a note head at pitch $p$, \item \keyindex{flageolett}\pitchp~to put a small circle above a note head at pitch $p$. diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixtex.log b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixtex.log deleted file mode 100644 index 6fdcab6d463..00000000000 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixtex.log +++ /dev/null @@ -1,32 +0,0 @@ -This is musixtex.lua version 0.18. -Processing musixdoc.tex - latex musixdoc.tex - musixflx musixdoc - latex musixdoc.tex - makeindex -q musixdoc - latex musixdoc.tex - latex musixdoc.tex -! LaTeX Warning: No \author given. -! LaTeX Font Warning: Font shape `OMS/cmtt/m/n' undefined -! LaTeX Font Warning: Some font shapes were not available, defaults substituted. - dvips -e0 musixdoc - ps2pdf musixdoc.ps -musixdoc.pdf generated by ps2pdf. - removing musixdoc.mx1 - removing musixdoc.mx2 - removing musixdoc.dvi - removing musixdoc.ps - removing musixdoc.idx - removing musixdoc.log - removing musixdoc.ilg ---- TeX files actually included according to musixdoc.log --- -./musixtex.tex - MusiXTeX(c) 1.24 <2017-02-28> -/usr/local/texlive/2017/texmf-dist/tex/latex/musixtex/musixltx.tex - MusiXLaTeX T.61 <25 September 1996> -/usr/local/texlive/2017/texmf-dist/tex/generic/musixtex/musixlyr.tex - MusiXLYRics 2.1c -/usr/local/texlive/2017/texmf-dist/tex/generic/musixtex/musixlyr.tex - MusiXLYRics 2.1c -/usr/local/texlive/2017/texmf-dist/tex/generic/musixtex/musixlyr.tex - MusiXLYRics 2.1c diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex index 3fe44808de3..87bc2fe59b3 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex @@ -273,7 +273,9 @@ the spacing in single-instrument parts extracted from a multi-instrument score; see Section~\ref{musixtnt}. The \texttt{autosp} package is available in -\href{https://www.tug.org/texlive/}{\underline{TeXLive}} and +\href{https://www.tug.org/texlive/}{\underline{TeXLive}} +and +\href{http://miktex.org/}{\underline{MiKTeX}}, and can also be found at the \href{http://icking-music-archive.org/software/autosp/autosp.zip} {\underline{Werner Icking Music Archive}} diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex index 3b081c3c90b..46685f9c1a4 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex @@ -25,15 +25,20 @@ \def\mufl@x{0.83}% \def\mxmajorvernumber{1} -\def\mxminorvernumber{25} +\def\mxminorvernumber{26} \def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum \def\mxversuffix{}% \edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix} -\def\mxdate{2017-07-25} +\def\mxdate{2017-11-15} \immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}% \everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}% +% version 1.26 + +% deleted spurious definition in \resetlayout and +% spurious space in definition of \interfacteur... + % version 1.25 % included a "dummy" tuplet.tex in the distribution @@ -358,7 +363,7 @@ \advance\count@ by\@ne % \expandafter \let \csname interinstrument\roman@c@\endcsname \interinstrument - \expandafter\def\csname interfacteur\roman@c@\endcsname{\interfacteur} % RDT 1.24 + \expandafter\def\csname interfacteur\roman@c@\endcsname{\interfacteur}% RDT 1.26 % % altitude \expandafter \noexpand@newskip \csname k@i\roman@c@\endcsname @@ -1810,7 +1815,7 @@ \edef\nblines{\csname n@l\romannumeral\noinstrum@nt\endcsname}% \edef\internote{\csname i@n\romannumeral\noinstrum@nt\endcsname}% \edef\int@rf{\csname interfacteur\romannumeral\noinstrum@nt\endcsname}% RDT 1.24 - \interportee\int@rf\internote \interportee\tw@\interportee} % RDT 1.24 + \interportee\int@rf\internote \interportee\tw@\interportee}% RDT 1.26 \def\C@Inter{% RDT: corrected to work if \nblines > 6 (version 1.23) \stem@skip\interportee @@ -1919,10 +1924,10 @@ % \let\interinstrumenti\interinstrument \def\setinterinstrument#1#2{\n@v#1\relax % select instrument - \expandafter\def\csname interinstrument\romannumeral\n@v\endcsname{#2}} + \expandafter\def\csname interinstrument\romannumeral\n@v\endcsname{#2}}% -\def\setinterstaff#1#2{\n@v#1\relax % select instrument % RDT 1.24 - \expandafter\def\csname interfacteur\romannumeral\n@v\endcsname{#2}} +\def\setinterstaff#1#2{\n@v#1\relax % select instrument RDT 1.24 + \expandafter\def\csname interfacteur\romannumeral\n@v\endcsname{#2}}% %%% portees @@ -2084,7 +2089,7 @@ \noexpand\startpiece }% \fi \barsinpi@c@\z@ \piece@begina \leavevmode \piece@beginb - \piece@beginc \fil@begin \Writ@meters\lastbarpos\lin@pos %%% 1.21: added \lastbarno setting + \piece@beginc \fil@begin \Writ@meters\lastbarpos\lin@pos %%% 1.21: added \lastbarpos setting \let\volta@set\empty % tells the kind of volta setting at next bar \let\volta@cut\empty % flag to tell that a volta has been cut at line end \let\volta@type\empty % the current volta setting (same defs as \volta@set) @@ -2102,8 +2107,8 @@ \def\piece@conta{\catcodesmusic \atnextline \let\atnextline\empty \comp@internote \leavevmode \barsinlin@\z@ } -\def\contpiece{\noindent \piece@conta \writ@staffs \piece@beginc - \Writ@meters \wbarno@x\lastbarpos\lin@pos\addspace\afterruleskip %%% 1.21: added \lastbarno setting +\def\contpiece{\noindent \piece@conta \writ@staffs \piece@beginc + \Writ@meters\wbarno@x\lastbarpos\lin@pos\addspace\afterruleskip %%% 1.21: added \lastbarpos setting } % like contpiece but with indentation (parindent) and instrument names @@ -2111,7 +2116,7 @@ \let\fil@indent\empty \def\Contpiece{\piece@conta \piece@beginb \fil@indent \piece@beginc - \Writ@meters\lastbarpos\lin@pos} %%% 1.21: added \lastbarno setting + \Writ@meters\lastbarpos\lin@pos} %%% 1.21: added \lastbarpos setting %%% end score @@ -2190,7 +2195,7 @@ \let\fil@termskip\empty \let\fil@signs\empty \let\fil@barno\empty \let\leftrepeat\leftrepeat@II \let\leftrightrepeat\leftrightrepeat@II \piece@beginc\Writ@meters\lastbarpos\lin@pos\let\pdl@cut\empty\addspace\afterruleskip} - %%% 1.21: added \lastbarno and \pdl@cut settings + %%% 1.21: added \lastbarpos and \pdl@cut settings % enable left and right extracts (e.g. for footnotes) @@ -5003,7 +5008,7 @@ \count@\z@ \loop \advance\count@ by\@ne \expandafter \let\csname n@l\roman@c@\endcsname \fiv@ - \expandafter\def\csname interfacteur\roman@c@\endcsname{\interfacteur} % RDT 1.24 +% \expandafter\def\csname interfacteur\roman@c@\endcsname{\interfacteur} % RDT deleted 1.26 \ifnum\count@<\maxinstruments\repeat \resetclefsymbols} -- cgit v1.2.3