diff options
Diffstat (limited to 'Master/texmf-dist/fonts/source/lh/base')
-rw-r--r-- | Master/texmf-dist/fonts/source/lh/base/fikparm.mf | 13 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/lh/base/lgrusu.mf | 6 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/lh/base/lgt2comi.mf | 22 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/lh/base/lgt2coml.mf | 78 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/lh/base/llbligtb.mf | 11 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/lh/base/lliligtb.mf | 11 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/lh/base/llrligtb.mf | 11 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/lh/base/lxpseudo.mf | 5 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/lh/base/lypseudo.mf | 5 |
9 files changed, 142 insertions, 20 deletions
diff --git a/Master/texmf-dist/fonts/source/lh/base/fikparm.mf b/Master/texmf-dist/fonts/source/lh/base/fikparm.mf index 7ce793a6b50..8374c4cc94d 100644 --- a/Master/texmf-dist/fonts/source/lh/base/fikparm.mf +++ b/Master/texmf-dist/fonts/source/lh/base/fikparm.mf @@ -4,7 +4,7 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.5 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % % This package is freeware product under conditions similar to @@ -84,6 +84,17 @@ if genmode="dc": genmode:="ec"; message "We use ec fonts only"; message ""; fi +% new booleans 2007 (3.5g) +% for mongolian italian otld with bar stroke; +% for lowercase yat with beak serifs +if unknown variant_obar: boolean variant_obar; + variant_obar:=false; +fi +if unknown variant_yat: boolean variant_yat; + variant_yat:=false; +fi + + % -- |param_base| can be changed only in begin file string param_base; param_base:=jobname; diff --git a/Master/texmf-dist/fonts/source/lh/base/lgrusu.mf b/Master/texmf-dist/fonts/source/lh/base/lgrusu.mf index 80766c6a9cf..c75aba18796 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgrusu.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgrusu.mf @@ -4,7 +4,7 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.5 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % % This package is freeware product under conditions similar to @@ -989,7 +989,7 @@ pos3(fudged.cap_stem,0); pos4(fudged.cap_stem,0); pos5(fudged.cap_stem,0); pos6(fudged.cap_stem,0); lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); x3=x4=w-x1; top y1=top y3=top y5=h; bot y2=bot y4=bot y6=0; -lft x5l=lft x6l=hround (.5[x1,x3]-.5cap_stem); % middle stem point +lft x5l=lft x6l=hround (.5[x1,x3]-.5fudged.cap_stem); % middle stem point filldraw stroke z1e--z2e; % left stem filldraw stroke z3e--z4e; % right stem filldraw stroke z5e--z6e; % center stem @@ -1029,7 +1029,7 @@ pos3(fudged.cap_stem,0); pos4(fudged.cap_stem,0); pos5(fudged.cap_stem,0); pos6(fudged.cap_stem,0); lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); x3=x4=w-x1; top y1=top y3=top y5=h; bot y2=bot y4=bot y6=0; -lft x5l=lft x6l=hround (.5[x1,x3]-.5cap_stem); % middle stem point +lft x5l=lft x6l=hround (.5[x1,x3]-.5fudged.cap_stem); % middle stem point filldraw stroke z1e--z2e; % left stem filldraw stroke z3e--z4e; % right stem filldraw stroke z5e--z6e; % center stem diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2comi.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2comi.mf index 12fef153d3e..8a7aff2fe18 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2comi.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgt2comi.mf @@ -4,7 +4,7 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.5 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % % This package is freeware product under conditions similar to @@ -409,6 +409,7 @@ filldraw circ_stroke z12e{up}--z13e{up}...z14e{left}--z15e; % ital_beak %%% penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); endchar; +iff not variant_obar:% lhchar "Italic Cyrillic letter otld - o tilded"; cyrchar(otld,9u#,x_height#,0); italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi; @@ -435,6 +436,25 @@ fi %%%%% penlabels(1,2,3,4,5,6,7); endchar; +iff variant_obar:% +lhchar "Italic Cyrillic letter otld - o bar"; +cyrchar(otld,9u#,x_height#,0); +italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi; +adjust_fit(0,0); pickup fine.nib; +% ital_o;tld +pos1(vair,90); pos2(curve,180); pos3(vair,270); pos4(curve,360); +x1=x3=.5w; lft x2r=hround(1.5u-.5curve); x4=w-x2; +top y1r=h+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 +%%% +% bar; +x7=x3; y7=bar_height; y8=y7; x8=x4; +pos7(vair,90); pos8(vair,90); +filldraw stroke z7e--z8e; +%%%%% +penlabels(1,2,3,4,5,6,7); endchar; + lhchar "Italic Cyrillic letter u_shrt - short u (as latin y)"; cyrchar(u_shrt,if monospace:8.5u# else:9u#fi, x_height#+acc_height#,desc_depth#); diff --git a/Master/texmf-dist/fonts/source/lh/base/lgt2coml.mf b/Master/texmf-dist/fonts/source/lh/base/lgt2coml.mf index b2cef9e2514..08231ad8c1b 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lgt2coml.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lgt2coml.mf @@ -4,7 +4,7 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.5 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % % This package is freeware product under conditions similar to @@ -363,15 +363,18 @@ else: numeric light_hair; fi penlabels(1,2,3,4,5,6); endchar; +iff not variant_yat:% lhchar "Lowercase Cyrillic letter yat"; cyrchar(yat,9u#,x_height#+acc_height#,0); italcorr .5x_height#*slant+min(.5curve#-u#,-.25u#); adjust_fit(if serifs: serif_fit# else: 0 fi,if monospace:.5u# else:0 fi); +pickup tiny.nib; +top y1=min(if serifs: x_height+ 1.5u else: x_height+2u fi,h-eps); full_h:=h; h:=x_height; % lower_yat; -pickup tiny.nib; pos1(fudged.stem,0); pos2(fudged.stem,0); +pos1(fudged.stem,0); pos2(fudged.stem,0); lft x1l=lft x2l=hround (2.5u-.5fudged.stem); -top y1=x_height+ if serifs: 1.5u else: 2u fi; bot y2=0; +bot y2=0; filldraw stroke z1e--z2e; % body of stem if serifs: save slab; slab:=vair; % lower.slab nodish_serif(2,1,a,1/3,jut,b,1/3,.5jut) ; fi % lower serif @@ -394,10 +397,9 @@ fill stroke super_arc.e([_three],[_two])..z[_one]e; % lobe %%% h:=full_h; -y10=h;%y1+2jut; -if hefty: - filldraw z1l--(x1l,y10)--(x1r,y10)--z1r--cycle; % stem -else: x10=x1l-jut; x11=x1r+jut; y10=y11; +if serifs: + if monospace: top fi y10=h;%y1+2jut; + x10=x1l-jut-eps; x11=x1r+jut+eps; y10=y11; filldraw z1l--z10--z1r--cycle; filldraw z1l--z11--z1r--cycle; fi % swallow % hcross @@ -408,6 +410,68 @@ filldraw stroke z8e--z9e; % cross bar %%%%% penlabels(0,1,2,3,4,5,6,7,8,9,10,11); endchar; +iff variant_yat:% +lhchar "Lowercase Cyrillic letter yat"; +cyrchar(yat,9u#,if serifs: if monospace: x_height#+acc_height# else:asc_height# fi else: x_height#+acc_height# fi,0); +italcorr .5x_height#*slant+min(.5curve#-u#,-.25u#); +adjust_fit(if serifs: if monospace: serif_fit# else:u#-.5width_adj#fi else: 0 fi,if monospace:.5u# else:0 fi); +pickup tiny.nib; +top y1=min(if serifs: x_height+ 1.5u else: x_height+2u fi,h-eps); +full_h:=h; h:=x_height; +% lower_yat; +pos1(fudged.stem,0); pos2(fudged.stem,0); +lft x1l=lft x2l=hround (2.5u-.5fudged.stem); +bot y2=0; +filldraw stroke z1e--z2e; % body of stem +if serifs: save slab; slab:=vair; % lower.slab + nodish_serif(2,1,a,1/3,jut,b,1/3,.5jut) ; fi % lower serif +% lsftsn_bowl(2); +_zero:=2; +_one:=3; _two:=4; _three:=5; _four:=6; _five:=7; +% +set_bar_axis; +penpos[_three](curve if hefty:-3stem_corr fi,0); +penpos[_four](vair',-90); penpos[_five](vair',-90); +z[_five]r=bot z[_zero]; y[_four]=y[_five]; +y[_three]=.5[y[_two]l,y[_four]l]; +y[_one]l=y[_two]l=y1.bh; y[_one]r=y[_two]r=y2.bh; +x[_two]l=x[_two]r=x[_four]=w-3.75u; %.5v_width+.75u; +x[_one]l=x[_one]r=x[_zero]; x[_three]r=hround(w-.6u); +x[_two]l:=x[_four]l:=x[_two]r-.25curve; +fill stroke + {{if not serifs: interim superness:=more_super; fi + z[_five]e..super_arc.e([_four],[_three])}} & + super_arc.e([_three],[_two])..z[_one]e; % lobe +%%% +h:=full_h; +if monospace: top y10=h;%y1+2jut; + x10=x1l-jut; x11=x1r+jut; y10=y11; + filldraw z1l--z10--z1r--cycle; + filldraw z1l--z11--z1r--cycle; % swallow +fi +if (serifs=true) and (monospace=false): + top y11=h; x11=x1; pos11(fudged.stem,0); + pickup tiny.nib; filldraw stroke z1e--z11e; % stem + numeric outer_jut; outer_jut=jut; + sloped_serif.l(11,2,ba,1/3,outer_jut,serif_drop); % upper serif + pickup crisp.nib; pos10(vair,90); pos8(hair,0); + y10r=x_height+1u; x10=x1; + pos9(hair,180); %x9=w-x8; + lft x9r=l+letter_fit+hround.45u; + y9=good.y(y10l-beak/1.4)-eps; + arm(10,9,f,beak_darkness,-.4beak_jut); % left arm and beak + x8-x10-u=x10-x9; y8=y9; + arm(10,8,e,beak_darkness,.4beak_jut); % right arm and beak +else: + % hcross + pickup crisp.nib; pos8(bar,90); pos9(bar,90); + lft x8=hround1/3u if serifs:-serif_fit fi; x9=x1r+2.5u; + top y8r=top y9r=vround x_height+eps; + filldraw stroke z8e--z9e; % cross bar +fi +%%%%% +penlabels(0,1,2,3,4,5,6,7,8,9,10,11); endchar; + iff not specific:% lhchar "Lowercase Cyrillic letter b_yus - big yus (`roman')"; cyrchar(b_yus,15u#,x_height#,0); diff --git a/Master/texmf-dist/fonts/source/lh/base/llbligtb.mf b/Master/texmf-dist/fonts/source/lh/base/llbligtb.mf index 1fe8c4f6ffa..83602f8facd 100644 --- a/Master/texmf-dist/fonts/source/lh/base/llbligtb.mf +++ b/Master/texmf-dist/fonts/source/lh/base/llbligtb.mf @@ -4,7 +4,7 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.5 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % % This package is freeware product under conditions similar to @@ -28,9 +28,13 @@ itc#=if serifs: max(0,flare#-.25u#) else: 1.25u# fi; %>>>!!! ligtable - "f": "i"=:oct"034", + "f": + if old_cyr=true: %relax + else: + "i"=:oct"034", "f"=:oct"033", "l"=:oct"035", + fi "'" kern itc#, "`" kern itc#, oct"020" kern itc#, @@ -41,8 +45,11 @@ ligtable "]" kern itc#; ligtable oct"033": % ff + if old_cyr=true: %relax + else: "i"=:oct"036", "l"=:oct"037", + fi "'" kern itc#, "`" kern itc#, oct"020" kern itc#, diff --git a/Master/texmf-dist/fonts/source/lh/base/lliligtb.mf b/Master/texmf-dist/fonts/source/lh/base/lliligtb.mf index c88521b31d6..1ac3e747278 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lliligtb.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lliligtb.mf @@ -4,7 +4,7 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.5 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % % This package is freeware product under conditions similar to @@ -28,9 +28,13 @@ itc#=(asc_height#-x_height#)*slant+.75u#; %>>>!!! ligtable - "f": "i"=:oct"034", + "f": + if old_cyr=true: %relax + else: + "i"=:oct"034", "f"=:oct"033", "l"=:oct"035", + fi "'" kern itc#, "`" kern itc#, oct"020" kern itc#, @@ -41,8 +45,11 @@ ligtable "]" kern itc#; ligtable oct"033": % ff + if old_cyr=true: %relax + else: "i"=:oct"036", "l"=:oct"037", + fi "'" kern itc#, "`" kern itc#, oct"020" kern itc#, diff --git a/Master/texmf-dist/fonts/source/lh/base/llrligtb.mf b/Master/texmf-dist/fonts/source/lh/base/llrligtb.mf index 3c1d53ab94c..b06600a8b22 100644 --- a/Master/texmf-dist/fonts/source/lh/base/llrligtb.mf +++ b/Master/texmf-dist/fonts/source/lh/base/llrligtb.mf @@ -4,7 +4,7 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.5 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % % This package is freeware product under conditions similar to @@ -28,9 +28,13 @@ itc#=if serifs: max(0,flare#-.25u#) else: 1.25u# fi; %>>>!!! ligtable - "f": "i"=:oct"034", + "f": + if old_cyr=true: %relax + else: + "i"=:oct"034", "f"=:oct"033", "l"=:oct"035", + fi "'" kern itc#, "`" kern itc#, oct"020" kern itc#, @@ -41,8 +45,11 @@ ligtable "]" kern itc#; ligtable oct"033": % ff + if old_cyr=true: %relax + else: "i"=:oct"036", "l"=:oct"037", + fi "'" kern itc#, "`" kern itc#, oct"020" kern itc#, diff --git a/Master/texmf-dist/fonts/source/lh/base/lxpseudo.mf b/Master/texmf-dist/fonts/source/lh/base/lxpseudo.mf index 5422fe60046..48ed5ba970b 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lxpseudo.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lxpseudo.mf @@ -4,7 +4,7 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.5 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % % This package is freeware product under conditions similar to @@ -91,6 +91,9 @@ numeric cap_accent_height, cap_accent_height#; cap_accent_height# = cap_height# + acc_height#; def pseudo_setup = + if monospace: + if true_mono: let normal_adjust_fit=mono_adjust_fit; fi + fi if ebbase=1:%(CMBRIGHT) idot_diam:=stem'; idot_diam#:=stem'/hppp; diff --git a/Master/texmf-dist/fonts/source/lh/base/lypseudo.mf b/Master/texmf-dist/fonts/source/lh/base/lypseudo.mf index aef1672edc8..0bc6c9f1e78 100644 --- a/Master/texmf-dist/fonts/source/lh/base/lypseudo.mf +++ b/Master/texmf-dist/fonts/source/lh/base/lypseudo.mf @@ -4,7 +4,7 @@ %% Cyrillic font container with T2 encoding beta-support % % This file is future part of lxfonts package -% Version 3.5 // Patchlevel=0 +% Version 3.5 // Patchlevel=1 % (c) O.Lapko % % This package is freeware product under conditions similar to @@ -67,6 +67,9 @@ numeric cap_accent_height, cap_accent_height#; cap_accent_height# = acc_height# + hi.x_height#; def pseudo_setup= + if monospace: + if true_mono: let normal_adjust_fit=mono_adjust_fit; fi + fi if ebbase=1:%(CMBRIGHT) idot_diam:=stem'; idot_diam#:=stem'/hppp; |