From 1074a973f22887ad62358212772dec80248a49d5 Mon Sep 17 00:00:00 2001 From: Mats Bengtsson Date: Tue, 29 Sep 1998 23:11:23 +0200 Subject: [PATCH] patch::: 1.0.11.mb2: Re: Old time signatures in LilyPond pl 11.mb2 - feta-timesig.mf: Added some flesh on C and C2, added old-style mensuration marks. --- NEWS | 4 +++ VERSION | 2 +- lily/VERSION | 2 +- make/STATE-VECTOR | 1 + mf/feta-timesig.mf | 70 +++++++++++++++++++++++++++++++++++++++------- 5 files changed, 67 insertions(+), 12 deletions(-) diff --git a/NEWS b/NEWS index 9a84d2b855..4da9b2d303 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +pl 11.mb2 + - feta-timesig.mf: Added some flesh on C and C2, + added old-style mensuration marks. + pl 11.mb1 - Added feta-timesig.mf, font for C and alla breve. diff --git a/VERSION b/VERSION index e728e14d1f..6bdac35005 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_LEVEL=11 -MY_PATCH_LEVEL=mb1 +MY_PATCH_LEVEL=mb2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/lily/VERSION b/lily/VERSION index e728e14d1f..6bdac35005 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_LEVEL=11 -MY_PATCH_LEVEL=mb1 +MY_PATCH_LEVEL=mb2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR index 77e2d04833..a81e757b3b 100644 --- a/make/STATE-VECTOR +++ b/make/STATE-VECTOR @@ -88,3 +88,4 @@ 1.0.10.uu2 1.0.11 1.0.11.mb1 +1.0.11.mb2 diff --git a/mf/feta-timesig.mf b/mf/feta-timesig.mf index 509903ad0a..bf233f5680 100644 --- a/mf/feta-timesig.mf +++ b/mf/feta-timesig.mf @@ -9,20 +9,20 @@ fet_begingroup("timesig"); def draw_C = save hair, bulb_rad; - hair# := .5 stafflinethickness#; - bulb_rad# := (interline# - stafflinethickness#) / 4; + hair# := stafflinethickness#; + bulb_rad# := interline# / 3; define_pixels(hair, bulb_rad); x1r = x5; - y1r = interline / 3; - z2r = (0, interline); + y1r = .4 interline; + z2 = (0, interline); z3r = (-b, 0); - z4r = (0, -interline); - z5r = (w, -stafflinethickness); + z4 = (0, -interline); + z5r = (w, -2 stafflinethickness); - penpos1(1.5 stafflinethickness, 0); + penpos1(hair, 0); penpos2(stafflinethickness, 90); - penpos3(3 stafflinethickness, 180); + penpos3(4 stafflinethickness, 180); penpos4(stafflinethickness, -90); penpos5(hair, -5); @@ -42,13 +42,63 @@ fet_beginchar ("4/4 meter", "C", "fourfourmeter") draw_C; fet_endchar; -fet_beginchar ("4/4 meter", "C2", "allabreve") +fet_beginchar ("2/2 meter", "C2", "allabreve") set_char_box(.8 interline#, .7 interline#, 1.4 interline#, 1.4 interline#); draw_C; - draw_block((-stafflinethickness, -d), (0, h)); + draw_block((-1.5stafflinethickness, -d), (0, h)); fet_endchar; +path threequartercircle; +threequartercircle = halfcircle & quartercircle rotated 180; + +save Cdiameter,Cthickness; +Cdiameter# := 3/2 interline#; +Cthickness# := 2 stafflinethickness#; +define_pixels(Cdiameter,Cthickness); + +fet_beginchar ("Mensural 4/4 meter", "oldC", "oldfourfourmeter") + set_char_box(.5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#); + + pickup pencircle scaled Cthickness; + draw threequartercircle rotated 45 scaled Cdiameter; +fet_endchar; + +fet_beginchar ("Mensural 2/2 meter", "oldC2", "oldallabreve") + set_char_box(.5 Cdiameter#, .5 Cdiameter#, interline#, interline#); + + pickup pencircle scaled Cthickness; + draw threequartercircle rotated 45 scaled Cdiameter; + draw_block((-Cthickness, -d), (0, h)); +fet_endchar; + +fet_beginchar ("Mensural 3/2 meter", "old3_2", "oldthreetwometer") + set_char_box(.5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#); + + pickup pencircle scaled Cthickness; + draw fullcircle scaled Cdiameter; +fet_endchar; + +fet_beginchar ("Mensural 6/4 meter", "old6_4", "oldsixfourmeter") + set_char_box(.5 Cdiameter#, .5 Cdiameter#, + .5 Cdiameter# + .5 interline#, Cdiameter#+ .5 interline#); + + pickup pencircle scaled Cthickness; + draw threequartercircle rotated 45 scaled Cdiameter + shifted (0,.5 interline); + pickup pencircle scaled 3 stafflinethickness; + draw (0,.5 interline); +fet_endchar; + +fet_beginchar ("Mensural 9/4 meter", "old9_4", "oldninefourmeter") + set_char_box(.5 Cdiameter#, .5 Cdiameter#, + .5 Cdiameter# + .5 interline#, Cdiameter#+ .5 interline#); + + pickup pencircle scaled Cthickness; + draw fullcircle scaled Cdiameter shifted (0,.5 interline); + pickup pencircle scaled 3 stafflinethickness; + draw (0,.5 interline); +fet_endchar; fet_endgroup("timesig"); -- 2.39.2