release: 0.1.50

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

diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index f97a635d11de5d445081f83e4b120fe14037baff..56c36f18a370866cf68ea078b83ee5ec6b12d383 100644 (file)
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -1,9 +1,11 @@
-% 
+% -*- Fundamental -*-  (emacs-20 mf mode mucks
 % feta-schrift.mf --  implement scripts
 % 
-% source file of the Feta (Font-En-Tja) music font
+% source file of the Feta (defintively not an abbreviation for Font-En-Tja)
+% music font
 % 
 % (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+%      Jan Nieuwenhuizen <jan@digicash.com>
 % 
 
 
@@ -11,39 +13,39 @@ fet_begingroup("scripts")
 
 
 def draw_fermata =
-       save alpha, radius, crook_thinness, crook_fatness, dot_diam;
-       
+  save alpha, radius, crook_thinness, crook_fatness, dot_diam;
+  
        % [Wanske] and some  Baerenreiter editions
        % suggest ca 80 degrees iso half-circle
-       alpha := 10;
+  alpha := 10;
 
-       radius# = 1.25 interline#;
-       crook_thinness# = 1.5stafflinethickness#;
-       crook_fatness# = 4 stafflinethickness#;
+  radius# = 1.25 interline#;
+  crook_thinness# = 1.5stafflinethickness#;
+  crook_fatness# = 4 stafflinethickness#;
 
-       radius# + crook_fatness#/2 = h#;
-       radius# + crook_thinness#/2 = w#;
-       set_char_box(w#, w#, crook_thinness#/2, h#);
-       
-       define_pixels(radius, crook_thinness, crook_fatness);
-       dot_diam = 4/3 crook_fatness;
+  radius# + crook_fatness#/2 = h#;
+  radius# + crook_thinness#/2 = w#;
+  set_char_box(w#, w#, crook_thinness#/2, h#);
+  
+  define_pixels(radius, crook_thinness, crook_fatness);
+  dot_diam = 4/3 crook_fatness;
 
 
-       penpos1(crook_thinness, 0);
-       penpos2(crook_fatness, -90);
-       z1 = (-radius,0);
-       z2 = (0, radius);
+  penpos1(crook_thinness, 0);
+  penpos2(crook_fatness, -90);
+  z1 = (-radius,0);
+  z2 = (0, radius);
 
-       fill z1l{dir (-alpha-90)}..{dir (90-alpha)}z1r..
-               {right}z2r -- z2l{left} .. cycle;
+  fill z1l{dir (-alpha-90)}..{dir (90-alpha)}z1r..
+  {right}z2r -- z2l{left} .. cycle;
 
-       addto currentpicture also 
-               currentpicture xscaled -1;
+  addto currentpicture also 
+  currentpicture xscaled -1;
 
-       pickup pencircle scaled dot_diam;
-       x4 =0;
-       bot y4 = - crook_thinness/2;
-       draw z4;
+  pickup pencircle scaled dot_diam;
+  x4 =0;
+  bot y4 = - crook_thinness/2;
+  draw z4;
 enddef;
 
 fet_beginchar("fermata up", "ufermata", "ufermata")
@@ -65,7 +67,7 @@ fet_beginchar("> accent", "sforzato", "sforzatoaccent")
        set_char_box(.9 interline#, .9 interline#, .5 interline#, .5 interline#);
        save thickness, diminish;
 
-       thickness = 2 stafflinethickness;
+       thickness = 3/2 stafflinethickness;
        pickup pencircle scaled thickness;
 
        % prevent blobs at crossing lines
@@ -371,7 +373,7 @@ fet_beginchar("Trill (`tr')","trill","trill")
        slant = .2;
 
        local_copy(transform)(currenttransform);
-       currenttransform := currenttransform slanted slant;
+       currenttransform := currenttransform slanted slant shifted (- interline, 0)  ;
 
        y1 = ascender;
        x1l = 0;
@@ -437,7 +439,7 @@ fet_beginchar("Trill (`tr')","trill","trill")
                --- z9r{up} 
                ..  z8r{left} ..  z7r{z5-z7} -- cycle;
        fill r_p;
-       set_char_box(0,2 interline#, 0,ascender#);
+       set_char_box(interline# , interline#, 0,ascender#);
 
 
        penpos11(1/4 r_fatness, -20);
@@ -452,7 +454,8 @@ fet_beginchar("Trill (`tr')","trill","trill")
        draw_bulb(-1, z13r, z13l, bulb_size * r_fatness, 1.5);
 fet_endchar;
 
-fet_beginchar("organ-heel", "pedalheel", "pedalheel")
+
+def draw_heel =
        save radius, thickness, wall;
 
        radius# := .5 interline#;
@@ -473,10 +476,21 @@ fet_beginchar("organ-heel", "pedalheel", "pedalheel")
 
        draw z1{down} .. z2{down} .. z3{left};
        addto currentpicture also currentpicture xscaled -1;
+       
+enddef;
+
+
+fet_beginchar("left heel", "upedalheel", "upedalheel")
+       draw_heel;
        labels(1,2,3);
 fet_endchar;
 
-fet_beginchar("organ-toe", "pedaltoe", "pedaltoe")
+fet_beginchar("right heel", "dpedalheel", "dpedalheel")
+       draw_heel;
+       y_mirror_char;
+fet_endchar;
+
+def draw_toe =
        save ht,wd;
 
        thickness := 1.5 stafflinethickness;
@@ -496,10 +510,41 @@ fet_beginchar("organ-toe", "pedaltoe", "pedaltoe")
 
 
        draw z1 -- z2 -- z3;
+
+enddef;
+       
+fet_beginchar("left toe", "upedaltoe", "upedaltoe")
+       draw_toe;
        labels(1,2,3);
 fet_endchar;
+fet_beginchar("right toe", "dpedaltoe", "dpedaltoe")
+       draw_toe;
+       y_mirror_char;
+fet_endchar;
 
+fet_beginchar("Flageolet", "flageolet", "flageolet")
+       save height,width,thickness;
+       height#=4/15 staffsize#;
+       width#=height#;
+       thickness#=blot_diameter#;
+       define_pixels(height,width,thickness);
+       set_char_box(width#/2,width#/2,height#/2,height#/2);
+       
+       pickup pencircle scaled thickness;
+       x1= .5 [x2, x4];
+       x1 = 0;
+       top y1=height/2;
+       rt x4  - lft x2 =width; 
+       y2 = 0;
+       y4=y2;
+       x3=x1;
+       bot y3=-height/2;
 
+       penlabels(1,2,3,4);
+       draw z1..z2..z3..z4..cycle;
+fet_endchar;
 
+input feta-slag;
 
 fet_endgroup("scripts");
+