diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-02-10 16:33:02 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-02-10 16:33:02 +0000 |
commit | 85a12660c810339230543aa4d8975c3e578ea1ce (patch) | |
tree | 24f9639ba9f678306e792b6906da765e2b61e8d9 /Build/source/texk/musixtnt | |
parent | ac4e58eccab2dbf0b957d99edbd05ae1a6053dcd (diff) |
musixtnt 2016-01-30
git-svn-id: svn://tug.org/texlive/trunk@39658 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/musixtnt')
-rw-r--r-- | Build/source/texk/musixtnt/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/Makefile.am | 14 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/Makefile.in | 29 | ||||
-rwxr-xr-x | Build/source/texk/musixtnt/configure | 26 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/configure.ac | 4 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-2015-02-09-PATCHES/patch-01-too-many-args | 13 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-2015-02-09-PATCHES/patch-02-portability | 12 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-2015-02-09/fixmsxpart.1 | 185 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-2015-02-09/fixmsxpart.c | 889 | ||||
-rwxr-xr-x | Build/source/texk/musixtnt/musixtnt-2015-02-09/fixmsxpart.test | 37 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/fixtest.out | 129 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/fixtest.tex | 159 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src-PATCHES/ChangeLog (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09-PATCHES/ChangeLog) | 7 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src-PATCHES/TL-Changes (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09-PATCHES/TL-Changes) | 3 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src/AUTHORS (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09/AUTHORS) | 0 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src/ChangeLog (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09/ChangeLog) | 13 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src/Makefile.am (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09/Makefile.am) | 10 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src/README (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09/README) | 11 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src/acinclude.m4 (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09/acinclude.m4) | 0 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src/configure.ac (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09/configure.ac) | 2 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src/msxlint.1 (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09/msxlint.1) | 0 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src/msxlint.c (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09/msxlint.c) | 6 | ||||
-rwxr-xr-x | Build/source/texk/musixtnt/musixtnt-src/msxlint.test (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09/msxlint.test) | 0 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src/tests/badtest.tex (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/badtest.tex) | 0 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src/tests/linttest.out (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/linttest.out) | 0 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src/tests/linttest.tex (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/linttest.tex) | 0 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src/utils.c (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09/utils.c) | 0 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/musixtnt-src/utils.h (renamed from Build/source/texk/musixtnt/musixtnt-2015-02-09/utils.h) | 6 | ||||
-rw-r--r-- | Build/source/texk/musixtnt/version.ac | 2 |
29 files changed, 67 insertions, 1495 deletions
diff --git a/Build/source/texk/musixtnt/ChangeLog b/Build/source/texk/musixtnt/ChangeLog index 3a921f67dec..026bb161c3e 100644 --- a/Build/source/texk/musixtnt/ChangeLog +++ b/Build/source/texk/musixtnt/ChangeLog @@ -1,3 +1,7 @@ +2016-02-10 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + Import musixtnt-2016-01-30. + 2015-07-07 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Better dependencies for 'make check'. @@ -14,4 +18,3 @@ 2015-02-10 Peter Breitenlohner <peb@mppmu.mpg.de> Import musixtnt-2015-02-09. - diff --git a/Build/source/texk/musixtnt/Makefile.am b/Build/source/texk/musixtnt/Makefile.am index 66d33948852..e8269184487 100644 --- a/Build/source/texk/musixtnt/Makefile.am +++ b/Build/source/texk/musixtnt/Makefile.am @@ -18,22 +18,17 @@ NEVER_NAMES += $(NEVER_NAMES_SUB) AM_CPPFLAGS = -I$(top_srcdir)/$(MUSIXTNT_TREE) $(KPATHSEA_INCLUDES) -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) -bin_PROGRAMS = fixmsxpart msxlint - -fixmsxpart_SOURCES = \ - @MUSIXTNT_TREE@/fixmsxpart.c \ - @MUSIXTNT_TREE@/utils.c +bin_PROGRAMS = msxlint msxlint_SOURCES = \ @MUSIXTNT_TREE@/msxlint.c \ @MUSIXTNT_TREE@/utils.c -$(fixmsxpart_OBJECTS) $(msxlint_OBJECTS): $(KPATHSEA_DEPEND) +$(msxlint_OBJECTS): $(KPATHSEA_DEPEND) LDADD = $(KPATHSEA_LIBS) dist_man_MANS = \ - $(MUSIXTNT_TREE)/fixmsxpart.1 \ $(MUSIXTNT_TREE)/msxlint.1 ## Rebuild libkpathsea @@ -42,9 +37,8 @@ dist_man_MANS = \ ## Tests ## TESTS_ENVIRONMENT = testsrc="$(srcdir)/$(MUSIXTNT_TREE)/tests" -TESTS = $(MUSIXTNT_TREE)/fixmsxpart.test $(MUSIXTNT_TREE)/msxlint.test -$(MUSIXTNT_TREE)/fixmsxpart.log: fixmsxpart$(EXEEXT) +TESTS = $(MUSIXTNT_TREE)/msxlint.test $(MUSIXTNT_TREE)/msxlint.log: msxlint$(EXEEXT) -DISTCLEANFILES = fixtest.* linttest.* +DISTCLEANFILES = linttest.* NEVER_DIST += $(TESTS:.test=.log) $(TESTS:.test=.trs) diff --git a/Build/source/texk/musixtnt/Makefile.in b/Build/source/texk/musixtnt/Makefile.in index 6dc65b99244..f09ed69d04b 100644 --- a/Build/source/texk/musixtnt/Makefile.in +++ b/Build/source/texk/musixtnt/Makefile.in @@ -88,7 +88,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = fixmsxpart$(EXEEXT) msxlint$(EXEEXT) +bin_PROGRAMS = msxlint$(EXEEXT) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -113,12 +113,7 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) am__dirstamp = $(am__leading_dot)dirstamp -am_fixmsxpart_OBJECTS = @MUSIXTNT_TREE@/fixmsxpart.$(OBJEXT) \ - @MUSIXTNT_TREE@/utils.$(OBJEXT) -fixmsxpart_OBJECTS = $(am_fixmsxpart_OBJECTS) -fixmsxpart_LDADD = $(LDADD) am__DEPENDENCIES_1 = -fixmsxpart_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -162,8 +157,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(fixmsxpart_SOURCES) $(msxlint_SOURCES) -DIST_SOURCES = $(fixmsxpart_SOURCES) $(msxlint_SOURCES) +SOURCES = $(msxlint_SOURCES) +DIST_SOURCES = $(msxlint_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -560,22 +555,17 @@ NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' AM_CPPFLAGS = -I$(top_srcdir)/$(MUSIXTNT_TREE) $(KPATHSEA_INCLUDES) -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) -fixmsxpart_SOURCES = \ - @MUSIXTNT_TREE@/fixmsxpart.c \ - @MUSIXTNT_TREE@/utils.c - msxlint_SOURCES = \ @MUSIXTNT_TREE@/msxlint.c \ @MUSIXTNT_TREE@/utils.c LDADD = $(KPATHSEA_LIBS) dist_man_MANS = \ - $(MUSIXTNT_TREE)/fixmsxpart.1 \ $(MUSIXTNT_TREE)/msxlint.1 TESTS_ENVIRONMENT = testsrc="$(srcdir)/$(MUSIXTNT_TREE)/tests" -TESTS = $(MUSIXTNT_TREE)/fixmsxpart.test $(MUSIXTNT_TREE)/msxlint.test -DISTCLEANFILES = fixtest.* linttest.* +TESTS = $(MUSIXTNT_TREE)/msxlint.test +DISTCLEANFILES = linttest.* all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -685,14 +675,9 @@ clean-binPROGRAMS: @MUSIXTNT_TREE@/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) @MUSIXTNT_TREE@/$(DEPDIR) @: > @MUSIXTNT_TREE@/$(DEPDIR)/$(am__dirstamp) -@MUSIXTNT_TREE@/fixmsxpart.$(OBJEXT): @MUSIXTNT_TREE@/$(am__dirstamp) \ - @MUSIXTNT_TREE@/$(DEPDIR)/$(am__dirstamp) @MUSIXTNT_TREE@/utils.$(OBJEXT): @MUSIXTNT_TREE@/$(am__dirstamp) \ @MUSIXTNT_TREE@/$(DEPDIR)/$(am__dirstamp) -fixmsxpart$(EXEEXT): $(fixmsxpart_OBJECTS) $(fixmsxpart_DEPENDENCIES) $(EXTRA_fixmsxpart_DEPENDENCIES) - @rm -f fixmsxpart$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(fixmsxpart_OBJECTS) $(fixmsxpart_LDADD) $(LIBS) @MUSIXTNT_TREE@/msxlint.$(OBJEXT): @MUSIXTNT_TREE@/$(am__dirstamp) \ @MUSIXTNT_TREE@/$(DEPDIR)/$(am__dirstamp) @@ -707,7 +692,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@@MUSIXTNT_TREE@/$(DEPDIR)/fixmsxpart.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@MUSIXTNT_TREE@/$(DEPDIR)/msxlint.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@MUSIXTNT_TREE@/$(DEPDIR)/utils.Po@am__quote@ @@ -1313,10 +1297,9 @@ uninstall-man: uninstall-man1 dist-hook: cd "$(distdir)" && rm -rf $(NEVER_DIST) -$(fixmsxpart_OBJECTS) $(msxlint_OBJECTS): $(KPATHSEA_DEPEND) +$(msxlint_OBJECTS): $(KPATHSEA_DEPEND) @KPATHSEA_RULE@ -$(MUSIXTNT_TREE)/fixmsxpart.log: fixmsxpart$(EXEEXT) $(MUSIXTNT_TREE)/msxlint.log: msxlint$(EXEEXT) # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Build/source/texk/musixtnt/configure b/Build/source/texk/musixtnt/configure index 3d9b92dacf5..8563014bccc 100755 --- a/Build/source/texk/musixtnt/configure +++ b/Build/source/texk/musixtnt/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for musixtnt (TeX Live) 2015-02-09. +# Generated by GNU Autoconf 2.69 for musixtnt (TeX Live) 2016-01-30. # # Report bugs to <tex-k@tug.org>. # @@ -590,12 +590,12 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='musixtnt (TeX Live)' PACKAGE_TARNAME='musixtnt--tex-live-' -PACKAGE_VERSION='2015-02-09' -PACKAGE_STRING='musixtnt (TeX Live) 2015-02-09' +PACKAGE_VERSION='2016-01-30' +PACKAGE_STRING='musixtnt (TeX Live) 2016-01-30' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' -ac_unique_file="musixtnt-2015-02-09/msxlint.c" +ac_unique_file="musixtnt-src/msxlint.c" # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -1328,7 +1328,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures musixtnt (TeX Live) 2015-02-09 to adapt to many kinds of systems. +\`configure' configures musixtnt (TeX Live) 2016-01-30 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1399,7 +1399,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of musixtnt (TeX Live) 2015-02-09:";; + short | recursive ) echo "Configuration of musixtnt (TeX Live) 2016-01-30:";; esac cat <<\_ACEOF @@ -1518,7 +1518,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -musixtnt (TeX Live) configure 2015-02-09 +musixtnt (TeX Live) configure 2016-01-30 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2174,7 +2174,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by musixtnt (TeX Live) $as_me 2015-02-09, which was +It was created by musixtnt (TeX Live) $as_me 2016-01-30, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -7859,7 +7859,7 @@ fi # Define the identity of the package. PACKAGE='musixtnt--tex-live-' - VERSION='2015-02-09' + VERSION='2016-01-30' cat >>confdefs.h <<_ACEOF @@ -13974,7 +13974,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -musixtnt (TeX Live) config.lt 2015-02-09 +musixtnt (TeX Live) config.lt 2016-01-30 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -15020,7 +15020,7 @@ if test "x$kpse_cv_kpse_debug" != xyes; then : fi -MUSIXTNT_TREE=musixtnt-2015-02-09 +MUSIXTNT_TREE=musixtnt-src ac_config_files="$ac_config_files Makefile" @@ -15560,7 +15560,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by musixtnt (TeX Live) $as_me 2015-02-09, which was +This file was extended by musixtnt (TeX Live) $as_me 2016-01-30, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15626,7 +15626,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -musixtnt (TeX Live) config.status 2015-02-09 +musixtnt (TeX Live) config.status 2016-01-30 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/musixtnt/configure.ac b/Build/source/texk/musixtnt/configure.ac index 5b37dbcffc0..48d78338dde 100644 --- a/Build/source/texk/musixtnt/configure.ac +++ b/Build/source/texk/musixtnt/configure.ac @@ -9,7 +9,7 @@ dnl m4_include([version.ac])[] dnl define musixtnt_version AC_INIT([musixtnt (TeX Live)], musixtnt_version, [tex-k@tug.org]) AC_PREREQ([2.65]) -AC_CONFIG_SRCDIR([musixtnt-]musixtnt_version[/msxlint.c]) +AC_CONFIG_SRCDIR([musixtnt-src/msxlint.c]) AC_CONFIG_AUX_DIR([../../build-aux]) AC_CONFIG_MACRO_DIR([../../m4]) @@ -22,7 +22,7 @@ AC_CONFIG_HEADERS([config.h]) KPSE_KPATHSEA_FLAGS -AC_SUBST([MUSIXTNT_TREE], [musixtnt-]musixtnt_version) +AC_SUBST([MUSIXTNT_TREE], [musixtnt-src]) AC_CONFIG_FILES([Makefile]) diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09-PATCHES/patch-01-too-many-args b/Build/source/texk/musixtnt/musixtnt-2015-02-09-PATCHES/patch-01-too-many-args deleted file mode 100644 index 66ca764e058..00000000000 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09-PATCHES/patch-01-too-many-args +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur musixtnt-2015-02-09.orig/fixmsxpart.test musixtnt-2015-02-09/fixmsxpart.test ---- musixtnt-2015-02-09.orig/fixmsxpart.test 2015-02-09 14:50:44.000000000 +0100 -+++ musixtnt-2015-02-09/fixmsxpart.test 2015-02-10 08:41:06.362535492 +0100 -@@ -12,6 +12,9 @@ - echo && echo "*** fixmsxpart -dd (missing infile)" - ./fixmsxpart -dd && exit 1 - -+echo && echo "*** fixmsxpart too many args" -+./fixmsxpart too many args && exit 1 -+ - : ${testsrc:=$srcdir/tests} - - echo && echo "*** generate fixtest.exp with version and date" diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09-PATCHES/patch-02-portability b/Build/source/texk/musixtnt/musixtnt-2015-02-09-PATCHES/patch-02-portability deleted file mode 100644 index 484d990990e..00000000000 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09-PATCHES/patch-02-portability +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur musixtnt-2015-02-09.orig/fixmsxpart.test musixtnt-2015-02-09/fixmsxpart.test ---- musixtnt-2015-02-09.orig/fixmsxpart.test 2015-02-10 08:41:06.362535492 +0100 -+++ musixtnt-2015-02-09/fixmsxpart.test 2015-02-10 14:07:17.000000000 +0100 -@@ -18,7 +18,7 @@ - : ${testsrc:=$srcdir/tests} - - echo && echo "*** generate fixtest.exp with version and date" --yyyymmdd=`date +%F` -+yyyymmdd=`date +%Y-%m-%d` - version=`./fixmsxpart -v | sed 's/^This .* version \(.*\).$/\1/'` - { echo "% Generated on $yyyymmdd by fixmsxpart ($version)." - cat $testsrc/fixtest.out; } >fixtest.exp diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/fixmsxpart.1 b/Build/source/texk/musixtnt/musixtnt-2015-02-09/fixmsxpart.1 deleted file mode 100644 index 2a546fcea3d..00000000000 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/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/Build/source/texk/musixtnt/musixtnt-2015-02-09/fixmsxpart.c b/Build/source/texk/musixtnt/musixtnt-2015-02-09/fixmsxpart.c deleted file mode 100644 index 0420109cb9a..00000000000 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/fixmsxpart.c +++ /dev/null @@ -1,889 +0,0 @@ -char version[12] = "2015-02-09"; - -/* Copyright (C) 2014-15 R. D. Tennent School of Computing, - * Queen's University, rdt@cs.queensu.ca - * - * 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 2 of the License, 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. - */ - -/* fixmsxpart - corrects note spacing in a single-staff - * musixtex part - */ - - -# include "utils.h" - -# define NNOTES "\\vnotes1.6\\elemskip" -# define NNNOTES "\\vnotes1.28\\elemskip" - -PRIVATE char infilename[LINE_LEN]; -PRIVATE char *infilename_n = infilename; -PRIVATE char outfilename[LINE_LEN]; -PRIVATE char *outfilename_n = outfilename; - -PRIVATE FILE *infile, *outfile; - -PRIVATE int debug = 0; -PRIVATE char line[LINE_LEN]; /* line of input */ -PRIVATE int staff = 1; /* staff number */ -PRIVATE char *notes; /* notes or other material for staff part */ -PRIVATE int spacing = 0; /* 0 = not determined; 1 = whole or breve, 2 = half, - 4 = quarter, 8 = eigth, etc. */ -PRIVATE int beaming = 0; /* beam-note spacing */ -PRIVATE int new_beaming = 0; /* spacing to be used *after* the next beam note */ -PRIVATE int restbars = 0; /* number of whole-bar rests not yet output */ - -PRIVATE void -usage (FILE *f) -{ - fprintf (f, "Usage: fixmsxpart [-v | --version | -h | --help]\n"); - fprintf (f, " fixmsxpart infile[.tex] [outfile[.tex]] \n"); -} - - -PRIVATE char -*analyze_notes (char **ln) { -/* - skip initial TeX command, which may be unreliable; - then skip staff-1 ampersands or vertical bars; - then truncate tail and return a pointer to the - beginning of the staff commands. - ln is moved to the token after \en -*/ - int i; char *s; char *t; char *tt; - s = strpbrk (*ln+1, "|&\\\n"); /* skip initial command */ - while (true) - { /* look for \en */ - t = strstr(s, "\\en"); - if (t != NULL) break; - else - /* replace EOL by a blank and append another line of input */ - { char new_line[LINE_LEN]; - if (fgets (new_line, LINE_LEN, infile) == NULL) - error("Unexpected EOF."); - if ((t = strchr (s, '\n')) == NULL ) - error("Missing EOL."); - *t = ' '; - t++; - *t = '\0'; - if (append (line, &t, new_line, LINE_LEN) >= LINE_LEN) - error ("Line too Long."); - } - } - for (i=1; i<staff; i++) /* skip staff-1 & or | */ - { - s = strpbrk (s, "|&"); - if (s == NULL) error ("Can't find & or |."); - s++; - } - t = strstr(s, "\\en"); - if (t == NULL) error ("Can't find \\en."); - *ln = t+3; - tt = strpbrk (s, "|&"); - if ( tt != NULL && tt < t) t = tt; - *t = '\0'; - if (debug > 0) - fprintf (stderr, "After analyze_notes notes=%s\n", s); - return s; -} - - -PRIVATE void -output_notes (char *t) -{ /* outputs text from *notes to *t (except for - commands \sk \hsk \noteskip= \multnoteskip); - then updates notes. - */ - char *s = notes; - if (debug > 0) - fprintf (stderr, "\nBefore output_notes: notes=%s\n", s); - while (s < t) - { - /* discard commands \sk, \hsk, \noteskip= ..., \multnoteskip */ - if ( prefix("\\sk", s) || - prefix("\\hsk", s) || - prefix("\\noteskip", s) || - prefix("\\multnoteskip", s ) ) - { - s = strchr (s+1, '\\'); - if (s == NULL) break; - } - else - { - char *tt; - tt = strchr (s+1, '\\'); - if (tt == NULL) tt = t; - while (s < tt) - { if (*s != '*') /* equivalent to \sk */ - putc (*s, outfile); - s++; - } - } - } - notes = t; - if (debug > 0) - fprintf (stderr, "\nAfter output_notes, notes=%s\n", notes); -} - -PRIVATE void -output_rests (bool output_bar) -{ /* outputs multi-bar rest and, possibly, a deferred \bar command */ - switch (restbars) - { case 0: return; - case 1: - fprintf ( outfile, "\\NOTEs\\sk\\en\n" ); - fprintf ( outfile, "\\def\\atnextbar{\\znotes\\centerpause\\en}%%\n" ); - break; - case 2: - fprintf ( outfile, "\\NOTesp\\sk\\en\n" ); - fprintf ( outfile, "\\def\\atnextbar{\\znotes\\centerbar{\\zcharnote{9}{\\meterfont\\lrlap2}}\\centerbar{\\PAuse}\\en}%%\n" ); - break; - case 3: - fprintf ( outfile, "\\NOTes\\hqsk\\sk\\en\n" ); - fprintf ( outfile, "\\def\\atnextbar{\\znotes\\centerbar{\\zcharnote{9}{\\meterfont\\lrlap3}}\\centerbar{\\PAuse\\off{2.5\\elemskip}\\pause}\\en}%%\n" ); - break; - case 4: - fprintf ( outfile, "\\NOtesp\\sk\\en\n" ); - fprintf ( outfile, "\\def\\atnextbar{\\znotes\\centerbar{\\zcharnote{9}{\\meterfont\\lrlap4}}\\centerbar{\\PAUSe}\\en}%%\n" ); - break; - case 5: - fprintf ( outfile, "\\NOTes\\hqsk\\sk\\en\n" ); - fprintf ( outfile, "\\def\\atnextbar{\\znotes\\centerbar{\\zcharnote{9}{\\meterfont\\lrlap5}}\\centerbar{\\PAUSe\\off{2.5\\elemskip}\\pause}\\en}%%\n" ); - break; - case 6: - fprintf ( outfile, "\\NOTes\\hqsk\\sk\\en\n" ); - fprintf ( outfile, "\\def\\atnextbar{\\znotes\\centerbar{\\zcharnote{9}{\\meterfont\\lrlap6}}\\centerbar{\\PAUSe\\off{2.5\\elemskip}\\PAuse}\\en}%%\n" ); - break; - case 7: - fprintf ( outfile, "\\NOTEs\\hqsk\\sk\\en\n" ); - fprintf ( outfile, "\\def\\atnextbar{\\znotes\\centerbar{\\zcharnote{9}{\\meterfont\\lrlap7}}\\centerbar{\\PAUSe\\off{2.5\\elemskip}\\PAuse\\off{2.5\\elemskip}\\pause}\\en}%%\n" ); - break; - case 8: - fprintf ( outfile, "\\NOTes\\hqsk\\sk\\en\n" ); - fprintf ( outfile, "\\def\\atnextbar{\\znotes\\centerbar{\\zcharnote{9}{\\meterfont\\lrlap8}}\\centerbar{\\PAUSe\\off{2.5\\elemskip}\\PAUSe}\\en}%%\n" ); - break; - case 9: - fprintf ( outfile, "\\NOTEs\\hqsk\\sk\\en\n" ); - fprintf ( outfile, "\\def\\atnextbar{\\znotes\\centerbar{\\zcharnote{9}{\\meterfont\\lrlap9}}\\centerbar{\\PAUSe\\off{2.5\\elemskip}\\PAUSe\\off{2.5\\elemskip}\\pause}\\en}%%\n" ); - break; - default: - fprintf ( outfile, "\\NOTEs\\hqsk\\Hpause4{0.83}\\en\n" ); - fprintf ( outfile, "\\def\\atnextbar{\\znotes\\centerbar{\\zcharnote{9}{\\meterfont\\lrlap{%d}}}\\en}%%\n", restbars ); - } - if (restbars > 1) - fprintf ( outfile, "\\advance\\barno%d%%\n", restbars-1 ); - restbars = 0; - if (output_bar) - fprintf ( outfile, "\\bar\n"); -} - -PRIVATE char *spacing_note (char *s, int new_spacing) -{ /* outputs from notes* to just after note at *s, - if necessary, preceded by a new notes command; - then updates notes. - */ - char *t; - if (debug > 0) - fprintf (stderr, "\nspacing_note: spacing=%d new_spacing=%d s=%s\n", spacing, new_spacing, s); - if (spacing != new_spacing) - { - if (spacing != 0) fprintf (outfile,"\\en\n"); - output_rests (true); - switch (new_spacing) - { /* start a new notes command */ - case 128:fprintf (outfile,"%s", NNNOTES); break; - case 64: fprintf (outfile,"%s", NNNOTES); break; - case 32: fprintf (outfile,"%s", NNOTES); break; - case 16: fprintf (outfile,"\\notes"); break; - case 8: fprintf (outfile,"\\Notes"); break; - case 4: fprintf (outfile,"\\NOtes"); break; - case 2: fprintf (outfile,"\\NOTes"); break; - case 1: fprintf (outfile,"\\NOTEs"); break; - default: error ("Spacing value not recognized"); - } - spacing = new_spacing; - } - t = strchr (s+1, '\\'); - if (t == NULL) t = s + strlen(s); - output_notes (t); - if (debug > 0) - fprintf (stderr, "\nAfter spacing_note: spacing=%d notes=%s\n", spacing, notes); - return notes; -} - -PRIVATE char *semiautomatic_beam (char *s) -{ - char *t; - if ( prefix ("\\Dqbb", s) - || prefix ("\\Tqbb", s) - || prefix ("\\Qqbb", s) ) - beaming = 16; - else - if ( prefix ("\\Dqb", s) - || prefix ("\\Tqb", s) - || prefix ("\\Qqb", s) ) - beaming = 8; - if (beaming > spacing) - { - if (spacing != 0) fprintf (outfile, "\\en\n"); - output_rests (true); - switch (beaming) - { - case 16: fprintf (outfile,"\\notes"); break; - case 8: fprintf (outfile,"\\Notes"); break; - default: error ("Beaming value not recognized"); - } - spacing = beaming; - } - t = strchr (s+1, '\\'); - if (t == NULL) t = s + strlen(s); - output_notes (t); - return t; -} - -PRIVATE char *beam_initiation (char *s) -{ /* sets beaming, but doesn't output anything yet */ - char *t; - if ( prefix ("\\ibbbbbb", s) - || prefix ("\\Ibbbbbb", s) - || prefix ("\\nbbbbbb", s) ) - beaming = 256; - else if ( prefix ("\\ibbbbb", s) - || prefix ("\\Ibbbbb", s) - || prefix ("\\nbbbbb", s) ) - beaming = 128; - else if ( prefix ("\\ibbbb", s) - || prefix ("\\Ibbbb", s) - || prefix ("\\nbbbb", s) ) - beaming = 64; - else if ( prefix ("\\ibbb", s) - || prefix ("\\Ibbb", s) - || prefix ("\\nbbb", s) ) - beaming = 32; - else if ( prefix ("\\ibb", s) - || prefix ("\\Ibb", s) - || prefix ("\\nbb", s) ) - beaming = 16; - else if ( prefix ("\\ib", s) - || prefix ("\\Ib", s) ) - beaming = 8; - t = strchr (s+1, '\\'); - if (t == NULL) t = s + strlen(s); - return t; -} - -PRIVATE char *beam_note (char *s) /* \qb... */ -{ char *t; - if (debug > 0) - fprintf (stderr, "\nIn beam_note: spacing=%d beaming=%d new_beaming=%d\n", - spacing, beaming, new_beaming); - if (beaming > spacing) - { - if (spacing != 0) fprintf (outfile, "\\en\n"); - output_rests (true); - switch (beaming) - { - case 256: case 128: case 64: - fprintf (outfile,"%s", NNNOTES); break; - case 32: fprintf (outfile,"%s", NNOTES); break; - case 16: fprintf (outfile,"\\notes"); break; - case 8: fprintf (outfile,"\\Notes"); break; - default: error ("Beaming value not recognized"); - } - spacing = beaming; - } - t = strchr (s+1, '\\'); - if (t == NULL) t = s + strlen (s); - output_notes (t); - if (new_beaming != 0) /* set by preceding \tb... */ - { - beaming = new_beaming; new_beaming = 0; - if (*notes != '\0' && beaming != spacing) - { - if (spacing != 0) fprintf (outfile,"\\en\n"); - switch (beaming) - { - case 256: case 128: case 64: - fprintf (outfile,"%s", NNNOTES); break; - case 32: fprintf (outfile,"%s", NNOTES); break; - case 16: fprintf (outfile,"\\notes"); break; - case 8: fprintf (outfile,"\\Notes"); break; - default: error ("Beaming value not recognized"); - } - spacing = beaming; - } - } - return t; -} - -PRIVATE char *beam_termination (char *s) /* \tb... */ -{ char *t; - if (debug > 0) - fprintf (stderr, "\nIn beam_termination: spacing=%d beaming=%d new_beaming=%d\n", - spacing, beaming, new_beaming); - if (spacing == 0) - { - output_rests (true); - switch (beaming) - { - case 256: case 128: case 64: - fprintf (outfile,"%s", NNNOTES); break; - case 32: fprintf (outfile,"%s", NNOTES); break; - case 16: fprintf (outfile,"\\notes"); break; - case 8: fprintf (outfile,"\\Notes"); break; - default: error ("Beaming value not recognized"); - } - spacing = beaming; - } - if ( prefix ("\\tbbbbbb", s) ) - new_beaming = 128; - else if ( prefix ("\\tbbbbb", s) ) - new_beaming = 64; - else if ( prefix ("\\tbbbb", s) ) - new_beaming = 32; - else if ( prefix ("\\tbbb", s) ) - new_beaming = 16; - else if ( prefix ("\\tbb", s) ) - new_beaming = 8; - else if ( prefix ("\\tb", s) ) - { new_beaming = 0; } - - t = strchr (s+1, '\\'); - if (t == NULL) t = s + strlen(s); - return t; -} - -PRIVATE char *beam_completion (char *s) /* \tq... */ -{ char *t; - if (debug > 0) - fprintf (stderr, "\nIn beam_completion: spacing=%d beaming=%d new_beaming=%d\n", - spacing, beaming, new_beaming); - if (beaming > spacing) - { - if (spacing != 0) fprintf (outfile, "\\en\n"); - output_rests (true); - switch (beaming) - { - case 256: case 128: case 64: - fprintf (outfile,"%s", NNNOTES); break; - case 32: fprintf (outfile,"%s", NNOTES); break; - case 16: fprintf (outfile,"\\notes"); break; - case 8: fprintf (outfile,"\\Notes"); break; - default: error ("Beaming value not recognized"); - } - spacing = beaming; - } - t = strchr (s+1, '\\'); - if (t == NULL) t = s + strlen(s); - output_notes (t); - new_beaming = 0; spacing = 8; - return t; -} - -PRIVATE char *nonspacing_beam_termination (char *s) /* \ztq... */ -{ char *t; - if (spacing == 0) - { - output_rests (true); - fprintf (outfile,"\\znotes"); - spacing = beaming; - } - t = strchr (s+1, '\\'); - if (t == NULL) t = s + strlen(s); - output_notes (t); - new_beaming = 0; - return t; -} - -PRIVATE char *tiny (char *s) -/* \tinynotesize */ -{ - char *t; - if (spacing > 32) - { - if (spacing != 0) fprintf (outfile,"\\en\n"); - /* for appoggiatura */ - fprintf (outfile, NNNOTES); - } - spacing = 32; - t = s + strlen(s); - output_notes (t); - return t; -} - -PRIVATE char *simple (char *s) -/* detect and correct simple slurs and ties over > 1 note */ -{ char *t; - t = strchr (s+1, '\\'); - if (t == NULL) t = s + strlen(s); - if (*(t-1) != '1') - { - char msg[LINE_LEN]; - sprintf (msg, "simple slur or tie with n == %c changed to 1.", *(t-1)); - warning (msg); - *(t-1) = '1'; - } - return t; -} - -PRIVATE void -synthesize_notes (void) -/* generate well-spaced notes */ -{ char *s; - s = notes; - while (true) - { - if (debug > 0) - fprintf (stderr, "\nIn synthesize s=%s\n", s); - if (*s == '\0') - { - if (spacing == 0) - { if (*notes == '\0') return; /* to avoid \znotes\en */ - fprintf (outfile,"\\znotes"); - } - output_notes (s); - fprintf (outfile,"\\en"); - spacing = 0; - return; - } - - if ( prefix ("\\h", s) - && !prefix ("\\hs", s) - && !prefix ("\\hqsk", s) - && !prefix ("\\hroff", s) - && !prefix ("\\hloff", s) ) - s = spacing_note (s, 2); - - else if ( prefix ("\\hs", s) - && !prefix ("\\hsk", s) ) - s = spacing_note (s, 32); - - else if ( prefix ("\\q", s) - && !prefix ("\\qb", s) - && !prefix ("\\qs", s) - && !prefix ("\\qqsk", s) ) - s = spacing_note (s, 4); - - else if ( prefix ("\\qs", s) - && !prefix ("\\qsk", s) ) - s = spacing_note (s, 16); - - else if ( prefix("\\qb", s) ) - s = beam_note (s); - - else if ( prefix ("\\ccccc", s) ) - s = spacing_note (s, 128); - - else if ( prefix ("\\cccc", s) ) - s = spacing_note (s, 64); - - else if ( prefix ("\\ccc", s) ) - s = spacing_note (s, 32); - - else if ( prefix ("\\cc", s) - && !prefix ("\\ccharnote", s) ) - s = spacing_note (s, 16); - - else if ( prefix ("\\c", s) - && !prefix ("\\cna", s) - && !prefix ("\\csh", s) - && !prefix ("\\cfl", s) - && !prefix ("\\curve", s) - && !prefix ("\\ccharnote", s) ) - s = spacing_note (s, 8); - - else if ( prefix ("\\ds", s ) - && !prefix ("\\dsh", s) ) - s = spacing_note (s, 8); - - else if ( prefix ("\\wh", s) - || prefix ("\\pa", s) - || prefix ("\\breve", s) ) - s = spacing_note (s, 1); - - else if ( prefix ("\\Hpause", s) ) - s = spacing_note (s, 2); - - else if ( prefix("\\ib",s) - || prefix("\\Ib",s) - || prefix("\\nb",s) ) - s = beam_initiation (s); - - else if ( prefix("\\Dq",s) - || prefix("\\Tq",s) - || prefix("\\Qq",s) ) - s = semiautomatic_beam (s); - - else if ( prefix("\\tb", s) ) - s = beam_termination (s); - - else if ( prefix("\\tq", s) ) - s = beam_completion (s); - - else if ( prefix("\\ztq", s) ) - s = nonspacing_beam_termination (s); - - else if ( prefix("\\tinynotesize", s)) - s = tiny (s); - - else if ( prefix("\\slur", s) - || prefix("\\tie", s) - || prefix("\\sslur", s) - || prefix("\\bslur", s) ) - s = simple (s); - - else if ( prefix("\\zchar", s) - || prefix("\\lchar", s) - || prefix("\\cchar", s) ) - { char *t; /* need to skip two arguments */ - s = strchr (s+1, '}'); /* first } */ - s = strchr (s+1, '}'); /* second } */ - t = strchr(s+1,'\\'); - if (t == NULL) t = s + strlen(s); - s = t; - } - - else /* non-spacing; skip to next command */ - { char *t; - t = strchr(s+1,'\\'); - if (t == NULL) t = s + strlen(s); - s = t; - } - } -} - -PRIVATE void -process_command (char **ln) -{ char *s, *t; - - if ( prefix("\\def\\vnotes#1\\elemskip", *ln) ) - { /* determine staff */ - s = strstr (*ln, "@vnotes") + 7; - t = strchr(s, '#'); /* may have commands before # */ - if (sscanf (t, "#%d", &staff) != 1) error("sscanf for staff fails"); - staff--; - fprintf (outfile,"\\def\\vnotes#1\\elemskip#2\\en{\\noteskip#1\\@l@mskip\\@vnotes"); - while (s != t) - { putc(*s, outfile); s++; } - fprintf (outfile,"#2\\enotes}"); - *ln = strchr (*ln, '}') ; - (*ln)++; - } - - else if ( prefix("\\TransformNotes", *ln) ) - { /* determine staff */ - s = strchr (*ln, '}'); - if (s == NULL) error ("Can't parse \\TransformNotes."); - s = strchr (s+1, '{'); - if (s == NULL) error ("Can't parse \\TransformNotes."); - s++; - t = strchr(s, '#'); /* may have \transpose... before # */ - if (sscanf (t, "#%d", &staff) != 1) error("sscanf for staff fails"); - staff--; - fprintf (outfile,"\\TransformNotes{#2}{"); - while (s != t) - { putc(*s, outfile); s++; } - fprintf (outfile,"#2}"); - *ln = strchr (t, '}') ; - if (*ln == NULL) error ("Can't find '}' after \\TransformNotes.\n"); - (*ln)++; - } - - else if ( prefix("\\nnotes", *ln) || /* non-standard */ - prefix("\\notes", *ln) || - prefix("\\Notes", *ln) || - prefix("\\NOtes", *ln) || - prefix("\\NOTes", *ln) || - prefix("\\NOTEs", *ln) || - prefix("\\NOTES", *ln) ) - { /* spaced notes */ - char *save_notes; - notes = analyze_notes (ln); - save_notes = notes; - synthesize_notes (); - t = strpbrk (*ln, "%\\\n"); - *ln = t; - if (notes == save_notes) - (*ln)++; /* avoids blank line if no notes */ - } - - else if ( prefix("\\vnotes", *ln) ) - { - char *s; char *t; - s = *ln+7; - t = strchr ( s, '\\'); - *ln = t; /* skip to \elemskip */ - notes = analyze_notes (ln); - if ( strstr (notes, "\\tinynotesize") != NULL ) - { /* appoggiatura note */ - output_rests (true); - fprintf (outfile,"\\vnotes"); - while (s!=t) - { putc(*s, outfile); s++; } - fprintf (outfile,"\\elemskip%s\\en", notes); - t = strpbrk (*ln, "%\\\n"); - if (t == NULL) t = *ln + strlen (*ln); - *ln = t; - } - else - { char *save_notes; - save_notes = notes; - synthesize_notes (); - t = strpbrk (*ln, "%\\\n"); - *ln = t; - if (notes == save_notes) - (*ln)++; /* avoids blank line if no notes */ - } - } - - else if ( prefix("\\znotes", *ln) ) - { /* non-spacing material */ - notes = analyze_notes (ln); - fprintf (outfile,"\\znotes%s\\en", notes); - t = strpbrk (*ln, "%\\\n"); - if (t == NULL) t = *ln + strlen (*ln); - *ln = t; - } - - else if ( prefix("\\def\\atnextbar{\\znotes", *ln)) - { /* whole-bar or multi-bar rest? */ - *ln = *ln + 15; - notes = analyze_notes(ln); - if (strstr (notes, "\\centerpause") != NULL ) - { restbars++; /* defer output until after a */ - /* possible multi-bar rest */ - } - else - { - if (*notes != '\0') - { fprintf (outfile,"\\def\\atnextbar{\\znotes%s\\en}", notes);} - } - t = strchr (*ln, '}'); - if (t == NULL) error ("Can't find }."); - *ln = t+1; - t = strchr (*ln, '\\'); - if (t == NULL ) t = *ln + strlen(*ln); - *ln = t; - } - - else if ( (prefix("\\bar", *ln) && !prefix("\\barno", *ln) ) - || prefix("\\doublebar", *ln) - || prefix("\\ala", *ln) ) - { - if ( restbars > 0 ) - { /* defer output till next \Notes bar */ - t = strpbrk (*ln+1, "%\\"); - if (t == NULL) t = *ln + strlen (*ln); - } - else - { - if ( prefix("\\doublebar", *ln) ) - fprintf (outfile, "\\doublebar"); - else - fprintf (outfile, "\\bar"); - t = strpbrk (*ln+1, "%\\\n"); - if (t == NULL) t = *ln + strlen (*ln); - } - *ln = t; - } - - else if ( prefix("\\Endpiece", *ln) - || prefix("\\endpiece", *ln) ) - { - output_rests (false); - fprintf (outfile,"%s", *ln); - *ln = *ln + strlen (*ln); - } - - else if ( prefix("\\instrumentnumber", *ln) ) - { fprintf (outfile, "\\instrumentnumber1\n"); - t = strpbrk (*ln+1, "%\\"); - if (t == NULL) - { *ln = *ln + strlen (*ln); fprintf (outfile, "\n"); return; } - *ln = t; - } - - else if ( prefix("\\startpiece", *ln) ) - { fprintf (outfile, "%s", "\\setstaffs11\n\\nostartrule\n\\startpiece"); - t = strpbrk (*ln+1, "%\\\n"); - if (t == NULL) t = *ln + strlen (*ln); - *ln = t; - } - - else if ( prefix("\\mulooseness", *ln) - || prefix("\\eject", *ln) - || prefix("\\linegoal", *ln) - || prefix("\\song", *ln) - || prefix("\\group", *ln) - || prefix("\\akkoladen", *ln) ) - { fputc ('%', outfile); - t = strpbrk (*ln+1, "%\\\n"); - if (t == NULL) - { fprintf (outfile, "%s", *ln); return; } - while (*ln < t) { fputc (**ln, outfile); (*ln)++; } - fputc ('\n', outfile); - } - - else if ( prefix("\\def", *ln) ) - { char msg[LINE_LEN]; - sprintf (msg, "Macro definition ignored: %s", *ln); - fprintf (stderr, "Warning: %s", msg); - t = *ln + strlen(*ln); - while (*ln < t) - { fputc (**ln, outfile); - (*ln)++; - } - } - - else /* everything else */ - { t = strpbrk (*ln+1, "%\\"); - if (t == NULL || *t == '%') t = *ln + strlen (*ln); - while (*ln < t) - { fputc (**ln, outfile); - (*ln)++; - } - } -} - -PRIVATE void -process_line (void) -{ - char *ln; - ln = &line[0]; - while ( *ln != '\0') - { - while (*ln == ' ') { ln++; fputc (' ', outfile); } - if (*ln == '%') { - fprintf (outfile, "%s", ln); - return; - } - process_command (&ln); - } /* *ln == '\0' */ -} - -PRIVATE void -process_score (void) -/* process .tex file */ -{ - int c; - while ( (c = getc (infile)) != EOF ) - { - ungetc (c, infile); - if ( fgets(line, LINE_LEN, infile) == NULL) error("IO error"); - if (strlen (line) == LINE_LEN-1) error("Line too long."); - process_line (); - } /* c == EOF */ -} - - -int -main (int argc, char *argv[]) -{ - int c; - char today[12]; - time_t mytime; -# define NOPTS 4 - struct option longopts[NOPTS] = - { { "help", 0, NULL, 'h'}, - { "version", 0, NULL, 'v'}, - { "debug", 0, NULL, 'd'}, - { NULL, 0, NULL, 0} - }; - - time (&mytime); - strftime (today, 11, "%Y-%m-%d", localtime (&mytime) ); - c = getopt_long (argc, argv, "hvd", longopts, NULL); - while (c != -1) - { - switch (c) - { - case 'h': - fprintf (stdout, "This is fixmsxpart, version %s.\n", version); - usage (stdout); - fprintf (stdout, "Please report bugs to rdt@cs.queensu.ca.\n" ); - exit (0); - case 'v': - fprintf (stdout, "This is fixmsxpart, version %s.\n", version); - exit (0); - case 'd': - debug++; break; - case '?': - exit (EXIT_FAILURE); - default: - fprintf (stderr,"Function getopt returned character code 0%o.\n", - (unsigned int) c); - exit (EXIT_FAILURE); - } - c = getopt_long (argc, argv, "hvd", longopts, NULL); - } - fprintf (stderr, "This is fixmsxpart, version %s.\n", version); - fprintf (stderr, "Copyright (C) 2014-15 R. D. Tennent\n" ); - fprintf (stderr, "School of Computing, Queen's University, rdt@cs.queensu.ca\n" ); - fprintf (stderr, "License GNU GPL version 2 or later <http://gnu.org/licences/gpl.html>.\n" ); - fprintf (stderr, "There is NO WARRANTY, to the extent permitted by law.\n\n" ); - - infilename[0] = '\0'; - infilename_n = infilename; - if ( (optind < argc) && (optind+2 >= argc)) - { - append (infilename, &infilename_n, argv[optind], sizeof (infilename)); - if (!suffix (".tex", infilename)) - append (infilename, &infilename_n, ".tex", sizeof (infilename)); - } - else - { usage (stderr); - exit (EXIT_FAILURE); - } - optind++; - outfilename[0] = '\0'; - outfilename_n = outfilename; - if (optind < argc) /* user-provided outfilename */ - { - append (outfilename, &outfilename_n, argv[optind], sizeof (outfilename)); - if (!suffix (".tex", outfilename)) - append (outfilename, &outfilename_n, ".tex", sizeof (outfilename)); - } - infile = fopen (infilename, "r"); - if (infile == NULL) - { - fprintf (stderr,"Can't open %s\n", infilename); - exit (EXIT_FAILURE); - } - fprintf (stderr, "Reading from %s.", infilename); - if (*outfilename == '\0') - { - outfile = stdout; - fprintf (stderr, " Writing to stdout.\n"); - } - else - { - outfile = fopen (outfilename, "w"); - if (outfile == NULL) - { - fprintf (stderr,"Can't open %s\n", outfilename); - exit (EXIT_FAILURE); - } - fprintf (stderr, " Writing to %s.\n", outfilename); - } - fprintf (stderr,"\n"); - - fprintf (outfile, "%% Generated on %s by fixmsxpart (%s).\n", today, version); - process_score (); - - return 0; -} diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/fixmsxpart.test b/Build/source/texk/musixtnt/musixtnt-2015-02-09/fixmsxpart.test deleted file mode 100755 index 7b468620eaa..00000000000 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/fixmsxpart.test +++ /dev/null @@ -1,37 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2015 Peter Breitenlohner <tex-live@tug.org> -# You may freely use, modify and/or distribute this file. - -echo && echo "*** fixmsxpart --help" -./fixmsxpart --help || exit 1 - -echo && echo "*** fixmsxpart --version" -./fixmsxpart --version || exit 1 - -echo && echo "*** fixmsxpart -dd (missing infile)" -./fixmsxpart -dd && exit 1 - -echo && echo "*** fixmsxpart too many args" -./fixmsxpart too many args && exit 1 - -: ${testsrc:=$srcdir/tests} - -echo && echo "*** generate fixtest.exp with version and date" -yyyymmdd=`date +%Y-%m-%d` -version=`./fixmsxpart -v | sed 's/^This .* version \(.*\).$/\1/'` -{ echo "% Generated on $yyyymmdd by fixmsxpart ($version)." - cat $testsrc/fixtest.out; } >fixtest.exp - -echo && echo "*** fixmsxpart tests/fixtest fixtest" -./fixmsxpart $testsrc/fixtest fixtest || exit 1 - -echo && echo "*** diff fixtest.exp fixtest.tex" -diff fixtest.exp fixtest.tex || exit 1 - -echo && echo "*** fixmsxpart tests/fixtest >fixtest.out" -./fixmsxpart $testsrc/fixtest >fixtest.out || exit 1 - -echo && echo "*** diff fixtest.exp fixtest.out" -diff fixtest.exp fixtest.out || exit 1 - diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/fixtest.out b/Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/fixtest.out deleted file mode 100644 index 603980afa65..00000000000 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/fixtest.out +++ /dev/null @@ -1,129 +0,0 @@ -\input musixtex.tex -\input musixsty.tex -\input musixps -\input musixtnt -\nohalfties -\def\pstiehgt{0.5} -\def\psslurhgt{0.5} -\vsize9.75in -\voffset-0.5in -\hsize7.0in -\hoffset-0.25in -\smallmusicsize -\bigaccid -\advance\parindent by 10pt -\def\raisebarno{5\internote}% -\nobarnumbers -\relativeaccid -\geometricskipscale -\instrumentnumber1 - -\setclef1\bass\setbassclefsymbol1\bassoct -\setclef4\treble\settrebleclefsymbol4\trebleoct -\generalsignature{+1} -\generalmeter\meterC -\setname1{B} -\setname2{T} -\setname3{A} -\setname4{S} -\fulltitle{Quodlibet} -\subtitle{Variation 30 of the Goldberg Variations for Clavier} -\title{Quodlibet} -\author{J. S. Bach (1685--1750)} -\shortauthor{J. S. Bach} -\othermention{Arranged for Recorders by R. D. Tennent} -\maketitle -\startbarno=0 -\nobarnumbers -\setstaffs11 -\nostartrule -\startpiece\addspace\afterruleskip% -\TransformNotes{#2}{#2}% -\systemnumbers% -\Notes\ds\en -\bar%1 -\NOTes\hl N\en -\NOTes\hl M\en -\bar%2 -\NOTes\hl L\en -\NOtes\ql{.K}\en -\Notes\cu J\en -\bar%3 -\NOTes\hu I\en -\NOTes\hu J\en -\bar%4 -\NOTes\hl K\en -%\vnotes1.5\elemskip&\nbbbu1\qb1e\tbbu1\qb1f&&\en -\NOtes\qu G\en -\Notes\ds\en -\notes\ibbl0b{-1}\qb0b\tqb0a\en -\bar%5 -\Notes\ibl0M0\qb0N\en -\notes\nbbl0\qb0M\tqb0N\en -\Notes\ibl0K0\qb0L\en -\notes\nbbl0\qb0K\tqb0L\en -\NOtes\ql{.M}\en -\Notes\cu I\en -\bar%6 -\NOtes\ql{.L}\en -\notes\ibbl0M2\qb0M\tqb0N\en -\NOtes\itieu0a\ql a\en -\notes\ttie0\ibbl0a{-2}\qb0{aN}\en -\notes\qb0M\tqb0L\en -\bar%7 -\NOtes\ql M\en -\NOtes\ql K\en -\NOtes\ql N\en -\NOtes\qu G\en -\bar%8 -\NOtes\qu{.H}\en -\Notes\cu{^J}\en -\NOtes\ql K\en -\Notes\cl K\en -\advance\barno by -1% -\leftrightrepeat -\Notes\ds\en -\bar%9 -\NOtes\ql d\ql c\en -\NOtes\ql b\en -\NOtes\ql N\en -\bar%10 -\Notes\ibl0b{-1}\qb0{cbc}\tqb0a\en -\NOtes\ql{.b}\en -\Notes\cl a\en -\bar%11 -\NOtes\ql{N}\ql{N}\en -\NOtes\ql{.a}\en -\Notes\cl{^a}\en -\bar%12 -\NOtes\ql b\en -\NOtes\qu I\en -\NOtes\ql{.L}\en -\Notes\cl{=K}\en -\bar%13 -\NOtes\qu J\en -\NOtes\ql c\en -\NOtes\ql{.b}\en -\notes\ibbu0J{-2}\qb0J\tqh0I\en -\bar%14 -\NOtes\qu{.H}\en -\notes\ibbu0I2\qb0I\tqh0J\en -\NOtes\ql{.K}\en -\notes\ibbu0J2\qb0J\tqh0K\en -\bar%15 -\Notes\ibu0I0\qb0G\en -\Notes\qb0H\en -\Notes\qb0I\en -\Notes\tqh0G\en -\NOtes\qu{.J}\en -\Notes\cu{^J}\en -\bar%16 -\NOtes\ql K\en -\NOtes\ql K\en -\NOtes\ql N\en -\Notes\cu G\en -\setrightrepeat -\endpiece% -%\eject - -\end diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/fixtest.tex b/Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/fixtest.tex deleted file mode 100644 index cf6d6b010b2..00000000000 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/fixtest.tex +++ /dev/null @@ -1,159 +0,0 @@ -\input musixtex.tex -\input musixsty.tex -\input musixps -\input musixtnt -\nohalfties -\def\pstiehgt{0.5} -\def\psslurhgt{0.5} -\vsize9.75in -\voffset-0.5in -\hsize7.0in -\hoffset-0.25in -\smallmusicsize -\bigaccid -\advance\parindent by 10pt -\def\raisebarno{5\internote}% -\nobarnumbers -\relativeaccid -\geometricskipscale -\instrumentnumber1 -\setclef1\bass\setbassclefsymbol1\bassoct -\setclef4\treble\settrebleclefsymbol4\trebleoct -\generalsignature{+1} -\generalmeter\meterC -\setname1{B} -\setname2{T} -\setname3{A} -\setname4{S} -\fulltitle{Quodlibet} -\subtitle{Variation 30 of the Goldberg Variations for Clavier} -\title{Quodlibet} -\author{J. S. Bach (1685--1750)} -\shortauthor{J. S. Bach} -\othermention{Arranged for Recorders by R. D. Tennent} -\maketitle -\startbarno=0 -\nobarnumbers -\startpiece\addspace\afterruleskip% -\TransformNotes{#2}{#2}% -\systemnumbers% -\Notes\ds&\cu d&\ds&\ds\en -\bar%1 -\Notes\hl N&\ibu1g2\qb1{ghi}\tqh1j&&\hpause\en -\Notes\hl M&\ibl1k{-2}\qb1k&&\en -\notes&\nbbl1\qb1j\tqb1i&&\qp\en -\Notes&\ibu1h0\qb1h&&\ds\en -\notes&\nbbu1\qb1g\tqh1h&&\cu d\en -\def\atnextbar{\znotes&&\centerpause&\en}% -\bar%2 -\Notes\hl L&\ibu1i{-2}\qb1i\tqh1h&\ql n&\ibu3g2\qb3{gh}\en -\Notes&\itied1g\qu g&\ql n&\qb3i\tqh3j\en -\Notes\ql{.K}&\ttie1\qu g&\ql o&\ibl3k{-2}\qb3k\en -\notes&&&\nbbl3\qb3j\tqb3i\en -\Notes&\ibu1f0\shake{n}\qb1f&\cl o&\cu h\en -\notes\cu J&\nbbu1\qb1e\tqh1f&\ds&\ds\en -\bar%3 -\Notes\hu I&\qu g&\ibl2n{-1}\qb2{no}&\ql k\en -\Notes&\ds\cl k&\qb2{n}\tqb2{=m}&\ql k\en -\Notes\hu J&\ibu1j{-2}\qb1{ji}&\ibl2j{0}\qb2{lk}&\ql l\en -\Notes&\qb1h\tqh1g&\qb2j\tqb2p&\ql l\en -\bar%4 -\Notes\hl K&\itied1f\shake{n}\qu f&\ibl2o{-1}\qb2{on}&\ibl3k{-1}\qb3{kl}\en -\notes&\ttie1\ibbu1e{-2}\qb1f\tbbu1\qb1e&\qb2o&\qb3k\en -%\vnotes1.5\elemskip&\nbbbu1\qb1e\tbbu1\qb1f&&\en -\Notes&\itied1d\tqh1d&\tqb2m&\tqb3j\en -\Notes\qu G&\ttie1\qu d&\ibl2n{-2}\qb2n\tqb2m&\ibu3h{-1}\shake{p}\qb3i\tqh3h\en -\Notes\ds&\qp&\ibl2n{-5}\qb2n&\qu g\en -\notes\ibbl0b{-1}\qb0b\tqb0a&&\tqb2k&\en -\bar%5 -\Notes\ibl0M0\qb0N&\ql n&\ibl2n2\qb2n&\hpause\en -\notes\nbbl0\qb0M\tqb0N&&\qb2o&\en -\Notes\ibl0K0\qb0L&\ql n&\qb2p&\en -\notes\nbbl0\qb0K\tqb0L&&\tqb2q&\en -\Notes\ql{.M}&\ql o&\ibl2r{-2}\qb2r&\qp\en -\notes&&\nbbl2\qb2q\tqb2p&\en -\Notes\sk\cu I&\ql o&\ibl2o6\qb2o\itieu2r\tqb2r&\ds\cl k\en -\bar%6 -\Notes\ql{.L}&\ibl1n{-1}\qb1{no}&\ttie2\ibl2r{-2}\qb2r\tqb2q&\ibl3n{-2}\qb3{nm}\en -\Notes&\qb1n&\ql p&\qb3l\en -\notes\ibbl0M2\qb0M\tqb0N&\tqb1m&&\tqb3k\en -\Notes\itieu0a\ql a&\ibl1l{-2}\qb1l&\ql{.o}&\shake{n}\ibl3i0\qb3{^j}\en -\notes&\tqb1k&&\nbbl3\qb3i\tqb3j\en -\notes\ttie0\ibbl0a{-2}\qb0{aN}&\cl{^j}&&\cu h\en -\notes\qb0M\tqb0L&\ds&\ibbl2i2\qb2i\qsk\tqb2{^j}&\ds\en -\bar%7 -\Notes\ql M&\ibu1g0\qb1{fg}&\ibl2k0\qb2{kl}&\qu h\en -\Notes\ql K&\qb1h\tqh1f&\qb2m\tqb2k&\qu h\en -\Notes\ql N&\ibu1g{-2}\qb1{gf}&\ibl2i4\qb2{ik}&\ql i\en -\Notes\qu G&\qb1e\tqh1d&\qb2n\tqb2m&\ql i\en -\bar%8 -\Notes\qu{.H}&\ibu1c4\qb1{^cd}&\ibl2l{-1}\qb2{.l}\roff{\itieu2k\tbbl2\tqb2k}\qsk&\ibu3i{-1}\qb3{hi}\en -\notes&\qb1e&\ttie2\ibbl2j0\qb2k\hqsk\tbbl2\qb2{^j}&\qb3h\en -\Notes\cu{^J}&\itied1h\tqh1h&\itieu2l\tqb2l&\tqh3g\en -\notes\ql K&\ttie1\ibu1h{-2}\qb1h&\ttie2\ibbl2l{-1}\qb2{lk}&\ibu3f{-1}\qb3f\en -\notes&\tqh1g&\qb2l\tqb2j&\tqh3e\en -\Notes\cl K&\cu f&\cl k&\cu d\en -\advance\barno by -1% -\leftrightrepeat -\Notes\ds&\cl m&\ds&\cl o\en -\bar%9 -\Notes\ql d\sk\ql c&\ibl1k0\qb1{kmk}\tqb1{m}&\ql o\sk\ql o&\ibl3m0\qb3{mom}\tqb3o\en -\Notes\ql b&\ibl1k0\qb1n&\ql p&\ibl3k2\qb3k\en -\notes&\qb1k&&\nbbl3\qb3l\tqb3m\en -\Notes\ql N&\qb1k\tqb1n&\ql p&\ibl3n{-4}\qb3n\tqb3l\en -\bar%10 -\Notes\ibl0b{-1}\qb0{cbc}\tqb0a&\cl l\ds\qp&\ibl2o{-1}\qb2{opo}\tqb2n&\ibl3o{-2}\qb3{onm}\tqb3l\en -\Notes\ql{.b}&\ql m&\ibl2m{-2}\qb2m&\ibl3j0\shake n\qb3{^k}\en -\notes&&\tqb2l&\nbbl3\qb3{^j}\tqb3k\en -\Notes\sk\cl a&\ql m&\cl{^k}\ds&\ibl3i8\qb3i\tqb3{p}\en -\bar%11 -\Notes\ql{N}\sk\ql{N}&\ibl1l0\qb1{nln}\tqb1l&\ql p\sk\ql p&\ibl3m0\qb3{lpl}\tqb3{p}\en -\notes\ql{.a}&\ibl1m{-1}\qb1{m*n}&\ql q&\ibbl3k2\qb3{^klm}\tqb3n\en -\Notes&\qb1m&\ql q&\ibl3o{-2}\qb3o\en -\notes\cl{^a}&\tqb1l&&\nbbl3\qb3n\qsk\tqb3{m}\en -\bar%12 -\Notes\ql b&\ibl1k2\qb1{^k}&\ibl2o{-1}\qb2p&\ibl3n{-2}\qb3n\en -\notes&\nbbl1\qb1l\tqb1m&\qb2q&\nbbl3\qb3m\tqb3l\qsk\en -\notes\qu I&\itied1i\qu i&\qb2p&\ibbl3k0\qb3{^kl}\en -\notes&&\tqb2o&\qb3m\tqb3k\en -\Notes\ql{.L}&\ttie1\ibu1i0\qb1i&\ibl2n0\qb2n&\itieu3l\hl l\en -\notes&\nbbu1\qb1h\tqh1i&\nbbl2\qb2m\tqb2n&\en -\Notes&\ibu1g2\qb1g&\cl l&\en -\notes\cl{=K}&\nbbu1\qb1h\tqh1i&\ds&\en -\bar%13 -\notes\qu J&\ibl1j2\qb1j\sk\qb1k&\hpause&\ttie3\ibbl3k1\slur lku1\qb3l\qb3k\slur mlu1\qb3m\tqb3l\en -\notes\ql c&\qb1l\sk\tqb1m&&\ibbl3m1\isluru3n\qb3n\tbbl3\tslur3m\qb3m\tqb3o\en -\notes\ql{.b}&\ibl1n{-1}\qb1n\sk\nbbl1\qb1m\tqb1l&\ql n&\ql{.k}\en -\Notes&\cl k&\ibl2i{-5}\qb2n&\en -\notes\ibbu0J{-2}\qb0J\tqh0I&\ds&\tqb2g&\ibbl3j2\qb3j\tqb3k\en -\bar%14 -\Notes\qu{.H}&\ds&\ibl2j1\qb2{.j}&\ibl3l2\qb3l\en -\notes&\cu h&\sk\tbbl2\tqb2k&\nbbl3\qb3m\tqb3n\en -\Notes&\ibu1e0\qb1e&\ibl2j{-2}\qb2j&\ibl3o{-2}\qb3o\en -\notes\ibbu0I2\qb0I\tqh0J&\nbbu1\qb1d\tqh1e&\tqb2{i}&\tqb3n\en -\notes\ql{.K}&\ibu1g1\qb1f&\ibu2h1\qb2h&\ibbl3m{-2}\shake{o}\qb3m\en -\notes&&&\tbbl3\qb3l\en -\Notes&\itied1g\tqh1g&\tqh2i&\tqb3k\en -\Notes&\ttie1\ibu1g{-1}\qb1g&\ibl2j2\qb2j&\ibu3i{-6}\qb3j\en -\notes\ibbu0J2\qb0J\tqh0K&\tqh1f&\tqb2k&\tqh3d\en -\bar%15 -\Notes\ibu0I0\qb0G&\qu d&\ibu2i0\qb2i&\ibl3i0\qb3i\en -\notes\qb0H&&\nbbu2\qb2h\tqh2i&\qb3j\en -\Notes\qb0I&\qu d&\cu g&\qb3k\en -\Notes\tqh0G&&\ds&\tqb3i\en -\Notes\qu{.J}&\qu e&\ds&\ibu3j{-2}\qb3j\en -\notes&&\ibbl2l{-2}\qb2l\tqb2k&\qb3i\en -\Notes&\qu e&\ibl2j4\qb2j&\qb3h\en -\Notes\cu{^J}&&\tqb2l&\tqh3g\en -\bar%16 -\notes\ql K&\ibu1g{1}\qb1d&\ibbl2h1\qb2{hk}&\ibu3f2\qb3f\en -\notes&\qb1e&\qb2j\tqb2i&\tqh3g\en -\notes\ql K&\qb1d&\ibbl2j0\qb2j\tbbl2\qb2h&\ibu3h{-4}\qb3h\en -\Notes&\tqh1j&\itieu2k\tqb2k&\tqh3f\en -\Notes\ql N&\ibu1i{-2}\qb1i&\ttie2\ibl2j0\qb2k&\qu g\en -\notes&\tqh1h&\nbbl2\qb2j\tqb2k&\en -\Notes\cu G&\cu g&\cl i&\cu g\en -\setrightrepeat -\endpiece% -\eject -\end diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09-PATCHES/ChangeLog b/Build/source/texk/musixtnt/musixtnt-src-PATCHES/ChangeLog index 0f2b7aa8ce7..6ac40a4ca33 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09-PATCHES/ChangeLog +++ b/Build/source/texk/musixtnt/musixtnt-src-PATCHES/ChangeLog @@ -1,3 +1,9 @@ +2016-02-10 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + Import musixtnt-2016-01-30. + * patch-01-too-many-args: Removed since fixmsxpart is removed. + * patch-02-portability: Removed since fixmsxpart is removed. + 2015-02-10 Peter Breitenlohner <peb@mppmu.mpg.de> Import musixtnt-2015-02-09. @@ -5,4 +11,3 @@ * patch-01-too-many-args (new): Test too many fixmsxpart args. * patch-02-portability (new): Avoid thn GNU extension 'date +%F' from Akira Kakuto <kakuto@fuk.kindai.ac.jp>. - diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09-PATCHES/TL-Changes b/Build/source/texk/musixtnt/musixtnt-src-PATCHES/TL-Changes index 94699646f0d..2773f8cfe55 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09-PATCHES/TL-Changes +++ b/Build/source/texk/musixtnt/musixtnt-src-PATCHES/TL-Changes @@ -1,4 +1,4 @@ -Changes applied to the musixtnt-2015-02-09 tree as obtained from: +Changes applied to the musixtnt-2016-01-30 tree as obtained from: http://mirror.ctan.org/macros/musixtnt/ Remove: @@ -13,4 +13,3 @@ Remove: depcomp install-sh missing - diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/AUTHORS b/Build/source/texk/musixtnt/musixtnt-src/AUTHORS index 2684f199c52..2684f199c52 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/AUTHORS +++ b/Build/source/texk/musixtnt/musixtnt-src/AUTHORS diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/ChangeLog b/Build/source/texk/musixtnt/musixtnt-src/ChangeLog index ea156221ff2..4cba0e1cc43 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/ChangeLog +++ b/Build/source/texk/musixtnt/musixtnt-src/ChangeLog @@ -1,3 +1,16 @@ +2015-05-07 + + Re-implement to deal with autosp output + Replace -d option by a log file + Introduce -a option to allow user choice of \qb{n}{.p} treatment + Don't replace \alaligne and \alapage by \bar + (might change context) + output_rests for \znotes ... + +2015-02-23 + + Allow for \zcn, \lcn, \ccn abbreviations for \zcharnote, etc. + 2015-02-09 RDT Check for EOF and missing EOL. diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/Makefile.am b/Build/source/texk/musixtnt/musixtnt-src/Makefile.am index 0bbc30a2af2..cdc28185321 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/Makefile.am +++ b/Build/source/texk/musixtnt/musixtnt-src/Makefile.am @@ -1,19 +1,15 @@ -bin_PROGRAMS = fixmsxpart msxlint -fixmsxpart_SOURCES = utils.h utils.c fixmsxpart.c +bin_PROGRAMS = msxlint msxlint_SOURCES = utils.h utils.c msxlint.c AM_CFLAGS = -O4 -ansi -Wall -Wextra -pedantic-errors -dist_man_MANS = fixmsxpart.1 msxlint.1 +dist_man_MANS = msxlint.1 ## Tests ## -TESTS = fixmsxpart.test msxlint.test +TESTS = msxlint.test EXTRA_DIST = EXTRA_DIST += $(TESTS) DISTCLEANFILES = -## fixmsxpart.test -EXTRA_DIST += tests/fixtest.out tests/fixtest.tex -DISTCLEANFILES += fixtest.* ## msxlint.test EXTRA_DIST += tests/badtest.tex tests/linttest.tex tests/linttest.out DISTCLEANFILES += linttest.* diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/README b/Build/source/texk/musixtnt/musixtnt-src/README index 5dd90b25230..3d29bf8c317 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/README +++ b/Build/source/texk/musixtnt/musixtnt-src/README @@ -4,7 +4,7 @@ and MacOSX, and documentation for two programs: fixmsxpart and msxlint. musixtnt.tex provides a macro \TransformNotes that -makes possble transformations of the effect of notes +enables transformations of the effect of notes commands such as \notes. In general, the effect of \TransformNotes{input}{output} is that notes commands in the source will expect their arguments to match the input @@ -32,7 +32,7 @@ Update the file-name database as required by your TeX installation. If your platform is UNIX-like, process the -musixtnt-2014-02-04.tar.gz file as usual (tar zxvf ..., +musixtnt-<version>.tar.gz file as usual (tar zxvf ..., ./configure, make, make install). If your platform is Windows, move the executables @@ -43,11 +43,12 @@ If your platform is Mac OS-X, install the executables in the macosx directory. musixtnt.tex, fixmsxpart.c, utils.c and msxlint.c are -licensed under the GPL version 2. +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-05 +rdt(at)cs(dot)queensu(dot)ca +2015-05-07 diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/acinclude.m4 b/Build/source/texk/musixtnt/musixtnt-src/acinclude.m4 index 4a581894bc7..4a581894bc7 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/acinclude.m4 +++ b/Build/source/texk/musixtnt/musixtnt-src/acinclude.m4 diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/configure.ac b/Build/source/texk/musixtnt/musixtnt-src/configure.ac index 2f23faa8f8f..843a504be18 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/configure.ac +++ b/Build/source/texk/musixtnt/musixtnt-src/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.63) -AC_INIT([musixtnt],[2015-02-09],[rdt@cs.queensu.ca]) +AC_INIT([musixtnt],[2016-01-30],[rdt@cs.queensu.ca]) AC_CONFIG_AUX_DIR([.]) AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([config.h]) diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/msxlint.1 b/Build/source/texk/musixtnt/musixtnt-src/msxlint.1 index d0a3f695ae7..d0a3f695ae7 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/msxlint.1 +++ b/Build/source/texk/musixtnt/musixtnt-src/msxlint.1 diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/msxlint.c b/Build/source/texk/musixtnt/musixtnt-src/msxlint.c index 47a8bede0c4..86a5d1f2317 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/msxlint.c +++ b/Build/source/texk/musixtnt/musixtnt-src/msxlint.c @@ -1,6 +1,6 @@ -char version[12] = "2015-02-09"; +char version[12] = "2016-01-30"; -/* Copyright (C) 2014-15 R. D. Tennent School of Computing, +/* Copyright (C) 2014-16 R. D. Tennent School of Computing, * Queen's University, rdt@cs.queensu.ca * * This program is free software; you can redistribute it @@ -386,7 +386,7 @@ main (int argc, char *argv[]) } c = getopt_long (argc, argv, "hvd", longopts, NULL); } - puts ( "Copyright (C) 2014-15 R. D. Tennent" ); + puts ( "Copyright (C) 2014-16 R. D. Tennent" ); puts ( "School of Computing, Queen's University, rdt@cs.queensu.ca" ); puts ( "License GNU GPL version 2 or later <http://gnu.org/licences/gpl.html>." ); puts ( "There is NO WARRANTY, to the extent permitted by law." ); diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/msxlint.test b/Build/source/texk/musixtnt/musixtnt-src/msxlint.test index efdf3620005..efdf3620005 100755 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/msxlint.test +++ b/Build/source/texk/musixtnt/musixtnt-src/msxlint.test diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/badtest.tex b/Build/source/texk/musixtnt/musixtnt-src/tests/badtest.tex index ed85d76374e..ed85d76374e 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/badtest.tex +++ b/Build/source/texk/musixtnt/musixtnt-src/tests/badtest.tex diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/linttest.out b/Build/source/texk/musixtnt/musixtnt-src/tests/linttest.out index db86b2d9938..db86b2d9938 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/linttest.out +++ b/Build/source/texk/musixtnt/musixtnt-src/tests/linttest.out diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/linttest.tex b/Build/source/texk/musixtnt/musixtnt-src/tests/linttest.tex index 588582b4e89..588582b4e89 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/tests/linttest.tex +++ b/Build/source/texk/musixtnt/musixtnt-src/tests/linttest.tex diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/utils.c b/Build/source/texk/musixtnt/musixtnt-src/utils.c index 808f43ac3a8..808f43ac3a8 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/utils.c +++ b/Build/source/texk/musixtnt/musixtnt-src/utils.c diff --git a/Build/source/texk/musixtnt/musixtnt-2015-02-09/utils.h b/Build/source/texk/musixtnt/musixtnt-src/utils.h index fc25559ee52..34fc3a83f82 100644 --- a/Build/source/texk/musixtnt/musixtnt-2015-02-09/utils.h +++ b/Build/source/texk/musixtnt/musixtnt-src/utils.h @@ -1,8 +1,8 @@ /* - utils.h -- header file for fixmsxpart.c and msxlint.c + utils.h -- header file for msxlint.c - Copyright (c) 2005-15 R. D. Tennent + Copyright (c) 2005-16 R. D. Tennent School of Computing, Queen's University, rdt@cs.queensu.ca This program is free software; you can redistribute it and/or modify it @@ -28,6 +28,8 @@ with this program; if not, write to the Free Software Foundation, Inc., # include <stdlib.h> # include <string.h> # include <stdio.h> +# include <ctype.h> + # ifdef KPATHSEA # include <kpathsea/getopt.h> # else diff --git a/Build/source/texk/musixtnt/version.ac b/Build/source/texk/musixtnt/version.ac index 92b14cc63c7..cfedc9b5963 100644 --- a/Build/source/texk/musixtnt/version.ac +++ b/Build/source/texk/musixtnt/version.ac @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current musixtnt version -m4_define([musixtnt_version], [2015-02-09]) +m4_define([musixtnt_version], [2016-01-30]) |