X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-autometric.mf;h=fe7467aca255712b0739804dc64f860577e7519f;hb=393d61330753cdd9a86f94fc6ec23d29cfb845ed;hp=1c138535a84714cb1daa89803d4258900add5089;hpb=32bc5ac1c42ea0beca27fc62d8ac6c0dc74bba12;p=lilypond.git

diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
index 1c138535a8..fe7467aca2 100644
--- a/mf/feta-autometric.mf
+++ b/mf/feta-autometric.mf
@@ -4,17 +4,18 @@
 % 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--2008 Han-Wen Nienhuys <hanwen@xs4all.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
+% These macros help create ascii logging output
+% to automate generation of the lily tables.
+% 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 "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
@@ -124,13 +125,19 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) =
 	charwx := charwd;
 	charwy := 0;
 
-	% additions for mf2pt1
+	% additions for mf2pt1 (`bbox' is called `glyph_dimensions' starting
+	% with version 2.4.2)
 	if known bp_per_pixel:
 		special "% MF2PT1: bbox "
 			& to_bp (-b) & " "
 			& to_bp (-d) & " "
 			& to_bp (w) & " "
 			& to_bp (h);
+		special "% MF2PT1: glyph_dimensions "
+			& to_bp (-b) & " "
+			& to_bp (-d) & " "
+			& to_bp (w) & " "
+			& to_bp (h);
 		special "% MF2PT1: font_size " & decimal designsize;
 		special "% MF2PT1: font_slant " & decimal font_slant_;
 
@@ -203,7 +210,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 +249,7 @@ endgroup;
 enddef;
 
 
-def fet_endchar=
+def fet_endchar =
 	autometric_output_char;
 	breapth_endchar;
 enddef;