diff options
27 files changed, 21 insertions, 217 deletions
diff --git a/Master/bin/alpha-linux/fixmsxpart b/Master/bin/alpha-linux/fixmsxpart Binary files differdeleted file mode 100755 index ecb6171a49c..00000000000 --- a/Master/bin/alpha-linux/fixmsxpart +++ /dev/null diff --git a/Master/bin/amd64-freebsd/fixmsxpart b/Master/bin/amd64-freebsd/fixmsxpart Binary files differdeleted file mode 100755 index ef7c268ebdd..00000000000 --- a/Master/bin/amd64-freebsd/fixmsxpart +++ /dev/null diff --git a/Master/bin/amd64-netbsd/fixmsxpart b/Master/bin/amd64-netbsd/fixmsxpart Binary files differdeleted file mode 100755 index c78c8ace55a..00000000000 --- a/Master/bin/amd64-netbsd/fixmsxpart +++ /dev/null diff --git a/Master/bin/armel-linux/fixmsxpart b/Master/bin/armel-linux/fixmsxpart Binary files differdeleted file mode 100755 index 702524070bd..00000000000 --- a/Master/bin/armel-linux/fixmsxpart +++ /dev/null diff --git a/Master/bin/armhf-linux/fixmsxpart b/Master/bin/armhf-linux/fixmsxpart Binary files differdeleted file mode 100755 index dfd4734a96b..00000000000 --- a/Master/bin/armhf-linux/fixmsxpart +++ /dev/null diff --git a/Master/bin/i386-cygwin/fixmsxpart.exe b/Master/bin/i386-cygwin/fixmsxpart.exe Binary files differdeleted file mode 100755 index e9d61327557..00000000000 --- a/Master/bin/i386-cygwin/fixmsxpart.exe +++ /dev/null diff --git a/Master/bin/i386-freebsd/fixmsxpart b/Master/bin/i386-freebsd/fixmsxpart Binary files differdeleted file mode 100755 index f802ccf1b1c..00000000000 --- a/Master/bin/i386-freebsd/fixmsxpart +++ /dev/null diff --git a/Master/bin/i386-netbsd/fixmsxpart b/Master/bin/i386-netbsd/fixmsxpart Binary files differdeleted file mode 100755 index daba4bfb9b7..00000000000 --- a/Master/bin/i386-netbsd/fixmsxpart +++ /dev/null diff --git a/Master/bin/i386-solaris/fixmsxpart b/Master/bin/i386-solaris/fixmsxpart Binary files differdeleted file mode 100755 index 47cf563c178..00000000000 --- a/Master/bin/i386-solaris/fixmsxpart +++ /dev/null diff --git a/Master/bin/powerpc-linux/fixmsxpart b/Master/bin/powerpc-linux/fixmsxpart Binary files differdeleted file mode 100755 index 6aa11241c26..00000000000 --- a/Master/bin/powerpc-linux/fixmsxpart +++ /dev/null diff --git a/Master/bin/sparc-solaris/fixmsxpart b/Master/bin/sparc-solaris/fixmsxpart Binary files differdeleted file mode 100755 index 017b8b507b7..00000000000 --- a/Master/bin/sparc-solaris/fixmsxpart +++ /dev/null diff --git a/Master/bin/universal-darwin/fixmsxpart b/Master/bin/universal-darwin/fixmsxpart Binary files differdeleted file mode 100755 index a5eecf6a560..00000000000 --- a/Master/bin/universal-darwin/fixmsxpart +++ /dev/null diff --git a/Master/bin/win32/msxlint.exe b/Master/bin/win32/msxlint.exe Binary files differindex c68e9dd5f3e..67441ce567d 100755 --- a/Master/bin/win32/msxlint.exe +++ b/Master/bin/win32/msxlint.exe diff --git a/Master/bin/x86_64-cygwin/fixmsxpart.exe b/Master/bin/x86_64-cygwin/fixmsxpart.exe Binary files differdeleted file mode 100755 index 3eae67bca27..00000000000 --- a/Master/bin/x86_64-cygwin/fixmsxpart.exe +++ /dev/null diff --git a/Master/bin/x86_64-darwin/fixmsxpart b/Master/bin/x86_64-darwin/fixmsxpart Binary files differdeleted file mode 100755 index e1159effc03..00000000000 --- a/Master/bin/x86_64-darwin/fixmsxpart +++ /dev/null diff --git a/Master/bin/x86_64-solaris/fixmsxpart b/Master/bin/x86_64-solaris/fixmsxpart Binary files differdeleted file mode 100755 index a266f73b848..00000000000 --- a/Master/bin/x86_64-solaris/fixmsxpart +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/musixtnt/README b/Master/texmf-dist/doc/generic/musixtnt/README index feb85055448..78adcc1c8a4 100644 --- a/Master/texmf-dist/doc/generic/musixtnt/README +++ b/Master/texmf-dist/doc/generic/musixtnt/README @@ -1,7 +1,7 @@ -This archive contains a MusiXTeX extension library musixtnt -and C source code, binaries for Windows (32 bit and 64 bit) -and MacOSX, and documentation for two programs: fixmsxpart -and msxlint. +This archive contains a MusiXTeX extension library +musixtnt.tex and C source code, binaries for Windows (32 +bit and 64 bit) and MacOSX, and documentation for a program +msxlint. musixtnt.tex provides a macro \TransformNotes that enables transformations of the effect of notes @@ -12,12 +12,8 @@ pattern, but the notes will be typeset according to the output pattern. An example is extracting single-instrument parts from a multi-instrument score. -fixmsxpart corrects note spacing in a single-part MusiXTeX -source (possibly derived from a multi-instrument score and -as a result having irregular note spacing). - msxlint detects incorrectly formatted notes lines in a -MusiXTeX source file. This should be used before using +MusiXTeX source file. This should be used before using \TransformNotes. To install: @@ -35,19 +31,19 @@ If your platform is UNIX-like, process the musixtnt-<version>.tar.gz file as usual (tar zxvf ..., ./configure, make, make install). -If your platform is Windows, move the executables -msxlint.exe and fixmsxpart.exe in either the 32bit or the -64bit folders to a folder on the executable PATH. +If your platform is Windows, move the executable msxlint.exe +from either the 32bit or the 64bit folder to a folder on the +executable PATH. -If your platform is Mac OS-X, install the executables -in the macosx directory. +If your platform is Mac OS-X, install the executable from +the macosx directory. -musixtnt.tex, fixmsxpart.c, utils.c and msxlint.c are -licensed under the GPL version 2. +musixtnt.tex, utils.c and msxlint.c are licensed under the +GPL version 2 or (at your option) any later version. Please report bugs and experience (good or bad) using these programs to me. Bob Tennent -rdt@cs.queensu.ca -2015-02-18 +rdt(at)cs(dot)queensu(dot)ca +2016-01-30 diff --git a/Master/texmf-dist/doc/generic/musixtnt/TransformNotes.3 b/Master/texmf-dist/doc/generic/musixtnt/TransformNotes.3 index 4db043a9818..752aa02985c 100644 --- a/Master/texmf-dist/doc/generic/musixtnt/TransformNotes.3 +++ b/Master/texmf-dist/doc/generic/musixtnt/TransformNotes.3 @@ -1,4 +1,4 @@ -.TH TransformNotes 3 2015-01-18 "" "" +.TH TransformNotes 3 2016-01-30 "" "" .SH NAME TransformNotes \- macro to transform notes command arguments in MusiXTeX @@ -15,7 +15,7 @@ TransformNotes \- macro to transform notes command arguments in MusiXTeX .SH USAGE musixtnt.tex is an extension library for MusiXTeX. It is available -at WIMA in the software archive. +at CTAN and at WIMA in the software archive. \\TransformNotes makes possible transformations of the effect of notes commands such as \\notes. In general, the effect of \\TransformNotes{input}{output} @@ -37,10 +37,7 @@ the score match the pattern of the first argument to \\TransformNotes exactly; t note segments will result in unintentionally discarded material and possibly compilation failure. An auxiliary program .BR msxlint (1) -can be used to detect such inconsistencies; -it is available at WIMA in the -software -archive. +can be used to detect such inconsistencies. Notes commands are assumed to be terminated by \\en, not \\enotes. \\TransformNotes may be used anywhere between \\startpiece @@ -68,8 +65,8 @@ When the extracted part score is compiled and viewed, it may be seen that horizontal-spacing commands designed for multiple instruments can produce bad spacing when used for a single instrument. Bad spacing can be corrected manually but this is very tedious; an auxiliary program called -.BR fixmsxpart (1) -automates this process (for single-staff instruments only); it is available at WIMA +.BR autosp (1) +automates this process; it is available at WIMA in the software archive. The \\TransformNotes macro may be used for other purposes. Here are some examples: @@ -92,7 +89,7 @@ package for lyrics. .SH SEE ALSO .BR msxlint (1), -.BR fixmsxpart (1) +.BR autosp (1) .PP musixdoc.pdf diff --git a/Master/texmf-dist/doc/generic/musixtnt/TransformNotes.pdf b/Master/texmf-dist/doc/generic/musixtnt/TransformNotes.pdf Binary files differindex 1e9374edd95..2cd529e0310 100644 --- a/Master/texmf-dist/doc/generic/musixtnt/TransformNotes.pdf +++ b/Master/texmf-dist/doc/generic/musixtnt/TransformNotes.pdf diff --git a/Master/texmf-dist/doc/generic/musixtnt/fixmsxpart.pdf b/Master/texmf-dist/doc/generic/musixtnt/fixmsxpart.pdf Binary files differdeleted file mode 100644 index 833c48e57fd..00000000000 --- a/Master/texmf-dist/doc/generic/musixtnt/fixmsxpart.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/musixtnt/musixtnt-2015-02-09.tar.gz b/Master/texmf-dist/doc/generic/musixtnt/musixtnt-2015-02-09.tar.gz Binary files differdeleted file mode 100644 index 9bf6291cadf..00000000000 --- a/Master/texmf-dist/doc/generic/musixtnt/musixtnt-2015-02-09.tar.gz +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/musixtnt/musixtnt-2016-01-30.tar.gz b/Master/texmf-dist/doc/generic/musixtnt/musixtnt-2016-01-30.tar.gz Binary files differnew file mode 100644 index 00000000000..979058bdd65 --- /dev/null +++ b/Master/texmf-dist/doc/generic/musixtnt/musixtnt-2016-01-30.tar.gz diff --git a/Master/texmf-dist/doc/man/man1/fixmsxpart.1 b/Master/texmf-dist/doc/man/man1/fixmsxpart.1 deleted file mode 100644 index 2a546fcea3d..00000000000 --- a/Master/texmf-dist/doc/man/man1/fixmsxpart.1 +++ /dev/null @@ -1,185 +0,0 @@ -.\" This manpage is licensed under the GNU Public License -.TH FIXMSXPART 1 2015-02-05 "" "" - -.SH NAME -fixmsxpart \- corrects note spacing in a single-staff MusiXTeX part - -.SH SYNOPSIS -.B fixmsxpart -.RB [ \-v\ |\ \-\-version\ |\ \-h\ |\ \-\-help ] - -.B fixmsxpart -.RB [ \-d\ | \ \-\-debug ] -.IR infile [ \fB.tex\fB ] -.RI [ outfile [ \fB.tex\fP ]] - - -Converts a single-staff MusiXTeX part (possibly derived from a multi-instrument score and as a result having irregular note spacing) to a single-staff part with proper spacing determined by the notes themselves. - -If -.IR outfile -is not specifed, standard output is used. - -.SH USAGE - -.SS Generating a Single-Instrument Part - -To generate a single-instrument part from (a copy of) the MusiXTeX source for -a multi-instrument score, add -.nf - - \\input musixtnt - -.fi -to the preamble, -set -.nf - - \\instrumentnumber1 - -.fi -and use the \\TransformNotes macro defined in musixtnt.tex to discard all but one part. -For example, the following line placed -after -\\startpiece (but before any note commands) would be appropriate for -a -.IR four -instrument -score (arguments #2, #3, #4, and #5, separated by three &s), -and will result in a part for the -.IR second -of these (#3): - -.nf - \\TransformNotes{#2}{#3} -.fi - -Argument #1 is a scaling -parameter and should not be modified. -.B -It is essential that every \\znotes, \\notes, \\Notes, \\NOtes, etc. command in the score match the macro pattern exactly; -insufficient (or too many) note segments -will result in lost text and possibly compilation failure; see -.BR msxlint (1). -It is assumed by \\TransformNotes that notes commands are terminated by \\en (rather than \\enotes). - -Some additional manual changes to the source will be necessary: -.TP 3 -+ -adjustments of \\setname1, \\setclef1, \\setsign1 , \\setmeter1 and \\setstaffs1 commands, as necessary; -.TP 3 -+ -ensuring that tempo and roadmap markings -.RB ( D.C. , -.BR Fine , -etc.) are in the -appropriate instrument segment; -.PP -Finally, if the modified score is compiled and viewed, it may be seen that horizontal -spacing designed for -.I multiple -instruments often produces bad -spacing for a -.IR single -instrument. -This can be corrected manually (and very tediously) but it is -what -.B fixmsxpart -was designed to fix (much more conveniently). - -.SS Correcting Horizontal Spacing Using fixmsxpart -The -\\notes \\Notes \\NOtes \\NOTes... -commands in a -part derived from a multi-instrument score are unreliable, -and so -.B fixmsxpart -determines the spacing for ordinary notes by the note -commands themselves; for example, -.TP 3 -+ -\\qa, \\qu, \\ql, \\qp result in -\\NOtes; -.TP 3 -+ -\\ca, \\cu, \\cl, \\ds result in \\Notes; -.PP -and so on. -Spacing commands \\sk and \\hsk in the input are -discarded (but \\qsk, \\hqsk and explicit uses of \\off{...} are preserved). - -.B fixmsxpart -determines the spacing for -.IR beamed -notes by the beam -multiplicity: \\ib... results in \\Notes, \\ibb... results in -\\notes, etc. Some beam-termination commands (\\tb...) are -problematic because the immediately-following beam note -\\qb... must be spaced according to the spacing -.IR before -the \\tb... command. This is handled by setting a -variable -.IR new_beaming -when processing the \\tb... command -and only updating -.IR beaming -to -.IR new_beaming -when processing -the subsequent beam note. This isn't needed for the -abbreviations \\tqb, \\tqh, \\ztqb and \\ztqh which combine beam-termination and -specification of the -final beam note. - -.IR Pointed -notes are -.IR not -given extra space -automatically. They should be given extra space manually -in the score -by using either a \\roff-like command on the subsequent -note or the \\qsk or \\hqsk spacing commands. - -Additional features of -.BR fixmsxpart -transformation: -.TP 3 -+ -Successive whole-bar rests are -accumulated into a multi-bar rest, with appropriate adjustment of the bar number. -.TP 3 -+ -\\alaligne -and \\alapage commands are replaced by \\bar. -.TP 3 -+ -\\mulooseness, \\eject, \\linegoal, \\song{top | bottom}, \\group{top | bottom} -and \\akkoladen -commands are commented out. -.TP 3 -+ -\\instrumentnumber... commands become -\\instrumentnumber1. -.TP 3 -+ -\\nostartrule is added to -the preamble. -.TP 3 -+ -Simple slurs or ties initiated by \\slur or \\tie are normalized by -setting the -.IR n -parameter to 1 on the -assumption that the new note spacing is correct. - -.SH LIMITATIONS -Only single-staff instrumental parts are supported. User-defined macros are not expanded. -A few esoteric MusiXTeX commands -and constructions are not supported. - -.SH SEE ALSO -.BR msxlint (1) -.PP -musixdoc.pdf - -.SH AUTHOR -This program and manual page were written by Bob Tennent <rdt@cs.queensu.ca>. diff --git a/Master/texmf-dist/doc/man/man1/fixmsxpart.man1.pdf b/Master/texmf-dist/doc/man/man1/fixmsxpart.man1.pdf Binary files differdeleted file mode 100644 index b259c22a813..00000000000 --- a/Master/texmf-dist/doc/man/man1/fixmsxpart.man1.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/man/man1/msxlint.man1.pdf b/Master/texmf-dist/doc/man/man1/msxlint.man1.pdf Binary files differindex 0707ad7f9e6..ff468a54488 100644 --- a/Master/texmf-dist/doc/man/man1/msxlint.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/msxlint.man1.pdf diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 37979d67711..32abd5560fc 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -727,8 +727,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'multido', "&MAKEpst", 'multirow', "&MAKEflatten", 'musictex', "die 'skipping, superseded by musixtex", - 'musixtnt', "die 'skipping, for TL16 per rdt'", -# 'musixtnt', "&MAKEflatten", + 'musixtnt', "&MAKEflatten", 'mwrite', "die 'skipping, nonfree license", 'mx' , "die 'skipping, author does not recommend system install'", 'mxd', "die 'skipping, noinfo license, old mongolian'", diff --git a/Master/tlpkg/tlpsrc/musixtnt.tlpsrc b/Master/tlpkg/tlpsrc/musixtnt.tlpsrc index 6859465bae2..96a932eff53 100644 --- a/Master/tlpkg/tlpsrc/musixtnt.tlpsrc +++ b/Master/tlpkg/tlpsrc/musixtnt.tlpsrc @@ -1,7 +1,4 @@ depend musixtex # -binpattern f bin/${ARCH}/fixmsxpart -docpattern +f texmf-dist/doc/man/man1/fixmsxpart.* -# binpattern f bin/${ARCH}/msxlint docpattern +f texmf-dist/doc/man/man1/msxlint.* |