summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/fonts/source/lh/nont2/lgcvacl.mf
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/fonts/source/lh/nont2/lgcvacl.mf')
-rw-r--r--Master/texmf-dist/fonts/source/lh/nont2/lgcvacl.mf33
1 files changed, 19 insertions, 14 deletions
diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgcvacl.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgcvacl.mf
index 6b769826afb..33e6a697135 100644
--- a/Master/texmf-dist/fonts/source/lh/nont2/lgcvacl.mf
+++ b/Master/texmf-dist/fonts/source/lh/nont2/lgcvacl.mf
@@ -4,13 +4,13 @@
%% Cyrillic font container with T2 encoding beta-support
%
% This file is future part of lxfonts package
-% Version 3.4 // Patchlevel=0
+% Version 3.5 // Patchlevel=0
% (c) O.Lapko
%
-% This package belongs to the public domain under conditions similar to
+% This package is freeware product under conditions similar to
% those of D. E. Knuth specified for the Computer Modern family of fonts.
% In particular, only the authors are entitled to modify this file
-% and to save it under the same name.
+% (and all this package as well) and to save it under the same name.
%
% Content:
%
@@ -48,7 +48,7 @@
% dje_ac
%
-LHver_check(3,4); % like |version_check| in ec
+LHver_check(3,5); % like |version_check| in ec
lhchar "Lowercase Cyrillic letter a_ac - a acute";
cyrchar_twice(a_ac,9u#,x_height#,0); % eng
@@ -585,6 +585,7 @@ endgroup;
hpos_corr=-u; put_accent; repeat_once;
penlabels(1,2,3,4,5,6,7,8); endchar;
+iff not concrete:%
iff not specific:%
lhchar "Lowercase Cyrillic letter ya_ac - ya acute (`roman')";
cyrchar_twice(ya_ac,if serifs: 9.75u# else: 10u# fi-.5width_adj#,x_height#,0); %ya (~n_width:10u)
@@ -675,7 +676,7 @@ filldraw stroke z8e--z9e; % cross bar
%%%%%
endgroup;
% the accent
-hpos_corr=-u; put_accent; repeat_once;
+put_accent(cyrcaph); repeat_once; % cyrcaph for asc_height
penlabels(0,1,2,3,4,5,6,7,8,9,10); endchar;
lhchar "Lowercase Cyrillic letter izh_ac - izhitsa acute";
@@ -1064,22 +1065,23 @@ else:
bot_thickness=vair';
upper_side=max(fine.breadth,hround(.3[vair',stem]-stem_corr));
lower_side=hround(.3[vair',stem]+stem_corr); fi
- x0=.5w; y0=if serifs:.7x_height else:bar_height fi; %h;%%%%%%%%%%%%%%
+ x0=.5w; y0=if hefty:bar_height else:.7x_height fi; %h;%%%%%%%%%%%%%%
pickup fine.nib; theta=90-angle(20u,h); slope:=-h/20u;
if lower_side>1.2upper_side: upper_side:=lower_side; fi
pos1(top_thickness,-90); pos6(bot_thickness,-90);
-x1=x6=.5w; top y1l=h+o; bot y6r=-o; pos0(fudged.stem-2stem_corr,theta);
+x1=x6=.5w; top y1l=h+o; bot y6r=-o;
+pos0(max(fine.breadth,fudged.stem-2stem_corr),theta);
lft x2l=w-rt x8l=hround 1.25u; lft x7r=w-rt x5r=hround 1.75u if not serifs:+.5u fi;
x2r-x2l=if serifs:fudged.stem else:upper_side fi-fine;
x5r-x5l=lower_side-fine;
ellipse_set(1l,2l,3l,0l); ellipse_set(1r,2r,3r,0r);
ellipse_set(6l,5l,4l,0l); ellipse_set(6r,5r,4r,0r);
numeric tau; tau=max(.8,.20710678/(superness-.5));
-y2r:=y2l+serif_drop;
+y2r:=vround(y2l+max(1,serif_drop)+eps);
filldraw stroke z2e{down}
..z3e---z4e..z5e{down}..tension atleast tau..z6e{left}; % S stroke
pos7(lower_side,180); pos8(upper_side,180);
-y7=.5[y5l,y5r]; y8=.5[y2l,y2r]; pos9(vair,90); z9=z0;
+y7=.5[y5l,y5r]; y8=.5[y2l,y2r]; pos9(vair,90); z9=(x0,min(y0,y8-eps));
filldraw stroke z8e{down}
..tension atleast tau and atleast 1..{-18u,-.618h}z9e; % upper right stroke
filldraw stroke z6e{left}..tension atleast tau..z7e{up}
@@ -1092,15 +1094,18 @@ if serifs:
filldraw z1'l{dir theta}..tension atleast 1 and 1..{down}z8'l
--z8'r{up}...{-dir theta}z1'r..cycle; % bulb
% from sloped serif
- pos12(slab,90); lft x12=x2l-.5jut; y12r=y2r-serif_drop; z14=z2l;
- filldraw z2r--z12r--z12l{right}
- ...1/3[(x14,y12l),.5[z12l,z14] ]{z14-z12l}
- ...{down}z14--(x2r,y14)--cycle; % sloped serif
+ if serif_drop>0:
+ pos12(slab,90); lft x12=hround(x2l-max(1,.5jut)-.5-eps);
+ top y12r=vround(y2r-max(0,serif_drop)-eps); z14=(x2l,min(y2l-.5,y12)-eps);
+ filldraw z2r--z12r--z12l{right}
+ ...1/3[(x14,y12l),.5[z12l,z14] ]{z14-z12l}
+ ...{down}z14--(x2r,y14)--cycle; % sloped serif
+ fi
else: pos10(flare,225); x10r=x1; y10l=h+oo;
filldraw stroke z8e{up}...z10e; fi
%%%%%
% the accent
-put_accent(cyrcaph); repeat_once; % cyrcaph for acs_height
+put_accent(cyrcaph); repeat_once; % cyrcaph for asc_height
penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12); endchar;
lhchar "Lowercase Cyrillic letter y_ac - straight u acute";