Hi all,
here is a first version of font symbols for C and C2 (alla breve)
in time signatures. Since Peter had began fiddling with the TeX
and C++ parts, I only did the font.
I don't think it is a good solution to always print e.g. 4/4 as
'C', in some cases you want the numbers. I'd like to be able
to write \time C; to get the C and \time 4/4; to get the numbers.
Also, in some occasions you only want e.g. a single 4 to denote 4/4
or even a C2 to denote 3/2 which means that the symbol name itself
doesn't uniquely decide the time signature. Yet another syntax
problem to solve.
Anyway, here comes the patch
/Mats
-----------------
Generated by (address unknown) using package-diff 0.62,
>From = lilypond-1.0.11, To = lilypond-1.0.11.mb1
usage
cd lilypond-source-dir; patch -E -p1 < lilypond-1.0.11.mb1.diff
Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
and possibly make outdirs.
--state
1.0.11
1.0.11.mb1
++state
diff -urN ../lilypond-1.0.11/NEWS ./NEWS
--- ../lilypond-1.0.11/NEWS Thu Sep 24 16:45:51 1998
+++ ./NEWS Sun Sep 27 16:33:52 1998
@@ -1,3 +1,5 @@
+pl 11.mb1
+ - Added feta-timesig.mf, font for C and alla breve.
pl 10.uu2
- plet-spanner fix.
diff -urN ../lilypond-1.0.11/VERSION ./VERSION
--- ../lilypond-1.0.11/VERSION Thu Sep 24 17:02:45 1998
+++ ./VERSION Sun Sep 27 16:32:30 1998
@@ -2,7 +2,7 @@
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 -urN ../lilypond-1.0.11/lily/VERSION ./lily/VERSION
--- ../lilypond-1.0.11/lily/VERSION Thu Sep 24 17:03:16 1998
+++ ./lily/VERSION Sun Sep 27 16:34:34 1998
@@ -2,7 +2,7 @@
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 -urN ../lilypond-1.0.11/make/STATE-VECTOR ./make/STATE-VECTOR
--- ../lilypond-1.0.11/make/STATE-VECTOR Thu Sep 24 17:03:08 1998
+++ ./make/STATE-VECTOR Sun Sep 27 16:34:26 1998
@@ -87,3 +87,4 @@
1.0.10.uu1
1.0.10.uu2
1.0.11
+1.0.11.mb1
diff -urN ../lilypond-1.0.11/mf/feta-generic.mf ./mf/feta-generic.mf
--- ../lilypond-1.0.11/mf/feta-generic.mf Tue Sep 15 19:22:43 1998
+++ ./mf/feta-generic.mf Sun Sep 27 16:35:13 1998
@@ -32,6 +32,7 @@
input feta-schrift;
input feta-banier;
input feta-klef;
+ input feta-timesig;
else:
% input feta-bolletjes;
% input feta-banier;
@@ -41,4 +42,5 @@
% input feta-schrift;
% input feta-schrift;
% input feta-haak;
+% input feta-timesig;
fi
diff -urN ../lilypond-1.0.11/mf/feta-timesig.mf ./mf/feta-timesig.mf
--- ../lilypond-1.0.11/mf/feta-timesig.mf Thu Jan 1 01:00:00 1970
+++ ./mf/feta-timesig.mf Sun Sep 27 15:32:28 1998
@@ -0,0 +1,54 @@
+%
+% feta-timesig.mf -- implement Time Signatures
+%
+% source file of the Feta (Font-En-Tja) music font
+%
+% (c) 1998 Mats Bengtsson <[EMAIL PROTECTED]>
+
+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");
