1 files changed, 16 insertions, 67 deletions
diff --git a/Master/texmf-dist/fonts/source/lh/nont2/lgcaccl.mf b/Master/texmf-dist/fonts/source/lh/nont2/lgcaccl.mf
index c565dd8f05b..d914f4c8b7b 100644
--- a/Master/texmf-dist/fonts/source/lh/nont2/lgcaccl.mf
+++ b/Master/texmf-dist/fonts/source/lh/nont2/lgcaccl.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
@@ -44,7 +43,7 @@
 % ch_ldot
 %
 
-LHver_check(3,4); % like |version_check| in ec
+LHver_check(3,5); % like |version_check| in ec
 
 lhchar "Lowercase Cyrillic letter a_bar";
 cyrchar(a_bar,9u#,lc_trema_height#,0);
@@ -159,11 +158,12 @@ penstroke 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
@@ -412,11 +412,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
@@ -492,59 +493,6 @@ else:
  filldraw stroke z[_one]e--z[_two]e;  fi % bar
 penlabels(1,2,3,4,5,6,7,8,9, 10,11); endchar;
 
-lhchar "Lowercase Cyrillic letter erev_uml - reverse e umlaut";
-cyrchar(erev_uml,8u#,lc_trema_height#,0); % eng
-italcorr x_height#*slant-.2u#;
-adjust_fit(if monospace: .5u#,.5u# else: 0,0 fi);
-full_h:=h; h:=x_height;
-% lower_erev;
-set_bar_axis;
-pickup fine.nib; pos2(vair',90); pos3(curve,0); pos4(vair',-90);
-x2=x4=w-.5(w+u); top y2r=vround(h+1.5oo); bot y4r=-oo;
-rt x3r=w-hround max(.6u,1.35u-.5curve); y3=.5h; % eng
-if serifs:
- pos1(hair,180); pos5(hair,-180);
- y1=min(y2.bh+.75flare-.25vair+eps,.9[bar_height,h]-.75flare);
- lft x1r=lft x5r=hround.5u;
- y5=max(good.y(.5bar_height-.9),y4l+vair');
- (x,y4l)=whatever[z4r,z5l]; x4l:=max(x,x4l-.5u);
- filldraw stroke z1e{x2-x1,5(y2-y1)}...pulled_super_arc.e(2,3)(.7superpull)
-  & pulled_super_arc.e(3,4)(.5superpull)
-  ..tension .9 and 1..{x5-x4,5(y5-y4)}z5e;  % arc and lower terminal
- pos6(.3[fine.breadth,hair],180); x6r=x1r; top y6=h+oo;
- x1'-x1r=1.5curve; y1'=y1;
- path upper_arc; upper_arc=z1{x2-x1,5(y2-y1)}..z2{right};
- numeric t; t=xpart(upper_arc intersectiontimes (z6l--z1'));
- filldraw z1r--z6r--z6l--subpath(t,0) of upper_arc--cycle; % barb
-else:
- pos1(4/7[vair',flare],100); pos5(.6[vair',flare],-95);
- lft x1r=good.x .6u; top y1r=vround .82[bar_height,top y2r];
- filldraw stroke term.e(2,1,left,.8,4);  % upper terminal
- lft x5r=good.x .5u;
- y5r=good.y(y5r+1/3bar_height-y5); y5l:=good.y y5l; x5l:=good.x x5l;
- forsuffixes e=l,r: path p.e; p.e=z4e{left}..tension .9 and 1..z5e;
-  if angle direction 1 of p.e<105:
-   p.e:=z4e{left}..tension atleast.9 and 1..{dir 105}z5e; fi
- endfor
- filldraw stroke pulled_super_arc.e(2,3)(.7superpull)
-  & pulled_super_arc.e(3,4)(.5superpull) & p.e; fi  % arc and lower terminal
-%%%
-% lerev_bar;
-if (serifs=true) and (bar#<=.5curve#):
-   x7r=max(rt x1l+.5hair,0.85[x3l,x1l]); x8r=x3l;
-   y7l=y8l=y1.bh; y7r=y8r=y2.bh; x7l=x7r; x8l=x8r;
-   numeric bar[];
-   bar2=7/8[bar,fudged.stem-2stem_corr];
-   penpos9(bar2,45); z9=.475[z7l,z8l];
-   fill circ_stroke z7e{2,1}..{2,-1}z9e..{2,1}z8e; % curve /\/
-else:
-   bar_stroke(max(rt x1l+.5hair,0.85[x3l,x1l]),x3l); % bar --
-fi
-%%%%%
-% the accent
-h:=full_h; lowercase_umlaut(0,0, 10,11,12,13);
-penlabels(1,1',2,3,4,5,6,7,8,9, 10,11,12,13); endchar;
-
 lhchar "Lowercase Cyrillic letter erev_dot - reverse e dot";
 cyrchar_twice(erev_dot,8u#,x_height#,0); % eng
 italcorr x_height#*slant-.2u#;
@@ -1063,11 +1011,12 @@ if serifs:
   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