release: 1.5.29

[lilypond.git] / mf / feta-params.mf

diff --git a/mf/feta-params.mf b/mf/feta-params.mf
index ea95ec352339fc56be6c34da166b136f0ececbc6..b9c9d9924b3b191b39f0d5be0f2a450d5849c9f8 100644 (file)
--- a/mf/feta-params.mf
+++ b/mf/feta-params.mf
@@ -1,17 +1,25 @@
 
-interline#:=staffsize#/(stafflines-1);
+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.
+
+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# := 1.5 stafflinethickness#;
+ledgerlinethickness# := 2 stafflinethickness#;
 
-define_pixels(interline, stemthickness);
+define_pixels(staff_space, stemthickness);
 define_pixels(stafflinethickness,ledgerlinethickness);
 
 %
@@ -30,6 +38,14 @@ overdone_heads = 0.0;
 %
 % 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
 numeric blot_diameter;
 blot_diameter# = .4pt#;
+if (blot_diameter# * hppp) < 1:
+       blot_diameter# := 1/hppp;
+fi
+if (blot_diameter# * vppp) < 1:
+       blot_diameter# := 1/vppp;
+fi
 define_pixels(blot_diameter);