* mf/feta-params.mf (stafflines): introduce linethickness as

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

diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index 29f381484b1f4948c07e7f09fa0d58c023ad512c..8331c955f008de6228436da2796657afb9b4b603 100644 (file)
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-eindelijk.mf
@@ -97,7 +97,7 @@ fet_beginchar("Quarter rest","2","quartrest");
        thick# := 1/4 staff_space#;
        define_blacker_pixels(thick);
 
-       rthin := 1.25 stafflinethickness;
+       rthin := 1.25 linethickness;
        rthick := 2 thick+rthin;
 
 
@@ -191,11 +191,11 @@ enddef;
 save bulb_diam, thin, thick;
 
 bulb_diam# := 0.64 staff_space#;
-thin# := 1.4 stafflinethickness# - 0.02 staff_space#;
-thick# :=  2.2 stafflinethickness#;
-crook_thin := 0.5 stafflinethickness  + 0.08 staff_space;
+thin# := 1.4 linethickness# - 0.02 staff_space#;
+thick# :=  2.2 linethickness#;
+crook_thin := 0.5 linethickness  + 0.08 staff_space;
 
-lower_brush := 1.5 stafflinethickness;
+lower_brush := 1.5 linethickness;
 
 define_pixels ( bulb_diam, thin, thick);
 
@@ -217,11 +217,11 @@ begingroup;
 
 
        z3 = z10+bulb_diam/2.15*dir(-72) ;
-       z5 = z10 + up*bulb_diam/2 + right*stafflinethickness/3;
+       z5 = z10 + up*bulb_diam/2 + right*linethickness/3;
        
        z7 = 0.5 [z4, z5] +  crook_thin * (0.45 ,0.4 ) / 1.3;
        x8 = x10-0.4bulb_diam;
-       y8 = y10 + 0.25 stafflinethickness;
+       y8 = y10 + 0.25 linethickness;
 
        z6 = whatever [z1l, z2l];
        z6 = z3 + whatever * dir(12);
@@ -254,7 +254,7 @@ def draw_eighth_rest =
 
        define_pixels (width);
        set_char_box (0, width#,
-               1.0 staff_space# + 0.5 stafflinethickness#, 0.5 staff_space# + bulb_diam#/2);
+               1.0 staff_space# + 0.5 linethickness#, 0.5 staff_space# + bulb_diam#/2);
 
        penpos1 (thick, 0);
        penpos2 (thin, 10);
@@ -263,7 +263,7 @@ def draw_eighth_rest =
        y2 = h -  lower_brush;
        x2r = width;
        z2 = z1 + whatever*dir(72);
-               z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+               z9 = z2 + 0.5 linethickness * dir (angle(z2 - z1)- 10);
        pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
        fill pat;
        
@@ -302,7 +302,7 @@ fet_beginchar("16th rest","4","sixteenthrest");
 
        define_pixels (width);
        set_char_box (0, width#,
-               2.0 staff_space# + 0.5 stafflinethickness#, 0.5 staff_space# + bulb_diam#/2);
+               2.0 staff_space# + 0.5 linethickness#, 0.5 staff_space# + bulb_diam#/2);
 
        penpos1 (thick, 0);
        penpos2 (thin, 10);
@@ -311,7 +311,7 @@ fet_beginchar("16th rest","4","sixteenthrest");
        y2 = h -  lower_brush;
        x2r = width;
        z2 = z1 + whatever*dir(74);
-               z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+               z9 = z2 + 0.5 linethickness * dir (angle(z2 - z1)- 10);
        pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
        fill pat;
        
@@ -335,7 +335,7 @@ fet_beginchar("32th rest","5","thirtysecondrest");
 
        define_pixels (width);
        set_char_box (0, width#,
-               2.0 staff_space# + 0.5 stafflinethickness#, 1.5 staff_space# + bulb_diam#/2);
+               2.0 staff_space# + 0.5 linethickness#, 1.5 staff_space# + bulb_diam#/2);
 
        penpos1 (thick, 0);
        penpos2 (thin, 10);
@@ -344,7 +344,7 @@ fet_beginchar("32th rest","5","thirtysecondrest");
        y2 = h -  lower_brush;
        x2r = width;
        z2 = z1 + whatever*dir(76);
-               z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+               z9 = z2 + 0.5 linethickness * dir (angle(z2 - z1)- 10);
        pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
        fill pat;
        
@@ -369,7 +369,7 @@ fet_beginchar("64th rest","6","sixtyfourthrest");
 
        define_pixels (width);
        set_char_box (0, width#,
-               3.0 staff_space# + 0.5 stafflinethickness#, 1.5 staff_space# + bulb_diam#/2);
+               3.0 staff_space# + 0.5 linethickness#, 1.5 staff_space# + bulb_diam#/2);
 
        penpos1 (thick, 0);
        penpos2 (thin, 10);
@@ -378,7 +378,7 @@ fet_beginchar("64th rest","6","sixtyfourthrest");
        y2 = h -  lower_brush;
        x2r = width;
        z2 = z1 + whatever*dir(78);
-               z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+               z9 = z2 + 0.5 linethickness * dir (angle(z2 - z1)- 10);
        pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
        fill pat;
        
@@ -404,7 +404,7 @@ fet_beginchar("128th rest","7","hundredtwentyeighthrest");
 
        define_pixels (width);
        set_char_box (0, width#,
-               3.0 staff_space# + 0.5 stafflinethickness#, 2.5 staff_space# + bulb_diam#/2);
+               3.0 staff_space# + 0.5 linethickness#, 2.5 staff_space# + bulb_diam#/2);
 
        penpos1 (thick, 0);
        penpos2 (thin, 10);
@@ -413,7 +413,7 @@ fet_beginchar("128th rest","7","hundredtwentyeighthrest");
        y2 = h -  lower_brush;
        x2r = width;
        z2 = z1 + whatever*dir(80);
-               z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+               z9 = z2 + 0.5 linethickness * dir (angle(z2 - z1)- 10);
        pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
        fill pat;