]> git.donarmstrong.com Git - lilypond.git/blobdiff - mf/feta-schrift.mf
release: 1.1.53
[lilypond.git] / mf / feta-schrift.mf
index cec0283fcd79dee419ce84a85a6a18b337aae973..835a13c83166e70f30561ed17868b78ea08d181e 100644 (file)
@@ -1,10 +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>
+%      Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 
 
@@ -12,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")
@@ -57,6 +58,34 @@ fet_beginchar("fermata down", "dfermata", "dfermata")
        y_mirror_char;
 fet_endchar;
 
+%
+% Thumbs are used in cello music.
+% TODO : thumbs should look like the finger-font and should be placed in
+% the same way in the score.
+%
+
+fet_beginchar("Thumb", "thumb", "thumb")
+        save thin, height, width, thick;
+        height# = 5/4 width#;
+        height# = interline#;
+        thin = 1.2 stafflinethickness;
+        thick =  2 thin;
+        set_char_box(width#/2, width#/2, height#/2, height#/2);
+        
+       penpos1(thick, 0);
+        penpos2(thin, 90);
+        z1r = (w, 0);
+        z2r = (0, h);
+        penlabels(1,2);
+        penstroke z1e{up} .. {left}z2e;
+        addto currentpicture also currentpicture xscaled -1;
+        addto currentpicture also currentpicture yscaled -1;
+
+       z3 = (0, -h);
+       z4 = (0, -1.5h);
+       penlabels(3,4);
+       draw_brush(z3,1.4*thin, z4,0.9*thick);
+fet_endchar;
 
 %
 % FIXME: rounded endings
@@ -129,10 +158,10 @@ fet_endchar;
 
 fet_beginchar("portato/single tenuto", "tenuto", "tenuto")
        save thick;
-       thick# = 1.2 stafflinethickness#;
+       thick# = 1.4 stafflinethickness#;
        define_pixels(thick);
 
-       set_char_box(.9 interline#, .9 interline#, thick#/2,thick#/2);
+       set_char_box(.6 interline#, .6 interline#, thick#/2,thick#/2);
        pickup pencircle scaled thick;
        lft x1 = -b;
        rt x2 = w;
@@ -178,6 +207,7 @@ fet_beginchar("marcato down", "dmarcato", "dmarcato")
        xy_mirror_char;
 fet_endchar;
  
+
 %
 % used in french horn music todo
 %
@@ -280,7 +310,8 @@ fet_endchar;
 %
 % Inspired by a computer-set version of Auf dem Strom by Baerenreiter. 
 %
-fet_beginchar("Turn","turn","turn")
+
+def draw_turn =
        save thin, thick, ball_diam, darkness;
        save wd, ht, thick_nibangle, ball_nib_thick;
        save turndir;
@@ -290,7 +321,7 @@ fet_beginchar("Turn","turn","turn")
        ht# = 18/17 interline#;
        darkness = 1.20 stafflinethickness;
 
-       set_char_box(wd#/2, wd#/2, ht#/2, ht#/2);
+       set_char_box(wd#/2, wd#/2, ht#/2, ht#/2);       
 
        thick_nibangle = 60;
        thick = 3 darkness;
@@ -316,7 +347,6 @@ fet_beginchar("Turn","turn","turn")
        swoosh :=  z1l{curl 0} .. z2l .. z3l{up} .. {left}z4l 
          -- z4r .. z3r{down} .. z2r{left} ;
        fill swoosh .. (swoosh scaled -1) .. cycle;
-       penlabels(2,3,4);
 
        x5r = x4;
        y5r = y4l - ball_diam /2;
@@ -330,8 +360,21 @@ fet_beginchar("Turn","turn","turn")
        fill ploop scaled -1;
 
 
+enddef;
+
+fet_beginchar("Reverse turn","reverseturn","reverseturn")
+       draw_turn;
+       currentpicture := currentpicture yscaled -1;
        penlabels(5,6,7);
-       
+       penlabels(2,3,4);
+fet_endchar;
+
+
+fet_beginchar("Turn","turn","turn")
+       draw_turn;
+               
+       penlabels(5,6,7);
+       penlabels(1,2,3,4);
 fet_endchar;
 
 
@@ -372,7 +415,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;
@@ -438,7 +481,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);
@@ -453,7 +496,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#;
@@ -474,10 +518,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;
@@ -497,8 +552,17 @@ 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;
@@ -522,4 +586,120 @@ fet_beginchar("Flageolet", "flageolet", "flageolet")
        draw z1..z2..z3..z4..cycle;
 fet_endchar;
 
+fet_beginchar("Repeatsign", "repeatsign", "repeatsign")
+       set_char_box(interline#, interline#, interline#, interline#);
+
+       save dot_diam;
+       2 dot_diam# = interline# - stafflinethickness#;
+       define_pixels(dot_diam);
+
+       penpos1(dot_diam,0);
+       z1l=(-b,-d);
+       penpos2(dot_diam,0);
+       z2r=(w,h);
+       filldraw z1l--z2l{right}--z2r{down}--z1r{right}--cycle;
+        penlabels (1,2);
+
+       pickup pencircle scaled dot_diam;
+        draw (-interline/2, interline/2);
+        draw (interline/2, -interline/2);
+fet_endchar;
+
+fet_beginchar("Segno", "segno", "segno")
+       save thin, thick, ball_diam, darkness, pointheight;
+       save wd, ht, thick_nibangle, ball_nib_thick;
+       save turndir;
+       pair turndir;
+
+       ht# = 3 interline#;
+       wd# = 2 interline#;
+       darkness = 1.20 stafflinethickness;
+
+       set_char_box(wd#/2, wd#/2, ht#/2, ht#/2);       
+
+       thick_nibangle = 30;
+       thick = 3 darkness;
+       thin = darkness;
+       ball_nib_thick = 2.7 darkness;
+       ball_diam = ball_nib_thick + (w - ball_nib_thick) / 10;
+       pointheight = 2 stafflinethickness;
+       
+       y3l = h;
+       2 x3 = x2 + x4;
+       x4 = 0;
+       y4 = y2;
+       y2l = .6 h;
+       x2l = -b;
+       z1 = (0,0);
+
+       penpos1(thick, 2 thick_nibangle);
+       penpos2(thick, thick_nibangle);
+       penpos3(thin, -90);
+       penpos4(ball_nib_thick, 180-thick_nibangle);
+
+       path swoosh, ploop;
+       swoosh :=  z1l{curl 0} .. z2l .. z3l{right} .. {down}z4l 
+         -- z4r .. z3r{left} .. z2r{down} ;
+       fill swoosh .. (swoosh scaled -1) .. cycle;
+       penlabels(1,2,3,4);
+
+       y5r = y4;
+       x5r = x4l - ball_diam /2;
+       z6r = z5r;
+
+       penpos5(1.6 ball_diam/2, 100);
+       penpos6(ball_diam/2, 240);
+
+       ploop := z4l{down} .. z5l .. z6l -- cycle;
+       fill ploop;
+       fill ploop scaled -1;
+       penlabels(4,5,6);
+
+       penpos7(2 thin,0);
+       z7l=(-b,-d);
+       penpos8(2 thin,0);
+       z8r=(w,h);
+       filldraw z7l--z8l{right}--z8r{down}--z7r{right}--cycle;
+       pickup pencircle scaled 2 thin;
+       draw (-x2r,pointheight);
+       draw (x2r,-pointheight);
+fet_endchar;
+
+fet_beginchar("Coda", "coda", "coda")
+       save thin, thick, wheelwidth, wheelheight;
+       thin# = 1.2 stafflinethickness#;
+       thick# = 3.5 stafflinethickness#;
+       wheelwidth# = 2/3 interline#;
+       wheelheight# = 1 interline#;
+       define_pixels(thin, thick, wheelwidth, wheelheight);
+
+       set_char_box(wheelwidth#+thick#, wheelwidth#+thick#,
+               wheelheight#+thick#, wheelheight#+thick#);
+
+       penpos1(thick,0);
+       penpos2(thin,-90);
+       penpos3(thick,180);
+       x1l=-wheelwidth;
+       y2l=wheelheight;
+       y1=0;
+       x2=0;
+       z3 = - z1;
+       penlabels(1,2,3);
+
+       path halfwheel;
+       halfwheel := z1l{up} .. z2l{right} .. z3l{down} -- 
+               z3r{up} .. z2r{left} .. z1r{down} .. cycle;
+       fill halfwheel;
+       fill (halfwheel scaled -1);
+
+       pickup pencircle scaled thin;
+       draw (0,-h) -- (0,h);
+       draw (-w,0) -- (w,0);
+
+fet_endchar;
+
+input feta-slag;
+input feta-accordion;
+
 fet_endgroup("scripts");
+