patch::: 1.0.11.mb1: Re: Old time signatures in LilyPond

pl 11.mb1
	- Added feta-timesig.mf, font for C and alla breve.

diff --git a/NEWS b/NEWS
index 3991eaa09e8c1165cd1e0f62be75652d6ee424a9..9a84d2b85512bba3a76681808fd9eb74e05a27fe 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+pl 11.mb1
+       - Added feta-timesig.mf, font for C and alla breve.
 
 pl 10.uu2
        - plet-spanner fix.

diff --git a/VERSION b/VERSION
index a4af69fcb5d6fa15de66039864667710df8dc27a..e728e14d1f639e2763fe6eea5c1e7daf3c7d1187 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=11
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # 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 a4af69fcb5d6fa15de66039864667710df8dc27a..e728e14d1f639e2763fe6eea5c1e7daf3c7d1187 100644 (file)
--- 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=
+MY_PATCH_LEVEL=mb1
 
 # 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 273ae744b2c57c2d9f3c7c5acabc1f85520975b4..77e2d04833fe1b54148cda8f5e039aeba1e4bc49 100644 (file)
--- a/make/STATE-VECTOR
+++ b/make/STATE-VECTOR
@@ -87,3 +87,4 @@
 1.0.10.uu1
 1.0.10.uu2
 1.0.11
+1.0.11.mb1

diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index e9803f5dff5c90860376e0d1535fb8f4e5c15b4a..6b3bdda090b90536a7a5fd46300342bd24fbaa79 100644 (file)
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -32,6 +32,7 @@ if test = 0:
        input feta-schrift;
        input feta-banier;
        input feta-klef;
+       input feta-timesig;
 else:
 %      input feta-bolletjes;   
 %      input feta-banier;
@@ -41,4 +42,5 @@ else:
 %      input feta-schrift;
 %      input feta-schrift;
 %      input feta-haak;
+%      input feta-timesig;
 fi

diff --git a/mf/feta-timesig.mf b/mf/feta-timesig.mf
new file mode 100644 (file)
index 0000000..509903a
--- /dev/null
+++ b/mf/feta-timesig.mf
@@ -0,0 +1,54 @@
+% 
+% feta-timesig.mf --  implement Time Signatures
+% 
+% source file of the Feta (Font-En-Tja) music font
+% 
+% (c) 1998 Mats Bengtsson <matsb@s3.kth.se>
+
+fet_begingroup("timesig");
+
+def draw_C =
+       save hair, bulb_rad;
+       hair# := .5 stafflinethickness#;
+       bulb_rad# := (interline# - stafflinethickness#) / 4;
+       define_pixels(hair, bulb_rad);
+
+       x1r = x5;
+       y1r = interline / 3;
+       z2r = (0, interline);
+       z3r = (-b, 0);
+       z4r = (0, -interline);
+       z5r = (w, -stafflinethickness);
+       
+       penpos1(1.5 stafflinethickness, 0);
+       penpos2(stafflinethickness, 90);
+       penpos3(3 stafflinethickness, 180);
+       penpos4(stafflinethickness, -90);
+       penpos5(hair, -5);
+       
+       draw_bulb(-1, z1l,  z1r, bulb_rad, .8);
+
+       fill z1l{up} .. z2l{left} .. z3l{down} .. z4l{right} ..
+       simple_serif(z5l, z5r, -90) .. 
+       z4r{left} .. z3r{up} .. z2r{right} .. z1r -- cycle;
+       
+%      labels(1,2,3,4,5);
+       penlabels(1,2,3,4,5);
+enddef;
+
+fet_beginchar ("4/4 meter", "C", "fourfourmeter")
+       set_char_box(.8 interline#, .7 interline#, interline#, interline#);
+       
+       draw_C;
+fet_endchar;
+
+fet_beginchar ("4/4 meter", "C2", "allabreve")
+       set_char_box(.8 interline#, .7 interline#, 1.4 interline#, 1.4 interline#);
+       
+       draw_C;
+       draw_block((-stafflinethickness, -d), (0, h));
+fet_endchar;
+
+
+
+fet_endgroup("timesig");