From 94793d281acd7294d0cde42d6835c09d04b67a8f Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:00:58 +0000
Subject: [PATCH] lilypond-0.1.25

---
 input/font.ly        |  5 ++---
 mf/feta-eindelijk.mf | 28 ++++++++++++++++------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/input/font.ly b/input/font.ly
index 620c39b66e..5a57033f95 100644
--- a/input/font.ly
+++ b/input/font.ly
@@ -26,12 +26,13 @@ TestedFeatures =	 "This file tests the Feta music-font"
 		[c d e f] [as' ges' f' e']
 		[cis' dis' c' des'] [cisis' disis' ceses' deses'] |
 		  r1 r2 r4 r8 r16 r32 r64 r128 r128 |
-		\multi 2 < { \stemup r1} {\stemdown c''}>
+		\multi 2 < { \stemup r2 r2} {\stemdown c'' c''}>
 		\multi 2 < { \stemup c1 } {\stemdown r1}>		
 		\stemboth
 		
 		e8_. g'8-> e16^^ g'16_^ 
 		e32 _| g'32^| g''32-\ltoe g''32-\lheel
+		e64 g'64 c4... |
 		}
 	\paper{ 
 	    gourlay_maxmeasures =5.;
@@ -41,7 +42,5 @@ TestedFeatures =	 "This file tests the Feta music-font"
 	    gourlay_maxmeasures =5.;
 	    \output "lelie20.tex";
 	}
-% oeps
-%	\midi{ }
 }
 
diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index b3cadcab90..d6d7cfcf54 100644
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-eindelijk.mf
@@ -8,11 +8,8 @@ fet_begingroup("rests");
 
 begingroup
 
-med#:=1/33designsize;
 thick#:=1/16designsize;
-define_blacker_pixels(med,thick);
-pen med_pen;
-med_pen:= pencircle scaled med;
+define_blacker_pixels(thick);
 
 rthin:=1/8*interline;
 % rthick:=2rthin;
@@ -59,9 +56,10 @@ def block_rest=
 enddef;
 
 fet_beginchar( "whole rest", "0", "wholerest");
-set_char_box(0, block_rest_x#, -interline# + block_rest_y#,  interline# );
+	set_char_box(0, block_rest_x#,
+		block_rest_y#,  0);
 	block_rest;
-	currentpicture := currentpicture shifted (0,interline - block_rest_y);
+	currentpicture := currentpicture shifted (0,- block_rest_y);
 fet_endchar;
 
 fet_beginchar("half rest", "1", "halfrest");
@@ -75,20 +73,26 @@ fet_endchar;
 %
 fet_beginchar( "whole rest (outside staff)", "0o", "outsidewholerest");
 	set_char_box(block_rest_y#, block_rest_x# + block_rest_y#, 
-		-interline# + block_rest_y#, interline#);
+		block_rest_y#, ledgerlinethickness#/2);
 	block_rest;
-	currentpicture := currentpicture shifted (0,interline - block_rest_y);
+	currentpicture := currentpicture shifted (0, - block_rest_y);
 	pickup pencircle scaled ledgerlinethickness;
-	draw (-block_rest_y, interline) 
-             .. (block_rest_x + block_rest_y, interline);
+
+	y5 = y6 = 0;
+	lft x5 = - b; 
+	rt x6 = w;
+	draw z5 .. z6;
 fet_endchar;
 
 fet_beginchar("half rest (outside staff)", "1o", "outsidehalfrest");
 	set_char_box(block_rest_y#, block_rest_x#+ block_rest_y#, 
-		0, block_rest_y#);
+		ledgerlinethickness#/2, block_rest_y#);
 	block_rest;
 	pickup pencircle scaled ledgerlinethickness;
-	draw (-block_rest_y,0) .. (block_rest_x + block_rest_y,0);
+	y5 = y6 = 0;
+	lft x5 = - b; 
+	rt x6 = w;
+	draw z5 .. z6;
 fet_endchar;
 
 fet_beginchar("Quarter rest","2","quartrest");
-- 
2.39.5