X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-generic.mf;h=f2c90cdf616c78fe03e19c1f4da2747477811d6b;hb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;hp=4d01e53bf7c427fb2ebce86c8aab89247432ab6b;hpb=eb736251ddd70a4562264eed6cc021b281f0377a;p=lilypond.git

diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index 4d01e53bf7..f2c90cdf61 100644
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -1,11 +1,11 @@
 % 
-% feta-generic.mf --  implement generic stuff: include lots of files, but don't
+% feta-generic.mf -- implement generic stuff: include lots of files, but don't
 %  set dims.
 %
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 % 
-% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 
@@ -13,20 +13,26 @@ 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_x_height staff_space#;
+
+%% 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;
@@ -34,16 +40,18 @@ if test = 0:
 	input feta-klef;
 	input feta-timesig;
 	input feta-pendaal;
+	input feta-haak;
 	input feta-accordion;
 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-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;