summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-10-19 15:34:42 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-10-19 15:34:42 +0000
commit099a7eb7059c2d88a5e672854ee06aa72ddde77c (patch)
tree3ad8bdf631d9d7dcc12a8e847daa099fabab836b
parent53eb3d86b589be0f3dbfe4193512334464c85aa8 (diff)
musixflx 0.83.2 (19oct10)
git-svn-id: svn://tug.org/texlive/trunk@20141 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/README4
-rw-r--r--Build/source/texk/musixflx/ChangeLog7
-rwxr-xr-xBuild/source/texk/musixflx/configure24
-rw-r--r--Build/source/texk/musixflx/configure.ac2
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83-PATCHES/TL-Changes9
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-01-filenames28
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-02-FILENAME_MAX26
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-03-ANSI36
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-04-lastbar11
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-05-HAVE_CONFIG_H16
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-06-indent170
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83.2-PATCHES/ChangeLog (renamed from Build/source/texk/musixflx/musixflx-0.83-PATCHES/ChangeLog)6
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83.2-PATCHES/TL-Changes9
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83.2/AUTHORS (renamed from Build/source/texk/musixflx/musixflx-0.83/AUTHORS)1
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83.2/COPYING (renamed from Build/source/texk/musixflx/musixflx-0.83/COPYING)0
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83.2/ChangeLog (renamed from Build/source/texk/musixflx/musixflx-0.83/ChangeLog)20
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83.2/Makefile.am (renamed from Build/source/texk/musixflx/musixflx-0.83/Makefile.am)0
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83.2/Makefile.in (renamed from Build/source/texk/musixflx/musixflx-0.83/Makefile.in)0
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83.2/NEWS9
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83.2/README2
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83.2/aclocal.m4 (renamed from Build/source/texk/musixflx/musixflx-0.83/aclocal.m4)0
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83.2/config.h.in (renamed from Build/source/texk/musixflx/musixflx-0.83/config.h.in)0
-rwxr-xr-xBuild/source/texk/musixflx/musixflx-0.83.2/configure (renamed from Build/source/texk/musixflx/musixflx-0.83/configure)20
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83.2/configure.ac (renamed from Build/source/texk/musixflx/musixflx-0.83/configure.ac)3
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83.2/musixflx.140
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83.2/musixflx.c (renamed from Build/source/texk/musixflx/musixflx-0.83/musixflx.c)8
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83/NEWS39
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83/README1
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83/musixflx.136
29 files changed, 126 insertions, 401 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README
index af821e29216..efde2cb880b 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -75,8 +75,8 @@ lcdf-typetools - checked 04oct10
makeindexk - maintained here, by us
-musixflx - checked 15oct10
- http://mirror.ctan.org/macros/musixtex/musixflx-0.83.tar.gz
+musixflx - checked 19oct10
+ http://mirror.ctan.org/macros/musixtex/musixflx-0.83.2.tar.gz
ps2pkm - ?
diff --git a/Build/source/texk/musixflx/ChangeLog b/Build/source/texk/musixflx/ChangeLog
index d322713fbd1..d21547e7ccc 100644
--- a/Build/source/texk/musixflx/ChangeLog
+++ b/Build/source/texk/musixflx/ChangeLog
@@ -1,6 +1,13 @@
+2009-10-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import musixflx-0.83.2 from CTAN.
+
+ * configure.ac: Adapted.
+
2009-10-18 Peter Breitenlohner <peb@mppmu.mpg.de>
Import musixflx-0.83 from CTAN (as of 28 Sep 2010)..
+
* Makefile.am, configure.ac: Proxy build system for TeX Live,
using the musixflx-0.83 distribution tree.
* musixflx-0.83-PATCHES: New directory with patches applied to
diff --git a/Build/source/texk/musixflx/configure b/Build/source/texk/musixflx/configure
index 77a3b6e8e55..2028a0ec768 100755
--- a/Build/source/texk/musixflx/configure
+++ b/Build/source/texk/musixflx/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for musixflx for TeX Live 0.83.
+# Generated by GNU Autoconf 2.68 for musixflx for TeX Live 0.83.2.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -559,12 +559,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='musixflx for TeX Live'
PACKAGE_TARNAME='musixflx-for-tex-live'
-PACKAGE_VERSION='0.83'
-PACKAGE_STRING='musixflx for TeX Live 0.83'
+PACKAGE_VERSION='0.83.2'
+PACKAGE_STRING='musixflx for TeX Live 0.83.2'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="musixflx-0.83/musixflx.c"
+ac_unique_file="musixflx-0.83.2/musixflx.c"
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
@@ -1208,7 +1208,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 musixflx for TeX Live 0.83 to adapt to many kinds of systems.
+\`configure' configures musixflx for TeX Live 0.83.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1275,7 +1275,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of musixflx for TeX Live 0.83:";;
+ short | recursive ) echo "Configuration of musixflx for TeX Live 0.83.2:";;
esac
cat <<\_ACEOF
@@ -1366,7 +1366,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-musixflx for TeX Live configure 0.83
+musixflx for TeX Live configure 0.83.2
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1421,7 +1421,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 musixflx for TeX Live $as_me 0.83, which was
+It was created by musixflx for TeX Live $as_me 0.83.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2240,7 +2240,7 @@ fi
# Define the identity of the package.
PACKAGE='musixflx-for-tex-live'
- VERSION='0.83'
+ VERSION='0.83.2'
cat >>confdefs.h <<_ACEOF
@@ -3353,7 +3353,7 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
ac_config_headers="$ac_config_headers config.h"
-MUSIXFLX_TREE=musixflx-0.83
+MUSIXFLX_TREE=musixflx-0.83.2
ac_config_files="$ac_config_files Makefile"
@@ -3897,7 +3897,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 musixflx for TeX Live $as_me 0.83, which was
+This file was extended by musixflx for TeX Live $as_me 0.83.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3963,7 +3963,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="\\
-musixflx for TeX Live config.status 0.83
+musixflx for TeX Live config.status 0.83.2
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/musixflx/configure.ac b/Build/source/texk/musixflx/configure.ac
index 62e0587be77..f4bdb717262 100644
--- a/Build/source/texk/musixflx/configure.ac
+++ b/Build/source/texk/musixflx/configure.ac
@@ -6,7 +6,7 @@ dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-m4_define([musixflx_version], [0.83])[]dnl using unmodified musixflx source tree
+m4_define([musixflx_version], [0.83.2])[]dnl using unmodified musixflx source tree
AC_INIT([musixflx for TeX Live], musixflx_version, [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([musixflx-]musixflx_version[/musixflx.c])
diff --git a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/TL-Changes b/Build/source/texk/musixflx/musixflx-0.83-PATCHES/TL-Changes
deleted file mode 100644
index 8d194378ab1..00000000000
--- a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/TL-Changes
+++ /dev/null
@@ -1,9 +0,0 @@
-Changes applied to the musixflx-0.83 tree as obtained from:
- http://mirror.ctan.org/macros/musixtex/musixflx-0.83.tar.gz as of 28 Sep 2010.
-
-Removed:
- INSTALL
- depcomp
- install-sh
- missing
-
diff --git a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-01-filenames b/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-01-filenames
deleted file mode 100644
index 1b4bccc36d6..00000000000
--- a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-01-filenames
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur musixflx-0.83.orig/musixflx.c musixflx-0.83/musixflx.c
---- musixflx-0.83.orig/musixflx.c 2010-09-25 15:56:09.000000000 +0200
-+++ musixflx-0.83/musixflx.c 2010-10-18 11:31:28.147003045 +0200
-@@ -106,6 +106,8 @@
-
- char name_of_file [128], n_o_f [128], n_o_logfile[128], MusiXFlxVersion[6];
-
-+ char *p;
-+
- printf("\n <<< musixflex %s%s >>>\n", VERSION, MYVERSION);
- printf("\n ... decoding command line\n");
-
-@@ -130,7 +132,14 @@
-
- strcpy (name_of_file, argv[1]);
-
-- strcpy(n_o_f, strtok(name_of_file, "."));
-+ p = strrchr(name_of_file, '.');
-+ if (p && !strchr(p + 1, '/')
-+#if defined(__MSDOS__) || defined(WIN32)
-+ && !strchr(p + 1, '\\')
-+#endif
-+ )
-+ *p = '\0';
-+ strcpy(n_o_f, name_of_file);
- strcat(name_of_file, ".mx1");
-
- /*****************************************************
diff --git a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-02-FILENAME_MAX b/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-02-FILENAME_MAX
deleted file mode 100644
index b7df1cd0271..00000000000
--- a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-02-FILENAME_MAX
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur musixflx-0.83.orig/musixflx.c musixflx-0.83/musixflx.c
---- musixflx-0.83.orig/musixflx.c 2010-10-18 11:31:28.000000000 +0200
-+++ musixflx-0.83/musixflx.c 2010-10-18 11:34:37.978679634 +0200
-@@ -31,6 +31,13 @@
- #define TRUE 1
- #define FALSE 0
-
-+/* FILENAME_MAX should be in stdio.h, but if your compiler loses,
-+ here's a replacement. */
-+#ifndef FILENAME_MAX
-+#define FILENAME_MAX 512
-+#endif
-+#define FNL FILENAME_MAX
-+
- /* attention: every \changecontext reports a change of \sign@skip */
-
- #define MAX_SIGNS 128 /* max signature changes */
-@@ -104,7 +111,7 @@
- beforerule, cor_beforerule, afterrule, cor_afterrule, lastbar,
- eff_linewidth, fill_length, hardlength, softlength, clefskip;
-
-- char name_of_file [128], n_o_f [128], n_o_logfile[128], MusiXFlxVersion[6];
-+ char name_of_file [FNL], n_o_f [FNL], n_o_logfile[FNL], MusiXFlxVersion[6];
-
- char *p;
-
diff --git a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-03-ANSI b/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-03-ANSI
deleted file mode 100644
index 83bedb58096..00000000000
--- a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-03-ANSI
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur musixflx-0.83.orig/musixflx.c musixflx-0.83/musixflx.c
---- musixflx-0.83.orig/musixflx.c 2010-10-18 11:34:37.000000000 +0200
-+++ musixflx-0.83/musixflx.c 2010-10-18 11:49:06.934796190 +0200
-@@ -46,9 +46,6 @@
-
- #define GETLINE fgets(linebuf, (int) sizeof(linebuf), infile)
-
--/* ! If next line causes trouble, comment it out ! */
--void error_exit(int error_number);
--
- int zbar[MAX_BARS], lr_repeat[MAX_BARS], raggedline[MAX_BARS],
- l_repeat[MAX_BARS], barno[MAX_BARS], autolines[MAX_SECTIONS],
- bars[MAX_SECTIONS], mulooseness[MAX_SECTIONS], signchange[MAX_SIGNS],
-@@ -65,8 +62,8 @@
- FILE *infile, *outfile, *logfile;
- char linebuf[128];
-
--void error_exit(error_number)
-- int error_number;
-+static void
-+error_exit(int error_number)
- {
- switch (error_number){
-
-@@ -86,9 +83,8 @@
- default:
- printf("!!! Can't go on !!!\n"); exit(3);}}
-
--int main(argc, argv)
-- int argc;
-- char **argv;
-+int
-+main(int argc, char **argv)
- {
- register int i, j, bar;
-
diff --git a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-04-lastbar b/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-04-lastbar
deleted file mode 100644
index 1e878471933..00000000000
--- a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-04-lastbar
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur musixflx-0.83.orig/musixflx.c musixflx-0.83/musixflx.c
---- musixflx-0.83.orig/musixflx.c 2010-10-18 11:49:06.000000000 +0200
-+++ musixflx-0.83/musixflx.c 2010-10-18 11:54:03.303953595 +0200
-@@ -671,6 +671,7 @@
- hardlength= 0;
- softlength = 0;
- x = 0;
-+ lastbar = 0.0;
- detect_end= FALSE;
-
- while (x<eff_linewidth){
diff --git a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-05-HAVE_CONFIG_H b/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-05-HAVE_CONFIG_H
deleted file mode 100644
index 028e74afcff..00000000000
--- a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-05-HAVE_CONFIG_H
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur musixflx-0.83.orig/musixflx.c musixflx-0.83/musixflx.c
---- musixflx-0.83.orig/musixflx.c 2010-10-18 11:54:03.000000000 +0200
-+++ musixflx-0.83/musixflx.c 2010-10-18 11:58:20.590008308 +0200
-@@ -22,11 +22,11 @@
-
- *****************************************************************************/
-
-+#include <config.h>
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
- #include <ctype.h>
--#include "config.h"
-
- #define TRUE 1
- #define FALSE 0
diff --git a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-06-indent b/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-06-indent
deleted file mode 100644
index 6e7459db787..00000000000
--- a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/patch-06-indent
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -ur musixflx-0.83.orig/musixflx.c musixflx-0.83/musixflx.c
---- musixflx-0.83.orig/musixflx.c 2010-10-18 11:58:20.000000000 +0200
-+++ musixflx-0.83/musixflx.c 2010-10-18 12:15:33.035167453 +0200
-@@ -636,7 +636,7 @@
- added correct computing of fill_length
- ****************************************************************/
-
-- for (j=1; j<=lines; ++j, ++line_in_section){
-+ for (j=1; j<=lines; ++j, ++line_in_section) {
- ++line_number;
- fill_length=(lines-j+1)*(linewidth-(clefskip+signskip[sign]));
-
-@@ -652,8 +652,8 @@
- if (!eff_softlength[section]) error_exit(5);
- spc_factor=(fill_length-eff_hardlength[section])/eff_softlength[section];
-
-- if ((xbar[mark+1]>1) && (mark>0)){
-- /* The bar is an bar+xbar with a sign change. jh-1 */
-+ if ((xbar[mark+1]>1) && (mark>0)) {
-+ /* The bar is an bar+xbar with a sign change. jh-1 */
- eff_linewidth=linewidth-(clefskip+signskip[sign-1])-parindent;
- } else { /* This is a normal bar. jh-1 */
- eff_linewidth=linewidth-(clefskip+signskip[sign])-parindent;
-@@ -674,7 +674,7 @@
- lastbar = 0.0;
- detect_end= FALSE;
-
-- while (x<eff_linewidth){
-+ while (x<eff_linewidth) {
- if (detect_end) break;
- ++i;
-
-@@ -701,7 +701,8 @@
- else if (line_in_section==lines){detect_end=FALSE; x=0;}
-
- hardlength += hardbarlength[i];
-- softlength += softbarlength[i];}
-+ softlength += softbarlength[i];
-+ }
-
- /************************************************
- If the overhang is less than half the barlength,
-@@ -709,7 +710,7 @@
- and shrink the line accordingly.
- *************************************************/
-
-- if ((x-eff_linewidth)<(lastbar/2)){
-+ if ((x-eff_linewidth)<(lastbar/2)) {
- barsinline=i-mark;
- mark=i;
- lastbarno=barno[mark];
-@@ -720,9 +721,10 @@
- the amount of afterruleskip
- *********************************************/
-
-- if (zbar[mark]){
-+ if (zbar[mark]) {
- softbarlength[i+1] += afterrule;
-- eff_softlength[section] += afterrule;}
-+ eff_softlength[section] += afterrule;
-+ }
-
- /********************************************
- last bar in line a leftrightrepeat?
-@@ -731,7 +733,7 @@
- advance the softwidth of next bar
- *********************************************/
-
-- if (lr_repeat[mark]){
-+ if (lr_repeat[mark]) {
- /* printf("mark=%d\n",mark);
- printf("width_leftright=%f\n",width_leftrightrepeat[i]);
- printf("width_left=%f\n",width_leftrepeat[i]); */
-@@ -742,7 +744,7 @@
- softbarlength[i+1] += afterrule/2;
- eff_softlength[section] += afterrule/2;
-
-- }
-+ }
-
- /********************************************
- last bar in line a leftrepeat?
-@@ -751,13 +753,14 @@
- advance the softwidth of next bar
- *********************************************/
-
-- if (l_repeat[mark]){
-+ if (l_repeat[mark]) {
- hardlength -= (width_leftrepeat[i]-lthick);
- hardbarlength[i+1] += width_leftrepeat[i];
- softbarlength[i+1] += afterrule/2;
-- eff_softlength[section] += afterrule/2;}
-+ eff_softlength[section] += afterrule/2;
-+ }
-
-- if (signchange[sign+1]==mark+1){ /* s.b. */
-+ if (signchange[sign+1]==mark+1) { /* s.b. */
- ++sign;
- /* Because the bar is staying here in the line, we look ahead
- to see if the upcoming bar is a sign change, and adjust space
-@@ -766,15 +769,18 @@
- sign change bar is really a bar+xbar set, where the sign change
- is buried in the xbar, then we don't do the move because the
- change notice really won't be posted in this line. jh-1 */
-- if (xbar[mark+1]<2){ /* okay to do the move. jh-1 */
-- hardlength += oldsignskip[sign];
-- hardbarlength[mark+1] -= oldsignskip[sign];}}}
-+ if (xbar[mark+1]<2) { /* okay to do the move. jh-1 */
-+ hardlength += oldsignskip[sign];
-+ hardbarlength[mark+1] -= oldsignskip[sign];
-+ }
-+ }
-+ }
-
- /*********************************************
- Exclude the latest bar, and stretch the line.
- **********************************************/
-
-- else{
-+ else {
-
- barsinline=i-1-mark;
- if (barsinline<1) error_exit(2);
-@@ -785,19 +791,21 @@
-
- if (zbar[mark]) softbarlength[i] += afterrule;
-
-- if (lr_repeat[mark]){
-+ if (lr_repeat[mark]) {
- hardlength -= (width_leftrightrepeat[i-1]-width_leftrepeat[i-1]);
- eff_hardlength[section] +=
- (width_leftrightrepeat[i-1]-width_leftrepeat[i-1]);
- hardbarlength[i] += width_leftrepeat[i-1];
- softbarlength[i] += afterrule/2;
-- eff_softlength[section] += afterrule/2;}
-+ eff_softlength[section] += afterrule/2;
-+ }
-
-- if (l_repeat[mark]){
-+ if (l_repeat[mark]) {
- hardlength -= (width_leftrepeat[i-1]-lthick);
- hardbarlength[i] += width_leftrepeat[i-1];
- softbarlength[i] += afterrule/2;
-- eff_softlength[section] += afterrule/2;}
-+ eff_softlength[section] += afterrule/2;
-+ }
-
- /*********************************************************************
- Error (o/u-hbox) occurs only when signature change start in next line
-@@ -806,13 +814,16 @@
- reduce next hard barlength by signature change
- **********************************************************************/
-
-- if (signchange[sign]==mark+1){
-+ if (signchange[sign]==mark+1) {
- /* However, if the next bar is a bar+xbar set where the
- sign change comes from the xbar, then don't do this
- move, because the extra skip is not really there! jh-1 */
-- if (xbar[mark+1]<2) { /* alright, do the move. jh-1 */
-- hardlength += oldsignskip[sign];
-- hardbarlength[mark+1] -= oldsignskip[sign];}}}
-+ if (xbar[mark+1]<2) { /* alright, do the move. jh-1 */
-+ hardlength += oldsignskip[sign];
-+ hardbarlength[mark+1] -= oldsignskip[sign];
-+ }
-+ }
-+ }
-
- /***********************************************
- Define a flex factor for this line as the ratio
diff --git a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/ChangeLog b/Build/source/texk/musixflx/musixflx-0.83.2-PATCHES/ChangeLog
index 9c0ff6c1553..3f84920649b 100644
--- a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/ChangeLog
+++ b/Build/source/texk/musixflx/musixflx-0.83.2-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import musixflx-0.83.2 source tree from CTAN.
+
+ * patch-0[1-6]-* (removed): Now all in distributed 0.83.2 tree.
+
2010-10-18 Peter Breitenlohner <peb@mppmu.mpg.de>
Import musixflx-0.83 source tree from CTAN.
diff --git a/Build/source/texk/musixflx/musixflx-0.83.2-PATCHES/TL-Changes b/Build/source/texk/musixflx/musixflx-0.83.2-PATCHES/TL-Changes
new file mode 100644
index 00000000000..48b5762e0f1
--- /dev/null
+++ b/Build/source/texk/musixflx/musixflx-0.83.2-PATCHES/TL-Changes
@@ -0,0 +1,9 @@
+Changes applied to the musixflx-0.83.2 tree as obtained from:
+ http://mirror.ctan.org/macros/musixtex/musixflx-0.83.2.tar.gz.
+
+Removed:
+ INSTALL
+ depcomp
+ install-sh
+ missing
+
diff --git a/Build/source/texk/musixflx/musixflx-0.83/AUTHORS b/Build/source/texk/musixflx/musixflx-0.83.2/AUTHORS
index 26e2e336b08..2f68e01a11e 100644
--- a/Build/source/texk/musixflx/musixflx-0.83/AUTHORS
+++ b/Build/source/texk/musixflx/musixflx-0.83.2/AUTHORS
@@ -1 +1,2 @@
Ross Mitchell (ross.mitchell@csiro.au)
+Peter Breitenlohner (peb@mppmu.mpg.de)
diff --git a/Build/source/texk/musixflx/musixflx-0.83/COPYING b/Build/source/texk/musixflx/musixflx-0.83.2/COPYING
index 623b6258a13..623b6258a13 100644
--- a/Build/source/texk/musixflx/musixflx-0.83/COPYING
+++ b/Build/source/texk/musixflx/musixflx-0.83.2/COPYING
diff --git a/Build/source/texk/musixflx/musixflx-0.83/ChangeLog b/Build/source/texk/musixflx/musixflx-0.83.2/ChangeLog
index 1053efee835..c553f4b7174 100644
--- a/Build/source/texk/musixflx/musixflx-0.83/ChangeLog
+++ b/Build/source/texk/musixflx/musixflx-0.83.2/ChangeLog
@@ -23,3 +23,23 @@
- added some safeties for weird situations, March 1995
- fix bug in line breaking when xbars have sign changes - November 1997 jh-1
- support possible \linegoal instead of \mulooseness - November 1997, jh-2
+
+2010-09-27 Bob Tennent <rdt@cs.queensu.ca>
+
+ * musixflx.c: added copyright notice and reference to the GPL license as
+ instructed by e-mail from Ross Mitchell <Ross.Mitchell@csiro.au>
+
+2010-10-18 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * musixflx.c: use ANSI C function declarations.
+ avoid uninitialized use of 'lastbar'.
+ declare error_exit as static.
+ Correctly parse file names from the command line; allow backslash as directory separator.
+ Allow longer file names.
+ #include <config.h> as recommended in the Autoconf manual.
+ Consistent indentation.
+
+2010-10-18 Bob Tennent <rdt@cs.queensu.ca>
+
+ * musixflx.c: replaced definition of VERSION by MUSIXFLXVERSION to allow changes
+ that don't affect MusiXTeX
diff --git a/Build/source/texk/musixflx/musixflx-0.83/Makefile.am b/Build/source/texk/musixflx/musixflx-0.83.2/Makefile.am
index 9705e0204c5..9705e0204c5 100644
--- a/Build/source/texk/musixflx/musixflx-0.83/Makefile.am
+++ b/Build/source/texk/musixflx/musixflx-0.83.2/Makefile.am
diff --git a/Build/source/texk/musixflx/musixflx-0.83/Makefile.in b/Build/source/texk/musixflx/musixflx-0.83.2/Makefile.in
index e905f5229de..e905f5229de 100644
--- a/Build/source/texk/musixflx/musixflx-0.83/Makefile.in
+++ b/Build/source/texk/musixflx/musixflx-0.83.2/Makefile.in
diff --git a/Build/source/texk/musixflx/musixflx-0.83.2/NEWS b/Build/source/texk/musixflx/musixflx-0.83.2/NEWS
new file mode 100644
index 00000000000..6c952e05446
--- /dev/null
+++ b/Build/source/texk/musixflx/musixflx-0.83.2/NEWS
@@ -0,0 +1,9 @@
+Musixflx implements the second pass of a three-pass system described in
+Section 1.3 of the MusiXTeX manual.
+
+This version (0.83.2) incorporates a number of small improvements
+by Peter Breitenlohner and the introduction of MUSIXFLXVERSION to
+distinguish between "local" changes and changes that affect MusiXTeX;
+see the ChangeLog.
+
+Ross Mitchell has by e-mail authorized distribution of this version.
diff --git a/Build/source/texk/musixflx/musixflx-0.83.2/README b/Build/source/texk/musixflx/musixflx-0.83.2/README
new file mode 100644
index 00000000000..060a6cee900
--- /dev/null
+++ b/Build/source/texk/musixflx/musixflx-0.83.2/README
@@ -0,0 +1,2 @@
+This is Musixflx, which implements the second pass of a three-pass
+system described in Section 1.3 of the MusiXTeX manual.
diff --git a/Build/source/texk/musixflx/musixflx-0.83/aclocal.m4 b/Build/source/texk/musixflx/musixflx-0.83.2/aclocal.m4
index aef181a6ddb..aef181a6ddb 100644
--- a/Build/source/texk/musixflx/musixflx-0.83/aclocal.m4
+++ b/Build/source/texk/musixflx/musixflx-0.83.2/aclocal.m4
diff --git a/Build/source/texk/musixflx/musixflx-0.83/config.h.in b/Build/source/texk/musixflx/musixflx-0.83.2/config.h.in
index f1db752a7dd..f1db752a7dd 100644
--- a/Build/source/texk/musixflx/musixflx-0.83/config.h.in
+++ b/Build/source/texk/musixflx/musixflx-0.83.2/config.h.in
diff --git a/Build/source/texk/musixflx/musixflx-0.83/configure b/Build/source/texk/musixflx/musixflx-0.83.2/configure
index df80e8b8c02..35cd5ae32ce 100755
--- a/Build/source/texk/musixflx/musixflx-0.83/configure
+++ b/Build/source/texk/musixflx/musixflx-0.83.2/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for musixflx 0.83.
+# Generated by GNU Autoconf 2.59 for musixflx 0.83.2.
#
# Report bugs to <ross.mitchell@csiro.au>.
#
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='musixflx'
PACKAGE_TARNAME='musixflx'
-PACKAGE_VERSION='0.83'
-PACKAGE_STRING='musixflx 0.83'
+PACKAGE_VERSION='0.83.2'
+PACKAGE_STRING='musixflx 0.83.2'
PACKAGE_BUGREPORT='ross.mitchell@csiro.au'
ac_unique_file="musixflx.c"
@@ -780,7 +780,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 musixflx 0.83 to adapt to many kinds of systems.
+\`configure' configures musixflx 0.83.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -842,7 +842,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of musixflx 0.83:";;
+ short | recursive ) echo "Configuration of musixflx 0.83.2:";;
esac
cat <<\_ACEOF
@@ -960,7 +960,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-musixflx configure 0.83
+musixflx configure 0.83.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -974,7 +974,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by musixflx $as_me 0.83, which was
+It was created by musixflx $as_me 0.83.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1617,7 +1617,7 @@ fi
# Define the identity of the package.
PACKAGE='musixflx'
- VERSION='0.83'
+ VERSION='0.83.2'
cat >>confdefs.h <<_ACEOF
@@ -3987,7 +3987,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by musixflx $as_me 0.83, which was
+This file was extended by musixflx $as_me 0.83.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4050,7 +4050,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-musixflx config.status 0.83
+musixflx config.status 0.83.2
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/Build/source/texk/musixflx/musixflx-0.83/configure.ac b/Build/source/texk/musixflx/musixflx-0.83.2/configure.ac
index df3dc15626d..323f231cee2 100644
--- a/Build/source/texk/musixflx/musixflx-0.83/configure.ac
+++ b/Build/source/texk/musixflx/musixflx-0.83.2/configure.ac
@@ -1,8 +1,9 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
+m4_define([musixflx_version], [0.83.2])[]
AC_PREREQ(2.59)
-AC_INIT(musixflx, 0.83, ross.mitchell@csiro.au)
+AC_INIT([musixflx], musixflx_version, [ross.mitchell@csiro.au])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([musixflx.c])
diff --git a/Build/source/texk/musixflx/musixflx-0.83.2/musixflx.1 b/Build/source/texk/musixflx/musixflx-0.83.2/musixflx.1
new file mode 100644
index 00000000000..b94345f73c9
--- /dev/null
+++ b/Build/source/texk/musixflx/musixflx-0.83.2/musixflx.1
@@ -0,0 +1,40 @@
+.\" This manpage is licensed under the GNU Public License
+.TH MUSIXFLX 1 2010-10-19 "musixflx-0.83.2" ""
+
+.SH NAME
+musixflx \- process mx1 files (the second pass of 3-pass MusiXTeX typesetting)
+
+.SH SYNOPSIS
+.B musixflx
+.IR jobname [ .mx1 " | " .tex ]
+[
+.I debugmode
+]
+
+where
+.I debugmode
+can be
+.br
+ d for debug information to the screen
+.br
+ m for line numbers to the screen
+.br
+ f for debug information to a log file jobname.mxl (not .mx1)
+.br
+ s to get the computed lines immediately on the screen
+
+To allow for ease of use with a batch file, \fB musixflx\fR
+can be fed with either \fI jobname.mx1\fP, \fI jobname.tex\fP,
+or just \fI jobname\fP, any of which open \fI jobname.mx1\fP.
+
+.SH SEE ALSO
+.BR musixtex (1)
+.br
+musixdoc.pdf
+
+.SH AUTHOR
+This manual page was written by Andreas Tille
+<tille@debian.org> for the Debian GNU/Linux system (but may be used
+by others). Corrections to the synopsis were pointed out by Peter
+Breitenlohner <peb@mppmu.mpg.de> and implemented by Bob Tennent
+<rdt@cs.queensu.ca>.
diff --git a/Build/source/texk/musixflx/musixflx-0.83/musixflx.c b/Build/source/texk/musixflx/musixflx-0.83.2/musixflx.c
index 8c302d17a34..4c0086abba8 100644
--- a/Build/source/texk/musixflx/musixflx-0.83/musixflx.c
+++ b/Build/source/texk/musixflx/musixflx-0.83.2/musixflx.c
@@ -1,9 +1,11 @@
-#define VERSION "0.83"
+#define MUSIXFLXVERSION "0.83"
#define MYVERSION "/T.63dt+jh.2\0" /* Revision jh.2 jh-2 */
+ /* Don't know who jh is. Bob Tennent */
/****************************************************************************
Line breaking program for MusiXTeX.
(c) Ross Mitchell 1992-1997 ross.mitchell@csiro.au
+ (c) Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
This program is free software; you can redistribute it and/or modify it
@@ -111,7 +113,7 @@ main(int argc, char **argv)
char *p;
- printf("\n <<< musixflex %s%s >>>\n", VERSION, MYVERSION);
+ printf("\n <<< musixflex %s >>>\n", VERSION);
printf("\n ... decoding command line\n");
if (argc<2 || argc >3) error_exit(1);
@@ -160,7 +162,7 @@ main(int argc, char **argv)
and stop if they differ
************************/
- strcpy(MusiXFlxVersion, VERSION);
+ strcpy(MusiXFlxVersion, MUSIXFLXVERSION);
strcat(MusiXFlxVersion, "\n");
printf(" ... testing versionnumber\n");
++currentline;
diff --git a/Build/source/texk/musixflx/musixflx-0.83/NEWS b/Build/source/texk/musixflx/musixflx-0.83/NEWS
deleted file mode 100644
index 87c8a3cbffc..00000000000
--- a/Build/source/texk/musixflx/musixflx-0.83/NEWS
+++ /dev/null
@@ -1,39 +0,0 @@
-Sept 25, 2010
-
- RDT added the copyright notice and reference to the GPL license,
- based on the following comment in musixdoc.tex:
-
-% MusiXTeX 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, or (at your option)
-% any later version.
-
-and the following e-mail exchange:
-
- From Ross.Mitchell@csiro.au Mon Sep 27 02:23:36 2010
- From: <Ross.Mitchell@csiro.au>
- To: <rdt@cs.queensu.ca>
- Date: Mon, 27 Sep 2010 16:20:29 +1000
- Subject: Re: musixflx
-
- Bob, I'm happy for you to add license provisions to musixflx.c as
- suggested.
- Regards,
- Ross Mitchell
-
- ----- Original Message -----
- From: Bob Tennent [mailto:rdt@cs.queensu.ca]
- Sent: Saturday, September 25, 2010 12:47 AM
- To: Mitchell, Ross (CMAR, Black Mountain)
- Subject: musixflx
-
- Ross: I've been assigned the task of cleaning up the files for musixtex
- and friends at CTAN. I'd like to include musixflx.c but I haven't found
- a license for it. Are you agreeable to my applying either the GPL or the
- LPPL to it (and a copyright attribution to you)?
-
-________________________________________________________________________________
-
-
-Musixflx implements the second pass of a three-pass system described in
-Section 1.3 of the MusiXTeX manual.
diff --git a/Build/source/texk/musixflx/musixflx-0.83/README b/Build/source/texk/musixflx/musixflx-0.83/README
deleted file mode 100644
index a112f8c3e4c..00000000000
--- a/Build/source/texk/musixflx/musixflx-0.83/README
+++ /dev/null
@@ -1 +0,0 @@
-This is musixflx, a line-breaking program for MusiXTeX.
diff --git a/Build/source/texk/musixflx/musixflx-0.83/musixflx.1 b/Build/source/texk/musixflx/musixflx-0.83/musixflx.1
deleted file mode 100644
index 6b6c7ae50a1..00000000000
--- a/Build/source/texk/musixflx/musixflx-0.83/musixflx.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\" musixflx.1
-.\" Written by Andreas Tille <tille@debian.org> for the Debian GNU/Linux
-.\" distribution but might be useful for others, too.
-.\" This manpage is licensed under the GNU Public License
-.TH MUSIXFLX 1
-
-.SH NAME
-musixflx \- preprocess mx1 files
-
-.SH SYNOPSIS
-.B musixflx
-.I "[debugmode] jobname.mx1"
-
-.SH "DESCRIPTION"
-
-Optionally, you can add a letter to indicate one of the debug modes, which are:
-
- d for debug information to screen
-.br
- f for debug information to file jobname.mxl
-.br
- s to get the computed lines immediately on screen
-
-To allow for ease of use with a batch file, \fB musixflx\fR
-can either be fed with \fI jobname.mx1\fP, \fI jobname.tex\fP
-or only \fI jobname\fP, all of which opens \fI jobname.mx1\fP.
-
-.SH SEE ALSO
-musixtex(1)
-.br
-/usr/share/doc/musixtex/musixdoc.ps on a Debian GNU/Linux system
-
-
-.SH AUTHOR
-This manual page was written by Andreas Tille <tille@debian.org>
-for the Debian GNU/Linux system (but may be used by others).