X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Fparmesan-rests.mf;h=3ef67212b9c9e17aec163dae1c40fd99ab6e4f45;hb=HEAD;hp=1d08c0b9a7d8d58d368a592a875da30db449c6fa;hpb=ddb85675c4e3308837f63a613179128f8e23c2a3;p=lilypond.git

diff --git a/mf/parmesan-rests.mf b/mf/parmesan-rests.mf
index 1d08c0b9a7..3ef67212b9 100644
--- a/mf/parmesan-rests.mf
+++ b/mf/parmesan-rests.mf
@@ -1,15 +1,26 @@
-% -%-Fundamental-%- -*-Metafont-*-
-% parmesan-rests.mf -- implement ancient rests
-% 
-% source file of LilyPond's pretty-but-neat music font
-% 
-% (c) 2001--2006 Juergen Reuter <reuter@ipd.uka.de>
+% Feta (not the Font-En-Tja) music font --  ancient rests
+% This file is part of LilyPond, the GNU music typesetter.
+%
+% Copyright (C) 2001--2015 Juergen Reuter <reuter@ipd.uka.de>
 % 
 % Neo-mensural rests originally by
 % Christian Mondrup and Mats Bengtsson.
 % 
+%
+% 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.
+%
+% 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/>.
 
-fet_begingroup("rests")
+fet_begingroup ("rests")
 
 
 %%%%%%%%
@@ -38,7 +49,7 @@ def neomens_half_block_rest =
 enddef;
 
 
-fet_beginchar ("Neo-mensural maxima rest", "-3neomensural");
+fet_beginchar ("Neo-mensural maxima rest", "M3neomensural");
 	set_char_box (0, 3 neomens_block_rest_x#,
 		      neomens_block_rest_y#, neomens_block_rest_y#);
 
@@ -49,7 +60,7 @@ fet_beginchar ("Neo-mensural maxima rest", "-3neomensural");
 fet_endchar;
 
 
-fet_beginchar ("Neo-mensural longa rest", "-2neomensural");
+fet_beginchar ("Neo-mensural longa rest", "M2neomensural");
 	set_char_box (0, neomens_block_rest_x#,
 		      neomens_block_rest_y#, neomens_block_rest_y#);
 
@@ -58,7 +69,7 @@ fet_beginchar ("Neo-mensural longa rest", "-2neomensural");
 fet_endchar;
 
 
-fet_beginchar ("Neo-mensural breve rest", "-1neomensural");
+fet_beginchar ("Neo-mensural breve rest", "M1neomensural");
 	set_char_box (0, neomens_block_rest_x#,
 		      0, neomens_block_rest_y#);
 
@@ -186,11 +197,11 @@ fet_beginchar ("Neo-mensural 16th rest", "4neomensural");
 	rt x3 = w;
 	top y3 = h;
 	lft x4 = 0;
-	bot y4 = h/2;
+	bot y4 = h / 2;
 	rt x5 = w;
-	top y5 = 5/8h;
+	top y5 = 5/8 h;
 	lft x6 = 0;
-	bot y6 = h/8;
+	bot y6 = h / 8;
 
 	z11 = z1 - stafflinethickness * unitvector (z2 - z1);
 	z14 = z4 + stafflinethickness * unitvector (z4 - z3);
@@ -252,9 +263,9 @@ define_pixels (mens_block_rest_y, mens_half_block_rest_y,
 	       pen_width, pen_height);
 
 
-fet_beginchar ("Mensural maxima rest", "-3mensural");
+fet_beginchar ("Mensural maxima rest", "M3mensural");
 	set_char_box (0, pen_width#,
-		      mens_block_rest_y#, 2mens_block_rest_y#);
+		      mens_block_rest_y#, 2 mens_block_rest_y#);
 
 	pickup pencircle xscaled pen_width
 			 yscaled pen_height
@@ -265,7 +276,7 @@ fet_beginchar ("Mensural maxima rest", "-3mensural");
 fet_endchar;
 
 
-fet_beginchar ("Mensural longa rest", "-2mensural");
+fet_beginchar ("Mensural longa rest", "M2mensural");
 	set_char_box (0, pen_width#,
 		      mens_block_rest_y#, mens_block_rest_y#);
 
@@ -278,7 +289,7 @@ fet_beginchar ("Mensural longa rest", "-2mensural");
 fet_endchar;
 
 
-fet_beginchar ("Mensural breve rest", "-1mensural");
+fet_beginchar ("Mensural breve rest", "M1mensural");
 	set_char_box (0, pen_width#,
 		      0, mens_block_rest_y#);
 
@@ -317,7 +328,7 @@ fet_beginchar ("Mensural half rest", "1mensural");
 fet_endchar;
 
 
-mensrestsize# = .8staff_space#;
+mensrestsize# = .8 staff_space#;
 
 
 fet_beginchar ("Mensural 4th rest", "2mensural");
@@ -345,7 +356,9 @@ fet_beginchar ("Mensural 4th rest", "2mensural");
 	labels (1, 2, 3, 4);
 fet_endchar;
 
-
+%
+% FIXME: The left sharp corner produces ugly results at lower resolutions.
+%
 fet_beginchar ("Mensural 8th rest", "3mensural");
 	set_char_box (0, mensrestsize#,
 		      0, mensrestsize#);
@@ -375,6 +388,9 @@ fet_endchar;
 % FIXME: So far, I have never seen a semifusa rest printed.  Hence,
 % the shape of this font character is currently pure invention.  --jr
 %
+%
+% FIXME: The left sharp corner produces ugly results at lower resolutions.
+%
 fet_beginchar ("Mensural 16th rest", "4mensural");
 	set_char_box (0, mensrestsize#,
 		      0, staff_space#);