diff options
Diffstat (limited to 'Build/source/utils/m-tx/mtx-src')
-rw-r--r-- | Build/source/utils/m-tx/mtx-src/Corrections | 6 | ||||
-rw-r--r-- | Build/source/utils/m-tx/mtx-src/files.c | 4 | ||||
-rw-r--r-- | Build/source/utils/m-tx/mtx-src/libp2c/p2clib.c | 4 | ||||
-rw-r--r-- | Build/source/utils/m-tx/mtx-src/preamble.c | 4 | ||||
-rw-r--r-- | Build/source/utils/m-tx/mtx-src/preamble.pas | 3 | ||||
-rw-r--r-- | Build/source/utils/m-tx/mtx-src/prepmx.c | 6 | ||||
-rw-r--r-- | Build/source/utils/m-tx/mtx-src/prepmx.pas | 4 |
7 files changed, 19 insertions, 12 deletions
diff --git a/Build/source/utils/m-tx/mtx-src/Corrections b/Build/source/utils/m-tx/mtx-src/Corrections index 23b6da91690..ced0da435c3 100644 --- a/Build/source/utils/m-tx/mtx-src/Corrections +++ b/Build/source/utils/m-tx/mtx-src/Corrections @@ -3,6 +3,12 @@ Corrections and enhancements to M-Tx starting from 0.53 Newest items at top. You might also want to look at file `MAINTENANCE`. +Version 0.63a +------------- + +Commented out apparently spurious begin...end block in preambleDefaults +in preamble.pas. (RDT) + Version 0.63 ------------ diff --git a/Build/source/utils/m-tx/mtx-src/files.c b/Build/source/utils/m-tx/mtx-src/files.c index bd080211a97..f78ba27d860 100644 --- a/Build/source/utils/m-tx/mtx-src/files.c +++ b/Build/source/utils/m-tx/mtx-src/files.c @@ -289,9 +289,9 @@ void OpenFiles(void) pushFile(infilename); strcpy(outfile_NAME, outfilename); if (outfile != NULL) - outfile = freopen(outfile_NAME, "w", outfile); + outfile = freopen(outfile_NAME, "wb", outfile); else - outfile = fopen(outfile_NAME, "w"); + outfile = fopen(outfile_NAME, "wb"); _SETIO(outfile != NULL, FileNotFound); strcpy(stylefile_NAME, stylefilename); if (stylefile != NULL) diff --git a/Build/source/utils/m-tx/mtx-src/libp2c/p2clib.c b/Build/source/utils/m-tx/mtx-src/libp2c/p2clib.c index 30b6c55a96f..247ddd1e634 100644 --- a/Build/source/utils/m-tx/mtx-src/libp2c/p2clib.c +++ b/Build/source/utils/m-tx/mtx-src/libp2c/p2clib.c @@ -73,8 +73,8 @@ register int n; { register char *dd = (char *)d, *ss = (char *)s; if (dd < ss || dd - ss >= n) { -#if defined(bcopy) && defined(memcpy) - my_memcpy(dd, ss, n); +#if defined(bcopy) && defined(memcpy) + Anyptr my_memcpy(Anyptr d, Const Anyptr s, size_t n); #else memcpy(dd, ss, n); #endif diff --git a/Build/source/utils/m-tx/mtx-src/preamble.c b/Build/source/utils/m-tx/mtx-src/preamble.c index cd403bd46e5..4a7da2e5449 100644 --- a/Build/source/utils/m-tx/mtx-src/preamble.c +++ b/Build/source/utils/m-tx/mtx-src/preamble.c @@ -801,8 +801,8 @@ void preambleDefaults(void) stave_size[i] = unspec; for (i = 0; i <= maxstaves; i++) nspace[i] = unspec; - nspace[i] = unspec; - stave_size[i-1] = unspec; + /* next line seems to be spurious. 0.63a RDT */ + /* begin nspace[i]:=unspec; stave_size[i]:=unspec; end; */ n_pages = 1; n_systems = 1; readStyles(); diff --git a/Build/source/utils/m-tx/mtx-src/preamble.pas b/Build/source/utils/m-tx/mtx-src/preamble.pas index 7898864bd26..c27b9f7054f 100644 --- a/Build/source/utils/m-tx/mtx-src/preamble.pas +++ b/Build/source/utils/m-tx/mtx-src/preamble.pas @@ -501,7 +501,8 @@ begin for i:=1 to maxvoices do setVocal(i,false); for i:=1 to maxstaves do stave_size[i]:=unspec; for i:=0 to maxstaves do nspace[i]:=unspec; - begin nspace[i]:=unspec; stave_size[i]:=unspec; end; + { next line seems to be spurious. 0.63a RDT } + { begin nspace[i]:=unspec; stave_size[i]:=unspec; end; } n_pages:=1; n_systems:=1; readStyles; old_known_styles := known_styles; for i:=1 to lines_in_paragraph do omit_line[i]:=false; diff --git a/Build/source/utils/m-tx/mtx-src/prepmx.c b/Build/source/utils/m-tx/mtx-src/prepmx.c index d7fc8f38161..a3d37070c27 100644 --- a/Build/source/utils/m-tx/mtx-src/prepmx.c +++ b/Build/source/utils/m-tx/mtx-src/prepmx.c @@ -66,8 +66,8 @@ /** M-Tx preprocessor to PMX Dirk Laurie */ -#define version "0.63" -#define version_date "<7 January 2018>" +#define version "0.63a" +#define version_date "<8 April 2018>" /** See file "Corrections" for updates */ @@ -758,7 +758,7 @@ Static boolean isControlParagraph(Char (*P)[256], paragraph_index para_len) Static void topOfPMXfile(void) { Char STR2[24]; - Char STR3[32]; + Char STR3[30]; putLine("---"); sprintf(STR2, "\\def\\mtxversion{%s}", version); diff --git a/Build/source/utils/m-tx/mtx-src/prepmx.pas b/Build/source/utils/m-tx/mtx-src/prepmx.pas index 4c743365964..f6b472ea6ff 100644 --- a/Build/source/utils/m-tx/mtx-src/prepmx.pas +++ b/Build/source/utils/m-tx/mtx-src/prepmx.pas @@ -5,8 +5,8 @@ uses control, strings, globals, preamble, lyrics, mtx, analyze, { CMO: addition/change by Christian Mondrup } {* M-Tx preprocessor to PMX Dirk Laurie } -const version = '0.63'; - version_date = '<7 January 2018>'; +const version = '0.63a'; + version_date = '<8 April 2018>'; {* See file "Corrections" for updates } |