X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-params.mf;h=af82b3cc0182e8c11943293d8f4539c6e6d039a0;hb=a584f8d2d3570496acd73f7c81c4a64d29c57e00;hp=51ec99126a05757b12d1c37c54577986e10a25f4;hpb=eb51afef3e13a459b68987e975f2cf2c7bb2877c;p=lilypond.git

diff --git a/mf/feta-params.mf b/mf/feta-params.mf
index 51ec99126a..af82b3cc01 100644
--- a/mf/feta-params.mf
+++ b/mf/feta-params.mf
@@ -1,29 +1,42 @@
 
 stafflines = 5;
 
-interline#:=staffsize#/(stafflines-1);
-
 %
-%  [D.K.Roush & J.S.Gourlay] say this should be 0.072
-% We know better
-% generally, the "blackness" of most chars depends on this.
+% The design size of a staff should really be the 
+% staff_space, but we use staffsize for historical reasons.
+% 
+staff_space# = staffsize#/(stafflines-1);
+
+
+% measuring on pocket scores turns out: stafflinethickness is
+% largely independent on staff size, and generally about 0.5 pt.
 %
-stafflinethickness#:=0.1 interline#;
+% by request of WL, we tune down the blackness a little
+% for increased contrast with beams.
 
-stemthickness# := stafflinethickness#;
-ledgerlinethickness# := 1.5 stafflinethickness#;
+%% !! synchronize with paper.scm
+stafflinethickness#  = 0.3 pt# + 0.04 staff_space#; 
 
-define_pixels(interline, stemthickness);
-define_pixels(stafflinethickness,ledgerlinethickness);
+%
+% The following tunes the general blackness of the glyphs. 
+%
+linethickness# = stafflinethickness#; %%   0.5 pt#;
 
 %
-% Hand-engraved music often has balls extending above and below
-% the lines.  If you like that, modify overdone heads (unit:
-% stafflinethickness)
+% bigger puff_up_factor, relatively thicker stafflines.
+% 20 pt = puff_up_factor 0.
+% 10 pt = puff_up_factor 1
 %
+puff_up_factor =  (linethickness# - 0.1 staff_space#) / (0.1 staff_space#);
+
+
+
+stemthickness# := 1.3 stafflinethickness#;
+ledgerlinethickness# := 2 stafflinethickness#;
+
+define_pixels(staff_space, stemthickness);
+define_pixels(stafflinethickness, ledgerlinethickness, linethickness);
 
-numeric overdone_heads;
-overdone_heads = 0.0;
 
 % 
 % Because of the engraving/stamping process, no traditional
@@ -32,6 +45,18 @@ 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#;
+blot_diameter# = .35 pt#;
+if (blot_diameter# * hppp) < 1:
+	blot_diameter# := 1/hppp;
+fi
+if (blot_diameter# * vppp) < 1:
+	blot_diameter# := 1/vppp;
+fi
 define_pixels(blot_diameter);
+
+
+
+