add modulo-bar-number-visible

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

diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index fcc12ec877df19f880e64e11f0331e246ac67a99..4da3607f7ff46678e40f9c0d2d5c4eea09c9b163 100644 (file)
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-eindelijk.mf
@@ -95,17 +95,23 @@ fet_endchar;
 
 define_pixels(breve_rest_y, breve_rest_x, multi_rest_x, multi_beam_height);
 
+fet_beginchar("maxima rest", "-3", "maximarest");
+       set_char_box(0, 3 breve_rest_x#, breve_rest_y#, breve_rest_y#);
+       draw_block ((0,-floor (breve_rest_y)), (breve_rest_x, floor (breve_rest_y)));
+       addto currentpicture also currentpicture shifted (2 breve_rest_x, 0);
+fet_endchar;
 
 fet_beginchar("longa rest", "-2", "longarest");
-       set_char_box(0, breve_rest_x#, breve_rest_y#, breve_rest_y#);
-       draw_block ((0,-floor (breve_rest_y)), (breve_rest_x, floor (breve_rest_y)));
+       set_char_box(0, breve_rest_x#, breve_rest_y#, breve_rest_y#);
+       draw_block ((0,-floor (breve_rest_y)), (breve_rest_x, floor (breve_rest_y)));
 fet_endchar;
 
 fet_beginchar("breve rest", "-1", "breverest");
-       set_char_box(0, breve_rest_x#, 0, breve_rest_y#);
-       draw_block ((0,0), (breve_rest_x, floor (breve_rest_y)));
+       set_char_box(0, breve_rest_x#, 0, breve_rest_y#);
+       draw_block ((0,0), (breve_rest_x, floor (breve_rest_y)));
 fet_endchar;
 
+
 tracingvariables := 1;
 
 fet_beginchar("Quarter rest","2","quartrest");
@@ -188,6 +194,18 @@ enddef;
 % it is closed, or even a flare.
 % 
 
+% from an email to Rune Zedeler:
+%
+% 
+% For example, the 8th rest was vaguely based on a book with trumpet
+% studies by Duhem, and by Baerenreiters cello suites. I included my
+% findings in a comment in the mf file.  One of the things that I tried
+% to do was make the rest a little lighter and narrower than the black
+% note head. I think this looks better in polyphonic music, when the
+% rest is below a head from a different voice.
+%
+%
+
 
 def draw_rest_bulb(expr ycenter, ycut, pat, stretch) =
 begingroup;
@@ -293,7 +311,7 @@ fet_beginchar("16th rest","4","sixteenthrest");
        crook_thick# := 1.8 stafflinethickness#;
        crook_thin := 1.3 stafflinethickness;
 
-       lower_brush := 2.5 stafflinethickness;
+       lower_brush := 1.5 stafflinethickness;
 
        define_pixels (width, bulb_diam, thin, thick, crook_thick);
        set_char_box (0, width#,
@@ -312,7 +330,7 @@ fet_beginchar("16th rest","4","sixteenthrest");
        
 
        draw_rest_bulb(0.5 staff_space , y2r , pat , 0.98);
-       draw_rest_bulb(-0.5 staff_space , (-0.5+0.12)*staff_space , pat , 1.02);
+       draw_rest_bulb(-0.5 staff_space , (-0.5+0.2)*staff_space , pat , 1.02);
        penlabels (1, 2);
        labels(9);
 
@@ -333,7 +351,7 @@ fet_beginchar("32th rest","5","thirtysecondrest");
        crook_thick# := 1.8 stafflinethickness#;
        crook_thin := 1.3 stafflinethickness;
 
-       lower_brush := 2.5 stafflinethickness;
+       lower_brush := 1.5 stafflinethickness;
 
        define_pixels (width, bulb_diam, thin, thick, crook_thick);
        set_char_box (0, width#,
@@ -352,8 +370,8 @@ fet_beginchar("32th rest","5","thirtysecondrest");
        
 
        draw_rest_bulb(1.5 staff_space , y2r , pat , 0.96);
-       draw_rest_bulb(0.5 staff_space , (0.5+0.12)*staff_space , pat , 1.00);
-       draw_rest_bulb(-0.5 staff_space , (-0.5+0.13)*staff_space , pat , 1.04);
+       draw_rest_bulb(0.5 staff_space , (0.5+0.2)*staff_space , pat , 1.00);
+       draw_rest_bulb(-0.5 staff_space , (-0.5+0.21)*staff_space , pat , 1.04);
        penlabels (1, 2);
        labels(9);
 
@@ -374,7 +392,7 @@ fet_beginchar("64th rest","6","sixtyfourthrest");
        crook_thick# := 1.8 stafflinethickness#;
        crook_thin := 1.3 stafflinethickness;
 
-       lower_brush := 2.5 stafflinethickness;
+       lower_brush := 1.5 stafflinethickness;
 
        define_pixels (width, bulb_diam, thin, thick, crook_thick);
        set_char_box (0, width#,
@@ -393,9 +411,9 @@ fet_beginchar("64th rest","6","sixtyfourthrest");
        
 
        draw_rest_bulb(1.5 staff_space , y2r , pat , 0.94);
-       draw_rest_bulb(0.5 staff_space , (0.5+0.12)*staff_space , pat , 0.98);
-       draw_rest_bulb(-0.5 staff_space , (-0.5+0.13)*staff_space , pat , 1.02);
-       draw_rest_bulb(-1.5 staff_space , (-1.5+0.14)*staff_space , pat , 1.06);
+       draw_rest_bulb(0.5 staff_space , (0.5+0.20)*staff_space , pat , 0.98);
+       draw_rest_bulb(-0.5 staff_space , (-0.5+0.21)*staff_space , pat , 1.02);
+       draw_rest_bulb(-1.5 staff_space , (-1.5+0.22)*staff_space , pat , 1.06);
        penlabels (1, 2);
        labels(9);
 
@@ -416,7 +434,7 @@ fet_beginchar("128th rest","7","hundredtwentyeighthrest");
        crook_thick# := 1.8 stafflinethickness#;
        crook_thin := 1.3 stafflinethickness;
 
-       lower_brush := 2.5 stafflinethickness;
+       lower_brush := 1.5 stafflinethickness;
 
        define_pixels (width, bulb_diam, thin, thick, crook_thick);
        set_char_box (0, width#,
@@ -435,10 +453,10 @@ fet_beginchar("128th rest","7","hundredtwentyeighthrest");
        
 
        draw_rest_bulb(2.5 staff_space , y2r , pat , 0.92);
-       draw_rest_bulb(1.5 staff_space , (1.5+0.12)*staff_space , pat , 0.96);
-       draw_rest_bulb(0.5 staff_space , (0.5+0.13)*staff_space , pat , 1.0);
-       draw_rest_bulb(-0.5 staff_space , (-0.5+0.14)*staff_space , pat , 1.04);
-       draw_rest_bulb(-1.5 staff_space , (-1.5+0.15)*staff_space , pat , 1.08);
+       draw_rest_bulb(1.5 staff_space , (1.5+0.20)*staff_space , pat , 0.96);
+       draw_rest_bulb(0.5 staff_space , (0.5+0.21)*staff_space , pat , 1.0);
+       draw_rest_bulb(-0.5 staff_space , (-0.5+0.22)*staff_space , pat , 1.04);
+       draw_rest_bulb(-1.5 staff_space , (-1.5+0.23)*staff_space , pat , 1.08);
        penlabels (1, 2);
        labels(9);
 
@@ -505,7 +523,7 @@ fet_beginchar("Neo-mensural half rest", "1neo_mensural", "neomensminimahalfrest"
        neomens_half_block_rest;
 fet_endchar;
 
-neomensrestsize# = .8staff_space#;
+neomensrestsize# = 0.8 staff_space#;
 
 fet_beginchar("Neo-mensural 4th rest","2neo_mensural","neomenssemiminimarest")
        set_char_box(0,neomensrestsize#,0,neomensrestsize#);