diff options
author | Karl Berry <karl@freefriends.org> | 2014-03-18 22:06:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-03-18 22:06:38 +0000 |
commit | d834f9da1e08f7fab4ec7359c5aaf2d42c63b1fc (patch) | |
tree | d592ebdef347a50f95f074b0f5b155bbe58a3d87 /Master/texmf-dist/fonts/source | |
parent | c753333126d255ea8ae0af7df0acbbed7dab03ae (diff) |
fetamont (18mar14)
git-svn-id: svn://tug.org/texlive/trunk@33221 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts/source')
10 files changed, 26 insertions, 31 deletions
diff --git a/Master/texmf-dist/fonts/source/public/fetamont/ffmbase.mf b/Master/texmf-dist/fonts/source/public/fetamont/ffmbase.mf index dee523c8b8d..8eb2e809376 100644 --- a/Master/texmf-dist/fonts/source/public/fetamont/ffmbase.mf +++ b/Master/texmf-dist/fonts/source/public/fetamont/ffmbase.mf @@ -18,11 +18,14 @@ if unknown slant: slant:=0 else: currenttransform:= ho#:=o#; % horizontal overshoot leftstemloc#:=2.5u#+s#; % position of left stem -font_quad 18u#+2s#; +font_coding_scheme "T1"; +font_slant slant; font_normal_space 6u#+2s#; font_normal_stretch 3u#; font_normal_shrink 2u#; -font_coding_scheme "T1"; +font_x_height x_ht#; +font_quad 18u#+2s#; +font_extra_space 2u#; define_pixels(s,u); define_whole_pixels(xgap); @@ -605,10 +608,8 @@ extra_endchar := extra_endchar&"charpictures_[charcode]:=currentpicture;" &"charitalcorrs_[charcode]=charic;"; def ffmcombinedchar(expr namea,nameb,namec,anchor,height,depth) = - widthb:=charwidths_[enc(nameb)+code_offset]; - charicb:=charitalcorrs_[enc(nameb)+code_offset]; - beginchar(enc(namea)+code_offset,widthb,height,depth); - charic:=charicb; + beginchar(enc(namea)+code_offset,charwidths_[enc(nameb)+code_offset],height,depth); + charic:=charitalcorrs_[enc(nameb)+code_offset]; addto currentpicture also charpictures_[enc(nameb)+code_offset]; if anchor="top": addto currentpicture also charpictures_[enc(namec)] shifted diff --git a/Master/texmf-dist/fonts/source/public/fetamont/ffmbw10.mf b/Master/texmf-dist/fonts/source/public/fetamont/ffmbw10.mf index 5506caad90f..ad9d98fe2d7 100644 --- a/Master/texmf-dist/fonts/source/public/fetamont/ffmbw10.mf +++ b/Master/texmf-dist/fonts/source/public/fetamont/ffmbw10.mf @@ -17,7 +17,7 @@ py#:=.6px#; % vertical pen thickness dotincr:=.4; % increasement of dot diameter prot:=60; % rotation angle of the pen slant:=0; % slanting amount -craziness:=.1pt; % degree of haphazard variation +craziness:=.1pt; % degree of haphazard variation superness:=.75; % parameter for superellipses input ffmbase % now generate the font diff --git a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_A.mf b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_A.mf index 35c181de727..514db7668cd 100644 --- a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_A.mf +++ b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_A.mf @@ -12,10 +12,8 @@ y4=barheight+noise; bot y5=noise-o; bot y6=0; %no noise z6=whatever[z4,z5]; -draw z1--z2 - & half(z2,z2-z1,z3,randrt,z4,z5-z4) - & z4--z5; -draw z2--z4; +draw z1--z2--z4--z5; +draw half(z2,z2-z1,z3,randrt,z4,z5-z4); charanchortops_[charcode]=(.5w,h); charanchorbots_[charcode]=z6; labels(1,2,3,4,5,6); diff --git a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_AE.mf b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_AE.mf index e12ff1754bd..578e2c5996b 100644 --- a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_AE.mf +++ b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_AE.mf @@ -14,9 +14,8 @@ bot y4=noise; top y5=h+noise; y6=barheight+noise; bot y7=noise; -draw z1--z2; +draw z1--z2--z6; draw arc(z2,z2-z1,z3,z5-z3); -draw z2--z6; draw z5--z3--z4--z7; labels(1,2,3,4,5,6,7); endchar; diff --git a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_E.mf b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_E.mf index c6d06c43e2b..e9aa19dbf72 100644 --- a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_E.mf +++ b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_E.mf @@ -14,8 +14,8 @@ y5=barheight+noise; bot y7=0; z2=whatever[z1,z3]; z6=whatever[z1,z7]; -draw z6--z1--z3--z4; -draw z2--z5; +draw z6--z1--z2--z5; +draw z2--z3--z4; charanchortops_[charcode]=(.5[leftstemloc,w-leftstemloc+o],h); charanchorbots_[charcode]=z7; labels(1,2,3,4,5,6,7); diff --git a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_F.mf b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_F.mf index 4f3878a8a40..ea231ef6286 100644 --- a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_F.mf +++ b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_F.mf @@ -11,7 +11,7 @@ top y4=h+noise; y5=barheight+noise; bot y6=noise; z2=whatever[z1,z3]; -draw z1--z3--z4; -draw z2--z5; +draw z1--z2--z5; +draw z2--z3--z4; labels(1,2,3,4,5); endchar; diff --git a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_H.mf b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_H.mf index ea94d5e3894..927fbebbe8e 100644 --- a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_H.mf +++ b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_H.mf @@ -2,18 +2,18 @@ ffmchar("H",15,ht#,0); italcorr .8ht#*slant; x1=leftstemloc+noise; x2=leftstemloc+noise; -x5=leftstemloc+noise; w-x3=leftstemloc+noise; w-x4=leftstemloc+noise; -w-x6=leftstemloc+noise; bot y1=noise-o; top y2=h+o+noise; bot y3=noise-o; top y4=h+o+noise; y5=barheight+noise; y6=barheight+noise; -draw z1--z2; -draw z3--z4; -draw z5--z6; +z5=whatever[z1,z2]; +z6=whatever[z3,z4]; +draw z1--z5--z6--z3; +draw z5--z2; +draw z6--z4; labels(1,2,3,4,5,6); endchar; diff --git a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_OE.mf b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_OE.mf index c64bad458db..4e119b25029 100644 --- a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_OE.mf +++ b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_OE.mf @@ -21,7 +21,7 @@ z8=whatever[z2,z6]; draw z1--z3 & half(z3,z3-z1,z4,randup,z5,z7-z5) & z5--z7; -draw z2--z6; -draw z8--z9; +draw z2--z8--z9; +draw z6--z8; labels(1,2,3,4,5,6,7,8,9); endchar; diff --git a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_P.mf b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_P.mf index 73a9c111194..1497ae993db 100644 --- a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_P.mf +++ b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_P.mf @@ -12,9 +12,9 @@ top y3=h+noise; top y4=h+noise; y6=.5[y4,y5]+noise; z2=whatever[z1,z3]; -draw z1--z3--z4; -draw z2--z5; -draw half(z4,z4-z3,z6,-randup,z5,z2-z5); +draw z1--z3--z4 + & half(z4,z4-z3,z6,-randup,z5,z2-z5) + & z5 -- z2; labels(1,2,3,4,5,6); endchar; diff --git a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_cwm.mf b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_cwm.mf index e2ce7b3ad3d..6e90c5896f6 100644 --- a/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_cwm.mf +++ b/Master/texmf-dist/fonts/source/public/fetamont/ffmchar_cwm.mf @@ -1,5 +1,2 @@ -ffmchar("cwm",0,ht#,0); -z1=(0,0); -undraw z1; %just for fontforge -labels(1); +ffmchar("cwm",0,x_ht#,0); endchar; |