* mf/README: Document process for proper mf2pt1 conversion.

* mf/feta-beugel.mf (draw_brace): Fix path to assure clean
overlapping.

* mf/feta-harmonica.mf: Removed.  Unused.

Formatting.

39 files changed, 252 insertions, 198 deletions

diff --git a/ChangeLog b/ChangeLog
index e7a9253226..87a6c94763 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-02  Werner Lemberg  <wl@gnu.org>
+
+	* mf/README: Document process for proper mf2pt1 conversion.
+
+	* mf/feta-beugel.mf (draw_brace): Fix path to assure clean
+	overlapping.
+
+	* mf/feta-harmonica.mf: Removed.  Unused.
+
 2005-12-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* scripts/lilypond-book.py (do_file): fix thinkos.
diff --git a/mf/README b/mf/README
index d416209af2..ab3459a731 100644
--- a/mf/README
+++ b/mf/README
@@ -1,3 +1,71 @@
 
 This is a font of music symbols.  All MF sources are original.  Most
-of the doco is in comments in the MF code.
+of the documentation is in comments in the MF code.
+
+Currently, outline fonts are created by using `autotrace', but we are
+already in the process to convert the MF code directly to PostScript code
+with a tool called `mf2pt1', which in turn calls `FontForge' to postprocess
+the output (mainly to remove outline overlaps and to add hints).
+
+The recommended calling sequence of mf2pt1 is
+
+  mf2pt1 --rounding=0.001 <font>
+
+You need mf2pt1 version 2.1 or newer.
+
+Here some guidelines to assure a clean conversion.
+
+. Never use `---'.  Replace it with `--' together with explicit path
+  directions (if necessary).
+
+. Don't use self-intersecting outlines in general since it can confuse
+  mf2pt1's algorithm to get the orientation of a closed path.  Note that
+  MetaPost's implementation of the `turningnumber' primitive (which would
+  immediately give the orientation of a path) is severely broken and not
+  fixed yet at the time of writing (November 2005), thus some hand-made code
+  in mf2pt1.mp is used to work around this bug.
+
+. If outlines intersect, avoid grazing intersections.  In case two outlines
+  intersect in an explicitly defined point, include this point into both
+  intersecting paths to avoid problems due to rounding errors.
+
+. Don't use `draw' with a polygonal pen but for straight lines (consisting
+  of exactly two points).  In most cases it is quite easy to emulate `draw'
+  with an explicit definition of the outline or with `penstroke'.
+
+. Don't apply transformations after calling `fill' -- for example, don't
+  mirror `currentpicture'.  Instead, transform the path and call `fill'
+  afterwards.  This insures that mf2pt1 gets the correct outline directions
+  which is a necessary prerequisite for FontForge's algorithm to remove
+  overlaps.
+
+
+Some design rules:
+
+. Always use smooth curve transitions.  Since this is difficult to see in
+  MetaFont proof sheets (which don't show the tangents) I recommend to call
+  mf2pt1 like this
+
+    FONTFORGE=foo mf2pt1 ...
+
+  (`foo' should be a non-existent program; this avoids the default
+  postprocessing).  Then call FontForge to inspect the outlines.
+
+. Use rounded corners.
+
+
+Finally, some rules to assure that rasterization at low resolutions give
+good results.  Today, this is a minor issue, but in some cases it might show
+design flaws.
+
+. Use `define_whole_pixels' and friends where appropriate.
+
+. Use `hround' and `vround' consistently.  A lot of auxiliary macros are
+  defined in feta-macros.mf.
+
+. If a path element is duplicated or shifted, use an integer value for the
+  offset.
+
+. Add `eps' for mirrored paths to assure correct MetaFont rasterization.
+  See the comment and the variables at the end of `feta-params.mf' for
+  details how vertical symmetry should be achieved.
diff --git a/mf/feta-arrow.mf b/mf/feta-arrow.mf
index f44ebb6aeb..efae30d6d6 100644
--- a/mf/feta-arrow.mf
+++ b/mf/feta-arrow.mf
@@ -145,7 +145,7 @@ fet_endchar;
 
 
 fet_beginchar ("close", "close.11");
-	set_char_box (.5 staff_space#, .5 staff_space# ,
+	set_char_box (.5 staff_space#, .5 staff_space#,
 		      1.0 staff_space#, 0.0 staff_space#);
 	set_arrow_paths (staff_space, 0.5 staff_space, 1.5, blot_diameter);
 	fill close_path;
@@ -156,7 +156,7 @@ fet_endchar;
 
 
 fet_beginchar ("close", "close.1M1");
-	set_char_box (.5 staff_space#, .5 staff_space# ,
+	set_char_box (.5 staff_space#, .5 staff_space#,
 		      0.0 staff_space#, 1.0 staff_space#);
 	set_arrow_paths (staff_space, 0.5 staff_space, 1.5, blot_diameter);
 	fill close_path;
diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
index 07237fbcad..04dbc2fe30 100644
--- a/mf/feta-autometric.mf
+++ b/mf/feta-autometric.mf
@@ -66,7 +66,7 @@ def autometric_parameter (expr name, value) =
 enddef;
 
 
-def autometric_output_char=
+def autometric_output_char =
 	message "@{char@:" & charnamestr
 		& "@:" & decimal charcode
 		& "@:" & decimal charbp
@@ -242,7 +242,7 @@ endgroup;
 enddef;
 
 
-def fet_endchar=
+def fet_endchar =
 	autometric_output_char;
 	breapth_endchar;
 enddef;
diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index 3d378cadf7..a671a67b03 100644
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -1,110 +1,119 @@
-% 
+%
 % feta-beugel.mf -- Staff braces
-% 
+%
 % source file of the Feta (not an acronym for Font-En-Tja)
 % pretty-but-neat music font
-% 
+%
 % (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %                Jan Nieuwenhuizen <janneke@gnu.org>
 
 input feta-autometric;
 input feta-macros;
 
-staffsize# := 20 pt#;   %% arbitrary.
+staffsize# := 20 pt#;   %% arbitrary
 
 input feta-params;
 
+%
+% We must let the design increase for each font to make sure that mftrace
+% doesn't jack up the resolution too highly for the longer braces.
+%
 
-% we must let the design increase for each
-% font to make sure that mftrace doesn't jack up the resolution too highly
-% for the longer braces.
-fet_beginfont ("feta-braces-" & char (97 + font_count), (font_count + 1) * 20,
-               "fetaBraces");
+fet_beginfont ("feta-braces-" & char (97 + font_count),
+	       (font_count + 1) * 20, "fetaBraces");
 
 mode_setup;
 
 
-
 save code, braces_per_font;
 code := 64;
 braces_per_font := 64;
 
 def draw_brace (expr height_sharp, width_sharp, slt_sharp, brace_number) =
-
-	save pendir, height, width, thin, thick, slt;
+	save pendir, height, width, thin, thick, slt, pat;
 	save penangle;
+	pair pendir;
+	path pat;
+
 	height# := height_sharp;
 	width# := width_sharp;
 	slt# := slt_sharp;
 
-%% +1  is needed because fet_beginchar increments after dumping the strings.
-fet_beginchar ("brace number " & (decimal (brace_number)),
-		"brace" & decimal(brace_number))
+	fet_beginchar ("brace number " & decimal (brace_number),
+		       "brace" & decimal (brace_number))
+		set_char_box (width#, 0, height# / 2, height# / 2);
 
-	set_char_box (width#, 0, height#/2, height#/2);
-	  
-	define_pixels (height, width, slt);
-	thin = 2 slt;
-	thick = .5 width;
+		define_pixels (height, width, slt);
+		thin = 2 slt;
+		thick = .5 width;
 	
-	z2 = .5 [z1, z3];
-	y3l = y1 + height/2;
-	x3 = x1 + width;
-	y1 =0;
-	x1 = - b;
-
-	pair pendir;
-	pendir = unitvector(x3 - x1, y3l/6 - y1);
-	penangle = angle pendir - 90;
-	penpos3(thin, penangle);
-	penpos2(thick, angle(z3 -z1) -90 );
-	penpos1(2/3 thin, penangle);
+		z2 = .5 [z1, z3];
+		y3l = y1 + height / 2;
+		x3 = x1 + width;
+		y1 = 0;
+		x1 = -b;
+		y0 = y1;
+		x0 = x1 - 2/6 thin;
+
+		pendir = unitvector (x3 - x1, y3l / 6 - y1);
+		penangle = angle pendir - 90;
+		penpos3 (thin, penangle);
+		penpos2 (thick, angle (z3 - z1) - 90);
+		penpos1 (2/3 thin, penangle);
 	
-	penlabels(1,2,3);
-	fill z2r ..  simple_serif (z3r, z3l, 90)
-		.. z2l .. simple_serif (z1l, z1r, 90) ..cycle;
-
-	addto currentpicture also currentpicture yscaled -1;
-fet_endchar;
+		penlabels (1, 2, 3);
+		labels (0);
+
+		pat = z2r
+		      .. simple_serif (z3r, z3l, 90)
+		      .. z2l
+		      .. z1l{dir (angle (z1r - z1l) - 90)}
+		      .. z0{down}
+		      -- z1r{-dir (angle (z1l - z1r) + 90)}
+		      .. cycle;
+
+		fill pat;
+		fill pat yscaled -1;
+	fet_endchar;
 enddef;
 
 
-
 save stafflinethickness;
 save increment;
 
-linethickness := 0.5pt#;
-increment := 0.5pt#;
-y := 10pt#;
+linethickness := 0.5 pt#;
+increment := 0.5 pt#;
+y := 10 pt#;
 
 for i := 0 step 1 until font_count:
-  save number;
-
-  number := braces_per_font * i;
-
-  for j := 0 step 1 until (braces_per_font -1):
-    % message "l: "&decimal l;
-    % note: define_pixels (x) multiplies x by hppp,
-    % must never get bigger than infinity
-    y := y + increment;
-    if y > infinity/hppp:
-      message "Resolution and/or magnification is too high";
-      message "HPP: "& decimal hpp &" Y: " & y;
-      error "please report to <bug-lilypond@gnu.org>";
-    fi
-
-    % x should be about one staff space, taking brace to have
-    % default height of 3 staffs, this yields height / 3 / 4 = 12
-    % but 15 looks better
-    x := y / 15;
-
-    increment := x / 10;
-    linethickness :=  min (0.5pt#, y/150);
-    if i = font_count:
-      draw_brace (y, x, linethickness, number);
-    fi
-    number := number + 1;
-  endfor;
-endfor
-  
-fet_endfont("feta-braces");
+	save number;
+
+	number := braces_per_font * i;
+
+	for j := 0 step 1 until (braces_per_font - 1):
+		% message "l: "&decimal l;
+		% note: define_pixels (x) multiplies x by hppp,
+		% must never get bigger than infinity
+		y := y + increment;
+		if y > infinity / hppp:
+			message "Resolution and/or magnification is too high";
+			message "HPP: "& decimal hpp &" Y: " & y;
+			error "please report to <bug-lilypond@gnu.org>";
+		fi;
+
+		% x should be about one staff space, taking brace to have
+		% default height of 3 staffs, this yields height / 3 / 4 = 12
+		% but 15 looks better
+		x := y / 15;
+
+		increment := x / 10;
+		linethickness :=  min (0.5 pt#, y / 150);
+		if i = font_count:
+			draw_brace (y, x, linethickness, number);
+		fi;
+
+		number := number + 1;
+	endfor;
+endfor;
+
+fet_endfont ("feta-braces");
diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index 52be8dafae..dd3df5105f 100644
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -585,8 +585,8 @@ def draw_slash (expr hwid_hash) =
 		z6 - z5 = whatever * ne;
 		z8 - z7 = whatever * ne;
 
-		z5  = z1 + whatever * ne + th * (ne rotated -90);
-		z8  = z4 + whatever * ne + th * (ne rotated 90);
+		z5 = z1 + whatever * ne + th * (ne rotated -90);
+		z8 = z4 + whatever * ne + th * (ne rotated 90);
 
 		unfill z5
 		       -- z6
diff --git a/mf/feta-braces-a.mf b/mf/feta-braces-a.mf
index d44baac6f9..2248e3647b 100644
--- a/mf/feta-braces-a.mf
+++ b/mf/feta-braces-a.mf
@@ -1,5 +1,5 @@
 % 
-% feta-braces0.mf --  256 smallest braces
+% feta-braces-a.mf --  256 smallest braces
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
diff --git a/mf/feta-braces-b.mf b/mf/feta-braces-b.mf
index cc3fd46e1d..253536e161 100644
--- a/mf/feta-braces-b.mf
+++ b/mf/feta-braces-b.mf
@@ -1,5 +1,5 @@
 % 
-% feta-braces1.mf --  next 256 braces
+% feta-braces-b.mf --  next 256 braces
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
diff --git a/mf/feta-braces-c.mf b/mf/feta-braces-c.mf
index 9dc8343c52..82caa5799a 100644
--- a/mf/feta-braces-c.mf
+++ b/mf/feta-braces-c.mf
@@ -1,5 +1,5 @@
 % 
-% feta-braces2.mf --  next 256 braces
+% feta-braces-c.mf --  next 256 braces
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
diff --git a/mf/feta-braces-d.mf b/mf/feta-braces-d.mf
index 440b1bf877..03c50dc1d4 100644
--- a/mf/feta-braces-d.mf
+++ b/mf/feta-braces-d.mf
@@ -1,5 +1,5 @@
 % 
-% feta-braces3.mf --  next 256 braces
+% feta-braces-d.mf --  next 256 braces
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
diff --git a/mf/feta-braces-e.mf b/mf/feta-braces-e.mf
index bfa112ea7a..9241458500 100644
--- a/mf/feta-braces-e.mf
+++ b/mf/feta-braces-e.mf
@@ -1,5 +1,5 @@
 % 
-% feta-braces4.mf --  next 256 braces
+% feta-braces-e.mf --  next 256 braces
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
@@ -9,5 +9,3 @@
 font_count := 4;
 input feta-beugel;
 end.
-
-
diff --git a/mf/feta-braces-f.mf b/mf/feta-braces-f.mf
index ab28784d78..49137330eb 100644
--- a/mf/feta-braces-f.mf
+++ b/mf/feta-braces-f.mf
@@ -1,5 +1,5 @@
 % 
-% feta-braces5.mf --  next 256 braces
+% feta-braces-f.mf --  next 256 braces
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
diff --git a/mf/feta-braces-g.mf b/mf/feta-braces-g.mf
index 2ff9f6386e..9f2bbb1176 100644
--- a/mf/feta-braces-g.mf
+++ b/mf/feta-braces-g.mf
@@ -1,5 +1,5 @@
 % 
-% feta-braces6.mf --  next 256 braces
+% feta-braces-g.mf --  next 256 braces
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
diff --git a/mf/feta-braces-h.mf b/mf/feta-braces-h.mf
index 6509c75edc..04b8c072f4 100644
--- a/mf/feta-braces-h.mf
+++ b/mf/feta-braces-h.mf
@@ -1,5 +1,5 @@
 % 
-% feta-braces6.mf --  next 256 braces
+% feta-braces-h.mf --  next 256 braces
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
diff --git a/mf/feta-braces-i.mf b/mf/feta-braces-i.mf
index 6a1e2b528c..c0a4cb66b1 100644
--- a/mf/feta-braces-i.mf
+++ b/mf/feta-braces-i.mf
@@ -1,5 +1,5 @@
 % 
-% feta-braces6.mf --  next 256 braces
+% feta-braces-i.mf --  next 256 braces
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
diff --git a/mf/feta-din-code.mf b/mf/feta-din-code.mf
index 599396248d..e964fb6442 100644
--- a/mf/feta-din-code.mf
+++ b/mf/feta-din-code.mf
@@ -187,7 +187,7 @@ fet_beginchar ("dynamic f", "f");
 	penpos8 (bulb_thick, 160);
 	x8l = x7l - 1/10 ex;
 
-	z7l = whatever [z8r,z8l];
+	z7l = whatever [z8r, z8l];
 
 	penpos9 (bulb_thick, 135);
 	x9r = 0.1 [x8l, x8r];
@@ -349,7 +349,7 @@ slant := ypart (dir (slant_angle));
 
 code := 111;
 
-fet_beginchar("dynamic p", "p")
+fet_beginchar ("dynamic p", "p")
 	% TODO: w really is 13/12 ex
 	%       but should do kerning
 
@@ -376,7 +376,7 @@ fet_beginchar("dynamic p", "p")
 	cheek_thick = 13/32 ex;
 	cheek_width = 0.72 ex;
 	left_serif_protude = 18/60 ex;
-	right_serif_protude= 15/60 ex;
+	right_serif_protude = 15/60 ex;
 
 	currenttransform := currenttransform slanted slant;
 
@@ -657,7 +657,7 @@ fet_beginchar ("dynamic m", "m");
 	y6l = 23/80 ex + ypart center;
 	z6l = 1.6 [z3l, z3r] + whatever * idir;
 
-	penpos7 (i_thick ,0);
+	penpos7 (i_thick, 0);
 	y7 = 0;
 	z7l = z5l + whatever * idir;
 
@@ -685,11 +685,11 @@ fet_beginchar ("dynamic r", "r");
 	save twiddle_thick, attach_len, overshoot, taille;
 	pair base_point;
 
-	set_char_box (0, .75 ex#, 0, 1ex#);
+	set_char_box (0, .75 ex#, 0, ex#);
 
 	stem_thick =.26 ex;
 	bulb_diam = .30 ex;
-	twiddle_thick= 1.1 serif_thick;
+	twiddle_thick = 1.1 serif_thick;
 	overshoot = .5 serif_thick;
 	taille = -0.3 serif_thick;
 	attach_len + bulb_diam / 2 + stem_thick = w;
diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index c5644af555..09149da22c 100644
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -1,5 +1,5 @@
 % 
-% feta-generic.mf --  implement generic stuff: include lots of files, but don't
+% feta-generic.mf -- implement generic stuff: include lots of files, but don't
 %  set dims.
 %
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
@@ -21,13 +21,14 @@ input feta-macros;
 
 input feta-params;
 
-font_x_height  staff_space#;
+font_x_height staff_space#;
 
 %% this is a fallback so we can run the font without including feta-bolletjes.
 black_notehead_width# := 1.0 staff_space#;
 
 
-fet_beginfont("feta", design_size, "fetaMusic");
+fet_beginfont ("feta", design_size, "fetaMusic");
+
 if test = 0: 
 	input feta-eindelijk;
 	input feta-toevallig;
@@ -43,16 +44,14 @@ if test = 0:
 	input feta-accordion;
 else:
 	input feta-test-generic.mf;
-
 fi
 
-autometric_parameter("staffsize", staffsize#);
-autometric_parameter("stafflinethickness", stafflinethickness#);
-autometric_parameter("staff_space", staff_space#)
-autometric_parameter("linethickness", linethickness#)
-autometric_parameter("black_notehead_width", black_notehead_width#);
-autometric_parameter("ledgerlinethickness", ledgerlinethickness#);
-autometric_parameter("blot_diameter", blot_diameter#);
+autometric_parameter ("staffsize", staffsize#);
+autometric_parameter ("stafflinethickness", stafflinethickness#);
+autometric_parameter ("staff_space", staff_space#);
+autometric_parameter ("linethickness", linethickness#);
+autometric_parameter ("black_notehead_width", black_notehead_width#);
+autometric_parameter ("ledgerlinethickness", ledgerlinethickness#);
+autometric_parameter ("blot_diameter", blot_diameter#);
 
 fet_endfont;
-
diff --git a/mf/feta-haak.mf b/mf/feta-haak.mf
index 674593cfba..fa14abac68 100644
--- a/mf/feta-haak.mf
+++ b/mf/feta-haak.mf
@@ -8,7 +8,7 @@
 
 fet_begingroup ("brackettips");
 
-def draw_bracket(expr thick_sharp, width_sharp, updown) =
+def draw_bracket (expr thick_sharp, width_sharp, updown) =
 begingroup;
 	save p, thin, thick, flattening, width, hair, flare;
  	path p;
@@ -22,7 +22,7 @@ begingroup;
 	define_pixels (thick, width, flare);
 	if updown = 1:
 	        set_char_box (0, width#,
-			      .5 thick# , flare#);
+			      .5 thick#, flare#);
 	else:
 	        set_char_box (0, width#,
 			      flare#, .5 thick#);
diff --git a/mf/feta-harmonica.mf b/mf/feta-harmonica.mf
deleted file mode 100644
index 313c001688..0000000000
--- a/mf/feta-harmonica.mf
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-fet_begingroup("balls");
-
-fet_endgroup("balls");
-
diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index 90a3a838ab..4ac2501941 100644
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -146,7 +146,7 @@ begingroup;
 	labels (1', 2', 3', 4', 5');
 
 	before := z3'{dir (turning_dir * 90)}
-		  .. z4'{-dir(0)}
+		  .. z4'{-dir (0)}
 		  ..tension 1.1.. z1'{-dir (turning_dir* 90)};
 	after := z2'{dir (turning_dir * 90)}
 		 .. end_point{dir (end_angle)};
@@ -154,7 +154,7 @@ begingroup;
 
 	pat := start_point{dir (start_angle)}
 	       .. outer_tangent_point{dir (-turning_dir * 90)}
-	       ..tension 1.02.. z5'{dir(0)}
+	       ..tension 1.02.. z5'{dir (0)}
 	       .. subpath (0, u) of before
 	       .. subpath (v, infinity) of after;
 
@@ -312,7 +312,7 @@ def draw_gclef (expr reduction) =
 	upward_swoosh_angle = 132;
 	start_angle = -97;
 
-	breapth_factor = 21.0 /14;
+	breapth_factor = 21/14;
 	inner_thick_end = 45;
 	inner_start_angle = downstroke_angle - 43;
 	thickness = .32 reduced_ss + 1.1 linethickness;
@@ -632,7 +632,7 @@ begingroup;
 
 	penpos10 (.75 [penh, penw], 170);
 	z10 = pos + .375 vx + vy;
-	penpos 11 (.8 [penh, penw], 150);
+	penpos11 (.8 [penh, penw], 150);
 	z11 = z10 - .5 vy + .04 vx;
 	penpos12 (penh, 100);
 	z12l = (xpart .5 [z13, z11], ypart pos);
diff --git a/mf/feta-macros.mf b/mf/feta-macros.mf
index fa236fd01a..fbf8cb4fb0 100644
--- a/mf/feta-macros.mf
+++ b/mf/feta-macros.mf
@@ -141,7 +141,7 @@ def make_pen_stack =
 enddef;
 
 
-def del_pen_stack=
+def del_pen_stack =
 	save save_pen_stack, pen_stack_idx;
 enddef;
 
diff --git a/mf/feta-nummer-code.mf b/mf/feta-nummer-code.mf
index 4517c8cd2e..f0ecefdce4 100644
--- a/mf/feta-nummer-code.mf
+++ b/mf/feta-nummer-code.mf
@@ -21,13 +21,13 @@ font_normal_space space#;
 %
 
 save b, h;
-4h + b = 1.15;
-10h + b = 1;
+4 h + b = 1.15;
+10 h + b = 1;
 fatten := number_design_size * h + b;
 
 save b, h;
-4h + b = 1.05;
-10h + b = 1;
+4 h + b = 1.05;
+10 h + b = 1;
 widen := number_design_size * h + b;
 
 tense = 0.85;
@@ -75,7 +75,7 @@ define_pixels (kuulleke);
 %
 %
 % move_away_to = amount left (for 2)
-% turn_to  = amount down (for  2 )
+% turn_to = amount down (for 2)
 %
 
 def number_flare_path (expr pos, alpha, beta, line, flare,
@@ -98,8 +98,8 @@ begingroup;
 	z3r = 0.5 [z2l, z2r] + 0.5 * flare * dir (alpha + beta);
 
 	penpos1 (line, 180 + beta + alpha);
-	penpos2 (flare, alpha );
-	penpos3 (flare, alpha +  beta);
+	penpos2 (flare, alpha);
+	penpos3 (flare, alpha + beta);
 
 	penlabels (1, 2, 3, 4, 5);
 
@@ -146,7 +146,7 @@ enddef;
 
 % should make generic macro?
 %
-def draw_foot(expr xpos) =
+def draw_foot (expr xpos) =
 begingroup;
 	clearxy;
 
@@ -267,14 +267,14 @@ fet_beginchar ("Plus", "plus");
 	centerx := hround (w / 2);
 	centery := vround ((h - d) / 2);
 
-	z1 = (centerx - hthick/2, -d); 
-	z2 = (centerx + hthick/2, h); 
+	z1 = (centerx - hthick / 2, -d); 
+	z2 = (centerx + hthick / 2, h); 
 
 	labels (1, 2);
 
 	draw_rounded_block (z1, z2, hthick);
-	draw_rounded_block ((0, centery - vthick/2),
-			    (w, (centery + vthick/2)),
+	draw_rounded_block ((0, centery - vthick / 2),
+			    (w, (centery + vthick / 2)),
 			    vthick);
 fet_endchar;
 
@@ -309,7 +309,7 @@ fet_beginchar ("Numeral comma", "comma");
 	fill subpath (0,3) of pat
 	     .. z0
 	     .. cycle;
-	filldraw z1l{dir(alpha)}
+	filldraw z1l{dir (alpha)}
 		 .. {up}z2
 		 -- z0{direction pos of pat}
 		 ..tension 0.95.. {dir (180 + alpha)}z1r
@@ -341,7 +341,7 @@ fet_endchar;
 
 code := 47;	% 0 = 48
 
-fet_beginchar("Numeral 0", "zero");
+fet_beginchar ("Numeral 0", "zero");
 	set_char_box (0, 11/15 height# * widen, 0, height#);
 
 	message "w:" & decimal w;
diff --git a/mf/feta-params.mf b/mf/feta-params.mf
index 64cc51b079..225f8b74e8 100644
--- a/mf/feta-params.mf
+++ b/mf/feta-params.mf
@@ -67,7 +67,7 @@ fi;
 % characters have sharp edges and corners.
 % The following variable controls the amount of `roundness'.
 %
-% %his is not a meta variable: it is related to absolute sizes.
+% This is not a meta variable: it is related to absolute sizes.
 %
 % FIXME: According to [Wanske], only outside corners should be round
 %        I don't think we do this anywhere -- jcn
diff --git a/mf/feta-pendaal.mf b/mf/feta-pendaal.mf
index 25112a3faf..205784522b 100644
--- a/mf/feta-pendaal.mf
+++ b/mf/feta-pendaal.mf
@@ -44,9 +44,9 @@ fet_beginchar ("Pedal asterisk", "*");
 
 	pickup pencircle scaled penh;
 
-	penpos 1 (bulb, 180);
-	penpos 2 (bulb, 0);
-	penpos 3 (thin, 0);
+	penpos1 (bulb, 180);
+	penpos2 (bulb, 0);
+	penpos3 (thin, 0);
 
 	z1 = z0 + (0, radius);
 	z2 = z1;
diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 9048afc5b9..845f1c72eb 100644
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -114,7 +114,7 @@ def draw_short_fermata =
 
 	pickup pencircle scaled dot_size;
 
-	x1 - 2x6 = x2;
+	x1 - 2 x6 = x2;
 	bot y6 = -d;
 
 	drawdot z6;
@@ -862,7 +862,7 @@ fet_beginchar ("Trill (`tr')", "trill");
 	penpos11 (hair_thick, -4);
 	z11r = z9r;
 
-	z13l = (x9l + r_width, y11 -  linethickness);
+	z13l = (x9l + r_width, y11 - linethickness);
 	penpos13 (r_flare, 180);
 
 	z15 = z13r - (bulb_size * r_fatness, 0);
@@ -1261,7 +1261,7 @@ def draw_arpeggio =
 	save alpha;
 	save ne, nw, se, sw;
 	save x, y;
-	pair ne,nw,se,sw;
+	pair ne, nw, se, sw;
 
 	alpha := -40;
 
diff --git a/mf/feta-test11.mf b/mf/feta-test11.mf
index 66917bb063..ad21720acc 100644
--- a/mf/feta-test11.mf
+++ b/mf/feta-test11.mf
@@ -1,17 +1,14 @@
-% feta-test11
+% feta-test11.mf
 % part of LilyPond's pretty-but-neat music font
 
 input feta-autometric;
+
 design_size := 11;
-test:=1;
+test := 1;
 
 % smoked cheese
 % test := -1;
 
-
-% dem piksels.
-%test := 1;
-
 input feta-generic;
 
 end.
diff --git a/mf/feta-test13.mf b/mf/feta-test13.mf
index be8ebb8dae..28abf42cd5 100644
--- a/mf/feta-test13.mf
+++ b/mf/feta-test13.mf
@@ -1,17 +1,14 @@
-% feta-test13
+% feta-test13.mf
 % part of LilyPond's pretty-but-neat music font
 
 input feta-autometric;
+
 design_size := 13;
-test:=1;
+test := 1;
 
 % smoked cheese
 % test := -1;
 
-
-% dem piksels.
-%test := 1;
-
 input feta-generic;
 
 
diff --git a/mf/feta-test16.mf b/mf/feta-test16.mf
index 8dd1f2da14..eaa280aa43 100644
--- a/mf/feta-test16.mf
+++ b/mf/feta-test16.mf
@@ -1,17 +1,14 @@
-% feta-test16
+% feta-test16.mf
 % part of LilyPond's pretty-but-neat music font
 
 input feta-autometric;
+
 design_size := 16;
-test:=1;
+test := 1;
 
 % smoked cheese
 % test := -1;
 
-
-% dem piksels.
-%test := 1;
-
 input feta-generic;
 
 
diff --git a/mf/feta-test20.mf b/mf/feta-test20.mf
index 5838201c5a..5a58be3dd6 100644
--- a/mf/feta-test20.mf
+++ b/mf/feta-test20.mf
@@ -1,18 +1,14 @@
-% feta-test20
+% feta-test20.mf
 % part of LilyPond's pretty-but-neat music font
 
-
 input feta-autometric;
+
 design_size := 20;
-test:=1;
+test := 1;
 
 % smoked cheese
 % test := -1;
 
-
-% dem piksels.
-%test := 1;
-
 input feta-generic;
 
 
diff --git a/mf/feta-test23.mf b/mf/feta-test23.mf
index 8dc122b741..5a25b4691c 100644
--- a/mf/feta-test23.mf
+++ b/mf/feta-test23.mf
@@ -1,18 +1,14 @@
-% feta-test23
+% feta-test23.mf
 % part of LilyPond's pretty-but-neat music font
 
-
 input feta-autometric;
+
 design_size := 23;
-test:=1;
+test := 1;
 
 % smoked cheese
 % test := -1;
 
-
-% dem piksels.
-%test := 1;
-
 input feta-generic;
 
 
diff --git a/mf/feta-test26.mf b/mf/feta-test26.mf
index 748efb8760..e9e1521834 100644
--- a/mf/feta-test26.mf
+++ b/mf/feta-test26.mf
@@ -1,19 +1,15 @@
-% feta-test26
+% feta-test26.mf
 % part of LilyPond's pretty-but-neat music font
 
 input feta-autometric;
+
 design_size := 26;
-test:=1;
+test := 1;
 
 % smoked cheese
 % test := -1;
 
-
-% dem piksels.
-%test := 1;
-
 input feta-generic;
 
 
 end.
-
diff --git a/mf/feta11.mf b/mf/feta11.mf
index de5e4dfd7c..be6a6a7e10 100644
--- a/mf/feta11.mf
+++ b/mf/feta11.mf
@@ -1,11 +1,10 @@
-% feta16.mf
+% feta11.mf
 % part of LilyPond's pretty-but-neat music font
 
-
 input feta-autometric;
 
-design_size:= 11.22;
-test:=0;
+design_size := 11.22;
+test := 0;
 
 
 input feta-generic;
diff --git a/mf/feta13.mf b/mf/feta13.mf
index 66db45b0ef..5014c12342 100644
--- a/mf/feta13.mf
+++ b/mf/feta13.mf
@@ -1,11 +1,10 @@
-% feta16.mf
+% feta13.mf
 % part of LilyPond's pretty-but-neat music font
 
 input feta-autometric;
 
 design_size := 12.60;
-
-test:=0;
+test := 0;
 
 
 input feta-generic;
diff --git a/mf/feta14.mf b/mf/feta14.mf
index 63b71fe2c6..23ac8e4d15 100644
--- a/mf/feta14.mf
+++ b/mf/feta14.mf
@@ -1,10 +1,10 @@
-
-% feta16.mf
+% feta14.mf
 % part of LilyPond's pretty-but-neat music font
 
 input feta-autometric;
+
 design_size := 14.14;
-test:=0;
+test := 0;
 
 
 input feta-generic;
diff --git a/mf/feta16.mf b/mf/feta16.mf
index 251a5c60d3..174460b715 100644
--- a/mf/feta16.mf
+++ b/mf/feta16.mf
@@ -2,8 +2,9 @@
 % part of LilyPond's pretty-but-neat music font
 
 input feta-autometric;
+
 design_size := 15.87;
-test:=0;
+test := 0;
 
 
 input feta-generic;
diff --git a/mf/feta18.mf b/mf/feta18.mf
index 4c1de34699..b52f6a3e35 100644
--- a/mf/feta18.mf
+++ b/mf/feta18.mf
@@ -1,15 +1,14 @@
-% feta23.mf
+% feta18.mf
 % part of LilyPond's pretty-but-neat music font
 
 input feta-autometric;
 
 % todo change file name
 design_size := 17.82;
-test:=0;
+test := 0;
 
 
 input feta-generic;
 
 
 end.
-
diff --git a/mf/feta20.mf b/mf/feta20.mf
index c49d776ffc..2b561b200d 100644
--- a/mf/feta20.mf
+++ b/mf/feta20.mf
@@ -12,4 +12,3 @@ input feta-generic;
 
 
 end.
-
diff --git a/mf/feta23.mf b/mf/feta23.mf
index efb7af8e45..d2cf0025e9 100644
--- a/mf/feta23.mf
+++ b/mf/feta23.mf
@@ -5,7 +5,7 @@ input feta-autometric;
 
 % todo change file name
 design_size := 22.45;
-test:=0;
+test := 0;
 
 
 input feta-generic;
diff --git a/mf/feta26.mf b/mf/feta26.mf
index 8e141de3b8..2bfa536618 100644
--- a/mf/feta26.mf
+++ b/mf/feta26.mf
@@ -2,8 +2,9 @@
 % part of LilyPond's pretty-but-neat music font
 
 input feta-autometric;
+
 design_size := 25.20;
-test:=0;
+test := 0;
 
 
 input feta-generic;