From 1040ec4ab43659eabf6281bc7cb414dc222ec071 Mon Sep 17 00:00:00 2001 From: Hironobu Yamashita Date: Wed, 14 Sep 2022 13:18:47 +0000 Subject: m-tx 0.63d git-svn-id: svn://tug.org/texlive/trunk@64381 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/README | 2 +- Build/source/utils/m-tx/ChangeLog | 4 + Build/source/utils/m-tx/TLpatches/ChangeLog | 4 + Build/source/utils/m-tx/TLpatches/TL-Changes | 2 +- .../source/utils/m-tx/TLpatches/patch-01-write-bin | 12 +- Build/source/utils/m-tx/configure | 20 +- Build/source/utils/m-tx/mtx-src/ChangeLog | 5 + Build/source/utils/m-tx/mtx-src/Corrections | 14 +- Build/source/utils/m-tx/mtx-src/Makefile.am | 5 +- Build/source/utils/m-tx/mtx-src/Makefile.p2c | 2 +- Build/source/utils/m-tx/mtx-src/cfuncs.h | 4 +- Build/source/utils/m-tx/mtx-src/compile | 348 +++++++++++++++++++++ Build/source/utils/m-tx/mtx-src/configure.ac | 2 +- Build/source/utils/m-tx/mtx-src/libp2c/p2c.h | 2 +- Build/source/utils/m-tx/mtx-src/mtx.test | 13 +- Build/source/utils/m-tx/mtx-src/prepmx.c | 6 +- Build/source/utils/m-tx/mtx-src/prepmx.pas | 4 +- Build/source/utils/m-tx/mtx-src/strings.h | 7 +- Build/source/utils/m-tx/mtx-src/utility.c | 1 + Build/source/utils/m-tx/mtx-src/utility.pas | 2 + Build/source/utils/m-tx/mtx-src/version.ac | 2 +- Build/source/utils/m-tx/tests/mozart.pmx | 4 +- Build/source/utils/m-tx/version.ac | 2 +- 23 files changed, 426 insertions(+), 41 deletions(-) create mode 100755 Build/source/utils/m-tx/mtx-src/compile (limited to 'Build/source/utils') diff --git a/Build/source/utils/README b/Build/source/utils/README index ec43e2f7b2c..4461bb3ff86 100644 --- a/Build/source/utils/README +++ b/Build/source/utils/README @@ -20,7 +20,7 @@ devnag - from devanagari package installed in texmf-dist. lacheck - maintained here, by us -m-tx 0.63a - checked 29apr18 +m-tx 0.63d - checked 14sep22 https://ctan.org/pkg/m-tx/ pmx 2.9.8a - checked 08mar22 diff --git a/Build/source/utils/m-tx/ChangeLog b/Build/source/utils/m-tx/ChangeLog index f81d8fa463a..e99bcecbc97 100644 --- a/Build/source/utils/m-tx/ChangeLog +++ b/Build/source/utils/m-tx/ChangeLog @@ -1,3 +1,7 @@ +2022-09-14 Hironobu Yamashita + + * Import m-tx 0.63d. + 2018-04-29 Akira Kakuto * Import m-tx 0.63a. diff --git a/Build/source/utils/m-tx/TLpatches/ChangeLog b/Build/source/utils/m-tx/TLpatches/ChangeLog index 586afebe506..02984e37a00 100644 --- a/Build/source/utils/m-tx/TLpatches/ChangeLog +++ b/Build/source/utils/m-tx/TLpatches/ChangeLog @@ -1,3 +1,7 @@ +2022-09-14 Hironobu Yamashita + + * patch-01-write-bin: Update for 0.63d. + 2018-04-29 Akira Kakuto * patch-01-write-bin: Update for 0.63a. diff --git a/Build/source/utils/m-tx/TLpatches/TL-Changes b/Build/source/utils/m-tx/TLpatches/TL-Changes index 8247e3c8f32..d394ff9a631 100644 --- a/Build/source/utils/m-tx/TLpatches/TL-Changes +++ b/Build/source/utils/m-tx/TLpatches/TL-Changes @@ -1,4 +1,4 @@ -Changes applied to the mtx-0.63a tree as obtained from: +Changes applied to the mtx-0.63d tree as obtained from: http://www.ctan.org/tex-archive/support/m-tx/ Remove: diff --git a/Build/source/utils/m-tx/TLpatches/patch-01-write-bin b/Build/source/utils/m-tx/TLpatches/patch-01-write-bin index 222e43ba63e..52bb2832a79 100644 --- a/Build/source/utils/m-tx/TLpatches/patch-01-write-bin +++ b/Build/source/utils/m-tx/TLpatches/patch-01-write-bin @@ -1,6 +1,6 @@ -diff -ur mtx-0.63a/files.c mtx-src/files.c ---- mtx-0.63a/files.c Tue Jan 09 01:39:42 2018 -+++ mtx-src/files.c Wed Apr 25 18:07:12 2018 +diff -ur mtx-0.63d.orig/files.c mtx-0.63d/files.c +--- mtx-0.63d.orig/files.c 2022-07-26 05:35:12.000000000 +0900 ++++ mtx-0.63d/files.c 2022-09-14 22:07:11.000000000 +0900 @@ -289,9 +289,9 @@ pushFile(infilename); strcpy(outfile_NAME, outfilename); @@ -13,9 +13,9 @@ diff -ur mtx-0.63a/files.c mtx-src/files.c _SETIO(outfile != NULL, FileNotFound); strcpy(stylefile_NAME, stylefilename); if (stylefile != NULL) -diff -ur mtx-0.63a/globals.c mtx-src/globals.c ---- mtx-0.63a/globals.c Tue Jan 09 01:39:42 2018 -+++ mtx-src/globals.c Wed Apr 25 18:07:37 2018 +diff -ur mtx-0.63d.orig/globals.c mtx-0.63d/globals.c +--- mtx-0.63d.orig/globals.c 2022-07-26 05:35:12.000000000 +0900 ++++ mtx-0.63d/globals.c 2022-09-14 22:07:11.000000000 +0900 @@ -230,7 +230,7 @@ if (outfile != NULL) fclose(outfile); diff --git a/Build/source/utils/m-tx/configure b/Build/source/utils/m-tx/configure index 2b151336d60..e6329151913 100755 --- a/Build/source/utils/m-tx/configure +++ b/Build/source/utils/m-tx/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for m-tx (TeX Live) 0.63a. +# Generated by GNU Autoconf 2.71 for m-tx (TeX Live) 0.63d. # # Report bugs to . # @@ -610,8 +610,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='m-tx (TeX Live)' PACKAGE_TARNAME='m-tx--tex-live-' -PACKAGE_VERSION='0.63a' -PACKAGE_STRING='m-tx (TeX Live) 0.63a' +PACKAGE_VERSION='0.63d' +PACKAGE_STRING='m-tx (TeX Live) 0.63d' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1309,7 +1309,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 m-tx (TeX Live) 0.63a to adapt to many kinds of systems. +\`configure' configures m-tx (TeX Live) 0.63d to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1376,7 +1376,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of m-tx (TeX Live) 0.63a:";; + short | recursive ) echo "Configuration of m-tx (TeX Live) 0.63d:";; esac cat <<\_ACEOF @@ -1473,7 +1473,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -m-tx (TeX Live) configure 0.63a +m-tx (TeX Live) configure 0.63d generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1748,7 +1748,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 m-tx (TeX Live) $as_me 0.63a, which was +It was created by m-tx (TeX Live) $as_me 0.63d, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4291,7 +4291,7 @@ fi # Define the identity of the package. PACKAGE='m-tx--tex-live-' - VERSION='0.63a' + VERSION='0.63d' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -6262,7 +6262,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 m-tx (TeX Live) $as_me 0.63a, which was +This file was extended by m-tx (TeX Live) $as_me 0.63d, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6321,7 +6321,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -m-tx (TeX Live) config.status 0.63a +m-tx (TeX Live) config.status 0.63d configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/Build/source/utils/m-tx/mtx-src/ChangeLog b/Build/source/utils/m-tx/mtx-src/ChangeLog index 87d5421ad2c..2e86a587110 100644 --- a/Build/source/utils/m-tx/mtx-src/ChangeLog +++ b/Build/source/utils/m-tx/mtx-src/ChangeLog @@ -3,6 +3,11 @@ 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.63d +------------- + +Uninitialized variable correction in function grep. RDT 2022-07-27. + Version 0.63 ------------ diff --git a/Build/source/utils/m-tx/mtx-src/Corrections b/Build/source/utils/m-tx/mtx-src/Corrections index ced0da435c3..24fef31a9d0 100644 --- a/Build/source/utils/m-tx/mtx-src/Corrections +++ b/Build/source/utils/m-tx/mtx-src/Corrections @@ -3,10 +3,22 @@ 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.63d +------------- + +Added initialization to matching in utility.{pas,c}. Thanks to +Raphael Isemann for reporting that matching was uninitialized. (RDT) + +Version 0.63b +------------- + +Added -ansi to AM_CFLAGS in Makefile.am (RDT) + + Version 0.63a ------------- -Commented out apparently spurious begin...end block in preambleDefaults +Commented out spurious begin...end block in preambleDefaults in preamble.pas. (RDT) Version 0.63 diff --git a/Build/source/utils/m-tx/mtx-src/Makefile.am b/Build/source/utils/m-tx/mtx-src/Makefile.am index 38f1584ca8e..1c9573381b8 100644 --- a/Build/source/utils/m-tx/mtx-src/Makefile.am +++ b/Build/source/utils/m-tx/mtx-src/Makefile.am @@ -3,8 +3,7 @@ ## INCLUDES = -I$(srcdir)/libp2c -AM_CFLAGS = #$(WARNING_CFLAGS) - +AM_CFLAGS = -ansi #$(WARNING_CFLAGS) bin_PROGRAMS = prepmx ## prepmx_SOURCES = config.h @@ -35,7 +34,7 @@ prepmx_SOURCES = \ prepmx.c \ status.c \ status.h \ -## strings.c \ ## p2c generated, replaced by cfuncs.c +## strings.c \ strings.h \ uptext.c \ uptext.h \ diff --git a/Build/source/utils/m-tx/mtx-src/Makefile.p2c b/Build/source/utils/m-tx/mtx-src/Makefile.p2c index a6732b2967e..b3b69c3759c 100644 --- a/Build/source/utils/m-tx/mtx-src/Makefile.p2c +++ b/Build/source/utils/m-tx/mtx-src/Makefile.p2c @@ -1,5 +1,5 @@ all: globals.c mtx.c preamble.c lyrics.c analyze.c mtxline.c\ - status.c uptext.c prepmx.c files.c notes.c multfile.c utility.c control.c strings.c + status.c uptext.c prepmx.c files.c notes.c multfile.c utility.c control.c %.c: %.pas p2c -a -LTurbo $*.pas diff --git a/Build/source/utils/m-tx/mtx-src/cfuncs.h b/Build/source/utils/m-tx/mtx-src/cfuncs.h index f8f3e0c2d0d..fd5516192f1 100644 --- a/Build/source/utils/m-tx/mtx-src/cfuncs.h +++ b/Build/source/utils/m-tx/mtx-src/cfuncs.h @@ -3,7 +3,7 @@ #ifndef CFUNCS_H # define CFUNCS_H -#define STRINGS_H +# define STRINGS_H typedef char Char; typedef void Void; #define Static static @@ -28,7 +28,7 @@ typedef void Void; # define _FNSIZE 120 #endif -typedef unsigned boolean; +typedef unsigned char boolean; #define false 0 #define true 1 diff --git a/Build/source/utils/m-tx/mtx-src/compile b/Build/source/utils/m-tx/mtx-src/compile new file mode 100755 index 00000000000..df363c8fbfb --- /dev/null +++ b/Build/source/utils/m-tx/mtx-src/compile @@ -0,0 +1,348 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2018-03-07.03; # UTC + +# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# 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, 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, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN* | MSYS*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/* | msys/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC0" +# time-stamp-end: "; # UTC" +# End: diff --git a/Build/source/utils/m-tx/mtx-src/configure.ac b/Build/source/utils/m-tx/mtx-src/configure.ac index 99c60fa12ef..29ad7c3d902 100644 --- a/Build/source/utils/m-tx/mtx-src/configure.ac +++ b/Build/source/utils/m-tx/mtx-src/configure.ac @@ -28,7 +28,7 @@ AC_PROG_RANLIB # Checks for libraries. # Checks for header files. -AC_CHECK_HEADERS([memory.h stddef.h stdlib.h string.h strings.h]) +AC_CHECK_HEADERS([memory.h stddef.h stdlib.h string.h]) # Checks for typedefs, structures, and compiler characteristics. AC_TYPE_SIZE_T diff --git a/Build/source/utils/m-tx/mtx-src/libp2c/p2c.h b/Build/source/utils/m-tx/mtx-src/libp2c/p2c.h index 03b95201794..72560468123 100644 --- a/Build/source/utils/m-tx/mtx-src/libp2c/p2c.h +++ b/Build/source/utils/m-tx/mtx-src/libp2c/p2c.h @@ -234,7 +234,7 @@ typedef char *Anyptr; #endif #define Register register /* Register variables */ -#define Char char /* Characters (not bytes) */ +typedef char Char; /* Characters (not bytes) */ #ifndef Static # define Static static /* Private global funcs and vars */ diff --git a/Build/source/utils/m-tx/mtx-src/mtx.test b/Build/source/utils/m-tx/mtx-src/mtx.test index 9705cdd87aa..174e1298ec4 100644 --- a/Build/source/utils/m-tx/mtx-src/mtx.test +++ b/Build/source/utils/m-tx/mtx-src/mtx.test @@ -1,11 +1,20 @@ #! /bin/sh -vx -# Copyright (C) 2012 Peter Breitenlohner +# Copyright 2021 Bob Tennent # You may freely use, modify and/or distribute this file. rm -f mozart* +if test -r "$srcdir/tests/mozart.mtx"; then + : # standalone mtx +elif test -r "$srcdir/mtx-src/tests/mozart.mtx"; then + srcdir=$srcdir/mtx-src # in TL +else + echo "$0: cannot find tests/mozart.mtx" >&2 + exit 1 +fi -cp $srcdir/tests/mozart.mtx . + +cp "$srcdir/tests/mozart.mtx" . || exit 1 set -x diff --git a/Build/source/utils/m-tx/mtx-src/prepmx.c b/Build/source/utils/m-tx/mtx-src/prepmx.c index a3d37070c27..01525a129d2 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.63a" -#define version_date "<8 April 2018>" +#define version "0.63d" +#define version_date "<26 July 2022>" /** 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[30]; + Char STR3[32]; 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 f6b472ea6ff..eb3be2023fb 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.63a'; - version_date = '<8 April 2018>'; +const version = '0.63b'; + version_date = '<11 April 2018>'; {* See file "Corrections" for updates } diff --git a/Build/source/utils/m-tx/mtx-src/strings.h b/Build/source/utils/m-tx/mtx-src/strings.h index 3b8e7f4a539..06cd8fcdf1c 100644 --- a/Build/source/utils/m-tx/mtx-src/strings.h +++ b/Build/source/utils/m-tx/mtx-src/strings.h @@ -1,4 +1,3 @@ -/* Header for module strings, generated by p2c 1.21alpha-07.Dec.93 */ #ifndef STRINGS_H #define STRINGS_H @@ -8,8 +7,10 @@ #else # define vextern extern #endif -/* String handling primitives. */ -/* These should be recoded in C instead of using the p2c code. */ + +/* Uncomment if necessary: */ +/* typedef char Char; */ +/* typedef unsigned char boolean; */ extern void scan1(Char *s, short p, short *n); diff --git a/Build/source/utils/m-tx/mtx-src/utility.c b/Build/source/utils/m-tx/mtx-src/utility.c index 079bfdda116..819cb502cef 100644 --- a/Build/source/utils/m-tx/mtx-src/utility.c +++ b/Build/source/utils/m-tx/mtx-src/utility.c @@ -307,6 +307,7 @@ void grep(Char *source_, Char *pattern_, Char *target) V.p1[V.i] = 1; V.p2[V.i] = 0; } + V.matching = true; /* missing initialization RDT 2022-07-26 */ while (V.matching && V.p <= strlen(V.pattern) && V.s <= strlen(V.source)) subgrep(&V); *product = '\0'; diff --git a/Build/source/utils/m-tx/mtx-src/utility.pas b/Build/source/utils/m-tx/mtx-src/utility.pas index 42cc76d15d5..781b5592f28 100644 --- a/Build/source/utils/m-tx/mtx-src/utility.pas +++ b/Build/source/utils/m-tx/mtx-src/utility.pas @@ -1,4 +1,5 @@ unit utility; { DPL 2004-03-22 } +{ uninitialized variable correction in function grep; RDT 2022-07-27 } { Utilities, mainly aids to parsing } @@ -162,6 +163,7 @@ procedure grep(var source, pattern, target: string); begin index := 0; s := 1; p := 1; for i:=0 to 9 do begin p1[i]:=1; p2[i]:=0 end; + matching := true; { added by RDT 2022-07-27 } while matching and (p<=length(pattern)) and (s<=length(source)) do subgrep; product := ''; trigger := false; for t:=1 to length(target) do if trigger then diff --git a/Build/source/utils/m-tx/mtx-src/version.ac b/Build/source/utils/m-tx/mtx-src/version.ac index 61c3423259d..da2adac1781 100644 --- a/Build/source/utils/m-tx/mtx-src/version.ac +++ b/Build/source/utils/m-tx/mtx-src/version.ac @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current mtx version -m4_define([mtx_version], [0.63]) +m4_define([mtx_version], [0.63d]) diff --git a/Build/source/utils/m-tx/tests/mozart.pmx b/Build/source/utils/m-tx/tests/mozart.pmx index 32e69280be8..c212be17d90 100644 --- a/Build/source/utils/m-tx/tests/mozart.pmx +++ b/Build/source/utils/m-tx/tests/mozart.pmx @@ -1,6 +1,6 @@ --- -\def\mtxversion{0.63a} -\def\mtxdate{<8 April 2018>} +\def\mtxversion{0.63d} +\def\mtxdate{<26 July 2022>} \input mtx \mtxComposerLine{}{W. A. Mozart (1756--1791)} \mtxTitleLine{Riff in C} diff --git a/Build/source/utils/m-tx/version.ac b/Build/source/utils/m-tx/version.ac index e8db71af403..da2adac1781 100644 --- a/Build/source/utils/m-tx/version.ac +++ b/Build/source/utils/m-tx/version.ac @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current mtx version -m4_define([mtx_version], [0.63a]) +m4_define([mtx_version], [0.63d]) -- cgit v1.2.3