lilypond-0.1.37

diff --git a/VERSION b/VERSION
index 8cfffe87ef5140b9f5d788ab7982e7c1234d3547..f9754fe8f7498742152166cacdb53712098e4e16 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 TOPLEVEL_MAJOR_VERSION = 0
 TOPLEVEL_MINOR_VERSION = 1
-TOPLEVEL_PATCH_LEVEL = 36
+TOPLEVEL_PATCH_LEVEL = 37
 TOPLEVEL_MY_PATCH_LEVEL = 
 
 # use the above to send patches, always empty for released version:

diff --git a/mf/feta-nummer.mf b/mf/feta-nummer.mf
index 3d0f5e718bc9e59ebc0514d00f9eafac1ce4e48f..99af95c96568920ca2e6fa5cff9a8a9c9f339f1a 100644 (file)
--- a/mf/feta-nummer.mf
+++ b/mf/feta-nummer.mf
@@ -5,8 +5,8 @@ fet_begingroup("nummer")
 code := 47;
 
 define_pixels(height,thick,thick,thin,hair);
-foot_top#:=2thin#;
-foot_width#:=2thick#+thin#;
+foot_top#:=thick#;
+foot_width#:=9/4thick#/fatten;
 define_pixels(foot_top,foot_width);
 define_pixels(kuulleke);
 
@@ -38,50 +38,49 @@ def draw_foot(expr xpos) =
        z3r=z2r;
        penpos4(hair,90);
        z4l=z2l;
-       z5=(x1,hair/2);
-       fill z1..{right}z1r{down}..{right}z3l..z3r{left}..z5..{left}z4l..z4r{right}..{up}z1l{right}..z1..cycle;
+       z5=(x1,kuulleke);
+       penlabels(1,2,3,4);
+       fill z1..{right}z1r{down}..{right}z3l..z3r{left}..z5
+               ..{left}z4l..z4r{right}..{up}z1l{right}..z1..cycle;
        endgroup;
        enddef;
 
 def draw_six =
-       set_char_box(0, 2/3height#, 0, height#);
+       set_char_box(0, 2/3height#*widen, 0, height#);
        message "w:"&decimal w;
        message "h:"&decimal h;
 
        penpos1(thin,90);
-       z1=(thick,h/2+thin);
+       z1=(thick,h/2+thin-hair/2);
        penpos2(hair,90);
        z2=(w/2,y1);
-       penpos3(thick-hair,0);
-       % yup, should use the path [] "everywhere"
+       penpos3(7/8thick,0);
+       % yup, should use the path fract [] "everywhere"
        z3r=(w,1/2[0,y1]);
        penpos4(hair,-90);
        z4r=(x2,0);
-       penpos5(thick-hair,180);
+       penpos5(7/8thick,180);
        z5r=(0,y1);
        penpos6(hair,90);
-       z6r=(w-thick-hair,h);
-       penpos7(thick-hair,180);
+       z6r=(w-9/8thick*flaren,h);
+       penpos7(7/8thick,180);
        z7r=(0,h/2);
-       penpos10(thick-hair,180);
+       penpos10(7/8thick,180);
        z10r=(0,y3);
        penlabels(1,2,3,4,5,6,7,8,9,10,11);
-       save t; t=0.833;
-%      fill z5{right}..z2r{right}..z3r{down}..z4r{left}
-%              ..tension t..z7r{up}..tension t..z6r{right}
-%              ..z6l{left}..tension t..z7l{down}..z10l{up}..cycle;
+       save t; t=tense;
        fill z5{right}..z2r{right}..tension t..z3r{down}
                ..tension t..z4r{left}
                ..tension t..z7r{up}..tension t..z6r{right}
                ..z6l{left}..tension t..z7l{down}..z10l{up}..cycle;
-       draw_flare(z6r,0,-90,hair,thick);
+       draw_flare(z6r,0,-90,hair,thick*flaren);
        unfill z2l{right}..tension t..z3l{down}..tension t
                ..z4l{left}..tension t..z10l{up}..tension t..cycle;
        enddef;
 
 fet_beginchar("Numeral 0", "0", "zero")
-%      set_char_box(0, 4/5height#, 0, height#);
-       set_char_box(0, 11/15height#, 0, height#);
+%      set_char_box(0, 4/5height#*widen, 0, height#);
+       set_char_box(0, 11/15height#*widen, 0, height#);
        message "w:"&decimal w;
        message "h:"&decimal h;
        penpos1(thin,90);
@@ -93,19 +92,20 @@ fet_beginchar("Numeral 0", "0", "zero")
        penpos4(thick,180);
        z4r=(0,h/2);
        fill z1r..z2r..z3r..z4r..cycle;
-       save t; t=1.2;
-       unfill z1l..tension t..z2l..tension t..z3l..tension t..z4l..tension t..cycle;
+       save t; t=1/tense;
+       unfill z1l..tension t..z2l..tension t..z3l
+               ..tension t..z4l..tension t..cycle;
 fet_endchar;
        
 fet_beginchar("Numeral 1", "1", "one")
-%      set_char_box(0, 11/15height#, 0, height#);
-       set_char_box(0, 19/30height#, 0, height#);
+%      set_char_box(0, 19/30height#*widen, 0, height#);
+       set_char_box(0, 1/2foot_width#+3/2thick#+1/2hair#, 0, height#);
        message "w:"&decimal w;
        message "h:"&decimal h;
 
        save alpha; alpha=0;
        calc_kuulleke(thick,alpha);
-       z1=(thick+thick/2,height);
+       z1=(3/2thick,height);
 
        penpos5(thick,0);
        z5=(x1,foot_top);
@@ -120,91 +120,90 @@ fet_beginchar("Numeral 1", "1", "one")
        z9r=z8r+(thin/cosd(beta))*(0,-1);
        penlabels(1,2,3,4,5,6,7,8,9);
        save gamma; gamma=angle(length(z1r-z1),+2kuulleke);
-       fill z2r{dir(alpha-gamma)}..z4..{dir(alpha+gamma)}z3l..z3r{down}..{down}z5r{left}..z5..{left}z5l{up}..{up}z2l..cycle;
-       fill z7l{dir(beta)}..{dir(beta)}z1l..z2r..z9r{up}..z9l{dir(180+beta)}..{dir(180+beta)}z7r..cycle;
+       fill z2r{dir(alpha-gamma)}..z4..{dir(alpha+gamma)}z3l..z3r{down}
+               ..{down}z5r{left}..z5..{left}z5l{up}..{up}z2l..cycle;
+       fill z7l{dir(beta)}..{dir(beta)}z1l..z2r..z9r{up}
+               ..z9l{dir(180+beta)}..{dir(180+beta)}z7r..cycle;
        penlabels(7,8,9);
 
        draw_foot(x1);
 fet_endchar;
 
 fet_beginchar("Numeral 2", "2", "two")
-       set_char_box(0, 11/15height#, 0, height#);
+       set_char_box(0, 11/15height#*widen, 0, height#);
        message "w:"&decimal w;
        message "h:"&decimal h;
        clearxy;
-       save alpha; alpha=-50;
-       save beta; beta=75;
-       penpos1(thin,90+beta);
-       z1=(0,0)+(1/2sqrt(2)*thin)*dir(45);
-       penpos3(hair,90+beta);
+       save alpha; alpha=-45*widen;
+       save beta; beta=85;
+       save gamma; gamma=beta-10;
+       save theta; theta=20/widen;
+       penpos1(hair,90+beta);
+       z1=(0,0)+(1/2sqrt(2)*hair)*dir(45);
+       penpos3(hair,90+gamma);
        z3=(w,thick)+(1/2sqrt(2)*hair)*dir(-135);
-       penpos2(thick-hair,90+alpha);
-       x2-x1=x3-x2; y2=thick/2+hair;
+       penpos2(thick/fatten,90+alpha);
+       x2-x1=x3-x2; y2=11/16thick/widen;
        penlabels(1,2,3);
-       fill z1r{dir(beta)}..{dir(alpha)}z2r..{dir(beta)}z3r
-               ..z3l{dir(180+beta)}..{dir(180+alpha)}z2l
+       fill z1r{dir(beta)}..{dir(alpha)}z2r..{dir(gamma)}z3r
+               ..z3l{dir(180+gamma)}..{dir(180+alpha)}z2l
                ..{dir(180+beta)}z1l..cycle;
 
        penpos4(thin,90);
        z4r=(thick,2/5h);
        penpos5(thick,0);
-       z5r=(w-thin,.72h);
+       z5r=(w-thin/2,.72h);
        penpos6(thin,90);
-       z6r=(w/2-thin-hair,h);
+       z6r=(1/2hair+thick*flaren,h);
        penlabels(4,5,6);
-       fill z1l{dir(beta)}..z4l{dir(15)}..z5r{up}..
-               tension 0.9 ..          
-               z6r{left}
-               ..z6l{right}..z5l{down}..z4r{dir(180+15)}
+       save t; t=tense;
+       fill z1l{dir(beta)}..z4l{dir(theta)}..z5r{up}
+               ..tension t..z6r{left}..z6l{right}
+               ..z5l{down}..z4r{dir(180+theta)}
                ..{dir(180+beta)}z1r..cycle;
-       draw_flare(z6r,180,90,thin,thick);
+       draw_flare(z6r,180,90,thin,thick*flaren);
 fet_endchar;
 
 fet_beginchar("Numeral 3", "3", "three")
-       set_char_box(0, 2/3height#, 0, height#);
+       set_char_box(0, 2/3height#*widen, 0, height#);
        message "w:"&decimal w;
        message "h:"&decimal h;
        penpos1(hair,-90);
-       z1l=(thick+hair/2,h);
-       penpos2(thick-hair,180);
-       z2l=(w-hair,3/4h+hair/2);
+       z1l=(17/16thick,h);
+       penpos2(7/8thick,180);
+       z2l=(w-thick/8,3/4h+thick/16);
        penpos3(hair,90);
-       z3=(w/2,h/2+hair);
+       z3=(w/2,h/2+1/8thick);
        penpos4(hair,90);
-       z4=(1/2thick+hair,y3);
+       z4=(5/8thick,y3);
        penpos5(thick,0);
-       z5r=(w,1/4h+hair/2);
+       z5r=(w,1/4h+thick/16);
        penpos6(hair,-90);
-       z6r=(thick+hair,0);
+       z6r=(9/8thick,0);
        penpos7(thin+hair,90);
-       z7=(x2,y3);
+%      z7=(x2,y3);
+       z7=(x5,y3);
        penlabels(1,2,3,4,5,6,7);
        save alpha; alpha=25;
-       save t; t=0.833;
-%      fill z1l{right}..z2l{down}..z7r{dir(180+alpha)}
-%              ..z7l{dir(-alpha)}..z5r{down}..z6r{left}
-%              ..z6l{right}..tension t..z5l{up}
-%              ..tension t..z3l{left}..z4l{left}
-%              ..z4r{right}..z3r{right}..tension t..z2r{up}
-%              ..tension t..z1r{left}..cycle;
+       save t; t=tense;
        fill z1l{right}..tension t..z2l{down}..z7r{dir(180+alpha)}
                ..z7l{dir(-alpha)}..z5r{down}..tension t..z6r{left}
                ..z6l{right}..tension t..z5l{up}
                ..tension t..z3l{left}..z4l{left}
                ..z4r{right}..z3r{right}..tension t..z2r{up}
                ..tension t..z1r{left}..cycle;
-       draw_flare(z1l,180,90,hair,thick);
-       draw_flare(z6r,180,-90,hair,thick+hair);
+       draw_flare(z1l,180,90,hair,thick*flaren);
+       draw_flare(z6r,180,-90,hair,9/8thick*flaren);
 fet_endchar;
 
 fet_beginchar("Numeral 4", "4", "four")
-       set_char_box(0, 4/5height#, 0, height#);
+       set_char_box(0, 4/5height#*widen, 0, height#);
        message "w:"&decimal w;
        message "h:"&decimal h;
 
        save alpha; alpha=0;
        calc_kuulleke(3/2thick,alpha);
-       z1r=(w-3thin,height);
+       z1r=(w-3/4thick,height);
 
        z5=(thin,1/4height+thin);
        save beta; beta=angle(z3r-z5);
@@ -216,61 +215,63 @@ fet_beginchar("Numeral 4", "4", "four")
        z8r=z5;
        penlabels(1,2,3,4,5,6,7);
        save gamma; gamma=angle(length(z1r-z1),+2kuulleke);
-       fill z2r{dir(alpha-gamma)}..z4..{dir(alpha+gamma)}z3l..z3r{dir(180+beta)}..{dir(180+beta)}z8r{right}..{right}z7l..z7r{left}..{left}z6r..z8l{dir(beta)}..{up}z2l..cycle;
+       fill z2r{dir(alpha-gamma)}..z4..{dir(alpha+gamma)}z3l
+               ..z3r{dir(180+beta)}..{dir(180+beta)}z8r{right}
+               ..{right}z7l..z7r{left}..{left}z6r..z8l{dir(beta)}
+               ..{up}z2l..cycle;
 
        clearxy;
 
        save alpha; alpha=beta;
        calc_kuulleke(thick,alpha);
-       z1r=(w-3thin,height-(thin+hair)/cosd(alpha));
+       z1r=(w-3/4thick,height-(thin+1/2hair)/cosd(alpha));
 
        penpos5(thick,0);
        z5=(x1,foot_top);
        
        save gamma; gamma=angle(length(z1r-z1),+2kuulleke);
-       fill z2r{dir(alpha-gamma)}..z4..{dir(alpha+gamma)}z3l..z3r{down}..{down}z5r{left}..z5..{left}z5l{up}..{up}z2l..cycle;
+       fill z2r{dir(alpha-gamma)}..z4..{dir(alpha+gamma)}z3l
+               ..z3r{down}..{down}z5r{left}..z5..{left}z5l{up}
+               ..{up}z2l..cycle;
        penlabels(1,2,3,4,5);
 
        draw_foot(x5);
 fet_endchar;
 
 fet_beginchar("Numeral 5", "5", "five")
-       set_char_box(0, 7/10height#, 0, height#);
+       set_char_box(0, 7/10height#*widen, 0, height#);
        message "w:"&decimal w;
        message "h:"&decimal h;
        calc_kuulleke(w-thin,0);
-       z1=(w/2+thin/2,h);
+       z1=(w/2+1/8thick,h);
        save alpha; alpha=0;
        penpos5(thin,0);
-       z5l=(x1l,h-thick);
+       z5l=(x1l,h-15/16thick);
        penpos6(hair,90-45);
        z6=z5r+1/2hair*dir(-45);
        penpos7(thin,0);
-       z7l=(x1l,h/2+thin/2);
+       z7l=(x1l,h/2+thin-hair);
        penlabels(1,2,3,4,5,6,7);
        save gamma; gamma=angle(length(z1r-z1),+2kuulleke);
        fill z2r{dir(alpha-gamma)}..z4..{dir(alpha+gamma)}z3l
                ..z3r{dir(-135)}..{left}z6r..z6l{down}..z7r{down}
                ..z7l{up}..{up}z2l..cycle;
        penpos8(thin,90);
-       z8l=z7r;
-       penpos9(hair,90);
-       z9l=(x11,y7+thin+hair);
+       z8l=(x7r,y7r-1/16thick);
+       penpos9(thin,90);
+       z9=(x11+3/16thick,10/16[y5,y7]);
        penpos10(thick,0);
        z10r=(w,1/2[y9r,y11r]);
        penpos11(hair,-90);
-        z11r=(thick+hair,0);
+        z11r=(9/8thick,0);
        penlabels(8,9,10,11);
        save beta; beta=45;
-       save t; t=0.833;
-%      fill z8r{dir(beta)}..z9r{right}..z10r{down}..z11r{left}
-%              ..z11l{right}..tension t..z10l{up}..tension t
-%              ..z9l{left}..z8l{dir(180+beta)}..cycle;
+       save t; t=tense;
        fill z8r{dir(beta)}..z9r{right}..tension t..z10r{down}
                ..tension t..z11r{left}
                ..z11l{right}..tension t..z10l{up}..tension t
-               ..z9l{left}..z8l{dir(180+beta)}..cycle;
-       draw_flare(z11r,180,-90,hair,thick+hair);
+               ..z9l{left}..z8l{dir(180+beta+10)}..cycle;
+       draw_flare(z11r,180,-90,hair,9/8thick*flaren);
 fet_endchar;
 
 fet_beginchar("Numeral 6", "6", "six")
@@ -278,7 +279,7 @@ fet_beginchar("Numeral 6", "6", "six")
 fet_endchar;
 
 fet_beginchar("Numeral 7", "7", "seven")
-       set_char_box(0, 11/15height#, 0, height#);
+       set_char_box(0, 11/15height#*widen, 0, height#);
        message "w:"&decimal w;
        message "h:"&decimal h;
 
@@ -296,7 +297,7 @@ else:
 fi
        z1l=(thin,0);
 
-       save beta; beta=50;
+       save beta; beta=55;
        penpos5(thin,90+beta);
        z5=(w,h)+(1/2sqrt(2)*thin)*dir(-135);
 
@@ -309,21 +310,21 @@ fi
        penlabels(1,2,3,4,5);
 
        clearxy;
-       save alpha; alpha=-50;
-       penpos1(2thin,90);
+       save alpha; alpha=-45*widen;
+       penpos1(1/2thick,90);
        z1=(3/2thin,h-(thick+thin)/2);
        penpos3(thin,90+beta);
        z3=(w,h)+(1/2sqrt(2)*thin)*dir(-135);
-       penpos2(thick-hair,90+alpha);
-       x2-x1=x3-x2; y2=h-thick/2-hair;
+       penpos2(thick/fatten,90+alpha);
+       x2=1/2[x1,x3]-1/4thick; y2=h-15/16thick+thin*widen;
 
        penpos4(thin,0);
        z4l=(0,h-thin/2);
        penpos5(thin,0);
        z5l=(0,h/2+thin/2);
 
-       penpos6(4thin,90);
-       z6r=(thin,y1r+thin/2);
+       penpos6(9/8thick,90);
+       z6r=(thin,y1r+2/16thick);
        
        fill z1r{dir(beta)}..{dir(alpha)}z2r..{dir(beta)}z3r
                ..z3l{dir(180+beta)}..{dir(180+alpha)}z2l
@@ -333,30 +334,31 @@ fi
 fet_endchar;
 
 fet_beginchar("Numeral 8", "8", "eight")
-       set_char_box(0, 11/15height#, 0, height#);
+       set_char_box(0, 11/15height#*widen, 0, height#);
        message "w:"&decimal w;
        message "h:"&decimal h;
        save alpha; alpha=60;
        save beta; beta=alpha-15;
-       z1=(w/2,h/2+hair);
+       z1=(w/2,h/2+thick/8);
        penpos2(hair,90+180+beta);
        z2=(w/3,h/2+thin);
-       penpos3(thin+hair,0);
+       penpos3(3/2thin,0);
        z3l=(0,h/4+thin/2);
        penpos4(hair,90);
        z4l=(x1,0);
        penpos5(thick,90+90+alpha);
        z5=z1+w/4*dir(alpha-90);
        penpos6(thick,90+90+alpha);
-       z6=z1+w/4*dir(90+alpha);
+       z6=z1+(w/4-thin/2)*dir(90+alpha);
        penpos7(hair,90);
        z7r=(x1,h);
-       penpos8(thin+hair,0);
-       z8r=(w-hair,3/4h+thin/2);
+       penpos8(3/2thin,0);
+       z8r=(w-thin/2,3/4h+thin/2);
        penpos9(hair,90+180+beta);
        z9=(2/3w,h/2);
        penlabels(1,2,3,4,5,6,7,8,9);
-       save t; t=0.85;
+%      save t; t=0.85;
+       save t; t=tense;
        fill z2r{dir(180+beta)}..z3r{down}..z4r{right}
                ..z5r{dir(90+alpha)}..z6r{dir(90+alpha)}
                ..tension t..z7r{right}..z8r{down}..z9r{dir(180+beta)}

diff --git a/mf/feta-nummer10.mf b/mf/feta-nummer10.mf
index 73d46c94eee624763b37fcceb5b3fce93f1dab6a..3d0b1f0af5cdc00309f32b4baef6e72b260f8e7b 100644 (file)
--- a/mf/feta-nummer10.mf
+++ b/mf/feta-nummer10.mf
@@ -9,13 +9,18 @@ mode_setup;
 
 test:=0;
 input feta-macros;
+input feta-params;
 
 height#:=designsize;
-thick#:=7/30height#;
-thin#:=thick#/4;
-hair#:=thin#/2;
-kuulleke#:=hair#;
-%kuulleke#:=0;
+
+fatten:=1;
+widen:=1;
+flaren:=1;
+tense=0.85;
+thick#:=7/30height#*fatten;
+thin#:=thick#/4*fatten;
+hair#:=blot_diameter#;
+kuulleke#:=1/8thick#;
 
 input feta-nummer;
 

diff --git a/mf/feta-nummer4.mf b/mf/feta-nummer4.mf
index e3c4e7fafd67cd8032b69592fd6e3eed0569a277..8e9ca32cf4af24544c4c6a2f5497f488d2130697 100644 (file)
--- a/mf/feta-nummer4.mf
+++ b/mf/feta-nummer4.mf
@@ -9,14 +9,18 @@ mode_setup;
 
 test:=0;
 input feta-macros;
+input feta-params;
 
-% copied from 8; will it work?
 height#:=designsize;
-thick#:=7/30height#;
-thin#:=thick#/4;
-hair#:=thin#/2;
-kuulleke#:=hair#;
-%kuulleke#:=0;
+
+fatten:=1.15;
+widen:=1.05;
+flaren:=0.88;
+tense=0.85;
+thick#:=7/30height#*fatten;
+hair#:=blot_diameter#;
+thin#:=hair#;
+kuulleke#:=1/8thick#;
 
 input feta-nummer;
 

diff --git a/mf/feta-nummer5.mf b/mf/feta-nummer5.mf
index f366ba40300737b0382c7205327259f6a65d9a6b..2affa3ded7713c7ec44f529905dbe32d6c428f20 100644 (file)
--- a/mf/feta-nummer5.mf
+++ b/mf/feta-nummer5.mf
@@ -9,14 +9,18 @@ mode_setup;
 
 test:=0;
 input feta-macros;
+input feta-params;
 
-% copied from 4; will it work?
 height#:=designsize;
-thick#:=7/30height#;
-thin#:=thick#/4;
-hair#:=thin#/2;
-kuulleke#:=hair#;
-%kuulleke#:=0;
+
+fatten:=1.12;
+widen:=1.03;
+flaren:=0.9;
+tense=0.85;
+thick#:=7/30height#*fatten;
+hair#:=blot_diameter#;
+thin#:=hair#;
+kuulleke#:=1/8thick#;
 
 input feta-nummer;
 

diff --git a/mf/feta-nummer8.mf b/mf/feta-nummer8.mf
index d1f2caa70bb9be46592f3429b9dca08373e94290..b7c900afbfc97d10fbd2fffbcf46203f745a941f 100644 (file)
--- a/mf/feta-nummer8.mf
+++ b/mf/feta-nummer8.mf
@@ -9,14 +9,18 @@ mode_setup;
 
 test:=0;
 input feta-macros;
+input feta-params;
 
-% copied from 10; will it work?
 height#:=designsize;
-thick#:=7/30height#;
-thin#:=thick#/4;
-hair#:=thin#/2;
-kuulleke#:=hair#;
-%kuulleke#:=0;
+
+fatten:=1;
+widen:=1;
+flaren:=1;
+tense=0.85;
+thick#:=7/30height#*fatten;
+thin#:=thick#/4*fatten;
+hair#:=blot_diameter#;
+kuulleke#:=1/8thick#;
 
 input feta-nummer;