X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-generic.mf;h=dd508285aa5daf0a77cc06aca567ffddec66ca6d;hb=d37ec07a0124acff8ceb87a0e0616ca998965fdf;hp=0270ad3803ca7fd5c13da58f71fd5123b01c43d8;hpb=7244c2583a5ea8b89fd72a8b96d33511935cfe88;p=lilypond.git

diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index 0270ad3803..dd508285aa 100644
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -5,7 +5,7 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 % 
-% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 
@@ -13,21 +13,25 @@ if test = -1:
 	mode := smoke;
 fi
 
+staffsize# := design_size * pt#;
+
 mode_setup;
-%
 
 input feta-macros;
 
-make_pen_stack;
-make_picture_stack;
 input feta-params;
 
 font_x_height  staff_space#;
-font_coding_scheme "feta music";
 
+%% this is a fallback so we can run the font without including feta-bolletjes.
+black_notehead_width# := 1.0 staff_space#;
+
+
+fet_beginfont("feta", design_size, "fetaMusic");
 if test = 0: 
 	input feta-eindelijk;
 	input feta-toevallig;
+	input feta-arrow;
 	input feta-puntje;
 	input feta-bolletjes;
 	input feta-schrift;
@@ -35,19 +39,20 @@ if test = 0:
 	input feta-klef;
 	input feta-timesig;
 	input feta-pendaal;
+	input feta-haak;
 	input feta-accordion;
-	input feta-solfa;
-	
 else:
-%	input feta-bolletjes;	
-%	input feta-banier;
-%	input feta-eindelijk;
-%	input feta-klef;
-	input feta-toevallig;
-%	input feta-schrift;
-%	input feta-haak;
-%	input feta-timesig;
-%	input feta-pendaal;
-%	input feta-accordion;
-%	input feta-solfa;
+	input feta-test-generic.mf;
+
 fi
+
+autometric_parameter("staffsize", staffsize#);
+autometric_parameter("stafflinethickness", stafflinethickness#);
+autometric_parameter("staff_space", staff_space#)
+autometric_parameter("linethickness", linethickness#)
+autometric_parameter("black_notehead_width", black_notehead_width#);
+autometric_parameter("ledgerlinethickness", ledgerlinethickness#);
+autometric_parameter("blot_diameter", blot_diameter#);
+
+fet_endfont;
+