From 0522b7156c2d4278a770a8c4b007a4e0fed2d804 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 11 Feb 2002 14:16:51 +0100 Subject: [PATCH] patch::: 1.5.30.uu1.jcn1 2002-02-11 Jan Nieuwenhuizen * mf/GNUmakefile (FET_FILES): (FONT_FILES): Include parmesan. * stepmake/bin/packagepython.py (make_assign_re): Bugfix. Use re iso regex, regsub * buildscripts/clean-fonts.sh (FILES): Clean parmesan too. * Documentation/user/refman.itely (Paper size): Quote braces. --- ChangeLog | 12 ++++++++++ Documentation/user/refman.itely | 2 +- VERSION | 2 +- buildscripts/clean-fonts.sh | 5 +++- mf/GNUmakefile | 6 +++-- stepmake/bin/packagepython.py | 42 +++++++++++++++------------------ stepmake/bin/release.py | 2 +- 7 files changed, 42 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07252e7ad5..e360df2c7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2002-02-11 Jan Nieuwenhuizen + + * mf/GNUmakefile (FET_FILES): + (FONT_FILES): Include parmesan. + + * stepmake/bin/packagepython.py (make_assign_re): Bugfix. Use re + iso regex, regsub + + * buildscripts/clean-fonts.sh (FILES): Clean parmesan too. + + * Documentation/user/refman.itely (Paper size): Quote braces. + 2002-02-07 Han-Wen Nienhuys * stepmake/aclocal.m4: fixed bison version check to be more diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 4879e34658..cd67604188 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -3547,7 +3547,7 @@ specification, you must set the font as described above. If you want the default font, then use the 20 point font. @example - \paper{papersize = "a4"} + \paper@{ papersize = "a4" @} \include "paper16.ly" @end example diff --git a/VERSION b/VERSION index a967b76a90..74b784a2a9 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=30 -MY_PATCH_LEVEL=uu1 +MY_PATCH_LEVEL=uu1.jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/buildscripts/clean-fonts.sh b/buildscripts/clean-fonts.sh index e8d457f32e..395a35cff7 100755 --- a/buildscripts/clean-fonts.sh +++ b/buildscripts/clean-fonts.sh @@ -31,7 +31,10 @@ if [ -z "$TEXDIRS" -o "$TEXDIRS" = "." ]; then fi # remove possibly stale .pk/.tfm files -FILES=`find $TEXDIRS -name "feta*$WHAT*tfm" -or -name "feta*$WHAT*pk"` +FILES=$(find $TEXDIRS -name "feta*$WHAT*tfm" \ + -or -name "feta*$WHAT*pk" \ + -or -name "parmesan$WHAT*tfm" \ + -or -name "parmesan*$WHAT*pk") echo removing $FILES rm -f $FILES /tmp/cleaning-font-dummy diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 9b2ae77de2..147b33fc6d 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -12,8 +12,10 @@ EXTRA_DIST_FILES += README feta.tex # don't try to make fonts from test files TEST_FILES = $(wildcard *test*.mf) -FET_FILES = $(filter-out $(TEST_FILES),$(wildcard feta[0-9]*.mf)) -FONT_FILES = $(filter-out $(TEST_FILES),$(wildcard feta*[0-9].mf)) +FET_FILES = $(filter-out $(TEST_FILES),\ + $(wildcard feta[0-9]*.mf) $(wildcard parmesan[0-9]*.mf)) +FONT_FILES = $(filter-out $(TEST_FILES),\ +$(wildcard feta*[0-9].mf) $(wildcard parmesan*[0-9].mf)) XPM_FONTS = feta20 feta-nummer10 feta-braces20 #CM_AFM_FILES = cmr10 diff --git a/stepmake/bin/packagepython.py b/stepmake/bin/packagepython.py index 9fb12ff074..86fc71969c 100755 --- a/stepmake/bin/packagepython.py +++ b/stepmake/bin/packagepython.py @@ -10,15 +10,14 @@ # (c) 1997--1998 Han-Wen Nienhuys # Jan Nieuwenhuizen -import regex -import regsub +import re import string import sys import os import getopt -make_assign_re = regex.compile('^\([A-Z_]*\)=\(.*\)$') +make_assign_re = re.compile ('^([A-Z_]*)=(.*)$') def read_makefile (fn): file = open (fn) @@ -29,9 +28,10 @@ def read_makefile (fn): make_dict = {} for l in lines: - if make_assign_re.search(l) <> -1: - nm = make_assign_re.group(1) - val = make_assign_re.group(2) + m = make_assign_re.search (l) + if m: + nm = m.group (1) + val = m.group (2) make_dict[nm] = val return make_dict @@ -39,7 +39,7 @@ class Package: def __init__ (self, dirname): dict = read_makefile (dirname + '/VERSION') version_list = [] - for x in [ 'MAJOR_VERSION', 'MINOR_VERSION', 'PATCH_LEVEL']: + for x in [ 'MAJOR_VERSION', 'MINOR_VERSION', 'PATCH_LEVEL']: version_list.append (string.atoi (dict[x])) version_list.append (dict['MY_PATCH_LEVEL']) self.topdir = dirname @@ -80,10 +80,9 @@ def full_version_tup(tup): break return tuple(t) -def split_my_patchlevel(str): - return (regsub.sub('[0-9]*$', '', str), - string.atoi(regsub.sub('[^0-9]*', '', str))) - +def split_my_patchlevel (str): + m = re.match ('(.*?)([0-9]*)$', str) + return (m.group (1), string.atoi (m.group (2))) def next_version(tup): l = list(full_version_tup (tup)) @@ -103,7 +102,7 @@ def prev_version(tup): l = list(full_version_tup (tup)) t3name=t3num='' if l[3]: - (t3name,t3num)= split_my_patchlevel (l[3]) + (t3name, t3num) = split_my_patchlevel (l[3]) if t3num and t3num - 1 > 0: t3num = '%d' %(t3num - 1) else: @@ -129,24 +128,21 @@ def version_str_to_tuple(str): mypatch = string.join (t[3:], '.') return (string.atoi(t[0]), string.atoi(t[1]), string.atoi(t[2]), mypatch) -def version_compare (tupl, tupr): - tupl = full_version_tup (tupl) - tupr = full_version_tup (tupr) +def version_compare (ltup, rtup): + rtup = full_version_tup (ltup) + rtup = full_version_tup (rtup) for i in (0,1,2): - if tupl[i] - tupr[i]: return tupl[i] - tupr[i] - if tupl[3] and tupr[3]: - lname = regsub.sub('[0-9]*$', '', tupl[3]) - lnum = string.atoi(regsub.sub('[^0-9]*', '', tupl[3])) - rname = regsub.sub('[0-9]*$', '', tupr[3]) - rnum = string.atoi(regsub.sub('[^0-9]*', '', tupr[3])) + if ltup[i] - rtup[i]: return ltup[i] - rtup[i] + if ltup[3] and rtup[3]: + (lname, lnum) = split_my_patchlevel (ltup[i]) + (rname, rnum) = split_my_patchlevel (rtup[3]) if lname != rname: raise 'ambiguous' return sign (lnum - rnum) - if tupl[3]: + if ltup[3]: return 1 else: return -1 - if __name__ == '__main__': p = Package ('.') diff --git a/stepmake/bin/release.py b/stepmake/bin/release.py index 4b563143da..864c157558 100755 --- a/stepmake/bin/release.py +++ b/stepmake/bin/release.py @@ -51,7 +51,7 @@ if status: cur_ver = package.version -pn = '%s-%s' %(package.name, version_tuple_to_str(cur_ver)) +pn = '%s-%s' % (package.name, version_tuple_to_str (cur_ver)) tarball = pn + '.tar.gz' orig = os.path.join (outdir, tarball) try: -- 2.39.5