From: fred <fred>
Date: Tue, 26 Mar 2002 21:26:54 +0000 (+0000)
Subject: lilypond-1.0.12
X-Git-Tag: release/1.5.59~2856
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1614cf31a946ad848ee758f9cb7d028bd4f2ed00;p=lilypond.git

lilypond-1.0.12
---

diff --git a/NEWS b/NEWS
index 3991eaa09e..855cc07ca3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,28 @@
+pl 11.uu2
+	- added Transposed_music for mixing transposition and relative 
+
+pl 11.jcn1
+	- bf: config.make striproff
+	- texinfo
+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.
+
+
+pl 11.uu1
+	- new \property: meterSignatureStyle for C and C2 time sigs
+	- bf: BIBINPUTS
+	- stepmake 53
+	- bf: gif vs. png stuff
+
+*******
+pl 11
 
 pl 10.uu2
-	- plet-spanner fix.
+	- plet-spanner fix. 
 	- large doc patch (thanks Adrian)
 
 pl 10.jbr1
diff --git a/buildscripts/clean-fonts.sh b/buildscripts/clean-fonts.sh
index a57dc7fc74..597efa9032 100644
--- a/buildscripts/clean-fonts.sh
+++ b/buildscripts/clean-fonts.sh
@@ -19,7 +19,7 @@ fi
 
 # remove possibly stale .pk/.tfm files 
 echo> /tmp/cleaning-font-dummy
-FILES=`find $TEXDIR -name "feta*$WHAT*tfm" -or -name "feta*$WHAT*pk"`
+FILES=`find .  $TEXDIR -name "feta*$WHAT*tfm" -or -name "feta*$WHAT*pk"`
 
 echo removing $FILES
 rm  -f $FILES /tmp/cleaning-font-dummy
diff --git a/mf/feta-timesig.mf b/mf/feta-timesig.mf
new file mode 100644
index 0000000000..bf233f5680
--- /dev/null
+++ b/mf/feta-timesig.mf
@@ -0,0 +1,104 @@
+% 
+% 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# := stafflinethickness#;
+	bulb_rad# := interline# / 3;
+	define_pixels(hair, bulb_rad);
+
+	x1r = x5;
+	y1r = .4 interline;
+	z2 = (0, interline);
+	z3r = (-b, 0);
+	z4 = (0, -interline);
+	z5r = (w, -2 stafflinethickness);
+	
+	penpos1(hair, 0);
+	penpos2(stafflinethickness, 90);
+	penpos3(4 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 ("2/2 meter", "C2", "allabreve")
+	set_char_box(.8 interline#, .7 interline#, 1.4 interline#, 1.4 interline#);
+	
+	draw_C;
+	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");