Cleanup of ugly MI and SOL shaped noteheads

mf/feta-noteheads.mf

 % Feta (not the Font-En-Tja) music font -- implement noteheads
 % This file is part of LilyPond, the GNU music typesetter.
 %
 % Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 % & Han-Wen Nienhuys <hanwen@xs4all.nl>
 % & Juergen Reuter <reuter@ipd.uka.de>
 %
 % 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
@@ skipping 1204 matching lines @@
                     .. rt z3 {up}
                     .. (z3 + se_dist){-se}
                     -- (z4 + se_dist){-se}
                     .. top z4 {left}
                     .. (z4 + ne_dist){-ne}
                     -- (z1 + ne_dist){-ne}
                     .. cycle;
 enddef;
 
 
-save mi_weight, mi_width;
+save mi_weight;
 mi_weight := 2;
-mi_width := 1.2;
 
 fet_beginchar ("Whole mihead", "s0mi");
-        draw_mi_head (mi_width * solfa_whole_width, mi_weight, false);
+        draw_mi_head (solfa_whole_width, mi_weight, false);
         fill path_out;
         unfill path_in;
 fet_endchar;
 
 
 fet_beginchar ("Half mihead", "s1mi");
-        draw_mi_head (mi_width * solfa_quarter_width, mi_weight, false);
+        draw_mi_head (solfa_quarter_width, mi_weight, false);
         fill path_out;
         unfill path_in;
 fet_endchar;
 
 
 fet_beginchar ("Quarter mihead", "s2mi");
-        draw_mi_head (mi_width * solfa_quarter_width, mi_weight, false);
+        draw_mi_head (solfa_quarter_width, mi_weight, false);
         fill path_out;
 fet_endchar;
 
 
 fet_beginchar ("Whole mirror mihead", "s0miMirror");
-        draw_mi_head (mi_width * solfa_whole_width, mi_weight, true);
+        draw_mi_head (solfa_whole_width, mi_weight, true);
         fill path_out;
         unfill path_in;
 fet_endchar;
 
 
 fet_beginchar ("Half  mirror mihead", "s1miMirror");
-        draw_mi_head (mi_width * solfa_quarter_width, mi_weight, true);
+        draw_mi_head (solfa_quarter_width, mi_weight, true);
         fill path_out;
         unfill path_in;
 fet_endchar;
 
 
 fet_beginchar ("Quarter mirror mihead", "s2miMirror");
-        draw_mi_head (mi_width * solfa_quarter_width, mi_weight, true);
+        draw_mi_head (solfa_quarter_width, mi_weight, true);
         fill path_out;
 fet_endchar;
 
 
 fet_beginchar ("Whole thin mihead", "s0miThin");
-        draw_mi_head (mi_width * solfa_whole_width, 1, false);
+        draw_mi_head (solfa_whole_width, 1, false);
         fill path_out;
         unfill path_in;
 fet_endchar;
 
 
 fet_beginchar ("Half thin mihead", "s1miThin");
-        draw_mi_head (mi_width * solfa_quarter_width, 1, false);
+        draw_mi_head (solfa_quarter_width, 1, false);
         fill path_out;
         unfill path_in;
 fet_endchar;
 
 
 fet_beginchar ("Quarter thin mihead", "s2miThin");
-        draw_mi_head (mi_width * solfa_quarter_width, 1, false);
+        draw_mi_head (solfa_quarter_width, 1, false);
         fill path_out;
 fet_endchar;
 
 
 %%%% fa head
 %
 % Right triangle, hypotenuse from nw to se corner.  Stem attaches on
 % vertical side in direction of horizontal side.
 %
 def draw_fa_head (expr width_factor, thickness_factor) =
@@ skipping 144 matching lines @@
 
 
 
 %%%% sol head
 %
 % Note: sol head is the same shape as a standard music head, and doesn't
 %       vary from style to style.  However, width is constant with duration,
 %       so we can't just use the standard note font.
 %
 def draw_sol_head (expr filled) =
-        draw_outside_ellipse (1.53 - puff_up_factor / 3.0, 34, 0.66, 0.17);
+        draw_outside_ellipse (1.49 - puff_up_factor / 3.0, 31, 0.707, 0);
         if not filled:
-          undraw_inside_ellipse (3.25, 33, 0.81, 2.5 stafflinethickness#);
+          undraw_inside_ellipse (2.5 - puff_up_factor / 3.0, 31, 0.707, 3.5 stafflinethickness#);

[lemzwerg, 2013/12/24 00:57:53]

Please stay in the 80-char-per-line limit.

[Carl P., 2013/12/24 01:04:19]

Does MF allow for line wrapping inside the function call?

         fi
         draw_staff_if_debugging (-2, 2);
 enddef;
 
 fet_beginchar ("Whole solhead", "s0sol");
         draw_sol_head ( false);
 fet_endchar;
 
 
 fet_beginchar ("Half solhead", "s1sol");
@@ skipping 497 matching lines @@
 fet_beginchar ("Quarter down Funk rehead", "d2reFunk");
         draw_Funk_re_head (funk_notehead_width, funk_re_weight);
         fill p_down_out;
 fet_endchar;
 
 
 %%%%%%  Funk mi head
 %       Diamond shape
 %       Has up and down shapes for all hollow notes
 %
-save funk_mi_width, funk_mi_weight;
-funk_mi_width := 1.2;
+save funk_mi_weight;
 funk_mi_weight := 1.9;
 
 fet_beginchar ("Whole up Funk mihead", "u0miFunk");
-        draw_mi_head (funk_mi_width * funk_notehead_width,
+        draw_mi_head (funk_notehead_width,
                       funk_mi_weight, false);
         fill path_out;
         unfill path_in;
 fet_endchar;
 
 
 fet_beginchar ("Whole down Funk mihead", "d0miFunk");
-        draw_mi_head (funk_mi_width * funk_notehead_width,
+        draw_mi_head (funk_notehead_width,
                       funk_mi_weight, true);
         fill path_out;
         unfill path_in;
 fet_endchar;
 
 
 fet_beginchar ("Half up Funk mihead", "u1miFunk");
-        draw_mi_head (funk_mi_width * funk_notehead_width,
+        draw_mi_head (funk_notehead_width,
                       funk_mi_weight, false);
         fill path_out;
         unfill path_in;
 fet_endchar;
 
 
 fet_beginchar ("Half down Funk mihead", "d1miFunk");
-        draw_mi_head (funk_mi_width * funk_notehead_width,
+        draw_mi_head (funk_notehead_width,
                       funk_mi_weight, true);
         fill path_out;
         unfill path_in;
 fet_endchar;
 
 
 fet_beginchar ("Quarter Funk mihead", "s2miFunk");
-        draw_mi_head (funk_mi_width * funk_notehead_width,
+        draw_mi_head (funk_notehead_width,
                       funk_mi_weight, false);
         fill path_out;
 fet_endchar;
 
 
 %%%%%%  Funk fa
 %       Triangle shape
 %       Does it rotate for whole notes?
 %       Same as other shape note systems
 %       Need special notes because of special width
@@ skipping 487 matching lines @@
         draw_Walker_re_head (funk_notehead_width, walker_re_weight);
         fill p_down_out;
 fet_endchar;
 
 
 %%%%%%  Walker mi head
 %       Diamond shape
 %       Symmetric for all hollow notes
 %
 save walker_mi_width, walker_mi_weight;
-walker_mi_width := 1.2;
+walker_mi_width := 1;
 walker_mi_weight := 1.5;
 
 fet_beginchar ("Whole Walker mihead", "s0miWalker");
         draw_mi_head (walker_mi_width * funk_notehead_width,
                       walker_mi_weight, true);
         fill path_out;
         unfill path_in;
 fet_endchar;
 
 
@@ skipping 203 matching lines @@
 
 %
 % we derive black_notehead_width# from the quarter head,
 % so we have to define black_notehead_width (pixel qty)
 % after the black_notehead_width# itself.
 %
 % Let's keep it outside the group as well.
 %
 
 define_pixels (black_notehead_width);