From 0d296879a3cab7e50bc37cdad5a26b50025c0d51 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Fri, 20 Apr 2007 19:02:36 +0200
Subject: [PATCH] Replace draw_block with draw_rounded_block.

Formatting nits.
---
 mf/parmesan-heads.mf | 32 +++++++++++++++++---------------
 mf/parmesan-rests.mf | 19 ++++++++++++-------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf
index 62cee5bb25..a21b942b02 100644
--- a/mf/parmesan-heads.mf
+++ b/mf/parmesan-heads.mf
@@ -660,14 +660,16 @@ def vat_punctum_char (expr verbose_name, internal_name,
 
 			pickup pencircle scaled 0.6 linethickness;
 
-			draw_block ((-0.10 wd - linea_width / 2,
-				     -linea_height / 2),
-				    (-0.10 wd + linea_width / 2,
-				     +linea_height / 2));
-			draw_block ((+0.52 wd - linea_width / 2,
-				     -linea_height / 2),
-				    (+0.52 wd + linea_width / 2,
-				     +linea_height / 2));
+			draw_rounded_block ((-0.10 wd - linea_width / 2,
+					     -linea_height / 2),
+					    (-0.10 wd + linea_width / 2,
+					     +linea_height / 2),
+					    0.6 linethickness);
+			draw_rounded_block ((+0.52 wd - linea_width / 2,
+					     -linea_height / 2),
+					    (+0.52 wd + linea_width / 2,
+					     +linea_height / 2),
+					    0.6 linethickness);
 
 			set_char_box (0, 0.62 wd# + linea_width#,
 				      linea_height# / 2,
@@ -893,15 +895,15 @@ def epiphonus_char (expr verbose_name, internal_name,
 		     .. get_subpath (circle, dirs65, down, z6)
 		     -- cycle;
 
-		pickup pencircle scaled 0.6 linethickness;
-
 		save stem_bt;
 
 		if left_stem:
 			z11 = (0.00 wd + 0.6 linethickness / 2, yoffs - 1.1 ht);
 			z12 = (0.00 wd + 0.6 linethickness / 2, yoffs);
-			draw_block ((0, yoffs - 1.1 ht - linethickness / 2),
-				    (0.6 linethickness, yoffs));
+			draw_rounded_block ((0, yoffs - 1.1 ht -
+						  linethickness / 2),
+					    (0.6 linethickness, yoffs),
+					    0.6 linethickness);
 			stem_bt# = yoffs# - 1.1 ht#;
 		else:
 			stem_bt# = 0;
@@ -1346,14 +1348,14 @@ def med_punctum_char (expr verbose_name, internal_name,
 			z4 = (0.00 wd + linethickness / 2, blot_diameter / 2);
 			z5 = (0.00 wd + linethickness / 2, -1.25 ht);
 
-			draw_block (lft z5, rt z4);
+			draw_rounded_block (lft z5, rt z4, linethickness);
 		elseif left_up_stem:
 			set_char_box (0.0, 0.4 wd#, 0.25 ht#, 1.25 ht#);
 
 			z4 = (0.00 wd + linethickness / 2, -blot_diameter / 2);
 			z5 = (0.00 wd + linethickness / 2, +1.25 ht);
 
-			draw_block (lft z4, rt z5);
+			draw_rounded_block (lft z4, rt z5, linethickness);
 		else:
 			set_char_box (0.0, 0.4 wd#, 0.25 ht#, 0.25 ht#);
 		fi;
@@ -1413,7 +1415,7 @@ def huf_punctum_char (expr verbose_name, internal_name,
 
 			fill get_subpath (ellipse, up, down, z11)
 			     -- get_subpath (ellipse, down, up, z12)
-			     --cycle;
+			     -- cycle;
 
 			labels (11, 12);
 		fi;
diff --git a/mf/parmesan-rests.mf b/mf/parmesan-rests.mf
index 1d08c0b9a7..5aa392e3d2 100644
--- a/mf/parmesan-rests.mf
+++ b/mf/parmesan-rests.mf
@@ -9,7 +9,7 @@
 % Christian Mondrup and Mats Bengtsson.
 % 
 
-fet_begingroup("rests")
+fet_begingroup ("rests")
 
 
 %%%%%%%%
@@ -186,11 +186,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);
@@ -254,7 +254,7 @@ define_pixels (mens_block_rest_y, mens_half_block_rest_y,
 
 fet_beginchar ("Mensural maxima rest", "-3mensural");
 	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
@@ -317,7 +317,7 @@ fet_beginchar ("Mensural half rest", "1mensural");
 fet_endchar;
 
 
-mensrestsize# = .8staff_space#;
+mensrestsize# = .8 staff_space#;
 
 
 fet_beginchar ("Mensural 4th rest", "2mensural");
@@ -345,7 +345,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 +377,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#);
-- 
2.39.5