X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-autometric.mf;h=a7779390349056b2a59697d0cfb068f4bc583f17;hb=969b3b0a27bbdaa721cb6b78a9ce82a9b0300277;hp=fdf9b0eb3f2e17c3e545d40bc939522ef8ccda48;hpb=095750f4177ff3c486c33ec5475d20620d4ea926;p=lilypond.git

diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
index fdf9b0eb3f..a777939034 100644
--- a/mf/feta-autometric.mf
+++ b/mf/feta-autometric.mf
@@ -4,7 +4,7 @@
 % source file of the Feta (not an acronym for Font-En-Tja)
 % pretty-but-neat music font
 % 
-% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 %          Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 % these macros help create ascii logging output
@@ -20,7 +20,7 @@ message "******************************************************";
 def fet_beginfont(expr name,size) =
 	font_identifier:=name&decimal size;
 	font_size size;
-	message "@{font@:"&name&"@:"&decimal size&"@}";
+	message "@{font@:GNU@:LilyPond@:"&name&"@:"&decimal size&"@}";
 	message "";
 	enddef;
 
@@ -43,7 +43,7 @@ def fet_endgroup(expr name) =
 enddef;
 
 def autometric_output_char=
-	message "@{char@:"&charnamestr&"@:"&decimal charcode&"@:"&decimal charbp&"@:"&decimal charwd&"@:"&decimal chardp&"@:"&decimal charht&"@:"&idstr&"@:"&texstr&"@}";
+	message "@{char@:"&charnamestr&"@:"&decimal charcode&"@:"&decimal charbp&"@:"&decimal charwd&"@:"&decimal chardp&"@:"&decimal charht&"@:"&decimal charwx&"@:"&decimal charwy&"@:"&idstr&"@:"&texstr&"@}";
 enddef;
 
 def hround_pixels(expr sharped) = hround(sharped * hppp) enddef;
@@ -73,6 +73,9 @@ def set_char_box(expr b_sharp, w_sharp, d_sharp,h_sharp) =
 	b := hround(b_sharp *hppp);
 	h := hround(h_sharp *vppp);
 	d := hround(d_sharp *vppp);
+
+	charwx := charwd;
+	charwy := 0;
 enddef;
 
 def no_dimen_beginchar(expr c) =
@@ -85,7 +88,11 @@ def no_dimen_beginchar(expr c) =
 	scantokens extra_beginchar;
 enddef;
 
-code:=-1;
+
+%
+% we leave the ctrl characters alone.
+%
+code:=32;
 
 % starts just as plain mf's beginchar:
 %     charcode, 
@@ -99,6 +106,8 @@ def fet_beginchar(expr name, id_lit, texstr_lit) =
 	save texstr, idstr, charnamestr;
 	save charbp;
 	save w,b,h,d;
+	save charwx, charwy;
+
 	string texstr, idstr, charnamestr;
 	texstr := texstr_lit;
 	charnamestr := name;