[musixtex] 02/07: Imported Upstream version 1.19.ctan20151130
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository musixtex.
commit de728a5eb3aa6ce380c50f06ddb2ec69b931b9cf
Author: Norbert Preining <preining@debian.org>
Date: Mon Nov 30 14:03:08 2015 +0900
Imported Upstream version 1.19.ctan20151130
---
README | 88 -------
doc/generic/musixtex/ChangeLog-119.txt | 7 +
doc/generic/musixtex/README | 2 +-
doc/generic/musixtex/musixcrd/README.musixcrd | 54 ----
doc/generic/musixtex/musixdoc.pdf | Bin 1244127 -> 1251932 bytes
doc/generic/musixtex/musixdoc/beams.tex | 105 ++++----
doc/generic/musixtex/musixdoc/frontmatter.tex | 14 +-
doc/generic/musixtex/musixdoc/miscellaneous.tex | 102 +++++++-
doc/generic/musixtex/musixdoc/musixdoc.tex | 4 +-
.../generic/musixtex/musixdoc}/musixtex.tex | 43 +++-
.../musixtex/musixdoc/{rests.tex => restsdoc.tex} | 15 +-
doc/generic/musixtex/scripts/musixflx.pdf | Bin 4074 -> 4074 bytes
doc/generic/musixtex/scripts/musixtex.1 | 21 +-
doc/generic/musixtex/scripts/musixtex.pdf | Bin 4865 -> 4990 bytes
dvips/psslurs.pro | 282 ---------------------
gpl.txt | 251 ------------------
scripts/musixtex/musixtex.lua | 81 ++++--
tex/generic/musixtex/musixec.tex | 27 +-
tex/generic/musixtex/musixtex.tex | 43 +++-
19 files changed, 343 insertions(+), 796 deletions(-)
diff --git a/README b/README
deleted file mode 100644
index b2451f6..0000000
--- a/README
+++ /dev/null
@@ -1,88 +0,0 @@
-This is MusiXTeX, version 1.18-2015-07-25.
-MusiXTeX is a TeX-based system for typesetting music.
-
-The main author was Daniel Taupin, who died in a climbing
-accident in 2003; other authors credited in the MusiXTeX
-manual are Andreas Egler and Ross Mitchell. MusiXTeX is now
-being maintained by
-
-Don Simons dsimons(at)roadrunner(dot)com
-Hiroaki Morimoto CQX05646(at)nifty(dot)com
-Bob Tennent rdt(at)cs(dot)queensu(dot)ca
-
-The package includes
-
- + Postscript slur support, due to Stanislav Kneifl
-
- + musixlyr support for lyrics, due to Rainer Dunker
-
- + musixcrd support for chord symbols, due to Robert Hennig
-
- + support for music text in Palatino, Helvetica, Times
- and EC fonts
-
- + several other extension packages
-
- + a script musixflx.lua for the 2nd-pass processing
-
- + a script musixtex.lua that automates the 3-pass
- etex -> musixflx -> [pdf]etex process,
- possibly followed by calls to dvips and ps2pdf (or dvipdfm)
- to convert the output to Portable Document Format (PDF)
-
- + wrapper scripts musixflx.bat and musixtex.bat for use on Windows
-
-MusiXTeX fonts, including both the original metafont sources
-and Type 1 versions by Takanori Uchiyama are in a separate
-musixtex-fonts package, which must be installed before using
-the MusiXTeX macros.
-
-musixtex-install.{pdf,tex} is a more-detailed version of the
-following instructions:
-
-To install (on TDS-compliant TeX systems):
-
- + unzip tex-archive/install/macros/musixtex.tds.zip at the root of a
- texmf tree and, if necessary, update the filename database;
- e.g., texhash texmf.
-
- + on Windows: move the scripts in Windows to a folder
- on the executable PATH (or add that folder to the PATH)
-
- + on any Unix-like system: install symbolic links musixflx
- and musixtex in a directory on the executable PATH to
- scripts/musixtex/musixflx.lua and scripts/musixtex/musixtex.lua,
- respectively.
-
-Documentation for MusiXTeX and friends is installed under
-
-doc/generic/musixtex
-
-Documentation for the musixflx and musixtex scripts are in
-
-doc/generic/musixtex/scripts
-
-Many users, especially beginners, will find it easier to
-use the PMX and M-Tx pre-processors, which accept a simpler
-input language than MusiXTeX itself. Another pre-processor,
-autosp, simplifies input to MusiXTeX by automatically
-generating note-spacing commands. These pre-processor
-packages may be found at CTAN under support. Additional
-documentation, additional add-on packages, and many examples
-of MusiXTeX typesetting may be found at the Werner Icking
-Music Archive at
-
-http://icking-music-archive.org/
-
-Support for users of MusiXTeX and related software may be
-obtained via the MusiXTeX mail list at
-
-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.
-
-This distribution is maintained by Bob Tennent
-rdt(at)cs(dot)queensu(dot)ca.
diff --git a/doc/generic/musixtex/ChangeLog-119.txt b/doc/generic/musixtex/ChangeLog-119.txt
new file mode 100644
index 0000000..11871f1
--- /dev/null
+++ b/doc/generic/musixtex/ChangeLog-119.txt
@@ -0,0 +1,7 @@
+Changes from MusiXTeX 118 to 119:
+
+2015-11-29
+
+ definitions for tremolo commands \trml, \trmu, etc.
+ corrected typos in the definition of \comput@fonts affecting ppff fonts for
+ \Largemusicsize
diff --git a/doc/generic/musixtex/README b/doc/generic/musixtex/README
index b2451f6..d42c4b6 100644
--- a/doc/generic/musixtex/README
+++ b/doc/generic/musixtex/README
@@ -1,4 +1,4 @@
-This is MusiXTeX, version 1.18-2015-07-25.
+This is MusiXTeX, version 1.19-2015-11-29.
MusiXTeX is a TeX-based system for typesetting music.
The main author was Daniel Taupin, who died in a climbing
diff --git a/doc/generic/musixtex/musixcrd/README.musixcrd b/doc/generic/musixtex/musixcrd/README.musixcrd
deleted file mode 100644
index d1baf7e..0000000
--- a/doc/generic/musixtex/musixcrd/README.musixcrd
+++ /dev/null
@@ -1,54 +0,0 @@
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-#%% musixcrd - typsetting chord symbols with %%
-#%% musixtex %%
-#%% readme %%
-#%% $Id$ %%
-#%% copyright 2004 , Robert Hennig %%
-#%% this code is licensed in terms of the %%
-#%% GNU Public License %%
-#%% %%
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-Chord setting for musixtex or pmx.
-
-There exist two distributions, the sources and the compiled on.
-The sources are only necessary for development. Normal usage
-requires only the compiled version.
-
-
-compiled distribution
----------------------
- The archive musixcrd.tgz contains the following files:
-
- o readme this file
- o musixcrd.tex tex macros
- o doc.pdf documentation
-
- Put the musixcrd.tex file or an link to it into your
- musixtex/pmx working directory. For pmx use the lines
-
- ---
- \input musixtex % These commands are necessary
- \input pmx % because pmx.tex MUST be \input
- \input musixcrd
- ---
-
- as preamble in your pmx source file to include musixcrd.tex.
- Look at doc.ps for further instructions of how to use musixcrd.
-
-
-source distribution
--------------------
- The archive musixcrdsrc.tgz contains the following files:
-
- o readme this file
- o musixcrd.dtx tex macros and documentation
- o makefile makefile
- o musixcrd.sty latex stylefile is a link to musixcrd.dtx
- o doc.tex latex macros for documentation generation
- using musixcrd.dtx
- o strip.tex tex file for strip documentation from musixcrd.dtx
-
- Extract the file into an directory. Use make with the arguments
- doc, strip, srcdist and dist to generate the targets.
-
diff --git a/doc/generic/musixtex/musixdoc.pdf b/doc/generic/musixtex/musixdoc.pdf
index 8dc14c0..3e390f7 100644
Binary files a/doc/generic/musixtex/musixdoc.pdf and b/doc/generic/musixtex/musixdoc.pdf differ
diff --git a/doc/generic/musixtex/musixdoc/beams.tex b/doc/generic/musixtex/musixdoc/beams.tex
index 060ed86..2777caf 100644
--- a/doc/generic/musixtex/musixdoc/beams.tex
+++ b/doc/generic/musixtex/musixdoc/beams.tex
@@ -316,82 +316,93 @@ one could define a set of four sixteenths by the macro:
arguments are the pitches of the four successive sixteenths.
%\check
- \section{Shorthand beam notations for repeated notes}\index{repeated patterns}
-Sometimes you may want to indicate repeated short notes with open note heads joined
-by a beam. Here's an example of how to do that
+ \section{Shorthand beam notations for repeated or alternated notes}\index{repeated patterns}
+Sometimes you may want to indicate repeated or alternated short notes with open note heads joined
+by a beam. Here are examples of how to do that
using the \keyindex{hb} macro:
\begin{music}\nostartrule
\startextract
\Notes\ibbl0j0\hb0j\tbl0\hb0j\en
-\Notes\ibbu0g0\hb0g\tbu0\hb0g\en
+\Notes\ibbl0h4\hb0h\tbl0\hb0j\en
\zendextract
\end{music}
\noindent which has been coded as:
\begin{quote}\begin{verbatim}
\Notes\ibbl0j0\hb0j\tbl0\hb0j\en
-\Notes\ibbu0g0\hb0g\tbu0\hb0g\en
-\end{verbatim}\end{quote}
-
-It is also possible to dispense with the stems:
+\Notes\ibbl0h4\hb0h\tbl0\hb0j\en
+\end{verbatim}\end{quote}\noindent
+A different look could be obtained as follows:
\begin{music}\nostartrule
\startextract
-\Notes\ibbl0j3\wh j\tbl0\wh l\en
-\Notes\ibbu0g3\wh g\tbu0\wh i\en
+\notes\ha j\loffset{0.5}{\ibbl1n3}\qsk\tbl1\qsk\ha l\sk\en
\zendextract
\end{music}
-\noindent which was coded as
+\noindent which has been coded as:
\begin{quote}\begin{verbatim}
-\Notes\ibbl0j3\wh j\tbl0\wh l\en
-\Notes\ibbu0g3\wh g\tbu0\wh i\en
+\notes\ha j\loffset{0.5}{\ibbl1n4}\qsk\tbl1\qsk\ha l\sk\en
\end{verbatim}\end{quote}
-\noindent A different look could be obtained as follows:
+It is possible to combine this notation
+with a conventional beam, as in
\begin{music}\nostartrule
\startextract
-\Notes\loff{\zw j}\ibbl0j3\sk\tbl0\wh l\en
-\Notes\ibbu0g3\wh g\tbu0\roff{\wh i}\en\qspace
+\notes\ibl0h3\qb0j\loffset1{\ibbbl1m3}\qsk\tbl1\qsk\tql0l\en
\zendextract
\end{music}
-\noindent which was coded as:
+\noindent which has been coded as:
\begin{quote}\begin{verbatim}
-\Notes\loff{\zw j}\ibbl0j3\sk\tbl0\wh l\en
-\Notes\ibbu0g3\wh g\tbu0\roff{\wh i}\en\qspace
-\end{verbatim}\end{quote}
-
-Yet another way to indicate repeated notes is given in the
-following example:
+\notes\ibl0h3\qb0j\loffset1{\ibbbl1m3}\qsk\tbl1\qsk\tql0l\en
+\end{verbatim}\end{quote}\noindent
+or, for whole notes, to dispense with stems:
- \begin{music}\nostartrule
+\begin{music}\nostartrule
\startextract
-\Notes\ibl0h0\qb0{hhh}\tbl0\qb0h\bsk\bsk\bsk\bsk
- \ibu0j0\qb0{jjj}\tbu0\qb0j\en
-\NOTes\loffset{0.5}{\ibl0j9}\roffset{0.5}{\tbl0}\zhl h%
- \loffset{0.5}{\ibu0g9}\roffset{0.5}{\tbu0}\hu j\en\bar
-\notes\ibbl0i0\qb0{hhh}\tbl0\qb0h\bsk\bsk\bsk\bsk
- \ibbu0i0\qb0{jjj}\tbu0\qb0j%
- \ibbl0i0\qb0{hhh}\tbl0\qb0h\bsk\bsk\bsk\bsk
- \ibbu0i0\qb0{jjj}\tbu0\qb0j\en
-\NOTes\loffset{0.5}{\ibbl0k9}\roffset{0.5}{\tbl0}\zhl h%
- \loffset{0.5}{\ibbu0f9}\roffset{0.5}{\tbu0}\hu j\en
+\Notes\loff{\zw j}\ibbl0l4\sk\tbl0\wh l\en
+\Notes\ibbu0e4\wh g\tbu0\roff{\wh i}\en
\zendextract
- \end{music}
- \noindent whose coding (due to Werner {\sc Icking}) is
-
+\end{music}
+\noindent which has been coded as:
\begin{quote}\begin{verbatim}
-\Notes\ibl0h0\qb0{hhh}\tbl0\qb0h\bsk\bsk\bsk\bsk
- \ibu0j0\qb0{jjj}\tbu0\qb0j\en
-\NOTes\loffset{0.5}{\ibl0j9}\roffset{0.5}{\tbl0}\zhl h%
- \loffset{0.5}{\ibu0g9}\roffset{0.5}{\tbu0}\hu j\en\bar
-\notes\ibbl0i0\qb0{hhh}\tbl0\qb0h\bsk\bsk\bsk\bsk
- \ibbu0i0\qb0{jjj}\tbu0\qb0j%
- \ibbl0i0\qb0{hhh}\tbl0\qb0h\bsk\bsk\bsk\bsk
- \ibbu0i0\qb0{jjj}\tbu0\qb0j\en
-\NOTes\loffset{0.5}{\ibbl0k9}\roffset{0.5}{\tbl0}\zhl h%
- \loffset{0.5}{\ibbu0f9}\roffset{0.5}{\tbu0}\hu j\en
+\Notes\loff{\zw j}\ibbl0l4\sk\tbl0\wh l\en
+\Notes\ibbu0e4\wh g\tbu0\roff{\wh i}\en
\end{verbatim}\end{quote}
+Short ``beams'' centered on note stems (or directly over
+or under whole notes)
+indicate \emph{tremolos}. Commands that generate tremolo indications are described in Section~\ref{tremolos}.
+
+
+% \begin{music}\nostartrule
+%\startextract
+%\Notes\ibl0h0\qb0{hhh}\tbl0\qb0h\bsk\bsk\bsk\bsk
+% \ibu0j0\qb0{jjj}\tbu0\qb0j\en
+%\NOTes\loffset{0.5}{\ibl0j9}\roffset{0.5}{\tbl0}\zhl h%
+% \loffset{0.5}{\ibu0g9}\roffset{0.5}{\tbu0}\hu j\en\bar
+%\notes\ibbl0i0\qb0{hhh}\tbl0\qb0h\bsk\bsk\bsk\bsk
+% \ibbu0i0\qb0{jjj}\tbu0\qb0j%
+% \ibbl0i0\qb0{hhh}\tbl0\qb0h\bsk\bsk\bsk\bsk
+% \ibbu0i0\qb0{jjj}\tbu0\qb0j\en
+%\NOTes\loffset{0.5}{\ibbl0k9}\roffset{0.5}{\tbl0}\zhl h%
+% \loffset{0.5}{\ibbu0f9}\roffset{0.5}{\tbu0}\hu j\en
+%\zendextract
+% \end{music}
+% \noindent whose coding (due to Werner {\sc Icking}) is
+%
+%\begin{quote}\begin{verbatim}
+%\Notes\ibl0h0\qb0{hhh}\tbl0\qb0h\bsk\bsk\bsk\bsk
+% \ibu0j0\qb0{jjj}\tbu0\qb0j\en
+%\NOTes\loffset{0.5}{\ibl0j9}\roffset{0.5}{\tbl0}\zhl h%
+% \loffset{0.5}{\ibu0g9}\roffset{0.5}{\tbu0}\hu j\en\bar
+%\notes\ibbl0i0\qb0{hhh}\tbl0\qb0h\bsk\bsk\bsk\bsk
+% \ibbu0i0\qb0{jjj}\tbu0\qb0j%
+% \ibbl0i0\qb0{hhh}\tbl0\qb0h\bsk\bsk\bsk\bsk
+% \ibbu0i0\qb0{jjj}\tbu0\qb0j\en
+%\NOTes\loffset{0.5}{\ibbl0k9}\roffset{0.5}{\tbl0}\zhl h%
+% \loffset{0.5}{\ibbu0f9}\roffset{0.5}{\tbu0}\hu j\en
+%\end{verbatim}\end{quote}
+
\section{Beams that cross line breaks}
Although careful typesetting can usually avoid it, occasionally
diff --git a/doc/generic/musixtex/musixdoc/frontmatter.tex b/doc/generic/musixtex/musixdoc/frontmatter.tex
index e3f7a9a..92bc0ab 100644
--- a/doc/generic/musixtex/musixdoc/frontmatter.tex
+++ b/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.18}
+instrumental music\\\Large\itshape Version 1.19}
%\author{\Large\rm Daniel \sc Taupin\\\large\sl
@@ -65,13 +65,11 @@ event. You may read tributes to Daniel Taupin that are archived at the
Since then, the only significant update to \musixtex\ has been in version 1.15 (April 2011) which
takes advantage of the greater capacity of the e\TeX\ version of \TeX.
-In the current version~1.18 (June~2015), the definitions
-in the extension library \verb|musixext.tex| (\verb|\raggedstoppiece| and \verb|\slide|)
-have been moved into
-\verb|musixtex.tex|, and \verb|musixppff.tex| has been corrected so that \verb|\xppff|
-is musicsize-dependent.
-This manual is the definitive reference to all features of
-\musixtex\ version~1.18.
+In the current version~1.19 (November~2015),
+new commands for tremolos HAVE BEEN added and discussion
+of non-spacing rests has been added to this manual, which
+is the definitive reference to all features of
+\musixtex\ version~1.19.
Novice users need not start here.
Most
diff --git a/doc/generic/musixtex/musixdoc/miscellaneous.tex b/doc/generic/musixtex/musixdoc/miscellaneous.tex
index 0a75f7a..77471a5 100644
--- a/doc/generic/musixtex/musixdoc/miscellaneous.tex
+++ b/doc/generic/musixtex/musixdoc/miscellaneous.tex
@@ -22,13 +22,13 @@
By way of example, the notations
\begin{quote}
\def\nbinstruments{0}
-\metron{\hup}{60}
+\metron{\qu}{60}
\quad and\quad
\def\nbinstruments{0}\metronequiv{\qup}{\qu}
\end{quote}
are
respectively coded as
-\keyindex{metron}\verb|{\hup}{60}| and \keyindex{metronequiv}\verb|{\qup}{\qu}|,
+\keyindex{metron}\verb|{\qu}{60}| and \keyindex{metronequiv}\verb|{\qup}{\qu}|,
which are normally placed using \keyindex{Uptext}.
Also, you can set a smaller metronomic indication like
\begin{quote}
@@ -45,7 +45,6 @@ or
\verb|\metron{\tinynotesize\lqu}{ca.~72}|
\end{quote}
-
\section{Accents}
You may use\footnote{Note from the editor: the reason the names of some of
@@ -385,6 +384,86 @@ whose coding is
\endextract
\end{verbatim}\end{quote}
+
+ \subsection{Tremolos}\label{tremolos}
+
+The command \keyindex{trml}\verb|{|$p$\verb|}|~is used to indicate that the immediately
+following
+quarter or half note (normally at pitch $p$ and with a lower stem) is to be repeated in eighth notes.
+For example,
+\verb|\trml j\ha j|
+generates
+
+\begin{music}\nostartrule
+\startextract
+\NOTes\trml j\ha j\en
+\zendextract
+\end{music}\noindent
+and is an abbreviation for
+
+\begin{music}\nostartrule
+\startextract
+\notes\ibl0j0\qb0{jjj}\tql0j\en
+\zendextract
+\end{music}\noindent
+Similarly, \keyindex{trmu}\verb|{|$p$\verb|}|~generates an eighth-note tremolo
+on a quarter or half note with an \emph{upper} stem:
+
+\begin{music}\nostartrule
+\startextract
+\NOTes\trmu h\ha h\en
+\zendextract
+\end{music}\noindent
+16th-note and 32-note tremolos are similarly generated by
+commands \keyindex{trrml}, \keyindex{trrmu}, \keyindex{trrrml}
+and \keyindex{trrrmu}, as in
+
+\begin{music}
+\nostartrule
+\startextract
+\NOtesp\trrml h\zqlp h\trrmu j\qup j\en
+\Notes\stemlength{6.4}\trrml j\zcl j\trrmu l\cu l\en
+\NOtes\stemlength{6.4}\trrrml h\zql h\trrrmu j\qu j\en
+\endextract
+\end{music}\noindent
+which is coded as
+\begin{quote}\begin{verbatim}
+\NOtesp\trrml h\zqlp h\trrmu j\qup j\en
+\Notes\stemlength{6.4}\trrml j\zcl j\trrmu l\cu l\en
+\NOtes\stemlength{6.4}\trrrml h\zql h\trrrmu j\qu j\en
+\end{verbatim}\end{quote}
+The \keyindex{stemlength} command is used to adjust
+stem lengths;
+the new length remains effective to the end of the current notes group.
+If necessary, the usual stem length can be restored by using
+\verb|\stemlength{\DefaultStemlength}|.
+
+
+For \emph{whole} notes, tremolo indications
+should be wider and centered directly over or under the note. These
+are generated by commands \keyindex{Trml}, \keyindex{Trmu}, \keyindex{Trrml},
+\keyindex{Trrmu}, \keyindex{Trrrml} and \keyindex{Trrrmu}; for example,
+
+\begin{music}
+\nostartrule
+\startextract
+\NOTEs\Trml h\zw h\Trmu j\wh j\en
+\bar%
+\NOTEs\Trrml h\zw h\Trrmu j\wh j\en
+\bar%
+\NOTEs\Trrrml h\zw h\Trrrmu j\wh j\en
+\endextract
+\end{music}\noindent
+which is coded as
+\begin{quote}\begin{verbatim}
+\NOTEs\Trml h\zw h\Trmu j\wh j\en\bar
+\NOTEs\Trrml h\zw h\Trrmu j\wh j\en\bar
+\NOTEs\Trrrml h\zw h\Trrrmu j\wh j\en
+\end{verbatim}\end{quote}
+
+For all of the commands described in this section, the pitch parameter may be used
+if it is necessary to raise or lower the tremolo indication.
+
\subsection{Piano pedal commands}
The macro \keyindex{PED} inserts a piano pedal command below the staff;
\keyindex{DEP}, a pedal release. Alternate symbols, the first of which
@@ -559,8 +638,6 @@ For example,
\end{music}
\end{verbatim}\end{quote}
-
-
\section{Forcing activity at the beginning of systems}
A macro named \keyindex{everystaff} is executed each time a new system
begins. It is normally void, but it can be defined (simply by \verb|\def|%
@@ -586,21 +663,18 @@ staves at the beginning of every system using \keyindex{everystaff} and
\keyindex{zcharnote} as follows:
\begin{music}
-\instrumentnumber{4}
-\setclef1\bass
-\def\everystaff{%
- \znotes&\zchar{-6}{\eightrm\kern-2\Interligne8}%
+\instrumentnumber{4}\setclef1\bass
+\def\everystaff{\znotes&\zchar{-6}{\eightrm\kern-2\Interligne8}%
&\zchar{-6}{\eightrm\kern-2\Interligne8}\en}%
\startextract
\NOTes\ha{HIJK}&\ha{efgh}&\ha{hijk}&\ha{hmlk}\en
\zendextract
\end{music}
-\noindent The coding is
+\noindent
+The coding is
\begin{quote}\begin{verbatim}
-\instrumentnumber{4}
-\setclef1\bass
-\def\everystaff{%
- \znotes&\zchar{-6}{\eightrm \kern -2\Interligne 8}%
+\instrumentnumber{4}\setclef1\bass
+\def\everystaff{\znotes&\zchar{-6}{\eightrm \kern -2\Interligne 8}%
&\zchar{-6}{\eightrm \kern -2\Interligne 8}\en}%
\startextract
\NOTes\ha{HIJK}&\ha{efgh}&\ha{hijk}&\ha{hmlk}\en
diff --git a/doc/generic/musixtex/musixdoc/musixdoc.tex b/doc/generic/musixtex/musixdoc/musixdoc.tex
index 2c00364..ff98908 100644
--- a/doc/generic/musixtex/musixdoc/musixdoc.tex
+++ b/doc/generic/musixtex/musixdoc/musixdoc.tex
@@ -31,7 +31,7 @@
%preparing,
%writingnotes,
%beams,
-%rests,
+%restsdoc,
%spacing,
%accidentals,
%transposition,
@@ -73,7 +73,7 @@
\include{preparing}
\include{writingnotes}
\include{beams}
-\include{rests}
+\include{restsdoc}
\include{spacing}
\include{accidentals}
\include{transposition}
diff --git a/tex/generic/musixtex/musixtex.tex b/doc/generic/musixtex/musixdoc/musixtex.tex
similarity index 98%
copy from tex/generic/musixtex/musixtex.tex
copy to doc/generic/musixtex/musixdoc/musixtex.tex
index 3de1de2..0016785 100644
--- a/tex/generic/musixtex/musixtex.tex
+++ b/doc/generic/musixtex/musixdoc/musixtex.tex
@@ -25,15 +25,20 @@
\def\mufl@x{0.83}%
\def\mxmajorvernumber{1}
-\def\mxminorvernumber{18}
+\def\mxminorvernumber{19}
\def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
\def\mxversuffix{}%
\edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{2015-07-25}
+\def\mxdate{2015-11-29}
\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
\everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
+% version 1.19:
+
+% RDT corrected typos in the definition of \comput@fonts affecting ppff fonts for \Largemusicsize
+% RDT introduced definitions for tremolo commands \trml, \trmu, etc.
+
% version 1.18:
% RDT added definitions of \raggedstoppiece and \slide from musixext.tex
@@ -1609,11 +1614,11 @@
\let\hslurud\hslurutwentyd \let\hslurdd\hslurdtwentyd %+ickd
\let\meternorfont\svtbfg \let\metersmallfont\frtbf % version 1.18 RDT
\let\meterbigfont\twtybfg \let\meterlargefont\twfvbf
- \let\meterLargefont\twfvbfg
- \let\tinyppff\ppfftwentyg
- \let\smallppff\ppfftwentyfourg
- \let\normppff\ppfftwentynineg
- \let\medppff\ppfftwentynineg
+ \let\meterLargefont\twfvbf
+ \let\tinyppff\ppfftwenty
+ \let\smallppff\ppfftwentyfour
+ \let\normppff\ppfftwentynine
+ \let\medppff\ppfftwentynine
\else
\ifnum\musicsize=\tw@nty
\else\ifnum\musicsize=\z@
@@ -4206,6 +4211,24 @@
% Correction by Julian Gilbey
\the\tr@sw\xleaders\hbox{\musixchar69}\hfill}}%
+%%% tremolos version 1.19 RDT
+%%% based on code by Werner Icking and Andre van Ryckeghem
+
+\def\trml#1{\advance\transpose2\loffset{0.5}{\ibl0{#1}9}\roffset{0.5}{\tbl0}\advance\transpose-2}%
+\def\trmu#1{\advance\transpose-3\loffset{0.5}{\ibu0{#1}9}\roffset{0.5}{\tbu0}\advance\transpose3}%
+\def\trrml#1{\advance\transpose2\loffset{0.5}{\ibbl0{#1}9}\roffset{0.5}{\tbl0}\advance\transpose-2}%
+\def\trrmu#1{\advance\transpose-3\loffset{0.5}{\ibbu0{#1}9}\roffset{0.5}{\tbu0}\advance\transpose3}%
+\def\trrrml#1{\advance\transpose2\loffset{0.5}{\ibbbl0{#1}9}\roffset{0.5}{\tbl0}\advance\transpose-2}%
+\def\trrrmu#1{\advance\transpose-3\loffset{0.5}{\ibbbu0{#1}9}\roffset{0.5}{\tbu0}\advance\transpose3}%
+
+% whole notes are wider than quarter/half notes:
+\def\Trml#1{\advance\transpose2\loffset0{\ibl0{#1}9}\roffset{1.125}{\tbl0}\advance\transpose-2}%
+\def\Trmu#1{\advance\transpose-3\loffset{1.125}{\ibu0{#1}9}\roffset0{\tbu0}\advance\transpose3}%
+\def\Trrml#1{\advance\transpose2\loffset0{\ibbl0{#1}9}\roffset{1.125}{\tbl0}\advance\transpose-2}%
+\def\Trrmu#1{\advance\transpose-3\loffset{1.125}{\ibbu0{#1}9}\roffset0{\tbu0}\advance\transpose3}%
+\def\Trrrml#1{\advance\transpose2\loffset0{\ibbbl0{#1}9}\roffset{1.125}{\tbl0}\advance\transpose-2}%
+\def\Trrrmu#1{\advance\transpose-3\loffset{1.125}{\ibbbu0{#1}9}\roffset0{\tbu0}\advance\transpose3}%
+
%%% octave lines
\def\octnumberup{\octnumberdefault\vrule width 0pt height2ex}
@@ -4307,7 +4330,11 @@
%%% some specials
-\def\metron#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2}}
+% \def\metron#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2}}
+% version 1.19 RDT:
+\let\lyricson\relax
+\let\lyricsoff\relax
+\def\metron#1#2{{\lyricsoff\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2\lyricson}}
\def\metronequiv#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2 1}}
diff --git a/doc/generic/musixtex/musixdoc/rests.tex b/doc/generic/musixtex/musixdoc/restsdoc.tex
similarity index 91%
rename from doc/generic/musixtex/musixdoc/rests.tex
rename to doc/generic/musixtex/musixdoc/restsdoc.tex
index 63109da..8f99ebd 100644
--- a/doc/generic/musixtex/musixdoc/rests.tex
+++ b/doc/generic/musixtex/musixdoc/restsdoc.tex
@@ -35,7 +35,7 @@ and \keyindex{PAUSe}, which yield:
%\check
- \section{Raising rests}\index{raising rests}
+ \section{Raising rests and non-spacing rests}\index{raising rests}
All the
previous rests except \keyindex{pausep} and
\keyindex{hpausep} are \ital{hboxes}, which means that
@@ -51,6 +51,19 @@ standard \TeX\ command \keyindex{raise}. For example:
\noindent where \keyindex{Interligne} is the distance from one staff line to the
next.
+Similarly, non-spacing rests may be coded using the \TeX\ command \keyindex{rlap}, as in
+
+\begin{music}\nostartrule
+\startextract
+\notes\ibbu0h{-1}\zccl e\qb0h\raise-4\Interligne\rlap\qs\qb0e\en
+\notes\raise-4\Interligne\rlap\ds\qb0f\tqu0g\en
+\endextract
+\end{music}\noindent
+for which the coding is
+\begin{verbatim}
+\notes\ibbu0h{-1}\zccl e\qb0h\raise-4\Interligne\rlap\qs\qb0e\en
+\notes\raise-4\Interligne\rlap\ds\qb0f\tqu0g\en
+\end{verbatim}
In addition, two macros are available to put a whole or
half rest above or below the staff. The ordinary \verb|\pause| or
diff --git a/doc/generic/musixtex/scripts/musixflx.pdf b/doc/generic/musixtex/scripts/musixflx.pdf
index e93d61b..934b909 100644
Binary files a/doc/generic/musixtex/scripts/musixflx.pdf and b/doc/generic/musixtex/scripts/musixflx.pdf differ
diff --git a/doc/generic/musixtex/scripts/musixtex.1 b/doc/generic/musixtex/scripts/musixtex.1
index b069353..d1d15a1 100644
--- a/doc/generic/musixtex/scripts/musixtex.1
+++ b/doc/generic/musixtex/scripts/musixtex.1
@@ -1,5 +1,5 @@
.\" This manpage is licensed under the GNU Public License
-.TH MUSIXTEX 1 2014-07-16 "musixtex version 0.11" ""
+.TH MUSIXTEX 1 2015-11-28 "musixtex version 0.12" ""
.SH NAME
musixtex \- processes MusiXTeX files, deleting intermediate files
@@ -15,6 +15,9 @@ musixtex \- processes MusiXTeX files, deleting intermediate files
|
.IR jobname
[ .aspc ]
+|
+.IR jobname
+[ .ltx ]
} ...
.TP
If a jobname argument has a .tex extension, the default effect is to process the file using
@@ -40,12 +43,19 @@ If a jobname argument has a .aspc extension, the file is first preprocessed usin
.BR autosp (1)
and the resulting .tex file is processed as above.
.P
-If a jobname argument has neither .tex nor .aspc extension, file
+If a jobname argument has a .ltx extension, the file is processed using
+.BR latex (1)
+or
+.BR pdflatex (1).
+.P
+If a jobname argument has neither .tex nor .aspc nor .ltx extension, file
.IR jobname .aspc
+or
+.IR jobname .ltx
will be processed as above if it exists; otherwise file
.IR jobname .tex
will
-be processed.
+be processed, if it exists.
.SH OPTIONS
.TP 8
@@ -59,7 +69,8 @@ output usage summary and quit
changes the TeX processor to
.BR latex (1)
or
-.BR pdflatex (1)
+.BR pdflatex (1);
+implied if the file has .ltx extension
.TP
.B -p
changes the TeX processor to
@@ -98,7 +109,7 @@ to update index database
.B -a
force
.BR autosp (1)
-preprocessing
+preprocessing; implied if the file has .aspc extension.
.TP
.B -f
default processing
diff --git a/doc/generic/musixtex/scripts/musixtex.pdf b/doc/generic/musixtex/scripts/musixtex.pdf
index 385e2b6..4df687b 100644
Binary files a/doc/generic/musixtex/scripts/musixtex.pdf and b/doc/generic/musixtex/scripts/musixtex.pdf differ
diff --git a/dvips/psslurs.pro b/dvips/psslurs.pro
deleted file mode 100644
index b1ba952..0000000
--- a/dvips/psslurs.pro
+++ /dev/null
@@ -1,282 +0,0 @@
-% This file can be used instead of psslurs.pro, it is only commented
-% and indented.
-%
-% VERSION: 1.01
-%
-% WARNING! This is a heavy magic! If you want something more understandable,
-% you will have to write it yourself (if it is possible in a stack-oriented
-% language that PostScript is). There are some constants you can
-% change and see what happens, but I think the slurs should be almost
-% always satisfiable. When not, let me know at:
-% stanislav@kneifl.net
-% Also any bug reports and comments are welcomed.
-%
-% Stanislav Kneifl.
-
-/slur@Dict 200 dict def
-
-% this dictionary is for \setslurtext, overriding some dvips's definitions
-/temp@xx@dict 4 dict def temp@xx@dict begin
- /a { moveto ax1 ay1 rmoveto } def
- /V {gsave newpath transform round exch round exch itransform
- exch ax1 add exch ay1 add moveto rulex 0 rlineto 0 ruley neg
- rlineto rulex neg 0 rlineto fill grestore} def
-end
-
-TeXDict begin
-% get dimen from TeX's string ("125pt" -> 125 PS points)
-/psxGD { dup length 2 sub 0 exch getinterval cvr 1.045 mul} def
-% get dimen adjusted to Resolution
-/psxGDAR { dup length 2 sub 0 exch getinterval cvr 4 psxAR mul 1.045 mul} def
-% Adjust to Resolution
-/psxAR { Resolution mul 300 div } def
-% the distances in dvips's PostScript are resolution dependant!
-end
-
-slur@Dict begin
-/CP /currentpoint load def
-/ED { exch def } bind def
-/psxAR { Resolution mul 300 div } def % stands for Adjust to Resolution,
-/VS { dup /ay1 exch ay1 exch linew mul 4 mul add def /ay2 exch ay2 exch linew mul 4 mul add def } def
-/y { 3 2 roll ax1 ay1 rmoveto show moveto } def
-/M { mul } def
-/A { add } def
-/SB { sub } def
-/P { pop } def
-/DP { dup } def
-/R { roll } def
-
-/drawseg { 0 0 moveto
- ax1 ay1
- ax1 0.6 mul ax2 0.4 mul add ay1 0.6 mul ay2 0.4 mul add
- ax1 ax2 add 2 div ay1 ay2 add 2 div curveto
- ax1 0.4 mul ax2 0.6 mul add ay1 0.4 mul ay2 0.6 mul add
- ax2 ay2
- x2 0 curveto } def
-
-/DS {
- psxAR /maxe ED
- /ifadjust ED
- /ifdash ED
- psxAR /m ED % max height of the slur
- /e ED % "angularity" of the slur; 0.1 = very angular,
- % 0.3 = very round
- /aa exch neg def % what to multiply the height with
- % AFTER the max height checking
- /y2 ED % y coordinate of the end of the slur
- /x2 ED % x coordinate of the end of the slur
- /y1 ED % y coordinate of the beginning of the slur
- /x1 ED % x coordinate of the beginning of the slur
- /yr2 ED
- /yr1 ED
- /internote ED
- /x2 x2 x1 sub def % x2=x2-x1
- /y2 y2 y1 sub def % y2=y2-y1
- /sx y2 x2 div def
- /b x2 300 mul Resolution div abs sqrt psxAR 2 mul def % b=2*sqrt(x2)
- b 3 psxAR lt {/b 3 psxAR def} if % b=max(b,3)
- b m gt {/b m def} if % b=min(b,m)
- /aa b aa mul def % aa=aa*b
- /s 90 x2 y2 atan sub def % s=90-arctan(x2,y2) slope of the slur
- /aa aa s cos div def % aa=aa/cos(s) height of the slur
- /x2 s neg cos x2 mul s neg sin y2 mul sub def % x2 = x2*cos(-s) - y2*sin(-s)
- % is the length of the slur
- e x2 mul maxe gt { /e maxe x2 div def } if
- /beta e x2 mul aa neg atan def
- beta 90 gt {/beta 180 beta sub def} if
- /ax1 e x2 mul def % control points
- /ay1 aa def
- /ax2 1 e sub x2 mul def
- /ay2 aa def
-
-% check if the starting and endin vector stay in desired quadrants
-% => beta < abs(s)
- beta s abs lt {
- /b aa abs s abs 2 add sin mul s abs 2 add cos div def
- s aa mul 0 lt {
- s cos 0.75 lt { /ax1 ax1 b 1 s cos sub mul 0.5 mul sub def /ay1 ay1 s cos mul 0.8 mul def } if
-% ^^^^ ^^^ ^^^
-% (values to play with)
- /ax2 x2 b sub def
- }
- {
- /ax1 b def
- s cos 0.75 lt { /ax2 b 1 s cos sub mul 0.5 mul ax2 add def /ay2 ay2 s cos mul 0.8 mul def } if
-% ^^^^ ^^^ ^^^
- } ifelse
- } if
-
-% align the slur to the staff lines
-
- gsave
- x1 y1 translate
- s rotate
-% [1 0 sx 1 0 0] concat
- drawseg
- gsave
- initmatrix
- flattenpath
- pathbbox
- exch pop
- sub
- /slh ED % in slh we have the height of the whole slur
- pop
- grestore
-
- /yr s aa mul 0 ge { yr1 } { yr2 } ifelse internote div def
- /slh yr slh internote div aa 0 gt { add } { sub } ifelse 2 div def
-% check if the slur gets too close to staff line
- /shift 0 def
- slh 4.45 lt slh -0.5 gt and {
- /slh slh dup truncate sub def
- slh 0 lt { /slh 1 slh add def } if
- aa 0 gt { /slh 1 slh sub def } if
-
- % slh now contains the position ot the slur top/bottom in the space
- % between the nearest staff lines (from <0,1>), regardless direction
-
- % slur is too low:
- slh 0.45 lt { /shift 0.45 slh sub def } if
- % slur is too high, but we can be shift it down:
- slh 0.7 gt slh 0.85 lt and { /shift 0.7 slh sub def } if
- % slur is too high, must be shifted up:
- slh 0.85 ge { /shift 1.45 slh sub def } if
- } if
-
- aa 0 gt { /shift shift neg def } if
-
- ifadjust 0 eq {
- /shift 0 def
- } if
-
-
-% and finally draw it...
-
- grestore
- gsave
- /linew internote 0.06 mul psxAR def
- linew 4 mul setlinewidth
- 1 setlinecap
- 0 setlinejoin
- ifdash 1 eq
- { [internote 8 mul psxAR internote 5 mul psxAR] 0 setdash } if
- x1 y1 shift neg 2 mul internote mul 4 psxAR mul add translate
- s rotate
-% [1 sx 0 1 0 0] concat
-
-% uncomment this to see the control points
-% 5 psxAR setlinewidth ax1 ay1 moveto 0.1 0 rlineto stroke
-% ax2 ay2 moveto 0.1 0 rlineto stroke linew setlinewidth
-
- drawseg
- 1 VS
- drawseg
- -2 VS
- drawseg
- x2 20 psxAR gt {
- 3 VS
- drawseg
- } if
- x2 50 psxAR gt {
- -4 VS
- drawseg
- } if
- x2 80 psxAR gt {
- 5 VS
- drawseg
- } if
- stroke
-
- grestore
-
- % now some \slurtext code...
-
- /x1 ax1 ax2 add 2 div def % middle of the slur
- /y1 ay1 ay2 add 2 div def
- x1 s cos mul y1 s sin mul add neg
- y1 s cos mul x1 s sin mul sub
- aa 0 lt {1} {0} ifelse
- end
-
- % this is a hack to place the slurtext in the middle of the slur.
- % From unknown reasons simple 'ax1 ay1 translate' did not work,
- % so we have to overlay some definitions with our own, namely
- % 'a', which is originally 'moveto' and 'V' for drawing rules.
- % maybe there are some other operations that should be redefined,
- % but for almost all cases this will be sufficient. If you find
- % anything that won't be typeset at the correct position, let me know...
-
- temp@xx@dict begin
- /dir exch def
- /ay1 exch def
- /ax1 exch def
-} def
-
-% crescendos
-/DC {
- /y2 ED
- /x2 ED
- /y1 ED
- /x1 ED
- gsave
- 1 psxAR ceiling setlinewidth % line thickness: this results
- 1 setlinecap % to exactly 2 pixels in 300 dpi
- 1 setlinejoin
- x2 y2 10 psxAR add moveto % the 10's specify wideness of the
- x1 y1 lineto % open end of the crescendo,
- x2 y2 10 psxAR sub lineto % similarly the 11's below
- stroke
- grestore
-} def
-
-% half crescendos
-/DHC {
- /y2 ED
- /x2 ED
- /y1 ED
- /x1 ED
- gsave
- 1 psxAR ceiling setlinewidth
- 1 setlinecap
- 1 setlinejoin
- x2 y2 11 psxAR add moveto
- x1 y1 4 psxAR add lineto stroke
- x1 y1 4 psxAR sub moveto
- x2 y2 11 psxAR sub lineto
- stroke
- grestore
-} def
-
-% differenced line
-
-/DLN {
- gsave
- psxGDAR ceiling setlinewidth
- psxGDAR exch psxGDAR neg rlineto
- stroke
- grestore
-} def
-
-% sloped line
-
-/DSLN {
- gsave
- psxGDAR ceiling setlinewidth
- psxGDAR exch 1.125 mul neg rotate 0 rlineto
- stroke
- grestore
-} def
-
-% free line (init & terminate)
-
-/DFLN {
- gsave
- psxGDAR ceiling setlinewidth
- CP moveto
- lineto
- stroke
- grestore
-} def
-
-end
-
diff --git a/gpl.txt b/gpl.txt
deleted file mode 100644
index 8de98af..0000000
--- a/gpl.txt
+++ /dev/null
@@ -1,251 +0,0 @@
-
- GNU GENERAL PUBLIC LICENSE
- Version 1, February 1989
-
- Copyright (C) 1989 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The license agreements of most software companies try to keep users
-at the mercy of those companies. By contrast, our General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. The
-General Public License applies to the Free Software Foundation's
-software and to any other program whose authors commit to using it.
-You can use it for your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Specifically, the General Public License is designed to make
-sure that you have the freedom to give away or sell copies of free
-software, that you receive source code or can get it if you want it,
-that you can change the software or use pieces of it in new free
-programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of a such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must tell them their rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any program or other work which
-contains a notice placed by the copyright holder saying it may be
-distributed under the terms of this General Public License. The
-"Program", below, refers to any such program or work, and a "work based
-on the Program" means either the Program or any work containing the
-Program or a portion of it, either verbatim or with modifications. Each
-licensee is addressed as "you".
-
- 1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this
-General Public License and to the absence of any warranty; and give any
-other recipients of the Program a copy of this General Public License
-along with the Program. You may charge a fee for the physical act of
-transferring a copy.
-
- 2. You may modify your copy or copies of the Program or any portion of
-it, and copy and distribute such modifications under the terms of Paragraph
-1 above, provided that you also do the following:
-
- a) cause the modified files to carry prominent notices stating that
- you changed the files and the date of any change; and
-
- b) cause the whole of any work that you distribute or publish, that
- in whole or in part contains the Program or any part thereof, either
- with or without modifications, to be licensed at no charge to all
- third parties under the terms of this General Public License (except
- that you may choose to grant warranty protection to some or all
- third parties, at your option).
-
- c) If the modified program normally reads commands interactively when
- run, you must cause it, when started running for such interactive use
- in the simplest and most usual way, to print or display an
- announcement including an appropriate copyright notice and a notice
- that there is no warranty (or else, saying that you provide a
- warranty) and that users may redistribute the program under these
- conditions, and telling the user how to view a copy of this General
- Public License.
-
- d) You may charge a fee for the physical act of transferring a
- copy, and you may at your option offer warranty protection in
- exchange for a fee.
-
-Mere aggregation of another independent work with the Program (or its
-derivative) on a volume of a storage or distribution medium does not bring
-the other work under the scope of these terms.
-
- 3. You may copy and distribute the Program (or a portion or derivative of
-it, under Paragraph 2) in object code or executable form under the terms of
-Paragraphs 1 and 2 above provided that you also do one of the following:
-
- a) accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of
- Paragraphs 1 and 2 above; or,
-
- b) accompany it with a written offer, valid for at least three
- years, to give any third party free (except for a nominal charge
- for the cost of distribution) a complete machine-readable copy of the
- corresponding source code, to be distributed under the terms of
- Paragraphs 1 and 2 above; or,
-
- c) accompany it with the information you received as to where the
- corresponding source code may be obtained. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form alone.)
-
-Source code for a work means the preferred form of the work for making
-modifications to it. For an executable file, complete source code means
-all the source code for all modules it contains; but, as a special
-exception, it need not include source code for modules which are standard
-libraries that accompany the operating system on which the executable
-file runs, or for standard header files or definitions files that
-accompany that operating system.
-
- 4. You may not copy, modify, sublicense, distribute or transfer the
-Program except as expressly provided under this General Public License.
-Any attempt otherwise to copy, modify, sublicense, distribute or transfer
-the Program is void, and will automatically terminate your rights to use
-the Program under this License. However, parties who have received
-copies, or rights to use copies, from you under this General Public
-License will not have their licenses terminated so long as such parties
-remain in full compliance.
-
- 5. By copying, distributing or modifying the Program (or any work based
-on the Program) you indicate your acceptance of this license to do so,
-and all its terms and conditions.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the original
-licensor to copy, distribute or modify the Program subject to these
-terms and conditions. You may not impose any further restrictions on the
-recipients' exercise of the rights granted herein.
-
- 7. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of the license which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-the license, you may choose any version ever published by the Free Software
-Foundation.
-
- 8. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- Appendix: How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to humanity, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
-
- To do so, attach the following notices to the program. It is safest to
-attach them to the start of each source file to most effectively convey
-the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19xx name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public License. Of course, the
-commands you use may be called something other than `show w' and `show
-c'; they could even be mouse-clicks or menu items--whatever suits your
-program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- program `Gnomovision' (a program to direct compilers to make passes
- at assemblers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/scripts/musixtex/musixtex.lua b/scripts/musixtex/musixtex.lua
index 3977fb3..c85f38a 100755
--- a/scripts/musixtex/musixtex.lua
+++ b/scripts/musixtex/musixtex.lua
@@ -1,6 +1,6 @@
#!/usr/bin/env texlua
-VERSION = "0.11"
+VERSION = "0.12"
--[[
musixtex.lua: processes MusiXTeX files (and deletes intermediate files)
@@ -26,6 +26,9 @@ VERSION = "0.11"
--[[
ChangeLog:
+ version 0.12 2015-11-28 RDT
+ Process .ltx files with -l implied
+
version 0.11 2015-07-16 RDT
Automatic autosp preprocessing.
@@ -64,10 +67,10 @@ VERSION = "0.11"
--]]
function usage()
- print("Usage: [texlua] musixtex.lua { option | basename[.tex] | basename[.aspc] } ... ")
+ print("Usage: [texlua] musixtex.lua { option | basename[.tex] | basename[.aspc] basename[.ltx] } ... ")
print("options: -v version")
print(" -h help")
- print(" -l latex (or pdflatex)")
+ print(" -l latex (or pdflatex) (implied with .ltx extension)")
print(" -p pdfetex (or pdflatex)")
print(" -d dvipdfm")
print(" -s stop at dvi")
@@ -76,7 +79,7 @@ function usage()
print(" -1 one-pass [pdf][la]tex processing")
print(" -F fmt use fmt as the TeX processor")
print(" -x run makeindex")
- print(" -a preprocess using autosp")
+ print(" -a preprocess using autosp (impled with .aspc extension)")
print(" -f restore default processing")
end
@@ -144,31 +147,57 @@ repeat
tex = arg[narg]
else
repeat -- pseudo loop to get effect of "continue" using "break"
- filename = this_arg
- if filename ~= "" and string.sub(filename, -5, -1) == ".aspc" then
- if io.open(filename, "r") then
- print("Processing ".. filename )
+ texfilename = this_arg
+ if texfilename ~= "" and string.sub(texfilename, -5, -1) == ".aspc" then
+ if io.open(texfilename, "r") then
+ print("Processing ".. texfilename )
else
- print("No file: " .. filename )
+ print("No file: " .. texfilename )
break -- out of pseudo loop
end
preprocess = 1
- filename = string.sub(filename, 1, -6)
- elseif filename ~= "" and string.sub(filename, -4, -1) == ".tex" then
- if io.open(filename, "r") then
- print("Processing ".. filename )
+ filename = string.sub(texfilename, 1, -6)
+ texfilename = filename .. ".tex"
+ elseif texfilename ~= "" and string.sub(texfilename, -4, -1) == ".ltx" then
+ if io.open(texfilename, "r") then
+ print("Processing ".. texfilename )
+ else
+ print("No file: " .. texfilename )
+ break -- out of pseudo loop
+ end
+ if tex == "pdfetex" then
+ tex = "pdflatex"
else
- print("No file: " .. filename )
+ tex = "latex"
+ end
+ filename = string.sub(texfilename, 1, -5)
+ elseif texfilename ~= "" and string.sub(texfilename, -4, -1) == ".tex" then
+ if io.open(texfilename, "r") then
+ print("Processing ".. texfilename )
+ else
+ print("No file: " .. texfilename )
break -- out of pseudo loop
end
- filename = string.sub(filename, 1, -5)
- elseif io.open(filename .. ".aspc", "r") then
+ filename = string.sub(texfilename, 1, -5)
+ elseif io.open(texfilename .. ".aspc", "r") then
preprocess = 1
- print("Processing ".. filename .. ".aspc")
- elseif io.open(filename .. ".tex", "r") then
- print("Processing ".. filename .. ".tex")
+ print("Processing ".. texfilename .. ".aspc")
+ filename = texfilename
+ elseif io.open(texfilename .. ".ltx", "r") then
+ if tex == "pdfetex" then
+ tex = "pdflatex"
+ else
+ tex = "latex"
+ end
+ ltx = 1
+ filename = texfilename
+ texfilename = filename .. ".ltx"
+ elseif io.open(texfilename .. ".tex", "r") then
+ print("Processing ".. texfilename .. ".tex")
+ filename = texfilename
+ texfilename = filename .. ".tex"
else
- print("No file: " .. filename )
+ print("No file: " .. texfilename )
break -- out of pseudo loop
end
if preprocess == 1 and os.execute("autosp " .. filename) ~= 0 then
@@ -176,18 +205,18 @@ repeat
break -- out of pseudo loop
end
os.remove( filename .. ".mx2" )
- if (passes == 1 or os.execute(tex .. " " .. filename) == 0) and
+ if (passes == 1 or os.execute(tex .. " " .. texfilename) == 0) and
(passes == 1 or os.execute(musixflx .. " " .. filename) == 0) and
- (os.execute(tex .. " " .. filename) == 0) and
+ (os.execute(tex .. " " .. texfilename) == 0) and
((tex ~= "latex" and tex ~="pdflatex")
or (index == 0)
or (os.execute("makeindex -q " .. filename) == 0)) and
((tex ~= "latex" and tex ~= "pdflatex")
- or (os.execute(tex .. " " .. filename) == 0)) and
+ or (os.execute(tex .. " " .. texfilename) == 0)) and
((tex ~= "latex" and tex ~= "pdflatex")
- or (os.execute(tex .. " " .. filename) == 0)) and
+ or (os.execute(tex .. " " .. texfilename) == 0)) and
((tex ~= "latex" and tex ~= "pdflatex")
- or (os.execute(tex .. " " .. filename) == 0)) and
+ or (os.execute(tex .. " " .. texfilename) == 0)) and
(dvi == "" or (os.execute(dvi .. " " .. filename) == 0)) and
(ps2pdf == "" or (os.execute(ps2pdf .. " " .. filename .. ".ps") == 0) )
then
@@ -205,7 +234,7 @@ repeat
end
end
else
- print("Musixtex processing of " .. filename .. ".tex fails.\n")
+ print("Musixtex processing of " .. texfilename " fails.\n")
exit_code = 2
--[[ uncomment for debugging
print("tex = ", tex)
diff --git a/tex/generic/musixtex/musixec.tex b/tex/generic/musixtex/musixec.tex
index ced44c0..7225273 100644
--- a/tex/generic/musixtex/musixec.tex
+++ b/tex/generic/musixtex/musixec.tex
@@ -23,7 +23,7 @@
%
% Copyright 2015 Bob Tennent rdt@cs.queensu.ca
%
-\immediate\write16{MusiXec\space<2015/02/11>}
+\immediate\write16{MusiXec\space<2015/07/28>}
%
\newif\iflongDCfontnames
@@ -212,5 +212,30 @@
\zcharnote{#2}{\kern\h@lf\qn@width\kern \half@sign@skip\lrlap{\txtfont#1}}}
\catcode`\@=\catcodeat
+%
+% Redefine accented characters for etex, suggested by David Carlisle:
+%
+\ifx\documentclass\undefined
+\def\ProvidesFile#1[#2]{}
+\def\DeclareFontEncoding#1#2#3{}
+\def\DeclareTextAccent#1#2#3{%
+\def#1##1{%
+\expandafter\ifx\csname T1\string#1-\string##1\endcsname\relax
+{\accent#1 ##1}%
+\else
+\csname T1\string#1-\string##1\expandafter\endcsname
+\fi}}
+\def\DeclareTextCommand#1#2{\xdtcmd}%not today
+\def\xdtcmd#1#{\xxdtcmd}%not today
+\def\xxdtcmd#1{}%not today
+\def\DeclareTextCompositeCommand#1#2#3#4{}%not today
+\def\DeclareTextSymbol#1#2#3{%
+\def#1{\char#3\relax}}
+\def\DeclareTextComposite#1#2#3#4{%
+\expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}}
+
+\input t1enc.def
+\fi
+
\normtype
\endinput
diff --git a/tex/generic/musixtex/musixtex.tex b/tex/generic/musixtex/musixtex.tex
index 3de1de2..0016785 100644
--- a/tex/generic/musixtex/musixtex.tex
+++ b/tex/generic/musixtex/musixtex.tex
@@ -25,15 +25,20 @@
\def\mufl@x{0.83}%
\def\mxmajorvernumber{1}
-\def\mxminorvernumber{18}
+\def\mxminorvernumber{19}
\def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
\def\mxversuffix{}%
\edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{2015-07-25}
+\def\mxdate{2015-11-29}
\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
\everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
+% version 1.19:
+
+% RDT corrected typos in the definition of \comput@fonts affecting ppff fonts for \Largemusicsize
+% RDT introduced definitions for tremolo commands \trml, \trmu, etc.
+
% version 1.18:
% RDT added definitions of \raggedstoppiece and \slide from musixext.tex
@@ -1609,11 +1614,11 @@
\let\hslurud\hslurutwentyd \let\hslurdd\hslurdtwentyd %+ickd
\let\meternorfont\svtbfg \let\metersmallfont\frtbf % version 1.18 RDT
\let\meterbigfont\twtybfg \let\meterlargefont\twfvbf
- \let\meterLargefont\twfvbfg
- \let\tinyppff\ppfftwentyg
- \let\smallppff\ppfftwentyfourg
- \let\normppff\ppfftwentynineg
- \let\medppff\ppfftwentynineg
+ \let\meterLargefont\twfvbf
+ \let\tinyppff\ppfftwenty
+ \let\smallppff\ppfftwentyfour
+ \let\normppff\ppfftwentynine
+ \let\medppff\ppfftwentynine
\else
\ifnum\musicsize=\tw@nty
\else\ifnum\musicsize=\z@
@@ -4206,6 +4211,24 @@
% Correction by Julian Gilbey
\the\tr@sw\xleaders\hbox{\musixchar69}\hfill}}%
+%%% tremolos version 1.19 RDT
+%%% based on code by Werner Icking and Andre van Ryckeghem
+
+\def\trml#1{\advance\transpose2\loffset{0.5}{\ibl0{#1}9}\roffset{0.5}{\tbl0}\advance\transpose-2}%
+\def\trmu#1{\advance\transpose-3\loffset{0.5}{\ibu0{#1}9}\roffset{0.5}{\tbu0}\advance\transpose3}%
+\def\trrml#1{\advance\transpose2\loffset{0.5}{\ibbl0{#1}9}\roffset{0.5}{\tbl0}\advance\transpose-2}%
+\def\trrmu#1{\advance\transpose-3\loffset{0.5}{\ibbu0{#1}9}\roffset{0.5}{\tbu0}\advance\transpose3}%
+\def\trrrml#1{\advance\transpose2\loffset{0.5}{\ibbbl0{#1}9}\roffset{0.5}{\tbl0}\advance\transpose-2}%
+\def\trrrmu#1{\advance\transpose-3\loffset{0.5}{\ibbbu0{#1}9}\roffset{0.5}{\tbu0}\advance\transpose3}%
+
+% whole notes are wider than quarter/half notes:
+\def\Trml#1{\advance\transpose2\loffset0{\ibl0{#1}9}\roffset{1.125}{\tbl0}\advance\transpose-2}%
+\def\Trmu#1{\advance\transpose-3\loffset{1.125}{\ibu0{#1}9}\roffset0{\tbu0}\advance\transpose3}%
+\def\Trrml#1{\advance\transpose2\loffset0{\ibbl0{#1}9}\roffset{1.125}{\tbl0}\advance\transpose-2}%
+\def\Trrmu#1{\advance\transpose-3\loffset{1.125}{\ibbu0{#1}9}\roffset0{\tbu0}\advance\transpose3}%
+\def\Trrrml#1{\advance\transpose2\loffset0{\ibbbl0{#1}9}\roffset{1.125}{\tbl0}\advance\transpose-2}%
+\def\Trrrmu#1{\advance\transpose-3\loffset{1.125}{\ibbbu0{#1}9}\roffset0{\tbu0}\advance\transpose3}%
+
%%% octave lines
\def\octnumberup{\octnumberdefault\vrule width 0pt height2ex}
@@ -4307,7 +4330,11 @@
%%% some specials
-\def\metron#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2}}
+% \def\metron#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2}}
+% version 1.19 RDT:
+\let\lyricson\relax
+\let\lyricsoff\relax
+\def\metron#1#2{{\lyricsoff\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2\lyricson}}
\def\metronequiv#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2 1}}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/musixtex.git
Reply to: