X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-generic.mf;h=1fca5618a39723b5a4be2916f3a205f6e439e99e;hb=cd5c901120301fe26d2f45deaec89fa7973a62e5;hp=9891168c1ef37785ddbe27667644155f22d5a424;hpb=c24b8835be7d548804a94f6caceadcf914bb8198;p=lilypond.git

diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index 9891168c1e..1fca5618a3 100644
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -1,34 +1,57 @@
+% 
+% 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% 
 
 
 if test = -1:
 	mode := smoke;
 fi
 
-mode_setup;
+staffsize# := design_size * pt#;
 
+mode_setup;
 
 input feta-macros;
 
-make_pen_stack;
-make_picture_stack;
 input feta-params;
 
+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;
 	input feta-banier;
 	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-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;