musixtex (24jul21)

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

11 files changed, 216 insertions, 44 deletions

diff --git a/Master/texmf-dist/doc/generic/musixtex/ChangeLog-134.txt b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-134.txt
new file mode 100644
index 00000000000..fb19280be0a
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-134.txt
@@ -0,0 +1,9 @@
+
+Changes from MusiXTeX 133 to 134:
+
+  *  new extension library musixftab.tex to support traditional French
+       tablature using script letters instead of numerals
+
+  *  \tabfnt ... commands re-defined to allow re-definition in 
+       musixftab.tex
+
diff --git a/Master/texmf-dist/doc/generic/musixtex/README b/Master/texmf-dist/doc/generic/musixtex/README
index 1d3a097d19e..29bb184edbf 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.33a (2021-07-07).
+This is MusiXTeX, version 1.34 (2021-07-24).
 MusiXTeX is a TeX-based system for typesetting music.
 
 The main author was Daniel Taupin, who died in a climbing
@@ -47,6 +47,10 @@ To install (on TDS-compliant TeX systems):
     texmf tree and, if necessary, update the filename database; 
     e.g., texhash texmf.
 
+ +  update the font maps, for example, by executing 
+
+      updmap-user -enable Map frenchtab.map
+
  +  on Windows: move the scripts in Windows to a folder
     on the executable PATH (or add that folder to the PATH)
 
@@ -83,7 +87,15 @@ http://tug.org/mailman/listinfo/tex-music
 MusiXTeX may be freely copied, duplicated and used in
 conformance to the GNU General Public License (Version 2,
 1991, see included file gpl.txt) or (at your option) any
-later version.
+later version.  
+
+The font file frenchtab.pfb is derived from mscoreTab.ttf
+by Maurizio M. Gavioli. It was obtained from
+
+https://github.com/musescore/MuseScore/blob/master/fonts/
+
+and is licensed under the SIL Open Font Licence, 
+Version 1.1; the text may be found in the doc directory.
 
 This distribution is maintained by Bob Tennent
 rdt(at)cs(dot)queensu(dot)ca.
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf b/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf
index 48fc1a33af0..ce5a18080c0 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/extensions.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
index 3871f732688..164117f8f39 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
@@ -385,6 +385,57 @@ requiring ledger lines look better with \keyindex{longledgerlines}.
 \autoledgerlines
 \end{music}
 
+ \section{musixftab}\label{frenchtab}\index{tablature}\index{musixftab@{\tt musixftab.tex}}
+This extension replaces the default (Helvetica) numerals of the tablature commands
+of Section~\ref{tablature} with the traditional script letters of French tablature.
+These glyphs are generated in \keyindex{tabfnt} by arguments \texttt{0}--\texttt{9}
+or by (capital) Latin letters \texttt{A}--\texttt{R} (excluding \texttt{J}).
+\clearpage
+
+The example of Section~\ref{tablature} with \texttt{musixftab.tex} is as follows:
+\medskip
+
+\begin{music}
+\input musixftab
+\input musixps
+\tabstylespacetrue
+\largemusicsize
+\def\psslurhgt{0.5}
+\instrumentnumber{1}
+\generalmeter{\meterfrac34}
+\generalsignature{-1}
+\setlines16\setclefsymbol1\tabclef\setsize1{1.2}\setsign10
+\nobarnumbers
+\parindent=2ex
+\setname1{\tabstringfnt\baselineskip=1.2\internote%
+\vbox{\hbox{F}\hbox{D}\hbox{A}\hbox{F}\hbox{D}\hbox{A}}}
+\nostartrule
+\startextract
+\scale{0.6}
+\NOtes\tzqu\qa{*}\en
+\NOtesp\zltab50\zltab40\tzqup\ltab30\en
+\Notes\tzcu\ltab30\en
+\bar%
+\NOtes\zltab50\zltab42\zltab31\tzqu\ltab22\en
+\NOtesp\zltab64\zltab35\zltab30\tzqup\ltab22\en
+\Notes\tzcu\ltab22\en
+\bar%
+\NOtes\zltab50\zltab30\zltab20\tzqu\ltab10\en
+\NOtes\zltab61\zltab40\tzqup\ltab20\en
+\Notes\tzcu\ltab33\en
+\bar%
+\NOtes\zltab70\zltab55\tzqu\ltab45\en
+\NOtes\zltab60\zltab53\ltab44\en
+\notesp\zltab64\tzccu\ltab42\ilsluru03\ltab53\ltab52\tlslur03\ltab53\en
+\bar%
+\notesp\ztab{10}0\tzccu\ltab42\ilsluru03\ltab52\ltab53\tlslur03\ltab50\en
+\NOtesp\zltab50\zltab40\tzqup\ltab30\en
+\Notes\tzcu\ltab30\en
+\bar%
+\zendextract
+\end{music}
+\medskip
+
  \section{musixgre}\label{gregnotes}\index{gregorian chant}
 
 % \section{Gregorian chant: staffs and clefs}
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
index 7feaad84163..8713f1ee71d 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.33}
+instrumental music\\\Large\itshape Version 1.34}
 \author{}
 
 
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
index db1ae9cf1e6..83b62bed6d5 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
@@ -830,20 +830,25 @@ The coding is
 \end{verbatim}\end{quote}
 
 
-\section{Tablature}
+\section{Tablature}\label{tablature}\index{tablature}
 Tablature is a notational system used for fretted stringed instruments such
 as lute, guitar, banjo, mandolin, and so on.  Staff lines represent strings
 and conventional note heads are replaced by numbers (or sometimes letters)
 indicating which fret is to be stopped, with $0$ representing an open string.
 
 A special clef symbol 
-\keyindex{tabclef} may be used with \verb|\setclefsymbol| for a tablature staff; commands \verb|\setlines|, \verb|\setsign|
-and \verb|\setsize| may be used as usual for a tablature staff.  The macros that put numbers (or letters) on staff lines
+\keyindex{tabclef} may be used with \verb|\setclefsymbol| for a tablature staff; commands \verb|\setlines|, \verb|\setsign|,
+\verb|\setsize| and \verb|\setname| may be used as usual for a tablature staff.  
+A size-dependent font \keyindex{tabstringfnt} can be used for string names.
+
+The macros that put numbers (or letters) on staff lines
 are as follows:
 \begin{itemize}
 \item \keyindex{tab}\verb|{|$n$\verb|}|\verb|{|$p$\verb|}| 
 puts $p$ on string $n$
 (counting from top to bottom); $p$ is centered, using \verb|\ccharnote|.
+Space for a ``rest'' can be generated by a command like 
+\verb|\qa{*}|.
 Ledger lines are replaced by slashes (/) for $n$ greater than the number of staff lines,
 or simply the number of courses below the staff if this is greater than 3. 
 \item \keyindex{ltab}\verb|{|$n$\verb|}|\verb|{|$p$\verb|}| 
@@ -859,16 +864,14 @@ is a non-spacing \verb|\ltab| and
 \keyindex{zrtab}\verb|{|$n$\verb|}|\verb|{|$p$\verb|}| 
 is a non-spacing \verb|\rtab|.
 \end{itemize}
-A size-dependent font \keyindex{tabfnt} is used for tab characters; Helvetica bold is the default font family.
+A size-dependent font \keyindex{tabfnt} is used for tab characters. Helvetica bold is the 
+default font family but the traditional script letters of French tablature may be obtained by
+inputting the extension library \verb|musixftab.tex|\index{musixftab@{\tt musixftab.tex}}
+described in Section~\ref{frenchtab}.
 
 The default tablature style is to place fingering notations \emph{on} staff lines;
 Postscript specials are used to ``blank'' staff lines below
 the tab characters.  
-If it is desired to locate the fingering notations \emph{above} staff lines, use
-the command \keyindex{tabstylespacetrue}.
-A size-dependent font \keyindex{tabstringfnt} is defined to allow string names to be
-listed using \verb|\setname|.
-
 Here is an example 
 for baroque lute
 (from \emph{Ciaccona} in D~minor by J.S.~Bach): 
@@ -885,15 +888,10 @@ for baroque lute
 \setsign2{-1}\setclefsymbol2\treblelowoct
 \parindent=2ex
 \setname1{\tabstringfnt\baselineskip=1.2\internote%
-\vbox{%
-\hbox to\parindent{\hss F\hss}%
-\hbox to\parindent{\hss D\hss}%
-\hbox to\parindent{\hss A\hss}%
-\hbox to\parindent{\hss F\hss}%
-\hbox to\parindent{\hss D\hss}%
-\hbox to\parindent{\hss A\hss}}}
+\vbox{\hbox{F}\hbox{D}\hbox{A}\hbox{F}\hbox{D}\hbox{A}}}
 \startextract
-\scale{0.88}
+\scale{0.8}
+\NOtes\qa{*}&\qp\en
 \NOtesp\zltab50\zltab40\ltab30&\zhl{d}\zhu{f}\qu{.h}\en
 \Notes\ltab30&\cu{h}\en
 \bar%
@@ -930,14 +928,9 @@ The coding is
 \setsign2{-1}\setclefsymbol2\treblelowoct
 \parindent=2ex
 \setname1{\tabstringfnt\baselineskip=1.2\internote%
-\vbox{%
-\hbox to\parindent{\hss F\hss}%
-\hbox to\parindent{\hss D\hss}%
-\hbox to\parindent{\hss A\hss}%
-\hbox to\parindent{\hss F\hss}%
-\hbox to\parindent{\hss D\hss}%
-\hbox to\parindent{\hss A\hss}}}
+\vbox{\hbox{F}\hbox{D}\hbox{A}\hbox{F}\hbox{D}\hbox{A}}}
 \startextract
+\NOtes\qa{*}&\qp\en
 \NOtesp\zltab50\zltab40\ltab30&\zhl{d}\zhu{f}\qu{.h}\en
 \Notes\ltab30&\cu{h}\en
 \bar%
@@ -965,6 +958,8 @@ The coding is
 \clearpage
 
 \par\noindent
+If it is desired that fingering notations be placed \emph{above} staff lines, use
+the command \keyindex{tabstylespacetrue}.
 Here is the same example with \verb|\tabstylespacetrue|:
 \begin{music}
 \input musixps
@@ -979,15 +974,10 @@ Here is the same example with \verb|\tabstylespacetrue|:
 \setsign2{-1}\setclefsymbol2\treblelowoct
 \parindent=2ex
 \setname1{\tabstringfnt\baselineskip=1.2\internote%
-\vbox{%
-\hbox to\parindent{\hss F\hss}%
-\hbox to\parindent{\hss D\hss}%
-\hbox to\parindent{\hss A\hss}%
-\hbox to\parindent{\hss F\hss}%
-\hbox to\parindent{\hss D\hss}%
-\hbox to\parindent{\hss A\hss}}}
+\vbox{\hbox{F}\hbox{D}\hbox{A}\hbox{F}\hbox{D}\hbox{A}}}
 \startextract
-\scale{0.88}
+\scale{0.8}
+\NOtes\qa{*}&\qp\en
 \NOtesp\zltab50\zltab40\ltab30&\zhl{d}\zhu{f}\qu{.h}\en
 \Notes\ltab30&\cu{h}\en
 \bar%
@@ -1028,15 +1018,11 @@ above the staff, as in:
 \nobarnumbers
 \parindent=2ex
 \setname1{\tabstringfnt\baselineskip=1.2\internote%
-\vbox{\hbox to\parindent{\hss F\hss}%
-\hbox to\parindent{\hss D\hss}%
-\hbox to\parindent{\hss A\hss}%
-\hbox to\parindent{\hss F\hss}%
-\hbox to\parindent{\hss D\hss}%
-\hbox to\parindent{\hss A\hss}}}
+\vbox{\hbox{F}\hbox{D}\hbox{A}\hbox{F}\hbox{D}\hbox{A}}}
 \nostartrule
 \startextract
-\scale{0.88}
+\scale{0.8}
+\NOtes\tzqu\qa{*}\en
 \NOtesp\zltab50\zltab40\tzqup\ltab30\en
 \Notes\tzcu\ltab30\en
 \bar%
@@ -1066,12 +1052,18 @@ above the staff, as in:
 \noindent
 A tiny note can be generated above the staff using one of the commands 
 \keyindex{tzwh}, \keyindex{tzwhp}, \keyindex{tzhu}, \keyindex{tzhup}, \keyindex{tzqu}, \keyindex{tzqup}, \keyindex{tzcu}, \keyindex{tzcup}, \keyindex{tzccu}, \ldots\  
-\emph{before} a spacing command.  Coding 
+\emph{before} a spacing command.  These commands suppress spurious ledger lines and
+avoid raising dots on dotted notes.
+
+\smallskip
+
+\noindent
+Coding 
 for the notes in the example above is as follows:
 \begin{footnotesize}
 \begin{quote}\begin{verbatim}
 \startextract
-\scale{0.88}
+\NOtes\tzqu\qa{*}\en
 \NOtesp\zltab50\zltab40\tzqup\ltab30\en
 \Notes\tzcu\ltab30\en
 \bar%
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixftab/OFL.txt b/Master/texmf-dist/doc/generic/musixtex/musixftab/OFL.txt
new file mode 100644
index 00000000000..caa9e01e460
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/musixtex/musixftab/OFL.txt
@@ -0,0 +1,95 @@
+frenchtab.pfb is derived from mscoreTab.ttf, 
+Copyright (c) 2012-15, Maurizio M. Gavioli,
+adapted by R.D. Tennent 2021.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixftab/frenchtab-samples.pdf b/Master/texmf-dist/doc/generic/musixtex/musixftab/frenchtab-samples.pdf
new file mode 100644
index 00000000000..a035265ce66
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/musixtex/musixftab/frenchtab-samples.pdf
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixftab/frenchtab-samples.tex b/Master/texmf-dist/doc/generic/musixtex/musixftab/frenchtab-samples.tex
new file mode 100644
index 00000000000..8ee4f077ce2
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/musixtex/musixftab/frenchtab-samples.tex
@@ -0,0 +1,9 @@
+\font\tabfnt=frenchtab at 11pt
+
+{\tabfnt  0 1 2 3 4 5 6 7 8 9}
+
+{\tabfnt  A B C D E F G H I K L M N O P Q R}
+
+{\tabfnt V W X Y Z}
+
+\end
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf
index 8a1d27ac52d..d06023158df 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf
+++ b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.tex b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.tex
index b3e78f43285..d2876fa3d06 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.tex
@@ -48,6 +48,10 @@ compliant TeX distribution, including MikTeX, TeXlive and teTeX.
 After unzipping the archive, update the filename database as necessary,
 for example, by executing \verb\texhash ~/texmf\ or 
 clicking the button labelled ``Refresh FNDB" in the MikTeX settings program.
+Update the font map files, for example, by executing
+\begin{list}{}{}\item
+\verb|updmap-user -enable Map frenchtab.map|
+\end{list}
 
 MusiXTeX requires a large set of specialized fonts. If necessary, install the 
 \texttt{musixtex-fonts} package.