diff options
author | Karl Berry <karl@freefriends.org> | 2008-04-23 23:13:33 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-04-23 23:13:33 +0000 |
commit | 1b5a2b603c2cf0f0bb4876a2769438f6f31a8fff (patch) | |
tree | 8c5cf53f5fb82d7c360898eae35a16642a786ac8 /Master/texmf-dist/fonts | |
parent | fc7a668ac46e1b0e8c8be4fb01a809f14e11d50a (diff) |
remaining knuth 2008 updates
git-svn-id: svn://tug.org/texlive/trunk@7621 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts')
-rw-r--r-- | Master/texmf-dist/fonts/source/public/cm/calu.mf | 5 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/public/cm/greekl.mf | 10 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/public/cm/symbol.mf | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/Master/texmf-dist/fonts/source/public/cm/calu.mf b/Master/texmf-dist/fonts/source/public/cm/calu.mf index 06657b8874c..da27f63f17e 100644 --- a/Master/texmf-dist/fonts/source/public/cm/calu.mf +++ b/Master/texmf-dist/fonts/source/public/cm/calu.mf @@ -79,10 +79,11 @@ beginchar("F",13.5u#,cap_height#,0); italcorr h#*slant+.5u#; adjust_fit(-.1w#,-u#); pickup cal.nib; x1=.5w; x3=.4w; lft x4=.1w; x5=x2+.35w; x6=.7[x1,x7]; rt x7=w; -top y1=top y6=h; z2=.5[z3,z1]+1.2bend; +top y1=top y6=h; z2=.5[z3,z1]+bend; bot y3=-o; y4=.1h; y5=y2; y7=.9h; draw flex(z1,z2,z3) softjoin (z3...{x4-x3,5(y4-y3)}z4); % stem -draw z1-flourish_change{up}...(z1-(u,0))---z6...{down}z7; % upper bar +draw z1-flourish_change+(0,.15asc_height){up}...{right}(z1-(2u,0)) + ---z6...{down}z7; % upper bar draw z2--z5--z5-(0,.1cap_curve); % middle bar math_fit(0,.5ic#); labels(1,2,3,4,5,6,7); endchar; diff --git a/Master/texmf-dist/fonts/source/public/cm/greekl.mf b/Master/texmf-dist/fonts/source/public/cm/greekl.mf index c8c11585ac5..823099f2aea 100644 --- a/Master/texmf-dist/fonts/source/public/cm/greekl.mf +++ b/Master/texmf-dist/fonts/source/public/cm/greekl.mf @@ -33,10 +33,10 @@ adjust_fit(0,0); pickup fine.nib; pos0(hair,180); pos1(hair,180); pos2(vair,90); pos3(.8[hair,stem],0); pos4(vair,-90); pos5(hair,-180); pos6(vair,-270); pos7(stem,-360); pos8(vair,-450); pos9(hair,-540); -x0=x1=x9; lft x0l=hround(1.5u-.5hair); x2=x4=x6=x8=.5w-.25u; +x0=x1=x9; lft x0r=hround(1.5u-.5hair); x2=x4=x6=x8=.5w-.25u; rt x3r=hround(w-1.75u); rt x7r=hround(w-u); rt x5l=hround(x4-u); bot y0=-d; y1=top y6r=x_height; top y2r=h+oo; y3=.5[y2,y4]; -y5=.5[y4,y6]; top y6r-bot y4r=vstem+eps; bot y8=-oo; y7=y9=.55[y6,y8]; +y5=.5[y4,y6]; top y6r-bot y4r=vstem+eps; bot y8r=-oo; y7=y9=.55[y6,y8]; if y6l<y4l: y6l:=y4l:=y5; fi filldraw stroke z0e---z1e...pulled_arc.e(2,3) & pulled_arc.e(3,4)...{up}z5e; % stem and upper bowl @@ -77,7 +77,7 @@ x4=x6=.5w+.5u; top y8r=x_height+oo; z4=z8; pos6(vair,-90); pos7(stem,-180); pos8(vair,-270); pos4(stem,angle(z4-z0)+90); pos5(stem,30); z3=.5[.5[z1,z4],z0]; -y5+.1x_height=y7=.5[y6,y8]; bot y6=-oo; +y5+.1x_height=y7=.5[y6,y8]; bot y6r=-oo; lft x7r=hround(1.4u-.5stem); rt x5r=hround(w-u); filldraw stroke z1e{z0-z1e}....z2e....z3e{(z0-z1)rotated 90} ...z4e{z4e-.8[z4,z0]} @@ -221,7 +221,7 @@ filldraw circ_stroke z4e{down}...{-36u,-h}z3e; % diagonal pickup tiny.nib; pos1(stem,0); pos2(stem,0); top y1=h+min(oo,serif_drop); bot y2=0; x1=x2=x3; z=((z4{down}...{-36u,-h}z3)intersectionpoint((x2r,0)--(x2r,h))); -filldraw z1l--z2l--z--z1r--cycle; % stem +filldraw z1l--z2l...(x3,y2l)...z--z1r--cycle; % stem sloped_serif.l(1,2,a,1/3,jut,serif_drop); % upper left serif math_fit(0,ic#-1/3x_height#*slant-.5u#); penlabels(1,2,3,4); endchar; @@ -323,7 +323,7 @@ adjust_fit(0,0); pickup fine.nib; numeric light_curve; light_curve=hround(.5[stem,curve]-2stem_corr); pos1(vair,90); pos2(light_curve,180); pos3(vair,270); pos4(light_curve,360); x1=x3=.5w; lft x2r=hround(1.5u-.5light_curve); x4=w-x2; -top y1=x_height+oo; y2=y4=.5[y1,y3]; bot y3=-oo; +top y1r=x_height+oo; y2=y4=.5[y1,y3]; bot y3r=-oo; filldraw stroke pulled_arc.e(1,2) & pulled_arc.e(2,3) & pulled_arc.e(3,4) & pulled_arc.e(4,1); % bowl pos5(hair,0); pos6(hair,0); x5=x6=.5w; top y5=h; bot y6=-d-oo; diff --git a/Master/texmf-dist/fonts/source/public/cm/symbol.mf b/Master/texmf-dist/fonts/source/public/cm/symbol.mf index 7a778624069..fd59d46546d 100644 --- a/Master/texmf-dist/fonts/source/public/cm/symbol.mf +++ b/Master/texmf-dist/fonts/source/public/cm/symbol.mf @@ -119,7 +119,7 @@ y1=y2=good.y h; y3=y4; .5[y1,y3]=.5[y5,y6]=math_axis; y5=good.y .3[y1,y3]; draw z1{x5-x1,2(y5-y1)}...z5{right}...z2{x2-x5,2(y2-y5)}; % upper bar draw z3{x6-x3,2(y6-y3)}...z6{right}...z4{x4-x6,2(y4-y6)}; % lower bar -labels(1,2,3,4); endchar; +labels(1,2,3,4,5,6); endchar; cmchar "Subset or equal to sign"; compute_spread(.45x_height#,.55x_height#); |