From 3f9dbbaf77ce576b90d9c702f613ae1f23fa1624 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:02:57 +0000 Subject: [PATCH] lilypond-0.1.27 --- VERSION | 4 +- bin/make-patch.py | 153 ++++++++++++++++++++++++++++++++++++++++++ bin/makepatch.py | 1 + init/font-en-tja16.ly | 7 +- init/font-en-tja20.ly | 7 +- make/lelievijver.lsm | 8 +-- make/lilypond.lsm | 8 +-- mf/feta-sleur.mf | 33 +++++++++ tex/font-en-tja16.tex | 65 +++++++++--------- tex/font-en-tja20.tex | 65 +++++++++--------- 10 files changed, 280 insertions(+), 71 deletions(-) create mode 100644 bin/make-patch.py create mode 100644 mf/feta-sleur.mf diff --git a/VERSION b/VERSION index 7fb5e2e952..34dc5b7113 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,8 @@ TOPLEVEL_MAJOR_VERSION = 0 TOPLEVEL_MINOR_VERSION = 1 -TOPLEVEL_PATCH_LEVEL = 26 +TOPLEVEL_PATCH_LEVEL = 27 TOPLEVEL_MY_PATCH_LEVEL = # use the above to send patches, always empty for released version: +# please don't move these comments up; the patch should fail if +# the previous version was wrong. diff --git a/bin/make-patch.py b/bin/make-patch.py new file mode 100644 index 0000000000..32ae99ae3b --- /dev/null +++ b/bin/make-patch.py @@ -0,0 +1,153 @@ +#!@PYTHON@ +from lilypython import * +import getopt +import pipes + + +mp_version = '2' + +class Options: + def __init__(self): + self.to_version = lilydirs.version_tuple() + self.from_version = prev_version(self.to_version) + +options = Options() + + +def help(): + sys.stdout.write( + 'Generate a patch to go to this version.\n' + ' --from=FROM, -f FROM old is FROM\n' + ' --to=TO, -t TO to version TO\n' + + ) + + + +def untar(fn): + # os.system('pwd'); + sys.stderr.write('untarring ' + fn) +# can't seem to fix errors: +# gzip: stdout: Broken pipe +# tar: Child returned status 1 +# os.system ('tar xzf ' + fn) +# sys.stderr.write('\n') +# ugh, even this does not work, but one error message less :-) + os.system ('gzip -dc ' + fn + '| tar xf - ') +# so print soothing message: + sys.stderr.write('make-patch:ugh: Please ignore error: gzip: stdout: Broken pipe\n'); + sys.stderr.flush() + + +header = 'Generated by make-patch, old = %s, new = %s\n\ +\n\ +usage \n\ +\n\ + cd lilypond-source-dir; patch -E -p0 < %s\n\ +\n\ +Patches do not contain automatically generated files, \n\ +i.e. you should rerun configure\n\n' + +import fnmatch +import os + +_debug = 0 + +_prune = ['(*)'] + + +def my_find(patterns, dir = os.curdir): + list = [] + names = os.listdir(dir) + names.sort() + for name in names: + if name in (os.curdir, os.pardir): + continue + fullname = os.path.join(dir, name) + for pat in patterns: + if fnmatch.fnmatch(name, pat): + list.append(fullname) + if os.path.isdir(fullname) and not os.path.islink(fullname): + for p in _prune: + if fnmatch.fnmatch(name, p): + if _debug: print "skip", `fullname` + break + else: + if _debug: print "descend into", `fullname` + found = my_find(patterns, fullname) + if found: + list = list + found + return list + +def multiple_find(pats, dirnames): + from find import find + l = [] + for d in dirnames: + l = l + my_find(pats, d) + return l + +pats = ['*.lsm', 'configure', '*.text', 'lilypond.spec'] +def remove_automatic(dirnames): + files = [] + files = files + multiple_find(pats, dirnames) + + for f in files: + os.remove(f) + +def makepatch(fv, tv, patfile_nm): + import tempfile + prev_cwd = os.getcwd(); + os.chdir ('/tmp') + untar(released_tarball(fv)) + untar(released_tarball(tv)) + remove_automatic([dirname(fv), dirname(tv)]) + + os.chdir(dirname(tv)) + + if not patfile_nm: + patfile_nm = '../patch-%s' % version_tuple_to_str(tv) + + f = open(patfile_nm, 'w') + f.write(header %\ + (version_tuple_to_str(fv), version_tuple_to_str(tv), \ + os.path.basename(patfile_nm))) + f.close() + + sys.stderr.write('diffing to %s... ' % patfile_nm) + os.system('diff -urN ../%s . >> %s' % (dirname(fv), patfile_nm)) + #os.system('gzip -9f %s' % patfile_nm) + os.chdir('/tmp') + + sys.stderr.write('cleaning ... ') + os.system('rm -fr %s %s' % (dirname(tv), dirname(fv))) + sys.stderr.write('\n') + os.chdir(prev_cwd) + +def main(): + sys.stderr.write('This is make-patch version %s\n' % mp_version) + (cl_options, files) = getopt.getopt(sys.argv[1:], + 'hf:o:t:', ['output=', 'help', 'from=', 'to=']) + outfn = '' + for opt in cl_options: + o = opt[0] + a = opt[1] + if o == '--from' or o == '-f': + options.from_version = version_str_to_tuple(a) + elif o == '--to' or o == '-t': + options.to_version = version_str_to_tuple(a) + elif o== '--help' or o == '-h': + help() + return 0; + elif o == '--output' or o == '-o': + outfn = os.path.join(os.getcwd(), a) + else: + raise getopt.error + + if not outfn: + pn = 'patch-%s' % version_tuple_to_str(options.to_version) + outfn = os.path.join(os.getcwd(), pn) + + makepatch(options.from_version, options.to_version, outfn) + +if __name__ == '__main__': + main() diff --git a/bin/makepatch.py b/bin/makepatch.py index 48a6c56bff..0d7ecfc082 100644 --- a/bin/makepatch.py +++ b/bin/makepatch.py @@ -21,6 +21,7 @@ def help(): ' --to=TO, -t TO to version TO\n' ) + sys.exit(); diff --git a/init/font-en-tja16.ly b/init/font-en-tja16.ly index 8c5488ed2a..1e6b32a344 100644 --- a/init/font-en-tja16.ly +++ b/init/font-en-tja16.ly @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Mon Oct 27 02:45:17 1997 +% on Tue Oct 28 12:14:59 1997 % Do not edit % input from out/font-en-tja16.log % name=\symboltables { @@ -27,10 +27,15 @@ } "balls" = \table { "-1" "\\brevisball" -0.00\pt 8.00\pt -2.20\pt 2.20\pt + "-1l" "\\brevisledger" -2.00\pt 10.00\pt -0.40\pt 0.40\pt "-2" "\\longaball" -0.00\pt 8.00\pt -2.20\pt 2.20\pt + "-2l" "\\longaledger" -2.00\pt 10.00\pt -0.40\pt 0.40\pt "0" "\\wholeball" -0.00\pt 7.92\pt -2.20\pt 2.20\pt + "0l" "\\wholeledger" -1.98\pt 9.90\pt -0.40\pt 0.40\pt "1" "\\halfball" -0.00\pt 5.51\pt -2.20\pt 2.20\pt + "1l" "\\halfledger" -1.38\pt 6.89\pt -0.40\pt 0.40\pt "2" "\\quartball" -0.00\pt 5.28\pt -2.20\pt 2.20\pt + "2l" "\\quartledger" -1.32\pt 6.61\pt -0.40\pt 0.40\pt } "scripts" = \table { "ufermata" "\\ufermata" -5.30\pt 5.30\pt -0.30\pt 5.80\pt diff --git a/init/font-en-tja20.ly b/init/font-en-tja20.ly index 14c637a328..e96c126c3d 100644 --- a/init/font-en-tja20.ly +++ b/init/font-en-tja20.ly @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Mon Oct 27 02:45:24 1997 +% on Tue Oct 28 12:15:08 1997 % Do not edit % input from out/font-en-tja20.log % name=\symboltables { @@ -27,10 +27,15 @@ } "balls" = \table { "-1" "\\brevisball" -0.00\pt 10.00\pt -2.75\pt 2.75\pt + "-1l" "\\brevisledger" -2.50\pt 12.50\pt -0.50\pt 0.50\pt "-2" "\\longaball" -0.00\pt 10.00\pt -2.75\pt 2.75\pt + "-2l" "\\longaledger" -2.50\pt 12.50\pt -0.50\pt 0.50\pt "0" "\\wholeball" -0.00\pt 9.90\pt -2.75\pt 2.75\pt + "0l" "\\wholeledger" -2.48\pt 12.38\pt -0.50\pt 0.50\pt "1" "\\halfball" -0.00\pt 6.89\pt -2.75\pt 2.75\pt + "1l" "\\halfledger" -1.72\pt 8.61\pt -0.50\pt 0.50\pt "2" "\\quartball" -0.00\pt 6.61\pt -2.75\pt 2.75\pt + "2l" "\\quartledger" -1.65\pt 8.26\pt -0.50\pt 0.50\pt } "scripts" = \table { "ufermata" "\\ufermata" -6.63\pt 6.63\pt -0.38\pt 7.25\pt diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index 4ddd5608bf..178d919856 100644 --- a/make/lelievijver.lsm +++ b/make/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond -Versie: 0.1.26. -Inschrijf datum: 27OCT97 +Versie: 0.1.27 +Inschrijf datum: 28OCT97 Beschrijving: LilyPond is de muziek typesetter van het GNU Project. Het programma genereert muziek in zichtbare of hoorbare vorm uit uit een muzikale definitie file: @@ -16,8 +16,8 @@ Auteur: hanwen@stack.nl (Han-Wen Nienhuys) jan@digicash.com (Jan Nieuwenhuizen) Onderhouden door: hanwen@stack.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 395k lilypond-0.1.26..tar.gz + 395k lilypond-0.1.27.tar.gz Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/ - 395k lilypond-0.1.26..tar.gz + 395k lilypond-0.1.27.tar.gz Copi"eer politie: GPL End diff --git a/make/lilypond.lsm b/make/lilypond.lsm index 4ebacf5ea9..ea3783a607 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 0.1.26. -Entered-date: 27OCT97 +Version: 0.1.27 +Entered-date: 28OCT97 Description: LilyPond is the GNU Project music typesetter. The program generates visual or auditive output from a music definition file: it can typeset formatted sheet music @@ -14,8 +14,8 @@ Author: hanwen@stack.nl (Han-Wen Nienhuys) jan@digicash.com (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps - 430k lilypond-0.1.26..tar.gz + 430k lilypond-0.1.27.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/ - 430k lilypond-0.1.26..tar.gz + 430k lilypond-0.1.27.tar.gz Copying-policy: GPL End diff --git a/mf/feta-sleur.mf b/mf/feta-sleur.mf new file mode 100644 index 0000000000..1eba2a6ce4 --- /dev/null +++ b/mf/feta-sleur.mf @@ -0,0 +1,33 @@ +% feta-sleur.mf + +mode_setup; +thin:=.2pt; +thick:=5thin; +bow:=.2; + +def sign(expr a) = + ((abs(a))/(a)) + enddef; + +def draw_slur(expr a,b,d) = + beginchar(0,0,0,0) "Embedded mf"; + % huh, factor 8? + z1=8a; + z3=8b; + save alpha; alpha=angle(z3-z1); + z2=(1/2[x1,x3],1/2[y1,y3])+d*bow*(x3-x1)*dir(alpha+90); + save beta; beta=d*sign(y3-y1)*1.5angle(z2-z1)-alpha; +% message "d: "&decimal d; +% message "dy: "& decimal sign(y3-y1); +% message "alpha: "&decimal alpha; +% message "beta: "&decimal beta; + penpos1(thin,alpha+beta+90); + penpos2(thick,alpha+90); + penpos3(thin,alpha-beta+90); + pickup pencircle; + fill z1l{dir(alpha+beta)}..z2l{dir(alpha)}..z3l{dir(alpha-beta)} + ..z3r{dir(180+alpha-beta)}..z2r{dir(180+alpha)}..z1r{dir(180+alpha+beta)} + ..cycle; + penlabels(1,2,3); + endchar; + enddef; diff --git a/tex/font-en-tja16.tex b/tex/font-en-tja16.tex index 03eaa36e9f..4f32c77574 100644 --- a/tex/font-en-tja16.tex +++ b/tex/font-en-tja16.tex @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Mon Oct 27 02:45:17 1997 +% on Tue Oct 28 12:14:59 1997 % Do not edit % input from out/font-en-tja16.log % name @@ -27,37 +27,42 @@ % balls \fetdef\brevisball{16} -\fetdef\longaball{17} -\fetdef\wholeball{18} -\fetdef\halfball{19} -\fetdef\quartball{20} +\fetdef\brevisledger{17} +\fetdef\longaball{18} +\fetdef\longaledger{19} +\fetdef\wholeball{20} +\fetdef\wholeledger{21} +\fetdef\halfball{22} +\fetdef\halfledger{23} +\fetdef\quartball{24} +\fetdef\quartledger{25} % scripts -\fetdef\ufermata{21} -\fetdef\dfermata{22} -\fetdef\sforzatoaccent{23} -\fetdef\staccato{24} -\fetdef\ustaccatissimo{25} -\fetdef\dstaccatissimo{26} -\fetdef\tenuto{27} -\fetdef\umarcato{28} -\fetdef\dmarcato{29} -\fetdef\ouvert{30} -\fetdef\plusstop{31} -\fetdef\upbow{32} -\fetdef\downbow{33} -\fetdef\turn{34} -\fetdef\trill{35} -\fetdef\pedalheel{36} -\fetdef\pedaltoe{37} +\fetdef\ufermata{26} +\fetdef\dfermata{27} +\fetdef\sforzatoaccent{28} +\fetdef\staccato{29} +\fetdef\ustaccatissimo{30} +\fetdef\dstaccatissimo{31} +\fetdef\tenuto{32} +\fetdef\umarcato{33} +\fetdef\dmarcato{34} +\fetdef\ouvert{35} +\fetdef\plusstop{36} +\fetdef\upbow{37} +\fetdef\downbow{38} +\fetdef\turn{39} +\fetdef\trill{40} +\fetdef\pedalheel{41} +\fetdef\pedaltoe{42} % flags -\fetdef\eighthflag{38} -\fetdef\sixteenthflag{39} -\fetdef\thirtysecondflag{40} -\fetdef\sixtyfourthflag{41} -\fetdef\deighthflag{42} -\fetdef\dsixteenthflag{43} -\fetdef\dthirtysecondflag{44} -\fetdef\dsixtyfourthflag{45} +\fetdef\eighthflag{43} +\fetdef\sixteenthflag{44} +\fetdef\thirtysecondflag{45} +\fetdef\sixtyfourthflag{46} +\fetdef\deighthflag{47} +\fetdef\dsixteenthflag{48} +\fetdef\dthirtysecondflag{49} +\fetdef\dsixtyfourthflag{50} diff --git a/tex/font-en-tja20.tex b/tex/font-en-tja20.tex index efc3fd3a76..3222e2b9bf 100644 --- a/tex/font-en-tja20.tex +++ b/tex/font-en-tja20.tex @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Mon Oct 27 02:45:24 1997 +% on Tue Oct 28 12:15:08 1997 % Do not edit % input from out/font-en-tja20.log % name @@ -27,37 +27,42 @@ % balls \fetdef\brevisball{16} -\fetdef\longaball{17} -\fetdef\wholeball{18} -\fetdef\halfball{19} -\fetdef\quartball{20} +\fetdef\brevisledger{17} +\fetdef\longaball{18} +\fetdef\longaledger{19} +\fetdef\wholeball{20} +\fetdef\wholeledger{21} +\fetdef\halfball{22} +\fetdef\halfledger{23} +\fetdef\quartball{24} +\fetdef\quartledger{25} % scripts -\fetdef\ufermata{21} -\fetdef\dfermata{22} -\fetdef\sforzatoaccent{23} -\fetdef\staccato{24} -\fetdef\ustaccatissimo{25} -\fetdef\dstaccatissimo{26} -\fetdef\tenuto{27} -\fetdef\umarcato{28} -\fetdef\dmarcato{29} -\fetdef\ouvert{30} -\fetdef\plusstop{31} -\fetdef\upbow{32} -\fetdef\downbow{33} -\fetdef\turn{34} -\fetdef\trill{35} -\fetdef\pedalheel{36} -\fetdef\pedaltoe{37} +\fetdef\ufermata{26} +\fetdef\dfermata{27} +\fetdef\sforzatoaccent{28} +\fetdef\staccato{29} +\fetdef\ustaccatissimo{30} +\fetdef\dstaccatissimo{31} +\fetdef\tenuto{32} +\fetdef\umarcato{33} +\fetdef\dmarcato{34} +\fetdef\ouvert{35} +\fetdef\plusstop{36} +\fetdef\upbow{37} +\fetdef\downbow{38} +\fetdef\turn{39} +\fetdef\trill{40} +\fetdef\pedalheel{41} +\fetdef\pedaltoe{42} % flags -\fetdef\eighthflag{38} -\fetdef\sixteenthflag{39} -\fetdef\thirtysecondflag{40} -\fetdef\sixtyfourthflag{41} -\fetdef\deighthflag{42} -\fetdef\dsixteenthflag{43} -\fetdef\dthirtysecondflag{44} -\fetdef\dsixtyfourthflag{45} +\fetdef\eighthflag{43} +\fetdef\sixteenthflag{44} +\fetdef\thirtysecondflag{45} +\fetdef\sixtyfourthflag{46} +\fetdef\deighthflag{47} +\fetdef\dsixteenthflag{48} +\fetdef\dthirtysecondflag{49} +\fetdef\dsixtyfourthflag{50} -- 2.39.5