summaryrefslogtreecommitdiff
path: root/Build/source/texk/musixflx/musixflx-0.83-PATCHES
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/musixflx/musixflx-0.83-PATCHES')
-rw-r--r--Build/source/texk/musixflx/musixflx-0.83-PATCHES/ChangeLog18
-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
8 files changed, 0 insertions, 314 deletions
diff --git a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/ChangeLog b/Build/source/texk/musixflx/musixflx-0.83-PATCHES/ChangeLog
deleted file mode 100644
index 9c0ff6c1553..00000000000
--- a/Build/source/texk/musixflx/musixflx-0.83-PATCHES/ChangeLog
+++ /dev/null
@@ -1,18 +0,0 @@
-2010-10-18 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- Import musixflx-0.83 source tree from CTAN.
-
- Changes from pre2006 teTeX repository:
- * patch-01-filenames (new): Correctly parse file names from the
- command line; allow backslash as directory separator.
- * patch-02-FILENAME_MAX (new): Allow longer file names.
-
- Changes from TeX Live repository (2009):
- * patch-03-ANSI (new): Use ANSI C function declarations.
- Declare error_exit as static.
- * patch-04-lastbar (new): Avoid uninitialized use of 'lastbar'.
-
- * patch-05-HAVE_CONFIG_H (new): #include <config.h> as
- recommended in the Autoconf manual.
- * patch-06-indent (new): Consistent indentation.
-
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