summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/fonts/source/lh/nont2/lgcacci.mf
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/fonts/source/lh/nont2/lgcacci.mf')
-rw-r--r--Master/texmf-dist/fonts/source/lh/nont2/lgcacci.mf54
1 files changed, 16 insertions, 38 deletions
diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgcacci.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgcacci.mf
index ac33585cf81..7c564bd8489 100644
--- a/Master/texmf-dist/fonts/source/lh/nont2/lgcacci.mf
+++ b/Master/texmf-dist/fonts/source/lh/nont2/lgcacci.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=1
% (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:
%
@@ -28,7 +28,6 @@
% u_gr
% u_com
% ery_bar
-% erev_uml
% erev_dot
% erev_bar
% yu_bar
@@ -50,7 +49,7 @@
% Vt - Serbian italic variant
%
-LHver_check(3,4); % like |version_check| in ec
+LHver_check(3,5); % like |version_check| in ec
lhchar "Italic Cyrillic letter a_bar";
cyrchar(a_bar,9u#,lc_trema_height#,0);
@@ -130,11 +129,12 @@ filldraw stroke pulled_arc.e(1,2) & pulled_arc.e(2,3)
y[_four]+.5bulb_diam=-d+y_move+height;
pos[_four](bulb_diam,90);
pos[_one](vair,90); pos[_two](vair,0); pos[_three](vair,-45);
- z[_one]r=z[_four]r; rt x[_two]r=hround(x[_four]+.5bulb_diam
+ z[_one]r=z[_four]r;
+ rt x[_two]r=hround max(rt x[_one]+eps,x[_four]+.5bulb_diam
+if monospace:.28u / expansion_factor else:.25u fi)+2eps;
x[_three]=x[_four]-.5u if monospace: /expansion_factor fi;
- y[_two]=1/3[y[_one],y[_three]];
- bot y[_three]r=vround(y[_four]-(height-.5bulb_diam));
+ y[_two]=1/3[y[_one],y[_three]]+eps;
+ bot y[_three]r=vround min(bot y[_four]-.5,y[_four]-(height-.5bulb_diam))-eps;
y_:=ypart((z[_one]{right}...z[_two]{down}...z[_three])
intersectiontimes (z[_four]l{right}..{left}z[_four]r));
if y_<0: y_:=1; fi
@@ -265,11 +265,12 @@ h:=full_h;
y[_four]+.5bulb_diam=h+y_move;
pos[_four](bulb_diam,90);
pos[_one](vair,90); pos[_two](vair,0); pos[_three](vair,-45);
- z[_one]r=z[_four]r; rt x[_two]r=hround(x[_four]+.5bulb_diam
+ z[_one]r=z[_four]r;
+ rt x[_two]r=hround max(rt x[_one]+eps,x[_four]+.5bulb_diam
+if monospace:.28u / expansion_factor else:.25u fi)+2eps;
x[_three]=x[_four]-.5u if monospace: /expansion_factor fi;
- y[_two]=1/3[y[_one],y[_three]];
- bot y[_three]r=vround(y[_four]-(height-.5bulb_diam));
+ y[_two]=1/3[y[_one],y[_three]]+eps;
+ bot y[_three]r=vround min(bot y[_four]-.5,y[_four]-(height-.5bulb_diam))-eps;
y_:=ypart((z[_one]{right}...z[_two]{down}...z[_three])
intersectiontimes (z[_four]l{right}..{left}z[_four]r));
if y_<0: y_:=1; fi
@@ -324,30 +325,6 @@ else:
filldraw stroke z[_one]e--z[_two]e; fi % bar
penlabels(0,1,1',2,3,4,5,6,7,8,9,10, 11,12); endchar;
-lhchar "Italic Cyrillic letter erev_uml - reverse e umlaut";
-cyrchar(erev_uml,8u#,lc_trema_height#,0);
-italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi; %o
-adjust_fit(0,if monospace:0 else:-.35u# fi); %o
-h:=x_height;
-% ital_erev;
-pickup fine.nib;
-pos0(flare,180); pos1(hair,-180); pos2(vair,-90);
-pos3(curve,0); pos4(vair,90); pos5(hair,140);
-x2+.5u=x4=.5(w-u); lft x1r=min(lft x2,hround(.25u))-eps;
-rt x3r=w-hround(1.5u-.5curve); lft x5r=good.x (lft x1r-eps); x6=x5;
-y1-.5flare=.1h; bot y2r=-oo; bulb(2,1,0); % bulb
-top y4r=h+oo; y3=.5[y2,y4]; top y5r=vround .5[bar_height,h];
-y6=bar_height; path p; p=z4{left}....z5..z6;
-filldraw stroke pulled_arc.e(2,3)
- & pulled_arc.e(3,4)...{direction 1 of p}z5e; % arc
-x7=x3; y7=bar_height; y8=y7; lft x8=hround min(lft x2-1-eps,rt x0l+eps);
-pos7(vair,90); pos8(vair,90);
-filldraw stroke z7e--z8e;
-%%%
-% the accent
-h:=full_h; lowercase_umlaut(0,0, 9,10,11,12);
-penlabels(0,1,2,3,4,5,6,7,8, 9,10,11,12); endchar;
-
lhchar "Italic Cyrillic letter erev_dot - reverse e dot";
cyrchar_twice(erev_dot,8u#,x_height#,0);
italcorr x_height#*slant-beak_jut#-.25u#; %o
@@ -801,11 +778,12 @@ filldraw stroke z7e{down}..{-u,-x_height}z8e; % right stem
y[_four]+.5bulb_diam=-d+y_move+height;
pos[_four](bulb_diam,90);
pos[_one](vair,90); pos[_two](vair,0); pos[_three](vair,-45);
- z[_one]r=z[_four]r; rt x[_two]r=hround(x[_four]+.5bulb_diam
+ z[_one]r=z[_four]r;
+ rt x[_two]r=hround max(rt x[_one]+eps,x[_four]+.5bulb_diam
+if monospace:.28u / expansion_factor else:.25u fi)+2eps;
x[_three]=x[_four]-.5u if monospace: /expansion_factor fi;
- y[_two]=1/3[y[_one],y[_three]];
- bot y[_three]r=vround(y[_four]-(height-.5bulb_diam));
+ y[_two]=1/3[y[_one],y[_three]]+eps;
+ bot y[_three]r=vround min(bot y[_four]-.5,y[_four]-(height-.5bulb_diam))-eps;
y_:=ypart((z[_one]{right}...z[_two]{down}...z[_three])
intersectiontimes (z[_four]l{right}..{left}z[_four]r));
if y_<0: y_:=1; fi