diff options
Diffstat (limited to 'Master/texmf-dist/fonts/source/public/cb/cbupper.mf')
-rw-r--r-- | Master/texmf-dist/fonts/source/public/cb/cbupper.mf | 858 |
1 files changed, 0 insertions, 858 deletions
diff --git a/Master/texmf-dist/fonts/source/public/cb/cbupper.mf b/Master/texmf-dist/fonts/source/public/cb/cbupper.mf deleted file mode 100644 index f9b641add03..00000000000 --- a/Master/texmf-dist/fonts/source/public/cb/cbupper.mf +++ /dev/null @@ -1,858 +0,0 @@ -% Copyright (C) 1997, 1999, 2000, 2001 Claudio Beccari -% version 2.1c 2001/02/27 -% This file is a rearrangement of code in Computer Modern's romanu.mf -% It contains definitions for Greek capitals. -% -% This rearrangement was done by Silvio Levy; I just controlled the validity -% for all the family series and shapes and introduced those simple -% "corrections" that proved necessary. -% -% Added adscript iota for capital letters A, H, W (1999/10/25 CB) -% Added dummy glyphs for the ligatures A"U, A"u, a"u (2000/02/13 CB) -% Modified capital Upsilon for Leipzig italics and CB roman (2000/07/06 CB) -% Modified capital Theta and Omega for Leipzig italics (2001/02/27 CB) - -def gen_letter = % Capital Alpha -numeric left_stem,right_stem,outer_jut,alpha; -right_stem=cap_stem-stem_corr; -left_stem=min(cap_hair if hefty: -3stem_corr fi,right_stem); -outer_jut=.8cap_jut; x1l=w-x4r=l+letter_fit+outer_jut+.5u; y1=y4=0; -x2-x1=x4-x3; x3r=x2r+apex_corr; y2=y3=h+apex_o+apex_oo; -alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr); -penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); -penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); -z0=whatever[z1r,z2r]=whatever[z3l,z4l]; -if y0<h-cap_notch_cut: y0:=h-cap_notch_cut; - fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r) - --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} - ...{up}z0+.5left--cycle; % left and right diagonals -else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) - --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals -penpos5(whatever,angle(z2-z1)); z5=whatever[z1,z2]; -penpos6(whatever,angle(z3-z4)); z6=whatever[z3,z4]; y6=y5; -if hefty: y5r else: y5 fi =5/12y0; -y5r-y5l=y6r-y6l=cap_band; penstroke z5e--z6e; % bar line -if serifs: numeric inner_jut; pickup tiny.nib; - prime_points_inside(1,2); prime_points_inside(4,3); - if rt x1'r+cap_jut+.5u+1<=lft x4'l-cap_jut: inner_jut=cap_jut; - else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi - dish_serif(1',2,a,1/2,outer_jut,b,.6,inner_jut)(dark); % left serif - dish_serif(4',3,c,1/2,inner_jut,d,1/3,outer_jut); fi % right serif - numeric pos_stem; %Iota reference - pos_stem:=rt x4r if serifs:+outer_jut-.5slab fi+.5(tiny+stem)+u; -enddef; - -cmchar "Uppercase alpha"; -beginchar("A",13u#,cap_height#,0); -adjust_fit(cap_serif_fit#,cap_serif_fit#); -gen_letter; -penlabels(0,1,2,3,4,5,6); endchar; - -cmchar "Uppercase alpha with adscript iota"; -beginchar(oct"011",13u#,cap_height#,0); -adjust_fit(cap_serif_fit#,cap_serif_fit#+stem#+.7jut#+1.2u#+.5tiny# if monospace:+1.3tiny# fi); -gen_letter; Iota_sub(pos_stem); -penlabels(0,1,2,3,4,5,6,51,52); endchar; - -cmchar "Uppercase alpha with right phantom diaeresis";% The diaeresis is not actually there -beginchar(oct"014",13u#,cap_height#,0); % this glyph is just for kerning with -adjust_fit(cap_serif_fit#,cap_serif_fit#); % uppercase upsilon with diaeresis -gen_letter; -endchar; - -% This is why we define here a variable AUkern that will be used also for left shifting -% a copy of uppercase upsilon with diaersis to be used with the above Adiaeresis glyph; -% the idea is that the ligkern table specifies the correct ammount of negative kern when -% A is followed by Udiaeresis (which is possible only by inputting text with a Greek -% keyboard and the iso-8859-7 input encoding), but fails when Greek text is input with -% a Latin keyboard, because in this case the sequence A"U cannot operate; in facts the kern -% between A and " cannot be inserted if it is still unknown if the next character will -% be U or I. In order to deal with such situation it would be necessary a ligkern command -% that involves three adiacent characters; up to now (2000/02/13) this command is missing -% from METAFONT. - -numeric AUkern,AUkern#; -if cbleipzig: AUkern:=2u; AUkern#:=2u#; -else: AUkern:=2.5u; AUkern#:=2.5u#; -fi - -cmchar "Uppercase beta"; -beginchar("B",12.5u#,cap_height#,0); -italcorr .75cap_height#*slant-.5u#; -adjust_fit(cap_serif_fit#,0); -numeric left_stem,right_curve,middle_weight; -left_stem=cap_stem-hround 2stem_corr; middle_weight=.6vair+.5; -pickup tiny.nib; pos1(left_stem,0); pos2(left_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5left_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -penpos3(cap_band,90); penpos4(cap_band,90); -penpos6(middle_weight,-90); penpos7(middle_weight,-90); -penpos8(middle_weight,90); penpos9(middle_weight,90); -penpos5(right_curve-stem_corr,0); penpos10(right_curve,0); -penpos11(cap_band,-90); penpos12(cap_band,-90); -z3r=top z1; y4=y3; y5=.5[y4,y6]; y6=y7; y7l-y8l=vair; -z12r=bot z2; y11=y12; y10=.5[y11,y9]; y8=y9; .5[y7l,y8l]=.52h; -x4=x6; x9=x11=x4+.5u; x7=x8=x1; x9l:=x4+.25u; -x5r=hround(w-1.5u); x10r=hround(w-u); -if serifs: right_curve=cap_curve-stem_corr; x4=.5[x1,w-1.5u]; -else: right_curve=cap_curve-3stem_corr; x4=.5[x1,w-2.5u]; - x4l:=x4l-.5u; x9l:=x9l-.5u; fi -x6l:=x6l-.5u; x11l:=x11l-.5u; -fill stroke z3e..super_arc.e(4,5) & super_arc.e(5,6)..z7e; % upper lobe -fill stroke z8e..super_arc.e(9,10) & super_arc.e(10,11)..z12e; % lower lobe -if serifs: dish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif - dish_serif(2,1,c,1/3,cap_jut,d,1/3,.5cap_jut); fi % lower serif -math_fit(0,.5ic#); penlabels(1,2,3,4,5,6,7,8,9,10,11,12); endchar; - -cmchar "Uppercase epsilon"; -beginchar("E",12u#-width_adj#,cap_height#,0); -italcorr cap_height#*slant-beak_jut#-.5u#; -adjust_fit(cap_serif_fit#,0); -h:=vround(h-stem_corr); -pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -pickup crisp.nib; pos3(slab,90); pos4(hair,0); -top y3r=h; x3=x1; rt x4r=hround(w-u); y4=good.y(y3l-beak)-eps; -arm(3,4,e,beak_darkness,beak_jut); % upper arm and beak -pos5(cap_bar,-90); pos6(hair,0); -top y5l=vround(.52[y2,y1]+.5cap_bar); x5=x1; -pos0(cap_bar,90); pos7(hair,0); -z0=z5; x6=x7; y6-y5l=y0l-y7; -if serifs: rt x6r=hround(w-4.4u+.5hair); y6=good.y(y5l+.6beak)+eps; - rt x9r=hround(w-.5u); -else: rt x6r=hround(w-1.5u); y6=y5l+eps; rt x9r=hround(w-.75u); fi -arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0); % middle arm and serif -pos8(slab if not serifs:+2stem_corr fi,-90); pos9(hair,0); -bot y8r=0; x8=x2; y9=good.y(y8l+7/6beak)+eps; -arm(8,9,h,beak_darkness,1.5beak_jut); % lower arm and beak -if serifs: dish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif - dish_serif(2,1,c,1/3,cap_jut,d,1/3,.5cap_jut); fi % lower serif -math_fit(0,.5ic#); penlabels(0,1,2,3,4,5,6,7,8,9); endchar; - - -def gen_letter = % Capital Eta -pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); -pos3(cap_stem,0); pos4(cap_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); x3=x4=w-x1; -top y1=top y3=h; bot y2=bot y4=0; -filldraw stroke z1e--z2e; % left stem -filldraw stroke z3e--z4e; % right stem -penpos5(cap_bar,90); penpos6(cap_bar,90); -x5=x1; x6=x3; y5=y6=.52h; -fill stroke z5e--z6e; % bar -if serifs: numeric inner_jut; - if rt x1r+cap_jut+.5u+1<=lft x3l-cap_jut: inner_jut=cap_jut; - else: rt x1r+inner_jut+.5u+1=lft x3l-inner_jut; fi - dish_serif(1,2,a,1/3,cap_jut,b,1/3,inner_jut); % upper left serif - dish_serif(2,1,c,1/3,cap_jut,d,1/3,inner_jut); % lower left serif - dish_serif(3,4,e,1/3,inner_jut,f,1/3,cap_jut); % upper left serif - dish_serif(4,3,g,1/3,inner_jut,h,1/3,cap_jut); fi % lower left serif - numeric pos_stem; %Iota reference - pos_stem:=rt x4r if serifs:+cap_jut fi+.5(stem+tiny)+u; -enddef; - - - -cmchar "Uppercase eta"; -beginchar("H",13u#+width_adj#,cap_height#,0); -italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); -adjust_fit(cap_serif_fit#,cap_serif_fit#); -gen_letter; -math_fit(0,.5ic#); penlabels(1,2,3,4,5,6); endchar; - -cmchar "Uppercase eta with adscript Iota"; -beginchar(oct"012",13u#+width_adj#,cap_height#,0); -italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); -adjust_fit(cap_serif_fit#,cap_serif_fit#+stem#+.7jut#+1.2u# if monospace:+1.6tiny# fi); -gen_letter; Iota_sub(pos_stem); -math_fit(0,.5ic#); penlabels(1,2,3,4,5,6,51,52); endchar; - - -cmchar "Uppercase iota with diaeresis"; -beginchar(oct"333",max(6u#,4u#+cap_stem#),cap_height#,0); -italcorr cap_height#*slant-.25u#; -adjust_fit(cap_serif_fit#,cap_serif_fit#); -pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); -lft x1l=lft x2l=hround(.5w-.5cap_stem); -numeric iota_h; iota_h=cap_height; -top y1=iota_h ; bot y2=0; -filldraw stroke z1e--z2e; % stem -if serifs: - dish_serif(1,2,a,1/3,1.05cap_jut,b,1/3,1.05cap_jut); % upper serif - dish_serif(2,1,c,1/3,1.05cap_jut,d,1/3,1.05cap_jut); % lower serif -elseif slitex: - dish_serif(1,2,a,1/3,1.05u,b,1/3,1.05u); % upper serif - dish_serif(2,1,c,1/3,1.05u,d,1/3,1.05u); % lower serif -fi -generate_diaeresis(.5w,dot_size,dot_size+4/5cap_stem,h+separator+dot_size,iota_h+separator); -math_fit(0,.5ic#); penlabels(1,2); endchar; - - - - - -cmchar "Uppercase iota"; -beginchar("I",max(6u#,4u#+cap_stem#),cap_height#,0); -italcorr cap_height#*slant-.25u#; -adjust_fit(cap_serif_fit#,cap_serif_fit#); -pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); -lft x1l=lft x2l=hround(.5w-.5cap_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -if serifs: - dish_serif(1,2,a,1/3,1.05cap_jut,b,1/3,1.05cap_jut); % upper serif - dish_serif(2,1,c,1/3,1.05cap_jut,d,1/3,1.05cap_jut); % lower serif -else: - if slitex: - dish_serif(1,2,a,1/3,1.05u,b,1/3,1.05u); % upper serif - dish_serif(2,1,c,1/3,1.05u,d,1/3,1.05u); % lower serif - fi -fi -math_fit(0,.5ic#); penlabels(1,2); endchar; - - - - - -cmchar "Uppercase kappa"; -beginchar("K",13.5u#,cap_height#,0); -italcorr cap_height#*slant-.5u#; -adjust_fit(cap_serif_fit#,cap_serif_fit#); -numeric right_jut,stem[],alpha[]; -if serifs: right_jut=.6cap_jut; -else: right_jut=.4tiny; fi -pickup tiny.nib; pos1(fudged.cap_stem,0); pos2(fudged.cap_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5fudged.cap_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -stem2=max(tiny.breadth,fudged.cap_stem-3stem_corr); -stem1=max(tiny.breadth,fudged.hair if hefty:-3stem_corr fi); -top y3=h; rt x3r=hround(r-letter_fit-u-right_jut); -bot y6=0; rt x6r=hround(r-letter_fit-.75u-right_jut); -x4=x1; y4=1/3h; -alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4); -penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90); -alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1); -penpos6(alpha2*(stem2-tiny),0); -forsuffixes $=l,r: y3'$=h; y6'$=0; z4$=z3'$+whatever*(z3-z4); - z5$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor -z5=.5[z5l,z5r]; -z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4); -% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\] -z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6); -z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6); -fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle; % upper diagonal -fill z5l--diag_end(5l,6'l,.5,1,6'r,5r)--z5r--cycle; % lower diagonal -if serifs: numeric inner_jut; - if rt x2r+cap_jut+.5u+1<=lft x6l-cap_jut: inner_jut=cap_jut; - else: rt x2r+cap_jut+.5u+1=lft x6l-inner_jut; fi - dish_serif(1,2,a,1/3,cap_jut,b,1/3,cap_jut); % upper stem serif - dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut); % lower stem serif - dish_serif(3,4,e,2/3,1.2cap_jut,f,1/2,right_jut)(dark); % upper diagonal serif - dish_serif(6,5,g,1/2,inner_jut,h,1/3,right_jut)(dark);fi % lower diagonal serif -math_fit(0,.5ic#); penlabels(1,2,3,4,5,6); endchar; - -cmchar "Uppercase mu"; -beginchar("M",16u#+width_adj#,cap_height#,0); -italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); -adjust_fit(cap_serif_fit#,cap_serif_fit#); -numeric stem[]; % thicknesses of the four strokes -stem1=hround(fudged.hair+stem_corr); -stem2=hround(fudged.cap_stem-4stem_corr); -stem3=hround(fudged.hair-stem_corr); -stem4=hround(fudged.cap_stem-3stem_corr); -if stem4<stem1: stem4:=stem1; fi -pickup tiny.nib; pos1(stem1,0); pos2(stem1,0); -pos3(stem4,0); pos4(stem4,0); -x1=x2; x3=x4; x1l=w-x3r; rt x3r=hround min(w-2u,w-3u+.5stem4); -top y1=top y3=h; bot y2=bot y4=0; -filldraw stroke z1e--z2e; % left stem -filldraw stroke z3e--z4e; % right stem -penpos5(stem2,0); penpos6(stem2,0); penpos7(stem3,0); penpos8(stem3,0); -x5l=x1; x6l=x7l; x8=lft x3l; x6-x5=x8-x7; y5=y8=h; y6=y7; -if hefty: y6=if monospace: vround 1/3h else: o fi; - numeric upper_notch,lower_notch; - upper_notch=h-cap_notch_cut; lower_notch=y6+cap_notch_cut; - x1'=rt x1r; z1'=whatever[z5l,z6l]; x3'=lft x3l; z3'=whatever[z7r,z8r]; - z0=whatever[z5r,z6r]=whatever[z7l,z8l]; - fill z5l.. - if y1'<upper_notch: {right}(x1'+1,upper_notch){down}... fi - {z6-z5}diag_in(5l,6l,1,6r)..diag_out(7l,1,7r,8r){z8-z7} - if y3'<upper_notch: ...{up}(x3'-1,upper_notch){right} fi - ..z8r--diag_out(8r,1,8l,7l){z7-z8} - if y0<=lower_notch: ..{z7-z8}z0{z5-z6}.. - else: ...{down}(x0+.5,lower_notch)--(x0-.5,lower_notch){up}... fi - {z5-z6}diag_in(6r,5r,1,5l)--cycle; % diagonals -else: y6=0; z0=whatever[z5r,z6r]=whatever[z7l,z8l]; - fill z5l..{z6-z5}diag_in(5l,6l,1,6r)..diag_out(7l,1,7r,8r){z8-z7} - ..z8r--diag_out(8r,1,8l,7l){z7-z8}..{z7-z8}z0{z5-z6} - ..{z5-z6}diag_in(6r,5r,1,5l)--cycle; fi % diagonals -if serifs: serif(1,2,a,1/3,-cap_jut); % upper left serif - dish_serif(2,1,b,1/2,cap_jut,c,1/2,cap_jut)(dark); % lower left serif - serif(3,4,d,1/3,cap_jut); % upper right serif - dish_serif(4,3,e,1/3,cap_jut,f,1/3,cap_jut); fi % lower right serif -math_fit(0,max(.5ic#-.5u#,0)); -penlabels(0,1,1',2,3,3',4,5,6,7,8); endchar; - -cmchar "Uppercase nu"; -beginchar("N",13u#+width_adj#,cap_height#,0); -italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); -adjust_fit(cap_serif_fit#,cap_serif_fit#); -numeric thin_stem; thin_stem=hround(fudged.hair+stem_corr); -pickup tiny.nib; pos1(thin_stem,0); pos2(thin_stem,0); -pos3(thin_stem,0); pos4(thin_stem,0); -pickup tiny.nib; top y1=top y3=h; bot y2=bot y4=0; -x1=x2; x3=x4; x1l=w-x3r; -rt x3r=hround min(w-2u,w-3u+.5fudged.cap_stem); -filldraw stroke z1e--z2e; % left stem -filldraw stroke z3e--z4e; % right stem -if hefty: penpos5(fudged.cap_stem,0); penpos6(fudged.cap_stem,0); - x5l=x1; x6r=x4; y5=h; y6=0; - numeric upper_notch,lower_notch; - upper_notch=h-cap_notch_cut; lower_notch=cap_notch_cut; - x1'=rt x1r; z1'=whatever[z5l,z6l]; x4'=lft x4l; z4'=whatever[z5r,z6r]; - fill z5l.. - if y1'<upper_notch: {right}(x1'+1,upper_notch){down}... fi - {z6-z5}diag_in(5l,6l,1,6r)--z6r.. - if y4'>lower_notch: {left}(x4'-1,lower_notch){up}... fi - {z5-z6}diag_in(6r,5r,1,5l)--cycle; % diagonal -else: penpos5(whatever,0); penpos6(whatever,90); - z5l=z1l; z6l=z4l; - z7=z6l+(max(eps,cap_stem-3stem_corr-tiny),0) rotated (angle(z5l-z6l)-90); - z5r=z7+whatever*(z5l-z6l); z6r=z7+whatever*(z5l-z6l); - filldraw stroke z5e..z6e; fi % diagonal -if serifs: if hefty: serif(1,2,a,1/3,-cap_jut); % upper left serif - else: serif(5,6,a,1/3,-cap_jut); fi % upper left serif - dish_serif(2,1,b,1/2,cap_jut,c,1/2,cap_jut)(dark); % lower left serif - dish_serif(3,4,e,1/2,cap_jut,f,1/2,cap_jut)(dark); fi % upper right serif -math_fit(0,max(.5ic#-.5u#,0)); penlabels(1,1',2,3,4,4',5,6,7); endchar; - -cmchar "Uppercase omicron"; -beginchar("O",14u#-width_adj#,cap_height#,0); -italcorr .7cap_height#*slant-.5u#; -adjust_fit(0,0); -penpos1(vair',90); penpos3(vround(vair+1.5vair_corr),-90); -penpos2(cap_curve,180); penpos4(cap_curve,0); -if monospace: x2r=hround 1.5u; - interim superness:=sqrt superness; % make |"O"|, not |"0"| -else: x2r=hround u; fi -x4r=w-x2r; x1=x3=.5w; y1r=h+o; y3r=-o; -y2=y4=.5h-vair_corr; y2l:=y4l:=.52h; -penstroke pulled_super_arc.e(1,2)(.5superpull) - & pulled_super_arc.e(2,3)(.5superpull) - & pulled_super_arc.e(3,4)(.5superpull) - & pulled_super_arc.e(4,1)(.5superpull) & cycle; % bowl -math_fit(-.3cap_height#*slant-.5u#,ic#-.5u#); penlabels(1,2,3,4); endchar; - -cmchar "Uppercase rho"; -beginchar("R",12u#,cap_height#,0); -italcorr .75cap_height#*slant-.5u#; -adjust_fit(cap_serif_fit#,0); -pickup tiny.nib; penpos1(cap_stem'-tiny,0); penpos2(cap_stem-tiny,0); -pos0(cap_stem',0); pos0'(cap_stem,0); -lft x1l=hround max(2u,3u-.5cap_stem'); top y1=h; bot y2=0; -x1l=x2l=x0l=x0'l; y0=y0'=y7; -penpos3(cap_band,90); penpos4(cap_band,90); -penpos5(cap_curve if hefty:-3stem_corr fi,0); -penpos6(.5[vair,cap_band],-90); penpos7(.5[vair,cap_band],-90); -z3r=top z1; y4=y3; y5=.5[y4l,y6l]; y6=y7; -x7=x2; y7l=vround .5h; x4=x6=.5w+.75u; x5r=hround(w-u); -x4l:=x6l:=x4-.25cap_curve; -filldraw stroke z1e--z0e--z0'e--z2e; % stem -fill stroke z3e..pulled_arc.e(4,5) & pulled_arc.e(5,6)..z7e; % lobe -if serifs: dish_serif(1,0,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif - dish_serif(2,0',c,1/3,cap_jut,d,1/3,cap_jut); fi % lower serif -math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7); endchar; - -cmchar "Uppercase tau"; -beginchar("T",13u#-width_adj#,cap_height#,0); -italcorr cap_height#*slant-beak_jut#-.25u#; -adjust_fit(0,0); -h:=vround(h-2stem_corr); -pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); -lft x1l=lft x2l=hround(.5w-.5cap_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -pickup crisp.nib; pos3(slab,90); pos4(hair,0); -top y3r=h; x3=x1; rt x4r=hround(w-.65u); y4=good.y(y3l-beak)-eps; -arm(3,4,e,beak_darkness,.7beak_jut); % right arm and beak -pos5(hair,180); x5=w-x4; y5=y4; -arm(3,5,f,beak_darkness,-.7beak_jut); % left arm and beak -if serifs: dish_serif(1,2,a,1/3,.5cap_jut,b,1/3,.5cap_jut); % upper bracketing - dish_serif(2,1,c,1/3,1.414cap_jut,d,1/3,1.414cap_jut); fi % lower serif -math_fit(-.75cap_height#*slant,ic#-2.5u#); penlabels(1,2,3,4,5,6); endchar; - -cmchar "Uppercase chi"; -beginchar("Q",13u#,cap_height#,0); -italcorr cap_height#*slant-.25u#; -adjust_fit(cap_serif_fit#,cap_serif_fit#); -numeric stem[],outer_jut,xjut,alpha[]; -stem1=cap_stem-2stem_corr; stem2=min(cap_hair,stem1); -outer_jut=.75cap_jut; xjut= if serifs: (stem1-stem2)/4 else: 0 fi; -x1l=l+letter_fit+.5u+outer_jut; x2r=r-letter_fit-u-outer_jut-xjut; -x3l=l+letter_fit+.25u+outer_jut+xjut; x4r=r-letter_fit-.25u-outer_jut; -y1=y2=h; y3=y4=0; -alpha1=diag_ratio(1,stem1,h,x4r-x1l); -alpha2=diag_ratio(1,stem2,h,x2r-x3l); -penpos1(alpha1*stem1,0); penpos2(alpha2*stem2,0); -penpos3(alpha2*stem2,0); penpos4(alpha1*stem1,0); -if hefty: z0=whatever[z1,z4]=whatever[z2,z3]; - x12=x34=x0; y13=y24=y0; - z12=whatever[z2l,z3l]; z13=whatever[z2l,z3l]; - z24=whatever[z2r,z3r]; z34=whatever[z2r,z3r]; - forsuffixes $=13,24,34: z$'=.1[z$,z0]; endfor - fill diag_end(12,1r,.5,1,1l,13')--z13'--diag_end(13',3l,1,.5,3r,34')--z34' - --diag_end(34',4l,.5,1,4r,24')--z24' - --diag_end(24',2r,1,.5,2l,12)--z12--cycle; % diagonals -else: fill diag_end(4r,1r,.5,1,1l,4l) - --diag_end(1l,4l,.5,1,4r,1r)--cycle; % left diagonal - fill diag_end(2l,3l,.5,1,3r,2r) - --diag_end(3r,2r,.5,1,2l,3l)--cycle; fi % right diagonal -if serifs: numeric inner_jut[]; pickup tiny.nib; - prime_points_inside(1,4); prime_points_inside(2,3); - prime_points_inside(3,2); prime_points_inside(4,1); - if rt x1'r+cap_jut+.5u+1<=lft x2'l-cap_jut-xjut: inner_jut1=cap_jut; - else: rt x1'r+inner_jut1+.5u+1=lft x2'l-inner_jut1-xjut; fi - if rt x3'r+cap_jut+.5u+1<=lft x4'l-cap_jut-xjut: inner_jut2=cap_jut; - else: rt x3'r+inner_jut2+.5u+1=lft x4'l-inner_jut2-xjut; fi - dish_serif(1',4,a,1/3,outer_jut,b,2/3,inner_jut1); % upper left serif - dish_serif(4',1,c,2/3,inner_jut2,d,1/3,outer_jut); % lower right serif - dish_serif(2',3,e,2/3,inner_jut1+xjut, - f,1/2,outer_jut+xjut)(dark); % upper right serif - dish_serif(3',2,g,1/2,outer_jut+xjut, - h,2/3,inner_jut2+xjut)(dark); fi % lower left serif -math_fit(0,.5ic#); penlabels(0,1,2,3,4,12,13,24,34); endchar; - -cmchar "Uppercase zeta"; -beginchar("Z",11u#,cap_height#,0); -italcorr cap_height#*slant-.5u#; -adjust_fit(0,0); -numeric arm_thickness[],z_stem; -if hefty: arm_thickness1=Vround(slab-vair_corr); arm_thickness2=slab; - z_stem=.8[vair,cap_stem]; -else: arm_thickness1=slab; arm_thickness2=vround(slab+vair_corr); - z_stem=.9[vair,cap_stem]; fi -pickup tiny.nib; x3l=x4l=w-x1r=w-x2r; lft x3l=hround u; -top y1=h; y2=min(y1,h-2/3arm_thickness1); -bot y4=0; y3=max(y4,2/3arm_thickness2); -numeric alpha; alpha=diag_ratio(1,z_stem-tiny,y2-y3,x2r-x3l); -penpos1(alpha*(z_stem-tiny),0); penpos2(alpha*(z_stem-tiny),0); -penpos3(alpha*(z_stem-tiny),0); penpos4(alpha*(z_stem-tiny),0); -pair delta; delta=penoffset z3-z2 of currentpen; -fill top lft z1l--z2l+delta---z3l+delta..lft z3l---lft z4l..bot z4l - ---bot rt z4r--z3r-delta---z2r-delta..rt z2r---rt z1r..top z1r - ---cycle; % diagonal -pickup crisp.nib; pos5(arm_thickness1,90); pos6(hair,180); -top y5r=h; x5=x1; lft x6r=hround 1.25u; y6=good.y(y5l-beak)-eps; -arm(5,6,a,beak_darkness**.8,-.4beak_jut); % upper arm and beak -pos7(arm_thickness2,-90); pos8(hair,0); -bot y7r=0; x7=x4; rt x8r=hround(w-.9u); y8=good.y(y7l+1.2beak)+eps; -arm(7,8,b,beak_darkness**.9,.6beak_jut); % lower arm and beak -math_fit(0,.5ic#); penlabels(1,2,3,4,5,6,7,8); endchar; - -cmchar "Uppercase gamma"; -beginchar("G",11u#-width_adj#,cap_height#,0); -italcorr cap_height#*slant-beak_jut#-.25u#; -adjust_fit(cap_serif_fit#,0); -h:=vround(h-stem_corr); -pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -pickup crisp.nib; pos3(slab,90); pos4(hair,0); -top y3r=h; x3=x1; rt x4r=hround(w-.75u); y4=good.y(y3l-beak)-eps; -arm(3,4,e,beak_darkness,beak_jut); % arm and beak -if serifs: dish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif - dish_serif(2,1,c,1/3,cap_jut,d,1/3,1.25cap_jut); fi % lower serif -math_fit(0,ic#-2.5u#); penlabels(1,2,3,4); endchar; - -cmchar "Uppercase delta"; -beginchar("D",15u#,cap_height#,0); -adjust_fit(0,0); -numeric left_stem,alpha; -left_stem=cap_hair if hefty: -3stem_corr fi; -x1l=w-x4r=.75u; y1=y4=0; -x2-x1=x4-x3; x3r=x2r+apex_corr; y2=y3=h+apex_o+apex_oo; -alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr); -penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); -penpos3(alpha*cap_stem,0); penpos4(alpha*cap_stem,0); -fill diag_end(2l,1l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l)--cycle; % triangle -z0=whatever[z1r,z2r]=whatever[z3l,z4l]; -y5=y6=cap_vstem; z5=whatever[z1r,z2r]; z6=whatever[z3l,z4l]; -if y0<h-cap_notch_cut: y0:=h-cap_notch_cut; - unfill z0+.5right{down}...{z4-z3}z6--z5{z2-z1} - ...{up}z0+.5left--cycle; % counter -else: unfill z0--z5--z6--cycle; fi % counter -penlabels(0,1,2,3,4,5,6); endchar; - -cmchar "Uppercase theta"; -beginchar("J",14u#,cap_height#,0); -italcorr .7cap_height#*slant-.5u#; -adjust_fit(0,0); -numeric light_curve; light_curve=hround(cap_curve-2stem_corr); -penpos1(vair,90); penpos3(vround(vair+.5vair_corr),-90); -penpos2(light_curve,180); penpos4(light_curve,0); -if monospace: x2r=hround 1.5u; - interim superness:=sqrt superness; % make |"O"|, not |"0"| -else: x2r=hround u; fi -x4r=w-x2r; x1=x3=.5w; y1r=h+o; y2=y4=.5h-vair_corr; y3r=-o; -penstroke pulled_super_arc.e(1,2)(.5superpull) - & pulled_super_arc.e(2,3)(.5superpull) - & pulled_super_arc.e(3,4)(.5superpull) - & pulled_super_arc.e(4,1)(.5superpull) & cycle; % bowl -pickup crisp.nib; pos5(cap_vstem,90); pos6(cap_vstem,90); -lft x5=w-rt x6=hround(x2l+if cbleipzig:1.5fi u)+1; y5=y6=.5[y1l,y3l]; -filldraw stroke z5e--z6e; % bar -if serifs: pos7(hair,0); pos8(hair,0); pos9(hair,0); pos10(hair,0); - x7l=x8l=x5; x9r=x10r=x6; - y7-y5r=y9-y6r=y5l-y8=y6l-y10=vround .05h; - filldraw stroke z7e--z8e; % left serif - filldraw stroke z9e--z10e; fi % right serif -math_fit(-.3cap_height#*slant-.5u#,ic#-.5u#); -penlabels(1,2,3,4,5,6,7,8,9,10); endchar; - -cmchar "Uppercase lambda"; -beginchar("L",12u#,cap_height#,0); -adjust_fit(cap_serif_fit#,cap_serif_fit#); -numeric left_stem,outer_jut,alpha; -left_stem=cap_hair if hefty: -3stem_corr fi; -outer_jut=.7cap_jut; x1l=w-x4r=l+letter_fit+outer_jut+.5u; y1=y4=0; -x2-x1=x4-x3; x3r=x2r+apex_corr; y2=y3=h+apex_o+apex_oo; -alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr); -penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); -penpos3(alpha*cap_stem,0); penpos4(alpha*cap_stem,0); -z0=whatever[z1r,z2r]=whatever[z3l,z4l]; -if y0<h-cap_notch_cut: y0:=h-cap_notch_cut; - fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r) - --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} - ...{up}z0+.5left--cycle; % left and right diagonals -else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) - --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals -if serifs: numeric inner_jut; pickup tiny.nib; - prime_points_inside(1,2); prime_points_inside(4,3); - if rt x1'r+cap_jut+.5u+1<=lft x4'l-cap_jut: inner_jut=cap_jut; - else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi - dish_serif(1',2,a,1/2,outer_jut,b,.6,inner_jut)(dark); % left serif - dish_serif(4',3,c,1/2,inner_jut,d,1/3,outer_jut); fi % right serif -penlabels(0,1,2,3,4,5,6); endchar; - -cmchar "Uppercase xi"; -beginchar("X",12u#,cap_height#,0); -italcorr cap_height#*slant-.35u#; -adjust_fit(0,0); -h:=vround(h-2stem_corr); -numeric shaved_stem; shaved_stem=hround .9[vair,.85cap_stem]; -pickup crisp.nib; pos1(shaved_stem,90); pos2(hair,0); -top y1r=h; x1=.5w; rt x2r=hround(w-.85u); y2=good.y(y1l-4/9beak)-eps; -arm(1,2,a,.4beak_darkness,.3beak_jut); % upper right arm and beak -pos3(hair,180); x3=w-x2; y3=y2; -arm(1,3,b,.4beak_darkness,-.3beak_jut); % upper left arm and beak -pos4(shaved_stem,-90); pos5(hair,0); -bot y4r=0; x4=.5w; rt x5r=hround(w-.75u); y5=good.y(y4l+.5beak)+eps; -arm(4,5,c,.4beak_darkness,.3beak_jut); % lower right arm and beak -pos6(hair,180); x6=w-x5; y6=y5; -arm(4,6,d,.4beak_darkness,-.3beak_jut); % lower left arm and beak -pos7(shaved_stem,90); pos8(shaved_stem,90); -lft x7=w-rt x8=hround if serifs: 2.5 else: 2 fi\\ u; -top y7r=top y8r=vround(.52h+.5shaved_stem); -filldraw stroke z7e--z8e; % middle bar -if serifs: numeric xjut; - if bot y2>top y7r+.75cap_jut: xjut=.5cap_jut; - else: bot y2=top y7r+1.5xjut; fi - pos11(hair,0); pos12(hair,0); y11=y12; - pos13(hair,0); pos14(hair,0); y13=y14; - lft x11l=lft x13l=w-rt x12r=w-rt x14r=hround 2.5u; - top y11-bot y13=shaved_stem+2xjut; .5[y11,y13]=y7; - filldraw stroke z11e--z13e; filldraw stroke z12e--z14e; fi % middle serifs -math_fit(0,.5ic#); penlabels(1,2,3,4,5,6,7,8,11,12,13,14); endchar; - -cmchar "Uppercase pi"; -beginchar("P",13u#+width_adj#,cap_height#,0); -italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); -adjust_fit(cap_serif_fit#,cap_serif_fit#); pickup tiny.nib; -h:=vround(h-stem_corr); -pos1(cap_stem,0); pos2(cap_stem,0); pos3(cap_stem,0); pos4(cap_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); x3=x4=w-x1; -top y1=top y3=h; bot y2=bot y4=0; -filldraw stroke z1e--z2e; % left stem -filldraw stroke z3e--z4e; % right stem -penpos5(cap_bar,90); penpos6(cap_bar,90); -x5=x1; x6=x3; y5r=y6r=h; -fill stroke z5e--z6e; % bar -if serifs: numeric inner_jut; - if rt x1r+cap_jut+.5u+1<=lft x3l-cap_jut: inner_jut=cap_jut; - else: rt x1r+inner_jut+.5u+1=lft x3l-inner_jut; fi - dish_serif(1,2,a,1/3,cap_jut,b,1/3,eps); % upper left serif - dish_serif(2,1,c,1/3,cap_jut,d,1/3,inner_jut); % lower left serif - dish_serif(3,4,e,1/3,eps,f,1/3,cap_jut); % upper left serif - dish_serif(4,3,g,1/3,inner_jut,h,1/3,cap_jut); fi % lower left serif -math_fit(0,.5ic#); penlabels(1,2,3,4,5,6); endchar; - -cmchar "Uppercase sigma"; -beginchar("S",13u#,cap_height#,0); -italcorr cap_height#*slant-beak_jut#-.5u#; -adjust_fit(0,0); -numeric bot_arm_thickness; -bot_arm_thickness=Vround .25[slab,cap_vstem]; -pickup tiny.nib; lft x1l=hround u; x1l=x2l=x4l; -top y1=h; bot y2=h-slab; bot y4=0; x3l-x1l=4/11(w-2u); y3=.5h; -numeric alpha[]; alpha1=((x3l-x1l)++(y2-y3))/(y2-y3); -penpos1(alpha1*(cap_stem-tiny),0); penpos2(alpha1*(cap_stem-tiny),0); -penpos3(alpha1*(cap_stem-tiny),0); -alpha2=diag_ratio(1,cap_hair-tiny,y3-y4,x3r-x4l); -penpos4(alpha2*(cap_hair-tiny),0); -z0=whatever[z2l,z3l]=z4l+whatever*(z3r-z4r); -filldraw z1l--z2l--z0--z4l--z4r--z3r--z2r--z1r--cycle; % diagonals -pickup crisp.nib; pos5(slab,90); pos6(hair,0); -top y5r=h; x5=x1; rt x6r=hround(w-u); y6=good.y(y5l-beak)-eps; -arm(5,6,a,beak_darkness,beak_jut); % upper arm and beak -pos7(bot_arm_thickness,-90); pos8(hair,0); -bot y7r=0; z7l=whatever[z4,z3]; x7r:=x4; x8=x6; y8=good.y(y7l+beak)+eps; -arm(7,8,b,beak_darkness,beak_jut); % lower arm and beak -math_fit(0,.5ic#); penlabels(0,1,2,3,4,5,6,7,8); endchar; - -cmchar "Uppercase upsilon"; -beginchar("U",if cbleipzig or cbroman:12else:14fi u#,cap_height#,0); -if cbleipzig or cbroman: - italcorr cap_height#*slant+.45u#; - adjust_fit(cap_serif_fit#,cap_serif_fit#); - numeric left_stem,right_stem,outer_jut,dy,alpha; - left_stem=cap_stem-stem_corr; - right_stem=min(cap_hair if hefty:-2stem_corr fi,left_stem); - outer_jut=.75cap_jut; x1l=w-x4r=l+letter_fit+outer_jut+.05u; - x2l=x5l=hround(.5w-.5left_stem); x3r=x5r; y1=y4=h; y2=y3=y5=.4h; - dy=y1-y2; alpha=((x2l-x1l)++dy)/dy; - penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); - penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); - penpos5(left_stem,0); penpos6(left_stem,0); x5=x6; y6=0; - z0=whatever[z1r,z2r]=whatever[z3l,z4l]; - if y0>y2+cap_notch_cut: y0:=y2+cap_notch_cut; - fill z0+.5right{up}...{z4-z3}diag_end(3l,4l,1,1,4r,3r)--z5r - --diag_end(5r,6r,1,1,6l,5l)--z5l--diag_end(2l,1l,1,1,1r,2r){z2-z1} - ...{down}z0+.5left--cycle; % diagonals and stem - else: fill z0--diag_end(0,4l,1,1,4r,3r)--z5r - --diag_end(5r,6r,1,1,6l,5l)--z5l - --diag_end(2l,1l,1,1,1r,0)--cycle; fi % diagonals and stem - if serifs: numeric inner_jut; pickup tiny.nib; - prime_points_inside(1,2); prime_points_inside(4,3); prime_points_inside(6,5); - if rt x1'r+cap_jut+.5u+1<=lft x4'l-cap_jut: inner_jut=cap_jut; - else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi - dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut); % upper left serif - dish_serif(4',3,c,.6,inner_jut,d,1/2,outer_jut)(dark); % upper right serif - dish_serif(6',5,e,1/3,cap_jut,f,1/3,cap_jut); fi % lower serif - math_fit(.5u#-cap_height#*slant,ic#-4u#); -else: - italcorr .8cap_height#*slant-.5u#; - adjust_fit(0,0); - pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); - lft x1l=lft x2l=hround(.5w-.5cap_stem); y1=.5h; bot y2=0; - filldraw stroke z1e--z2e; % stem - penpos3(.6cap_stem,0); penpos4(.75cap_curve,90); penpos5(cap_hair,180); - z3l=lft z1l; x5r=hround u; y5=bot .8h; x4=.61803[x3l,x5l]; y4r=h+o; - penpos5'(cap_hair,180); x5'=x5; y5'=h; - fill z3r{up}...z4r{left}...{down}diag_end(5'r,5r,1,1,5l,5'l){up} - ...{right}z4l...{down}z3l--cycle; % left arc - penpos6(.6cap_stem,0); penpos7(.75cap_curve,-90); penpos8(cap_hair,-180); - z6r=rt z1r; x8=w-x5; y8=y5; x7=w-x4; y7=y4; - penpos8'(cap_hair,-180); x8'=x8; y8'=h; - fill z6r{up}...z7r{right}...{down}diag_end(8'r,8r,1,1,8l,8'l){up} - ...{left}z7l...{down}z6l--cycle; % right arc - if serifs: dish_serif(2,1,a,1/3,1.25cap_jut,b,1/3,1.25cap_jut); fi % serif - math_fit(-.8cap_height#*slant-.5u#,ic#-2.5u#); -fi -penlabels(1,2,3,4,5,6,7,8); endchar; - - -cmchar "Uppercase Upsilon with diaeresis"; -beginchar(oct"337",if cbleipzig or cbroman:12else:14fi u#,cap_height#,0); -if cbleipzig or cbroman: - italcorr cap_height#*slant+.45u#; - adjust_fit(cap_serif_fit#,cap_serif_fit#); - numeric left_stem,right_stem,outer_jut,dy,alpha; - left_stem=cap_stem-stem_corr; - right_stem=min(cap_hair if hefty:-2stem_corr fi,left_stem); - outer_jut=.75cap_jut; x1l=w-x4r=l+letter_fit+outer_jut+.05u; - x2l=x5l=hround(.5w-.5left_stem); x3r=x5r; y1=y4=h; y2=y3=y5=.4h; - dy=y1-y2; alpha=((x2l-x1l)++dy)/dy; - penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); - penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0); - penpos5(left_stem,0); penpos6(left_stem,0); x5=x6; y6=0; - z0=whatever[z1r,z2r]=whatever[z3l,z4l]; - if y0>y2+cap_notch_cut: y0:=y2+cap_notch_cut; - fill z0+.5right{up}...{z4-z3}diag_end(3l,4l,1,1,4r,3r)--z5r - --diag_end(5r,6r,1,1,6l,5l)--z5l--diag_end(2l,1l,1,1,1r,2r){z2-z1} - ...{down}z0+.5left--cycle; % diagonals and stem - else: fill z0--diag_end(0,4l,1,1,4r,3r)--z5r - --diag_end(5r,6r,1,1,6l,5l)--z5l - --diag_end(2l,1l,1,1,1r,0)--cycle; fi % diagonals and stem - if serifs: numeric inner_jut; pickup tiny.nib; - prime_points_inside(1,2); prime_points_inside(4,3); prime_points_inside(6,5); - if rt x1'r+cap_jut+.5u+1<=lft x4'l-cap_jut: inner_jut=cap_jut; - else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi - dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut); % upper left serif - dish_serif(4',3,c,.6,inner_jut,d,1/2,outer_jut)(dark); % upper right serif - dish_serif(6',5,e,1/3,cap_jut,f,1/3,cap_jut); fi % lower serif - math_fit(.5u#-cap_height#*slant,ic#-4u#); -else: - italcorr .8cap_height#*slant-.5u#; - adjust_fit(0,0); - pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); - lft x1l=lft x2l=hround(.5w-.5cap_stem); y1=.5cap_height; bot y2=0; - filldraw stroke z1e--z2e; % stem - penpos3(.6cap_stem,0); penpos4(.75cap_curve,90); penpos5(cap_hair,180); - z3l=lft z1l; x5r=hround u; y5=bot .8cap_height; - x4=.61803[x3l,x5l]; y4r=cap_height+o; - penpos5'(cap_hair,180); x5'=x5; y5'=cap_height; - fill z3r{up}...z4r{left}...{down}diag_end(5'r,5r,1,1,5l,5'l){up} - ...{right}z4l...{down}z3l--cycle; % left arc - penpos6(.6cap_stem,0); penpos7(.75cap_curve,-90); penpos8(cap_hair,-180); - z6r=rt z1r; x8=w-x5; y8=y5; x7=w-x4; y7=y4; - penpos8'(cap_hair,-180); x8'=x8; y8'=cap_height; - fill z6r{up}...z7r{right}...{down}diag_end(8'r,8r,1,1,8l,8'l){up} - ...{left}z7l...{down}z6l--cycle; % right arc - if serifs: dish_serif(2,1,a,1/3,1.25cap_jut,b,1/3,1.25cap_jut); fi % serif - math_fit(-.8cap_height#*slant-.5u#,ic#-2.5u#); -fi -generate_diaeresis(.5w,dot_size,dot_size+cap_stem,h+separator+dot_size,cap_height+separator); -picture savedpicture; savedpicture:=currentpicture; -penlabels(1,2,3,4,5,6,7,8); endchar; - -cmchar "shifted uppercase Upsilon with diaeresis";% for kerning with A -beginchar(oct"15",if cbleipzig or cbroman:12else:14fi u#,cap_height#,0); -adjust_fit(0,-AUkern#); -currentpicture:=savedpicture shifted (-AUkern,0); -endchar; -picture savedpicture; - -cmchar "Uppercase phi"; -beginchar("F",13u#,cap_height#,0); -italcorr .5cap_height#*slant-.5u#; -adjust_fit(0,0); -numeric shaved_stem,light_curve; -shaved_stem=cap_stem-hround 2stem_corr; -light_curve=cap_curve-hround stem_corr; -pickup tiny.nib; pos1(shaved_stem,0); pos2(shaved_stem,0); -lft x1l=lft x2l=hround(.5w-.5cap_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -penpos3(vair,90); penpos5(vair,-90); -penpos4(light_curve,180); penpos6(light_curve,0); -x4r=hround u; x6r=w-x4r; x3=x5=.5w; -y3r=vround(.85h if serifs:-slab fi); y4=y6=.5[y3,y5]; -y5r=vround(.15h if serifs:+slab fi); -penstroke pulled_arc.e(3,4) & pulled_arc.e(4,5) - & pulled_arc.e(5,6) & pulled_arc.e(6,3) & cycle; % bowl -if serifs: dish_serif(1,2,a,1/3,1.25cap_jut,b,1/3,1.25cap_jut); % upper serif - dish_serif(2,1,c,1/3,1.25cap_jut,d,1/3,1.25cap_jut); fi % lower serif -math_fit(-.5cap_height#*slant-.5u#,ic#); penlabels(1,2,3,4,5,6); endchar; - -cmchar "Uppercase psi"; -beginchar("Y",14u#,cap_height#,0); -italcorr .8cap_height#*slant-.5u#; -adjust_fit(0,0); -if cbroman:% This is CB romanstyle capital Psi - numeric shaved_stem; - shaved_stem=cap_stem-hround 2stem_corr; - pickup tiny.nib; pos1(shaved_stem,0); pos2(shaved_stem,0); - lft x1l=lft x2l=hround(.5w-.5cap_stem); top y1=h; bot y2=0; - filldraw stroke z1e--z2e; % stem - pos3(shaved_stem,-180); pos4(shaved_stem,-180); - pos8(shaved_stem,0);z8=z3; pos9(shaved_stem,0);z9=z4; - pos5(vair,-90); x5=x1; bot y5r=vround(.15h +slab); - pos6(shaved_stem,0); pos7(shaved_stem,0); - lft x3r=hround u+jut; x7=w-x3; lft x4r=lft x3r; x6=w-x4; - y3=y7; y4=y6=.6h; y3=.84h -slab; - interim superness:=more_super; - filldraw z3r---z4r{down} & super_arc.r(4,5) - & super_arc.r(5,6) & z6r{up}---z7r - --z7l---z6l{down} & super_arc.l(6,5) - & super_arc.l(5,4) & z4l{up}---z3l--cycle; % stroke - dish_serif(1,2,a,1/3,1.25cap_jut,b,1/3,1.25cap_jut); % upper serif - dish_serif(2,1,c,1/3,1.25cap_jut,d,1/3,1.25cap_jut); % lower serif - dish_serif(8,9,e,1/3,jut,f,1/3,jut); % left arm serif - dish_serif(7,6,g,1/3,jut,h,1/3,jut); % right arm serif -else:% - numeric shaved_stem; - shaved_stem=cap_stem-hround 2stem_corr; - pickup tiny.nib; pos1(shaved_stem,0); pos2(shaved_stem,0); - lft x1l=lft x2l=hround(.5w-.5cap_stem); top y1=h; bot y2=0; - filldraw stroke z1e--z2e; % stem - pos3(shaved_stem,-180); pos4(shaved_stem,-180); - pos5(vair,-90); x5=x1; bot y5r=vround(.15h if serifs:+slab fi); - pos6(shaved_stem,0); pos7(shaved_stem,0); - lft x3r=hround u; x7=w-x3; lft x4r=hround(3u-.5shaved_stem); x6=w-x4; - pos3'(vair,90); pos7'(vair,90); z3'r=z3r; z7'r=z7r; - y3=y7; y4=y6=.6h; y3=good.y(y3+.84h if serifs:-slab fi-y3'); - interim superness:=more_super; - filldraw z3'l{right}...z4r{down} & super_arc.r(4,5) - & super_arc.r(5,6) & z6r{up}...z7'l{right} - --z7r---z7l...z6l{down} & super_arc.l(6,5) - & super_arc.l(5,4) & z4l{up}...z3l---z3r--cycle; % stroke - if serifs: dish_serif(1,2,a,1/3,1.25cap_jut,b,1/3,1.25cap_jut); % upper serif - dish_serif(2,1,c,1/3,1.25cap_jut,d,1/3,1.25cap_jut);fi % lower serif - - math_fit(-.8cap_height#*slant-.5u#,.4cap_height#*slant-1.25u#); -fi -penlabels(1,2,3,4,5,6,7); endchar; - - - -def gen_letter = % Capital Omega -pickup tiny.nib; pos1(vair,90); pos2(cap_curve,180); -pos3(vair,180); pos4(cap_curve,0); pos5(vair,0); -x1=.5w; top y1r=h+o; lft x2r=hround u; y2=y4=2/3h; x4=w-x2; -rt x3l=hround(1/3(w+if cbleipzig:2\else:.5fi u)+.5hair); bot y3=bot y5=0; x5=w-x3; -filldraw stroke z3e{up}...{up}z2e - & pulled_super_arc.e(2,1)(.5superpull) - & pulled_super_arc.e(1,4)(.5superpull) - & z4e{down}...{down}z5e; % bowl -numeric arm_thickness; path p; p=z3{up}...{up}z2; -arm_thickness=Vround(if hefty:slab+2stem_corr else:.75[slab,cap_vstem] fi); -pickup crisp.nib; pos6(arm_thickness,-90); pos7(fudged.hair,-180); -bot y6r=0; x6=x3; lft x7r=hround .8u; y7=good.y(y6l+.5beak)+eps; -(x,y)=p intersectionpoint((0,y6l)--(w,y6l)); x6l:=x; -arm(6,7,a,.5beak_darkness,-1.2beak_jut); % left arm and beak -pos8(arm_thickness,-90); pos9(fudged.hair,0); -y8=y6; y9=y7; x8+x6=x9+x7=w; x8l:=w-x6l; -arm(8,9,b,.5beak_darkness,1.2beak_jut); % right arm and beak - numeric pos_stem; %Iota reference - pos_stem:=rt x9r +.5(stem+tiny) + 1.4u; -enddef; - - -cmchar "Uppercase omega"; -beginchar("W",13u#,cap_height#,0); -italcorr .75cap_height#*slant-.5u#; -adjust_fit(0,0); gen_letter; -math_fit(0,.5ic#); penlabels(1,2,3,4,5,6,7,8,9); endchar; - -cmchar "Uppercase omega with iota adscript"; -beginchar(oct"013",13u#,cap_height#,0); -italcorr .75cap_height#*slant-.5u#; -adjust_fit(0,stem# + .5tiny# + .7jut# + 1.4u# if monospace:+1.3tiny# fi); -gen_letter; Iota_sub(pos_stem); -penlabels(1,2,3,4,5,6,7,8,9); endchar; - - - -cmchar "Uppercase digamma"; -beginchar(oct"303",11.5u#-width_adj#,cap_height#,0); -italcorr cap_height#*slant-beak_jut#-.25u#; -adjust_fit(cap_serif_fit#,0); -h:=vround(h-stem_corr); -pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -pickup crisp.nib; pos3(slab,90); pos4(hair,0); -top y3r=h; x3=x1; rt x4r=hround(w-.75u); y4=good.y(y3l-beak)-eps; -arm(3,4,e,beak_darkness,beak_jut); % upper arm and beak -pos5(cap_bar,-90); pos6(hair,0); -top y5l=vround(.5[y2,y1]+.5cap_bar); x5=x1; -pos0(cap_bar,90); pos7(hair,0); -z0=z5; x6=x7; y6-y5l=y0l-y7; -if serifs: rt x6r=hround(w-4u+.5hair); y6=good.y(y5l+.6beak)+eps; - rt x9r=hround(w-.5u); -else: rt x6r=hround(w-1.5u); y6=y5l+eps; rt x9r=hround(w-.75u); fi -arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0); % middle arm and serif -if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif - dish_serif(2,1,c,1/3,cap_jut,d,1/3,1.25cap_jut); fi % lower serif -math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7,8,9); endchar; - - -endinput; |