From c330618390bab7301500f0462e299ba8115ab0bf Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 19 Nov 1997 11:07:53 +0100 Subject: [PATCH] release: 0.1.32 --- AUTHORS.text | 2 +- DEDICATION | 4 +- Documentation/faq.pod | 3 +- INSTALL.text | 12 ++--- NEWS | 19 +++++-- TODO | 2 + VERSION | 4 +- bin/lilypython.py | 1 + bin/make-patch.py | 2 +- bin/release.py | 15 +++++- init/feta16.ly | 8 +-- init/feta20.ly | 8 +-- init/font-en-tja16.ly | 69 -------------------------- init/font-en-tja20.ly | 69 -------------------------- init/table16.ly | 34 +------------ init/table20.ly | 20 +------- input/font.ly | 2 +- lily/VERSION | 2 +- lily/clef-grav.cc | 11 +++- lily/dynamic-grav.cc | 2 +- lily/key-grav.cc | 2 +- lily/local-key-grav.cc | 4 +- lily/rest-collision-grav.cc | 2 +- lily/score-align-gravs.cc | 4 +- lily/slur-grav.cc | 2 +- lily/stem.cc | 10 ++-- lily/symtable.cc | 5 +- lily/tie-grav.cc | 2 +- lily/timing-translator.cc | 2 +- make/Targets.make | 4 ++ make/Toplevel.make.in | 3 +- make/lelievijver.lsm | 8 +-- make/lilypond.lsm | 8 +-- make/lilypond.spec | 4 +- mf/TODO | 1 + mf/feta-banier.mf | 8 +-- mf/feta-beams16.mf | 2 +- mf/feta-beams20.mf | 2 +- mf/feta-klef.mf | 15 +++--- mf/{wat-zie-ik.mf => feta-watzieik.mf} | 0 mf/feta20.mf | 1 + tex/feta16.tex | 4 +- tex/feta20.tex | 4 +- 43 files changed, 121 insertions(+), 265 deletions(-) delete mode 100644 init/font-en-tja16.ly delete mode 100644 init/font-en-tja20.ly rename mf/{wat-zie-ik.mf => feta-watzieik.mf} (100%) diff --git a/AUTHORS.text b/AUTHORS.text index cf19f67dd5..0e156d133a 100644 --- a/AUTHORS.text +++ b/AUTHORS.text @@ -61,6 +61,6 @@ CCCCOOOONNNNTTTTRRRRIIIIBBBBUUUUTTTTOOOORRRRSS -27/Oct/97 LilyPond 0.1.31 1 +27/Oct/97 LilyPond 0.1.32 1 diff --git a/DEDICATION b/DEDICATION index 36414b54e8..e6b3bf73bd 100644 --- a/DEDICATION +++ b/DEDICATION @@ -7,8 +7,8 @@ Those deserving special mention (in no particular order): Esther, Marijke, Heike, Inge, Judith, Hannah, Auke, Ilse, Evelyn, -Maartje, Suzanne, Ilse (gee, again?) and last (but certainly not least) -Janneke! +Maartje, Suzanne, Ilse (gee, again?), Bonne and last (but certainly +not least) Janneke! HWN diff --git a/Documentation/faq.pod b/Documentation/faq.pod index b98fa6865c..45a3cceb2e 100644 --- a/Documentation/faq.pod +++ b/Documentation/faq.pod @@ -202,7 +202,8 @@ Q: I want to implement XXXX! Should I do this? A: There might be better ways of doing XXXX, so it's a good thing to ask about this before you start hacking. If you want to keep in touch -current developments, you should subscribe to the mailing list. +with current developments, you should subscribe to the mailing list +(see the "links" section of the documentation). Q: I want to implement XXXX! How should I do this? diff --git a/INSTALL.text b/INSTALL.text index c8455c2dc8..beefad9059 100644 --- a/INSTALL.text +++ b/INSTALL.text @@ -61,7 +61,7 @@ RRRRUUUUNNNNNNNNIIIINNNNGGGG -20/Oct/97 LilyPond 0.1.31 1 +20/Oct/97 LilyPond 0.1.32 1 @@ -127,7 +127,7 @@ CCCCOOOONNNNFFFFIIIIGGGGUUUURRRRIIIINNNNGGGG a -20/Oct/97 LilyPond 0.1.31 2 +20/Oct/97 LilyPond 0.1.32 2 @@ -193,7 +193,7 @@ INSTALL(1) LilyPond documentation INSTALL(1) -20/Oct/97 LilyPond 0.1.31 3 +20/Oct/97 LilyPond 0.1.32 3 @@ -259,7 +259,7 @@ IIIINNNNSSSSTTTTAAAALLLLLLLLIIIINNNNGGGG -20/Oct/97 LilyPond 0.1.31 4 +20/Oct/97 LilyPond 0.1.32 4 @@ -325,7 +325,7 @@ RRRREEEEDDDDHHHHAAAATTTT LLLLIIIINNNNUUUUXXXX -20/Oct/97 LilyPond 0.1.31 5 +20/Oct/97 LilyPond 0.1.32 5 @@ -391,6 +391,6 @@ AAAAUUUUTTTTHHHHOOOORRRRSSSS -20/Oct/97 LilyPond 0.1.31 6 +20/Oct/97 LilyPond 0.1.32 6 diff --git a/NEWS b/NEWS index b125b3d40f..035407973c 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,20 @@ +pl 32 + - change type checks (ughugh) to derivation checks (ugh) + - this fixes clef bug. + - bf: order of breakables: meter comes after bar. + - bf: do error iso coredump on unknown symbol-table + - bf: release.py, copy patch too. + - bf: add makefile dep for disting MF logs. + - bf: don't read font-en-tja*.ly, but feta*.ly + pl 31.jcn2 - first version of (non-ugh) c-klef + - bf: mi2mu: notes of zero duration as comments + - feta: ugh c clef + + +******** +nov 17 pl 31 - bf: replaced Score_column assert by a warning (thanks Scott) @@ -13,9 +28,6 @@ pl 31 ******** nov 11 -pl 30.jcn1 - - bf: mi2mu: notes of zero duration as comments - - feta: ugh c clef pl 30 - feta: G clef. @@ -24,6 +36,7 @@ pl 30 - bf: bass clef ******** +nov 6 pl 29 - feta: bass clef, bf: dynamics, bf: 64th flag diff --git a/TODO b/TODO index 3f63c612a6..b38448220b 100644 --- a/TODO +++ b/TODO @@ -9,6 +9,8 @@ grep for TODO and ugh/ugr 0.2: * add a screenshot to the website. + * fix stdin input + * LILYSOURCEDIR * documentation diff --git a/VERSION b/VERSION index e06bb4090a..959fb4e60b 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ TOPLEVEL_MAJOR_VERSION = 0 TOPLEVEL_MINOR_VERSION = 1 -TOPLEVEL_PATCH_LEVEL = 31 -TOPLEVEL_MY_PATCH_LEVEL = jcn2 +TOPLEVEL_PATCH_LEVEL = 32 +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 diff --git a/bin/lilypython.py b/bin/lilypython.py index ab88f004f2..fb6f1a51f5 100644 --- a/bin/lilypython.py +++ b/bin/lilypython.py @@ -65,6 +65,7 @@ def tarball(v): def released_tarball(v): return lilydirs.release_dir + tarball(v) + def tuple_to_list(tup): l=[] for x in tup: diff --git a/bin/make-patch.py b/bin/make-patch.py index 32ae99ae3b..30e870f16c 100644 --- a/bin/make-patch.py +++ b/bin/make-patch.py @@ -33,7 +33,7 @@ def untar(fn): # 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 - ') + os.system ('gzip --quiet -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() diff --git a/bin/release.py b/bin/release.py index f18ff01ef7..604e1779f0 100644 --- a/bin/release.py +++ b/bin/release.py @@ -13,9 +13,20 @@ os.system('rm ../test/*gz') os.link(released_tarball(cur_ver), tarball(cur_ver)) -# not a module, but a script: +# not a module, but a script (JCN) # makepatch.main() + +# Module wherefore aren't thou Script +# A Rose by any other name would be as blonde. --HWN + os.system('python ' + lilydirs.topdir + '/bin/make-patch.py'); -os.system('gzip -9 patch*') +pn = 'patch-%s' % version_tuple_to_str(cur_ver) +os.system('gzip -9 ' + pn) +pn = pn + '.gz' +rel_pn = lilydirs.release_dir + '../patches/' + pn; + +os.rename(pn, rel_pn); +os.link(rel_pn, pn); + os.system('tar cf updeet *gz') diff --git a/init/feta16.ly b/init/feta16.ly index 204198068f..b599375c0b 100644 --- a/init/feta16.ly +++ b/init/feta16.ly @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Tue Nov 18 23:42:04 1997 +% on Wed Nov 19 11:44:45 1997 % Do not edit % input from out/feta16.log % name=\symboltables { @@ -67,12 +67,12 @@ "d5" "\\dthirtysecondflag" -0.20\pt 4.54\pt -0.20\pt 15.66\pt "d6" "\\dsixtyfourthflag" -0.20\pt 4.54\pt -0.20\pt 17.66\pt } - "klef" = \table { + "clefs" = \table { "alto" "\\altoclef" -0.00\pt 10.00\pt -8.00\pt 8.00\pt "alto_change" "\\caltoclef" -0.00\pt 8.00\pt -6.40\pt 6.40\pt "bass" "\\bassclef" 1.20\pt 12.80\pt -10.00\pt 4.00\pt "bass_change" "\\cbassclef" 0.96\pt 10.24\pt -8.00\pt 3.20\pt - "violin" "\\violinclef" 0.11\pt 10.55\pt -12.00\pt 20.00\pt - "violin_change" "\\cviolinclef" 0.17\pt 8.52\pt -9.60\pt 16.00\pt + "violin" "\\violinclef" -0.11\pt 10.95\pt -12.00\pt 20.00\pt + "violin_change" "\\cviolinclef" -0.33\pt 8.52\pt -9.60\pt 16.00\pt } % } % $name diff --git a/init/feta20.ly b/init/feta20.ly index edab1bd895..5ae1e0742d 100644 --- a/init/feta20.ly +++ b/init/feta20.ly @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Tue Nov 18 23:42:28 1997 +% on Wed Nov 19 11:44:54 1997 % Do not edit % input from out/feta20.log % name=\symboltables { @@ -67,12 +67,12 @@ "d5" "\\dthirtysecondflag" -0.25\pt 5.68\pt -0.25\pt 19.58\pt "d6" "\\dsixtyfourthflag" -0.25\pt 5.68\pt -0.25\pt 22.08\pt } - "klef" = \table { + "clefs" = \table { "alto" "\\altoclef" -0.00\pt 12.50\pt -10.00\pt 10.00\pt "alto_change" "\\caltoclef" -0.00\pt 10.00\pt -8.00\pt 8.00\pt "bass" "\\bassclef" 1.50\pt 16.00\pt -12.50\pt 5.00\pt "bass_change" "\\cbassclef" 1.20\pt 12.80\pt -10.00\pt 4.00\pt - "violin" "\\violinclef" 0.14\pt 13.19\pt -15.00\pt 25.00\pt - "violin_change" "\\cviolinclef" 0.21\pt 10.65\pt -12.00\pt 20.00\pt + "violin" "\\violinclef" -0.14\pt 13.69\pt -15.00\pt 25.00\pt + "violin_change" "\\cviolinclef" -0.41\pt 10.65\pt -12.00\pt 20.00\pt } % } % $name diff --git a/init/font-en-tja16.ly b/init/font-en-tja16.ly deleted file mode 100644 index f22e289f7f..0000000000 --- a/init/font-en-tja16.ly +++ /dev/null @@ -1,69 +0,0 @@ -% generated automatically by mf-to-table.py version 0.4 -% on Tue Oct 28 20:43:44 1997 -% Do not edit -% input from out/font-en-tja16.log -% name=\symboltables { - "rests" = \table { - "0" "\\wholerest" -0.00\pt 6.00\pt -2.50\pt 0.00\pt - "1" "\\halfrest" -0.00\pt 6.00\pt -0.00\pt 2.50\pt - "0o" "\\outsidewholerest" -2.50\pt 8.50\pt -2.50\pt 0.40\pt - "1o" "\\outsidehalfrest" -2.50\pt 8.50\pt -0.40\pt 2.50\pt - "2" "\\quartrest" -0.00\pt 4.32\pt 3.00\pt 14.40\pt - "3" "\\eighthrest" -0.00\pt 5.33\pt 4.00\pt 11.47\pt - "4" "\\sixteenthrest" -0.00\pt 6.23\pt -0.00\pt 11.47\pt - "5" "\\thirtysecondrest" -0.00\pt 7.03\pt -0.00\pt 15.47\pt - "6" "\\sixtyfourthrest" -0.00\pt 7.53\pt -0.00\pt 19.47\pt - "7" "\\hundredtwentyeighthrest" -0.00\pt 8.38\pt -0.00\pt 23.47\pt - } - "accidentals" = \table { - "1" "\\sharp" -0.00\pt 4.40\pt -6.00\pt 6.00\pt - "0" "\\natural" -0.00\pt 2.67\pt -6.00\pt 6.00\pt - "-1" "\\flat" -0.48\pt 3.20\pt -2.00\pt 8.00\pt - "-2" "\\flatflat" -0.48\pt 5.80\pt -2.00\pt 8.00\pt - "2" "\\sharpsharp" -0.00\pt 4.00\pt -2.00\pt 2.00\pt - } - "dots" = \table { - "dot" "\\dot" -0.00\pt 1.80\pt -0.90\pt 0.90\pt - } - "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 - "dfermata" "\\dfermata" -5.30\pt 5.30\pt -5.80\pt 0.30\pt - "sforzato" "\\sforzatoaccent" -3.60\pt 3.60\pt -2.00\pt 2.00\pt - "staccato" "\\staccato" -0.60\pt 0.60\pt -0.60\pt 0.60\pt - "ustaccatissimo" "\\ustaccatissimo" -0.80\pt 0.80\pt -0.20\pt 4.00\pt - "dstaccatissimo" "\\dstaccatissimo" -0.80\pt 0.80\pt -4.00\pt 0.20\pt - "tenuto" "\\tenuto" -3.60\pt 3.60\pt -0.24\pt 0.24\pt - "umarcato" "\\umarcato" -2.00\pt 2.00\pt -0.00\pt 4.40\pt - "dmarcato" "\\dmarcato" -2.00\pt 2.00\pt -4.40\pt 0.00\pt - "open" "\\ouvert" -1.60\pt 1.60\pt -2.00\pt 2.00\pt - "stopped" "\\plusstop" -2.20\pt 2.20\pt -2.20\pt 2.20\pt - "upbow" "\\upbow" -2.60\pt 2.60\pt -0.00\pt 8.32\pt - "downbow" "\\downbow" -3.00\pt 3.00\pt -0.00\pt 5.33\pt - "turn" "\\turn" -4.38\pt 4.38\pt -2.12\pt 2.12\pt - "trill" "\\trill" -0.00\pt 8.00\pt -0.00\pt 9.00\pt - "pedalheel" "\\pedalheel" -2.00\pt 2.00\pt -2.00\pt 2.67\pt - "pedaltoe" "\\pedaltoe" -2.00\pt 2.00\pt -0.00\pt 6.00\pt - } - "flags" = \table { - "u3" "\\eighthflag" -0.20\pt 4.10\pt -12.26\pt 0.20\pt - "u4" "\\sixteenthflag" -0.20\pt 4.10\pt -14.26\pt 0.20\pt - "u5" "\\thirtysecondflag" -0.20\pt 4.10\pt -17.26\pt 0.20\pt - "u6" "\\sixtyfourthflag" -0.20\pt 4.10\pt -21.26\pt 0.20\pt - "d3" "\\deighthflag" -0.20\pt 4.54\pt -0.20\pt 11.66\pt - "d4" "\\dsixteenthflag" -0.20\pt 4.54\pt -0.20\pt 12.26\pt - "d5" "\\dthirtysecondflag" -0.20\pt 4.54\pt -0.20\pt 15.66\pt - "d6" "\\dsixtyfourthflag" -0.20\pt 4.54\pt -0.20\pt 17.66\pt - } - % } % $name diff --git a/init/font-en-tja20.ly b/init/font-en-tja20.ly deleted file mode 100644 index cab88471c5..0000000000 --- a/init/font-en-tja20.ly +++ /dev/null @@ -1,69 +0,0 @@ -% generated automatically by mf-to-table.py version 0.4 -% on Tue Oct 28 20:44:01 1997 -% Do not edit -% input from out/font-en-tja20.log -% name=\symboltables { - "rests" = \table { - "0" "\\wholerest" -0.00\pt 7.50\pt -3.13\pt 0.00\pt - "1" "\\halfrest" -0.00\pt 7.50\pt -0.00\pt 3.13\pt - "0o" "\\outsidewholerest" -3.13\pt 10.62\pt -3.13\pt 0.50\pt - "1o" "\\outsidehalfrest" -3.13\pt 10.62\pt -0.50\pt 3.13\pt - "2" "\\quartrest" -0.00\pt 5.40\pt 3.75\pt 18.00\pt - "3" "\\eighthrest" -0.00\pt 6.67\pt 5.00\pt 14.33\pt - "4" "\\sixteenthrest" -0.00\pt 7.79\pt -0.00\pt 14.33\pt - "5" "\\thirtysecondrest" -0.00\pt 8.78\pt -0.00\pt 19.33\pt - "6" "\\sixtyfourthrest" -0.00\pt 9.41\pt -0.00\pt 24.33\pt - "7" "\\hundredtwentyeighthrest" -0.00\pt 10.47\pt -0.00\pt 29.33\pt - } - "accidentals" = \table { - "1" "\\sharp" -0.00\pt 5.50\pt -7.50\pt 7.50\pt - "0" "\\natural" -0.00\pt 3.33\pt -7.50\pt 7.50\pt - "-1" "\\flat" -0.60\pt 4.00\pt -2.50\pt 10.00\pt - "-2" "\\flatflat" -0.60\pt 7.25\pt -2.50\pt 10.00\pt - "2" "\\sharpsharp" -0.00\pt 5.00\pt -2.50\pt 2.50\pt - } - "dots" = \table { - "dot" "\\dot" -0.00\pt 2.25\pt -1.13\pt 1.13\pt - } - "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 - "dfermata" "\\dfermata" -6.63\pt 6.63\pt -7.25\pt 0.38\pt - "sforzato" "\\sforzatoaccent" -4.50\pt 4.50\pt -2.50\pt 2.50\pt - "staccato" "\\staccato" -0.75\pt 0.75\pt -0.75\pt 0.75\pt - "ustaccatissimo" "\\ustaccatissimo" -1.00\pt 1.00\pt -0.20\pt 5.00\pt - "dstaccatissimo" "\\dstaccatissimo" -1.00\pt 1.00\pt -5.00\pt 0.20\pt - "tenuto" "\\tenuto" -4.50\pt 4.50\pt -0.30\pt 0.30\pt - "umarcato" "\\umarcato" -2.50\pt 2.50\pt -0.00\pt 5.50\pt - "dmarcato" "\\dmarcato" -2.50\pt 2.50\pt -5.50\pt 0.00\pt - "open" "\\ouvert" -2.00\pt 2.00\pt -2.50\pt 2.50\pt - "stopped" "\\plusstop" -2.75\pt 2.75\pt -2.75\pt 2.75\pt - "upbow" "\\upbow" -3.25\pt 3.25\pt -0.00\pt 10.40\pt - "downbow" "\\downbow" -3.75\pt 3.75\pt -0.00\pt 6.67\pt - "turn" "\\turn" -5.47\pt 5.47\pt -2.65\pt 2.65\pt - "trill" "\\trill" -0.00\pt 10.00\pt -0.00\pt 11.25\pt - "pedalheel" "\\pedalheel" -2.50\pt 2.50\pt -2.50\pt 3.33\pt - "pedaltoe" "\\pedaltoe" -2.50\pt 2.50\pt -0.00\pt 7.50\pt - } - "flags" = \table { - "u3" "\\eighthflag" -0.25\pt 5.13\pt -15.33\pt 0.25\pt - "u4" "\\sixteenthflag" -0.25\pt 5.13\pt -17.83\pt 0.25\pt - "u5" "\\thirtysecondflag" -0.25\pt 5.13\pt -21.58\pt 0.25\pt - "u6" "\\sixtyfourthflag" -0.25\pt 5.13\pt -26.58\pt 0.25\pt - "d3" "\\deighthflag" -0.25\pt 5.68\pt -0.25\pt 14.58\pt - "d4" "\\dsixteenthflag" -0.25\pt 5.68\pt -0.25\pt 15.33\pt - "d5" "\\dthirtysecondflag" -0.25\pt 5.68\pt -0.25\pt 19.58\pt - "d6" "\\dsixtyfourthflag" -0.25\pt 5.68\pt -0.25\pt 22.08\pt - } - % } % $name diff --git a/init/table16.ly b/init/table16.ly index f95cb2fdcc..506c9f78b8 100644 --- a/init/table16.ly +++ b/init/table16.ly @@ -10,21 +10,6 @@ table_sixteen= \texid "\input lilyponddefs \musixsixteendefs" % index TeXstring, xmin xmax ymin ymax - - %{ - "back" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "-front" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "heel" "\heel" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "toe" "\\toe" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "bheel" "\bheel" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "btoe" "\btoe" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "fheel" "\fheel" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "ftoe" "\ftoe" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "-back" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "front" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "turn" "\\turn" -2.0\pt 7.0\pt 0.0\pt 4.0\pt - %} - "style" = \table { "roman" "\settext{%}" 0.0\pt 7.50\pt 0.0\pt 8.0\pt "italic" "\setitalic{%}" 0.0\pt 0.0\pt 0.0\pt 8.0\pt @@ -51,27 +36,11 @@ table_sixteen= "1" "\rightalign{%}" } - "clefs" = \table { - "violin" "\violinclef" 0.0\pt 12.8\pt -10.0\pt 18.0\pt - "bass" "\bassclef" -1.0\pt 12.8\pt 0.0\pt 16.0\pt - "alto" "\altoclef" 0.0\pt 12.8\pt 0.0\pt 16.0\pt - "tenor" "\altoclef" 0.0\pt 12.8\pt 0.0\pt 16.0\pt - "violin_change" "\cviolinclef" 0.0\pt 11.2\pt -12.0\pt 12.0\pt - "bass_change" "\cbassclef" 0.0\pt 11.2\pt 0.0\pt 16.0\pt - "alto_change" "\caltoclef" 0.0\pt 11.2\pt 0.0\pt 16.0\pt - "tenor_change" "\caltoclef" 0.0\pt 11.2\pt 0.0\pt 16.0\pt - } - "slur" = \table { "whole" "\slurchar%{%}" "half" "\hslurchar%{%}" } - "streepjes" = \table { - "toplines" "\\topledgerlines{%}{%}" -1.0\pt 7.0\pt 0.0\pt 0.0\pt - "botlines" "\\botledgerlines{%}{%}" -1.0\pt 7.0\pt 0.0\pt 0.0\pt - } - "bars" = \table { "empty" "\emptybar" "" "" 0.0\pt 0.0\pt 0.0\pt 16.0\pt @@ -94,7 +63,6 @@ table_sixteen= "param" = \table { "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt "meter" "\generalmeter{%}{%}" 0.0\pt 10.0\pt -8.0\pt 8.0\pt - "linestaf" "\linestafsym{%}{%}" "stem" "\stem{%}{%}" "fill" "\hbox{}" % ugh. 8pt @@ -107,6 +75,6 @@ table_sixteen= "slope" "\beamslope{%}{%}" 2.0\pt 64.0\pt 0.0\pt 0.0\pt "horizontal" "\rulesym{%}{%}" } - \include "font-en-tja16.ly" + \include "feta16.ly" } diff --git a/init/table20.ly b/init/table20.ly index 305b2c3572..abe4eadecb 100644 --- a/init/table20.ly +++ b/init/table20.ly @@ -16,6 +16,7 @@ table_twenty = "italic" "\setitalic{%}" 0.0\pt 0.0\pt 0.0\pt 8.0\pt "dynamic" "\setdynamic{%}" 0.0\pt 0.0\pt 0.0\pt 8.0\pt } + "dynamics" = \table { "mf" "\dynmf" @@ -38,17 +39,6 @@ table_twenty = } - "clefs" = \table { - "violin" "\violinclef" 0.0\pt 16.0\pt -12.5\pt 22.5\pt - "bass" "\bassclef" 0.0\pt 16.0\pt 0.0\pt 20.0\pt - "alto" "\altoclef" 0.0\pt 16.0\pt 0.0\pt 20.0\pt - "tenor" "\altoclef" 0.0\pt 16.0\pt 0.0\pt 20.0\pt - "violin_change" "\cviolinclef" 0.0\pt 16.0\pt -12.5\pt 22.5\pt - "bass_change" "\cbassclef" 0.0\pt 16.0\pt 0.0\pt 20.0\pt - "alto_change" "\caltoclef" 0.0\pt 16.0\pt 0.0\pt 20.0\pt - "tenor_change" "\caltoclef" 0.0\pt 16.0\pt 0.0\pt 20.0\pt - } - "slur" = \table { "whole" "\slurchar%{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt @@ -56,11 +46,6 @@ table_twenty = } - "streepjes" = \table { - "toplines" "\\topledgerlines{%}{%}" -3.0\pt 9.0\pt 0.0\pt 0.0\pt - "botlines" "\botledgerlines{%}{%}" -3.0\pt 9.0\pt 0.0\pt 0.0\pt - } - "bars" = \table { "empty" "\emptybar" "" "" 0.0\pt 0.0\pt 0.0\pt 16.0\pt @@ -82,7 +67,6 @@ table_twenty = "param" = \table { "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt "meter" "\generalmeter{%}{%}" 0.0\pt 10.0\pt -5.0\pt 5.0\pt - "linestaf" "\linestafsym{%}{%}" "stem" "\stem{%}{%}" "fill" "\hbox{}" % ugh. 8\pt @@ -96,6 +80,6 @@ table_twenty = } % ugh what's our outdir called? - \include "font-en-tja20.ly" + \include "feta20.ly" } diff --git a/input/font.ly b/input/font.ly index 76e2a8e5bf..4a5c7a3998 100644 --- a/input/font.ly +++ b/input/font.ly @@ -15,7 +15,7 @@ TestedFeatures = "This file tests the Feta music-font" \multi 2 < { \stemup e'\longa a\breve | } { \stemdown c1 \clef "bass"; ''b \clef "violin"; c' a' - c2 g c' a' + c2 \clef "alto"; g c' \clef "violin"; a' } > \stemboth c4 g c' a' \bar ":|"; diff --git a/lily/VERSION b/lily/VERSION index 24d753660d..83291dceb3 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,4 +1,4 @@ MAJOR_VERSION = 0 MINOR_VERSION = 1 -PATCH_LEVEL = 31 +PATCH_LEVEL = 32 MY_PATCH_LEVEL = diff --git a/lily/clef-grav.cc b/lily/clef-grav.cc index cf63067597..78f6aab7bd 100644 --- a/lily/clef-grav.cc +++ b/lily/clef-grav.cc @@ -1,5 +1,5 @@ /* - clef.cc -- implement Clef_engraver + clef.cc -- implement Clef_engraver source file of the GNU LilyPond music typesetter @@ -60,10 +60,17 @@ Clef_engraver::read_req (Clef_change_req*c_l) if (!set_type (c_l->clef_str_)) c_l->error (_("unknown clef type ")); } + + +/** + Generate a clef at the start of a measure. (when you see a Bar, + ie. a breakpoint) + */ void Clef_engraver::acknowledge_element (Score_elem_info info) { - if (info.elem_l_->name() == Bar::static_name () && clef_type_str_.length_i()) + if (info.elem_l_->is_type_b (Bar::static_name ()) + && clef_type_str_.length_i()) { create_clef(); if (!clef_req_l_) diff --git a/lily/dynamic-grav.cc b/lily/dynamic-grav.cc index d4b9544e3a..62dec7ba99 100644 --- a/lily/dynamic-grav.cc +++ b/lily/dynamic-grav.cc @@ -150,7 +150,7 @@ Dynamic_engraver::do_removal_processing () void Dynamic_engraver::acknowledge_element (Score_elem_info i) { - if (i.elem_l_->name() == Note_column::static_name ()) + if (i.elem_l_->is_type_b (Note_column::static_name ())) { if (dynamic_p_) dynamic_p_->add_support (i.elem_l_); if (to_end_cresc_p_) diff --git a/lily/key-grav.cc b/lily/key-grav.cc index f8d47a0830..3abc16b673 100644 --- a/lily/key-grav.cc +++ b/lily/key-grav.cc @@ -63,7 +63,7 @@ Key_engraver::acknowledge_element (Score_elem_info info) { create_key(); } - else if (info.elem_l_->name() == Bar::static_name ()) + else if (info.elem_l_->is_type_b (Bar::static_name ())) { if (!keyreq_l_) default_key_b_ = true; diff --git a/lily/local-key-grav.cc b/lily/local-key-grav.cc index ab566e1216..7201acf173 100644 --- a/lily/local-key-grav.cc +++ b/lily/local-key-grav.cc @@ -95,13 +95,13 @@ Local_key_engraver::acknowledge_element (Score_elem_info info) key_C_ = &key_grav_l->key_; local_key_ = *key_C_; } - else if (elem_l->name() == Key_item::static_name ()) + else if (elem_l->is_type_b (Key_item::static_name ())) { Key_engraver * key_grav_l = (Key_engraver*)info.origin_grav_l_arr_[0]; key_C_ = &key_grav_l->key_; } - else if (elem_l->name() == Tie::static_name ()) + else if (elem_l->is_type_b (Tie::static_name ())) { Tie * tie_l = (Tie*)elem_l->spanner(); if (tie_l->same_pitch_b_) diff --git a/lily/rest-collision-grav.cc b/lily/rest-collision-grav.cc index 4aa0607aca..119adcf2b7 100644 --- a/lily/rest-collision-grav.cc +++ b/lily/rest-collision-grav.cc @@ -24,7 +24,7 @@ Rest_collision_engraver::Rest_collision_engraver() void Rest_collision_engraver::acknowledge_element (Score_elem_info i) { - if (i.elem_l_->name()== Note_column::static_name()) + if (i.elem_l_->is_type_b (Note_column::static_name())) { // what should i do, what should _engraver do? if (!rest_collision_p_) diff --git a/lily/score-align-gravs.cc b/lily/score-align-gravs.cc index 4745a44191..28bb70bcc8 100644 --- a/lily/score-align-gravs.cc +++ b/lily/score-align-gravs.cc @@ -30,6 +30,6 @@ IMPLEMENT_IS_TYPE_B1(C ## _align_engraver, Type_align_engraver) ; IMPLEMENT_ALIGN_GRAV(Key,Key_item,3); IMPLEMENT_ALIGN_GRAV(Clef,Clef_item,2); -IMPLEMENT_ALIGN_GRAV(Meter,Meter,4); -IMPLEMENT_ALIGN_GRAV(Normal_bar, Normal_bar,5); +IMPLEMENT_ALIGN_GRAV(Normal_bar, Normal_bar,4); +IMPLEMENT_ALIGN_GRAV(Meter,Meter,5); IMPLEMENT_ALIGN_GRAV(Score_bar, Score_bar,0); diff --git a/lily/slur-grav.cc b/lily/slur-grav.cc index 83da2c3166..25b53201be 100644 --- a/lily/slur-grav.cc +++ b/lily/slur-grav.cc @@ -26,7 +26,7 @@ Slur_engraver::do_try_request (Request *req_l) void Slur_engraver::acknowledge_element (Score_elem_info info) { - if (info.elem_l_->name() == Note_column::static_name ()) + if (info.elem_l_->is_type_b (Note_column::static_name ())) { Note_column *col_l =(Note_column*) info.elem_l_->item() ;// ugh for (int i = 0; i < slur_l_stack_.size(); i++) diff --git a/lily/stem.cc b/lily/stem.cc index f72d3068ef..814eb6af83 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -28,7 +28,7 @@ Stem::Stem () { /* TODO: staff-size - */ + */ abbrev_flag_i_ = 0; beam_l_ = 0; beams_left_i_ = 0; @@ -190,10 +190,7 @@ Stem::set_default_extents () if (!stem_length_f ()) set_default_stemlen (); - /* set_stemend ((dir_< 0) ? - head_positions()[BIGGER]-stem_length_f (): - head_positions()[SMALLER] + stem_length_f ()); - */ + if (dir_ == UP) stem_xdir_ = RIGHT; if (invisible_b ()) @@ -289,6 +286,7 @@ Stem::abbrev_mol () const Molecule beams; Atom a (paper ()->lookup_l ()->beam (slope, w)); a.translate (Offset(- w / 2, stem_end_f () - (w / 2 * slope))); + // ugh if (!beams_i) a.translate_axis (dy + beamdy - dir_ * dy, Y_AXIS); @@ -305,7 +303,7 @@ Stem::abbrev_mol () const return beams; } -const Real ANGLE = 20* (2.0*M_PI/360.0); +const Real ANGLE = 20* (2.0*M_PI/360.0); // ugh! Molecule* Stem::brew_molecule_p () const diff --git a/lily/symtable.cc b/lily/symtable.cc index 16c48dfb5f..d247fa6494 100644 --- a/lily/symtable.cc +++ b/lily/symtable.cc @@ -53,7 +53,10 @@ Symtables::operator()(String s) { if (!elt_b (s)) { - warning ("Symtables `" + s + _("\' unknown")); + error ("Symtable `" + s + _("\' unknown")); + /* + We can't return, because we'll dump core anyway. + */ return 0; } else diff --git a/lily/tie-grav.cc b/lily/tie-grav.cc index ac7f776b50..c3ea8c1e36 100644 --- a/lily/tie-grav.cc +++ b/lily/tie-grav.cc @@ -72,7 +72,7 @@ Tie_engraver::do_process_requests() void Tie_engraver::acknowledge_element (Score_elem_info i) { - if (i.elem_l_->name() == Note_head::static_name ()) + if (i.elem_l_->is_type_b (Note_head::static_name ())) { if (tie_p_) { diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 44a61739f3..c7e4e03032 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -12,7 +12,7 @@ #include "translator-group.hh" #include "global-translator.hh" -Timing_translator::Timing_translator() +Timing_translator::Timing_translator () { default_grouping_ = Rhythmic_grouping (MInterval (0,4),4); // ugh } diff --git a/make/Targets.make b/make/Targets.make index aeb43521ac..4ea4098ba5 100644 --- a/make/Targets.make +++ b/make/Targets.make @@ -243,6 +243,10 @@ rpm: check-rpm-doc-deps check-rpm-doc-deps: $(MAKE) -C $(depth)/Documentation gifs +check-mf-deps: + $(MAKE) -C $(depth)/mf + + installexe: $(INSTALL) -d $(bindir) diff --git a/make/Toplevel.make.in b/make/Toplevel.make.in index 769b19fda0..9493966c26 100644 --- a/make/Toplevel.make.in +++ b/make/Toplevel.make.in @@ -51,10 +51,11 @@ include ./$(depth)/make/Rules.make localdist: configure -INSTALL.text: check-doc-deps +INSTALL.text: check-doc-deps check-mf-deps rm -f INSTALL.text ln `$(FIND) ./ -name INSTALL.text|head -1` . + # all machine generated junk resides in out/ distclean: set -e; for i in `find -type d -name 'out'`; do \ diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index 76ce89a784..0299de5e37 100644 --- a/make/lelievijver.lsm +++ b/make/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond -Versie: 0.1.31 -Inschrijf datum: 18NOV97 +Versie: 0.1.32 +Inschrijf datum: 19NOV97 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.31.tar.gz + 395k lilypond-0.1.32.tar.gz Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/ - 395k lilypond-0.1.31.tar.gz + 395k lilypond-0.1.32.tar.gz Copi"eer politie: GPL End diff --git a/make/lilypond.lsm b/make/lilypond.lsm index d46f62129e..5442985205 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 0.1.31 -Entered-date: 18NOV97 +Version: 0.1.32 +Entered-date: 19NOV97 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/sound/convert - 440k lilypond-0.1.31.tar.gz + 440k lilypond-0.1.32.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/development/ - 440k lilypond-0.1.31.tar.gz + 440k lilypond-0.1.32.tar.gz Copying-policy: GPL End diff --git a/make/lilypond.spec b/make/lilypond.spec index d95261c1f7..0713432550 100644 --- a/make/lilypond.spec +++ b/make/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 0.1.31 +Version: 0.1.32 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.31.tar.gz +Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.32.tar.gz Summary: A program for typesetting music. URL: http://www.stack.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/mf/TODO b/mf/TODO index 8269df3241..c94d227b86 100644 --- a/mf/TODO +++ b/mf/TODO @@ -1,5 +1,6 @@ - design macro for penstroke with rounded endings + - design decent macro for bulbed endings - y-refpoint for rests should be the 4th staffline (gclef: b') - versioning - lo-res fixes. diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf index 46cb11b300..b4b41e9e40 100644 --- a/mf/feta-banier.mf +++ b/mf/feta-banier.mf @@ -15,9 +15,10 @@ downflag_width# = .833 black_notehead_width# + stemthickness#/2; % so they have less slant. % -% Because of optical illusion, the utmost flag -% (bottom for down-pointing, top -% for up-pointing) should be smaller than the other flags +% Because of optical illusion, the utmost flag (bottom for +% down-pointing, top for up-pointing) should be smaller than the other +% flags. Adobe Sonata doesn't do this correctly. (Instead they have an +% extension flag. Yuck) % save hip_thickness, foot_thickness; @@ -29,7 +30,6 @@ foot_thickness# = hip_thickness#; % for example, see POSTSCRIPT Language -- program design, % page 119, and [Wanske], p 41,42 % - def draw_flag(expr center, flare, dims, hip_depth, foot_wid, hip_thickness, foot_thickness)= clearxy; diff --git a/mf/feta-beams16.mf b/mf/feta-beams16.mf index 75d3675ba7..62eff27315 100644 --- a/mf/feta-beams16.mf +++ b/mf/feta-beams16.mf @@ -8,6 +8,6 @@ font_size 16; mode_setup; staffsize#:=16pt#; -input wat-zie-ik; +input feta-watzieik; end. diff --git a/mf/feta-beams20.mf b/mf/feta-beams20.mf index d403140179..0340e3e057 100644 --- a/mf/feta-beams20.mf +++ b/mf/feta-beams20.mf @@ -10,5 +10,5 @@ mode_setup; staffsize#:=20pt#; -input wat-zie-ik; +input feta-watzieik; end. diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf index b168f44773..3ac2ba1b77 100644 --- a/mf/feta-klef.mf +++ b/mf/feta-klef.mf @@ -6,7 +6,7 @@ % (c) 1997 Han-Wen Nienhuys , % Jan Nieuwenhuizen -fet_begingroup("klef"); +fet_begingroup("clefs"); def draw_staff(expr first, last)= pickup pencircle scaled stafflinethickness; @@ -158,7 +158,6 @@ fet_endchar; % FIXME bulb should curve (see bass clef) % FIXME start (inside) should be little thinner % FIXME parametrise. -% FIXME should be a bit more upright % % Beste lezers, kijk, @@ -185,20 +184,20 @@ def draw_gclef (expr exact_center, reduction)= downstroke_dir = (14, -75); breapth_factor = 11/7; inner_thick_end = 45; - inner_start_angle = angle(-1,-2); + inner_start_angle = downstroke_angle - 43; thickness = .4 reduced_il - hair; thinnib = thinness - hair; thinpen = thinness; - set_char_box(-xpart exact_center + breapth_factor* reduced_il#, + set_char_box(-xpart exact_center + 1.1 * breapth_factor* reduced_il#, xpart exact_center + .66 breapth_factor* reduced_il#, -ypart exact_center + 3 * reduced_il#, ypart exact_center + 5 * reduced_il#); pickup pencircle scaled hair; - downstroke_angle = angle downstroke_dir; - z1 = center + whatever * dir inner_start_angle; + + z1 = center + whatever * dir (inner_start_angle); x1 = xpart center -.28 reduced_il; top z2r = center + (0,reduced_il + stafflinethickness/2); @@ -280,10 +279,10 @@ fet_beginchar("G clef", "violin", "violinclef") if test = 1: draw_staff(-1,3); fi; - draw_gclef((1.6 interline#,0), 1.0); + draw_gclef((1.7 interline#,0), 1.0); fet_endchar; fet_beginchar("G clef", "violin_change", "cviolinclef") draw_gclef((1.3 interline#,0), .8); fet_endchar; -fet_endgroup("klef"); +fet_endgroup("clefs"); diff --git a/mf/wat-zie-ik.mf b/mf/feta-watzieik.mf similarity index 100% rename from mf/wat-zie-ik.mf rename to mf/feta-watzieik.mf diff --git a/mf/feta20.mf b/mf/feta20.mf index b45af8ed34..5364504155 100644 --- a/mf/feta20.mf +++ b/mf/feta20.mf @@ -6,6 +6,7 @@ staffsize#:=20pt#; input autometric; fet_beginfont("feta", 20); +% AFBLIJVEN! Gebruik feta-test16/20, anders verneuk je de distributie. test := 0; input feta-generic; diff --git a/tex/feta16.tex b/tex/feta16.tex index 038711bf04..a575ac9a45 100644 --- a/tex/feta16.tex +++ b/tex/feta16.tex @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Tue Nov 18 23:42:04 1997 +% on Wed Nov 19 11:44:45 1997 % Do not edit % input from out/feta16.log % name @@ -67,7 +67,7 @@ \fetdef\dthirtysecondflag{50} \fetdef\dsixtyfourthflag{51} -% klef +% clefs \fetdef\altoclef{52} \fetdef\caltoclef{53} \fetdef\bassclef{54} diff --git a/tex/feta20.tex b/tex/feta20.tex index db65be50e8..d5b64756df 100644 --- a/tex/feta20.tex +++ b/tex/feta20.tex @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Tue Nov 18 23:42:28 1997 +% on Wed Nov 19 11:44:54 1997 % Do not edit % input from out/feta20.log % name @@ -67,7 +67,7 @@ \fetdef\dthirtysecondflag{50} \fetdef\dsixtyfourthflag{51} -% klef +% clefs \fetdef\altoclef{52} \fetdef\caltoclef{53} \fetdef\bassclef{54} -- 2.39.2