* mf/feta-bolletjes.mf (overdone_heads): cleanup triangle

[lilypond.git] / mf / parmesan-rests.mf

diff --git a/mf/parmesan-rests.mf b/mf/parmesan-rests.mf
index 1e1d0e6562995cf0de6f7eb46a5b4c0836066ffd..64ebf216937d0773703e244350321ba7e52a234e 100644 (file)
--- a/mf/parmesan-rests.mf
+++ b/mf/parmesan-rests.mf
@@ -1,9 +1,9 @@
-% -*-Fundamental-*-
+% -%-Fundamental-%- -*-Metafont-*-
 % parmesan-rests.mf -- implement ancient rests
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 2001--2003 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2004 Juergen Reuter <reuter@ipd.uka.de>
 % 
 % Neo-mensural rests originally by
 % Christian Mondrup and Mats Bengtsson
@@ -34,27 +34,28 @@ def neomens_half_block_rest =
        draw_block ((0,0), (neomens_block_rest_x, neomens_half_block_rest_y));
        enddef;
 
-fet_beginchar("Neo-mensural maxima rest", "-3neo_mensural", "neomensmaximarest");
-       set_char_box(0, neomens_block_rest_x#,
-                   neomens_block_rest_y#, 2 neomens_block_rest_y#);
-       draw_block ((0,-neomens_block_rest_y),
-                  (neomens_block_rest_x, 2 neomens_block_rest_y));
+fet_beginchar("Neo-mensural maxima rest", "-3neomensural", "neomensmaximarest");
+       set_char_box(0, 3 neomens_block_rest_x#,
+                    neomens_block_rest_y#, neomens_block_rest_y#);
+       draw_block ((0,-neomens_block_rest_y),
+                    (neomens_block_rest_x, neomens_block_rest_y));
+       addto currentpicture also currentpicture shifted (2 neomens_block_rest_x, 0);
 fet_endchar;
 
-fet_beginchar("Neo-mensural longa rest", "-2neo_mensural", "neomenslongarest");
-       set_char_box(0, neomens_block_rest_x#,
-                   neomens_block_rest_y#, neomens_block_rest_y#);
-       draw_block ((0,-neomens_block_rest_y),
-                  (neomens_block_rest_x, neomens_block_rest_y));
+fet_beginchar("Neo-mensural longa rest", "-2neomensural", "neomenslongarest");
+       set_char_box(0, neomens_block_rest_x#,
+                    neomens_block_rest_y#, neomens_block_rest_y#);
+       draw_block ((0,-neomens_block_rest_y),
+                   (neomens_block_rest_x, neomens_block_rest_y));
 fet_endchar;
 
-fet_beginchar("Neo-mensural breve rest", "-1neo_mensural", "neomensbreverest");
-       set_char_box(0, neomens_block_rest_x#,
-                   0, neomens_block_rest_y#);
-       draw_block ((0,0), (neomens_block_rest_x, neomens_block_rest_y));
+fet_beginchar("Neo-mensural breve rest", "-1neomensural", "neomensbreverest");
+       set_char_box(0, neomens_block_rest_x#,
+                    0, neomens_block_rest_y#);
+       draw_block ((0,0), (neomens_block_rest_x, neomens_block_rest_y));
 fet_endchar;
 
-fet_beginchar("Neo-mensural whole rest", "0neo_mensural", "neomenssemibrevisrest");
+fet_beginchar("Neo-mensural whole rest", "0neomensural", "neomenssemibrevisrest");
        set_char_box(0, neomens_block_rest_x#,
                     neomens_half_block_rest_y#,  0);
        neomens_half_block_rest;
@@ -62,7 +63,7 @@ fet_beginchar("Neo-mensural whole rest", "0neo_mensural", "neomenssemibrevisrest
                currentpicture shifted (0,- neomens_half_block_rest_y);
 fet_endchar;
 
-fet_beginchar("Neo-mensural half rest", "1neo_mensural", "neomensminimahalfrest");
+fet_beginchar("Neo-mensural half rest", "1neomensural", "neomensminimahalfrest");
        set_char_box(0, neomens_block_rest_x#,
                     0, neomens_half_block_rest_y#);
        neomens_half_block_rest;
@@ -70,7 +71,7 @@ fet_endchar;
 
 neomensrestsize# = 0.8 staff_space#;
 
-fet_beginchar("Neo-mensural 4th rest","2neo_mensural","neomenssemiminimarest")
+fet_beginchar("Neo-mensural 4th rest","2neomensural","neomenssemiminimarest")
        set_char_box(0,neomensrestsize#,0,neomensrestsize#);
         pickup pencircle scaled 2 stafflinethickness;
        lft x1 = 0;
@@ -83,7 +84,7 @@ fet_beginchar("Neo-mensural 4th rest","2neo_mensural","neomenssemiminimarest")
        draw z2 .. z3;
 fet_endchar
 
-fet_beginchar("Neo-mensural 8th rest","3neo_mensural","neomensfusarest")
+fet_beginchar("Neo-mensural 8th rest","3neomensural","neomensfusarest")
        set_char_box(0,neomensrestsize#,0,neomensrestsize#);
         pickup pencircle scaled 2 stafflinethickness;
        rt x1 = w;
@@ -96,7 +97,7 @@ fet_beginchar("Neo-mensural 8th rest","3neo_mensural","neomensfusarest")
        draw z2 .. z3;
 fet_endchar
 
-fet_beginchar("Neo-mensural 16th rest","4neo_mensural","neomenssemifusarest")
+fet_beginchar("Neo-mensural 16th rest","4neomensural","neomenssemifusarest")
        set_char_box(0,neomensrestsize#,0,staff_space#);
         pickup pencircle scaled 2 stafflinethickness;
        rt x1 = w;
@@ -142,53 +143,53 @@ define_pixels(mens_block_rest_y, mens_half_block_rest_y,
              pen_width, pen_height);
 
 fet_beginchar("Mensural maxima rest", "-3mensural", "mensmaximarest");
-       set_char_box(0.7pen_width#, 0.7pen_width#,
+       set_char_box(0, pen_width#,
                     mens_block_rest_y#, 2mens_block_rest_y#);
        pickup pencircle
                xscaled pen_width
                yscaled pen_height
                rotated slight_pen_rotation;
-       draw (0, -mens_block_rest_y) -- (0, 2 mens_block_rest_y);
+       draw (w/2, -mens_block_rest_y) -- (w/2, 2 mens_block_rest_y);
 fet_endchar;
 
 fet_beginchar("Mensural longa rest", "-2mensural", "menslongarest");
-       set_char_box(0.7pen_width#, 0.7pen_width#,
+       set_char_box(0, pen_width#,
                     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);
+       draw (w/2, -mens_block_rest_y) -- (w/2, mens_block_rest_y);
 fet_endchar;
 
 fet_beginchar("Mensural breve rest", "-1mensural", "mensbreverest");
-       set_char_box(0.7pen_width#, 0.7pen_width#,
+       set_char_box(0, pen_width#,
                     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);
+       draw (w/2, 0) -- (w/2, mens_block_rest_y);
 fet_endchar;
 
 fet_beginchar("Mensural whole rest", "0mensural", "menssemibrevisrest");
-       set_char_box(0.7pen_width#, 0.7pen_width#,
+       set_char_box(0, pen_width#,
                     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);
+       draw (w/2, 0) -- (w/2, -mens_half_block_rest_y);
 fet_endchar;
 
 fet_beginchar("Mensural half rest", "1mensural", "mensminimahalfrest");
-       set_char_box(0.7pen_width#, 0.7pen_width#,
+       set_char_box(0, pen_width#,
                     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);
+       draw (w/2, 0) -- (w/2, mens_half_block_rest_y);
 fet_endchar;
 
 mensrestsize# = .8staff_space#;