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

diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
index 1c138535a8..50ac474f54 100644
--- a/mf/feta-autometric.mf
+++ b/mf/feta-autometric.mf
@@ -1,20 +1,31 @@
+% Feta (not the Font-En-Tja) music font -- administrative MF routines
+% This file is part of LilyPond, the GNU music typesetter.
 %
-% autometric.mf -- administrative MF routines
+% Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%          Jan Nieuwenhuizen <janneke@gnu.org>
 %
-% source file of the Feta (not an acronym for Font-En-Tja)
-% pretty-but-neat music font
+% 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.
 %
-% (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-%          Jan Nieuwenhuizen <janneke@gnu.org>
+% The LilyPond font is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version, or under the SIL Open Font License.
 %
-% 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
+% LilyPond is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 
 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 +77,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 +135,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_;
 
@@ -179,7 +196,7 @@ enddef;
 
 
 %
-% we leave the ctrl characters alone.
+% we leave the ctrl characters alone
 %
 code := 32;
 
@@ -203,7 +220,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 +259,7 @@ endgroup;
 enddef;
 
 
-def fet_endchar=
+def fet_endchar =
 	autometric_output_char;
 	breapth_endchar;
 enddef;