Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
index 1c138535a84714cb1daa89803d4258900add5089..50648f13c0bcd2f9f20ede6d7490ce6ac205dcc7 100644 (file)
--- 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %          Jan Nieuwenhuizen <janneke@gnu.org>
 %
 % these macros help create ascii logging output
@@ -14,7 +14,8 @@
 
 message "******************************************************";
 message "Using feta Autometric macros.";
-message "Do not worry about the @ signs in the output, they are not errors.";
+message "order of messages: ";
+message " NAME/CODE/BP/WD/DP/HT/WX/WY";
 message "******************************************************";
 message "";
 
@@ -66,7 +67,7 @@ def autometric_parameter (expr name, value) =
 enddef;
 
 
-def autometric_output_char=
+def autometric_output_char =
        message "@{char@:" & charnamestr
                & "@:" & decimal charcode
                & "@:" & decimal charbp
@@ -203,7 +204,12 @@ def fet_beginchar (expr name, id_lit) =
 
        % addition for mf2pt1
        if known bp_per_pixel:
-               special "% MF2PT1: glyph_name " & feta_group & "." & idstr;
+               if known feta_group:
+                       special "% MF2PT1: glyph_name "
+                               & feta_group & "." & idstr;
+               else:
+                       special "% MF2PT1: glyph_name " & idstr;
+               fi;
        fi;
 
        no_dimen_beginchar (incr code) name;
@@ -237,7 +243,7 @@ endgroup;
 enddef;
 
 
-def fet_endchar=
+def fet_endchar =
        autometric_output_char;
        breapth_endchar;
 enddef;