X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-params.mf;h=2f793da49457e4186afb55dfa62df20ab8df1426;hb=35337fae20470616d5648c42a38ab75bf8efa7b9;hp=1ae189f1faf6eae6214e276040d28dd7e26db91a;hpb=460999e232e2126654185e5f5675f72cea495b13;p=lilypond.git

diff --git a/mf/feta-params.mf b/mf/feta-params.mf
index 1ae189f1fa..2f793da494 100644
--- a/mf/feta-params.mf
+++ b/mf/feta-params.mf
@@ -1,19 +1,25 @@
 
 stafflines = 5;
+% [reuter] URG!  This is not always true.  One of the effects of
+% keeping this a constant is that, for notation with less stafflines,
+% stafflinethickness gets too small.
 
-interline#:=staffsize#/(stafflines-1);
+staff_space#:=staffsize#/(stafflines-1);
+
+% URG!
+%font_x_height  staff_space# ;
 
 %
-%  [D.K.Roush & J.S.Gourlay] say this should be 0.072
+% [D.K.Roush & J.S.Gourlay] say this should be 0.072
 % We know better
-% generally, the "blackness" of most chars depends on this.
-%
-stafflinethickness#:=0.1 interline#;
+% FIXME: generally, the "blackness" of most chars depends on this.
+%        these dimensions should be independent.
+stafflinethickness#:=0.1 staff_space#;
 
 stemthickness# := stafflinethickness#;
 ledgerlinethickness# := 2 stafflinethickness#;
 
-define_pixels(interline, stemthickness);
+define_pixels(staff_space, stemthickness);
 define_pixels(stafflinethickness,ledgerlinethickness);
 
 %
@@ -32,8 +38,14 @@ overdone_heads = 0.0;
 %
 % this is not a meta variable: it is related to absolute sizes.
 %
-% According to [Wanske], only outside corners should be round
-%
+% FIXME: According to [Wanske], only outside corners should be round
+%        I don't think we do this anywhere -- jcn
 numeric blot_diameter;
-blot_diameter# = .4pt#;
+blot_diameter# = .45pt#;
+if (blot_diameter# * hppp) < 1:
+	blot_diameter# := 1/hppp;
+fi
+if (blot_diameter# * vppp) < 1:
+	blot_diameter# := 1/vppp;
+fi
 define_pixels(blot_diameter);