From ce5c525d38c72a16050ace4106b142dd5fd62dcb Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:56:58 +0000 Subject: [PATCH] lilypond-1.3.94 --- Documentation/topdocs/AUTHORS.texi | 2 +- aclocal.m4 | 12 ++++++--- scripts/mudela-book.py | 43 +++++++++--------------------- stepmake/aclocal.m4 | 10 +++++-- 4 files changed, 30 insertions(+), 37 deletions(-) diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi index d10bc35310..32b03ca22a 100644 --- a/Documentation/topdocs/AUTHORS.texi +++ b/Documentation/topdocs/AUTHORS.texi @@ -16,7 +16,7 @@ This file lists authors of GNU LilyPond, and what they wrote. This list is alphabetically ordered. @itemize @bullet -@item @email{tomcato@@xoommail.com, Tom Cato Amundsen}, +@item @email{tca@@gnu.org, Tom Cato Amundsen}, cembalo-partita in mudela, accordion symbols, some mudela-book.py @item @email{matsb@@s3.kth.se, Mats Bengtsson}, @uref{http://www.s3.kth.se/~matsb/} diff --git a/aclocal.m4 b/aclocal.m4 index a32e3bc02a..e812c5f830 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,5 @@ dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -179,9 +177,15 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [ fi AC_MSG_CHECKING("Guile version") need_guile_version="1.3.4" - guile_version=`expr "\`$guile_config --version 2>&1\`" : ".*\($need_guile_version\).*"` + need_guile_version_numeric=100304 + guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` + guile_version_numeric=`echo $guile_version | awk -F. ' +{if ([$]3) {last = [$]3} +else {last =0}} +{printf "%s%s%s\n",[$]1*100, [$]2*10,last}'` AC_MSG_RESULT("$guile_version") - if test "$guile_version" != "$need_guile_version"; then + if test $guile_version_numeric -lt $need_guile_version_numeric + then AC_STEPMAKE_WARN("Guile version "$need_guile_version" or newer is needed") fi GUILE_FLAGS diff --git a/scripts/mudela-book.py b/scripts/mudela-book.py index 8a334b40b6..ec3366a9d2 100644 --- a/scripts/mudela-book.py +++ b/scripts/mudela-book.py @@ -412,8 +412,8 @@ re_dict = { 'option-sep' : ', *', 'intertext': r',?\s*intertext=\".*?\"', #ugh fix - 'multiline-comment': r"(?s)(?P@ignore\s.*?@end ignore)\s", - 'singleline-comment': r"(?m)(?P^@c.*$\n+)", + 'multiline-comment': r"(?sm)^\s*(?!@c\s+)(?P@ignore\s.*?@end ignore)\s", + 'singleline-comment': r"(?m)^.*?(?P(?P@c.*$\n+))", 'numcols': no_match, } } @@ -688,7 +688,7 @@ def do_columns(m): if m.group('num') == 'two': return [('numcols', m.group('code'), 2)] -def new_chop_chunks(chunks, re_name, func): +def chop_chunks(chunks, re_name, func, use_match=0): newchunks = [] for c in chunks: if c[0] == 'input': @@ -699,27 +699,10 @@ def new_chop_chunks(chunks, re_name, func): newchunks.append (('input', str)) str = '' else: - newchunks.append (('input', str[:m.start ('match')])) - #newchunks.extend(func(m)) - # python 1.5 compatible: - newchunks = newchunks + func(m) - str = str [m.end(0):] - else: - newchunks.append(c) - return newchunks - -def chop_chunks(chunks, re_name, func): - newchunks = [] - for c in chunks: - if c[0] == 'input': - str = c[1] - while str: - m = get_re (re_name).search (str) - if m == None: - newchunks.append (('input', str)) - str = '' - else: - newchunks.append (('input', str[:m.start (0)])) + if use_match: + newchunks.append (('input', str[:m.start ('match')])) + else: + newchunks.append (('input', str[:m.start (0)])) #newchunks.extend(func(m)) # python 1.5 compatible: newchunks = newchunks + func(m) @@ -755,8 +738,8 @@ def read_doc_file (filename): chunks = chop_chunks(chunks, 'verb', make_verb) chunks = chop_chunks(chunks, 'multiline-comment', do_ignore) #ugh fix input - chunks = new_chop_chunks(chunks, 'include', do_include_file) - chunks = new_chop_chunks(chunks, 'input', do_input_file) + chunks = chop_chunks(chunks, 'include', do_include_file, 1) + chunks = chop_chunks(chunks, 'input', do_input_file, 1) return chunks @@ -1016,10 +999,10 @@ def do_file(input_filename): my_depname = my_outname + '.dep' chunks = read_doc_file(input_filename) - chunks = new_chop_chunks(chunks, 'mudela', make_mudela) - chunks = new_chop_chunks(chunks, 'mudela-file', make_mudela_file) - chunks = new_chop_chunks(chunks, 'mudela-block', make_mudela_block) - chunks = chop_chunks(chunks, 'singleline-comment', do_ignore) + chunks = chop_chunks(chunks, 'mudela', make_mudela, 1) + chunks = chop_chunks(chunks, 'mudela-file', make_mudela_file, 1) + chunks = chop_chunks(chunks, 'mudela-block', make_mudela_block, 1) + chunks = chop_chunks(chunks, 'singleline-comment', do_ignore, 1) chunks = chop_chunks(chunks, 'preamble-end', do_preamble_end) chunks = chop_chunks(chunks, 'numcols', do_columns) #print "-" * 50 diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 35ffdbd78f..e812c5f830 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -177,9 +177,15 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [ fi AC_MSG_CHECKING("Guile version") need_guile_version="1.3.4" - guile_version=`expr "\`$guile_config --version 2>&1\`" : ".*\($need_guile_version\).*"` + need_guile_version_numeric=100304 + guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` + guile_version_numeric=`echo $guile_version | awk -F. ' +{if ([$]3) {last = [$]3} +else {last =0}} +{printf "%s%s%s\n",[$]1*100, [$]2*10,last}'` AC_MSG_RESULT("$guile_version") - if test "$guile_version" != "$need_guile_version"; then + if test $guile_version_numeric -lt $need_guile_version_numeric + then AC_STEPMAKE_WARN("Guile version "$need_guile_version" or newer is needed") fi GUILE_FLAGS -- 2.39.5