*** empty log message ***

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

diff --git a/mf/parmesan-scripts.mf b/mf/parmesan-scripts.mf
index aef297768978f84b461f1faeb178e95b4cc93c8e..6b04068e9a16ba1e19ff524acddf563688382eb5 100644 (file)
--- a/mf/parmesan-scripts.mf
+++ b/mf/parmesan-scripts.mf
@@ -3,15 +3,15 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 2002, 2003 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
 % 
 
 fet_begingroup ("scripts")
 
-fet_beginchar("ictus", "ictus", "ictus")
+fet_beginchar("ictus", "ictus")
        save ht, wd;
        ht# = .35 staff_space#;
-       wd# = stafflinethickness#;
+       wd# = linethickness#;
        define_pixels(wd, ht);
        pickup pencircle
                xscaled wd
@@ -25,8 +25,8 @@ fet_endchar;
 
 def draw_accentus =
        save thick, thin, ht, wd;
-       thin# = 1 stafflinethickness#;
-       thick# = 1.2 stafflinethickness#;
+       thin# = 1 linethickness#;
+       thick# = 1.2 linethickness#;
        ht# = .35 staff_space#;
        wd# = .25 staff_space#;
        define_pixels(wd, ht, thin, thick);
@@ -40,11 +40,11 @@ def draw_accentus =
        set_char_box(wd#/2, wd#/2, ht#/2, ht#/2);
 enddef;
 
-fet_beginchar("accentus up", "uaccentus", "uaccentus")
+fet_beginchar("accentus up", "uaccentus")
        draw_accentus;
 fet_endchar;
 
-fet_beginchar("accentus down", "daccentus", "daccentus")
+fet_beginchar("accentus down", "daccentus")
        draw_accentus;
        y_mirror_char;
 fet_endchar;
@@ -56,7 +56,7 @@ def draw_half_ellipse(expr ellips_width, ellips_height) =
        height# = ellips_height;
        define_pixels(width, height);
 
-       thin = thick = 0.6 stafflinethickness;
+       thin = thick = 0.6 linethickness;
        penpos1(thick, 0);
        penpos2(thin, -90);
        z1r = (width/2, 0);
@@ -66,27 +66,27 @@ def draw_half_ellipse(expr ellips_width, ellips_height) =
        addto currentpicture also currentpicture xscaled -1;
 enddef;
 
-fet_beginchar("half circle", "usemicirculus", "usemicirculus")
+fet_beginchar("half circle", "usemicirculus")
        draw_half_ellipse(5/16 staff_space#, 5/16 staff_space#);
        currentpicture := currentpicture yscaled -1;
        set_char_box(width#/2, width#/2, 0, height#/2);
 fet_endchar;
 
 
-fet_beginchar("half circle", "dsemicirculus", "dsemicirculus")
+fet_beginchar("half circle", "dsemicirculus")
        draw_half_ellipse(5/16 staff_space#, 5/16 staff_space#);
        set_char_box(width#/2, width#/2, height#/2, 0);
 fet_endchar;
 
 
-fet_beginchar("circle", "circulus", "circulus")
+fet_beginchar("circle", "circulus")
        draw_half_ellipse(5/16 staff_space#, 5/16 staff_space#);
        set_char_box(width#/2, width#/2, height#/2, height#/2);
        addto currentpicture also currentpicture yscaled -1;
 fet_endchar;
 
 
-fet_beginchar("augmentum", "augmentum", "augmentum")
+fet_beginchar("augmentum", "augmentum")
        save diameter;
        diameter# = 0.25 staff_space#;
        define_pixels(diameter);
@@ -100,14 +100,14 @@ def draw_signum_congruentiae =
        save za, zb, zc, zd, ze, zf, zg, zh;
        pair za, zb, zc, zd, ze, zf, zg, zh;
 
-       set_char_box(0.50 staff_space# + 1.5 stafflinethickness#,
-                    0.50 staff_space# + 1.5 stafflinethickness#,
-                    2.5 stafflinethickness#,
-                    2.00 staff_space# + 3.5 stafflinethickness#);
+       set_char_box(0.50 staff_space# + 1.5 linethickness#,
+                    0.50 staff_space# + 1.5 linethickness#,
+                    2.5 linethickness#,
+                    2.00 staff_space# + 3.5 linethickness#);
 
        pickup pencircle
-               xscaled 1.0 stafflinethickness
-               yscaled 5.0 stafflinethickness
+               xscaled 1.0 linethickness
+               yscaled 5.0 linethickness
                rotated -35;
        za = (+0.50staff_space, +2.00staff_space);
        zb = (+0.00staff_space, +2.00staff_space);
@@ -117,20 +117,18 @@ def draw_signum_congruentiae =
        zf = (+0.00staff_space, +0.00staff_space);
        draw za{-1,+1} .. zb .. zc .. zd .. ze .. zf;
 
-       pickup pencircle scaled 3.0 stafflinethickness;
+       pickup pencircle scaled 3.0 linethickness;
        zg = (-0.5staff_space, +0.0staff_space);
        zh = (+0.5staff_space, +0.0staff_space);
        drawdot zg;
        drawdot zh;
 enddef;
 
-fet_beginchar("signum congruentiae up",
-             "usignumcongruentiae", "usignumcongruentiae")
+fet_beginchar("signum congruentiae up", "usignumcongruentiae")
        draw_signum_congruentiae;
 fet_endchar;
 
-fet_beginchar("signum congruentiae down",
-             "dsignumcongruentiae", "dsignumcongruentiae")
+fet_beginchar("signum congruentiae down", "dsignumcongruentiae")
        draw_signum_congruentiae;
        xy_mirror_char;
 fet_endchar;