From 0f575cec58f9daa761e9d0b1a0d85ac858dd2a91 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 12 Dec 1997 09:54:33 +0100 Subject: [PATCH] patch::: 0.1.36.jcn1: zwaarder pl 36.jcn2 - mf numerals beautify: 2, 5, 7 --- NEWS | 3 ++ VERSION | 2 +- init/feta16.ly | 2 +- init/feta20.ly | 2 +- mf/feta-nummer.mf | 85 +++++++++++++++++++++++---------------------- mf/feta-nummer10.mf | 4 +-- mf/feta-nummer4.mf | 8 ++--- mf/feta-nummer5.mf | 5 +-- mf/feta-nummer8.mf | 1 + tex/feta16.tex | 2 +- tex/feta20.tex | 2 +- 11 files changed, 60 insertions(+), 56 deletions(-) diff --git a/NEWS b/NEWS index 961813cec7..6c64843b1e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +pl 36.jcn2 + - mf numerals beautify: 2, 5, 7 + pl 36.jcn1 - mf numerals: * small numerals wider and fatter diff --git a/VERSION b/VERSION index 5bbed96c5e..8bba2b5c9f 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ TOPLEVEL_MAJOR_VERSION = 0 TOPLEVEL_MINOR_VERSION = 1 TOPLEVEL_PATCH_LEVEL = 36 -TOPLEVEL_MY_PATCH_LEVEL = jcn1 +TOPLEVEL_MY_PATCH_LEVEL = jcn2 # use the above to send patches, always empty for released version: # please don't move these comments up; the patch should fail if diff --git a/init/feta16.ly b/init/feta16.ly index 202a9520f9..9dcbbef890 100644 --- a/init/feta16.ly +++ b/init/feta16.ly @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Mon Dec 8 17:19:17 1997 +% Automatically generated on Fri Dec 12 01:52:34 1997 % Do not edit % input from out/feta16.log % name=\symboltables { diff --git a/init/feta20.ly b/init/feta20.ly index f877973d90..6e5c7b2bef 100644 --- a/init/feta20.ly +++ b/init/feta20.ly @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Mon Dec 8 17:19:20 1997 +% Automatically generated on Fri Dec 12 01:52:57 1997 % Do not edit % input from out/feta20.log % name=\symboltables { diff --git a/mf/feta-nummer.mf b/mf/feta-nummer.mf index 1f7d4eb276..99af95c965 100644 --- a/mf/feta-nummer.mf +++ b/mf/feta-nummer.mf @@ -6,7 +6,7 @@ code := 47; define_pixels(height,thick,thick,thin,hair); foot_top#:=thick#; -foot_width#:=9/4thick#; +foot_width#:=9/4thick#/fatten; define_pixels(foot_top,foot_width); define_pixels(kuulleke); @@ -39,6 +39,7 @@ def draw_foot(expr xpos) = penpos4(hair,90); z4l=z2l; 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; @@ -67,7 +68,7 @@ def draw_six = penpos10(7/8thick,180); z10r=(0,y3); penlabels(1,2,3,4,5,6,7,8,9,10,11); - save t; t=0.833; + 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} @@ -91,7 +92,7 @@ fet_beginchar("Numeral 0", "0", "zero") penpos4(thick,180); z4r=(0,h/2); fill z1r..z2r..z3r..z4r..cycle; - save t; t=1.2; + save t; t=1/tense; unfill z1l..tension t..z2l..tension t..z3l ..tension t..z4l..tension t..cycle; fet_endchar; @@ -133,33 +134,34 @@ fet_beginchar("Numeral 2", "2", "two") 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=5/8thick/fatten; + 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=(1/2hair+thick,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; - % nice without flaren correction... - draw_flare(z6r,180,90,thin,thick); + draw_flare(z6r,180,90,thin,thick*flaren); fet_endchar; fet_beginchar("Numeral 3", "3", "three") @@ -168,21 +170,22 @@ fet_beginchar("Numeral 3", "3", "three") message "h:"&decimal h; penpos1(hair,-90); z1l=(17/16thick,h); - penpos2(thick-hair,180); + penpos2(7/8thick,180); z2l=(w-thick/8,3/4h+thick/16); penpos3(hair,90); 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+thick/16); penpos6(hair,-90); 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; + 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} @@ -200,7 +203,7 @@ fet_beginchar("Numeral 4", "4", "four") 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); @@ -221,8 +224,7 @@ fet_beginchar("Numeral 4", "4", "four") save alpha; alpha=beta; calc_kuulleke(thick,alpha); -% z1r=(w-3thin,height-(thin+hair)/cosd(alpha)); - z1r=(w-3thin,height-(thin+1/2hair)/cosd(alpha)); + z1r=(w-3/4thick,height-(thin+1/2hair)/cosd(alpha)); penpos5(thick,0); z5=(x1,foot_top); @@ -241,7 +243,7 @@ fet_beginchar("Numeral 5", "5", "five") 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-15/16thick); @@ -255,20 +257,20 @@ fet_beginchar("Numeral 5", "5", "five") ..z3r{dir(-135)}..{left}z6r..z6l{down}..z7r{down} ..z7l{up}..{up}z2l..cycle; penpos8(thin,90); - z8l=z7r; - penpos9(hair,90); - z9=(x11,1/2[y5,y7]); + 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=(9/8thick,0); penlabels(8,9,10,11); save beta; beta=45; - save t; t=0.833; + 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; + ..z9l{left}..z8l{dir(180+beta+10)}..cycle; draw_flare(z11r,180,-90,hair,9/8thick*flaren); fet_endchar; @@ -295,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); @@ -308,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-5/8thick/fatten; + 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 @@ -355,7 +357,8 @@ fet_beginchar("Numeral 8", "8", "eight") 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 0780b1adca..3d0b1f0af5 100644 --- a/mf/feta-nummer10.mf +++ b/mf/feta-nummer10.mf @@ -16,14 +16,12 @@ height#:=designsize; fatten:=1; widen:=1; flaren:=1; +tense=0.85; thick#:=7/30height#*fatten; thin#:=thick#/4*fatten; hair#:=blot_diameter#; kuulleke#:=1/8thick#; -message "thin:"&decimal(thin#); -message "blot:"&decimal(blot_diameter#); - input feta-nummer; fet_endfont("feta-nummer"); diff --git a/mf/feta-nummer4.mf b/mf/feta-nummer4.mf index 026942c4ab..8e9ca32cf4 100644 --- a/mf/feta-nummer4.mf +++ b/mf/feta-nummer4.mf @@ -15,15 +15,13 @@ height#:=designsize; fatten:=1.15; widen:=1.05; -flaren:=0.9; +flaren:=0.88; +tense=0.85; thick#:=7/30height#*fatten; -thin#:=thick#/4*fatten; hair#:=blot_diameter#; +thin#:=hair#; kuulleke#:=1/8thick#; -message "thin:"&decimal(thin#); -message "blot:"&decimal(blot_diameter#); - input feta-nummer; fet_endfont("feta-nummer"); diff --git a/mf/feta-nummer5.mf b/mf/feta-nummer5.mf index f1e6b07113..2affa3ded7 100644 --- a/mf/feta-nummer5.mf +++ b/mf/feta-nummer5.mf @@ -15,10 +15,11 @@ height#:=designsize; fatten:=1.12; widen:=1.03; -flaren:=0.92; +flaren:=0.9; +tense=0.85; thick#:=7/30height#*fatten; -thin#:=thick#/4*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 defbc7f38e..b7c900afbf 100644 --- a/mf/feta-nummer8.mf +++ b/mf/feta-nummer8.mf @@ -16,6 +16,7 @@ height#:=designsize; fatten:=1; widen:=1; flaren:=1; +tense=0.85; thick#:=7/30height#*fatten; thin#:=thick#/4*fatten; hair#:=blot_diameter#; diff --git a/tex/feta16.tex b/tex/feta16.tex index ac17e13534..c3d377ccba 100644 --- a/tex/feta16.tex +++ b/tex/feta16.tex @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Mon Dec 8 17:19:17 1997 +% Automatically generated on Fri Dec 12 01:52:34 1997 % Do not edit % input from out/feta16.log % name diff --git a/tex/feta20.tex b/tex/feta20.tex index 6f7f348949..7f21a92877 100644 --- a/tex/feta20.tex +++ b/tex/feta20.tex @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Mon Dec 8 17:19:20 1997 +% Automatically generated on Fri Dec 12 01:52:57 1997 % Do not edit % input from out/feta20.log % name -- 2.39.5