2003 -> 2004

[lilypond.git] / mf / feta-autometric.mf

diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
index 76a21ed49dfb7b413346ccb70be5a676aec68561..a7779390349056b2a59697d0cfb068f4bc583f17 100644 (file)
--- a/mf/feta-autometric.mf
+++ b/mf/feta-autometric.mf
@@ -1,20 +1,26 @@
 % 
 % autometric.mf -- administrative MF routines
 % 
-% source file of the Feta (Font-En-Tja) pretty-but-neat music font
+% source file of the Feta (not an acronym for Font-En-Tja)
+% pretty-but-neat music font
 % 
-% (c) 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 %          Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 % these macros help create ascii logging output
 % to automate generation of lily tables and tex backend
 % The output should be parsed by the mf-to-table script
 
+message "******************************************************";
+message "Using feta Autometric macros. ";
+message "Do not worry about the @ signs in the output, they are not errors. "; 
+message "******************************************************";
+
 % font or database?
 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;
 
@@ -37,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;
@@ -67,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) =
@@ -79,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, 
@@ -93,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;