release: 1.5.32

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

diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index 24515de89e1cc222fbc44a0fe49009bdb6df2918..6eb476cc3f5d4998ab2472136904bd795b6707f8 100644 (file)
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-eindelijk.mf
@@ -4,7 +4,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 % 
-% (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 
 fet_begingroup("rests");
 
@@ -73,7 +73,7 @@ fet_beginchar( "whole rest (outside staff)", "0o", "outsidewholerest");
        y5 = y6 = 0;
        lft x5 = - b - block_rest_y;
        rt x6 = w + block_rest_y;
-       draw z5 .. z6;
+       draw_gridline(z5,z6,ledgerlinethickness);
 fet_endchar;
 
 fet_beginchar("half rest (outside staff)", "1o", "outsidehalfrest");
@@ -84,7 +84,7 @@ fet_beginchar("half rest (outside staff)", "1o", "outsidehalfrest");
        y5 = y6 = 0;
        lft x5 = - b - block_rest_y ;  
        rt x6 = w + block_rest_y;
-       draw z5 .. z6;
+       draw_gridline (z5,z6,ledgerlinethickness);
 fet_endchar;
 
 
@@ -179,7 +179,7 @@ def rest_crook(expr a, w) =
        balled_crook(a, w, ball_crook_balldiam, ball_crook_stem)
 enddef;
 
-fet_beginchar("8th rest","3","eighthrest");
+def draw_eighth_rest =
 %      draw_staff (-2, 2, 0.0);
        save yshift, ballcorrection;
        ballcorrection = 0.005 staff_space;
@@ -203,7 +203,11 @@ fet_beginchar("8th rest","3","eighthrest");
        rest_crook (z1,w-stem/6);
        z2-z1=whatever*dir70;
        y2= yshift + stem/2;
-       brush(z1,2/3stem,z2,stem);
+       brush(z1,2/3stem,z2,stem);      
+enddef;
+
+fet_beginchar("8th rest","3","eighthrest");
+       draw_eighth_rest;
 
        fet_endchar;
 
@@ -343,8 +347,14 @@ fet_beginchar("128th rest","7","hundredtwentyeighthrest");
        
        fet_endchar;
 
+fet_beginchar("Classical quarter rest","2classical","clasquartrest");
+       draw_eighth_rest;
+       currentpicture := currentpicture xscaled -1 shifted (w,0);
+       fet_endchar;
+
 endgroup;
 
+
 %%%%%%%%
 %
 %
@@ -446,101 +456,5 @@ fet_beginchar("Neo-mensural 16th rest","4neo_mensural","neomenssemifusarest")
        draw z5 .. z6;
 fet_endchar
 
-pen_width# = 2/5 staff_space#;
-pen_height# = 0;
-pen_rotation = 30;
-slight_pen_rotation = 15;
-
-mens_block_rest_y# = 1/1 staff_space#;
-mens_half_block_rest_y# = 5/8 staff_space#;
-
-define_pixels(mens_block_rest_y, mens_half_block_rest_y,
-             pen_width, pen_height);
-
-fet_beginchar("Mensural longa rest", "-2mensural", "menslongarest");
-       set_char_box(pen_width#/2, pen_width#/2,
-                    mens_block_rest_y#, mens_block_rest_y#);
-       pickup pencircle
-               xscaled pen_width
-               yscaled pen_height
-               rotated slight_pen_rotation;
-       draw (0, -mens_block_rest_y) -- (0, mens_block_rest_y);
-fet_endchar;
-
-fet_beginchar("Mensural breve rest", "-1mensural", "mensbreverest");
-       set_char_box(pen_width#/2, pen_width#/2,
-                    0, mens_block_rest_y#);
-       pickup pencircle
-               xscaled pen_width
-               yscaled pen_height
-               rotated slight_pen_rotation;
-       draw (0, 0) -- (0, mens_block_rest_y);
-fet_endchar;
-
-fet_beginchar("Mensural whole rest", "0mensural", "menssemibrevisrest");
-       set_char_box(pen_width#/2, pen_width#/2,
-                    mens_half_block_rest_y#, 0);
-       pickup pencircle
-               xscaled pen_width
-               yscaled pen_height
-               rotated slight_pen_rotation;
-       draw (0, 0) -- (0, -mens_half_block_rest_y);
-fet_endchar;
-
-fet_beginchar("Mensural half rest", "1mensural", "mensminimahalfrest");
-       set_char_box(pen_width#/2, pen_width#/2,
-                    0, mens_half_block_rest_y#);
-       pickup pencircle
-               xscaled pen_width
-               yscaled pen_height
-               rotated slight_pen_rotation;
-       draw (0, 0) -- (0, mens_half_block_rest_y);
-fet_endchar;
-
-mensrestsize# = .8staff_space#;
-
-fet_beginchar("Mensural 4th rest","2mensural","menssemiminimarest")
-       set_char_box(0,mensrestsize#,0,mensrestsize#);
-       pickup pencircle
-               xscaled pen_width
-               yscaled pen_height
-               rotated pen_rotation;
-       lft x1 =      0;     y1 = 0;
-       lft x2 =      0; top y2 = 5/8 h;
-       rt  x3 =  4/8 w; bot y3 = 6/8 h;
-       rt  x4 = 10/8 w; bot y4 = 4/8 h;
-       draw z1 -- z2 -- z3 -- z4;
-fet_endchar
-
-fet_beginchar("Mensural 8th rest","3mensural","mensfusarest")
-       set_char_box(0,mensrestsize#,0,mensrestsize#);
-       pickup pencircle
-               xscaled pen_width
-               yscaled pen_height
-               rotated pen_rotation;
-       rt  x1 = 10/8 w;     y1 = 0;
-       rt  x2 = 10/8 w; top y2 = 5/8 h;
-       lft x3 =  2/8 w; bot y3 = 6/8 h;
-       lft x4 =      0; bot y4 = 4/8 h;
-       draw z1 -- z2 -- z3 -- z4;
-fet_endchar
-
-fet_beginchar("Mensural 16th rest","4mensural","menssemifusarest")
-       set_char_box(0,mensrestsize#,0,staff_space#);
-       pickup pencircle
-               xscaled pen_width
-               yscaled pen_height
-               rotated pen_rotation;
-
-       rt  x1 = 10/8 w;     y1 = 0;
-       rt  x2 = 10/8 w; top y2 = 5.5/8 h;
-       lft x3 =  2/8 w; bot y3 = 6.5/8 h;
-       lft x4 =      0; bot y4 = 4.5/8 h;
-       rt  x5 = 10/8 w; top y5 = 2.5/8 h;
-       lft x6 =  2/8 w; bot y6 = 3.5/8 h;
-       lft x7 =      0; bot y7 = 1.5/8 h;
-       draw z1 -- z2 -- z3 -- z4;
-       draw z5 -- z6 -- z7;
-fet_endchar
 
 fet_endgroup("rests")