trunk/Master/texmf-dist/fonts/source

git-svn-id: svn://tug.org/texlive/trunk@101 c570f23f-e606-0410-a88d-b1316a301751

68 files changed, 7424 insertions, 0 deletions

diff --git a/Master/texmf-dist/fonts/source/public/wnri/acctmax.mf b/Master/texmf-dist/fonts/source/public/wnri/acctmax.mf
new file mode 100644
index 00000000000..3ff533b9bd3
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/acctmax.mf
@@ -0,0 +1,106 @@
+%
+% Washington Romanized Indic accent driver
+%
+% File       : acctmax.mf
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Roman and encoded according to
+% the Classical Sanskrit/Classical Sanskrit eXtended character set. 
+% See wnindic.map for more details.
+%
+
+transform At,Tf; At=Tf=identity;
+
+numeric acctdiff; acctdiff = min(dot_size,1/3(asc_height-x_height));
+
+def makeACCENT(suffix $) = 
+transform Tf; Tf = identity shifted(-.5w,0);
+if tracingspecs>0:
+	message ">> savepicture ";
+	show str $;
+	show Tf;
+	fi
+picture $; $=currentpicture transformed Tf; 
+enddef;
+
+def savePicture(suffix $) = 
+if tracingspecs>0:
+	message ">> savepicture ";
+	show str $;
+	show Tf;
+	fi
+picture $; $=currentpicture transformed Tf; 
+enddef;
+
+% addpicture
+def ap(suffix $) =
+  if unknown At: transform At; At=identity; fi
+  if tracingspecs>0:
+	  message ">> addpicture "; 
+	  show str $; 
+	  show At;
+	  fi
+  addto currentpicture also $ transformed At;
+enddef;
+
+def whap(suffix $,$$,$$$) =
+  if unknown At: transform At; At=identity; fi
+  if tracingspecs>0:
+	  message ">> addpicture "; 
+	  show str $; 
+	  show At;
+	  fi
+  if w > $$$: addto currentpicture also $ transformed At;
+  else: addto currentpicture also $$ transformed At;
+  fi
+enddef;
+
+numeric adhocht; adhocht=0;
+
+% shall accented characters show the height and depth of the accent?
+if unknown trueheights: boolean trueheights; trueheights=false; fi
+
+%adjustacctht
+def ah =
+ if trueheights:
+  if asc_height + (h - x_height) + adhocht > h: 
+     h:=asc_height + (h - x_height)+ adhocht; charht:= h / vppp;
+  fi
+ fi
+enddef;
+
+%adjustacctdp
+def ad =
+ if trueheights:
+  if d < desc_depth: d:=desc_depth; chardp:= d / vppp; fi
+ fi
+enddef;
+
+def deepen =
+ if trueheights:
+  if d <  max(dot_size,cap_curve)+.25x_height: d:=dot_diam+.25x_height;
+      chardp:=max(dot_size#,cap_curve#)+.25x_height#;
+  fi
+ fi
+enddef;
+
+% general accent height shift from x_height
+numeric acht; 
+acht:= if serifs: max(2/3[asc_height,x_height],x_height+o+hair)
+       else: vround 2/3[asc_height,x_height]
+       fi ;
+
+% replaced by use of czd
+%def slurped (expr accentpoint) =
+%  identity shifted ((xpart accentpoint) + slant*(ypart accentpoint),aspect_ratio * (ypart accentpoint))
+%enddef;
+
+% end of file acctmax.mf
diff --git a/Master/texmf-dist/fonts/source/public/wnri/acutacct.mf b/Master/texmf-dist/fonts/source/public/wnri/acutacct.mf
new file mode 100644
index 00000000000..a259ad2b608
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/acutacct.mf
@@ -0,0 +1,30 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw acute accents
+%
+
+boolean ACUTE; ACUTE=true;
+
+cmchar "Acute accent";
+beginchar(oct"023",9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant-if serifs: 1.5 fi u#;
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1+.5stem=hround(w-2u); x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ rt x1r=hround(w-1.5u); lft x2l=hround(.5w-.25u-.5vair);
+ top y1=h; bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+makeACCENT(AcutePic);
+penlabels(1,2); endgroup;
+extra_endchar:=
+  " czu  ap(AcutePic);  ah; oechar; ";
+def cp = acute enddef; 
+boolean dotson; dotson:=false;
+
+% end of file acutacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/addpunc.mf b/Master/texmf-dist/fonts/source/public/wnri/addpunc.mf
new file mode 100644
index 00000000000..f94945d7567
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/addpunc.mf
@@ -0,0 +1,115 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros for various punctuation marks
+%
+
+cmchar "Circumflex (hat) accent";
+newchar(hat,9u#,min(asc_height#,2x_height#),0);
+if serifs: italcorr .5[x_height#,h#]*slant+.5hair#-1.75u#;
+ adjust_fit(0,0);
+ pickup crisp.nib; pos2(.5[vair,curve],90); top y2r=h; x2=.5w;
+ x1=w-x3=good.x 2.25u; y1=y3=.5[x_height,y2];
+ pos1(hair,angle(z2-z1)+90); pos3(hair,angle(z3-z2)+90);
+ filldraw stroke z1e--z2e--z3e;  % diagonals
+else: italcorr 2/3[x_height#,h#]*slant-.5stem#+.5vair#-.75u#;
+ adjust_fit(0,0);
+ pickup fine.nib; pos1(vair,0); pos3(vair,0); x1=w-x3;
+ pos2(stem,0); top y2=h; x2=.5w; bot y1=bot y3=vround 2/3[h,x_height]-eps;
+ lft x1l=hround(rt x2r-3.25u-.5vair); % same slope as in the acute accent
+ z0=whatever[z1r,z2r]=whatever[z2l,z3l];
+ y4l=y4r=y2; x4l=good.x .2[x2l,x2]; x4r=w-x4l;
+ filldraw z4l--z1l--z1r--z0--z3l--z3r--z4r--cycle; fi  % diagonals
+penlabels(0,1,2,3,4); endchar;
+
+cmchar "Underbar";
+compute_spread((5/8+.45)*x_height#,(3/4+.55)*x_height#);
+newchar(underscore,14u#,0,spread#-math_axis#+.5rule_thickness#);
+adjust_fit(0,0); pickup rule.nib;
+lft x1=hround 1.5u-eps; x2=w-x1; bot y1=bot y2=-d;
+draw z1--z2;  % bar
+labels(1,2); endchar;
+
+cmchar "Left curly brace";
+newchar(left_brace,9u#,body_height#,paren_depth#);
+italcorr body_height#*slant+.5vair#-u#;
+adjust_fit(0,0); pickup fine.nib;
+forsuffixes $=1,1',4,4',7,7': pos$(vair,0); endfor
+forsuffixes $=2,3,5,6: pos$(stem,0); endfor
+x2=x3=x5=x6; x1=x1'=x7=x7'=w-x4=w-x4';
+lft x4l=hround(1.5u-.5vair); lft x2l=hround(.5w-.5stem);
+top y1=h; bot y7=-d; .5[y4,y4']=.5[y1,y7]=.5[y2,y6]=.5[y3,y5];
+y1-y2=y3-y4=(y1-y4)/4; y1-y1'=y4-y4'=y7'-y7=vair-fine;
+filldraw z1l{left}...z2l---z3l...{left}z4l
+ --z4'l{right}...z5l---z6l...{right}z7l
+ --z7r--z7'r{left}...z6r---z5r...{left}.5[z4r,z4'r]{right}
+ ...z3r---z2r...{right}z1'r--z1r--cycle;  % stroke
+penlabels(1,2,3,4,5,6,7); endchar;
+
+cmchar "Right curly brace";
+newchar(right_brace,9u#,body_height#,paren_depth#);
+italcorr math_axis#*slant+.5vair#-u#;
+adjust_fit(0,0); pickup fine.nib;
+forsuffixes $=1,1',4,4',7,7': pos$(vair,0); endfor
+forsuffixes $=2,3,5,6: pos$(stem,0); endfor
+x2=x3=x5=x6; x1=x1'=x7=x7'=w-x4=w-x4';
+rt x4r=hround(w-1.5u+.5vair); rt x2r=hround(.5w+.5stem);
+top y1=h; bot y7=-d; .5[y4,y4']=.5[y1,y7]=.5[y2,y6]=.5[y3,y5];
+y1-y2=y3-y4=(y1-y4)/4; y1-y1'=y4-y4'=y7'-y7=vair-fine;
+filldraw z1r{right}...z2r---z3r...{right}z4r
+ --z4'r{left}...z5r---z6r...{left}z7r
+ --z7l--z7'l{right}...z6l---z5l...{right}.5[z4l,z4'l]{left}
+ ...z3l---z2l...{left}z1'l--z1l--cycle;  % stroke
+penlabels(1,2,3,4,5,6,7); endchar;
+
+cmchar "Tilde (squiggle) accent";
+newchar(Tilde,9u#,min(asc_height#,10/7x_height#+.5dot_size#),0);
+italcorr h#*slant-u#;
+adjust_fit(0,0);
+if serifs: numeric theta; theta=angle(1/6(6u-vair),1/4(h-x_height));
+ pickup crisp.nib; numeric mid_width; mid_width=.4[vair,stem];
+ pos1(vair,theta+90); pos2(vair,theta+90);
+ pos3(vair,theta+90); pos4(vair,theta+90);
+ z2-z1=z4-z3=(mid_width-crisp)*dir theta;
+ lft x1r=w-rt x4l=hround 1.5u; top y4r=h;
+ bot y1l=vround(bot y1l+min(2/3[x_height,h],y3l-.25vair)-top y1r);
+ pair delta; ypart delta=3(y3l-y1l); delta=whatever*dir theta;
+ filldraw z1l..controls(z1l+delta)and(z3l-delta)..z3l..z4l
+  --z4r..controls(z4r-delta)and(z2r+delta)..z2r..z1r--cycle;  % stroke
+else: pickup fine.nib; pos1(vair,180); pos2(vair,90);
+ pos3(.5[vair,slab],90); pos4(vair,90); pos5(vair,180);
+ lft x1r=w-rt x5l=hround 1.5u; x2-x1=x3-x2=x4-x3=x5-x4;
+ bot y1=bot y4l=vround(.75[x_height,h]-vair);
+ top y2r=top y5=h; y3=.5[y2,y4];
+ filldraw stroke z1e{up}...z2e{right}..z3e..{right}z4e...{up}z5e; fi % stroke
+penlabels(1,2,3,4,5); endchar;
+
+cmchar "Reverse slash (backslash)";
+newchar(backslash,9u#,body_height#,paren_depth#);
+adjust_fit(0,0); pickup rule.nib;
+lft x1=hround u-eps; top y1=h+eps;
+rt x2=hround(w-u)+eps; bot y2=-d-eps;
+draw z1--z2;  % diagonal
+labels(1,2); endchar;
+
+cmchar "Vertical line";
+newchar(vertical,5u#,body_height#,paren_depth#);
+italcorr body_height#*slant+.5rule_thickness#-2u#;
+adjust_fit(0,0); pickup rule.nib;
+x1=x2=good.x .5w; top y1=h+eps; bot y2=-d-eps;
+draw z1--z2;  % stem
+labels(1,2); endchar;
+
+cmchar "Closing quotes";
+newchar(rquote,7u#+max(2u#,dot_size#),asc_height#,0);
+italcorr asc_height#*slant+dot_size#-4.1u#;
+adjust_fit(0,0);
+x1-.5dot_size=hround .6u; y2+.5dot_size=h;
+x2-x1=hround(1.5u+max(2u,dot_size)); y2=y1;
+comma(1,a,dot_size,.25u,comma_depth); % left dot and tail
+comma(2,b,dot_size,.25u,comma_depth); % right dot and tail
+penlabels(1,2); endchar;
+
+% end of file addpunc.mf
+
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/baraacct.mf b/Master/texmf-dist/fonts/source/public/wnri/baraacct.mf
new file mode 100644
index 00000000000..012b5a39ce2
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/baraacct.mf
@@ -0,0 +1,52 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros for macron + acute accent
+%
+
+numeric barwidth; barwidth=vround .2[vair,stem];
+numeric semiwidth; semiwidth=7.5u;
+
+cmchar "Acute accent";
+beginchar(oct"023",9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant-if serifs: 1.5 fi u#;
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1+.5stem=hround(w-2u); x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ rt x1r=hround(w-1.5u); lft x2l=hround(.5w-.25u-.5vair);
+ top y1=h; bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+transform Tf; Tf = identity shifted (-.5w+slant*(-y2),-y2*aspect_ratio);
+savePicture(MacronPic);
+endgroup;
+cmchar "Macron (bar) accent";
+numeric macron_breadth#; macron_breadth#=.2[vair#,stem#];
+beginchar(oct"026",9u#,.4[x_height#,asc_height#]+macron_breadth#,0);
+italcorr h#*slant-.75u#;
+adjust_fit(0,0);
+numeric macron_breadth; macron_breadth:=Vround .2[vair,stem];
+pickup if serifs: crisp.nib else: fine.nib fi;
+pos1(macron_breadth,90); pos2(macron_breadth,90);
+top y1r=top y2r=h+o; lft x1=w-rt x2=hround 1.25u;
+filldraw stroke z1e--z2e;  % bar
+transform At; At=identity shifted(.5w+slant*(h+acctdiff),aspect_ratio*(h+acctdiff));
+ap(MacronPic);
+if monospace: currentpicture:=currentpicture shifted(0,1/2aspect_ratio*dot_size); fi
+makeACCENT(MacronPic);
+endgroup;
+
+
+
+extra_endchar:=
+  " czu ap(MacronPic);  ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = baract enddef;
+
+% end of file baracct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/bargacct.mf b/Master/texmf-dist/fonts/source/public/wnri/bargacct.mf
new file mode 100644
index 00000000000..59f2564ae43
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/bargacct.mf
@@ -0,0 +1,49 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros for macron + grave accent
+%
+
+numeric barwidth; barwidth=vround .2[vair,stem];
+numeric semiwidth; semiwidth=7.5u;
+
+cmchar "Grave accent";
+beginchar(oct"022",9u#,min(asc_height#,2x_height#),0);
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1-.5stem=hround 2u; x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ lft x1l=hround 1.5u; rt x2r=hround(.5w+.25u+.5vair);
+ top y1=h; bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+transform Tf; Tf = identity shifted (-.5w+slant*(-y2),-y2*aspect_ratio);
+savePicture(MacronPic);
+endgroup;
+cmchar "Macron (bar) accent";
+numeric macron_breadth#; macron_breadth#=.2[vair#,stem#];
+beginchar(oct"026",9u#,.4[x_height#,asc_height#]+macron_breadth#,0);
+italcorr h#*slant-.75u#;
+adjust_fit(0,0);
+numeric macron_breadth; macron_breadth:=Vround .2[vair,stem];
+pickup if serifs: crisp.nib else: fine.nib fi;
+pos1(macron_breadth,90); pos2(macron_breadth,90);
+top y1r=top y2r=h+o; lft x1=w-rt x2=hround 1.25u;
+filldraw stroke z1e--z2e;  % bar
+transform At; At=identity shifted(.5w+slant*(h+acctdiff),aspect_ratio*(h+acctdiff));
+ap(MacronPic);
+if monospace: currentpicture:=currentpicture shifted(0,1/2aspect_ratio*dot_size); fi
+makeACCENT(MacronPic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(MacronPic);  ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = bargrv enddef;
+
+% end of file bargacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/bnduacct.mf b/Master/texmf-dist/fonts/source/public/wnri/bnduacct.mf
new file mode 100644
index 00000000000..d36283b2e35
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/bnduacct.mf
@@ -0,0 +1,32 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macro for candrabindu accent
+%
+
+cmchar "candrabindu accent";
+numeric dot_diam#, dot_diam; dot_diam#=max(dot_size#,cap_curve#);
+beginchar(oct"025",9u#,min(asc_height#,2x_height#),0);
+define_whole_blacker_pixels(dot_diam);
+italcorr h#*slant+.5vair#-1.5u#;
+adjust_fit(0,0);
+pickup crisp.nib; pos1(vair,-180); pos3(vair,0);
+numeric mid_thickness; mid_thickness=vround 1/3[vair,stem];
+pos2(mid_thickness,-90); x2=.5w;
+bot y2r=vround max(x_height+o+tiny,1/3[x_height,h]+o-.5mid_thickness);
+y1=y3=.5[y2l,h]; lft x1r=w-rt x3r=hround(2u-.5vair);
+filldraw stroke z1e{down}...z2e{right}...{up}z3e;  % stroke
+pickup tiny.nib; pos11(dot_diam,0); pos12(dot_diam,90);
+x11=x12=.5w; top y12r=max(h+1,y2l+1.5dot_diam);
+y11=.5[y12l,y12r]; dot(11,12);
+makeACCENT(CbPic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(CbPic);  ah; oechar; ";
+boolean dotson; dotson=false; %  omit dots on i, j, and possibly etc.
+
+def cp = bindu enddef;
+
+% end of file bnduacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/brbracct.mf b/Master/texmf-dist/fonts/source/public/wnri/brbracct.mf
new file mode 100644
index 00000000000..d580ce0c17f
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/brbracct.mf
@@ -0,0 +1,48 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw macron + breve accents 
+%
+
+numeric barwidth; barwidth=vround .2[vair,stem];
+numeric semiwidth; semiwidth=7.5u;
+
+%cmchar "Breve accent";
+beginchar(oct"025",9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant+.5vair#-1.5u#;
+adjust_fit(0,0);
+pickup crisp.nib; pos1(vair,-180); pos3(vair,0);
+top y1=top y3=h; lft x1r=w-rt x3r=hround(2u-.5vair);
+numeric mid_thickness; mid_thickness=vround 1/3[vair,stem];
+pos2(mid_thickness,-90); x2=.5w;
+bot y2r=vround max(x_height+o+tiny,1/3[x_height,h]+o-.5mid_thickness);
+filldraw stroke z1e{down}...z2e{right}...{up}z3e;  % stroke
+transform Tf; Tf = identity shifted (-.5w+slant*(-y2r),-y2r*aspect_ratio);
+savePicture(MacronPic); 
+endgroup;
+
+%cmchar "Macron (bar) accent";
+numeric macron_breadth#; macron_breadth#=.2[vair#,stem#];
+beginchar(oct"026",9u#,.4[x_height#,asc_height#]+macron_breadth#,0);
+italcorr h#*slant-.75u#;
+adjust_fit(0,0);
+numeric macron_breadth; macron_breadth:=Vround .2[vair,stem];
+pickup if serifs: crisp.nib else: fine.nib fi;
+pos1(macron_breadth,90); pos2(macron_breadth,90);
+top y1r=top y2r=h+o; lft x1=w-rt x2=hround 1.25u;
+filldraw stroke z1e--z2e;  % bar
+transform At; At=identity shifted(.5w+slant*(h+acctdiff),aspect_ratio*(h+acctdiff));
+ap(MacronPic);
+if monospace: currentpicture:=currentpicture shifted(0,1/2aspect_ratio*dot_size); fi
+makeACCENT(MacronPic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(MacronPic);  ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = mcbrv enddef;
+
+% end of file brbracct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/brevacct.mf b/Master/texmf-dist/fonts/source/public/wnri/brevacct.mf
new file mode 100644
index 00000000000..a9c1f6501f8
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/brevacct.mf
@@ -0,0 +1,26 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw breve accents 
+%
+
+cmchar "Breve accent";
+beginchar(oct"025",9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant+.5vair#-1.5u#;
+adjust_fit(0,0);
+pickup crisp.nib; pos1(vair,-180); pos3(vair,0);
+top y1=top y3=h; lft x1r=w-rt x3r=hround(2u-.5vair);
+numeric mid_thickness; mid_thickness=vround 1/3[vair,stem];
+pos2(mid_thickness,-90); x2=.5w;
+bot y2r=vround max(x_height+o+tiny,1/3[x_height,h]+o-.5mid_thickness);
+filldraw stroke z1e{down}...z2e{right}...{up}z3e;  % stroke
+makeACCENT(BrevePic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(BrevePic);  ah; oechar; ";
+boolean dotson; dotson=false; %  omit dots on i, j, and possibly etc.
+def cp = brev enddef;
+
+% end of file brevacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/cdilacct.mf b/Master/texmf-dist/fonts/source/public/wnri/cdilacct.mf
new file mode 100644
index 00000000000..0f8bdd2e4d9
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/cdilacct.mf
@@ -0,0 +1,34 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw cedilla accents 
+%
+
+% cdilorigin marks where the top of the connector starts
+if unknown cdilorigin: numeric cdilorigin; cdilorigin=-o; fi
+
+cmchar "Cedilla accent";
+beginchar(oct"030",8u#,0,.875desc_depth#);
+adjust_fit(0,0);
+x1=.5w+.5u;
+if serifs: pickup crisp.nib; pos1(stem,0); pos2(stem,0);
+ pos3(vair,90); pos4(stem,0); pos5(vair,-90);
+ x1=x2; z3l=z2l; x4=x2+1.5u; x5=x3-1.5u;
+ if monospace: top else: bot fi y1=cdilorigin; 
+ bot y2=-vround 2/7d-o; y4=.5[y3,y5]; bot y5=-d-o;
+ filldraw stroke z1e--z2e;  % stem
+ filldraw stroke z3e{right}...z4e{down}...{left}z5e;  % hook
+else: pickup fine.nib; pos1(vair,0); top y1=-o-2;
+ pos2(.5[vair,stem],0); bot y2=-d-o; x2=x1-1.25u;
+ filldraw stroke z1e--z2e; fi  % diagonal
+ makeACCENT(CedilPic);
+endgroup;
+extra_endchar:=
+  " czd ap(CedilPic);  ah; oechar; ";
+
+boolean dotson; dotson=true; % don't omit dots on i, j, and possibly etc.
+
+def cp = cdil enddef;
+
+% end of file cdilacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/facutact.mf b/Master/texmf-dist/fonts/source/public/wnri/facutact.mf
new file mode 100644
index 00000000000..062d29a189a
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/facutact.mf
@@ -0,0 +1,33 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw flat acute accents
+%
+
+boolean ACUTE; ACUTE=true;
+
+cmchar "Flat acute accent";
+beginchar(oct"023",9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant-if serifs: 1.5 fi u#;
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1+.5stem=hround(w-2u); x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ y1:=.825[y2,y1];                                   % flatten it a bit
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ rt x1r=hround(w-1.5u); lft x2l=hround(.5w-.25u-.5vair);
+ top y1=.825[x_height,h];            % flattened a bit
+ bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+makeACCENT(AcutePic);
+penlabels(1,2); endgroup;
+extra_endchar:=
+  " czu  ap(AcutePic);  ah; oechar; ";
+def cp = acute enddef; 
+boolean dotson; dotson:=false;
+
+% end of file facutact.mf
+
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/fbaraact.mf b/Master/texmf-dist/fonts/source/public/wnri/fbaraact.mf
new file mode 100644
index 00000000000..cdd675b8e2b
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/fbaraact.mf
@@ -0,0 +1,52 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw macron and flattened acute accents
+%
+
+numeric barwidth; barwidth=vround .2[vair,stem];
+numeric semiwidth; semiwidth=7.5u;
+
+cmchar "Acute accent";
+beginchar(oct"023",9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant-if serifs: 1.5 fi u#;
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1+.5stem=hround(w-2u); x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ y1:=.825[y2,y1];                                   % flatten it a bit
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ rt x1r=hround(w-1.5u); lft x2l=hround(.5w-.25u-.5vair);
+ top y1=.825[x_height,h];            % flattened a bit
+ bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+transform Tf; Tf = identity shifted (-.5w+slant*(-y2),-y2*aspect_ratio);
+savePicture(MacronPic);
+endgroup;
+cmchar "Macron (bar) accent";
+numeric macron_breadth#; macron_breadth#=.2[vair#,stem#];
+beginchar(oct"026",9u#,.4[x_height#,asc_height#]+macron_breadth#,0);
+italcorr h#*slant-.75u#;
+adjust_fit(0,0);
+numeric macron_breadth; macron_breadth:=Vround .2[vair,stem];
+pickup if serifs: crisp.nib else: fine.nib fi;
+pos1(macron_breadth,90); pos2(macron_breadth,90);
+top y1r=top y2r=h+o; lft x1=w-rt x2=hround 1.25u;
+filldraw stroke z1e--z2e;  % bar
+transform At; At=identity shifted(.5w+slant*(h+acctdiff),aspect_ratio*(h+acctdiff));
+ap(MacronPic);
+if monospace: currentpicture:=currentpicture shifted(0,1/2aspect_ratio*dot_size); fi
+makeACCENT(MacronPic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(MacronPic);  ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = baract enddef;
+
+% end of file fbaraact.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/fbargact.mf b/Master/texmf-dist/fonts/source/public/wnri/fbargact.mf
new file mode 100644
index 00000000000..6273e14cac5
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/fbargact.mf
@@ -0,0 +1,52 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw macron and flat grave accents 
+%
+
+numeric barwidth; barwidth=vround .2[vair,stem];
+numeric semiwidth; semiwidth=7.5u;
+
+cmchar "Grave accent";
+beginchar(oct"022",9u#,min(asc_height#,2x_height#),0);
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1-.5stem=hround 2u; x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ y1:=.825[y2,y1];                                   % flatten it a bit
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ lft x1l=hround 1.5u; rt x2r=hround(.5w+.25u+.5vair);
+ top y1=.825[x_height,h];            % flattened a bit
+ bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+transform Tf; Tf = identity shifted (-.5w+slant*(-y2),-y2*aspect_ratio);
+savePicture(MacronPic);
+endgroup;
+cmchar "Macron (bar) accent";
+numeric macron_breadth#; macron_breadth#=.2[vair#,stem#];
+beginchar(oct"026",9u#,.4[x_height#,asc_height#]+macron_breadth#,0);
+italcorr h#*slant-.75u#;
+adjust_fit(0,0);
+numeric macron_breadth; macron_breadth:=Vround .2[vair,stem];
+pickup if serifs: crisp.nib else: fine.nib fi;
+pos1(macron_breadth,90); pos2(macron_breadth,90);
+top y1r=top y2r=h+o; lft x1=w-rt x2=hround 1.25u;
+filldraw stroke z1e--z2e;  % bar
+transform At; At=identity shifted(.5w+slant*(h+acctdiff),aspect_ratio*(h+acctdiff));
+ap(MacronPic);
+if monospace: currentpicture:=currentpicture shifted(0,1/2aspect_ratio*dot_size); fi
+makeACCENT(MacronPic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(MacronPic);  ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = bargrv enddef;
+
+% end of file fbargact.mf
+
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/fbrevact.mf b/Master/texmf-dist/fonts/source/public/wnri/fbrevact.mf
new file mode 100644
index 00000000000..cc270d7f435
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/fbrevact.mf
@@ -0,0 +1,26 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw flat breve accents 
+%
+
+cmchar "Flat breve accent";
+beginchar(oct"025",9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant+.5vair#-1.5u#;
+adjust_fit(0,0);
+pickup crisp.nib; pos1(vair,-180); pos3(vair,0);
+top y1=top y3=.825[x_height,h]; lft x1r=w-rt x3r=hround(2u-.5vair);
+numeric mid_thickness; mid_thickness=vround 1/3[vair,stem];
+pos2(mid_thickness,-90); x2=.5w;
+bot y2r=vround max(x_height+o+tiny,1/3[x_height,h]+o-.5mid_thickness);
+filldraw stroke z1e{down}...z2e{right}...{up}z3e;  % stroke
+makeACCENT(BrevePic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(BrevePic);  ah; oechar; ";
+boolean dotson; dotson=false; %  omit dots on i, j, and possibly etc.
+def cp = cup enddef;
+
+% end of file fbrevact.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/fgravact.mf b/Master/texmf-dist/fonts/source/public/wnri/fgravact.mf
new file mode 100644
index 00000000000..072e7646781
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/fgravact.mf
@@ -0,0 +1,32 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw grave accents
+%
+
+cmchar "Grave accent";
+beginchar(oct"022",9u#,min(asc_height#,2x_height#),0);
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1-.5stem=hround 2u; x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ y1:=.825[y2,y1];                                   % flatten it a bit
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ lft x1l=hround 1.5u; rt x2r=hround(.5w+.25u+.5vair);
+ top y1=.825[x_height,h];            % flattened a bit
+ bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+makeACCENT(GravePic);
+endgroup;
+extra_endchar:=
+  " czu ap(GravePic);  ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = grave enddef;
+
+% end of file fgravact.mf
+
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/fhachact.mf b/Master/texmf-dist/fonts/source/public/wnri/fhachact.mf
new file mode 100644
index 00000000000..c7508435975
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/fhachact.mf
@@ -0,0 +1,37 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw flat hachek accents 
+%
+
+cmchar "Hachek (check) accent";
+beginchar(oct"024",9u#,.75[x_height#,min(asc_height#,2x_height#)],0);
+h':=vround min(asc_height,2x_height); % height of circumflex being inverted
+if serifs: italcorr h#*slant+.5hair#-1.75u#;
+ adjust_fit(0,0);
+ pickup crisp.nib; pos2'(.5[vair,curve],90); top y2'r=.825[x_height,h];
+ pos2(.5[vair,curve],90); x2=.5w;
+ x1=w-x3=good.x 2.25u; top y1=top y3=.825[x_height,h]; y1-y2=.5(y2'-x_height);
+ pos1(hair,angle(z2-z1)+90); pos3(hair,angle(z3-z2)+90);
+ filldraw stroke z1e--z2e--z3e;  % diagonals
+else: italcorr h#*slant-.5stem#+.5vair#-.75u#;
+ adjust_fit(0,0);
+ pickup fine.nib; pos1(vair,0); pos3(vair,0); x1=w-x3;
+ pos2(stem,0); bot y2=vround(1/12[x_height,h']+o); x2=.5w;
+ top y1=top y3=.825[x_height,h]; lft x1l=hround(rt x2r-3.25u-.5vair);
+ z0=whatever[z1r,z2r]=whatever[z2l,z3l];
+ y4l=y4r=y2; x4l=good.x .2[x2l,x2]; x4r=w-x4l;
+ filldraw z4l--z1l--z1r--z0--z3l--z3r--z4r--cycle; fi  % diagonals
+if monospace: currentpicture:=currentpicture shifted(0,1/2aspect_ratio*dot_size); fi
+makeACCENT(CaronPic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(CaronPic);  ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = hach enddef;
+
+% end of file fhachact.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/fhattact.mf b/Master/texmf-dist/fonts/source/public/wnri/fhattact.mf
new file mode 100644
index 00000000000..4a1245b2565
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/fhattact.mf
@@ -0,0 +1,32 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw flat circumflex accents
+%
+
+cmchar "Circumflex (hat) accent";
+beginchar(oct"136",9u#,min(asc_height#,2x_height#),0);
+if serifs: italcorr .5[x_height#,h#]*slant+.5hair#-1.75u#;
+ adjust_fit(0,0);
+ pickup crisp.nib; pos2(.5[vair,curve],90); top y2r=.825[x_height,h]; x2=.5w;
+ x1=w-x3=good.x 2.25u; y1=y3=.5[x_height,y2];
+ pos1(hair,angle(z2-z1)+90); pos3(hair,angle(z3-z2)+90);
+ filldraw stroke z1e--z2e--z3e;  % diagonals
+else: italcorr 2/3[x_height#,h#]*slant-.5stem#+.5vair#-.75u#;
+ adjust_fit(0,0);
+ pickup fine.nib; pos1(vair,0); pos3(vair,0); x1=w-x3;
+ pos2(stem,0); top y2=.825[x_height,h]; x2=.5w; bot y1=bot y3=vround 2/3[h,x_height]-eps;
+ lft x1l=hround(rt x2r-3.25u-.5vair); % same slope as in the acute accent
+ z0=whatever[z1r,z2r]=whatever[z2l,z3l];
+ y4l=y4r=y2; x4l=good.x .2[x2l,x2]; x4r=w-x4l;
+ filldraw z4l--z1l--z1r--z0--z3l--z3r--z4r--cycle; fi  % diagonals
+makeACCENT(HatPic);
+endgroup;
+extra_endchar:=
+  " czu ap(HatPic);  ah; oechar; ";
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = hatt enddef;
+
+% end of file fhattact.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/fubrvact.mf b/Master/texmf-dist/fonts/source/public/wnri/fubrvact.mf
new file mode 100644
index 00000000000..e6a1991d3bd
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/fubrvact.mf
@@ -0,0 +1,28 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw flat subscript breve accents 
+%
+
+cmchar "Breve accent";
+beginchar(oct"025",9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant+.5vair#-1.5u#;
+adjust_fit(0,0);
+pickup crisp.nib; pos1(vair,-180); pos3(vair,0);
+top y1=top y3=.825[x_height,h]; lft x1r=w-rt x3r=hround(2u-.5vair);
+numeric mid_thickness; mid_thickness=vround 1/3[vair,stem];
+pos2(mid_thickness,-90); x2=.5w;
+bot y2r=vround max(x_height+o+tiny,1/3[x_height,h]+o-.5mid_thickness);
+filldraw stroke z1e{down}...z2e{right}...{up}z3e;  % stroke
+transform Tf; Tf=identity shifted(-.5w+slant*(-y1-.25x_height),aspect_ration(-y1-.25x_height));
+savePicture(UBrevPic);
+endgroup;
+
+extra_endchar:=
+  " czd ap(UBrevPic);  ah; oechar; ";
+boolean dotson; dotson=true; % don't omit dots on i, j, and possibly etc.
+
+def cp = ubrv enddef;
+
+% end of file fubrvact.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/fudacact.mf b/Master/texmf-dist/fonts/source/public/wnri/fudacact.mf
new file mode 100644
index 00000000000..0be19e75b7f
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/fudacact.mf
@@ -0,0 +1,46 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw combination flat acute accent and underdot
+%
+
+cmchar "Dot accent";
+numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#);
+beginchar(oct"137",5u#,min(asc_height#,10/7x_height#+.5dot_diam#),0);
+define_whole_blacker_pixels(dot_diam);
+italcorr h#*slant+.5dot_diam#-2u#;
+adjust_fit(0,0);
+pickup tiny.nib; pos1(dot_diam,0); pos2(dot_diam,90);
+x1=x2=.5w; top y2r=h+1;
+if bot y2l<x_height+o+slab: y2l:=min(y2r-eps,x_height+o+slab+.5tiny); fi
+y1=.5[y2l,y2r]; dot(1,2);  % dot
+transform Tf; Tf = identity shifted (-.5w + slant*(-h-.25x_height),aspect_ratio*(-h-.25x_height));
+savePicture(UdotPic); 
+endgroup;
+
+cmchar "Acute accent";
+beginchar(oct"023",9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant-if serifs: 1.5 fi u#;
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1+.5stem=hround(w-2u); x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ y1:=.825[y2,y1];                                   % flatten it a bit
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ rt x1r=hround(w-1.5u); lft x2l=hround(.5w-.25u-.5vair);
+ top y1=.825[x_height,h];            % flattened a bit
+ bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+makeACCENT(AcutePic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(AcutePic);  czdm  ap(UdotPic); ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+def cp = udac enddef;
+
+% end of file fudacact.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/fudgract.mf b/Master/texmf-dist/fonts/source/public/wnri/fudgract.mf
new file mode 100644
index 00000000000..840bf97ad15
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/fudgract.mf
@@ -0,0 +1,45 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw combination flat grave accent and underdot
+%
+
+cmchar "Dot accent";
+numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#);
+beginchar(oct"137",5u#,min(asc_height#,10/7x_height#+.5dot_diam#),0);
+define_whole_blacker_pixels(dot_diam);
+italcorr h#*slant+.5dot_diam#-2u#;
+adjust_fit(0,0);
+pickup tiny.nib; pos1(dot_diam,0); pos2(dot_diam,90);
+x1=x2=.5w; top y2r=h+1;
+if bot y2l<x_height+o+slab: y2l:=min(y2r-eps,x_height+o+slab+.5tiny); fi
+y1=.5[y2l,y2r]; dot(1,2);  % dot
+transform Tf; Tf = identity shifted (-.5w+ slant*(-h-.25x_height),aspect_ratio*(-h-.25x_height));
+savePicture(UdotPic); 
+endgroup;
+
+cmchar "Grave accent";
+beginchar(oct"022",9u#,min(asc_height#,2x_height#),0);
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1-.5stem=hround 2u; x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ y1:=.825[y2,y1];                                   % flatten it a bit
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ lft x1l=hround 1.5u; rt x2r=hround(.5w+.25u+.5vair);
+ top y1=.825[x_height,h];            % flattened a bit
+ bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+makeACCENT(GravePic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(GravePic);  czdm ap(UdotPic); ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+def cp = udgr enddef;
+
+% end of file fudgract.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/gamma.mf b/Master/texmf-dist/fonts/source/public/wnri/gamma.mf
new file mode 100644
index 00000000000..cf808baef30
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/gamma.mf
@@ -0,0 +1,50 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw roman gammas
+%
+
+% cmchar "gamma";
+newchar(lgam,if serifs: 9.5u# else:9u# fi,x_height#,desc_depth#);
+italcorr x_height#*slant+.25u#;
+adjust_fit(serif_fit# if monospace:+\\.5u#,.5u#+ else:,fi\\ serif_fit#);
+numeric left_stem,right_stem,outer_jut; pickup tiny.nib; 
+left_stem=fudged.stem-stem_corr;
+right_stem=min(fudged.hair if hefty:-2stem_corr fi,left_stem);
+outer_jut=.75jut; x1l=w-x4r=if serifs:l+letter_fit+outer_jut+.25u+tiny else: u fi; 
+y1=y4=h; x5=x3=x2=.5[x1,x4]; y3=y2=.3h; bot y5r=-d;
+numeric gbot; gbot=.5(left_stem+right_stem);
+pos1(left_stem,0); pos4(right_stem,-180); pos2(left_stem,0);
+pos3(right_stem,-180); pos5(gbot,-90);
+filldraw stroke z1e--z2e{z2-z1}...{left}z5e{left}...{z4-z3}z3e--z4e;
+if serifs: numeric inner_jut; pickup tiny.nib;
+ if rt x1r+jut+.5u+1<=lft x4l-jut: inner_jut=jut;
+ else: rt x1r+inner_jut+.5u+1=lft x4l-inner_jut; fi
+ dish_serif(1,2,a,1/3,outer_jut,b,1/2,inner_jut);  % left serif
+ dish_serif(4,3,c,.6,inner_jut,d,1/2,outer_jut)(dark); 
+ fi  % right serif
+penlabels(0,1,2,3,4,5); endchar;
+
+newchar(CGam,if serifs: 13.5u# else:13u# fi,cap_height#,desc_depth#);
+italcorr x_height#*slant+.25u#;
+adjust_fit(serif_fit# if monospace:+\\.5u#,.5u#+ else:,fi\\ serif_fit#);
+numeric left_stem,right_stem,outer_jut; pickup tiny.nib; 
+left_stem=cap_stem-stem_corr;
+right_stem=min(cap_hair if hefty:-2stem_corr fi,left_stem);
+outer_jut=.75cap_jut; x1l=w-x4r=if serifs:l+letter_fit+outer_jut+.25u+tiny else: u fi; 
+y1=y4=h; x5=x3=x2=.5[x1,x4]; y3=y2=.625x_height; bot y5r=-d;
+numeric gbot; gbot=.5(left_stem+right_stem);
+pos1(left_stem,0); pos4(right_stem,-180); pos2(left_stem,0);
+pos3(right_stem,-180); pos5(gbot,-90);
+filldraw stroke z1e--z2e{z2-z1}...{left}z5e{left}...{z4-z3}z3e--z4e;
+if serifs: numeric inner_jut; pickup tiny.nib;
+ if rt x1r+jut+.5u+1<=lft x4l-jut: inner_jut=cap_jut;
+ else: rt x1r+inner_jut+.5u+1=lft x4l-inner_jut; fi
+ dish_serif(1,2,a,1/3,outer_jut,b,1/2,inner_jut);  % left serif
+ dish_serif(4,3,c,.6,inner_jut,d,1/2,outer_jut)(dark); 
+ fi  % right serif
+penlabels(0,1,2,3,4,5); endchar;
+
+% end of file gamma.mf
+
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/gram_max.mf b/Master/texmf-dist/fonts/source/public/wnri/gram_max.mf
new file mode 100644
index 00000000000..5c84be03f62
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/gram_max.mf
@@ -0,0 +1,552 @@
+%
+% Washington Romanized Indic accent driver
+%
+
+% grmax
+grmax:=1; % when |grmax| is known, this file has been input
+
+numeric xxxpr; xxxpr:=0;
+
+pen penpixel; penpixel = pensquare;
+
+% Grave_accent is called with suffix, dummy_suffix e.g.
+%               Grave_accent(2,q)
+% the accent is centered above 'suffix' 1 to 1.5 dot_sizes higher
+def Grave_accent (suffix $,@) =
+if serifs: pickup crisp.nib; 
+ x@_1+1.5curve=x$; x@_2=x$+1.5curve;
+ if y$ < .9cap_height: y@_1=y$+if hefty: 1.5 fi dot_size+.5bar_height; y@_2=y$+if hefty: 1.5 fi dot_size;
+ else: y@_1=y$+if hefty: 1.2 else: .8 fi dot_size+.4bar_height; y@_2=y$+if hefty: 1.2 else: .8 fi dot_size; fi
+ numeric theta; theta=angle(z@_2-z@_1)+90;
+ pos@_1(stem,theta); pos@_2(hair,theta);
+ filldraw circ_stroke z@_1e--z@_2e;  % diagonal
+else: pickup fine.nib; pos@_1(stem,0); pos@_2(vair,0);
+ x@_1l=x$-1.5u; x@_2r=x$+1.5u;
+ y@_1=y$+1.5dot_size+2.5u; y@_2=y$+1.5dot_size;
+ filldraw stroke z@_1e--z@_2e; fi  % diagonal
+penlabels(@_1,@_2); enddef;
+
+% Acute_accent is called with suffix, and dummy_suffix
+% as in the Grave_accent call
+def Acute_accent (suffix $,@) =
+if serifs: pickup crisp.nib; x@_1=x$+1.5curve; x@_2=x$-1.5curve;
+ if y$ < .9cap_height: y@_1=y$+ if hefty: 1.5 fi dot_size+.5bar_height;  y@_2=y$+ if hefty: 1.5 fi dot_size;
+ else: y@_1=y$+if hefty: 1.2 else: .8 fi dot_size+.4bar_height;  y@_2=y$+if hefty: 1.2 else: .8 fi dot_size; fi
+% y@_2=y$+dot_size;
+ numeric theta; theta=angle(z@_2-z@_1)+90;
+ pos@_1(stem,theta); pos@_2(hair,theta);
+ filldraw circ_stroke z@_1e--z@_2e;  % diagonal
+else: pickup fine.nib; pos@_1(stem,0); pos@_2(vair,0);
+ x@_1r=x$+1.5u; x@_2l=x$-1.5u;
+ y@_1=y$+1.5dot_size+2.5u; y@_2=y$+1.5dot_size;
+ filldraw stroke z@_1e--z@_2e; fi  % diagonal
+penlabels(@_1,@_2); enddef;
+
+numeric barwidth; barwidth=vround .2[vair,stem];
+
+def baracute (suffix $,@) =
+if serifs: pickup crisp.nib; x@_1=x$+1.5curve; x@_2=x$-1.5curve;
+ if y$ < .9cap_height: y@_1=2curve+y$+ if hefty: 1.5 fi dot_size+.5bar_height;  y@_2=2curve+y$+ if hefty: 1.5 fi dot_size;
+ else: y@_1=2curve+y$+ if hefty: 1.5 fi dot_size+.4bar_height;  y@_2=2curve+y$+ if hefty: 1.5 fi dot_size; fi
+ numeric theta; theta=angle(z@_2-z@_1)+90;
+ pos@_1(stem,theta); pos@_2(hair,theta);
+ filldraw circ_stroke z@_1e--z@_2e;  % diagonal
+else: pickup fine.nib; pos@_1(stem,0); pos@_2(vair,0);
+ x@_1r=x$+1.5u; x@_2l=x$-1.5u;
+ y@_1=2curve+y$+1.5dot_size+2.5u; y@_2=2curve+y$+1.5dot_size;
+ filldraw stroke z@_1e--z@_2e; fi  % diagonal
+pos@_99(barwidth,90); pos@_100(barwidth,90);
+bot y@_99l=bot y@_100l=y$+dot_size; x@_99=x$-.21body_height; x@_100=x$+.21body_height;
+filldraw stroke z@_99e--z@_100e;
+penlabels(@_1,@_2,@_99,@_100); enddef;
+
+% bar_accent
+% called with left-coord,right coord, dummy coord,accent_bar_height
+% e.g. bar_accent(3,6,q,.5(asc_height-bar_height))
+% bar extends from x_left to x_right at height_h
+def bar_accent (suffix $,$$,@)(expr bH) =
+numeric macron_breadth#; macron_breadth#=.2[vair#,stem#];
+numeric macron_breadth; macron_breadth:=Vround .2[vair,stem];
+pickup if serifs: crisp.nib else: fine.nib fi;
+pos@1(macron_breadth,90); pos@2(macron_breadth,90);
+top y@1r=top y@2r=bH+o; lft x@1=x$; rt x@2=x$$;
+filldraw stroke z@1e--z@2e;  % bar
+penlabels(@1,@2); enddef;
+
+% macron, fixed width macron, centered over $ and .4[x_height,asc_height] above
+% suffix passed should be a point at top center of main portion of char
+def Macron (suffix $,@) =
+numeric macron_breadth#; macron_breadth#=.2[vair#,stem#];
+numeric macron_breadth; macron_breadth:=Vround .2[vair,stem];
+pickup if serifs: crisp.nib else: fine.nib fi;
+pos@1(macron_breadth,90); pos@2(macron_breadth,90);
+y@1=y@2=y$+.4[x_height,asc_height]-x_height;
+if hefty: lft x@1=x$-.35w ; rt x@2=x$+.35w ;
+  else:  lft x@1=x$-3.25u; rt x@2=x$+3.25u; fi
+filldraw stroke z@1e--z@2e;  % bar
+penlabels(@1,@2); enddef;
+
+% cross for l     call with suffix of crossing point on stem
+def cross_for_l (suffix $,@) =
+pickup crisp.nib; x@_2-x@_1=max(4u,2.8u+stem); .5[x@_1,x@_2]=x$;
+y@_1-.75bar=y$-.75dot_size; y@_2+.75bar=y$+.75dot_size;
+numeric theta; theta=angle(z@_2-z@_1)+90;
+pos@_1(1.5bar,theta); pos@_2(1.5bar,theta);
+filldraw stroke z@_1e--z@_2e;  % diagonal
+penlabels(1,2); enddef;
+
+% longer cross for l
+def cross_for_lz (suffix $,@) =
+pickup crisp.nib; x@_2-x@_1=max(6u,4.2u+stem); .5[x@_1,x@_2]=x$;
+y@_1-.75bar=y$-.75dot_size; y@_2+.75bar=y$+.75dot_size;
+numeric theta; theta=angle(z@_2-z@_1)+90;
+pos@_1(1.5bar,theta); pos@_2(1.5bar,theta);
+filldraw stroke z@_1e--z@_2e;  % diagonal
+penlabels(1,2); enddef;
+
+% dot_sharp_values used by underdot
+def dot_sharp_values =
+numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#);
+numeric dot_top#; dot_top#=min(asc_height#,10/7x_height#+.5dot_diam#);
+enddef;
+
+% underdot draws a dot one dot-diameter below the baseline of an x-coordinate
+% specified in the call to underdot; the x-coordinate will ordinarily be
+% the low-center point of the character shape.  The suffix only of the
+% x-coordinate is passed, along with a dummy suffix to use for point
+% plotting, e.g.
+%               underdot(6,q); 
+def underdot (suffix $,@) =
+dot_sharp_values;
+define_whole_blacker_pixels(dot_diam);
+pickup tiny.nib; pos@_1(dot_diam,0); pos@_2(dot_diam,90);
+x@_1=x@_2=x$; top y@_2r=-dot_diam;
+y@_1=.5[y@_2l,y@_2r];  
+dot(@_1,@_2);  % dot
+penlabels(@_1,@_2); enddef;
+
+%    overdot
+% calling specification is as in underdot
+def overdot (suffix $,@) =
+dot_sharp_values;
+define_whole_blacker_pixels(dot_diam);
+pickup tiny.nib; pos@_1(dot_diam,0); pos@_2(dot_diam,90);
+x@_1=x@_2=x$; top y@_2r=2dot_diam+y$;
+y@_1=.5[y@_2l,y@_2r];  
+dot(@_1,@_2);  % dot
+penlabels(@_1,@_2); enddef;
+
+% umlaut
+% calling specification is as in underdot
+def umlaut (suffix $,@) =
+dot_sharp_values;
+define_whole_blacker_pixels(dot_diam);
+pickup tiny.nib; pos@_1(dot_diam,0); pos@_2(dot_diam,90);
+x@_1=x@_2=x$-1.25dot_diam; top y@_2r=2dot_diam+y$;
+y@_1=.5[y@_2l,y@_2r];  
+dot(@_1,@_2);  % dot
+pos@_3(dot_diam,0); pos@_4(dot_diam,90);
+x@_3=x@_4=x$+1.25dot_diam; top y@_4r=2dot_diam+y$;
+y@_3=.5[y@_4l,y@_4r];  
+dot(@_3,@_4);  % dot
+enddef;
+% calling specification is as in underdot
+def underumlaut (suffix $,@) =
+dot_sharp_values;
+define_whole_blacker_pixels(dot_diam);
+pickup tiny.nib; pos@_1(dot_diam,0); pos@_2(dot_diam,90);
+x@_1=x@_2=x$-1.75u; top y@_2r=y$-dot_diam;
+y@_1=.5[y@_2l,y@_2r];  
+dot(@_1,@_2);  % dot
+pos@_3(dot_diam,0); pos@_4(dot_diam,90);
+x@_3=x@_4=x$+1.75u; top y@_4r=y$-dot_diam;
+y@_3=.5[y@_4l,y@_4r];  
+dot(@_3,@_4);  % dot
+enddef;
+
+% glottal puts a comma/apostrophe with dot at specified location
+% called with suffix above spot to place glottal
+%               glottal(2);
+def glottal(suffix $)=
+x95=x$;
+if hefty: y95=y$+2dot_size+comma_depth else: y95=y$+1.25dot_size+.75comma_depth fi;
+if hefty: comma(95,hacc,dot_size,.28u,comma_depth);  % large comma
+else: comma(95,hacc,.75dot_size,.25u,.75comma_depth); fi  % comma with increased jut
+enddef;
+
+% glotchek draws glottal and hachek above the specified x coordinate supplied
+% as a suffix
+def glotchek (suffix @) =
+if serifs:
+ pickup crisp.nib; pos@_2'(.5[vair,curve],90); top y@_2'r=h;
+ pos@_2(.5[vair,curve],90); x@_2=.5w;
+ x@_1=w-x@_3=good.x 2.25u; top y@_1=top y@_3=h-.25dot_size; y@_1-y@_2=.5(y@_2'-x_height-.25dot_size);
+ pos@_1(hair,angle(z@_2-z@_1)+90); pos@_3(hair,angle(z@_3-z@_2)+90);
+ filldraw stroke z@_1e--z@_2e--z@_3e;  % diagonals
+else: 
+ pickup fine.nib; pos@_1(vair,0); pos@_3(vair,0); x@_1=w-x@_3;
+ pos@_2(stem,0); bot y@_2=vround(1/12[x_height,vround min(asc_height,2x_height)]+o)-.25dot_size; x@_2=.5w;
+ top y@_1=top y@_3=h+o-.25dot_size; lft x@_1l=hround(rt x@_2r-3.25u-.5vair);
+ z@_0=whatever[z@_1r,z@_2r]=whatever[z@_2l,z@_3l];
+ y@_4l=y@_4r=y@_2; x@_4l=good.x .2[x@_2l,x@_2]; x@_4r=w-x@_4l;
+ filldraw z@_4l--z@_1l--z@_1r--z@_0--z@_3l--z@_3r--z@_4r--cycle; fi  % diagonals
+x95-.5dot_size=hround(x@_2-.5dot_size); % y95=y@_2+.75comma_depth+.5dot_size;
+y95=body_height+dot_size;
+if hefty: comma(95,hacc,dot_size,.28u,.85comma_depth);  % large comma
+else: comma(95,hacc,.75dot_size,.25u,.75comma_depth); fi  % comma with increased jut
+penlabels(0,1,2,3,4); enddef;
+
+%   hachek accent macro, give suffix of point above which to center it
+def hachekit (suffix $,@) =
+if serifs:
+ pickup crisp.nib; pos@_2'(.5[vair,curve],90); bot y@_2'=y$+dot_size;
+ pos@_2(.5[vair,curve],90); x@_2=x$; y@_2=y@_2';
+x@_1+.21body_height=x@_2=x@_3-.21body_height;
+y@_1=y@_3=y@_2+.21body_height;
+%  x@_1=w-x@_3=good.x 2.25u; top y@_1=top y@_3=h; y@_1-y@_2=.5(y@_2'-x_height);
+ pos@_1(hair,angle(z@_2-z@_1)+90); pos@_3(hair,angle(z@_3-z@_2)+90);
+ filldraw stroke z@_1e--z@_2e--z@_3e;  % diagonals
+% show z@_1,z@_2,z@_3,z@_1r,z@_2r,z@_3r,z@_1l,z@_2l,z@_3l;
+else: 
+ pickup fine.nib; pos@_1(vair,0); pos@_3(vair,0); x@_1+.21body_height=x$=x@_2=x@_3-.21body_height;
+ pos@_2(stem,0); bot y@_2=y$+dot_size;
+ top y@_1=top y@_3=top y@_2+.21body_height; % lft x@_1l=hround(rt x@_2r-3.25u-.5vair);
+ z@_0=whatever[z@_1r,z@_2r]=whatever[z@_2l,z@_3l];
+ y@_4l=y@_4r=y@_2; x@_4l=good.x .2[x@_2l,x@_2]; x@_4r=2x$-x@_4l;
+ filldraw z@_4l--z@_1l--z@_1r--z@_0--z@_3l--z@_3r--z@_4r--cycle; fi  % diagonals
+%  show z@_0,z@_1,z@_2,z@_3,z@_1r,z@_2r,z@_3r,z@_1l,z@_2l,z@_3l;
+penlabels(0,1,2,3,4); enddef;
+
+def hatme (suffix $,@) =
+if serifs:
+ pickup crisp.nib; pos@_2'(.5[vair,curve],90); top y@_2'=y$+ if hefty: 2 else: 1.5 fi dot_size+.21body_height;
+ pos@_2(.5[vair,curve],90); x@_2=x$; y@_2=y@_2';
+ x@_1+.21body_height=x@_2=x@_3-.21body_height;
+ y@_1=y@_3=y@_2-.21body_height;
+ pos@_1(hair,angle(z@_2-z@_1)+90); pos@_3(hair,angle(z@_3-z@_2)+90);
+ filldraw stroke z@_1e--z@_2e--z@_3e;  % diagonals
+else: 
+ pickup fine.nib; pos@_1(vair,0); pos@_3(vair,0); x@_1+.21body_height=x$=x@_2=x@_3-.21body_height;
+ pos@_2(stem,0); top y@_2=y$+dot_size+.21body_height;
+ y@_1=y@_3=y@_2-.21body_height; 
+ z@_0=whatever[z@_1r,z@_2r]=whatever[z@_2l,z@_3l];
+ y@_4l=y@_4r=y@_2; x@_4l=good.x .2[x@_2l,x@_2]; x@_4r=2x$-x@_4l;
+ filldraw z@_4l--z@_1l--z@_1r--z@_0--z@_3l--z@_3r--z@_4r--cycle; fi  % diagonals
+penlabels(0,1,2,3,4); enddef;
+
+%  glotchek     a hachek with glottal accent
+def glotchekit (suffix $,@) =
+if serifs:
+ pickup crisp.nib; pos@_2'(.5[vair,curve],90); bot y@_2'=y$+.75dot_size;
+ pos@_2(.5[vair,curve],90); x@_2=x$; y@_2=y@_2';
+x@_1+3u=x@_2=x@_3-3u;
+y@_1=y@_3=y@_2+3u;
+ pos@_1(hair,angle(z@_2-z@_1)+90); pos@_3(hair,angle(z@_3-z@_2)+90);
+ filldraw stroke z@_1e--z@_2e--z@_3e;  % diagonals
+else: 
+ pickup fine.nib; pos@_1(vair,0); pos@_3(vair,0); x@_1+3u=x$=x@_2=x@_3-3u;
+ pos@_2(stem,0); bot y@_2=y$+.75dot_size;
+ top y@_1=top y@_3=top y@_2+3u; % lft x@_1l=hround(rt x@_2r-3.25u-.5vair);
+ z@_0=whatever[z@_1r,z@_2r]=whatever[z@_2l,z@_3l];
+ y@_4l=y@_4r=y@_2; x@_4l=good.x .2[x@_2l,x@_2]; x@_4r=2x$-x@_4l;
+ filldraw z@_4l--z@_1l--z@_1r--z@_0--z@_3l--z@_3r--z@_4r--cycle; fi  % diagonals
+x95-.5dot_size=hround(x@_2-.5dot_size);  y95=y@_2+.75comma_depth+dot_size;
+% y95=top y@_2 + dot_size;
+if hefty: comma(95,hacc,dot_size,.28u,.85comma_depth);  % large comma
+else: comma(95,hacc,.75dot_size,.25u,.75comma_depth); fi  % comma with increased jut
+enddef;
+
+
+def cedilla (suffix $,@)(expr cD_shift) =
+save @;
+forsuffixes $$=@,@_: transform $$; endfor
+if serifs: pickup crisp.nib; pos@_1(stem,0); pos@_2(stem,0);
+ pos@_3(vair,90); pos@_4(stem,0); pos@_5(1.1vair,-90); pos@_6(vair,-180);
+ x@_1=x@_2=x$; z@_3l=z@_2l; x@_4=x@_2+1.5u; x@_5=x@_3-1.5u;
+% bot y@_1=-o;
+ top y@_1=0;
+ bot y@_2=-vround 2/7(.875desc_depth)-o; 
+ y@_4=.5[y@_3,y@_5]; bot y@_5=-.875desc_depth-o;
+ @ = identity shifted(0,cD_shift);
+ for n = 1,2,3,4,5: forsuffixes e = l,,r: 
+  z@[n]e = z@_[n]e transformed @; endfor endfor
+ filldraw stroke z@1e--z@2e;  % stem
+ filldraw stroke z@3e{right}...z@4e{down}...{left}z@5e;  % hook
+else: pickup fine.nib; pos@_1(vair,0); top y@_1=-o-2;
+ pos@_2(.5[vair,stem],0); bot y@_2=-.875desc_depth-o; x@_1=x$; x@_2=x@_1-1.25u;
+ @ = identity shifted(0,cD_shift);
+ for n = 1,2: forsuffixes e = l,,r: 
+  z@[n]e = z@_[n]e transformed @; endfor endfor
+ filldraw stroke z@1e--z@2e; fi  % diagonal
+% filldraw stroke z$e--z@1e;   % fill gap
+penlabels(@1,@2,@3,@4,@5); enddef;
+
+def polhook (suffix $,@)(expr cD_shift) =
+save @;
+forsuffixes $$=@,@_: transform $$; endfor
+if serifs: pickup crisp.nib; pos@_1(stem,0); pos@_2(stem,0);
+ pos@_3(vair,-90); pos@_4(stem,0); pos@_5(vair,90);
+ x@_1=x@_2=x$; z@_3r=z@_2r; x@_4=x@_2-1.5u; x@_5=x@_3+.5u;
+ top y@_1=0; bot y@_2=-vround 2/7(.875desc_depth)-o;  % bot y@_1=-o;
+ y@_4=.5[y@_3,y@_5]; bot y@_5=-.875desc_depth-o;
+ @ = identity shifted(0,cD_shift);
+ for n = 1,2,3,4,5: forsuffixes e = l,,r: 
+  z@[n]e = z@_[n]e transformed @; endfor endfor
+x@6=x@5+u+.25dot_size; y@6=y@5+.25dot_size;
+pos@6(hair,180);
+ filldraw stroke z@1e--z@2e;  % stem
+ filldraw stroke z@3e{left}...z@4e{down}...{right}z@5e...z@6e;  % hook
+else: pickup fine.nib; pos@_1(vair,0); top y@_1=-o-2;
+ pos@_2(.5[vair,stem],0); bot y@_2=-.875desc_depth-o; x@_1=x$; x@_2=x@_1+1.25u;
+ @ = identity shifted(0,cD_shift);
+ for n = 1,2: forsuffixes e = l,,r: 
+  z@[n]e = z@_[n]e transformed @; endfor endfor
+ filldraw stroke z@1e--z@2e; fi  % diagonal
+% filldraw stroke z$e--z@1e;   % fill gap
+penlabels(@1,@2,@3,@4,@5); enddef;
+
+% controls for font size changing
+
+%%% the following have to be put, suitably modified into parameter files
+%%% string myfontstyle, mynormalsize, mysmallsize;
+%%%
+%%% myfontstyle := "CMR";
+%%% mynormalsize := "10";
+%%% mysmallsize := "8";
+
+def generate suffix t=enddef; %ignore generate on subsequent read-ins
+			      %of parameter files
+
+def shrinksize = scantokens ("input " & myfontstyle & mysmallsize ); 
+     mode_setup; font_setup; enddef;
+
+def resumesize = scantokens ("input " & myfontstyle & mynormalsize ); 
+      mode_setup; font_setup; enddef;
+
+%   resumesize;
+
+normala_ht# := asc_height#;
+
+
+% define reverse adjust fit for use with rotated characters
+def r_adjust_fit(expr adjr,adjl) =
+ adjust_fit(adjl,adjr);
+enddef;
+
+def tilde_accent (suffix $,@)(expr tY_shift) =
+save @;
+forsuffixes $$=@,@_: transform $$; endfor
+if serifs: numeric theta; theta=angle(1/6(6u-vair),1/4(asc_height-x_height));
+ pickup crisp.nib; numeric mid_width; mid_width=.4[vair,stem];
+ pos@_1(vair,theta+90); pos@_2(vair,theta+90);
+ pos@_3(vair,theta+90); pos@_4(vair,theta+90);
+ z@_2-z@_1=z@_4-z@_3=(mid_width-crisp)*dir theta;
+ rt x@_4l-x$=x$-lft x@_1r=3u; top y@_4r=asc_height;
+ bot y@_1l=vround(bot y@_1l+min(2/3[x_height,asc_height],y@_3l-.25vair)-top y@_1r);
+ pair delta; ypart delta=3(y@_3l-y@_1l); delta=whatever*dir theta;
+ @ = identity shifted(0,tY_shift);
+ for n = 1,2,3,4: forsuffixes e = l,,r: 
+  z@[n]e = z@_[n]e transformed @; endfor endfor
+ filldraw z@1l..controls(z@1l+delta)and(z@3l-delta)..z@3l..z@4l
+  --z@4r..controls(z@4r-delta)and(z@2r+delta)..z@2r..z@1r--cycle;  % stroke
+else: pickup fine.nib; pos@_1(vair,180); pos@_2(vair,90);
+ pos@_3(.5[vair,slab],90); pos@_4(vair,90); pos@_5(vair,180);
+ rt x@_5l-x$=x$-lft x@_1r=3u; x@_2-x@_1=x@_3-x@_2=x@_4-x@_3=x@_5-x@_4;
+ bot y@_1=bot y@_4l=vround(.75[x_height,asc_height]-vair);
+ top y@_2r=top y@_5=asc_height; y@_3=.5[y@_2,y@_4];
+ @ = identity shifted(0,tY_shift);
+ for n = 1,2,3,4,5: forsuffixes e = l,,r: 
+  z@[n]e = z@_[n]e transformed @; endfor endfor
+ filldraw stroke z@1e{up}...z@2e{right}..z@3e..{right}z@4e...{up}z@5e; fi % stroke
+penlabels(@1,@2,@3,@4,@5); enddef;
+
+def humlaut (suffix $,@) =
+x@_3-x@_1=x@_4-x@_2=hround 3u; y@_3=y@_1;  y@_4=y@_2;
+if serifs: pickup crisp.nib; x@_3=hround(x$+2.5u); 
+ x@_2=hround(x$-2u);
+ y@_1+.5stem=h+asc_height-x_height; 
+ y@_2=max(2/3[h+asc_height-x_height,h],h+o+hair);
+% if h > .9cap_height: y@_2:=.67[y@_1,y@_2]; fi
+% above line shortens & flattens humlaut marks
+ numeric theta; theta=angle(z@_2-z@_1)+90;
+ pos@_1(stem,theta); pos@_2(hair,theta);
+ pos@_3(stem,theta); pos@_4(hair,theta);
+ filldraw circ_stroke z@_1e--z@_2e;  % left diagonal
+ filldraw circ_stroke z@_3e--z@_4e;  % right diagonal
+else: pickup fine.nib; pos@_1(stem,0); pos@_2(vair,0);
+ pos@_3(stem,0); pos@_4(vair,0);
+ % rt x@_3r=hround(w-1.5u); lft x@_4l=hround(.5w+u-.5vair);
+ x@_3=x@_4+u; x@_4=x$+1.5u;
+ top y@_1=h+asc_height-x_height;
+ bot y@_2=vround 2/3[h+asc_height-x_height,h];
+ filldraw stroke z@_1e--z@_2e;  % left diagonal
+ filldraw stroke z@_3e--z@_4e; fi  % right diagonal
+% penlabels(1,2,3,4); 
+enddef;
+
+% set output character height after a beginchar has been issued
+def sethtto(expr newht) =
+charht:=newht / hppp;
+enddef;
+
+def setwdto(expr newwd) =
+charwd:=newwd / hppp;
+enddef;
+
+def addht(expr inc_ht) =
+charht:= charht + (inc_ht / hppp);
+enddef;
+
+def addwd(expr inc_wd) =
+charwd:= charwd + (inc_wd / hppp);
+enddef;
+
+% flip rotates 180 degrees about the centerpoint whose suffix is passed
+def flip (suffix $) =
+picture V; transform t;
+y$:=y$*aspect_ratio;
+t=identity rotatedaround(z$,180) shifted(2y$*slant,0);
+V=currentpicture transformed t; currentpicture:=V;
+enddef;
+
+def invbreve (suffix $,@) =
+pickup crisp.nib; pos@_1(vair,-180); pos@_3(vair,0);
+bot y@_1=bot y@_3=y$+dot_size; lft x@_1r=hround(x$-2curve-.5vair); rt x@_3r=hround(x$+2curve+.5vair);
+numeric mid_thickness; mid_thickness=vround 1/3[vair,stem];
+pos@_2(mid_thickness,-90); x@_2=x$;
+y@_2r= y@_1+2curve;
+filldraw stroke z@_1e{up}...z@_2e{right}...{down}z@_3e;  % stroke
+penlabels(@_1,@_2,@_3); enddef;
+
+def ringdot (suffix $,@) =
+numeric rdcirc_hair,rdcirc_vair;
+rdcirc_hair=hround min(hair,u+.5); rdcirc_vair=vround min(vair,(asc_height-x_height)/6+.5);
+penpos@_1(rdcirc_vair,90); penpos@_3(rdcirc_vair,-90);
+penpos@_2(rdcirc_hair,180); penpos@_4(rdcirc_hair,0);
+x@_2r=hround(x$-.105body_height-.5rdcirc_hair);
+x@_4r=hround(x$+.105body_height+.5rdcirc_hair); x@_1=x@_3=x$; 
+if y$ > bar_height: y@_1r=y$+dot_size+2rdcirc_vair+.105body_height; y@_2=y@_4=.5[y@_1,y@_3]; y@_3=y$+dot_size+rdcirc_vair;
+else: y@_1r=y$-dot_size; y@_2=y@_4=.5[y@_1,y@_3];
+  y@_3r=-d; fi
+penstroke pulled_arc.e(@_1,@_2) & pulled_arc.e(@_2,@_3)
+ & pulled_arc.e(@_3,@_4) & pulled_arc.e(@_4,@_1) & cycle;  % bowl
+enddef;
+numeric shrinkfactor; shrinkfactor=1;
+
+def slantswitch =
+slant:=-slant;
+currenttransform:= identity slanted slant yscaled aspect_ratio scaled granularity;
+enddef; %reverse slant so that mirror() will work
+
+def mirror (expr axis) =
+x._qa=x._qb=axis; y._qa=h; y._qb=0; picture V; transform MIRROR;
+MIRROR=identity reflectedabout(z._qa,z._qb); 
+V=currentpicture transformed MIRROR; currentpicture:=V;
+slantswitch; %restore original slant
+enddef;
+
+
+def l_tail(suffix $,@) =
+x@_22=x$; x@_22r=x$r; x@_22l=x$l; bot y@_22=-1/3d; y@_22r=y@_22l=y@_22;
+filldraw stroke z$e--z@_22e;
+if serifs:  pickup tiny.nib; pos@_55(vair,-90); pos@_66(hair,-180); pos@_77(flare,-180);
+ x@_55=.5[x@_22,x@_66r]; bot y@_55r=-d-oo; y@_66-.5flare=-.88d;
+ if monospace: lft x@_66r=x$-3.5u else: z@_66r=z@_77r; rt x@_77l=floor x$-2.5u fi;
+ (x@_,y@_55r)=whatever[z@_55l,z@_22l]; x@_55r:=max(x@_,.5[x@_66r,x@_55]);
+ filldraw stroke z@_22e{down}...z@_55e{left};  bulb(@_55,@_66,@_77); % arc and bulb
+else: pickup fine.nib; pos@_22'(stem',0); z@_22'=z@_22;
+ pos@_66(.2[vair,stem'],-90); pos@_77(vair,-90);
+ lft x@_77r=hround x$-2.5u; bot y@_77r=vround 5/6(-d-oo);
+ (x@_,y@_77l)=whatever[z@_77r,(x$,h)]; x@_77l:=x@_;
+ z@_55r=z@_22'r; (x@_22'l,y@_55l)=whatever[z@_77l,z@_55r]; x@_55l=x@_22'l; y@_55=y@_55r;
+ x@_66r=.5[x@_77r,x@_55r]; x@_66l:=.5[x@_77l,x@_55l]; bot y@_66r=-d-oo;
+ filldraw stroke z@_22'e..{down}z@_55e & super_arc.e(@_55,@_66)
+  & z@_66e{left}..z@_77e; fi  % arc and terminal
+enddef;
+
+def r_tail(suffix $,@) =
+ pickup if serifs: tiny.nib else: fine.nib fi ;
+x@_22=x$; x@_22r=x$r; x@_22l=x$l; bot y@_22=-1/3d; y@_22r=y@_22l=y@_22;
+filldraw stroke z$e--z@_22e;
+if serifs:  pickup tiny.nib; pos@_55(vair,90); pos@_66(hair,0); pos@_77(flare,0);
+ x@_55=.5[x@_22,x@_66l]; bot y@_55l=-d-oo; y@_66-.5flare=-.88d;
+ if monospace: rt x@_66r=x$+3.5u else: z@_66r=z@_77r; lft x@_77l=floor x$+2.5u fi;
+% (x@_,y@_55l)=whatever[z@_55r,z@_22l]; x@_55l:=max(x@_,.5[x@_66l,x@_55]);
+ filldraw stroke z@_22e{down}...z@_55e{right};  
+z@_55'=z@_55; pos@_55'(vair,-90);
+bulb(@_55',@_66,@_77); % arc and bulb
+else: pickup fine.nib; pos@_22'(stem',0); z@_22'=z@_22;
+ pos@_66(.2[vair,stem'],90); pos@_77(vair,90);
+ rt x@_77r=hround x$+2.5u; bot y@_77l=vround 5/6(-d-oo);
+ (x@_,y@_77r)=whatever[z@_77l,(x$,h)]; x@_77r:=x@_;
+ z@_55l=z@_22'l; (x@_22'r,y@_55r)=whatever[z@_77r,z@_55l]; x@_55r=x@_22'r; y@_55=y@_55l;
+ x@_66l=.5[x@_77l,x@_55l]; x@_66r:=.5[x@_77r,x@_55r]; bot y@_66l=-d-oo;
+ filldraw stroke z@_77e..{left}z@_66e & super_arc.e(@_66,@_55)
+  & z@_55e{up}..z@_22'e; fi
+% filldraw stroke z@_22'e..{down}z@_55e & super_arc.e(@_55,@_66)
+%  & z@_66e{right}..z@_77e; fi  % arc and terminal
+penlabels(@_22,@_55,@_66,@_77);
+enddef;
+
+def oef_stroke(suffix $,$$,@,left_serif,right_serif)(expr left_jut,right_jut)=
+% pickup tiny.nib; bot y$l=-d; 
+ pickup fine.nib; bot y$l=-d; 
+ if spike: y$r:=y$l+1.5stem; y$:=.5[y$l,y$r]; fi
+ penpos@0(x$r-x$l,0); x@0l=x$l; top y@0=x_height;
+ filldraw stroke z$e--z@0e;  % stem
+% pickup fine.nib; pos@0'(x$r-x$l-(hround stem_corr)+tiny,180);
+ pos@0'(x$r-x$l,180); z@0'=z@0;
+% y@0'=y@0; lft x@0'r=tiny.lft x$l;
+ penpos@1(x@0'l-x@0'r,180); x@1=x@0'; y@1+.5vair=.5[x_height,h];
+ pos@2(vair,90); top y@2r=h+oo;
+ if serifs: x@2=.6[x@1,x$$r]; (x@,y@2r)=whatever[z@2l,z@1l];
+    x@2r:=min(x@,.5[x@2,x$$r]); pos@3(hair,0); bulb(@2,@3,$$);  % bulb
+    filldraw stroke z@0'e--z@1e & super_arc.e(@1,@2);  % arc
+    if not spike: dish_serif($,@0,left_serif,1/3,left_jut,right_serif,1/3,right_jut); fi
+  else: x@2=.6[x@1,x$$]; y@1l:=1/3[y@1l,y@2l];
+    filldraw stroke z@0'e--z@1e & super_arc.e(@1,@2)
+    & term.e(@2,$$,right,.9,4);   % arc and terminal
+  fi
+ penlabels(@0,@1,@2); enddef;
+
+def oeh_stroke(suffix $,@,@@,$$) =
+ penpos$$(x@@r-x@@l,0); x$$=x@@-u;  bot y$$=0; 
+% y@@=1/3[bar_height,x_height];
+ y@@=bar_height;
+ penpos$''(x$r-x$l,0); x$''=x$; y$''=1/8[bar_height,x_height];
+ filldraw stroke z$''e--z$e;  % thicken the lower left stem
+ penpos@0(min(rt x$r-lft x$l,thin_join)-fine,180); pickup fine.nib;
+ rt x@0l=tiny.rt x$r; y@0=y$'';
+ pos@1(vair,90); pos@@'(x@@r-x@@l+tiny,0); z@@'=z@@;
+ x@1=.5[rt x@0l,rt x@@'r]; top y@1r=x_height+oo;
+ (x@,y@1l)=whatever[z@1r,z@0l]; x@1l:=x@;
+%  filldraw stroke z@0e{up}...{right}z@1e
+%  &{{interim superness:=hein_super; super_arc.e(@1,@@')}};  % arch and right stem
+% pickup tiny.nib; filldraw stroke z@@e{down}...{-2,-1}z$$e;  % right stem
+ filldraw stroke z@0e{up}...{right}z@1e
+   & pulled_super_arc.e(@1,@@)(.5superpull) & pulled_super_arc.e(@@,$$)(.5superpull); %arch and curved left stem
+ labels(@0); penlabels(@1); enddef;
+
+def circ_coord(suffix $,$$) (expr len, ang) =
+  x$ := x$$ + (len * cosd ang);
+  y$ := y$$ - (len * aspect_ratio * cosd (ang + 90));
+enddef;
+
+let cmbulb=bulb;
+% if a cmbase bulb is very close to its takeoff point (vertically) 
+% path_l will be relatively flat at its intersection with path_r and
+% subpath(0,xpart(path_.r intersectiontimes path_.l)) of path_.r--z$$r
+% may not lie entirely within  the link contour (path_.l--z$$r{0,y$r-y$$r}...{x$r-x$$r,0}z$r--cycle)
+% this will result in a wedge from the intersectionpoint to z$$r not being filled.
+%
+% therefore we redefine
+def bulb(suffix $,$$,$$$) =
+ z$$$r=z$$r;
+ path_.l:=z$l{x$$r-x$r,0}...{0,y$$r-y$r}z$$l;
+ filldraw path_.l--z$$r{0,y$r-y$$r}...{x$r-x$$r,0}z$r--cycle; % link
+ path_.r:=z$$$l{0,y$r-y$$r}..z$$$r{0,y$$r-y$r}; % near-circle
+ filldraw path_.r{0,y$$r-y$r}..{0,y$r-y$$r}cycle; % bulb in filleverything mode
+enddef;
+
+% end of file gram_max.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/grampunc.mf b/Master/texmf-dist/fonts/source/public/wnri/grampunc.mf
new file mode 100644
index 00000000000..0453a0bdcd4
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/grampunc.mf
@@ -0,0 +1,255 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw punctuation characters. Partly based on comlig.mf 
+% of Computer Modern miscellaneous punctuation and free accents
+%
+
+cmchar "close quote";
+newchar(closequote,7u#+max(2u#,dot_size#),asc_height#,0);
+italcorr asc_height#*slant+dot_size#-4.1u#;
+adjust_fit(0,0);
+x1-.5dot_size=hround .6u; y2+.5dot_size=h;
+x2-x1=hround(1.5u+max(2u,dot_size)); y2=y1;
+comma(1,a,dot_size,.25u,comma_depth); % left dot and tail
+comma(2,b,dot_size,.25u,comma_depth); % right dot and tail
+penlabels(1,2); endchar;
+
+cmchar "Hyphen";
+newchar(hyphen,6u#,x_height#,0);
+italcorr .5x_height#*slant-.5u#;
+adjust_fit(0,0);
+numeric thickness; thickness=if hefty:bar else:.75[hair,stem] fi;
+pickup crisp.nib; pos1(thickness,90); pos2(thickness,90);
+top y1r=top y2r=vround(.5h+.5thickness); rt x2=hround(w-u)+eps;
+if monospace: x2=w-x1 else: lft x1=hround .2u-eps fi;
+filldraw stroke z1e--z2e;  % bar
+penlabels(1,2); endchar;
+
+cmchar "Opening quotes";
+newchar(openquote,7u#+max(2u#,dot_size#),asc_height#,0);
+italcorr asc_height#*slant-.1u#;
+adjust_fit(0,0);
+x2+.5dot_size=hround(w-.6u); y1+.5dot_size=h-comma_depth;
+x2-x1=hround(1.5u+max(2u,dot_size)); y2=y1;
+ammoc(1,a,dot_size,.25u,comma_depth); % left dot and tail
+ammoc(2,b,dot_size,.25u,comma_depth); % right dot and tail
+penlabels(1,2); endchar;
+
+cmchar "En dash";
+newchar(endash,9u#,x_height#,0);
+italcorr .61803x_height#*slant+.5u#;
+adjust_fit(0,0);
+pickup crisp.nib; pos1(vair,90); pos2(vair,90);
+top y1r=top y2r=vround(.61803h+.5vair); lft x1=-eps; rt x2=w+eps;
+filldraw stroke z1e--z2e;  % bar
+penlabels(1,2); endchar;
+
+cmchar "Em dash";
+newchar(emdash,18u#,x_height#,0);
+italcorr .61803x_height#*slant+.5u#;
+adjust_fit(letter_fit#,letter_fit#);
+pickup crisp.nib; pos1(vair,90); pos2(vair,90);
+top y1r=top y2r=vround(.61803h+.5vair); lft x1=-eps; rt x2=w+eps;
+filldraw stroke z1e--z2e;  % bar
+penlabels(1,2); endchar;
+
+cmchar "Less than sign";
+compute_spread(5/4x_height#,3/2x_height#);
+newchar(lesser,14u#,v_center(spread#+rule_thickness#));
+italcorr h#*slant-u#;
+adjust_fit(0,0); pickup rule.nib;
+lft x2=hround 1.5u-eps; x1=x3=w-x2;
+y1-y3=spread; y2=.5[y1,y3]=math_axis;
+draw z1--z2--z3;  % diagonals
+labels(1,2,3); endchar;
+
+cmchar "Greater than sign";
+compute_spread(5/4x_height#,3/2x_height#);
+newchar(greater,14u#,v_center(spread#+rule_thickness#));
+italcorr math_axis#*slant-u#;
+adjust_fit(0,0); pickup rule.nib;
+rt x2=hround(w-1.5u)+eps; x1=x3=w-x2;
+y1-y3=spread; y2=.5[y1,y3]=math_axis;
+draw z1--z2--z3;  % diagonals
+labels(1,2,3); endchar;
+
+iff known vertical: cmchar "Vertical line";
+newchar(vertical,5u#,body_height#,paren_depth#);
+italcorr body_height#*slant+.5rule_thickness#-2u#;
+adjust_fit(0,0); pickup rule.nib;
+x1=x2=good.x .5w; top y1=h+eps; bot y2=-d-eps;
+draw z1--z2;  % stem
+labels(1,2); endchar;
+
+iff known left_brace: cmchar "Left curly brace";
+newchar(left_brace,9u#,body_height#,paren_depth#);
+italcorr body_height#*slant+.5vair#-u#;
+adjust_fit(0,0); pickup fine.nib;
+forsuffixes $=1,1',4,4',7,7': pos$(vair,0); endfor
+forsuffixes $=2,3,5,6: pos$(stem,0); endfor
+x2=x3=x5=x6; x1=x1'=x7=x7'=w-x4=w-x4';
+lft x4l=hround(1.5u-.5vair); lft x2l=hround(.5w-.5stem);
+top y1=h; bot y7=-d; .5[y4,y4']=.5[y1,y7]=.5[y2,y6]=.5[y3,y5];
+y1-y2=y3-y4=(y1-y4)/4; y1-y1'=y4-y4'=y7'-y7=vair-fine;
+filldraw z1l{left}...z2l---z3l...{left}z4l
+ --z4'l{right}...z5l---z6l...{right}z7l
+ --z7r--z7'r{left}...z6r---z5r...{left}.5[z4r,z4'r]{right}
+ ...z3r---z2r...{right}z1'r--z1r--cycle;  % stroke
+penlabels(1,2,3,4,5,6,7); endchar;
+
+iff known right_brace: cmchar "Right curly brace";
+newchar(right_brace,9u#,body_height#,paren_depth#);
+italcorr math_axis#*slant+.5vair#-u#;
+adjust_fit(0,0); pickup fine.nib;
+forsuffixes $=1,1',4,4',7,7': pos$(vair,0); endfor
+forsuffixes $=2,3,5,6: pos$(stem,0); endfor
+x2=x3=x5=x6; x1=x1'=x7=x7'=w-x4=w-x4';
+rt x4r=hround(w-1.5u+.5vair); rt x2r=hround(.5w+.5stem);
+top y1=h; bot y7=-d; .5[y4,y4']=.5[y1,y7]=.5[y2,y6]=.5[y3,y5];
+y1-y2=y3-y4=(y1-y4)/4; y1-y1'=y4-y4'=y7'-y7=vair-fine;
+filldraw z1r{right}...z2r---z3r...{right}z4r
+ --z4'r{left}...z5r---z6r...{left}z7r
+ --z7l--z7'l{right}...z6l---z5l...{right}.5[z4l,z4'l]{left}
+ ...z3l---z2l...{left}z1'l--z1l--cycle;  % stroke
+penlabels(1,2,3,4,5,6,7); endchar;
+
+cmchar "Straight double quotes";
+newchar(typequote,9u#,asc_height#,0);
+numeric top_width#,spread#; 
+top_width#=if serifs: flare# else: stem# fi;
+spread#=max(3u#,top_width#+.5u#); define_pixels(spread);
+italcorr asc_height#*slant+.5top_width#+.5spread#-4u#;
+adjust_fit(0,0);
+x1=x2; x3=x4=w-x1; x3-x1=spread+2; y1=y3;
+y2=y4=max(.5[bar_height,x_height]+.5vair,h-x_height);
+if serifs: pickup crisp.nib; pos1(flare,0); pos2(vair,0);
+ pos3(flare,0); pos4(vair,0);
+ y1+.5stem=h; filldraw circ_stroke z1e--z2e;  % left stem and bulb
+ filldraw circ_stroke z3e--z4e;  % right stem and bulb
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ pos3(stem,0); pos4(vair,0);
+ top y1=h; filldraw stroke z1e--z2e;  % left stem
+ filldraw stroke z3e--z4e; fi  % right stem
+penlabels(1,2,3,4); endchar;
+
+cmchar "Therefore symbol == Old English period";
+numeric dot_diam#,dot_diam;
+dot_diam#=max(dot_size#,cap_curve#);
+newchar(oeper,x_height#+2u#+dot_diam#,.86x_height#+dot_diam#,0);
+dot_diam=max(tiny.breadth,hround(max(dot_size,cap_curve)-2stem_corr));
+italcorr h#*slant+.5dot_diam#-2.25u#;
+adjust_fit(0,0);
+pickup tiny.nib; pos1(dot_diam,0); pos2(dot_diam,90);
+x1=x2=u+.5dot_diam; bot y2l=-o;
+y1=.5[y2l,y2r]; dot(1,2);  % left dot
+pos3(dot_diam,0); penpos4(y2r-y2l,90); y3=y4=y1; x3=x4=w-x1;
+dot(3,4);  % right dot
+pos5(dot_diam,0); pos6(dot_diam,90);
+x5=x6=.5w; bot y6l=.86x_height-o;
+y5=.5[y6l,y6r]; dot(5,6);
+penlabels(1,2,3,4,5,6); endchar;
+
+cmchar "subscript Scandinavian circle accent";
+newchar(Ring,5u#+hair#,0,desc_depth#);
+adjust_fit(0,0);
+numeric circ_hair,circ_vair; h:=asc_height;
+circ_hair=hround min(hair,u+.5); circ_vair=vround min(vair,(asc_height-x_height)/6+.5);
+penpos1(circ_vair,90); penpos3(circ_vair,-90);
+penpos2(circ_hair,180); penpos4(circ_hair,0);
+x2r=hround(.5w-1.5u-.5circ_hair);
+x4r=w-x2r; x1=x3=.5w; y1r=h+apex_o; y2=y4=.5[y1,y3];
+y3r=vround(1/3[x_height,h]+apex_o);
+penstroke pulled_arc.e(1,2) & pulled_arc.e(2,3)
+ & pulled_arc.e(3,4) & pulled_arc.e(4,1) & cycle;  % bowl
+currentpicture:=currentpicture shifted (0,-(asc_height+dot_size)*aspect_ratio);
+endchar;
+
+cmchar "Grave accent";
+newchar(Grave,9u#,min(asc_height#,2x_height#),0);
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1-.5stem=hround 2u; x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ lft x1l=hround 1.5u; rt x2r=hround(.5w+.25u+.5vair);
+ top y1=h; bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+penlabels(1,2); endchar;
+
+cmchar "Acute accent";
+newchar(Acute,9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant-if serifs: 1.5 fi u#;
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1+.5stem=hround(w-2u); x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ rt x1r=hround(w-1.5u); lft x2l=hround(.5w-.25u-.5vair);
+ top y1=h; bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+penlabels(1,2); endchar;
+
+cmchar "Hachek (check) accent";
+newchar(Hachek,9u#,.75[x_height#,min(asc_height#,2x_height#)],0);
+h':=vround min(asc_height,2x_height); % height of circumflex being inverted
+if serifs: italcorr h#*slant+.5hair#-1.75u#;
+ adjust_fit(0,0);
+ pickup crisp.nib; pos2'(.5[vair,curve],90); top y2'r=h;
+ pos2(.5[vair,curve],90); x2=.5w;
+ x1=w-x3=good.x 2.25u; top y1=top y3=h; y1-y2=.5(y2'-x_height);
+ pos1(hair,angle(z2-z1)+90); pos3(hair,angle(z3-z2)+90);
+ filldraw stroke z1e--z2e--z3e;  % diagonals
+else: italcorr h#*slant-.5stem#+.5vair#-.75u#;
+ adjust_fit(0,0);
+ pickup fine.nib; pos1(vair,0); pos3(vair,0); x1=w-x3;
+ pos2(stem,0); bot y2=vround(1/12[x_height,h']+o); x2=.5w;
+ top y1=top y3=h+o; lft x1l=hround(rt x2r-3.25u-.5vair);
+ z0=whatever[z1r,z2r]=whatever[z2l,z3l];
+ y4l=y4r=y2; x4l=good.x .2[x2l,x2]; x4r=w-x4l;
+ filldraw z4l--z1l--z1r--z0--z3l--z3r--z4r--cycle; fi  % diagonals
+penlabels(0,1,2,3,4); endchar;
+
+cmchar "Breve accent";
+newchar(Breve,9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant+.5vair#-1.5u#;
+adjust_fit(0,0);
+pickup crisp.nib; pos1(vair,-180); pos3(vair,0);
+top y1=top y3=h; lft x1r=w-rt x3r=hround(2u-.5vair);
+numeric mid_thickness; mid_thickness=vround 1/3[vair,stem];
+pos2(mid_thickness,-90); x2=.5w;
+bot y2r=vround max(x_height+o+tiny,1/3[x_height,h]+o-.5mid_thickness);
+filldraw stroke z1e{down}...z2e{right}...{up}z3e;  % stroke
+penlabels(1,2,3); endchar;
+
+cmchar "Inverted Breve accent";
+newchar(Ibreve,9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant+.5vair#-1.5u#;
+adjust_fit(0,0);
+pickup crisp.nib; pos1(vair,-180); pos3(vair,0);
+top y2r=h; lft x1r=w-rt x3r=hround(2u-.5vair);
+numeric mid_thickness; mid_thickness=vround 1/3[vair,stem];
+pos2(mid_thickness,90); x2=.5w;
+bot y1=bot y3=vround max(x_height+o+tiny,1/3[x_height,h]+o-.5mid_thickness);
+filldraw stroke z1e{up}...z2e{right}...{down}z3e;  % stroke
+penlabels(1,2,3); endchar;
+
+cmchar "Subscript Inverted Breve accent";
+newchar(Uibreve,9u#,0,.5desc_depth#);
+italcorr h#*slant+.5vair#-1.5u#;
+adjust_fit(0,0); h:=min(asc_height,2x_height);
+pickup crisp.nib;
+numeric mid_thickness; mid_thickness=vround 1/3[vair,stem];
+y2=-dot_size; y1=y3=vround max(x_height+o+tiny, 1/3[x_height,asc_height]+o-.5mid_thickness)-asc_height-dot_size;
+x2=x1+2.5u=x3-2.5u=.5w;
+pos2(mid_thickness,90); pos1(vair,-180); pos3(vair,0);
+filldraw stroke z1e{up}...z2e{right}...{down}z3e;
+chardp:= (bot y1) / hppp;  %adjust depth 
+penlabels(1,2,3); endchar;
+
+% end of file grampunc.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/gravacct.mf b/Master/texmf-dist/fonts/source/public/wnri/gravacct.mf
new file mode 100644
index 00000000000..756118cc22a
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/gravacct.mf
@@ -0,0 +1,30 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw grave accents
+%
+
+cmchar "Grave accent";
+beginchar(oct"022",9u#,min(asc_height#,2x_height#),0);
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1-.5stem=hround 2u; x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ lft x1l=hround 1.5u; rt x2r=hround(.5w+.25u+.5vair);
+ top y1=h; bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+makeACCENT(GravePic);
+endgroup;
+extra_endchar:=
+  " czu ap(GravePic);  ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = grave enddef;
+
+% end of file gravacct.mf
+
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/greeks.mf b/Master/texmf-dist/fonts/source/public/wnri/greeks.mf
new file mode 100644
index 00000000000..47e7fc6fdc0
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/greeks.mf
@@ -0,0 +1,83 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw Greek characters
+%
+
+cmchar "Lowercase Greek theta";
+newchar(lthet,8.25u#,asc_height#,0);
+italcorr .7asc_height#*slant+.5curve#-u#;
+adjust_fit(0,0); pickup fine.nib;
+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
+pos2'(bar,90); pos4'(bar,90); z2'=z2l; z4'=z4l;
+filldraw stroke z2'e--z4'e;  % bar
+math_fit(-.3asc_height#*slant-u#+.5curve#,ic#-.5u#);
+penlabels(1,2,3,4); endchar;
+
+cmchar "delta";
+newchar(ldelta,9u#,x_height#,0);
+adjust_fit(0,0);
+numeric left_stem,alpha;
+left_stem=hair if hefty: -stem_corr fi;
+x1l=w-x4r=.75u; y1=y4=0;
+x2-x1=x4-x3; x3r=x2r+apex_corr; y2=y3=h+apex_o+apex_oo;
+alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr);
+penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0);
+penpos3(alpha*stem,0); penpos4(alpha*stem,0);
+fill diag_end(2l,1l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l)--cycle;  % triangle
+z0=whatever[z1r,z2r]=whatever[z3l,z4l];
+y5=y6=vstem; z5=whatever[z1r,z2r]; z6=whatever[z3l,z4l];
+if y0<h-notch_cut: y0:=h-notch_cut;
+ unfill z0+.5right{down}...{z4-z3}z6--z5{z2-z1}
+  ...{up}z0+.5left--cycle; % counter
+else: unfill z0--z5--z6--cycle; fi  % counter
+penlabels(0,1,2,3,4,5,6); endchar;
+
+cmchar "phonetic gamma";
+newchar(lgama,if serifs: 9.5u# else:9u# fi,x_height#,desc_depth#);
+italcorr x_height#*slant+.25u#;
+adjust_fit(serif_fit# if monospace:+\\.5u#,.5u#+ else:,fi\\ serif_fit#);
+numeric left_stem,right_stem,outer_jut; pickup tiny.nib; 
+left_stem=fudged.stem-stem_corr;
+right_stem=min(fudged.hair if hefty:-2stem_corr fi,left_stem);
+outer_jut=.75jut; x1l=w-x4r=if serifs:l+letter_fit+outer_jut+.25u+tiny else: u fi; 
+y1=y4=h; x5=x3=x2=.5[x1,x4]; y3=y2=.265h; bot y5r=-d;
+numeric gbot; gbot=.5(left_stem+right_stem);
+pos1(left_stem,0); pos4(right_stem,-180); pos2(left_stem,0);
+pos3(right_stem,-180); pos5(gbot,-90);
+filldraw stroke z1e--z2e{z2-z1}...{left}z5e{left}...{z4-z3}z3e--z4e;
+if serifs: numeric inner_jut; pickup tiny.nib;
+ if rt x1r+jut+.5u+1<=lft x4l-jut: inner_jut=jut;
+ else: rt x1r+inner_jut+.5u+1=lft x4l-inner_jut; fi
+ dish_serif(1,2,a,1/3,outer_jut,b,1/2,inner_jut);  % left serif
+ dish_serif(4,3,c,.6,inner_jut,d,1/2,outer_jut)(dark); 
+ fi  % right serif
+penlabels(0,1,2,3,4,5); endchar;
+
+cmchar "epsilon";
+newchar(lepsi,8u#,x_height#,0);
+italcorr x_height#*slant-.5u#;
+adjust_fit(0,0); pickup fine.nib;
+numeric light_vstem; light_vstem=Vround 2/3[vair,vstem];
+pos2(vstem,90); x2=x8=.5w+.5u; top y2r=h+o;
+x1+.5vstem=hround(w-u); y1=.2[y2,bar_height];
+pos1(vstem,angle(x1-x2,2(y1-y2))+90); pos3(slab,180); pos4(vair,270);
+pos5(slab,360); pos6(vair,450); pos7(hair,540); pos8(vstem,630);
+lft x3r=hround u; x4=x6=.5w; rt x5r=hround(w-2.5u); x7=x3;
+y3=.5[y2,y4]; y5=bar_height=.5[y4,y6]; y7=.5[y6,y8]; bot y8r=-o;
+top y6r-bot y4r=vstem+eps; if y6l<y4l: y6l:=y4l:=y5; fi
+x9+.5vstem=hround(w-.5u); y9=1/3[y8,bar_height];
+pos9(vstem,angle(x8-x9,2(y8-y9))+90);
+filldraw circ_stroke z1e{x2-x1,2(y2-y1)}...pulled_super_arc.e(2,3)(.5superpull)
+ & super_arc.e(3,4)...{up}z5e;  % upper arc
+filldraw circ_stroke z9e{x8-x9,8(y8-y9)}...pulled_arc.e(8,7)
+ & super_arc.e(7,6)...{down}z5e;  % lower arc
+math_fit(-.5bar_height#*slant-.5u#,ic#);
+penlabels(1,2,3,4,5,6,7,8,9); endchar;
+
+% end of file greeks.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/haccbase.mf b/Master/texmf-dist/fonts/source/public/wnri/haccbase.mf
new file mode 100644
index 00000000000..083573bb6ed
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/haccbase.mf
@@ -0,0 +1,67 @@
+% 
+% Washington Romanized Indic base file
+%
+% File       : haccbase.mf (was nuhacccm.mf)
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Roman and encoded according to
+% the Classical Sanskrit/Classical Sanskrit eXtended character set. 
+% See wnindic.map for more details.
+%
+
+string charmsg; % charmsg will hold text passed by redefined cmchar
+
+% if we are very short of string space we will dodge instead
+% redef cmchar so that it saves the string until known if needed
+%def cmchar text t = charmsg := t; enddef;
+def cmchar text t = enddef;
+
+string oldendchar; oldendchar=extra_endchar;
+def oechar = r:=r+shrink_fit; w:=r-l; enddef;
+
+if unknown testing: boolean testing; testing=false; fi
+
+% redef beginchar: beginchar if the charcode symbol is known, else skip
+def newchar (suffix mycode)(expr w_sharp,h_sharp,d_sharp) =
+  if testing:  if unknown cp.mycode: show cp.mycode; fi fi
+  iff known cp.mycode:  
+    beginchar(cp.mycode,w_sharp,h_sharp,d_sharp);
+enddef;
+
+% define points relative to which accents may be placed
+pair tla,tca,tra,lla,lca,lra;
+
+% assign values to a pair from x and y expressions
+%%% !!! the suffixes passed are really pairs !!!
+def pairassign (suffix thispair)(expr thisx, thisy) =
+    pair thispair;
+    xpart thispair=thisx; ypart thispair=thisy;
+enddef;
+
+% equate one pair to another  thispair:=thatpair
+%%% !!! the suffixes passed are really pairs !!!
+def pairequate (suffix thispair, thatpair) =
+    pair thispair;
+    xpart thispair= xpart thatpair;
+    ypart thispair= ypart thatpair;
+enddef;
+
+% abbreviations for reducing string lengths
+def cza = addto currentpicture also enddef;
+%def czt = shifted (xpart tca,aspect_ratio(ypart tca - x_height)); adjustacctht; enddef;
+%def czl = shifted (xpart lca,0); deepen; enddef;
+def czo = & oldendchar; enddef;
+def czu = At:=identity shifted ((xpart tca) + slant*(ypart tca - x_height),aspect_ratio*(ypart tca - x_height)); enddef;
+def czr = At:=identity shifted ((xpart tra) + slant*(ypart tra - x_height),aspect_ratio*(ypart tra - x_height)); enddef;
+def czd = At:=identity shifted ((xpart lca) + slant*(ypart lca),aspect_ratio*ypart lca); enddef;
+def czdm = At:=identity shifted ((xpart lca) + slant*(ypart lca),aspect_ratio*(if (ypart lca)> -o: -o else: (ypart lca) fi)); enddef;
+
+% end of file haccbase.mf
diff --git a/Master/texmf-dist/fonts/source/public/wnri/hachacct.mf b/Master/texmf-dist/fonts/source/public/wnri/hachacct.mf
new file mode 100644
index 00000000000..96c8fe879f4
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/hachacct.mf
@@ -0,0 +1,37 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw hachek accents 
+%
+
+cmchar "Hachek (check) accent";
+beginchar(oct"024",9u#,.75[x_height#,min(asc_height#,2x_height#)],0);
+h':=vround min(asc_height,2x_height); % height of circumflex being inverted
+if serifs: italcorr h#*slant+.5hair#-1.75u#;
+ adjust_fit(0,0);
+ pickup crisp.nib; pos2'(.5[vair,curve],90); top y2'r=h;
+ pos2(.5[vair,curve],90); x2=.5w;
+ x1=w-x3=good.x 2.25u; top y1=top y3=h; y1-y2=.5(y2'-x_height);
+ pos1(hair,angle(z2-z1)+90); pos3(hair,angle(z3-z2)+90);
+ filldraw stroke z1e--z2e--z3e;  % diagonals
+else: italcorr h#*slant-.5stem#+.5vair#-.75u#;
+ adjust_fit(0,0);
+ pickup fine.nib; pos1(vair,0); pos3(vair,0); x1=w-x3;
+ pos2(stem,0); bot y2=vround(1/12[x_height,h']+o); x2=.5w;
+ top y1=top y3=h+o; lft x1l=hround(rt x2r-3.25u-.5vair);
+ z0=whatever[z1r,z2r]=whatever[z2l,z3l];
+ y4l=y4r=y2; x4l=good.x .2[x2l,x2]; x4r=w-x4l;
+ filldraw z4l--z1l--z1r--z0--z3l--z3r--z4r--cycle; fi  % diagonals
+if hefty: currentpicture:=currentpicture shifted(0,1/2aspect_ratio*dot_size); fi
+makeACCENT(CaronPic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(CaronPic);  ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = hach enddef;
+
+% end of file hachacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/hattacct.mf b/Master/texmf-dist/fonts/source/public/wnri/hattacct.mf
new file mode 100644
index 00000000000..4ad0b6906ea
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/hattacct.mf
@@ -0,0 +1,32 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw circumflex accents 
+%
+
+cmchar "Circumflex (hat) accent";
+beginchar(oct"136",9u#,min(asc_height#,2x_height#),0);
+if serifs: italcorr .5[x_height#,h#]*slant+.5hair#-1.75u#;
+ adjust_fit(0,0);
+ pickup crisp.nib; pos2(.5[vair,curve],90); top y2r=h; x2=.5w;
+ x1=w-x3=good.x 2.25u; y1=y3=.5[x_height,y2];
+ pos1(hair,angle(z2-z1)+90); pos3(hair,angle(z3-z2)+90);
+ filldraw stroke z1e--z2e--z3e;  % diagonals
+else: italcorr 2/3[x_height#,h#]*slant-.5stem#+.5vair#-.75u#;
+ adjust_fit(0,0);
+ pickup fine.nib; pos1(vair,0); pos3(vair,0); x1=w-x3;
+ pos2(stem,0); top y2=h; x2=.5w; bot y1=bot y3=vround 2/3[h,x_height]-eps;
+ lft x1l=hround(rt x2r-3.25u-.5vair); % same slope as in the acute accent
+ z0=whatever[z1r,z2r]=whatever[z2l,z3l];
+ y4l=y4r=y2; x4l=good.x .2[x2l,x2]; x4r=w-x4l;
+ filldraw z4l--z1l--z1r--z0--z3l--z3r--z4r--cycle; fi  % diagonals
+makeACCENT(HatPic);
+endgroup;
+extra_endchar:=
+  " czu ap(HatPic);  ah; oechar; ";
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = hatt enddef;
+
+% end of file hattacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/iaesc.mf b/Master/texmf-dist/fonts/source/public/wnri/iaesc.mf
new file mode 100644
index 00000000000..736843fb86e
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/iaesc.mf
@@ -0,0 +1,94 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw variant italic \ae ligature
+%
+
+% aesc.mf  italic variant of ae
+
+cmchar "Italic ligature ae";
+newchar(aesc,13u#,x_height#,0);
+italcorr max(1/3x_height#*slant,x_height#*slant+.5(.2[hair#,stem#])-u#);
+adjust_fit(if monospace:-u#,-u# else: 0,0 fi); pickup fine.nib;
+forsuffixes $=hair,stem: shaved$:=mfudged$; save $; $=shaved$; endfor
+numeric heavy_hair; heavy_hair=hround .2[hair,stem];
+numeric light_stem; light_stem=hround .75[hair,stem];
+pos0(vair,-90); pos1(heavy_hair,0); pos2(vair,90);
+pos3(light_stem,180); pos4(vair,270); pos5(hair,320);
+x0=rt x3l; rt x1r=hround(w-1.5u+.5heavy_hair); x2=x4=.5(w+6u);
+lft x3r=hround(.5w-.5light_stem); x5r=good.x(w-.5u); x6=x5;
+y0=y3=y6=bar_height; y1=.5[y0,y2]; top y2r=h+oo; bot y4r=-oo;
+top y5l=vround(.5bar_height+.5); path p; p=z4{right}..z5..z6;
+filldraw stroke z0e{right}...z1e{up}...pulled_arc.e(2,3)
+ & pulled_arc.e(3,4)...{direction 1 of p}z5e;  % arc of e
+% the a part
+pos7(light_stem,0); pos8(light_stem,0);
+x7=x8=x3; y7+.5light_stem=h+oo; y8-.5light_stem=-oo;
+pos7'(vair,-225); pos11(curve,-180); z7'=z7;
+pos12(vair,-90); pos3'(hair,0); z3'=z3;
+lft x11r=hround(1.5u-.5curve); x12=.4[x11,x3];
+y11=.3[y12,y7]; bot y12r=-oo;
+z3''=z3; pos3''(light_stem,0);
+filldraw stroke z3'e{left}...{down}pulled_arc.e(11,12)
+ & pulled_arc.e(12,3'');  %  bowl of a
+ x31=.1[x11,x3]; y31=.8h; pos31(heavy_hair,0);
+ x32=.4[x31,x3]; top y32l=h+o; pos32(vair,-90);
+ filldraw stroke pulled_arc.e(31,32) & pulled_arc.e(32,3);
+%filldraw z7l---z8l..z8r---z7r..cycle;  % stem
+penlabels(0,1,2,3,4,5,6,7,8,11,12); endchar;
+
+cmchar "The ligature AE";
+newchar(Aesc,16u#,cap_height#,0);
+italcorr cap_height#*slant-beak_jut#-.5u#;
+adjust_fit(cap_serif_fit#,0);
+numeric left_stem,mid_stem,outer_jut,alpha;
+mid_stem=max(tiny.breadth,hround .9[mfudged.hair,mfudged.cap_stem]);
+pickup tiny.nib; pos1(mid_stem,0); pos2(mid_stem,0);
+lft x1l=lft x2l=hround(if monospace or hefty:.55 else:.5 fi\\w-.75u);
+top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+pickup crisp.nib; pos3(slab,90); pos4(mfudged.hair,0);
+top y3r=h; x3=x1; rt x4r=hround(w-u); y4=good.y(y3l-beak)-eps;
+arm(3,4,e,beak_darkness,beak_jut);  % upper arm and beak
+pos5(cap_bar,-90); pos6(mfudged.hair,0); x5=x1;
+top y5l=vround(if hefty:.52 else:.48 fi\\[y2,y1]+.5cap_bar);
+pos0(cap_bar,90); pos7(mfudged.hair,0);
+z0=z5; x6=x7; y6-y5l=y0l-y7;
+if serifs and not(monospace and hefty): rt x6r=hround(w-3.65u+.5mfudged.hair);
+ y6=good.y(y5l+.6beak)+eps; rt x9r=hround(w-.5u);
+else: rt x6r=hround(w-1.5u); y6=y5l+eps; rt x9r=hround(w-.75u); fi
+arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0);  % middle arm and serif
+pos8(slab if not serifs:+2stem_corr fi,-90);
+pos9(mfudged.hair,0); bot y8r=0; x8=x2; y9=good.y(y8l+7/6beak)+eps;
+arm(8,9,h,beak_darkness,1.5beak_jut);  % lower arm and beak
+left_stem=if monospace:fudged.hair else: cap_hair fi if hefty: -3stem_corr fi;
+outer_jut=.8cap_jut; x11l=l+letter_fit+outer_jut+.5u; y11=0;
+x12=x1l-apex_corr-if monospace:2 fi\\u; y12=h;
+alpha=diag_ratio(1,.5left_stem,y12-y11,x12-x11l);
+penpos11(alpha*left_stem,0); penpos12(alpha*left_stem,0);
+fill diag_end(12l,11l,1,1,11r,12r)
+ --diag_end(11r,12r,1,1,12l,11l)--cycle; % diagonal
+y10=h-slab; z10=whatever[z11,z12];
+fill z10--(x1,y10)--(x1,h)--z12--cycle;  % link
+penpos13(whatever,angle(z2-z1)); z13=whatever[z11,z12];
+penpos14(cap_band,90); x14=x0; y13l=y14l; y13r=y14r;
+if hefty: y14r=.4h; else: y14=y0; fi
+penstroke z13e--z14e; % bar line
+if serifs: numeric inner_jut; pickup tiny.nib;
+ prime_points_inside(11,12);
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: inner_jut=cap_jut;
+ else: rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; fi
+ dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
+ nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
+ nodish_serif(2,1,c,1/3,.75inner_jut,d,1/3,.5cap_jut); fi  % lower middle serif
+pairequate(tca,z3);  %top center accentpoint
+pairequate(lca,z8);  %low center accentpoint
+pairassign(tra,x.e2,y3); %top right accentpoint
+pairequate(tla,z12); %top left accentpoint
+pairequate(lla,z11); %low left accentpoint
+pairassign(lra,x.h2,y2); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14); endchar;
+
+% end of file iaesc.mf
+
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/ibrvacct.mf b/Master/texmf-dist/fonts/source/public/wnri/ibrvacct.mf
new file mode 100644
index 00000000000..ef14a3b49e3
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/ibrvacct.mf
@@ -0,0 +1,28 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw inverted breve accents
+%
+
+cmchar "inverted Breve accent";
+beginchar(oct"025",9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant+.5vair#-1.5u#;
+adjust_fit(0,0);
+pickup crisp.nib; pos1(vair,180); pos3(vair,0);
+numeric mid_thickness; mid_thickness=vround 1/3[vair,stem];
+bot y1=bot y3=vround max(x_height+o+tiny,1/3[x_height,h]+o-.5mid_thickness); 
+lft x1r=w-rt x3r=hround(2u-.5vair);
+pos2(mid_thickness,90); x2=.5w;
+top y2r=h;
+filldraw stroke z1e{up}...{right}z2e...{down}z3e;  % stroke
+makeACCENT(IbrvPic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(IbrvPic);  ah; oechar; ";
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = ibrv enddef;
+
+% end of file ibrvacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/igamma.mf b/Master/texmf-dist/fonts/source/public/wnri/igamma.mf
new file mode 100644
index 00000000000..4b18f698c94
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/igamma.mf
@@ -0,0 +1,40 @@
+%
+% Washington Romanized Indic
+%
+% Macros to draw italic gammas
+%
+
+% cmchar "italic gamma";
+newchar(lgam,if serifs: 9.5u# else:9u# fi,x_height#,desc_depth#);
+italcorr x_height#*slant+.25u#;
+adjust_fit(serif_fit# if monospace:+\\.5u#,.5u#+ else:,fi\\ serif_fit#);
+numeric left_stem,right_stem,outer_jut; pickup tiny.nib; 
+left_stem=fudged.stem-stem_corr;
+right_stem=min(fudged.hair if hefty:-2stem_corr fi,left_stem);
+outer_jut=.75jut; x1l=w-x4r=if serifs:l+letter_fit+outer_jut+.25u+tiny else: u fi; 
+y1=y4=h; x5=x3=x2=.5[x1,x4]; y3=y2=.3h; bot y5r=-d;
+numeric gbot; gbot=.5(left_stem+right_stem);
+pos1(left_stem,0); pos4(right_stem,-180); pos2(left_stem,0);
+pos3(right_stem,-180); pos5(gbot,-90);
+filldraw circ_stroke z1e--z2e{z2-z1}..{left}z5e; %{left}...{z4-z3}z3e--z4e;
+filldraw circ_stroke z4e--z3e{z3-z4}..{right}z5e;
+penlabels(0,1,2,3,4,5); endchar;
+
+newchar(CGam,if serifs: 13.5u# else:13u# fi,cap_height#,desc_depth#);
+italcorr x_height#*slant+.25u#;
+adjust_fit(serif_fit# if monospace:+\\.5u#,.5u#+ else:,fi\\ serif_fit#);
+numeric left_stem,right_stem,outer_jut; pickup tiny.nib; 
+left_stem=cap_stem-stem_corr;
+right_stem=min(cap_hair if hefty:-2stem_corr fi,left_stem);
+outer_jut=.75cap_jut; x1l=w-x4r=if serifs:l+letter_fit+outer_jut+.25u+tiny else: u fi; 
+y1=y4=h; x5=x3=x2=.5[x1,x4]; y3=y2=.625x_height; bot y5r=-d;
+numeric gbot; gbot=.5(left_stem+right_stem);
+pos1(left_stem,0); pos4(right_stem,-180); pos2(left_stem,0);
+pos3(right_stem,-180); pos5(gbot,-90);
+filldraw circ_stroke z1e--z2e{z2-z1}..{left}z5e; %{left}...{z4-z3}z3e--z4e;
+filldraw circ_stroke z4e--z3e{z3-z4}..{right}z5e;
+penlabels(0,1,2,3,4,5); endchar;
+
+% end of file igamma.mf
+
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/italcskt.mf b/Master/texmf-dist/fonts/source/public/wnri/italcskt.mf
new file mode 100644
index 00000000000..0eb8f17626f
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/italcskt.mf
@@ -0,0 +1,171 @@
+%
+% Washington Romanized Indic Italic font driver file
+%
+% File       : italcskt.mf
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Roman and encoded according to
+% the Classical Sanskrit/Classical Sanskrit eXtended character set. 
+% See wnindic.map for more details.
+%
+
+mode_setup; font_setup;
+input product;
+if production:
+input itall;  % lower case (minuscules)
+input italsp;  % lowercase specials (dotless \i, ligature \ae, etc.)
+fi
+font_coding_scheme:="TeX Romanized Indic";
+ spanish_shriek=oct"074"; spanish_query=oct"076";
+
+def cp = plain enddef;
+
+font_slant slant; font_x_height x_height#;
+if monospace: font_normal_space 9u#; % no stretching or shrinking
+ font_quad 18u#;
+ font_extra_space 9u#;
+ letter_fit#:=letter_fit:=0;
+else: font_normal_space 6u#+2letter_fit#;
+ font_normal_stretch 3u#; font_normal_shrink 2u#;
+ font_quad 18u#+4letter_fit#;
+ font_extra_space 2u#; fi
+
+if production:
+ input romanu;  % upper case (majuscules)
+ input greeku;  % upper case greek letters
+ input itald;   % numerals
+ input italp;   % ampersand, question marks, currency sign
+ input romspu;  % uppercase specials (\AE, \OE, \O)
+ input punct;   % punctuation symbols common to roman and italic text
+ input accent;  % accents common to roman and italic text
+ if ligs>1: input italig; fi   % letter ligatures
+ if ligs>0: input comlig; fi   % ligatures common with roman text
+ if ligs<=1: input romsub; fi  % substitutes for ligatures
+
+	ligtable "!": "`" =: spanish_shriek;
+	ligtable "?": "`" =: spanish_query;
+fi
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% begin massive departure from textit.mf, our parent file
+
+
+mono_charic#:=0;
+input haccbase;     % altered base
+input acctmax;
+% dot_sharp_values used by various other macros
+def dot_sharp_values =
+numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#);
+numeric dot_top#; dot_top#=min(asc_height#,10/7x_height#+.5dot_diam#);
+enddef;
+
+%tracingstats:=1;
+input wnindic.map;
+
+input igamma;
+input iaesc;   % pickup the ae AE
+input sktmisc;    % eszett and rootsign
+
+% now --- numerous characters with built-in diacritics
+% overdot characters
+input odotacct; input romanua; input italla;
+
+% underdot characters
+input udotacct; input romanua; input italla;
+
+% hatted characters
+input hattacct; input italla; input romanua;
+
+% scandinavian ring accent characters
+input orngacct; input romanua; input italla;
+
+% umlauted characters
+input umlaacct; input italla; input romanua;
+
+% acute accents
+input acutacct; input italla; input romanua; input ligature;
+
+% macron characters
+input macracct; input romanua; input italla;
+
+% hachek characters
+input hachacct; input italla; input fhachact; input romanua;
+
+% macron and acute
+input baraacct; input italla; input romanua;
+
+% grave accented
+input gravacct; input italla; input romanua;
+
+% macron and grave
+input bargacct; input italla; input romanua;
+
+% cedillas
+input cdilacct; input italla; input romanua;
+
+% tilde characters
+input tildacct; input italla; input romanua;
+
+% breve accent characters
+input brevacct; input italla;
+
+% macron breve characters
+input brbracct; input italla;
+
+% underbar characters
+input ubaracct; input italla; input romanua;
+
+% underdot acute characters
+input udacacct; input italla;
+
+% underdot grave characters
+input udgracct; input italla;
+
+% underdot macron characters
+input udmcacct; input italla; input romanua;
+
+% underdot macron  acute
+input mudaacct; input italla;
+
+% under double dot (under-umlaut)
+input uumlacct; input italla;  input romanua;
+
+% under breve
+input ubrvacct; input italla;  input romanua;
+
+% candrabindu
+input bnduacct; input italla; % input romanua;
+% resume textit.mf original text  ( no kerning for extended chars yet)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+if not monospace:
+ k#:=-.5u#; kk#:=-1.5u#; kkk#:=-2u#; % three degrees of kerning
+ ligtable "d": "w": "l": "l" kern +u#;
+ ligtable "F": "V": "o" kern kk#, "e" kern kk#,
+   "u" kern kk#, "r" kern kk#, "a" kern kk#, "A" kern kkk#,
+  "K": "X": "O" kern k#, "C" kern k#, "G" kern k#, "Q" kern k#;
+ ligtable "T": "y" kern kk#,
+  "Y": "e" kern kk#, "o" kern kk#, "r" kern kk#, "a" kern kk#, "u" kern kk#,
+  "P": "W": "A" kern kk#;
+ ligtable "O": "D": "X" kern k#, "W" kern k#, "A" kern k#,
+   "V" kern k#, "Y" kern k#;
+ ligtable "A": "R": "n" kern k#, "l" kern k#, "r" kern k#, "u" kern k#,
+   "m" kern k#, "t" kern k#, "i" kern k#, "C" kern k#, "O" kern k#, "G" kern k#,
+   "h" kern k#, "b" kern k#, "U" kern k#, "k" kern k#, "v" kern k#, "w" kern k#,
+   "Q" kern k#, "L": "T" kern kk#, "Y" kern kk#, "V" kern kkk#, "W" kern kkk#,
+  "b": "c": "e": "o": "p": "r": "e" kern -u#, "a" kern -u#, "o" kern -u#,
+   "d" kern -u#, "c" kern -u#, "g" kern -u#, "q" kern -u#;
+ ligtable "n": "'" kern kkk#; fi
+% there are ligature/kern programs for |"f"| in the {\tt italig} file
+% and for |"-"|, |"`"|, and |"'"| in the {\tt comlig} file
+bye.
+
+% end of file italcskt.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/italla.mf b/Master/texmf-dist/fonts/source/public/wnri/italla.mf
new file mode 100644
index 00000000000..82b849d6cbe
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/italla.mf
@@ -0,0 +1,643 @@
+%
+% Washington Roman Indic lowercase base file
+%
+% based on ITALL.MF (Computer Modern Roman Italic lowercase base file)
+%
+% Modified by: Thomas Ridgeway <ridgeway@u.washington.edu>, June 19 1993
+% Updated: Anshuman Pandey <apandey@u.washington.edu>, Feb 18 1998
+%
+% Changes: modified accent positions of some characters
+%          
+
+if unknown dotson: boolean dotson; dotson=true; fi
+
+% cmchar "Italic letter a";
+newchar(a,9u#,x_height#,0);
+italcorr 1/3x_height#*slant+.5hair#+.5u#;
+adjust_fit(0,0); pickup fine.nib;
+pos0(hair,0); pos1(vair,90); pos2(curve,180); pos3(vair,270);
+pos4(stem,0); x4=x0; y4+.5stem=vround .98h;
+x1=x3=.5[x0,x2]; lft x2r=hround(1.5u-.5curve);
+rt x4r=hround(w-2.5u+.5stem);
+top y1r=h+oo; bot y3r=-oo; y0=y2=.5[y1,y3];
+filldraw stroke super_arc.e(0,1) & pulled_arc.e(1,2)
+ & pulled_arc.e(2,3) & super_arc.e(3,0);  % bowl
+x5=x4; x7=w; hook_out(5,6,7);  % closing hook
+filldraw circ_stroke z4e--z5e;  % stem
+pairequate(tca,z1);  %top center accentpoint
+pairequate(lca,z3);  %low center accentpoint
+pairequate(tra,z4); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,z6); %low right accentpoint
+math_fit(-.3x_height#*slant+.5curve#-u#,ic#);
+penlabels(0,1,2,3,4,5,6,7); endchar;
+
+% cmchar "Italic letter b";
+newchar(b,8u#,asc_height#,0);
+italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi;
+adjust_fit(0,0); pickup tiny.nib;
+pos1(stem,0); pos2(stem,0); x1=x2;
+lft x1l=hround(1.5u-.5stem); top y1=h; y2=.5x_height;
+filldraw stroke z1e--z2e;  % stem
+sloped_serif.l(1,2,a,1/3,jut,serif_drop);  % serif
+pickup fine.nib; pos2'(stem,-180); pos3(vair,-90);
+pos4(curve,0); pos5(vair,90); pos0(hair,180);
+z0=z2=z2'; x3=x5=.5[x2,x4]; rt x4r=hround(w-1.5u+.5curve);
+bot y3r=-oo; top y5r=x_height+oo; y4=y2;
+filldraw stroke pulled_arc.e(2',3) & pulled_arc.e(3,4)
+ & pulled_arc.e(4,5) & super_arc.e(5,0);  % bowl
+pairassign(tca,x5,asc_height);  %top center accentpoint
+pairequate(lca,z3);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(-.3x_height#*slant+.5curve#-u#,ic#);
+penlabels(0,1,2,3,4,5); endchar;
+
+% cmchar "Italic letter c";
+newchar(c,8u#,x_height#,0);
+italcorr if math_fitting:1/3x_height#*slant else:x_height#*slant-u# fi;
+adjust_fit(0,0); pickup fine.nib;
+pos0(flare,0); pos1(hair,0); pos2(vair,90);
+pos3(curve,180); pos4(vair,270); pos5(hair,320);
+x2=x4=.5(w+u); rt x1r=max(rt x2,hround(w-u))+eps;
+lft x3r=hround(1.5u-.5curve); x5r=good.x(w-eps); x6=x5;
+y1=.5[bar_height,h]; top y2r=h+oo; bulb(2,1,0);  % bulb
+bot y4r=-oo; y3=.5[y2,y4]; top y5l=vround .5bar_height; y6=bar_height;
+path p; p=z4{right}..z5..z6;
+filldraw stroke pulled_arc.e(2,3)
+ & pulled_arc.e(3,4)...{direction 1 of p}z5e;  % arc
+pairequate(tca,z2);  %top center accentpoint
+pairequate(lca,z4);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(-.3x_height#*slant+.5curve#-u#,ic#);
+penlabels(0,1,2,3,4,5,6); endchar;
+
+% cmchar "Italic letter d";
+newchar(d,9u#,asc_height#,0);
+italcorr max(1/3x_height#*slant+.5hair#+.5u#,
+  h#*slant+.5stem#-2u#) if math_fitting:-.5u# fi;
+adjust_fit(0,0); pickup fine.nib;
+pos0(hair,0); pos1(vair,90); pos2(curve,180); pos3(vair,270);
+x0=x4; x1=x3=.5[x0,x2]; lft x2r=hround(1.5u-.5curve);
+x4+.5stem=hround(w-2.5u+.5stem);
+top y1r=x_height+oo; bot y3r=-oo; y0=y2=.5[y1,y3];
+filldraw stroke super_arc.e(0,1) & pulled_arc.e(1,2)
+ & pulled_arc.e(2,3) & super_arc.e(3,0);  % bowl
+x5=x0; x7=w; hook_out(5,6,7);  % closing hook
+pickup tiny.nib; pos5'(stem,0); pos4(stem,0);
+z5'=z5; top y4=h; filldraw stroke z4e--z5'e;  % stem
+sloped_serif.l(4,5',a,1/3,jut,serif_drop);  % serif
+pairassign(tca,x1,asc_height);  %top center accentpoint
+pairequate(lca,z3);  %low center accentpoint
+pairequate(tra,z4); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,z6); %low right accentpoint
+math_fit(-.3x_height#*slant+.5curve#-u#,ic#);
+penlabels(0,1,2,3,4,5,6,7); endchar;
+
+% cmchar "Italic letter e";
+newchar(e,8u#,x_height#,0);
+italcorr max(1/3x_height#*slant,x_height#*slant+.5(.2[hair#,stem#])-u#);
+adjust_fit(0,0); pickup fine.nib;
+numeric heavy_hair; heavy_hair=hround .2[hair,stem];
+pos0(vair,-90); pos1(heavy_hair,0); pos2(vair,90);
+pos3(curve,180); pos4(vair,270); pos5(hair,320);
+x0=rt x3l; rt x1r=hround(w-1.5u+.5heavy_hair); x2=x4=.5(w+u);
+lft x3r=hround(1.5u-.5curve); x5r=good.x(w-eps); x6=x5;
+y0=y3=y6=bar_height; y1=.5[y0,y2]; top y2r=h+oo; bot y4r=-oo;
+top y5l=vround .5bar_height; path p; p=z4{right}..z5..z6;
+filldraw stroke z0e{right}...z1e{up}...pulled_arc.e(2,3)
+ & pulled_arc.e(3,4)...{direction 1 of p}z5e;  % arc
+pairequate(tca,z2);  %top center accentpoint
+pairequate(lca,z4);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(-.3x_height#*slant+.5curve#-u#,ic#);
+penlabels(0,1,2,3,4,5,6); endchar;
+
+% cmchar "Italic letter f";
+newchar(f,max(1.5u#,stem#)+max(3.5u#,2flare#),asc_height#,desc_depth#);
+italcorr asc_height#*slant+.75u#;
+adjust_fit(if monospace:u#,u# else: 0,0 fi); pickup fine.nib;
+numeric theta; z88=(.5w-.5u,h); z89=(.5w+.5u,-d); theta=angle(z88-z89);
+pos0(flare,0); pos1(hair,0); pos2(vair,90);
+pos3(.5[hair,stem],180); pos4(stem,theta+90);
+pos5(stem,theta-90); pos6(.5[hair,stem],0);
+pos7(vair,-90); pos8(hair,-180); pos9(flare,-180);
+rt x1r=hround(w+.25u); lft x8r=hround-.35u; x2=.6[x1,x4]; x7=.6[x8,x5];
+y9-.5flare=vround -.85d; y2-y0=y9-y7; top y2r=h+oo; bot y7r=-d-oo;
+y4=.25[x_height,h]; y5=.5[-d,y4];
+z4=whatever[z88,z89]; z5=whatever[z88,z89];
+x3=.8[x2+x4-x88,x88]; x6=.8[x7+x5-x89,x89]; y3=.8[y4,y2]; y6=.8[y5,y7];
+bulb(2,1,0); bulb(7,8,9);  % bulbs
+filldraw stroke z2e{left}...z3e...{z89-z88}z4e;  % upper arc
+filldraw z4r--z5l--z5r--z4l--cycle;  % stem
+filldraw stroke z5e{z89-z88}...z6e...{left}z7e;  % lower arc
+pickup crisp.nib; pos20(bar,90); pos21(bar,90);
+top y20r=top y21r=x_height;
+lft x20=lft x4r-.5stem-u; rt x21=rt x4l+.5stem+1.5u;
+filldraw stroke z20e--z21e;  %  crossbar
+pairequate(tca,z2);  %top center accentpoint
+pairequate(lca,z7);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(desc_depth#*slant+u#,x_height#*slant);
+penlabels(0,1,2,3,4,5,6,7,8,9,20,21,88,89); endchar;
+
+% cmchar "Italic letter g";
+newchar(g,8u#,x_height#,desc_depth#);
+italcorr x_height#*slant+.5stem#-u#;
+adjust_fit(0,0); pickup fine.nib;
+pos0(hair,0); pos1(vair,90); pos2(curve,180); pos3(vair,270);
+x0=x4; x1=x3=.5[x0,x2]; lft x2r=hround(1.5u-.5curve);
+x4+.5stem=hround(w-1.5u+.5stem);
+top y1r=h+oo; bot y3r=0; y0=y2=.5[y1,y3];
+filldraw stroke super_arc.e(0,1) & pulled_arc.e(1,2)
+ & pulled_arc.e(2,3) & super_arc.e(3,0);  % bowl
+pos4(stem,0); y4+.5stem=vround .98h;
+pos5(stem,0); x5=x4; y5=-1/3d;
+pos6(vair,-90); pos7(hair,-180); pos8(flare,-180);
+bot y6r=-d-oo; y8-.5flare=vround -.9d;
+lft x8r=hround(2u-.5flare); x6=x1; bulb(6,7,8);  % bulb
+filldraw circ_stroke z4e---z5e...{left}z6e;  % stem and arc
+pairequate(tca,z1);  %top center accentpoint
+pairequate(lca,z6);  %low center accentpoint
+pairequate(tra,z4); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(-min(.3x_height#*slant+.5curve#-u#,1.5u#-desc_depth#*slant),
+ ic#-1/3x_height#*slant); penlabels(0,1,2,3,4,5,6,7,8); endchar;
+
+% cmchar "Italic letter h";
+newchar(h,9u#,asc_height#,0);
+italcorr 1/3x_height#*slant+.5hair#+.5u#;
+adjust_fit(0,0); pickup tiny.nib;
+pos1(stem,0); pos2(stem,0); x1=x2;
+lft x1l=hround(1.5u-.5stem); top y1=h; y2-.5stem=-oo;
+filldraw circ_stroke z2e--z1e;  % left stem
+sloped_serif.l(1,2,a,1/3,jut,serif_drop);  % serif
+pickup fine.nib; x4+.5stem=hround(w-2.5u+.5stem);
+x5=x4-.25u; ital_arch(2,3,4);  % arch
+x7=w; hook_out(5,6,7)(skewed);  % closing hook
+filldraw stroke z4e{down}..{-u,-x_height}z5e;  % right stem
+pairassign(tca,x3,asc_height);  %top center accentpoint
+pairassign(lca,x3,0);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,z6); %low right accentpoint
+math_fit(0,ic#); penlabels(1,2,3,4,5,6,7); endchar;
+
+% cmchar "Italic letter i";
+newchar(i,5u#,min(asc_height#,10/7x_height#+.5flare#),0);
+italcorr max(1/3x_height#*slant+.5hair#+.5u#,h#*slant+.5flare#-2u#);
+adjust_fit(if monospace:u#,u# else: 0,0 fi); pickup fine.nib;
+x0=0; x5=w; x2=.5w+.25u; x3=.5w-.25u;
+hook_in(0,1,2)(skewed); hook_out(3,4,5)(skewed);  % hooks
+filldraw stroke z2e--z3e;  % stem
+pos8(flare,0); pos9(flare,90);
+x8=.5w if not monospace:-.4(h-x_height)*slant fi; top y9r=h+1;
+if bot y9l-top y1<slab: y9l:=min(y9r-eps,y1+fine+slab); fi
+x8=x9; y8=.5[y9l,y9r]; 
+if dotson: dot(8,9); fi  % dot
+pairassign(tca,.5[x1,x2],x_height);  %top center accentpoint
+pairassign(lca,.5[x3,x4],0);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(-2/3x_height#*slant+.5hair#+.5u#,ic#);
+penlabels(0,1,2,3,4,5,8,9); endchar;
+
+% cmchar "Italic letter j";
+newchar(j,5u#,min(asc_height#,10/7x_height#+.5flare#),desc_depth#);
+italcorr h#*slant+.5stem#-u#;
+adjust_fit(if monospace:2u#,.5u# else: 0,0 fi); pickup fine.nib;
+x0=0; x2=x3; pos3(stem,0); lft x3l=hround(w-1.5u-.5stem);
+hook_in(0,1,2);  % opening hook
+pos4(vair,-90); pos5(hair,-180); pos6(flare,-180);
+bot y3=-1/3d; bot y4r=-d-oo; y6-.5flare=-vround.9d;
+x4=1/3(w-u); lft x5r=min(hround-.5u,lft x5r+x4-x5l-eps);
+filldraw stroke z2e---z3e...{left}z4e;  % stem and arc
+bulb(4,5,6);  % bulb
+pos8(flare,0); pos9(flare,90);
+rt x8r=rt x2r if not monospace:-.6(h-x_height)*slant fi; top y9r=h+1;
+if bot y9l-top y1<slab: y9l:=min(y9r-eps,y1+fine+slab); fi
+x8=x9; y8=.5[y9l,y9r]; 
+if dotson: dot(8,9); fi  % dot
+pairassign(tca,.5[x1,x2],x_height);  %top center accentpoint
+pairequate(lca,z4);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(desc_depth#*slant,x_height#*slant+.5stem#-u#);
+penlabels(0,1,2,3,4,5,6,8,9); endchar;
+
+% cmchar "Italic letter k";
+newchar(k,8u#,asc_height#,0);
+italcorr x_height#*slant;
+adjust_fit(0,0); pickup tiny.nib;
+pos1(stem,0); pos2(stem,0); x1=x2;
+lft x1l=hround(1.5u-.5stem); top y1=h; y2-.5stem=-oo;
+filldraw circ_stroke z2e--z1e;  % left stem
+sloped_serif.l(1,2,a,1/3,jut,serif_drop);  % serif
+pickup fine.nib; pos3(vair,90); x3=x1; y3=bar_height;
+pos4(vair,90); x4=w-2u; top y4r=x_height+oo;
+filldraw stroke z3e{right}..{right}z4e;  % upper diagonal
+pos5(hair,0); pos6(flare,0);
+rt x5r=hround(w-.5u); y5+.5flare=vround(bot y4l-.03x_height);
+bulb(4,5,6);  % bulb
+pos7(stem,0); pos8(vair,90); pos9(hair,180);
+x9+.5hair=hround(w+.5hair-eps); y9=1/3x_height;
+lft x7l=hround(w-2.75u-.5stem); y7=1/2y3; x8=w-1.2u; bot y8l=-oo;
+filldraw stroke z3e{right}...z7e{down}
+ ...z8e{right}...{up}z9e;  % lower diagonal
+pairequate(tra,z4); %top right accentpoint
+if unknown gltl.k: pairassign(tca,.5w,h);  %top center accentpoint
+else:
+ if cp.k=gltl.k: pairequate(tca,tra);
+ else: pairassign(tca,.5w,h);  %top center accentpoint
+ fi
+fi
+pairassign(lca,.5[x2,x8],0);  %low center accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(0,1/3x_height#*slant+.5hair#+.5u#);
+penlabels(1,2,3,4,5,6,7,8,9); endchar;
+
+% cmchar "Italic letter l";
+newchar(l,4u#,asc_height#,0); l_width#:=4u#;
+italcorr max(1/3x_height#*slant+.5hair#+.5u#,
+ asc_height#*slant+.5stem#-2u#) if math_fitting:+.5u# fi;
+adjust_fit(if monospace:u#,u# else: 0,0 fi); pickup fine.nib;
+x2-.5stem=hround(1.5u-.5stem); x4=w; hook_out(2,3,4);  % closing hook
+pickup tiny.nib; pos1(stem,0); pos2'(stem,0); z2'=z2;
+top y1=h; x1=x2; filldraw stroke z1e--z2e;  % stem
+sloped_serif.l(1,2,a,1/3,jut,serif_drop);  % serif
+pairassign(tra,x4,y4); %top right accentpoint
+if unknown gltl.l: pairequate(tca,z1);  %top center accentpoint
+else:
+ if cp.l=gltl.l: pairequate(tca,tra);
+ else: pairequate(tca,z1);  %top center accentpoint
+ fi
+fi
+pairequate(lca,z3);  %low center accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(-.5u#,1/3x_height#*slant+.5hair#+u#); penlabels(1,2,3,4); endchar;
+
+% cmchar "Italic letter m";
+newchar(m,15u#,x_height#,0);
+italcorr 1/3x_height#*slant+.5hair#+.5u#;
+adjust_fit(if monospace:-1.5u#,-2u# else: 0,0 fi); pickup fine.nib;
+numeric shaved_stem; shaved_stem=mfudged.stem;
+save stem; stem=shaved_stem;
+pos2(stem,0); x1=x2;
+if monospace: pos1(stem,0); lft x1l=hround(2.5u-.5stem); top y1=h;
+else: x0=0; lft x2l=hround(2.5u-.5stem);
+ hook_in(0,a,1); fi  % opening hook
+y2-.5stem=-oo; filldraw circ_stroke z2e--z1e;  % left stem
+x4+.5stem=hround(.5w+.5stem); ital_arch(2,3,4);  % left arch
+pos5(stem,0); y5=y2; x5=x4;
+filldraw circ_stroke z5e--z4e;  % middle stem
+x7+.5stem=hround(w-2.5u+.5stem);
+x8=x7-.25u; ital_arch(5,6,7);  % right arch
+if monospace: pos9(vair,90); x9=good.x .5[x8,w]; bot y9l=0; y8=1/3h;
+ pos8(stem,0); filldraw stroke z8e{-u,-x_height}...{right}z9e; % terminal
+else: x9=w; hook_out(8,b,9)(skewed); fi  % closing hook
+filldraw stroke z7e{down}..{-u,-x_height}z8e;  % right stem
+pairassign(tca,x4,x_height);  %top center accentpoint
+pairequate(lca,z5);  %low center accentpoint
+pairequate(tra,z6); %top right accentpoint
+pairequate(tla,z.a); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,z.b); %low right accentpoint
+math_fit(-2/3x_height#*slant+.5hair#+.5u#,ic#);
+penlabels(0,a,1,2,3,4,5,6,7,8,9); endchar;
+
+% cmchar "Italic letter n";
+newchar(n,10u#,x_height#,0);
+italcorr 1/3x_height#*slant+.5hair#+.5u#;
+adjust_fit(0,0); pickup fine.nib;
+x0=0; x1=x2; pos2(stem,0); lft x2l=hround(2.5u-.5stem); y2-.5stem=-oo;
+hook_in(0,a,1);  % opening hook
+filldraw circ_stroke z2e--z1e;  % left stem
+x4+.5stem=hround(w-2.5u+.5stem); x5=x4-.25u; ital_arch(2,3,4);  % arch
+x7=w; hook_out(5,6,7)(skewed);  % closing hook
+filldraw stroke z4e{down}..{-u,-x_height}z5e;  % right stem
+pairassign(tca,x3,x_height);  %top center accentpoint
+%pairequate(tca,z3);  %top center accentpoint
+pairassign(lca,x3,0);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z.a); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,z6); %low right accentpoint
+math_fit(-2/3x_height#*slant+.5hair#+.5u#,ic#);
+penlabels(0,a,1,2,3,4,5,6,7); endchar;
+
+% cmchar "Italic letter o";
+newchar(o,9u#,x_height#,0);
+italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi;
+adjust_fit(0,0); pickup fine.nib;
+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
+pairequate(tca,z1);  %top center accentpoint
+pairequate(lca,z3);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(-.3x_height#*slant+.5curve#-u#,ic#); penlabels(1,2,3,4); endchar;
+
+% cmchar "Italic letter p";
+newchar(p,9u#,x_height#,desc_depth#);
+italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi;
+adjust_fit(0,0); pickup fine.nib;
+x0=0; x2-.5stem=hround(2.5u-.5stem); hook_in(0,1,2);  % opening hook
+pos4(hair,-180); pos5(vair,-90); pos6(curve,0); pos7(vair,90);
+x4=x2; rt x6r=hround(w-1.5u+.5curve); x5=x7=.5[x4,x6];
+bot y5r=-oo; top y7r=h+oo; y4=y6=.5[y5,y7];
+filldraw stroke super_arc.e(4,5) & pulled_arc.e(5,6)
+ & pulled_arc.e(6,7) & super_arc.e(7,4);  % bowl
+pickup tiny.nib; pos2'(stem,0); pos3(stem,0);
+z2=z2'; x3=x2; bot y3=-d; filldraw stroke z2'e--z3e;  % stem
+dish_serif(3,2',a,1/3,.75jut,b,1/3,jut);  % serif
+pairequate(tca,z7);  %top center accentpoint
+pairequate(lca,z3);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(-min(2/3x_height#*slant-.5hair#-.5u#,
+ 2u#-.5stem#-desc_depth#*slant),ic#);
+penlabels(0,1,2,3,4,5,6,7); endchar;
+
+% cmchar "Italic letter q";
+newchar(q,8u#,x_height#,desc_depth#);
+italcorr x_height#*slant+.5stem#-u#;
+adjust_fit(0,0); pickup fine.nib;
+pos0(hair,0); pos1(vair,90); pos2(curve,180); pos3(vair,270);
+x0=x4; x1=x3=.5[x0,x2]; lft x2r=hround(1.5u-.5curve);
+x4+.5stem=hround(w-1.5u+.5stem)+eps;
+top y1r=h+oo; bot y3r=-oo; y0=y2=.5[y1,y3];
+filldraw stroke super_arc.e(0,1) & pulled_arc.e(1,2)
+ & pulled_arc.e(2,3) & super_arc.e(3,0);  % bowl
+pickup tiny.nib; pos4(stem,0); pos5(stem,0);
+x4=x5; x6=x5r; top y6=h+oo; bot y4=-d;
+y5=ypart(((x4l,0)--(x4l,y6))intersectionpoint super_arc.r(0,1));
+filldraw z6{2(x5l-x6),y5-y6}...z5l---z4l--z4r--cycle;  % stem
+dish_serif(4,5,a,1/3,jut,b,1/3,jut);  % serif
+pairequate(tca,z1);  %top center accentpoint
+pairequate(lca,z4);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z6); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(-.3x_height#*slant+.5curve#-u#,ic#-1/3x_height#*slant);
+penlabels(0,1,2,3,4,5,6,7,8); endchar;
+
+% cmchar "Italic letter r";
+newchar(r,5.5u#+max(1.75u#,flare#),x_height#,0);
+italcorr x_height#*slant;
+adjust_fit(if monospace:.25u#,.5u# else: 0,0 fi); pickup fine.nib;
+x0=0; x2=x3; pos3(stem,0); lft x3l=hround(2.5u-.5stem); y3-.5stem=-oo;
+hook_in(0,1,2);  % opening hook
+filldraw circ_stroke z3e--z2e;  % left stem
+pos3'(hair,180); z3'=z3; pos4(vair,90); pos5(hair,0); pos6(flare,0);
+x4=w-.5u-max(1.75u,flare); rt x5r=hround(r-.5u); top y4r=h+oo;
+filldraw stroke z3'e{up}...z4e{right};  % link
+y6+.5flare=vround(bot y4l-.03x_height); bulb(4,5,6);  % bulb
+math_fit(-2/3x_height#*slant+.5hair#+.5u#,ic#-.5u#);
+pairequate(tca,z4);  %top center accentpoint
+pairequate(lca,z3);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(0,1,2,3,4,5,6); endchar;
+
+% cmchar "Italic letter s";
+newchar(s,5.25u#+max(1.75u#,flare#),x_height#,0);
+italcorr x_height#*slant-.5u#;
+adjust_fit(0,0); pickup fine.nib;
+numeric theta; theta=90-angle(40u,h); slope:=-h/40u;  % angle at middle
+pos2(vair,-90); pos0(max(fine.breadth,ess),theta); pos7(vair,-90);
+x2l=x0=x7=.5w; top y2l=h+oo; bot y7r=-oo;
+y0-.5ess=y7l+.55(y2r-y7l-ess);
+lft x3l=hround u-eps; rt x6r=hround(w-.5u)+eps;
+x3r-x3l=x6r-x6l=hround .5[vair,ess]-fine;
+ellipse_set(2l,3l,4l,0l); ellipse_set(2r,3r,4r,0r); y3=y3r;
+ellipse_set(7l,6l,5l,0l); ellipse_set(7r,6r,5r,0r); y6=y6r;
+interim superness:=more_super;
+filldraw stroke super_arc.e(2,3) & z3e{down}
+ ..z4e---z5e..z6e{down} & super_arc.e(6,7);  % main stroke
+pos1(hair,0); pos10(hround .75[hair,flare],0);
+pos2'(vair,90); z2'=z2;
+pos8(hair,-180); pos9(flare,-180);
+rt x10r=hround(w-u)+2eps; lft x9r=hround .5u-2eps; y10=.78h; y9=.25h;
+bulb(2',1,10); bulb(7,8,9);  % bulbs
+pairequate(tca,z2);  %top center accentpoint
+pairequate(lca,z7);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(0,ic#); penlabels(0,1,2,3,4,5,6,7,8,9,10); endchar;
+
+% cmchar "Italic letter t";
+newchar(t,5.5u#,min(asc_height#,10/7x_height#),0);
+italcorr max(1/3x_height#*slant+.5hair#+.5u#,x_height#*slant-.25u#);
+adjust_fit(if monospace:u#,u# else:0,0 fi); pickup fine.nib;
+pos1(stem,0); lft x1l=hround(2u-.5stem); y1+.5stem=h+oo;
+x2=x1; x4=w; hook_out(2,3,4);  % closing hook
+filldraw circ_stroke z1e--z2e;  % stem
+pickup crisp.nib; pos5(bar,90); pos6(bar,90);
+lft x5=hround-.75u; rt x6=hround(w-.75u); top y5r=top y6r=x_height;
+filldraw stroke z5e--z6e;  % crossbar
+pairequate(tra,z6); %top right accentpoint
+if unknown gltl.t: pairequate(tca,z1);  %top center accentpoint
+else:
+ if cp.t=gltl.t: pairequate(tca,tra);
+ else: pairequate(tca,z1);  %top center accentpoint
+ fi
+fi
+pairequate(lca,z3);  %low center accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(1.25u#-x_height#*slant,ic#); penlabels(1,2,3,4,5,6); endchar;
+
+% cmchar "Italic letter u";
+newchar(u,9.5u#,x_height#,0);
+italcorr 1/3x_height#*slant+.5hair#+.5u#;
+adjust_fit(0,0); pickup fine.nib; interim superness:=more_super;
+x0=0; x2=x3+.25u; pos3(stem,-180); lft x3r=hround(2.5u-.5stem);
+hook_in(0,1,2)(skewed);  % opening hook
+pos2'(stem,-180); z2'=z2;
+pos4(vair,-90); pos5(hair,0); x4=.5[x3,x5];
+pos6(stem,0); rt x6r=hround(w-2.5u+.5stem);
+x5=x6=x7; x9=w; hook_out(7,8,9);  % closing hook
+y3=.7[y4,y5]; bot y4r=-oo; y5=.57h; y6+.5stem=h;
+filldraw stroke z2'e{-u,-x_height}
+ ...super_arc.e(3,4)...{up}z5e; % left stem and arc
+filldraw circ_stroke z6e--z7e;  % right stem
+pairassign(tca,x4,x_height);  %top center accentpoint
+pairequate(lca,z4);  %low center accentpoint
+pairequate(tra,z6); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,z8); %low right accentpoint
+math_fit(-2/3x_height#*slant+.5hair#+.5u#,ic#);
+penlabels(0,1,2,3,4,5,6,7,8,9); endchar;
+
+% cmchar "Italic letter v";
+newchar(v,8u#,x_height#,0);
+italcorr x_height#*slant;
+adjust_fit(0,0); pickup fine.nib; interim superness:=more_super;
+x0=0; x2=x3+.25u; pos3(stem,-180); lft x3r=hround(2.5u-.5stem);
+hook_in(0,1,2)(skewed);  % opening hook
+pos2'(stem,-180); z2'=z2; pos4(vair,-90); pos5(hair,0);
+x4=.5w+u; rt x5r=hround(w-.5u); y3=.7[y4,y5]; bot y4r=-oo; y5=.57h;
+filldraw stroke z2'e{-u,-x_height}...super_arc.e(3,4)
+ ..tension atleast 1.05..{up}z5e; % left stem and arc
+v_bulb(5,6);  % closing bulb
+pairassign(tca,x4,x_height);  %top center accentpoint
+pairequate(lca,z4);  %low center accentpoint
+pairequate(tra,z6); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(-2/3x_height#*slant+.5hair#+.5u#,2/3ic#);
+penlabels(0,1,2,3,4,5,6); endchar;
+
+% cmchar "Italic letter w";
+newchar(w,12u#,x_height#,0);
+italcorr x_height#*slant;
+adjust_fit(if monospace:-1.5u#,-u# else: 0,0 fi);
+pickup fine.nib; interim superness:=more_super; begingroup
+forsuffixes $=hair,stem: shaved$:=mfudged$; save $; $=shaved$; endfor
+x0=0; x2=x3+.25u; pos3(stem,-180); lft x3r=hround(2.5u-.5stem);
+if monospace: pos1(vair,90); x1=good.x .5[x0,x2]; top y1r=h; y2=2/3h;
+ pos2(stem,0); filldraw stroke z1e{right}...{-u,-x_height}z2e;
+else: hook_in(0,1,2)(skewed); fi  % opening hook
+pos2'(stem,-180); z2'=z2;
+pos4(vair,-90); pos5(hair,0);
+x4=.6[x2,x5]; x5=x6=x7; pos6(stem,-180); pos7(stem,-180);
+y3=.7[y4,y5]; bot y4r=-oo; y5=.57h;
+rt x6l=hround(rt x6l+.5w+.75u-x6); y6+.5stem=h; y7=y3;
+pos8(vair,-90); pos9(hair,0);
+x8=w-2.75u; rt x9r=hround(w-.5u); bot y8r=-oo; y9=y5;
+filldraw stroke z2'e{-u,-x_height}
+ ...super_arc.e(3,4)...{up}z5e; % left stem and arc
+filldraw circ_stroke z6e..super_arc.e(7,8)...{up}z9e;  % middle stem and arc
+v_bulb(9,10);  % closing bulb
+endgroup; math_fit(-2/3x_height#*slant+.5hair#+.5u#,3/4ic#);
+pairequate(tca,z6);  %top center accentpoint
+pairassign(lca,x5,0);  %low center accentpoint
+pairequate(tra,z10); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z4); %low left accentpoint
+pairequate(lra,z8); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7,8,9,10); endchar;
+
+% cmchar "Italic letter x";
+newchar(x,6.5u#+max(1.5u#,flare#),x_height#,0);
+italcorr max(1/3x_height#*slant+.5hair#+.5u#,x_height#*slant+.25u#);
+adjust_fit(0,0); pickup fine.nib;
+pos0(hair,180); pos1(vair,90); pos2(stem,0);
+pos3(stem,-180); pos4(vair,-90); pos5(hair,0);
+y0=y2=2/3h; y3=y5=1/3h; top y1r=h+oo; bot y4r=-oo;
+rt x2r=hround(.5w+.5stem-eps); x2=x3;
+x0-.5hair=hround-.5hair; x5+.5hair=hround(w+.5hair-eps);
+x1=.5[x0,x2]; x4=.5[x3,x5];
+filldraw stroke z0e{up}...pulled_arc.e(1,2); % opening hook
+filldraw z2l--z3r--z3l--z2r--cycle;  % stem
+filldraw stroke pulled_arc.e(3,4)...{up}z5e;  % closing hook
+pos3'(hair,180); pos6(hair,180); pos7(vair,90);
+pos8(hair,0); pos9(flare,0);
+x3'l=x6l=x3l; y3'=y3; y6=3/4h; x7=.5[x8,x2]; top y7r=h+oo;
+rt x8r=hround(w-.25u); y8+.5flare=vround(bot y7l-.03x_height);
+filldraw stroke z3'e---z6e...{right}z7e; bulb(7,8,9);  % upper link and bulb
+pos2'(hair,0); pos16(hair,0); pos17(vair,-90);
+pos18(hair,-180); pos19(flare,-180);
+x2'l=x16l=x2l; y2'=y2; y16=1/4h; x17=.5[x18,x3]; bot y17r=-oo;
+lft x18r=hround.25u; y18-.5flare=vround(top y17l+.03x_height);
+filldraw stroke z2'e---z16e...{left}z17e; bulb(17,18,19); % lower link and bulb
+pairassign(tca,x2,x_height);  %top center accentpoint
+pairassign(lca,x3,0);  %low center accentpoint
+pairequate(tra,z7); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z17); %low left accentpoint
+pairequate(lra,z4); %low right accentpoint
+math_fit(0,ic#); penlabels(0,1,2,3,4,5,6,7,8,9,16,17,18,19); endchar;
+
+% cmchar "Italic letter y";
+newchar(y,8.5u#,x_height#,desc_depth#);
+italcorr x_height#*slant+.5stem#-u#;
+adjust_fit(0,0); pickup fine.nib; interim superness:=more_super;
+x0=0; x2=x3+.25u; pos3(stem,-180); lft x3r=hround(2.5u-.5stem);
+hook_in(0,1,2)(skewed);  % opening hook
+pos2'(stem,-180); z2'=z2;
+pos4(vair,-90); pos5(hair,0); x4=.5[x3,x5];
+pos6(stem,0); rt x6r=hround(w-1.5u+.5stem);
+pos7(stem,0); pos8(vair,-90);
+y3=.7[y4,y5]; bot y4r=-oo; y5=.57h; y6+.5stem=h;
+y7=0; bot y8r=-d-oo; x5=x6=x7; x8=.5w;
+pos9(hair,-180); pos10(flare,-180); y9=-.5d;
+lft x9r=hround(2.75u-.5flare); bulb(8,9,10);  % bulb
+filldraw stroke z2'e{-u,-x_height}
+ ...super_arc.e(3,4)...{up}z5e; % left stem and arc
+filldraw circ_stroke z6e---z7e...{left}z8e;  % right stem and link
+pairassign(tca,x4,x_height);  %top center accentpoint
+pairequate(lca,z8);  %low center accentpoint
+pairequate(tra,z6); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(-2/3x_height#*slant+.5hair#+.5u#,ic#-1/3x_height#*slant);
+penlabels(0,1,2,3,4,5,6,7,8,9,10); endchar;
+
+% cmchar "Italic letter z";
+newchar(z,5.5u#+max(1.5u#,stem#),x_height#,0);
+italcorr x_height#*slant+.5hair#;
+adjust_fit(if monospace:.5u#,.5u# else: 0,0 fi); pickup fine.nib;
+pos1(hair,0); pos2(stem,-90); pos3(vair,-90); pos4(hair,0);
+lft x1l=hround(u-.5hair); x2=2.5u; x3=w-2u; rt x4r=hround(w-.5u);
+top y1=.78h; top y2l=top y4=h+oo; y3=.825h;
+pos5(hair,0); pos6(vair,-90); pos7(stem,-90); pos8(hair,0);
+x5=x1; x6=2.5u; x7=w-2u; x8+.5hair=hround(w+.5hair-eps);
+bot y5=bot y7r=-oo; y6=.175h; bot y8=.31h;
+pair p; p=(z4-z5) yscaled 2;
+filldraw stroke z1e{up}...z2e{right}..z3e{right}...{p}z4e;  % upper bar
+filldraw stroke z5e{p}...z6e{right}..{right}z7e...{up}z8e;  % lower bar
+filldraw stroke z5e{p}..{p}z4e;  % diagonal
+pairassign(tca,.5[x5,x4],x_height);  %top center accentpoint
+pairassign(lca,.5[x5,x4],0);  %low center accentpoint
+pairequate(tra,z4); %top right accentpoint
+pairequate(tla,z2); %top left accentpoint
+pairequate(lla,z5); %low left accentpoint
+pairequate(lra,z7); %low right accentpoint
+math_fit(0,1/3x_height#*slant+.5hair#+.5u#);
+penlabels(1,2,3,4,5,6,7,8); endchar;
+
+% end of file italla.mf
+
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/ligature.mf b/Master/texmf-dist/fonts/source/public/wnri/ligature.mf
new file mode 100644
index 00000000000..d991fd3f122
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/ligature.mf
@@ -0,0 +1,218 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw roman ligature characters
+%
+
+cmchar "The ligature ae";
+newchar(ae,13u#,x_height#,0);
+italcorr .5[bar_height#,x_height#]*slant+.5min(curve#-1.5u#,0);
+adjust_fit(0,0);
+numeric left_curve,right_curve;
+if monospace: right_curve=left_curve=fudged.stem;
+else: left_curve=max(tiny.breadth,hround(curve-2stem_corr));
+right_curve=max(tiny.breadth,hround(curve-if serifs:6 
+else:8 fi\\stem_corr));fi
+pickup tiny.nib; pos11(right_curve,0);
+pos12(vair,90); pos13(mfudged.stem,180);
+y11=good.y bar_height; top y12r=h+vround 1.5oo; y10l=bot y11;
+rt x11r=hround min(w-.5u,w-u+.5right_curve);
+lft x13r=hround (.5w-.5mfudged.stem); x12=.55[x13,x11];
+{{interim superness:=more_super;
+ filldraw stroke super_arc.e(11,12)}};  % right bowl of e
+y13=.5[y12,y14]; bot y14r=-oo; x14=x12+.25u;
+if serifs: pos14(vair',270); pos15(mfudged.hair,360);
+ y15=max(good.y(.5bar_height-.9),y14l+vair); x15r=x11r;
+ (x,y14l)=whatever[z14r,z15]; x14l:=min(x,x14l+.5u);
+ filldraw stroke pulled_arc.e(12,13)
+  & pulled_super_arc.e(13,14)(.8superpull)
+  ...{x15-x14,5(y15-y14)}z15e; % left bowl, arc, and terminal of e
+else: pos14(vair,270);
+ filldraw stroke super_arc.e(12,13)
+  & super_arc.e(13,14);  % left bowl and arc of e
+ pickup fine.nib; pos14'(vair,270); z14=z14';
+ pos15(.5[vair,flare],275); rt x15r=hround(w-.6u);
+y15r=good.y(y15r+1/3bar_height-y15); y15l:=good.y 
+ y15l; x15l:=good.x x15l;
+ filldraw stroke term.e(14',15,right,1,4); fi  % right terminal
+y11'r=y10r=y10l+.6[thin_join,vair]; y11'l=y10l; 
+ x11'l=x11'r=x11; x10l=x10r=x13;
+fill stroke z10e--z11'e;  % crossbar
+pickup fine.nib; top y3r=h+vround 1.5oo;
+if serifs: pos1(flare,180); pos2(mfudged.hair,180);
+ pos3(vair,90);  lft x1r=hround max(u,2.1u-.5flare); x3=4u;
+ y1=min(bar_height+.5flare+2vair+2,.9[bar_height,h]-.5flare);
+ bulb(3,2,1);  % bulb
+else: pos1(5/7[vair,flare],95); x1l=good.x 1.5u; x1r:=good.x x1r;
+ pos3(1/8[vair,thin_join],90);
+ x3=4.3u; top y1r=vround .82[bar_height,top y3r];
+ filldraw stroke term.e(3,1,left,.9,4); fi  % left terminal
+pos4(mfudged.stem,0); x4=x13; y4=1/3[bar_height,h];
+pos5(mfudged.stem,0); x5=x4; y5=min(y4,y13);
+filldraw stroke super_arc.e(3,4)&z4e--z5e;  % arc and stem
+pos6(.6[thin_join,vair],90); x6=x4; bot y6=y10l;
+pos7(left_curve,180);
+lft x7r=hround max(.5u,1.5u-.5left_curve); 
+y7=1/3[top y8l,top y6r];
+pos8(vair,270); x8l=3.75u; bot y8r=-oo;
+pos9(.5[vair,fudged.stem],360); x9=x5; y9=.55bar_height;
+(x',y8r)=whatever[z8l,z9l]; x8r:=max(x',x8-u);
+{{interim superness:=more_super;
+ filldraw stroke z9e{down}...z8e{left}...{up}z7e&super_arc.e(7,6)}}; % bowl
+if y9<y5: 
+filldraw stroke z5e{down}..{down}z9e; 
+fi  % link (usually hidden)
+pairassign(tca,x4,y3);  %top center accentpoint
+pairassign(lca,x4,y8);  %low center accentpoint
+pairequate(tra,z12); %top right accentpoint
+pairequate(tla,z3); %top left accentpoint
+pairequate(lla,z8); %low left accentpoint
+pairequate(lra,z14); %low right accentpoint
+penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); 
+endchar;
+
+cmchar "The ligature oe";
+newchar(oe,14u#,x_height#,0);
+italcorr .5[bar_height#,x_height#]*slant+.5min(curve#-1.5u#,0);
+adjust_fit(0,0);
+numeric left_curve,right_curve;
+if monospace: right_curve=left_curve=fudged.stem;
+else: left_curve=max(fine.breadth,hround(curve-2stem_corr));
+ right_curve=max(tiny.breadth,hround(curve-if serifs:6 else:8 fi\\stem_corr));fi
+pickup tiny.nib; pos11(right_curve,0);
+pos12(vair,90); pos13(mfudged.stem,180);
+y11=good.y bar_height; top y12r=h+vround 1.5oo; y10l=bot y11;
+rt x11r=hround min(w-.5u,w-u+.5right_curve);
+lft x13r=hround (.5(w+u)-.5mfudged.stem); x12=.55[x13,x11];
+{{interim superness:=more_super;
+ filldraw stroke super_arc.e(11,12)}};  % right bowl of e
+y13=.5[y12,y14]; bot y14r=-oo; x14=x12+.25u;
+if serifs: pos14(vair',270); pos15(mfudged.hair,360);
+ y15=max(good.y(.5bar_height-.9),y14l+vair); x15r=x11r;
+ (x,y14l)=whatever[z14r,z15]; x14l:=min(x,x14l+.5u);
+ filldraw stroke pulled_arc.e(12,13)
+  & pulled_super_arc.e(13,14)(.8superpull)
+  ...{x15-x14,5(y15-y14)}z15e; % left bowl, arc, and terminal of e
+else: pos14(vair,270);
+ filldraw stroke super_arc.e(12,13)
+  & super_arc.e(13,14);  % left bowl and arc of e
+ pickup fine.nib; pos14'(vair,270); z14=z14';
+ pos15(.5[vair,flare],275); rt x15r=hround(w-.6u);
+ y15r=good.y(y15r+1/3bar_height-y15); y15l:=good.y y15l; x15l:=good.x x15l;
+ filldraw stroke term.e(14',15,right,1,4); fi  % terminal
+y11'r=y10r=y10l+.6[thin_join,vair]; y11'l=y10l; x11'l=x11'r=x11; x10l=x10r=x13;
+fill stroke z10e--z11'e;  % crossbar
+pickup fine.nib; pos1(vair,90); pos3(vair,-90);
+pos2(left_curve,180); pos4(mfudged.stem,0);
+lft x2r=hround max(.5u,1.25u-.5curve);
+z4=z13; x1=x3=.5[x2,x4]; top y1r=h+vround 1.5oo; bot y3r=-oo;
+y2=y4; y2l:=y4l:=.52h;
+filldraw stroke pulled_arc.e(1,2) & pulled_arc.e(2,3); % left half of left bowl
+filldraw stroke pulled_arc.e(3,4) & pulled_arc.e(4,1); % right half of left bowl
+pairassign(tca,x4,y1);  %top center accentpoint
+pairassign(lca,x4,y3);  %low center accentpoint
+pairequate(tra,z12); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z3); %low left accentpoint
+pairequate(lra,z14); %low right accentpoint
+penlabels(1,2,3,4,10,11,12,13,14,15); endchar;
+
+cmchar "The ligature AE";
+newchar(AE,16u#,cap_height#,0);
+italcorr cap_height#*slant-beak_jut#-.5u#;
+adjust_fit(cap_serif_fit#,0);
+numeric left_stem,mid_stem,outer_jut,alpha;
+mid_stem=max(tiny.breadth,hround .9[mfudged.hair,mfudged.cap_stem]);
+pickup tiny.nib; pos1(mid_stem,0); pos2(mid_stem,0);
+lft x1l=lft x2l=hround(if monospace or hefty:.55 else:.5 fi\\w-.75u);
+top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+pickup crisp.nib; pos3(slab,90); pos4(mfudged.hair,0);
+top y3r=h; x3=x1; rt x4r=hround(w-u); y4=good.y(y3l-beak)-eps;
+arm(3,4,e,beak_darkness,beak_jut);  % upper arm and beak
+pos5(cap_bar,-90); pos6(mfudged.hair,0); x5=x1;
+top y5l=vround(if hefty:.52 else:.48 fi\\[y2,y1]+.5cap_bar);
+pos0(cap_bar,90); pos7(mfudged.hair,0);
+z0=z5; x6=x7; y6-y5l=y0l-y7;
+if serifs and not(monospace and hefty): rt x6r=hround(w-3.65u+.5mfudged.hair);
+ y6=good.y(y5l+.6beak)+eps; rt x9r=hround(w-.5u);
+else: rt x6r=hround(w-1.5u); y6=y5l+eps; rt x9r=hround(w-.75u); fi
+arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0);  % middle arm and serif
+pos8(slab if not serifs:+2stem_corr fi,-90);
+pos9(mfudged.hair,0); bot y8r=0; x8=x2; y9=good.y(y8l+7/6beak)+eps;
+arm(8,9,h,beak_darkness,1.5beak_jut);  % lower arm and beak
+left_stem=if monospace:fudged.hair else: cap_hair fi if hefty: -3stem_corr fi;
+outer_jut=.8cap_jut; x11l=l+letter_fit+outer_jut+.5u; y11=0;
+x12=x1l-apex_corr-if monospace:2 fi\\u; y12=h;
+alpha=diag_ratio(1,.5left_stem,y12-y11,x12-x11l);
+penpos11(alpha*left_stem,0); penpos12(alpha*left_stem,0);
+fill diag_end(12l,11l,1,1,11r,12r)
+ --diag_end(11r,12r,1,1,12l,11l)--cycle; % diagonal
+y10=h-slab; z10=whatever[z11,z12];
+fill z10--(x1,y10)--(x1,h)--z12--cycle;  % link
+penpos13(whatever,angle(z2-z1)); z13=whatever[z11,z12];
+penpos14(cap_band,90); x14=x0; y13l=y14l; y13r=y14r;
+if hefty: y14r=.4h; else: y14=y0; fi
+penstroke z13e--z14e; % bar line
+if serifs: numeric inner_jut; pickup tiny.nib;
+ prime_points_inside(11,12);
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: inner_jut=cap_jut;
+ else: rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; fi
+ dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
+ nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
+ nodish_serif(2,1,c,1/3,.75inner_jut,d,1/3,.5cap_jut); fi  % lower middle serif
+pairequate(tca,z3);  %top center accentpoint
+pairequate(lca,z8);  %low center accentpoint
+pairassign(tra,x.e2,y3); %top right accentpoint
+pairequate(tla,z12); %top left accentpoint
+pairequate(lla,z11); %low left accentpoint
+pairassign(lra,x.h2,y2); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14); endchar;
+
+cmchar "The ligature OE";
+newchar(OE,18u#,cap_height#,0);
+italcorr cap_height#*slant-beak_jut#-.5u#;
+adjust_fit(cap_serif_fit#,0);
+numeric light_stem;
+light_stem=max(tiny.breadth,hround .8[mfudged.hair,mfudged.cap_stem]);
+pickup tiny.nib; pos1(light_stem,0); pos2(light_stem,0);
+lft x1l=lft x2l=hround .5w; top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+pickup crisp.nib; pos3(slab,90); pos4(mfudged.hair,0);
+top y3r=h; x3=x1; rt x4r=hround(w-u); y4=good.y(y3l-beak)-eps;
+arm(3,4,e,beak_darkness,beak_jut);  % upper arm and beak
+pos5(cap_bar,-90); pos6(mfudged.hair,0);
+top y5l=vround(.52[y2,y1]+.5cap_bar); x5=x1;
+pos0(cap_bar,90); pos7(mfudged.hair,0);
+z0=z5; x6=x7; y6-y5l=y0l-y7;
+if serifs and not(monospace and hefty): rt x6r=hround(w-3.4u+.5mfudged.hair);
+ y6=good.y(y5l+.6beak)+eps; rt x9r=hround(w-.5u);
+else: rt x6r=hround(w-1.5u); y6=y5l+eps; rt x9r=hround(w-.75u); fi
+arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0);  % middle arm and serif
+pos8(slab if not serifs:+2stem_corr fi,-90);
+pos9(mfudged.hair,0); bot y8r=0; x8=x2; y9=good.y(y8l+7/6beak)+eps;
+arm(8,9,h,beak_darkness,1.5beak_jut);  % lower arm and beak
+penpos11(vair,90); penpos13(vair,-90);
+if monospace: penpos12(fudged.cap_stem,180);
+ interim superness:=sqrt superness;  % make |"O"|, not |"0"|
+else: penpos12(hround(cap_curve-stem_corr),180); fi
+x11=x13=.5w-2u; y11r=h+o; y13r=-o; y12=.5h-vair_corr; x12r=hround u;
+x14=x15=.5w; y14=2/3h; y15=1/3h; y12l:=.52h;
+penstroke super_arc.e(11,12) & super_arc.e(12,13);  % left half of bowl
+fill z13r{right}..{right}(x2,0)--(x1,h){left}..{left}z11r
+ --z11l{right}...{z14-z11l}(.82[x11l,x14],.82[y14,y11l])
+ ...z14---z15...{z13l-z15}(.82[x13l,x15],.82[y15,y13l])
+ ...{left}z13l--cycle;  % right half of bowl
+if serifs: serif(1,2,a,1/3,.5cap_jut);  % upper serif
+ serif(2,1,b,1/3,.5cap_jut); fi  % lower serif
+pairequate(tca,z3);  %top center accentpoint
+pairequate(lca,z8);  %low center accentpoint
+pairassign(tra,x.e2,y3); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z13); %low left accentpoint
+pairassign(lra,x.h2,y2); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7,8,9,11,12,13,14,15); endchar;
+
+% end of file ligature.mf
+
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/ligaturi.mf b/Master/texmf-dist/fonts/source/public/wnri/ligaturi.mf
new file mode 100644
index 00000000000..980b5d67f3a
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/ligaturi.mf
@@ -0,0 +1,163 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw italic ligature characters
+%
+
+cmchar "The italic ligature ae";
+newchar(ae,13u#,x_height#,0);
+italcorr max(1/3x_height#*slant,x_height#*slant+.5(.2[hair#,stem#])-u#);
+adjust_fit(if monospace:-u#,-u# else: 0,0 fi); pickup fine.nib;
+forsuffixes $=hair,stem: shaved$:=mfudged$; save $; $=shaved$; endfor
+numeric heavy_hair; heavy_hair=hround .2[hair,stem];
+numeric light_stem; light_stem=hround .75[hair,stem];
+pos0(vair,-90); pos1(heavy_hair,0); pos2(vair,90);
+pos3(light_stem,180); pos4(vair,270); pos5(hair,320);
+x0=rt x3l; rt x1r=hround(w-1.5u+.5heavy_hair); x2=x4=.5(w+6u);
+lft x3r=hround(.5w-.5light_stem); x5r=good.x(w-.5u); x6=x5;
+y0=y3=y6=bar_height; y1=.5[y0,y2]; top y2r=h+oo; bot y4r=-oo;
+top y5l=vround(.5bar_height+.5); path p; p=z4{right}..z5..z6;
+filldraw stroke z0e{right}...z1e{up}...pulled_arc.e(2,3)
+ & pulled_arc.e(3,4)...{direction 1 of p}z5e;  % arc of e
+pos7(light_stem,0); pos8(light_stem,0);
+x7=x8=x3; y7+.5light_stem=h+oo; y8-.5light_stem=-oo;
+pos7'(vair,-225); pos11(curve,-180); z7'=z7;
+pos12(vair,-90); pos3'(hair,0); z3'=z3;
+lft x11r=hround(1.5u-.5curve); x12=.5[x11,x3];
+y11=.3[y12,y7]; bot y12r=-oo;
+filldraw stroke z7'e{3(x11-x7),y11-y7}...pulled_arc.e(11,12)
+ & pulled_arc.e(12,3');  %  bowl of a
+filldraw z7l---z8l..z8r---z7r..cycle;  % stem
+pairequate(tca,z7);  %top center accentpoint
+pairequate(lca,z8);  %low center accentpoint
+pairequate(tra,z2); %top right accentpoint
+pairassign(tla,x12,y7); %top left accentpoint
+pairequate(lla,z12); %low left accentpoint
+pairequate(lra,z4); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7,8,11,12); endchar;
+
+cmchar "The italic ligature oe";
+newchar(oe,13u#,x_height#,0);
+italcorr max(1/3x_height#*slant,x_height#*slant+.5(.2[hair#,stem#])-u#);
+adjust_fit(if monospace:-u#,-u# else: 0,0 fi); pickup fine.nib;
+forsuffixes $=hair,stem: shaved$:=mfudged$; save $; $=shaved$; endfor
+numeric heavy_hair; heavy_hair=hround .2[hair,stem];
+pos0(vair,-90); pos1(heavy_hair,0); pos2(vair,90);
+pos3(stem,180); pos4(vair,270); pos5(hair,320);
+x0=rt x3l; rt x1r=hround(w-1.5u+.5heavy_hair); x2=x4=.5(w+6u);
+lft x3r=hround(.5w-.5stem); x5r=good.x(w-.5u); x6=x5;
+y0=y3=y6=bar_height; y1=.5[y0,y2]; top y2r=h+oo; bot y4r=-oo;
+top y5l=vround(.5bar_height+.5); path p; p=z4{right}..z5..z6;
+filldraw stroke z0e{right}...z1e{up}...pulled_arc.e(2,3)
+ & pulled_arc.e(3,4)...{direction 1 of p}z5e;  % arc of e
+pos11(vair,90); pos12(curve,180); pos13(vair,270); pos14(stem,360);
+x11=x13=.5[x12,x14]; lft x12r=hround(1.5u-.5curve); x14=x3;
+top y11=h+oo; y12=y14=.5[y11,y13]; bot y13=-oo;
+filldraw stroke pulled_arc.e(11,12) & pulled_arc.e(12,13)
+ & pulled_arc.e(13,14) & pulled_arc.e(14,11); % bowl
+pairassign(tca,x3,y2);  %top center accentpoint
+pairassign(lca,x3,y4);  %low center accentpoint
+pairequate(tra,z2); %top right accentpoint
+pairequate(tla,z11); %top left accentpoint
+pairequate(lla,z13); %low left accentpoint
+pairequate(lra,z14); %low right accentpoint
+penlabels(1,2,3,4,5,6,11,12,13,14); endchar;
+
+cmchar "The ligature AE";
+newchar(AE,16u#,cap_height#,0);
+italcorr cap_height#*slant-beak_jut#-.5u#;
+adjust_fit(cap_serif_fit#,0);
+numeric left_stem,mid_stem,outer_jut,alpha;
+mid_stem=max(tiny.breadth,hround .9[mfudged.hair,mfudged.cap_stem]);
+pickup tiny.nib; pos1(mid_stem,0); pos2(mid_stem,0);
+lft x1l=lft x2l=hround(if monospace or hefty:.55 else:.5 fi\\w-.75u);
+top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+pickup crisp.nib; pos3(slab,90); pos4(mfudged.hair,0);
+top y3r=h; x3=x1; rt x4r=hround(w-u); y4=good.y(y3l-beak)-eps;
+arm(3,4,e,beak_darkness,beak_jut);  % upper arm and beak
+pos5(cap_bar,-90); pos6(mfudged.hair,0); x5=x1;
+top y5l=vround(if hefty:.52 else:.48 fi\\[y2,y1]+.5cap_bar);
+pos0(cap_bar,90); pos7(mfudged.hair,0);
+z0=z5; x6=x7; y6-y5l=y0l-y7;
+if serifs and not(monospace and hefty): rt x6r=hround(w-3.65u+.5mfudged.hair);
+ y6=good.y(y5l+.6beak)+eps; rt x9r=hround(w-.5u);
+else: rt x6r=hround(w-1.5u); y6=y5l+eps; rt x9r=hround(w-.75u); fi
+arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0);  % middle arm and serif
+pos8(slab if not serifs:+2stem_corr fi,-90);
+pos9(mfudged.hair,0); bot y8r=0; x8=x2; y9=good.y(y8l+7/6beak)+eps;
+arm(8,9,h,beak_darkness,1.5beak_jut);  % lower arm and beak
+left_stem=if monospace:fudged.hair else: cap_hair fi if hefty: -3stem_corr fi;
+outer_jut=.8cap_jut; x11l=l+letter_fit+outer_jut+.5u; y11=0;
+x12=x1l-apex_corr-if monospace:2 fi\\u; y12=h;
+alpha=diag_ratio(1,.5left_stem,y12-y11,x12-x11l);
+penpos11(alpha*left_stem,0); penpos12(alpha*left_stem,0);
+fill diag_end(12l,11l,1,1,11r,12r)
+ --diag_end(11r,12r,1,1,12l,11l)--cycle; % diagonal
+y10=h-slab; z10=whatever[z11,z12];
+fill z10--(x1,y10)--(x1,h)--z12--cycle;  % link
+penpos13(whatever,angle(z2-z1)); z13=whatever[z11,z12];
+penpos14(cap_band,90); x14=x0; y13l=y14l; y13r=y14r;
+if hefty: y14r=.4h; else: y14=y0; fi
+penstroke z13e--z14e; % bar line
+if serifs: numeric inner_jut; pickup tiny.nib;
+ prime_points_inside(11,12);
+ if rt x11'r+cap_jut+.5u+1<=lft x2l-.75cap_jut: inner_jut=cap_jut;
+ else: rt x11'r+inner_jut+.5u+1=lft x2l-.75inner_jut; fi
+ dish_serif(11',12,i,1/2,outer_jut,j,.6,inner_jut)(dark);  % lower left serif
+ nodish_serif(1,2,a,1/3,cap_jut+x1l-x12,b,1/3,.5cap_jut);  % upper serif
+ nodish_serif(2,1,c,1/3,.75inner_jut,d,1/3,.5cap_jut); fi  % lower middle serif
+pairequate(tca,z3);  %top center accentpoint
+pairequate(lca,z8);  %low center accentpoint
+pairassign(tra,x.e2,y3); %top right accentpoint
+pairequate(tla,z12); %top left accentpoint
+pairequate(lla,z11); %low left accentpoint
+pairassign(lra,x.h2,y2); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14); endchar;
+
+cmchar "The ligature OE";
+newchar(OE,18u#,cap_height#,0);
+italcorr cap_height#*slant-beak_jut#-.5u#;
+adjust_fit(cap_serif_fit#,0);
+numeric light_stem;
+light_stem=max(tiny.breadth,hround .8[mfudged.hair,mfudged.cap_stem]);
+pickup tiny.nib; pos1(light_stem,0); pos2(light_stem,0);
+lft x1l=lft x2l=hround .5w; top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+pickup crisp.nib; pos3(slab,90); pos4(mfudged.hair,0);
+top y3r=h; x3=x1; rt x4r=hround(w-u); y4=good.y(y3l-beak)-eps;
+arm(3,4,e,beak_darkness,beak_jut);  % upper arm and beak
+pos5(cap_bar,-90); pos6(mfudged.hair,0);
+top y5l=vround(.52[y2,y1]+.5cap_bar); x5=x1;
+pos0(cap_bar,90); pos7(mfudged.hair,0);
+z0=z5; x6=x7; y6-y5l=y0l-y7;
+if serifs and not(monospace and hefty): rt x6r=hround(w-3.4u+.5mfudged.hair);
+ y6=good.y(y5l+.6beak)+eps; rt x9r=hround(w-.5u);
+else: rt x6r=hround(w-1.5u); y6=y5l+eps; rt x9r=hround(w-.75u); fi
+arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0);  % middle arm and serif
+pos8(slab if not serifs:+2stem_corr fi,-90);
+pos9(mfudged.hair,0); bot y8r=0; x8=x2; y9=good.y(y8l+7/6beak)+eps;
+arm(8,9,h,beak_darkness,1.5beak_jut);  % lower arm and beak
+penpos11(vair,90); penpos13(vair,-90);
+if monospace: penpos12(fudged.cap_stem,180);
+ interim superness:=sqrt superness;  % make |"O"|, not |"0"|
+else: penpos12(hround(cap_curve-stem_corr),180); fi
+x11=x13=.5w-2u; y11r=h+o; y13r=-o; y12=.5h-vair_corr; x12r=hround u;
+x14=x15=.5w; y14=2/3h; y15=1/3h; y12l:=.52h;
+penstroke super_arc.e(11,12) & super_arc.e(12,13);  % left half of bowl
+fill z13r{right}..{right}(x2,0)--(x1,h){left}..{left}z11r
+ --z11l{right}...{z14-z11l}(.82[x11l,x14],.82[y14,y11l])
+ ...z14---z15...{z13l-z15}(.82[x13l,x15],.82[y15,y13l])
+ ...{left}z13l--cycle;  % right half of bowl
+if serifs: serif(1,2,a,1/3,.5cap_jut);  % upper serif
+ serif(2,1,b,1/3,.5cap_jut); fi  % lower serif
+pairequate(tca,z3);  %top center accentpoint
+pairequate(lca,z8);  %low center accentpoint
+pairassign(tra,x.e2,y3); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z13); %low left accentpoint
+pairassign(lra,x.h2,y2); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7,8,9,11,12,13,14,15); endchar;
+
+% end of file ligaturi.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/macracct.mf b/Master/texmf-dist/fonts/source/public/wnri/macracct.mf
new file mode 100644
index 00000000000..37b7de2baf7
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/macracct.mf
@@ -0,0 +1,36 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw macron accents 
+%
+
+cmchar "Macron (bar) accent";
+numeric macron_breadth#; macron_breadth#=.2[vair#,stem#];
+beginchar(oct"026",9u#,.4[x_height#,asc_height#]+macron_breadth#,0);
+italcorr h#*slant-.75u#;
+adjust_fit(0,0);
+numeric macron_breadth; macron_breadth:=Vround .2[vair,stem];
+pickup if serifs: crisp.nib else: fine.nib fi;
+pos1(macron_breadth,90); pos2(macron_breadth,90);
+top y1r=top y2r=h+o; lft x1=w-rt x2=hround 1.25u;
+filldraw stroke z1e--z2e;  % bar
+if monospace: currentpicture:=currentpicture shifted(0,1/2aspect_ratio*dot_size); fi
+makeACCENT(MacronPic);
+currentpicture:=nullpicture;
+z1'=0.25[z1,z2]; z2'=0.75[z1,z2];
+pos1'(macron_breadth,90); pos2'(macron_breadth,90);
+filldraw stroke z1'e--z2'e;  % bar
+if monospace: currentpicture:=currentpicture shifted(0,1/2aspect_ratio*dot_size); fi
+makeACCENT(ShortMac);
+endgroup;
+
+extra_endchar:=
+  " czu ap(MacronPic);  ah; oechar; ";
+%extra_endchar:=
+%  " czu whap(MacronPic,ShortMac,6.5u);  ah; oechar; ";
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = macron enddef;
+
+% end of file macracct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/mudaacct.mf b/Master/texmf-dist/fonts/source/public/wnri/mudaacct.mf
new file mode 100644
index 00000000000..9ac0263739b
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/mudaacct.mf
@@ -0,0 +1,61 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw combination macron, acute accent, and underdot
+%
+
+cmchar "Dot accent";
+numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#);
+beginchar(oct"137",5u#,min(asc_height#,10/7x_height#+.5dot_diam#),0);
+define_whole_blacker_pixels(dot_diam);
+italcorr h#*slant+.5dot_diam#-2u#;
+adjust_fit(0,0);
+pickup tiny.nib; pos1(dot_diam,0); pos2(dot_diam,90);
+x1=x2=.5w; top y2r=h+1;
+if bot y2l<x_height+o+slab: y2l:=min(y2r-eps,x_height+o+slab+.5tiny); fi
+y1=.5[y2l,y2r]; dot(1,2);  % dot
+transform Tf; Tf = identity shifted (-.5w + slant*(-h-dot_diam) ,aspect_ratio*(-h-dot_diam));
+savePicture(UdotPic); 
+endgroup;
+
+cmchar "Acute accent";
+beginchar(oct"023",9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant-if serifs: 1.5 fi u#;
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1+.5stem=hround(w-2u); x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ rt x1r=hround(w-1.5u); lft x2l=hround(.5w-.25u-.5vair);
+ top y1=h; bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+transform Tf; Tf=identity shifted (-.5w + slant*(-y2) ,aspect_ratio*(-y2));
+savePicture(MacronPic);
+endgroup;
+cmchar "Macron (bar) accent";
+numeric macron_breadth#; macron_breadth#=.2[vair#,stem#];
+beginchar(oct"026",9u#,.4[x_height#,asc_height#]+macron_breadth#,0);
+italcorr h#*slant-.75u#;
+adjust_fit(0,0);
+numeric macron_breadth; macron_breadth:=Vround .2[vair,stem];
+pickup if serifs: crisp.nib else: fine.nib fi;
+pos1(macron_breadth,90); pos2(macron_breadth,90);
+top y1r=top y2r=h+o; lft x1=w-rt x2=hround 1.25u;
+filldraw stroke z1e--z2e;  % bar
+transform At; At=identity shifted(.5w + slant*(h+acctdiff),aspect_ratio*(h+acctdiff));
+ap(MacronPic);
+if monospace: currentpicture:=currentpicture shifted(0,1/2aspect_ratio*dot_size); fi
+makeACCENT(MacronPic);
+endgroup;
+
+
+extra_endchar:=
+  " czu ap(MacronPic);  czd  ap(UdotPic); ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+def cp = muda enddef;
+
+% end of file mudaacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/odotacct.mf b/Master/texmf-dist/fonts/source/public/wnri/odotacct.mf
new file mode 100644
index 00000000000..8e80b9df827
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/odotacct.mf
@@ -0,0 +1,27 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw superscript dot accents 
+%
+
+cmchar "Dot accent";
+numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#);
+beginchar(oct"137",5u#,min(asc_height#,10/7x_height#+.5dot_diam#),0);
+define_whole_blacker_pixels(dot_diam);
+italcorr h#*slant+.5dot_diam#-2u#;
+adjust_fit(0,0);
+pickup tiny.nib; pos1(dot_diam,0); pos2(dot_diam,90);
+x1=x2=.5w; top y2r=h+1;
+if bot y2l<x_height+o+slab: y2l:=min(y2r-eps,x_height+o+slab+.5tiny); fi
+y1=.5[y2l,y2r]; dot(1,2);  % dot
+makeACCENT(DotPic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(DotPic);  ah; oechar; ";
+boolean dotson; dotson=true; % don't omit dots on i, j, and possibly etc.
+
+def cp = odot enddef;
+
+% end of file odotacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/orngacct.mf b/Master/texmf-dist/fonts/source/public/wnri/orngacct.mf
new file mode 100644
index 00000000000..97b65cea8ac
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/orngacct.mf
@@ -0,0 +1,30 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw high circle accents 
+%
+
+cmchar "Scandinavian circle accent";
+beginchar(oct"027",13u#+4/3(asc_height#-x_height#)*slant,asc_height#,0);
+adjust_fit(cap_serif_fit#,cap_serif_fit#);
+numeric circ_hair,circ_vair;
+circ_hair=hround min(hair,u+.5); circ_vair=vround min(vair,(h-x_height)/6+.5);
+penpos1(circ_vair,90); penpos3(circ_vair,-90);
+penpos2(circ_hair,180); penpos4(circ_hair,0);
+x2r=hround(.5w-1.5u-.5circ_hair);
+x4r=w-x2r; x1=x3=.5w; y1r=h+apex_o; y2=y4=.5[y1,y3];
+y3r=vround(1/3[x_height,h]+apex_o);
+penstroke pulled_arc.e(1,2) & pulled_arc.e(2,3)
+ & pulled_arc.e(3,4) & pulled_arc.e(4,1) & cycle;  % bowl
+makeACCENT(RingPic); 
+endgroup;
+
+
+extra_endchar:=
+  " czu ap(RingPic);  ah; oechar; ";
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = orng enddef;
+
+% end of file orngacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/product.mf b/Master/texmf-dist/fonts/source/public/wnri/product.mf
new file mode 100644
index 00000000000..466ebb5adf2
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/product.mf
@@ -0,0 +1,9 @@
+%
+% Washington Romanized Indic accent driver
+%
+
+boolean production; production=true;
+%boolean production; production=false;
+
+% end of file product.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/romanla.mf b/Master/texmf-dist/fonts/source/public/wnri/romanla.mf
new file mode 100644
index 00000000000..342d42da63a
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/romanla.mf
@@ -0,0 +1,1075 @@
+%
+% Washington Roman Indic lowercase base file
+%
+% based on ROMANL.MF (Computer Modern Roman lowercase base file)
+%
+% Modified by: Thomas Ridgeway <ridgeway@u.washington.edu>, June 19 1993
+% Updated: Anshuman Pandey <apandey@u.washington.edu>, Feb 18 1998
+%
+% Changes: modified some characters to get better looking accent
+%          positions.
+%
+
+% cmchar "The letter a";
+newchar(a,9u#,x_height#,0);
+bh#:=min(bar_height#,1.14x_height#-bar_height#); define_pixels(bh);
+italcorr 1/3[bh#,x_height#]*slant+.5stem#-serif_fit#-2u#;
+adjust_fit(0,serif_fit# if serifs: if hair#+.5stem#>1.5u#:-.25u# fi\\fi);
+pickup fine.nib; top y3r=h+vround 1.5oo;
+if serifs: pos1(flare,180); pos2(hair,180);
+ pos3(vair,90);  lft x1r=hround max(u,2.1u-.5flare); x3=.5w-.5u;
+ y1=min(bh+.5flare+2vair+2,.9[bh,h]-.5flare);
+ bulb(3,2,1);  % bulb
+else: pos1(5/7[vair,flare],95); x1l=good.x 1.5u; x1r:=good.x x1r;
+ pos3(1/8[vair,thin_join],90);
+ x3=.5w-.2u; top y1r=vround .82[bh,top y3r];
+ filldraw stroke term.e(3,1,left,.9,4); fi  % terminal
+pos4(stem,0); rt x4r=hround(w-2.5u+.5stem); y4=1/3[bh,h];
+pos5(stem,0); x5=x4; y5=max(.55bh,2vair);
+filldraw stroke super_arc.e(3,4)&z4e..z5e;  % arc and stem
+pos6(.3[thin_join,vair],90); x6=x4; bot y6=bh;
+pos7(hround(curve-2stem_corr),180);
+lft x7r=hround max(.5u,1.5u-.5curve); y7=1/3[top y8l,top y6r];
+pos8(vair,270); x8l=.5w-.75u; bot y8r=-oo;
+pos9(thin_join,360); z9l=z5l;
+(x,y8r)=whatever[z8l,z9l]; x8r:=max(x,x8-u);
+{{interim superness:=more_super;
+ filldraw stroke z9e{down}...z8e{left}...{up}z7e&super_arc.e(7,6)}}; % bowl
+if serifs: numeric shaved_stem; shaved_stem=hround(stem-3stem_corr);
+ if hair#+.5stem#>1.5u#: pickup tiny.nib;
+  pos5'(shaved_stem,0); rt x5'r=fine.rt x5r; y5'=y5;
+  pos10(shaved_stem,0); x10=x5'; y10=.2[.5tiny,bh];
+  pos11(shaved_stem,0); rt x11r=hround(w-.25u); bot y11=0;
+  pos12(shaved_stem,0); x11=x12; top y12=slab+eps;
+  filldraw z5'l---z10l...z11l{right}--z11r
+   --z12r{left}...z10r+.75(z12-z11)---z5'r--cycle;  % foot
+ else: pickup crisp.nib; pos5'(shaved_stem,0); rt x5'r=fine.rt x5r; y5'=y5;
+  pos10(shaved_stem,0); x10=x5'; y10=1/3bh;
+  pos11(.2[vair,stem],90); x11r=.5[x10r,x12r]; bot y11l=-vround .5oo;
+  pos12(hair,180); rt x12l=hround(w-.1u); y12=max(y10,y11+vair);
+  pos13(hair,180); x13=x12; top y13=max(vround .6bh,top y12);
+  (x',y11l)=whatever[z11r,z12r]; x11l:=max(x',x10);
+  filldraw stroke z5'e---z10e...z11e{right}...z12e---z13e; fi  % hook
+else: numeric shaved_stem; shaved_stem=hround(stem-stem_corr);
+ pickup tiny.nib; pos5'(shaved_stem,0); rt x5'r=fine.rt x5r; y5'=y5;
+ pos10(shaved_stem,0); x10=x5'; bot y10=0;
+ filldraw stroke z5'e--z10e; fi  % base of stem
+% accent points
+pairequate(tca,z3);  %top center accentpoint
+pairequate(lca,z8);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13); endchar;
+
+% cmchar "The letter b";
+newchar(b,10u#+serif_fit#,asc_height#,0);
+italcorr .5x_height#*slant+min(.5curve#-u#,-.25u#);
+adjust_fit(serif_fit#,0);
+pickup tiny.nib; pos1(stem',0); pos2(stem,0);
+pos0'(stem',0); pos0(stem,0); z0l=z0'l; x0'=x1; x0=x2;
+lft x1l=hround(2.5u-.5stem'); top y1=h;
+numeric edge; edge=rt x2r;
+pickup fine.nib; pos3(if hefty:thin_join else: hair fi,180);
+pos4(vair,90); pos5(curve,0); pos6(vair,-90); penpos7(x3l-x3r,-180);
+rt x3l=max(rt x3l-(lft x3r-tiny.lft x2l),1/3[rt x2,edge]);
+y3=1/8[bar_height,x_height];
+x4l=w-.5(w-serif_fit)+.5u; top y4r=x_height+oo;
+rt x5r=hround min(w-1.35u+.5curve,w-.6u); y5=.5x_height;
+x6l=x4l-.2u; bot y6r=-oo;
+x7=x3; y7=min(y3,y6+y4-y3+.6vair);
+(x,y4r)=whatever[z3l,z4l]; x4r:=min(x,.5[x4,x5r]);
+(x',y6r)=whatever[z7l,z6l]; x6r:=min(x',.5[x6,x5r]);
+filldraw stroke z3e{up}...pulled_arc.e(4,5)&pulled_arc.e(5,6)...{up}z7e; % bowl
+y0=ypart(((edge,h)--(edge,0))intersectionpoint(z3l{up}...{right}z4l));
+y2=ypart(((edge,h)--(edge,0))intersectionpoint(z6l{left}...{up}z7l));
+pickup tiny.nib; filldraw stroke z1e--z0'e--z0e--z2e;  % stem
+pickup crisp.nib; pos8(hair,0); pos7'(stem,0);
+z7'=z2; x8l=x7'l; bot y8=0;
+filldraw stroke z7'e--z8e;  % point
+if serifs: sloped_serif.l(1,0',a,1/3,jut,serif_drop); fi  % upper serif
+% accent points
+pairassign(tca,.3[x4,x5],y4);  %top center accentpoint
+pairequate(lca,z6);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z8); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7,8); endchar;
+
+% cmchar "The letter c";
+newchar(c,8u#,x_height#,0);
+italcorr x_height#*slant-.2u#;
+adjust_fit(if monospace: .5u#,.5u# else: 0,0 fi);
+pickup fine.nib; pos2(vair',90); pos4(vair',270);
+x2=x4=.5(w+u); top y2r=vround(h+1.5oo); bot y4r=-oo;
+pos3(curve,180); lft x3r=hround max(.6u,1.35u-.5curve); y3=.5h;
+if serifs: pos1(hair,0); pos0(flare,0);
+ y1=min(bar_height+.5flare+2vair'+2,.9[bar_height,h]-.5flare);
+ rt x1r=hround(w-.7u); bulb(2,1,0);  % bulb
+ pos5(hair,0); rt x5r=hround(w-.5u);
+ y5=max(good.y(.5bar_height-.9),y4l+vair');
+ (x,y4l)=whatever[z4r,z5l]; x4l:=min(x,x4l+.5u);
+ filldraw stroke 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
+else: pos1(4/7[vair',flare],80);
+ rt x1r=hround(w-.6u); top y1r=vround .82[bar_height,top y2r];
+ filldraw stroke term.e(2,1,right,.8,4);  % upper terminal
+ pos5(.6[vair',flare],275); rt x5r=hround(w-.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{right}..tension .9 and 1..z5e;
+  if angle direction 1 of p.e>75:
+   p.e:=z4e{right}..tension atleast.9 and 1..{dir 75}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
+% accent points
+pairequate(tca,z2);  %top center accentpoint
+pairequate(lca,z4);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(0,1,2,3,4,5); endchar;
+
+% cmchar "The letter d";
+newchar(d,10u#+serif_fit#,asc_height#,0);
+italcorr asc_height#*slant-serif_fit#+.5stem#-2u#;
+adjust_fit(0,serif_fit#);
+pickup tiny.nib; pos1(stem',0); pos2(stem,0);
+pos0'(stem',0); pos0(stem,0); z0r=z0'r; x0'=x1; x0=x2;
+rt x1r=hround(w-2.5u+.5stem'); top y1=h;
+numeric edge; edge=lft x2l;
+pickup fine.nib; pos3(if hefty:thin_join else: hair fi,0);
+pos4(vair,90); pos5(curve,180); pos6(vair,270); penpos7(x3r-x3l,360);
+lft x3l=min(lft x3l-(rt x3r-tiny.rt x2r),1/3[lft x2,edge]);
+y3=1/8[bar_height,x_height];
+x4l=.5(w-serif_fit)-.3u; top y4r=x_height+oo;
+lft x5r=hround max(1.35u-.5curve,.6u); y5=.5x_height;
+x6l=x4l-.2u; bot y6r=-oo;
+x7=x3; y7=min(y3,y6+y4-y3+.6vair);
+(x,y4r)=whatever[z3l,z4l]; x4r:=max(x,.5[x5r,x4]);
+(x',y6r)=whatever[z7l,z6l]; x6r:=max(x',.5[x5r,x6]);
+filldraw stroke z3e{up}...pulled_arc.e(4,5)
+ & pulled_arc.e(5,6)...{up}z7e; % bowl
+y0=ypart(((edge,h)--(edge,0))intersectionpoint(z3l{up}...{left}z4l));
+pickup tiny.nib; bot y2=if serifs:-min(oo,serif_drop) else: 0 fi;
+filldraw stroke z1e--z0'e--z0e--z2e;  % stem
+if serifs: sloped_serif.l(1,0',a,1/3,jut,serif_drop);  % upper serif
+ sloped_serif.r(2,0,b,1/3,jut,min(oo,serif_drop)); fi  % lower serif
+% accent points
+pairassign(tca,.3[x5,x4],y4);  %top center accentpoint
+pairequate(lca,z6);  %low center accentpoint
+pairequate(tra,z1); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,z2); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7); endchar;
+
+% cmchar "The letter e";
+newchar(e,7.25u#+max(.75u#,.5curve#),x_height#,0);
+italcorr .5[bar_height#,x_height#]*slant+.5min(curve#-1.5u#,0);
+adjust_fit(if monospace: .25u#,.5u# else: 0,0 fi);
+numeric left_curve,right_curve;
+left_curve=right_curve+6stem_corr=curve if not serifs: -3stem_corr fi;
+if right_curve<tiny.breadth: right_curve:=tiny.breadth; fi
+if left_curve<tiny.breadth: left_curve:=tiny.breadth; fi
+pickup tiny.nib; pos1(right_curve,0);
+pos2(vair,90); pos3(left_curve,180);
+y1=good.y bar_height; top y2r=h+vround 1.5oo; y0l=bot y1;
+rt x1r=hround min(w-.5u,w-u+.5right_curve);
+lft x3r=hround max(.5u,1.25u-.5left_curve); x2=.5w+.25u;
+{{interim superness:=more_super;
+ filldraw stroke super_arc.e(1,2)}};  % right bowl
+y3=.5[y2,y4]; bot y4r=-oo; x4=x2+.25u;
+if serifs: pos4(vair',270); pos5(hair,360);
+ y5=max(good.y(.5bar_height-.9),y4l+vair); x5r=x1r;
+ (x,y4l)=whatever[z4r,z5]; x4l:=min(x,x4l+.5u);
+ filldraw stroke pulled_arc.e(2,3) & pulled_arc.e(3,4)
+  ...{x5-x4,5(y5-y4)}z5e; % left bowl, arc, and terminal
+else: pos4(vair,270);
+ filldraw stroke super_arc.e(2,3) & super_arc.e(3,4);  % left bowl and arc
+ pickup fine.nib; pos4'(vair,270); z4=z4';
+ pos5(.5[vair,flare],275); rt x5r=hround(w-.6u);
+ y5r=good.y(y5r+1/3bar_height-y5); y5l:=good.y y5l; x5l:=good.x x5l;
+ filldraw stroke term.e(4',5,right,1,4); fi  % terminal
+path testpath; testpath=super_arc.r(2,3) & super_arc.r(3,4);
+y1'r=y0r=y0l+.6[thin_join,vair]; y1'l=y0l; x1'l=x1'r=x1;
+forsuffixes $=l,r:
+ x0$=xpart(((0,y0$)--(x1,y0$)) intersectionpoint testpath); endfor
+fill stroke z0e--z1'e;  % crossbar
+% accent points
+pairequate(tca,z2);  %top center accentpoint
+pairequate(lca,z4);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(0,1,2,3,4,5); endchar;
+
+% cmchar "The letter f";
+newchar(f,5.5u#,asc_height#,0);
+italcorr asc_height#*slant+if serifs:flare#-.25u# else: 1.25u# fi;
+adjust_fit(stem_shift#,if monospace: .5u# else:-stem_shift# fi);
+pickup tiny.nib; pos1(stem',0); lft x1l=hround(2.5u-.5stem');
+pickup fine.nib; numeric bulb_diam;
+if serifs: bulb_diam=hround .8[stem,flare];
+ pos2(bulb_diam,0); y2+.5bulb_diam=.9[x_height,h+oo];
+ if monospace: rt x2r=hround(w-.5u)+1 else: lft x2l=hround(w-.75u+.5) fi;
+else: pos2(5/7[vair,flare],90); top y2r=h;
+ rt x2=hround(if monospace:w-.5u else:w+.75u fi); fi
+f_stroke(1,2,a,b,c,jut,if not monospace:1.25fi\\ jut); % stem, terminal, serif
+pickup crisp.nib; top y3r=top y4r=x_height; lft x3=hround .5u-1;
+pos3(bar,90); pos4(bar,90);
+rt x4=hround(w-if monospace:.75u+1 else:1/3u fi);
+filldraw stroke z3e--z4e;  % bar
+% accent points
+pairequate(tca,z.a2);  %top center accentpoint
+pairequate(lca,z1);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(1,2,3,4); endchar;
+
+% cmchar "letter g inverted breve";
+newchar(g,9u#,x_height#,desc_depth#);
+italcorr x_height#*slant+.25u#;
+adjust_fit(0,0);
+numeric light_vair,light_curve,loop_top,loop_side;
+light_vair=Vround(.5[thin_join,vair]+vair_corr);
+light_curve=max(fine.breadth,hround(curve-3stem_corr));
+loop_top=Vround .77[vair,fudged.stem];
+loop_side=hround .64[vair,fudged.stem];
+pickup fine.nib; pos1(light_vair,90);
+pos2(light_curve,180); pos3(light_vair,270);
+pos4(light_curve,360); pos11(loop_top,90);
+y11r=good.y(y11r+.15bar_height-y11); x1=x3=.5[x2,x4]; y2=y4=.5[y1,y3];
+lft x2r=hround(1.75u-.5light_curve); rt x4r=hround(w-2.75u+.5light_curve);
+top y1r=x_height+oo; y3r=good.y(y3r+.27[top y11r,bot y1l]-y3);
+filldraw stroke pulled_arc.e(1,2) & pulled_arc.e(2,3);  % left half of bowl
+filldraw stroke pulled_arc.e(3,4) & pulled_arc.e(4,1);  % right half of bowl
+x0=superness[x1r,x4r]; y0=superness[y4r,y1r];  % NE point on the super bowl
+x8'=superness[x3r,x2r]; y8'=superness[y2r,y3r];  % SW point on the super bowl
+x8''=superness[x3,x2]; y8''=superness[y2,y3];
+pos0(thin_join,angle(z0-z8')+90);
+pos8(thin_join,angle(z0-z8')-90); z8=.618[z8',z8''];
+if serifs: pos5(vair,90);
+ pos6(hair,0); pos7(.5[hair,flare],0); x5=.75[x0,x6]; top y5r=x_height+o;
+ rt x6r=hround(w-.25u); y6+(.5[hair,flare])/2=.95[bar_height,x_height]+oo;
+ filldraw stroke z0e..{right}z5e; bulb(5,6,7);  % ear
+else: pos5(vair',100); top y5r=x_height+oo;
+ rt x5l=hround(w-.25u); y5l:=good.y y5l;
+ filldraw z0l{z5-z0}..z5l--z5r{left}..{curl 1}z0r--cycle; fi  % ear
+pos10(loop_top,90); x10=x8+.75u; y10=y11;
+pos12(loop_side,0); pos13(light_vair,-90);
+pos14(loop_side,-180); pos10'(.5[thin_join,vair],-270);
+rt x12r=hround max(w-1.25u+.5loop_side,w-.5u); y12=y14=.5[y11,y13];
+x11=x13=max(.5w,x10+eps); bot y13r=-d-oo-1; x14=w-x12; z10'l=z10l;
+filldraw stroke z8e{z8-z0}..z10e---z11e;  % link
+filldraw stroke {{interim superness:=hein_super; super_arc.e(11,12)}}
+ & super_arc.e(12,13) & super_arc.e(13,14) & super_arc.e(14,10');  % loop
+% accent points
+pairequate(tca,z1);  %top center accentpoint
+pairequate(lca,z13);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7,8,10,11,12,13,14); labels(8',8''); endchar;
+
+% cmchar "Variant letter g round";
+newchar(vg,10u#+serif_fit#,x_height#,desc_depth#);
+italcorr x_height#*slant-serif_fit#+.5stem#-2u# if serifs:+.5u# fi;
+adjust_fit(0,serif_fit# if serifs: -.5u# fi);
+pickup tiny.nib; pos1(stem',0); pos2(stem,0);
+pos0'(stem',0); pos0(stem,0); z0r=z0'r; x0'=x1; x0=x2;
+rt x1r=hround(w-2.5u+.5stem');
+numeric edge; edge=lft x2l;
+path edge_path; edge_path=(edge,h)--(edge,0);
+pickup fine.nib; pos3(if hefty:thin_join else: hair fi,0);
+pos4(vair,90); pos5(curve,180); pos6(vair,270); penpos7(x3r-x3l,360);
+lft x3l=min(lft x3l-(rt x3r-tiny.rt x2r),2/3[lft x2,edge]); y3=bar_height;
+x4l=.5(w-serif_fit)-.3u; top y4r=x_height+oo;
+lft x5r=hround max(1.35u-.5curve,.6u); y5=.5x_height;
+x6l=x4l-.2u; bot y6r=vround 1/3vair;
+lft x7l=edge; y7=min(y3,y6+y4-y3+.6vair);
+(x,y4r)=whatever[z3l,z4l]; x4r:=max(x,.5[x5r,x4]);
+(x',y6r)=whatever[z7l,z6l]; x6r:=max(x',.5[x5r,x6]);
+filldraw stroke z3e{up}...{left}z4e&super_arc.e(4,5)
+ &super_arc.e(5,6)&z6e{right}...{up}z7e;  % bowl
+y1=ypart(edge_path intersectionpoint(z3l{up}...{left}z4l));
+y0=ypart(edge_path intersectionpoint(z7l{down}...{left}z6l));
+pickup tiny.nib; bot y2=if serifs: -.25d else: 0 fi;
+filldraw stroke z1e--z0'e--z0e--z2e;  % stem
+pickup crisp.nib;
+pos8(hround(hair-stem_corr),0); pos7'(stem',0);
+z7'=z1; x8r=x7'r; top y8=h+oo;
+filldraw stroke z7'e--z8e;  % point
+if serifs: pickup tiny.nib;
+ pos9(vair,-90); x9=.5[x2,x10]; bot y9r=-d-o-1;
+ pos10(hair,-180); lft x10r=hround u; y10=-.75d+.5flare;
+ pos11(flare,-180); z11r=z10r;
+ bulb(9,10,11); filldraw stroke super_arc.e(2,9);  % tail
+else: pickup fine.nib; pos2'(stem,0); z2'=z2;
+ z2''r=z2'r; z2''=z2'; z2''l=(x2'l,0);
+ pos9(vair,-90); x9=4.5u; bot y9r=-d-o-1;
+ pos10(.5[vair,flare],-90); lft x10=hround 1.25u;
+ y10r=good.y -5/6d; y10l:=good.y y10l;
+ filldraw stroke z2'e..z2''e&super_arc.e(2'',9)
+  & term.e(9,10,left,.9,4); fi  % tail
+% accent points
+pairequate(tca,z4);  %top center accentpoint
+pairequate(lca,z9);  %low center accentpoint
+pairequate(tra,z8); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7,8,9,10,11); endchar;
+
+% cmchar "The letter h";
+newchar(h,10u#,asc_height#,0);
+italcorr .5[bar_height#,x_height#]*slant-serif_fit#+.5stem#-2u#;
+adjust_fit(serif_fit#+stem_shift#,serif_fit#-stem_shift#);
+pickup tiny.nib; pos1(stem,0); pos2(stem,0);
+pos1'(stem',0); pos2'(stem',0); pos3(stem,0);
+lft x1l=hround(2.5u-.5stem); x1l=x1'l=x2l=x2'l; x3=w-x1;
+top y1=h; bot y2=0; y1=y1'; y2=y2';
+filldraw stroke z1'e--z2'e;  % left stem
+h_stroke(2,a,3,4);  % arch and right stem
+if serifs: sloped_serif.l(1',2',b,1/3,jut,serif_drop); % upper left serif
+ numeric inner_jut; pickup tiny.nib;
+ if rt x2r+jut+.5u+1<=lft x4l-jut: inner_jut=jut;
+ else: rt x2r+jut+.5u+1=lft x4l-inner_jut; fi
+ dish_serif(2,1,c,1/3,jut,d,1/3,jut); % lower left serif
+ dish_serif(4,3,e,1/3,inner_jut,f,1/3,jut); fi % lower right serif
+% accent points
+pairassign(tca,.3[x.a1,x3],y.a1);  %top center accentpoint
+pairassign(lca,.5[x2,x4],y2);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,z4); %low right accentpoint
+penlabels(1,2,3,4); endchar;
+
+% cmchar "The letter i";
+numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#);
+newchar(i,5u#,min(asc_height#,10/7x_height#+.5dot_diam#),0);
+define_whole_blacker_pixels(dot_diam);
+italcorr h#*slant-serif_fit# + .5dot_diam# -2u#;
+adjust_fit(serif_fit#+stem_shift# if monospace:+.25u#fi,serif_fit#-stem_shift#);
+pickup tiny.nib; pos1(stem',0); pos2(stem',0);
+if odd(w-stem'): change_width; fi
+lft x1l=hround(.5w-.5stem'); x1=x2;
+top y1=x_height if serifs: +min(oo,serif_drop) fi; bot y2=0;
+filldraw stroke z1e--z2e;  % stem
+pos3(dot_diam,0); pos4(dot_diam,90);
+if serifs: x3r=max(x1r,x1+.5(dot_diam-tiny)-.2jut) else: x3=x1-.5 fi;
+top y4r=h+1;
+if bot y4l-top y1<slab: y4l:=min(y4r-eps,y1+tiny+slab); fi
+x3=x4; y3=.5[y4l,y4r]; if dotson: dot(3,4); fi % dot
+if serifs: sloped_serif.l(1,2,a,1/3,.95jut,serif_drop);  % upper serif
+ dish_serif(2,1,b,1/3,jut,c,1/3,.9jut); fi  % lower serif
+% accent points
+pairequate(tca,z1);  %top center accentpoint
+pairequate(lca,z2);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(1,2,3,4); endchar;
+
+% cmchar "The letter j";
+numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#);
+newchar(j,5.5u#,min(asc_height#,10/7x_height#+.5dot_diam#),desc_depth#);
+define_whole_blacker_pixels(dot_diam);
+italcorr h#*slant-serif_fit#+.5stem#-2u#;
+adjust_fit(serif_fit#+2stem_shift# if monospace:+\\.5u# fi,
+ serif_fit#-2stem_shift# if monospace:-.5u# fi);
+pickup tiny.nib; pos1(stem',0); pos2(stem',0);
+rt x1r=hround(.5w+.25u+.5stem'); x1=x2;
+top y1=x_height if serifs: +min(oo,serif_drop) fi; bot y2=-1/3d;
+filldraw stroke z1e--z2e;  % stem
+pos3(dot_diam,0); pos4(dot_diam,90);
+x3r=x1r; top y4r=h+1;
+if bot y4l-top y1<slab: y4l:=min(y4r-eps,y1+tiny+slab); fi
+x3=x4; y3=.5[y4l,y4r]; if dotson: dot(3,4); fi  % dot
+if serifs: sloped_serif.l(1,2,a,1/3,1.1jut,serif_drop);  % upper serif
+ pickup tiny.nib; pos5(vair,-90); pos6(hair,-180); pos7(flare,-180);
+ x5=.5[x2,x6r]; bot y5r=-d-oo; y6-.5flare=-.88d;
+ if monospace: lft x6r=0 else: z6r=z7r; rt x7l=floor .75u fi;
+ (x,y5r)=whatever[z5l,z2l]; x5r:=max(x,.5[x6r,x5]);
+ filldraw stroke z2e{down}...z5e{left};  bulb(5,6,7); % arc and bulb
+else: pickup fine.nib; pos2'(stem',0); z2'=z2;
+ pos6(.2[vair,stem'],-90); pos7(vair,-90);
+ lft x7r=hround -.75u; bot y7r=vround 5/6(-d-oo);
+ (x,y7l)=whatever[z7r,z3]; x7l:=x;
+ z5r=z2'r; (x2'l,y5l)=whatever[z7l,z5r]; x5l=x2'l; y5=y5r;
+ x6r=.5[x7r,x5r]; x6l:=.5[x7l,x5l]; bot y6r=-d-oo;
+ filldraw stroke z2'e..{down}z5e & super_arc.e(5,6)
+  & z6e{left}..z7e; fi  % arc and terminal
+% accent points
+pairequate(tca,z1);  %top center accentpoint
+pairequate(lca,z5);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(1,2,3,4,5,6,7); endchar;
+
+% cmchar "The letter k";
+newchar(k,9.5u#,asc_height#,0);
+italcorr x_height#*slant-.2u#;
+adjust_fit(serif_fit#,serif_fit#); pickup tiny.nib;
+numeric right_jut,stem[],alpha[];
+stem1=max(tiny.breadth,hround(fudged.stem-stem_corr));
+stem2=max(tiny.breadth,hround(fudged.stem-2stem_corr));
+stem3=max(tiny.breadth,hround(fudged.hair if hefty:-\\4stem_corr fi));
+stem4=max(tiny.breadth,hround(fudged.stem-3stem_corr));
+if serifs: right_jut=.6jut; else: right_jut=.4tiny; fi
+pos1(stem1,0); pos2(stem2,0); top y1=h; bot y2=0;
+lft x1l=lft x2l=hround(2.5u-.5stem1);
+top y3=x_height; rt x3r=hround(r-letter_fit-.7u-right_jut)+eps;
+bot y6=0; rt x6r=hround(r-letter_fit-.3u-right_jut)+eps;
+x4=x11=x1; y4=.7bar_height; y11=y3;
+alpha1=diag_ratio(1,.5(stem3-tiny),y3-y4,x3r-x4);
+alpha2=diag_ratio(1,.5(stem4-tiny),y11-y6,x6r-x1);
+penpos3(alpha1*(stem3-tiny),0); penpos4(whatever,-90);
+z5=.5[z5l,z5r]; penpos6(alpha2*(stem4-tiny),0);
+forsuffixes $=l,r: y3'$=x_height; y6'$=0; z4$=z3'$+whatever*(z3-z4);
+ z5$=z6'$+whatever*(z11-z6)=whatever[z3,z4]; endfor
+z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4);
+% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\]
+z6'r=z6r+penoffset z11-z6 of currentpen+whatever*(z11-z6);
+z6'l=z6l+penoffset z6-z11 of currentpen+whatever*(z11-z6);
+fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle;  % upper diagonal
+fill z5l--diag_end(5l,6'l,.5,1,6'r,5r)--z5r--cycle;  % lower diagonal
+pos0(stem1,0); pos0'(stem2,0); y0=y0'; x0=x1; x0'=x2;
+rt z0r=whatever[z3,z4]; filldraw stroke z1e..z0e--z0'e..z2e; % stem
+if serifs: numeric inner_jut;
+ if rt x2r+jut+.5u+1<=lft x6l-jut: inner_jut=jut;
+ else: rt x2r+inner_jut+.5u+1=lft x6l-inner_jut; fi
+ sloped_serif.l(1,0,a,1/3,jut,serif_drop); % upper stem serif
+ dish_serif(2,0',b,1/3,jut,c,1/3,inner_jut);  % lower stem serif
+ dish_serif(3,4,d,2/3,1.4jut,e,1/2,right_jut)(dark); % upper diagonal serif
+ dish_serif(6,5,f,1/2,inner_jut,g,1/3,right_jut)(dark);fi % lower diagonal serif
+% accent points
+pairassign(tca,.5[x5,x3],y3);  %top center accentpoint
+pairassign(lca,.5[x2,x6],y2);  %low center accentpoint
+pairequate(tra,z3); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,z6); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,11); endchar;
+
+% cmchar "The letter l";
+newchar(l,5u#,asc_height#,0); l_width#:=5u#+2serif_fit#;
+italcorr asc_height#*slant-serif_fit#+.5stem#-2u#;
+adjust_fit(serif_fit#+stem_shift#,serif_fit#-stem_shift#);
+pickup tiny.nib; pos1(stem',0); pos2(stem',0);
+if odd(w-stem'): change_width; fi
+lft x1l=hround(.5w-.5stem'); x1=x2; top y1=h; bot y2=0;
+filldraw stroke z1e--z2e;  % stem
+if serifs: sloped_serif.l(1,2,a,1/3,jut,serif_drop);  % upper serif
+ dish_serif(2,1,b,1/3,jut,c,1/3,jut); fi  % lower serif
+% accent points
+pairequate(lca,z2);  %low center accentpoint
+pairassign(tra,x1+min(stem+.25dot_size+.5jut,2dot_size),y1-slab-.5dot_size); %top right accentpoint
+if unknown gltl.l: pairequate(tca,z1);  %top center accentpoint
+else:
+ if cp.l=gltl.l: pairequate(tca,tra);
+ else: pairequate(tca,z1);  %top center accentpoint
+ fi
+fi
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(1,2); endchar;
+
+% cmchar "The letter m";
+newchar(m,15u#,x_height#,0);
+italcorr .5[bar_height#,x_height#]*slant-serif_fit#+.5stem#-2u#;
+adjust_fit(serif_fit#+stem_shift#,serif_fit#-stem_shift#);
+numeric shaved_stem; shaved_stem=hround(mfudged.stem-2stem_corr);
+pickup tiny.nib; pos1(mfudged.stem,0); pos2(mfudged.stem,0);
+pos1'(shaved_stem,0); pos2'(shaved_stem,0);
+pos3(mfudged.stem,0); pos5(mfudged.stem,0);
+lft x1l=hround(2.5u-.5stem); x1l=x1'l=x2l=x2'l;
+lft x3l=hround(.5w-.5stem); x5-x3=x3-x1;
+if not monospace: r:=hround(x5+x1)-l; fi  % change width for better fit
+top y1=h+min(oo,serif_drop); bot y2=0; y1=y1'; y2=y2';
+filldraw stroke z1'e--z2'e;  % left stem
+h_stroke(2,a,3,4);  % left arch and middle stem
+h_stroke(4,b,5,6);  % right arch and right stem
+if serifs: sloped_serif.l(1',2',c,1/3,jut,serif_drop); % upper left serif
+ numeric inner_jut; pickup tiny.nib;
+ if rt x2r+jut+.5u+1<=lft x4l-jut: inner_jut=jut;
+ else: rt x2r+jut+.5u+1=lft x4l-inner_jut; fi
+ dish_serif(2,1,d,1/3,jut,e,1/3,jut); % lower left serif
+ dish_serif(4,3,f,1/3,inner_jut,g,1/3,jut); % lower middle serif
+ dish_serif(6,5,h,1/3,inner_jut,i,1/3,jut); fi % lower right serif
+% accent points
+pairassign(tca,x4,y1);  %top center accentpoint
+pairequate(lca,z4);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,z6); %low right accentpoint
+penlabels(1,2,3,4,5,6); endchar;
+
+% cmchar "The letter n";
+newchar(n,10u#,x_height#,0);
+italcorr .5[bar_height#,x_height#]*slant-serif_fit#+.5stem#-2u#;
+adjust_fit(serif_fit#+stem_shift#,serif_fit#-stem_shift#);
+pickup tiny.nib; pos1(stem,0); pos2(stem,0);
+numeric shaved_stem; shaved_stem=hround(stem-2stem_corr);
+pos1'(shaved_stem,0); pos2'(shaved_stem,0); pos3(stem,0);
+lft x1l=hround(2.5u-.5stem); x1l=x1'l=x2l=x2'l; x3=w-x1;
+top y1=h+min(oo,serif_drop); bot y2=0; y1=y1'; y2=y2';
+filldraw stroke z1'e--z2'e;  % left stem
+h_stroke(2,a,3,4);  % arch and right stem
+if serifs: sloped_serif.l(1',2',b,1/3,jut,serif_drop); % upper left serif
+ numeric inner_jut; pickup tiny.nib;
+ if rt x2r+jut+.5u+1<=lft x4l-jut: inner_jut=jut;
+ else: rt x2r+jut+.5u+1=lft x4l-inner_jut; fi
+ dish_serif(2,1,c,1/3,jut,d,1/3,jut); % lower left serif
+ dish_serif(4,3,e,1/3,inner_jut,f,1/3,jut); fi % lower right serif
+% accent points
+pairassign(tca,.5[x1,x3],y1);  %top center accentpoint
+%pairequate(tca,z.a1);  %top center accentpoint
+pairassign(lca,.5[x2,x4],y2);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,z4); %low right accentpoint
+penlabels(1,2,3,4); endchar;
+
+% cmchar "The letter o";
+newchar(o,9u#,x_height#,0);
+italcorr .7x_height#*slant;
+adjust_fit(if monospace: .5u#,.5u# else: 0,0 fi);
+penpos1(vair,90); penpos3(vair',-90);
+penpos2(curve,180); penpos4(curve,0);
+x2r=hround max(.5u,1.25u-.5curve);
+x4r=w-x2r; x1=x3=.5w; y1r=h+vround 1.5oo; y3r=-oo;
+y2=y4=.5h-vair_corr; y2l:=y4l:=.52h;
+penstroke pulled_arc.e(1,2) & pulled_arc.e(2,3)
+ & pulled_arc.e(3,4) & pulled_arc.e(4,1) & cycle;  % bowl
+% accent points
+pairequate(tca,z1);  %top center accentpoint
+pairequate(lca,z3);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(1,2,3,4); endchar;
+
+% cmchar "The letter p";
+newchar(p,10u#+serif_fit#,x_height#,desc_depth#);
+italcorr .5x_height#*slant+min(.5curve#-.85u#,-.1u#);
+adjust_fit(serif_fit#,0);
+pickup tiny.nib; pos1(stem',0); pos2(stem,0);
+pos0'(stem',0); pos0(stem,0); z0l=z0'l; x0'=x1; x0=x2;
+lft x1l=hround(2.5u-.5stem'); top y1=h if serifs: +min(oo,serif_drop) fi;
+numeric edge; edge=rt x2r;
+pickup fine.nib; pos3(if hefty:thin_join else: hair fi,180);
+pos4(vair',90); pos5(curve,0); pos6(vair,-90); penpos7(x3l-x3r,-180);
+rt x3l=max(rt x3l-(lft x3r-tiny.lft x2l), 1/3[rt x2,edge]);
+y3=1/8[bar_height,x_height];
+x4l=w-.5(w-serif_fit)+.5u; top y4r=x_height+oo;
+rt x5r=hround min(w-1.35u+.5curve,w-.6u); y5=.5x_height;
+x6l=x4l-.2u; bot y6r=-oo;
+x7=x3; y7=min(y3,y6+y4-y3+.6vair);
+(x,y4r)=whatever[z3l,z4l]; x4r:=min(x,.5[x5r,x4]);
+(x',y6r)=whatever[z7l,z6l]; x6r:=min(x',.5[x5r,x6]);
+filldraw stroke z3e{up}...{right}z4e&super_arc.e(4,5)
+ &super_arc.e(5,6)&z6e{left}...{up}z7e;  % bowl
+y0=ypart(((edge,h)--(edge,0))intersectionpoint(z3l{up}...{right}z4l));
+pickup tiny.nib; bot y2=-d;
+filldraw stroke z1e--z0'e--z0e--z2e;  % stem
+pickup crisp.nib; pos8(hair,0); pos7'(stem,0);
+z7'=z2; x8l=x7'l; bot y8=0;
+filldraw stroke z7'e--z8e;  % point
+if serifs: sloped_serif.l(1,0',a,1/3,jut,serif_drop);  % upper serif
+ dish_serif(2,0,b,1/3,jut,c,1/3,jut); fi  % lower serif
+% accent points
+pairequate(tca,z4);  %top center accentpoint
+pairequate(lca,z2);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7,8); endchar;
+
+% cmchar "The letter q";
+newchar(q,10u#+serif_fit#,x_height#,desc_depth#);
+italcorr x_height#*slant-serif_fit#+.5stem#-2u# if serifs:+.5u# fi;
+adjust_fit(0,serif_fit# if serifs: -.5u# fi);
+pickup tiny.nib; pos1(stem',0); pos2(stem,0);
+pos0'(stem',0); pos0(stem,0); z0r=z0'r; x0'=x1; x0=x2;
+rt x1r=hround(w-2.5u+.5stem');
+numeric edge; edge=lft x2l;
+pickup fine.nib; pos3(if hefty:thin_join else: hair fi,0);
+pos4(vair',90); pos5(curve,180); pos6(vair,270); penpos7(x3r-x3l,360);
+lft x3l=min(lft x3l-(rt x3r-tiny.rt x2r),2/3[lft x2,edge]); y3=bar_height;
+x4l=.5(w-serif_fit)-.3u; top y4r=x_height+oo;
+lft x5r=hround max(1.35u-.5curve,.6u); y5=.5x_height;
+x6l=x4l-.2u; bot y6r=-oo; y7=min(y3,y6+y4-y3+.6vair);
+lft x7l=min(lft x7l-(rt x7r-tiny.rt x2r),1/3[lft x2,edge]);
+(x,y4r)=whatever[z3l,z4l]; x4r:=max(x,.5[x5r,x4]);
+(x',y6r)=whatever[z7l,z6l]; x6r:=max(x',.5[x5r,x6]);
+filldraw stroke z3e{up}...{left}z4e&super_arc.e(4,5)
+ &super_arc.e(5,6)&z6e{right}...{up}z7e;  % bowl
+y1=ypart(((edge,h)--(edge,0))intersectionpoint(z3l{up}...{left}z4l));
+y0=ypart(((edge,h)--(edge,0))intersectionpoint(z6l{right}...{up}z7l));
+pickup tiny.nib; bot y2=-d;
+filldraw stroke z1e--z0'e--z0e--z2e;  % stem
+pickup crisp.nib;
+pos8(hround(hair-stem_corr),0); pos7'(stem',0);
+z7'=z1; x8r=x7'r; top y8=h+oo;
+filldraw stroke z7'e--z8e;  % point
+if serifs: dish_serif(2,0,b,1/3,jut,c,1/3,jut); fi  % lower serif
+% accent points
+pairequate(tca,z4);  %top center accentpoint
+pairequate(lca,z2);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7,8); endchar;
+
+% cmchar "The letter r";
+numeric r_flare#; r_flare#=.75[if serifs: stem# else: vair# fi,flare#];
+define_whole_blacker_pixels(r_flare);
+newchar(r,if serifs:max(7u#,5.5u#+r_flare#) else:6.5u# fi,x_height#,0);
+italcorr x_height#*slant if not serifs: +.25u# fi;
+adjust_fit(serif_fit#,0);
+pickup fine.nib; top y4r=h+oo;
+if serifs: pos4(vair,90); pos5(hair,0);
+ x4=w-max(1.75u,.25u+r_flare);
+ rt x5r=hround(w-.5u+.5); y5+.5r_flare=.9[bar_height,h]+oo;
+ pos6(r_flare,0); bulb(4,5,6);  % bulb
+else: pos4(r_flare,90); rt x4=hround(w-.25u); fi
+pos3(thin_join,180); rt x3l=hround(2.5u-.5stem')+stem'; top y3=bar_height;
+filldraw stroke z3e{up}...{right}z4e;  % arc
+pickup tiny.nib; pos0(stem',0); pos2(stem',0);
+pos1(hround(stem-3stem_corr),0); top y1=h+min(oo,serif_drop);
+pos0'(hround(stem-3stem_corr),0); y0=y0'=y3; x1l=x0l=x0'l=x2l;
+lft x1l=hround(2.5u-.5stem'); bot y2=0;
+filldraw stroke z1e--z0'e--z0e--z2e;  % stem
+if serifs: sloped_serif.l(1,0',a,1/3,jut,serif_drop);  % upper serif
+ dish_serif(2,0,b,1/3,jut,c,1/3,1.25jut); fi  % lower serif
+% accent points
+if serifs: pairassign(tca,0.5[x1,x6],y1);  %top center accentpoint
+else: pairassign(tca,0.625[x3,x4],y1);  %top center accentpoint
+fi
+if unknown ubar.r: pairequate(lca,z2);
+else:
+ if cp.r=ubar.r:   pairassign(lca,.5w,0);  %low center accentpoint
+ else:
+   pairequate(lca,z2);  %low center accentpoint
+ fi
+fi
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(1,2,3,4,5,6); endchar;
+
+% cmchar "The letter s";
+newchar(s,7.1u#,x_height#,0);
+italcorr x_height#*slant-if serifs:.55u# else:.3u# fi;
+adjust_fit(if monospace: .5u#,.4u# else: 0,if serifs:0 else:-.2u# fi fi);
+numeric theta; theta=90-angle(40u,h); slope:=-h/40u;  % angle at middle
+numeric s_slab; s_slab=if serifs:vair else:Vround .1[vair,stem] fi;
+numeric ess'; ess'=max(fine.breadth,ess);
+pickup fine.nib; pos2(max(fine.breadth,s_slab-vround vair_corr),-100);
+pos0(ess',theta); pos7(s_slab,-90); x2l=x0=x7=.5w;
+top y2l=h+vround 1.5oo; bot y7r=-oo;
+y0-.5ess'=y7l+if serifs:.54 else: .52 fi\\(y2r-y7l-ess');
+lft x3l=hround .6u; rt x6r=hround(w-.6u);
+x3r-x3l=x6r-x6l=hround .5[s_slab,ess']-fine;
+ellipse_set(2l,3l,4l,0l); ellipse_set(2r,3r,4r,0r); y3=y3r;
+ellipse_set(7l,6l,5l,0l); ellipse_set(7r,6r,5r,0r); y6=y6r;
+interim superness:=more_super;
+filldraw stroke super_arc.e(2,3) & z3e{down}
+ ..z4e---z5e..z6e{down} & super_arc.e(6,7);  % main stroke
+if serifs: pos1(hair,180); pos8(hair,180);
+ rt x1l=hround(w-1.05u); lft x8r=hround .6u;
+ bot y1=min(bot y2r,vround 1/5[top y5r,h]);
+ top y8=max(top y7l,vround 5/6 bot y4l);
+ filldraw stroke z1e{up}....{left}z2e;  % upper arc
+ filldraw stroke z7e{left}....{x8-x7,5(y8-y7)}z8e;  % lower arc
+ path upper_arc, lower_arc;
+ upper_arc=z1{up}....{left}z2; lower_arc=z7{left}....{x8-x7,5(y8-y7)}z8;
+ pos10(.3[fine.breadth,cap_hair],0); pos9(.3[fine.breadth,cap_hair],0);
+ x10r=x1l; top y10=top y2l; x9l=x8r; bot y9=bot y7r;
+ x1l-x1'=x8'-x8r=1.6cap_curve-fine; y1'=y1; y8'=y8;
+ numeric t; t=xpart(upper_arc intersectiontimes(z10l--z1'));
+ filldraw z1l--z10r--z10l--subpath(t,0) of upper_arc--cycle;  % upper barb
+ t:=xpart(lower_arc intersectiontimes(z9r--z8'));
+ filldraw z8r--z9l--z9r--subpath(t,1) of lower_arc--cycle;  % lower barb
+else: pos1(4/7[s_slab,flare],-100); pos8(flare,-100);
+ x1l=good.x(x1l+w-u-rt x1); lft x8r=hround .5u;
+ top y1l=vround(.93h+1.5oo); bot y8r=vround .1h-oo;
+ filldraw stroke term.e(2,1,right,.9,4);  % upper arc and terminal
+ filldraw stroke term.e(7,8,left,1,4); fi  % lower arc and terminal
+% accent points
+pairequate(tca,z2);  %top center accentpoint
+
+pairequate(lca,z7);  %low center accentpoint
+if unknown udot.s:
+ pairequate(lca,z7);  %low center accentpoint
+else:
+ if cp.s=udot.s:
+   pairassign(lca,x7-.25dot_size,0);  %low center accentpoint
+ else:
+   pairequate(lca,z7);  %low center accentpoint
+ fi
+fi
+
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(0,1,1',2,3,4,5,6,7,8,8',9,10); endchar;
+
+% cmchar "The letter t";
+newchar(t,6u#+max(u#,.5stem#),
+ min(asc_height#,if hefty:9/7 else:10/7 fi\\ x_height#),0);
+italcorr x_height#*slant if serifs: -.9u# else: -.4u# fi;
+adjust_fit(0,if serifs: 0 else: -.5u# fi);
+numeric shaved_stem; shaved_stem=hround(stem if hefty:-\\2stem_corr fi);
+pickup fine.nib; pos2(shaved_stem,180);pos3(shaved_stem,180);
+lft x2r=lft x3r=hround(2.5u-.5shaved_stem);
+y2=y8; y3=max(.5bar_height,2vair);
+pickup crisp.nib; pos8(bar,90);
+rt x8=hround(w-1.3u); top y8r=x_height; lft x7=hround 1/3u; y7l=y8l;
+if hefty: pos7(bar,90);
+ filldraw stroke z7e--z8e;  % crossbar
+ pickup tiny.nib; pos1(hround(shaved_stem-stem_corr),0);
+ rt x1r=fine.rt x2l; top y1=h;
+ penpos2'(x1r-x1l,0); x2'=x1; y2'=y2;
+ filldraw stroke z1e--z2'e;  % upper terminal
+else: pos7(vair,90); pos1(hair,0);
+ rt x1r=fine.rt x2l; top y1=h;
+ filldraw z1l{down}...{left}z7r--z7l--z8l
+  --z8r--(x1r,y8r)--z1r--cycle; fi  % upper terminal and crossbar
+pickup fine.nib; interim superness:=more_super;
+pos4(vair',-90); bot y4r=-oo; rt x5r=hround(w-u);
+if serifs: pos5(hair,0); y5=y3; x4l=.5[x3l,x5l];
+ (x,y4r)=whatever[z4l,z5l]; x4r:=max(x,.5[x3r,x4]);
+ filldraw stroke z2e..super_arc.e(3,4)...{up}z5e;  % stem and hook
+ pickup crisp.nib; pos6(hair,0); pos5'(hair,0);
+ x6=x5=x5'; top y6=max(vround .75bar_height,top y5); y5=y5';
+ filldraw stroke z5'e--z6e;  % terminal
+else: pos5(vair,-75); top y5l=vround .2[top y4l,bar_height];
+ x5l:=good.x x5l; x4l=1/3[x3l,x5l]; x4r:=1/3[x3r,x5r]; y3l:=y3l+.2vair;
+ filldraw stroke z2e..super_arc.e(3,4);  % stem and hook
+ path p; p=stroke z4e{right}..tension .9 and atleast 1..z5e;  % terminal
+ if (xpart(z5l-precontrol 1 of p)<0) or (xpart(z5r-postcontrol 2 of p)<0):
+  filldraw stroke z4e{right}...{up}z5e;
+ else: filldraw p; fi fi;
+% accent points
+if unknown ubar.t: 
+  if unknown udot.t:
+   pairequate(lca,z4);  %low center accentpoint
+  else:
+   if cp.t=udot.t:
+     pairassign(lca,x1r,0);  %low center accentpoint
+   else:
+     pairequate(lca,z4);  %low center accentpoint
+   fi
+  fi
+else:
+ if cp.t=ubar.t:
+   pairassign(lca,x1,0);  %low center accentpoint
+ else:
+  if unknown udot.t:
+   pairequate(lca,z4);  %low center accentpoint
+  else:
+   if cp.t=udot.t:
+     pairassign(lca,x1r,0);  %low center accentpoint
+   else:
+     pairequate(lca,z4);  %low center accentpoint
+   fi
+  fi
+ fi
+fi
+pairequate(tra,z8); %top right accentpoint
+if unknown gltl.t: pairequate(tca,z1);  %top center accentpoint
+else:
+ if cp.t=gltl.t: pairequate(tca,tra);
+ else: pairequate(tca,z1);  %top center accentpoint
+ fi
+fi
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(1,2,3,4,5,6,7,8); endchar;
+
+% cmchar "The letter u";
+newchar(u,10u#,x_height#,0);
+italcorr x_height#*slant-serif_fit#+.5stem#-2u#;
+adjust_fit(serif_fit#+stem_shift#,serif_fit#-stem_shift#);
+numeric light_vair; light_vair=vair if hefty: -vround 2vair_corr fi;
+if light_vair<fine.breadth: light_vair:=fine.breadth; fi
+pickup tiny.nib; pos1(stem,0); pos2(stem,0);
+pos3(stem,0); pos4(stem',0);
+lft x1l=hround(2.5u-.5stem); x1=x2; x3=w-x1; x3r=x4r;
+if serifs: top y1=h+min(oo,serif_drop); bot y4=-min(oo,serif_drop);
+else: top y1=h; bot y4=0; fi
+pos0(stem,0); pos0'(stem',0); x0=x3; x0'=x4; y0=y0';
+penpos2'(stem-fine,-180); z2'=z2; y3=y1; y2=.5bar_height;
+penpos5(max(eps,light_vair-fine),-90); penpos6(thin_join-fine,0);
+y6=y0=2/3bar_height;
+filldraw stroke z1e--z2e;  % left stem
+filldraw stroke z3e..z0e--z0'e..z4e;  % right stem
+pickup fine.nib; bot y5r=-oo; x5l=.5w-.25u; lft x6l=tiny.lft x0l;
+(x,y5r)=whatever[z5l,z6l]; x5r:=max(x,.5[x5,x2'r]);
+filldraw stroke {{interim superness:=hein_super;
+  pulled_arc.e(2',5)}} & z5e{right}...{up}z6e;  % arc
+if serifs: sloped_serif.l(1,2,a,1/3,jut,serif_drop); % upper left serif
+ sloped_serif.l(3,0,b,1/3,jut,serif_drop); % upper right serif
+ sloped_serif.r(4,0',c,1/3,jut,min(oo,serif_drop)); fi % lower right serif
+% accent points
+pairassign(tca,.5[x1,x3],y1);  %top center accentpoint
+pairequate(lca,z5);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(1,2,3,4,5); labels(6); endchar;
+
+% cmchar "The letter v";
+newchar(v,if serifs: 9.5u# else:9u# fi,x_height#,0);
+italcorr x_height#*slant+.25u#;
+adjust_fit(serif_fit# if monospace:+\\.5u#,.5u#+ else:,fi\\ serif_fit#);
+numeric left_stem,right_stem,outer_jut,alpha;
+left_stem=fudged.stem-stem_corr;
+right_stem=min(fudged.hair if hefty:-2stem_corr fi,left_stem);
+outer_jut=.75jut; x1l=w-x4r=l+letter_fit+outer_jut+.25u; y1=y4=h;
+x2-x1=x4-x3; x2l+apex_corr=x3l; y2=y3=-apex_oo;
+alpha=diag_ratio(2,right_stem,y1-y2,x4r-x1l-apex_corr);
+penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0);
+penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0);
+z0=whatever[z1r,z2r]=whatever[z3l,z4l];
+if y0>notch_cut: y0:=notch_cut;
+  fill z0+.5right{up}...{z4-z3}diag_end(3l,4l,1,1,4r,3r)
+    --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1}
+    ...{down}z0+.5left--cycle; % left and right diagonals
+else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l)
+    --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals
+if serifs: numeric inner_jut; pickup tiny.nib;
+ prime_points_inside(1,2); prime_points_inside(4,3);
+ if rt x1'r+jut+.5u+1<=lft x4'l-jut: inner_jut=jut;
+ else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi
+ dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut);  % left serif
+ dish_serif(4',3,c,.6,inner_jut,d,1/2,outer_jut)(dark); fi  % right serif
+% accent points
+pairassign(tca,x0,y1);  %top center accentpoint
+if hefty pairassign(lca,x0,y2); else: pairequate(lca,z3); fi %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(0,1,2,3,4); endchar;
+
+% cmchar "The letter w";
+newchar(w,13u#,x_height#,0);
+italcorr x_height#*slant+.25u#;
+adjust_fit(serif_fit#,serif_fit#);
+numeric stem[],outer_jut,upper_notch,alpha,mid_corr;
+outer_jut=.7jut; x1l=w-x8r=l+letter_fit+outer_jut+.25u;
+stem1=fudged.stem-stem_corr;
+stem4=min(fudged.hair if hefty:-2stem_corr fi,stem1);
+stem2=if hefty:.1[vair,stem4] else: stem4 fi;
+stem3=max(stem2,stem1-3stem_corr);
+x2-x1=x4-x3=x6-x5=x8-x7; x2l+apex_corr=x3l; x6l+apex_corr=x7l;
+y1=y8=h; y2=y3=y6=y7=-apex_oo;
+y4=y5=if monospace: vround .6 fi\\ h; upper_notch=y4-notch_cut;
+mid_corr=if monospace or hefty:-.3apex_corr else: .5jut fi;
+alpha=diag_ratio(4,stem2-stem3+stem4,y1-y2,x8r-x1l+mid_corr-2apex_corr);
+penpos1(alpha*stem1,0); penpos2(alpha*stem1,0);
+penpos3(alpha*stem2,0); penpos4(alpha*stem2,0);
+penpos5(alpha*stem3,0); penpos6(alpha*stem3,0);
+penpos7(alpha*stem4,0); penpos8(alpha*stem4,0);
+x4l-x1l=floor(x4l-x1l+.5(x5r+mid_corr-x4r)); % |x5r| $\approx$ |x4r+mid_corr|
+z23=whatever[z1r,z2r]=whatever[z3l,z4l];
+z45=whatever[z3r,z4r]=whatever[z5l,z6l];
+z67=whatever[z5r,z6r]=whatever[z7l,z8l];
+fill diag_end(1l,2l,1,1,3r,4r){z4-z3}
+ ...if y45<upper_notch:(x45,upper_notch)+.5left{up}
+   --(x45,upper_notch)+.5right{down} else: z45&z45 fi
+ ...{z6-z5}diag_end(5l,6l,1,1,7r,8r)--diag_end(7r,8r,1,1,8l,7l){z7-z8}
+ ...if y67>notch_cut:(x67,notch_cut)+.5right{down}
+   --(x67,notch_cut)+.5left{up} else: z67&z67 fi
+ ...{z5-z6}special_diag_end(6,5,4,3){z3-z4}
+ ...if y23>notch_cut:(x23,notch_cut)+.5right{down}
+   --(x23,notch_cut)+.5left{up} else: z23&z23 fi
+ ...{z1-z2}diag_end(2r,1r,1,1,1l,2l)--cycle;  % diagonals
+if serifs: numeric inner_jut[]; pickup tiny.nib;
+ prime_points_inside(1,2); prime_points_inside(5,6); prime_points_inside(8,7);
+ if monospace: inner_jut1=inner_jut4=1.5jut;
+ elseif hefty: inner_jut1=inner_jut4=jut;
+ else: fill diag_end(6r,5r,1,1,5l,6l)--.5[z5l,z6l]
+   --.5[z5r,z6r]--cycle;% middle stem
+  inner_jut2=.7inner_jut1; inner_jut4=1.1inner_jut3;
+  if rt x1'r+jut+.5u+1<=lft x5'l-.7jut: inner_jut1=jut;
+  else: rt x1'r+inner_jut1+.5u+1=lft x5'l-inner_jut2; fi
+  if rt x5'r+jut+.5u+1<=lft x8'l-1.1jut: inner_jut3=jut;
+  else: rt x5'r+inner_jut3+.5u+1=lft x8'l-inner_jut4; fi
+  dish_serif(5',6,e,1/3,inner_jut2,f,1/2,inner_jut3); fi  % middle serif
+ dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut1);  % left serif
+ dish_serif(8',7,c,.6,inner_jut4,d,1/2,outer_jut)(dark); fi  % right serif
+% accent points
+pairassign(tca,x45,h);  %top center accentpoint
+pairassign(lca,x45,y2);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7,8,23,45,67); endchar;
+
+% cmchar "The letter x";
+newchar(x,if serifs:9.5u# else:9u# fi,x_height#,0);
+italcorr x_height#*slant-.05u#;
+adjust_fit(serif_fit# if monospace:+\\.5u#,.5u#+ else:,fi\\ serif_fit#);
+numeric stem[],outer_jut,xjut,alpha[];
+stem1=fudged.stem-4stem_corr; stem2=min(fudged.hair,stem1);
+outer_jut=.75jut; xjut= if serifs: (stem1-stem2)/4 else: 0 fi;
+x1l=l+letter_fit+.1u+outer_jut; x2r=r-letter_fit-.3u-outer_jut-xjut;
+x3l=l+letter_fit+outer_jut+xjut; x4r=r-letter_fit-outer_jut;
+y1=y2=h; y3=y4=0;
+alpha1=diag_ratio(1,stem1,h,x4r-x1l);
+alpha2=diag_ratio(1,stem2,h,x2r-x3l);
+penpos1(alpha1*stem1,0); penpos2(alpha2*stem2,0);
+penpos3(alpha2*stem2,0); penpos4(alpha1*stem1,0);
+if hefty: z0=whatever[z1,z4]=whatever[z2,z3];
+ x12=x34=x0; y13=y24=y0;
+ z12=whatever[z2l,z3l]; z13=whatever[z2l,z3l];
+ z24=whatever[z2r,z3r]; z34=whatever[z2r,z3r];
+ forsuffixes $=13,24,34: z$'=.2[z$,z0]; endfor
+ fill diag_end(12,1r,.5,1,1l,13')--z13'--diag_end(13',3l,1,.5,3r,34')--z34'
+  --diag_end(34',4l,.5,1,4r,24')--z24'
+  --diag_end(24',2r,1,.5,2l,12)--z12--cycle; % diagonals
+else: fill diag_end(4r,1r,.5,1,1l,4l)
+  --diag_end(1l,4l,.5,1,4r,1r)--cycle; % left diagonal
+ fill diag_end(2l,3l,.5,1,3r,2r)
+  --diag_end(3r,2r,.5,1,2l,3l)--cycle; fi  % right diagonal
+if serifs: numeric inner_jut[]; pickup tiny.nib;
+ prime_points_inside(1,4); prime_points_inside(2,3);
+ prime_points_inside(3,2); prime_points_inside(4,1);
+ if rt x1'r+jut+.5u+1<=lft x2'l-jut-xjut: inner_jut1=jut;
+ else: rt x1'r+inner_jut1+.5u+1=lft x2'l-inner_jut1-xjut; fi
+ if rt x3'r+jut+.5u+1<=lft x4'l-jut-xjut: inner_jut2=jut;
+ else: rt x3'r+inner_jut2+.5u+1=lft x4'l-inner_jut2-xjut; fi
+ dish_serif(1',4,a,1/3,outer_jut,b,2/3,inner_jut1);  % upper left serif
+ dish_serif(4',1,c,2/3,inner_jut2,d,1/3,outer_jut);  % lower right serif
+ dish_serif(2',3,e,2/3,inner_jut1+xjut,
+  f,1/2,outer_jut+xjut)(dark);  % upper right serif
+ dish_serif(3',2,g,1/2,outer_jut+xjut,
+  h,2/3,inner_jut2+xjut)(dark); fi  % lower left serif
+% accent points
+pairassign(tca,.5[x1,x2],y1);  %top center accentpoint
+pairassign(lca,.5[x3,x4],y3);  %low center accentpoint
+pairequate(tra,z2); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z3); %low left accentpoint
+pairequate(lra,z4); %low right accentpoint
+penlabels(0,1,2,3,4,12,13,24,34); endchar;
+
+% cmchar "The letter y";
+newchar(y,if serifs:9.5u# else:9u# fi,x_height#,desc_depth#);
+italcorr x_height#*slant+.25u#;
+adjust_fit(serif_fit# if monospace:+\\.5u#,.5u#+ else:,fi\\ serif_fit#);
+numeric left_stem,right_stem,bot_stem,bot_vair,outer_jut;
+left_stem=fudged.stem-stem_corr;
+right_stem=fudged.hair if hefty:-2stem_corr fi;
+bot_stem=fudged.hair if hefty:-8stem_corr fi;
+bot_vair=Vround(if serifs: vair else:.5[vair,bot_stem] fi);
+outer_jut=.75jut;
+x1l=w-x4r=l+letter_fit+outer_jut+.25u; y1=y4r=h; y2=y3=0; x2l=x3l;
+numeric alpha,alpha[]; x9=3u; y9=bot_vair-d-oo;
+alpha1=diag_ratio(2,bot_stem,y1-y3,x4r-x1l-apex_corr);
+alpha2=diag_ratio(1,bot_stem,y1-y9,x4r-x9);
+if alpha1<alpha2: x2l-x1l=x4r-x3r+apex_corr; alpha=alpha1;
+else: alpha=alpha2; z3l=whatever[z9,z4r-(alpha*bot_stem,0)]; fi
+penpos3(alpha*bot_stem,0); penpos4(alpha*right_stem,0);
+alpha3=(y1++(x2l-x1l))/y1;
+penpos1(alpha3*left_stem,0); penpos2(alpha3*left_stem,0);
+z0=whatever[z1r,z2r]=z4l+whatever*(z3r-z4r);
+if y0>notch_cut: y0:=notch_cut;
+  fill z0+.5right{up}...{z4r-z3r}diag_end(0,4l,1,1,4r,3r)
+    --z3r--z2l--diag_end(2l,1l,1,1,1r,2r){z2-z1}
+    ...{down}z0+.5left--cycle; % left and right diagonals
+else: fill z0--diag_end(0,4l,1,1,4r,3r)--z3r--z2l
+    --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals
+penpos5(alpha*bot_stem,0); z5r=whatever[z3r,z4r]; y5-.5vair=-.5d;
+if serifs: numeric light_bulb; light_bulb=hround 7/8[hair,flare]; clearpen;
+ penpos6(vair,-90); penpos7(hair,-180); penpos8(light_bulb,-180);
+ x6=2u; y6r=-d-oo; y8-.5light_bulb=-.85d; x8r=hround .35u;
+ fill stroke z3e---z5e...{left}z6e; bulb(6,7,8);  % arc and bulb
+ numeric inner_jut; pickup tiny.nib;
+ prime_points_inside(1,2); prime_points_inside(4,3);
+ if rt x1'r+jut+.5u+1<=lft x4'l-jut: inner_jut=jut;
+ else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi
+ dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut);  % left serif
+ dish_serif(4',3,c,.6,inner_jut,d,1/2,outer_jut)(dark);  % right serif
+else: penpos6(bot_vair,-90); x6=2.5u; y6r=-d-oo;
+ fill stroke z3e---z5e...{left}z6e;  % arc
+ pickup fine.nib; pos6'(bot_vair,-90); z6'=z6;
+ pos7(2/3[bot_vair,flare],-85);
+ lft x7l=hround u; bot y7r=vround-.96d-oo; y7l:=good.y y7l;
+ filldraw stroke term.e(6',7,left,1,4); fi % arc and terminal
+% accent points
+pairassign(tca,x0,y1);  %top center accentpoint
+pairassign(lca,x0,y6);  %low center accentpoint
+%pairequate(tra,z4); %top right accentpoint
+%
+%  this top-right, top-center, top-left business isn't terribly
+%       well worked out--- we really need some sort of conceptual
+%       / functional way of specifiying this
+%
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z6); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(0,1,2,3,4,5,6,7,8,9); endchar;
+
+% cmchar "The letter z";
+newchar(z,8u#,x_height#,0);
+italcorr x_height#*slant-.5serif_fit#-.3u#;
+adjust_fit(0,.5serif_fit#);
+numeric arm_thickness[],z_stem;
+if hefty: arm_thickness1=Vround(vair-vair_corr); arm_thickness2=vair;
+ z_stem=.6[vair,stem];
+else: arm_thickness1=vair; arm_thickness2=vair'; z_stem=.9[vair,stem]; fi
+pickup tiny.nib; rt x1r=rt x2r=hround(w-.8u); lft x3l=lft x4l=hround .5u;
+top y1=h; y2=min(y1,h-2/3arm_thickness1);
+bot y4=0; y3=max(y4,2/3arm_thickness2);
+numeric alpha; alpha=diag_ratio(1,z_stem-tiny,y2-y3,x2r-x3l-slant*(y2-y3));
+penpos1(alpha*(z_stem-tiny),0); penpos2(alpha*(z_stem-tiny),0);
+penpos3(alpha*(z_stem-tiny),0); penpos4(alpha*(z_stem-tiny),0);
+pair delta; delta=penoffset z3-z2 of currentpen;
+fill top lft z1l--z2l+delta---z3l+delta..lft z3l---lft z4l..bot z4l
+ ---bot rt z4r--z3r-delta---z2r-delta..rt z2r---rt z1r..top z1r
+ ---cycle;  % diagonal
+pickup crisp.nib; pos5(arm_thickness1,90); pos6(hair,180);
+top y5r=h; x5=x1; lft x6r=hround .75u; y6=good.y(y5l-beak/1.4)-eps;
+arm(5,6,a,beak_darkness,-.4beak_jut);  % upper arm and beak
+pos7(arm_thickness2,-90); pos8(hair,0);
+bot y7r=0; x7=x4; rt x8r=hround(w-.75u); y8=good.y(y7l+beak/1.2)+eps;
+arm(7,8,b,beak_darkness,.6beak_jut);  % lower arm and beak
+% accent points
+pairassign(tca,.5[x6,x1],y1);  %top center accentpoint
+pairassign(lca,.5[x3,x8],y3);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+penlabels(1,2,3,4,5,6,7,8); endchar;
+
+% end of file romanla.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/romanskt.mf b/Master/texmf-dist/fonts/source/public/wnri/romanskt.mf
new file mode 100644
index 00000000000..86d3d656637
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/romanskt.mf
@@ -0,0 +1,193 @@
+% 
+% Washington Romanized Indic Roman fonts driver file
+%
+% File       : romanskt.mf
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Roman and encoded according to
+% the Classical Sanskrit/Classical Sanskrit eXtended character set. 
+% See wnindic.map for more details.
+%
+
+%font_coding_scheme:="TeX Romanized Indic";
+font_coding_scheme:="Classical Sanskrit eXtended (CSX)";
+spanish_shriek=oct"074"; spanish_query=oct"076";
+
+numeric cdilorigin; cdilorigin=if monospace: -o else: 0 fi;
+
+mode_setup; font_setup;
+input product;
+if production:
+ input romanu;  % upper case (majuscules)
+ input romanl;  % lower case (minuscules)
+ input greeku;  % upper case Greek letters
+ input romand;  % numerals
+ input romanp;  % ampersand, question marks, currency sign
+ input romspl;  % lowercase specials (dotless \i, ligature \ae, etc.)
+ input romspu;  % uppercase specials (\AE, \OE, \O)
+ input punct;   % punctuation symbols common to roman and italic text
+ input accent;  % accents common to roman and italic text
+ if ligs>1: input romlig; fi   % letter ligatures
+ if ligs>0: input comlig; fi   % ligatures common with italic text
+ if ligs<=1: input romsub; fi  % substitutes for ligatures
+fi
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% begin massive departure from roman.mf parent file
+
+mono_charic#:=0;
+input haccbase;     % altered base
+
+% dot_sharp_values used by various other macros
+def dot_sharp_values =
+numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#);
+numeric dot_top#;
+dot_top#=min(asc_height#,10/7x_height#+.5dot_diam#);
+enddef;
+
+input wnindic.map;
+def cp = plain enddef;
+input gamma;
+input ligature;   % pickup the ae AE
+input sktmisc;    % eszett and rootsign
+input acctmax;
+
+% create characters with diacritics
+
+% overdot characters
+input odotacct; input romanua; input romanla;
+
+% underdot characters
+input udotacct; input romanua; input romanla;
+
+% hatted characters
+input hattacct; input romanla;
+
+% scandinavian ring accent characters
+input orngacct; input romanua; input romanla;
+
+% umlauted characters
+input umlaacct; input romanla; input romanua;
+
+% acute accented characters
+input acutacct; input romanla; input ligature;
+input facutact; input romanua; 
+
+% macron characters
+input macracct; input romanua; input romanla;
+
+% macron and acute accented characters
+input baraacct; input romanla; 
+input fbaraact; input romanua;
+
+% grave accented characters
+input gravacct; input romanla;
+
+% macron and grave accented characters
+input bargacct; input romanla; 
+input fbargact; input romanua;
+
+% cedilla characters
+input cdilacct; input romanla; input romanua;
+
+% tilde characters
+input tildacct; input romanla; input romanua;
+
+% breve accented characters
+input brevacct; input romanla;
+
+% macron breve accented characters
+input brbracct; input romanla;
+
+% underbar characters
+input ubaracct; input romanla; input romanua;
+
+% underdot acute accented characters
+input udacacct; input romanla;
+
+% underdot grave characters
+input udgracct; input romanla;
+
+% underdot macron characters
+input udmcacct; input romanla; input romanua;
+
+% underdot macron acute accented characters
+input mudaacct; input romanla;
+
+% hachek accented characters
+input hachacct; input romanla; 
+input fhachact; input romanua;
+
+% under double dot (under-umlaut) accented characters
+input uumlacct; input romanla;  input romanua;
+
+% candrabindu characters
+input bnduacct; input romanla; % input romanua;
+
+% flat breve/cup accented characters
+%input fbrevact; input romanla; input romanua;
+
+% under-breve accented characters
+input ubrvacct; input romanla; input romanua;
+
+% resume roman.mf original text  ( no kerning for extended chars yet)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+
+ligtable "!": "`" =: spanish_shriek;
+ligtable "?": "`" =: spanish_query;
+font_slant slant; font_x_height x_height#;
+if monospace: font_normal_space 9u#; % no stretching or shrinking
+ font_quad 18u#;
+ font_extra_space 9u#;
+else: font_normal_space 6u#+2letter_fit#;
+ font_normal_stretch 3u#; font_normal_shrink 2u#;
+ font_quad 18u#+4letter_fit#;
+ font_extra_space 2u#;
+ k#:=-.5u#; kk#:=-1.5u#; kkk#:=-2u#; % three degrees of kerning
+ ligtable "k": if serifs: "v": "a" kern -u#, fi\\"w": "e" kern
+k#,
+  "a" kern k#, "o" kern k#, "c" kern k#;
+ ligtable "P": "A" kern kk#,
+  "y": "o" kern k#, "e" kern k#, "a" kern k#, "." kern kk#, ","
+kern kk#;
+ ligtable "F": "V": "W": if serifs: "o" kern kk#, "e" kern kk#,
+"u" kern kk#,
+    "r" kern kk#, "a" kern kk#, "A" kern kkk#,
+   else: "o" kern k#, "e" kern k#, "u" kern k#,
+    "r" kern k#, "a" kern k#, "A" kern kk#, fi
+  "K": "X": "O" kern k#, "C" kern k#, "G" kern k#, "Q" kern k#;
+ ligtable "T": "y" kern if serifs: k# else: kk# fi,
+  "Y": "e" kern kk#, "o" kern kk#,
+   "r" kern kk#, "a" kern kk#, "A" kern kk#, "u" kern kk#;
+ ligtable "O": "D": "X" kern k#, "W" kern k#, "A" kern k#,
+   "V" kern k#, "Y" kern k#;
+ if serifs: ligtable "h": "m": "n":
+   "t" kern k#, "u" kern k#, "b" kern k#, "y" kern k#, "v" kern
+k#, "w" kern k#;
+  ligtable "c": "h" kern k#, "k" kern k#; fi
+ ligtable "o": "b": "p": "e" kern -k#, "o" kern -k#, "x" kern k#,
+   "d" kern -k#, "c" kern -k#, "q" kern -k#,
+  "a": if serifs: "v" kern k#, "j" kern u#, else: "r" kern k#, fi
+  "t": "y" kern k#,
+  "u": "w" kern k#;
+ ligtable "A": if serifs: "R": fi\\ "t" kern k#,
+  "C" kern k#, "O" kern k#, "G" kern k#, "U" kern k#, "Q" kern
+k#,
+  "L": "T" kern kk#, "Y" kern kk#, "V" kern kkk#, "W" kern kkk#;
+ ligtable "g": "j" kern -k#; % logjam
+ ligtable "I": "I" kern -k#; fi % Richard III
+ % there are ligature/kern programs for |"f"| in the {\tt romlig} file
+ % and for |"-"|, |"`"|, and |"'"| in the {\tt comlig} file
+bye.
+
+% end of file romanskt.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/romanua.mf b/Master/texmf-dist/fonts/source/public/wnri/romanua.mf
new file mode 100644
index 00000000000..056b0e30dd2
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/romanua.mf
@@ -0,0 +1,941 @@
+%
+% Washington Roman Indic uppercase base file
+%
+% based on ROMANU.MF (Computer Modern Roman uppercase base file)
+%
+% Modified by: Thomas Ridgeway <ridgeway@u.washington.edu>, June 19 1993
+% Updated: Anshuman Pandey <apandey@u.washington.edu>, Feb 18 1998
+%
+
+if unknown dotson: boolean dotson; dotson=true; fi
+
+% cmchar "The letter A";
+newchar(A,13u#,cap_height#,0);
+adjust_fit(cap_serif_fit#,cap_serif_fit#);
+numeric left_stem,right_stem,outer_jut,alpha;
+right_stem=cap_stem-stem_corr;
+left_stem=min(cap_hair if hefty: -3stem_corr fi,right_stem);
+outer_jut=.8cap_jut; x1l=w-x4r=l+letter_fit+outer_jut+.5u; y1=y4=0;
+x2-x1=x4-x3; x3r=x2r+apex_corr; y2=y3=h+apex_o+apex_oo;
+alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr);
+penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0);
+penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0);
+z0=whatever[z1r,z2r]=whatever[z3l,z4l];
+if y0<h-cap_notch_cut: y0:=h-cap_notch_cut;
+ fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r)
+  --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1}
+  ...{up}z0+.5left--cycle; % left and right diagonals
+else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l)
+  --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals
+penpos5(whatever,angle(z2-z1)); z5=whatever[z1,z2];
+penpos6(whatever,angle(z3-z4)); z6=whatever[z3,z4]; y6=y5;
+if hefty: y5r else: y5 fi =5/12y0;
+y5r-y5l=y6r-y6l=cap_band; penstroke z5e--z6e; % bar line
+if serifs: numeric inner_jut; pickup tiny.nib;
+ prime_points_inside(1,2); prime_points_inside(4,3);
+ if rt x1'r+cap_jut+.5u+1<=lft x4'l-cap_jut: inner_jut=cap_jut;
+ else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi
+ dish_serif(1',2,a,1/2,outer_jut,b,.6,inner_jut)(dark);  % left serif
+ dish_serif(4',3,c,1/2,inner_jut,d,1/3,outer_jut); fi  % right serif
+pairassign(tca,x2,cap_height);  %top center accentpoint-- lowered slightly
+if unknown ogon.A :pairassign(lca,.5[x1,x4],0);  %low center accentpoint
+else:
+  if cp.A = ogon.A: pairassign(lca,x4,y4+.5vair);  %low center accentpoint
+  else: pairassign(lca,.5[x1,x4],0);  %low center accentpoint
+  fi
+fi
+pairequate(tra,z4); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,z1); %low left accentpoint
+pairequate(lra,z4); %low right accentpoint
+penlabels(0,1,2,3,4,5,6); endchar;
+
+% cmchar "The letter B";
+newchar(B,12.5u#,cap_height#,0);
+italcorr .75cap_height#*slant-.5u#;
+adjust_fit(cap_serif_fit#,0);
+numeric left_stem,right_curve,middle_weight;
+left_stem=cap_stem-hround 2stem_corr; middle_weight=.6vair+.5;
+pickup tiny.nib; pos1(left_stem,0); pos2(left_stem,0);
+lft x1l=lft x2l=hround max(2u,3u-.5left_stem); top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+penpos3(cap_band,90); penpos4(cap_band,90);
+penpos6(middle_weight,-90); penpos7(middle_weight,-90);
+penpos8(middle_weight,90); penpos9(middle_weight,90);
+penpos5(right_curve-stem_corr,0); penpos10(right_curve,0);
+penpos11(cap_band,-90); penpos12(cap_band,-90);
+z3r=top z1; y4=y3; y5=.5[y4,y6]; y6=y7; y7l-y8l=vair;
+z12r=bot z2; y11=y12; y10=.5[y11,y9]; y8=y9; .5[y7l,y8l]=.52h;
+x4=x6; x9=x11=x4+.5u; x7=x8=x1; x9l:=x4+.25u;
+x5r=hround(w-1.5u); x10r=hround(w-u);
+if serifs: right_curve=cap_curve-stem_corr; x4=.5[x1,w-1.5u];
+else: right_curve=cap_curve-3stem_corr; x4=.5[x1,w-2.5u];
+ x4l:=x4l-.5u; x9l:=x9l-.5u; fi
+x6l:=x6l-.5u; x11l:=x11l-.5u;
+fill stroke z3e..super_arc.e(4,5) & super_arc.e(5,6)..z7e;  % upper lobe
+fill stroke z8e..super_arc.e(9,10) & super_arc.e(10,11)..z12e;  % lower lobe
+if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut);  % upper serif
+ nodish_serif(2,1,c,1/3,cap_jut,d,1/3,.5cap_jut); fi  % lower serif
+pairassign(tca,.5[x7,x5],cap_height);  %top center accentpoint
+pairassign(lca,.5[x7,x10],0);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,z11); %low right accentpoint
+math_fit(0,.5ic#); penlabels(1,2,3,4,5,6,7,8,9,10,11,12); endchar;
+
+% cmchar "The letter C";
+if serifs: 
+ newchar(C,13u#,cap_height#,0);
+ italcorr cap_height#*slant-.5u#;
+ adjust_fit(0,0);
+ pickup fine.nib; pos1(cap_hair,0); pos2(cap_band,90);
+ pos3(cap_curve,180); pos4(cap_band,270); pos5(hair,360);
+ rt x1r=rt x5r=hround(w-u); lft x3r=hround u; x2=x4=.55[x3,x1];
+ top y2r=h+o; bot y4r=-o; y3=.5[y2,y4];
+ bot y1=min(vround max(.6h,x_height-.5vair),bot y2l-eps);
+ y5=max(good.y .95(h-y1),y4l+eps);
+ (x2l',y2l)=whatever[z2r,z1l]; x2l:=min(x2l',x2l+.5u);
+ (x4l',y4l)=whatever[z4r,z5l]; x4l:=min(x4l',x4l+.5u);
+ filldraw stroke z1e{x2-x1,10(y2-y1)}
+  ...pulled_arc.e(2,3) & pulled_arc.e(3,4)...{up}z5e; % arc
+ pos6(.3[fine.breadth,cap_hair],0); x6r=x1r; top y6=h+o;
+ x1r-x1'=2cap_curve-fine; y1'=y1;
+ path upper_arc; upper_arc=z1{x2-x1,10(y2-y1)}..z2{left};
+ numeric t; t=xpart(upper_arc intersectiontimes (z6l--z1'));
+ filldraw z1r--z6r--z6l--subpath(t,0) of upper_arc--cycle; % barb
+ pairequate(tca,z2r);  %top center accentpoint
+ pairequate(lca,z4);  %low center accentpoint
+ pairequate(tra,tca); %top right accentpoint
+ pairequate(tla,tca); %top left accentpoint
+ pairequate(lla,lca); %low left accentpoint
+ pairequate(lra,lca); %low right accentpoint
+ math_fit(-.3cap_height#*slant-.5u#,.5ic#);
+ penlabels(1,1',2,3,4,5,6); endchar;
+else: 
+ newchar(C,11.5u#,cap_height#,0);
+ italcorr cap_height#*slant-.5u#;
+ adjust_fit(0,0);
+ pickup fine.nib; pos1(1.2flare,80); pos2(slab,90);
+ pos3(cap_curve,180); pos4(slab,270); pos5(flare,275);
+ rt x1r=hround(w-1.1u); x2=x4=.5w+1.25u;
+ lft x3r=hround max(u,2u-.5cap_curve); rt x5r=hround(w-.9u);
+ top y1r=vround .95h+o; top y2r=h+o; y3=.5h;
+ bot y4r=-o; bot y5r=vround .08h-o; y5l:=good.y y5l; x5l:=good.x x5l;
+ filldraw stroke rterm.e(2,1,right,.9,4) & super_arc.e(2,3)
+  & super_arc.e(3,4) & term.e(4,5,right,.8,4);  % arc and terminals
+ pairequate(tca,z2);  %top center accentpoint
+ pairequate(lca,z4);  %low center accentpoint
+ pairequate(tra,tca); %top right accentpoint
+ pairequate(tla,tca); %top left accentpoint
+ pairequate(lla,lca); %low left accentpoint
+ pairequate(lra,lca); %low right accentpoint
+ math_fit(-.3cap_height#*slant-.5u#,.5ic#);
+ penlabels(1,1',2,3,4,5,6); endchar; 
+fi
+
+% cmchar "The letter D";
+newchar(D,13.5u#,cap_height#,0);
+italcorr .7cap_height#*slant-.5u#;
+adjust_fit(cap_serif_fit#,0);
+pickup tiny.nib; pos1(cap_stem',0); pos2(cap_stem',0);
+lft x1l=lft x2l=hround max(2u,3u-.5cap_stem'); top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+penpos3(cap_band,90); penpos4(cap_band,90);
+penpos5(cap_curve-stem_corr,0);
+penpos6(cap_band,-90); penpos7(cap_band,-90);
+z3r=top z1; y4=y3; y5=.51[y4,y6]; y6=y7;
+z7r=bot z2; x4=x6=.5w+.25u; x5r=hround(w-u);
+x4l:=x6l:=x4-.25cap_curve;
+fill stroke z3e..pulled_arc.e(4,5) & pulled_arc.e(5,6)..z7e;  % lobe
+if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut);  % upper serif
+ nodish_serif(2,1,c,1/3,cap_jut,d,1/3,.5cap_jut); fi  % lower serif
+pairequate(tca,z4);  %top center accentpoint
+pairequate(lca,z6);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(0,ic#-.5u#); penlabels(1,2,3,4,5,6,7); endchar;
+
+% cmchar "The letter E";
+newchar(E,12u#-width_adj#,cap_height#,0);
+italcorr cap_height#*slant-beak_jut#-.5u#;
+adjust_fit(cap_serif_fit#,0);
+h:=vround(h-stem_corr);
+pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0);
+lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+pickup crisp.nib; pos3(slab,90); pos4(hair,0);
+top y3r=h; x3=x1; rt x4r=hround(w-u); y4=good.y(y3l-beak)-eps;
+arm(3,4,e,beak_darkness,beak_jut);  % upper arm and beak
+pos5(cap_bar,-90); pos6(hair,0);
+top y5l=vround(.52[y2,y1]+.5cap_bar); x5=x1;
+pos0(cap_bar,90); pos7(hair,0);
+z0=z5; x6=x7; y6-y5l=y0l-y7;
+if serifs: rt x6r=hround(w-4.4u+.5hair); y6=good.y(y5l+.6beak)+eps;
+ rt x9r=hround(w-.5u);
+else: rt x6r=hround(w-1.5u); y6=y5l+eps; rt x9r=hround(w-.75u); fi
+arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0);  % middle arm and serif
+pos8(slab if not serifs:+2stem_corr fi,-90); pos9(hair,0);
+bot y8r=0; x8=x2; y9=good.y(y8l+7/6beak)+eps;
+arm(8,9,h,beak_darkness,1.5beak_jut);  % lower arm and beak
+if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut);  % upper serif
+ nodish_serif(2,1,c,1/3,cap_jut,d,1/3,.5cap_jut); fi  % lower serif
+pairassign(tca,.5[x5,x6],cap_height);  %top center accentpoint
+pairassign(lca,.5[x8,x.h0],if monospace: .5vair else: 0 fi);  %low center accentpoint
+pairequate(tra,z.e0); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(0,.5ic#); penlabels(0,1,2,3,4,5,6,7,8,9); endchar;
+
+% cmchar "The letter F";
+newchar(F,11.5u#-width_adj#,cap_height#,0);
+italcorr cap_height#*slant-beak_jut#-.25u#;
+adjust_fit(cap_serif_fit#,0);
+h:=vround(h-stem_corr);
+pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0);
+lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+pickup crisp.nib; pos3(slab,90); pos4(hair,0);
+top y3r=h; x3=x1; rt x4r=hround(w-.75u); y4=good.y(y3l-beak)-eps;
+arm(3,4,e,beak_darkness,beak_jut);  % upper arm and beak
+pos5(cap_bar,-90); pos6(hair,0);
+top y5l=vround(.5[y2,y1]+.5cap_bar); x5=x1;
+pos0(cap_bar,90); pos7(hair,0);
+z0=z5; x6=x7; y6-y5l=y0l-y7;
+if serifs: rt x6r=hround(w-4u+.5hair); y6=good.y(y5l+.6beak)+eps;
+ rt x9r=hround(w-.5u);
+else: rt x6r=hround(w-1.5u); y6=y5l+eps; rt x9r=hround(w-.75u); fi
+arm(5,6,f,beak_darkness,0); arm(0,7,g,beak_darkness,0);  % middle arm and serif
+if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut);  % upper serif
+ dish_serif(2,1,c,1/3,cap_jut,d,1/3,1.25cap_jut); fi  % lower serif
+pairassign(tca,.5[x5,x6],cap_height);  %top center accentpoint
+pairequate(lca,z2);  %low center accentpoint
+pairequate(tra,z.e0); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7,8,9); endchar;
+
+% cmchar "The letter G";
+if serifs: 
+ newchar(G,14u#,cap_height#,0);
+ italcorr cap_height#*slant-1.5u#-.5cap_serif_fit#;
+ adjust_fit(0,.5cap_serif_fit#);
+ pickup tiny.nib; pos0(cap_stem,0); pos7(cap_stem,0);
+ rt x0r=hround(w-2u); y0=good.y(.1[bar_height,x_height]+1); x7=x0;
+ pickup fine.nib;
+ if hefty: bot y7=0; pos5(cap_stem,0); x5=x0; top y5=tiny.top y0;
+ else: pos5(cap_hair,0); pos8(cap_stem,0);
+  y7=.5bar_height; z5l=z8l; z8=z7; x9=x8r; bot y9=0;
+  filldraw z8l{down}..{4(x9-x8),y9-y8}z9--z8r--cycle; fi % spur
+ pos1(cap_hair,0); pos2(cap_band,90);
+ pos3(cap_curve,180); pos4(cap_band,270);
+ rt x1r=hround(w-2u); lft x3r=hround u; x2=x4=.55[x3,x1];
+ top y2r=h+o; bot y4r=-o; y3=.5[y2,y4];
+ bot y1=min(vround max(.6h,x_height-.5vair),bot y2l-eps);
+ (x2l',y2l)=whatever[z2r,z1l]; x2l:=min(x2l',x2l+.5u);
+ (x4l',y4l)=whatever[z4r,z5l]; x4l:=min(x4l',x4l+.5u);
+ filldraw stroke z1e{x2-x1,10(y2-y1)}
+  ...pulled_arc.e(2,3) & pulled_arc.e(3,4)...z5e{up}; % arc
+ pos6(.3[fine.breadth,cap_hair],0); x6r=x1r; top y6=h+o;
+ x1r-x1'=2cap_curve-fine; y1'=y1;
+ path upper_arc; upper_arc=z1{x2-x1,10(y2-y1)}..z2{left};
+ numeric t; t=xpart(upper_arc intersectiontimes (z6l--z1'));
+ filldraw z1r--z6r--z6l--subpath(t,0) of upper_arc--cycle; % barb
+ pickup tiny.nib; filldraw stroke z0e--z7e;  % stem
+ dish_serif(0,7,a,1/3,max(cap_jut,2.25u),b,1/3,1.25u);  % serif
+ math_fit(-.3cap_height#*slant-.5u#,ic#);
+ pairequate(tca,z2r);  %top center accentpoint
+ pairequate(lca,z4);  %low center accentpoint
+ pairequate(tra,tca); %top right accentpoint
+ pairequate(tla,tca); %top left accentpoint
+ pairequate(lla,lca); %low left accentpoint
+ pairequate(lra,lca); %low right accentpoint
+ penlabels(0,1,1',2,3,4,5,6,7,8,9); endchar;
+else: 
+ newchar(G,12u#,cap_height#,0);
+ italcorr cap_height#*slant-.5u#;
+ adjust_fit(0,0);
+ pickup fine.nib; pos1(1.2flare,80); pos2(slab,90);
+ pos3(cap_curve,180); pos4(slab,270); pos5(flare,270);
+ rt x1r=hround(w-1.35u); x2=x4=.5w+u;
+ lft x3r=hround max(u,2u-.5cap_curve); rt x5l=hround(w-1.2u);
+ top y1r=vround .93h+o; top y2r=h+o; y3=.5h;
+ bot y4r=-o; bot y5r=vround .07h-o;
+ filldraw stroke rterm.e(2,1,right,.9,4)&super_arc.e(2,3)
+  & super_arc.e(3,4) & term.e(4,5,right,1,4); % arc and terminals
+ pos0(stem,0); pos7(stem,0);
+ z7r=z5r; x0=x7; top y0=1+vround .35[bar_height,x_height];
+ filldraw stroke z0e--z7e;  % stem
+ pos8(cap_bar,90); pos9(cap_bar,90);
+ z0r=z9r; y8=y9; lft x8=hround x4;
+ filldraw stroke z8e--z9e;  % bar
+ math_fit(-.3cap_height#*slant-.5u#,.5ic#); 
+ pairequate(tca,z2);  %top center accentpoint
+ pairequate(lca,z4);  %low center accentpoint
+ pairequate(tra,tca); %top right accentpoint
+ pairequate(tla,tca); %top left accentpoint
+ pairequate(lla,lca); %low left accentpoint
+ pairequate(lra,lca); %low right accentpoint
+ penlabels(0,1,1',2,3,4,5,6,7,8,9); endchar;
+fi
+
+% cmchar "The letter H";
+newchar(H,13u#+width_adj#,cap_height#,0);
+italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#);
+adjust_fit(cap_serif_fit#,cap_serif_fit#);
+pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0);
+pos3(cap_stem,0); pos4(cap_stem,0);
+lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); x3=x4=w-x1;
+top y1=top y3=h; bot y2=bot y4=0;
+filldraw stroke z1e--z2e; % left stem
+filldraw stroke z3e--z4e; % right stem
+penpos5(cap_bar,90); penpos6(cap_bar,90);
+x5=x1; x6=x3; y5=y6=.52h;
+fill stroke z5e--z6e;  % bar
+if serifs: numeric inner_jut;
+ if rt x1r+cap_jut+.5u+1<=lft x3l-cap_jut: inner_jut=cap_jut;
+ else: rt x1r+inner_jut+.5u+1=lft x3l-inner_jut; fi
+ dish_serif(1,2,a,1/3,cap_jut,b,1/3,inner_jut);  % upper left serif
+ dish_serif(2,1,c,1/3,cap_jut,d,1/3,inner_jut); % lower left serif
+ dish_serif(3,4,e,1/3,inner_jut,f,1/3,cap_jut);  % upper left serif
+ dish_serif(4,3,g,1/3,inner_jut,h,1/3,cap_jut); fi  % lower left serif
+pairassign(tca,.5[x1,x3],cap_height);  %top center accentpoint
+pairassign(lca,.5[x2,x4],0);  %low center accentpoint
+pairequate(tra,z3); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,z4); %low right accentpoint
+math_fit(0,.5ic#); penlabels(1,2,3,4,5,6); endchar;
+
+% cmchar "The letter I";
+newchar(I,max(6u#,4u#+cap_stem#),cap_height#,0);
+italcorr cap_height#*slant-.25u#;
+adjust_fit(cap_serif_fit#,cap_serif_fit#);
+pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0);
+lft x1l=lft x2l=hround(.5w-.5cap_stem); top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+if serifs: dish_serif(1,2,a,1/3,1.05cap_jut,b,1/3,1.05cap_jut);  % upper serif
+ dish_serif(2,1,c,1/3,1.05cap_jut,d,1/3,1.05cap_jut);  fi % lower serif
+pairequate(tca,z1);  %top center accentpoint
+pairequate(lca,z2);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(0,.5ic#); penlabels(1,2); endchar;
+
+% cmchar "The letter J";
+newchar(J,9u#,cap_height#,0);
+italcorr cap_height#*slant-cap_serif_fit#
+ +.75cap_jut#-2.5u#+min(.5cap_stem#,u#);
+adjust_fit(0,cap_serif_fit#);
+pickup tiny.nib; pos1(cap_stem',0); pos2(cap_stem',0);
+top y1=h; rt x1r=hround(w-2u); x2=x1; y2=.21h;
+if serifs: pos3(vair,-90); pos4(cap_hair,-180);
+ pos5(flare+(cap_stem-stem),-180);
+ bot y3r=-o; x3=.5[x4,x2]; y5=1/6h; rt x5l=hround 2.75u; z5r=z4r;
+ filldraw stroke z1e--z2e&super_arc.e(2,3);  % stem and arc
+ dish_serif(1,2,a,1/3,1.3cap_jut,b,1/3,.75cap_jut);  % serif
+ bulb(3,4,5);  % bulb
+else: filldraw stroke z1e--z2e;  % stem
+ pickup fine.nib; pos3(cap_stem',0); z3=z2;
+ pos4(flare,angle(6.5u,-h)); pos5(1.1flare,-100);
+ bot y4r=-o; x4r=.5[x5r,x3r]; lft x5r=hround.75u; bot y5r=vround.06h-o;
+ filldraw stroke z3e{down}....term.e(4,5,left,1,4); fi % arc and terminal
+pairequate(tca,z1);  %top center accentpoint
+pairequate(lca,z3);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(0,.5ic#-.5u#); penlabels(1,2,3,4,5); endchar;
+
+% cmchar "The letter K";
+newchar(K,13.5u#,cap_height#,0);
+italcorr cap_height#*slant-.5u#;
+adjust_fit(cap_serif_fit#,cap_serif_fit#);
+numeric right_jut,stem[],alpha[];
+if serifs: right_jut=.6cap_jut;
+else: right_jut=.4tiny; fi
+pickup tiny.nib; pos1(fudged.cap_stem,0); pos2(fudged.cap_stem,0);
+lft x1l=lft x2l=hround max(2u,3u-.5fudged.cap_stem); top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+stem2=max(tiny.breadth,fudged.cap_stem-3stem_corr);
+stem1=max(tiny.breadth,fudged.hair if hefty:-3stem_corr fi);
+top y3=h; rt x3r=hround(r-letter_fit-u-right_jut);
+bot y6=0; rt x6r=hround(r-letter_fit-.75u-right_jut);
+x4=x1; y4=1/3h;
+alpha1=diag_ratio(1,.5(stem1-tiny),y3-y4,x3r-x4);
+penpos3(alpha1*(stem1-tiny),0); penpos4(whatever,-90);
+alpha2=diag_ratio(1,.5(stem2-tiny),y1-y6,x6r-x1);
+penpos6(alpha2*(stem2-tiny),0);
+forsuffixes $=l,r: y3'$=h; y6'$=0; z4$=z3'$+whatever*(z3-z4);
+ z5$=z6'$+whatever*(z1-z6)=whatever[z3,z4]; endfor
+z5=.5[z5l,z5r];
+z3'r=z3r+penoffset z3-z4 of currentpen+whatever*(z3-z4);
+% we have also |z3'l=z3l+penoffset z4-z3 of currentpen+whatever*(z3-z4)|;\]
+z6'r=z6r+penoffset z1-z6 of currentpen+whatever*(z1-z6);
+z6'l=z6l+penoffset z6-z1 of currentpen+whatever*(z1-z6);
+fill z4r--diag_end(4r,3'r,1,.5,3'l,4l)--z4l--cycle;  % upper diagonal
+fill z5l--diag_end(5l,6'l,.5,1,6'r,5r)--z5r--cycle;  % lower diagonal
+if serifs: numeric inner_jut;
+ if rt x2r+cap_jut+.5u+1<=lft x6l-cap_jut: inner_jut=cap_jut;
+ else: rt x2r+cap_jut+.5u+1=lft x6l-inner_jut; fi
+ dish_serif(1,2,a,1/3,cap_jut,b,1/3,cap_jut); % upper stem serif
+ dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut);  % lower stem serif
+ dish_serif(3,4,e,2/3,1.2cap_jut,f,1/2,right_jut)(dark); % upper diagonal serif
+ dish_serif(6,5,g,1/2,inner_jut,h,1/3,right_jut)(dark);fi % lower diagonal serif
+pairassign(tca,.5[x1,x3],cap_height);  %top center accentpoint
+pairassign(lca,.5[x2,x6],0);  %low center accentpoint
+pairequate(tra,z3); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,z6); %low right accentpoint
+math_fit(0,.5ic#); penlabels(1,2,3,4,5,6); endchar;
+
+% cmchar "The letter L";
+newchar(L,11u#-width_adj#,cap_height#,0);
+adjust_fit(cap_serif_fit#,0);
+pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0);
+lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+pickup crisp.nib; pos3(slab,-90); pos4(hair,0);
+bot y3r=0; x3=x2; y4=y3l+7/6beak+eps; rt x4r=hround(w-.75u);
+arm(3,4,e,1.2beak_darkness,beak_jut);  % lower arm and beak
+if serifs: dish_serif(1,2,a,1/3,cap_jut,b,1/3,1.25cap_jut);  % upper serif
+ nodish_serif(2,1,c,1/3,cap_jut,d,1/3,.5cap_jut); fi  % lower serif
+if unknown gltl.L: pairequate(tca,z1);  %top center accentpoint
+else:
+ if cp.L=gltl.L: pairassign(tca,x1+cap_stem+dot_size+.5cap_jut,.85h);  
+ else: pairequate(tca,z1);  %top center accentpoint
+ fi
+fi
+if serifs: pairassign(lca,x.e2,0);  %low center accentpoint
+else: pairassign(lca,.5x3+.5x4,0);  %low center accentpoint
+fi
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+if serifs: pairequate(lra,z.e0); %low right accentpoint
+else: pairequate(lra,z4); %low right accentpoint
+fi
+math_fit(0,u#); penlabels(1,2,3,4); endchar;
+
+% cmchar "The letter M";
+newchar(M,16u#+width_adj#,cap_height#,0);
+italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#);
+adjust_fit(cap_serif_fit#,cap_serif_fit#);
+numeric stem[]; % thicknesses of the four strokes
+stem1=hround(fudged.hair+stem_corr);
+stem2=hround(fudged.cap_stem-4stem_corr);
+stem3=hround(fudged.hair-stem_corr);
+stem4=hround(fudged.cap_stem-3stem_corr);
+if stem4<stem1: stem4:=stem1; fi
+pickup tiny.nib; pos1(stem1,0); pos2(stem1,0);
+pos3(stem4,0); pos4(stem4,0);
+x1=x2; x3=x4; x1l=w-x3r; rt x3r=hround min(w-2u,w-3u+.5stem4);
+top y1=top y3=h; bot y2=bot y4=0;
+filldraw stroke z1e--z2e; % left stem
+filldraw stroke z3e--z4e; % right stem
+penpos5(stem2,0); penpos6(stem2,0); penpos7(stem3,0); penpos8(stem3,0);
+x5l=x1; x6l=x7l; x8=lft x3l; x6-x5=x8-x7; y5=y8=h; y6=y7;
+if hefty: y6=if monospace: vround 1/3h else: o fi;
+ numeric upper_notch,lower_notch;
+ upper_notch=h-cap_notch_cut; lower_notch=y6+cap_notch_cut;
+ x1'=rt x1r; z1'=whatever[z5l,z6l]; x3'=lft x3l; z3'=whatever[z7r,z8r];
+ z0=whatever[z5r,z6r]=whatever[z7l,z8l];
+ fill z5l..
+  if y1'<upper_notch: {right}(x1'+1,upper_notch){down}... fi
+  {z6-z5}diag_in(5l,6l,1,6r)..diag_out(7l,1,7r,8r){z8-z7}
+  if y3'<upper_notch: ...{up}(x3'-1,upper_notch){right} fi
+  ..z8r--diag_out(8r,1,8l,7l){z7-z8}
+  if y0<=lower_notch: ..{z7-z8}z0{z5-z6}..
+  else: ...{down}(x0+.5,lower_notch)--(x0-.5,lower_notch){up}... fi
+  {z5-z6}diag_in(6r,5r,1,5l)--cycle;  % diagonals
+else: y6=0; z0=whatever[z5r,z6r]=whatever[z7l,z8l];
+ fill z5l..{z6-z5}diag_in(5l,6l,1,6r)..diag_out(7l,1,7r,8r){z8-z7}
+  ..z8r--diag_out(8r,1,8l,7l){z7-z8}..{z7-z8}z0{z5-z6}
+  ..{z5-z6}diag_in(6r,5r,1,5l)--cycle; fi  % diagonals
+if serifs: serif(1,2,a,1/3,-cap_jut);  % upper left serif
+ dish_serif(2,1,b,1/2,cap_jut,c,1/2,cap_jut)(dark); % lower left serif
+ serif(3,4,d,1/3,cap_jut); %  upper right serif
+ dish_serif(4,3,e,1/3,cap_jut,f,1/3,cap_jut); fi  % lower right serif
+pairassign(tca,x0,cap_height);  %top center accentpoint
+if monospace: pairassign(lca,x7,0);  %low center accentpoint
+else: pairequate(lca,z7);  %low center accentpoint
+fi
+pairequate(tra,z3); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,z4); %low right accentpoint
+math_fit(0,max(.5ic#-.5u#,0));
+penlabels(0,1,1',2,3,3',4,5,6,7,8); endchar;
+
+% cmchar "The letter N";
+newchar(N,13u#+width_adj#,cap_height#,0);
+italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#);
+adjust_fit(cap_serif_fit#,cap_serif_fit#);
+numeric thin_stem; thin_stem=hround(fudged.hair+stem_corr);
+pickup tiny.nib; pos1(thin_stem,0); pos2(thin_stem,0);
+pos3(thin_stem,0); pos4(thin_stem,0);
+pickup tiny.nib; top y1=top y3=h; bot y2=bot y4=0;
+x1=x2; x3=x4; x1l=w-x3r;
+rt x3r=hround min(w-2u,w-3u+.5fudged.cap_stem);
+filldraw stroke z1e--z2e; % left stem
+filldraw stroke z3e--z4e; % right stem
+if hefty: penpos5(fudged.cap_stem,0); penpos6(fudged.cap_stem,0);
+ x5l=x1; x6r=x4; y5=h; y6=0;
+ numeric upper_notch,lower_notch;
+ upper_notch=h-cap_notch_cut; lower_notch=cap_notch_cut;
+ x1'=rt x1r; z1'=whatever[z5l,z6l]; x4'=lft x4l; z4'=whatever[z5r,z6r];
+ fill z5l..
+  if y1'<upper_notch: {right}(x1'+1,upper_notch){down}... fi
+  {z6-z5}diag_in(5l,6l,1,6r)--z6r..
+  if y4'>lower_notch: {left}(x4'-1,lower_notch){up}... fi
+  {z5-z6}diag_in(6r,5r,1,5l)--cycle;  % diagonal
+else: penpos5(whatever,0); penpos6(whatever,90);
+ z5l=z1l; z6l=z4l;
+ z7=z6l+(max(eps,cap_stem-3stem_corr-tiny),0) rotated (angle(z5l-z6l)-90);
+ z5r=z7+whatever*(z5l-z6l); z6r=z7+whatever*(z5l-z6l);
+ filldraw stroke z5e..z6e; fi  % diagonal
+if serifs: if hefty: serif(1,2,a,1/3,-cap_jut); % upper left serif
+ else: serif(5,6,a,1/3,-cap_jut); fi  % upper left serif
+ dish_serif(2,1,b,1/2,cap_jut,c,1/2,cap_jut)(dark); % lower left serif
+ dish_serif(3,4,e,1/2,cap_jut,f,1/2,cap_jut)(dark); fi  % upper right serif
+pairassign(tca,.5[x1,x3],cap_height);  %top center accentpoint
+pairassign(lca,.5[x2,x4],0);  %low center accentpoint
+pairequate(tra,z3); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,z4); %low right accentpoint
+math_fit(0,max(.5ic#-.5u#,0)); penlabels(1,1',2,3,4,4',5,6,7); endchar;
+
+% cmchar "The letter O";
+newchar(O,14u#-width_adj#,cap_height#,0);
+italcorr .7cap_height#*slant-.5u#;
+adjust_fit(0,0);
+penpos1(vair',90); penpos3(vround(vair+1.5vair_corr),-90);
+penpos2(cap_curve,180); penpos4(cap_curve,0);
+if monospace: x2r=hround 1.5u;
+ interim superness:=sqrt superness;  % make |"O"|, not |"0"|
+else: x2r=hround u; fi
+x4r=w-x2r; x1=x3=.5w; y1r=h+o; y3r=-o;
+y2=y4=.5h-vair_corr; y2l:=y4l:=.52h;
+penstroke pulled_super_arc.e(1,2)(.5superpull)
+ & pulled_super_arc.e(2,3)(.5superpull)
+ & pulled_super_arc.e(3,4)(.5superpull)
+ & pulled_super_arc.e(4,1)(.5superpull) & cycle;  % bowl
+pairequate(tca,z1r);  %top center accentpoint
+pairequate(lca,z3);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(-.3cap_height#*slant-.5u#,ic#-.5u#); penlabels(1,2,3,4); endchar;
+
+% cmchar "The letter P";
+newchar(P,12u#,cap_height#,0);
+italcorr .75cap_height#*slant-.5u#;
+adjust_fit(cap_serif_fit#,0);
+pickup tiny.nib; penpos1(cap_stem'-tiny,0); penpos2(cap_stem-tiny,0);
+pos0(cap_stem',0); pos0'(cap_stem,0);
+lft x1l=hround max(2u,3u-.5cap_stem'); top y1=h; bot y2=0;
+x1l=x2l=x0l=x0'l; y0=y0'=y7;
+penpos3(cap_band,90); penpos4(cap_band,90);
+penpos5(cap_curve if hefty:-3stem_corr fi,0);
+penpos6(.5[vair,cap_band],-90); penpos7(.5[vair,cap_band],-90);
+z3r=top z1; y4=y3; y5=.5[y4l,y6l]; y6=y7;
+x7=x2; y7l=vround .5h; x4=x6=.5w+.75u; x5r=hround(w-u);
+x4l:=x6l:=x4-.25cap_curve;
+filldraw stroke z1e--z0e--z0'e--z2e; % stem
+fill stroke z3e..pulled_arc.e(4,5) & pulled_arc.e(5,6)..z7e;  % lobe
+if serifs: nodish_serif(1,0,a,1/3,cap_jut,b,1/3,.5cap_jut);  % upper serif
+ dish_serif(2,0',c,1/3,cap_jut,d,1/3,cap_jut); fi  % lower serif
+pairassign(tca,x6,cap_height);  %top center accentpoint
+pairequate(lca,z2);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7); endchar;
+
+% cmchar "The letter Q";
+newchar(Q,14u#-width_adj#,cap_height#,comma_depth#);
+italcorr .7cap_height#*slant-.5u#;
+adjust_fit(0,0);
+numeric light_curve; light_curve=cap_curve-hround stem_corr;
+penpos1(vair',90); penpos3(vair',-90);
+penpos2(light_curve,180); penpos4(light_curve,0);
+if monospace: x2r=hround 1.5u;
+ interim superness:=sqrt superness;  % make |"Q"| like |"O"|
+else: x2r=hround u; fi
+x4r=w-x2r; x1=x3=.5w; y1r=h+o; y2=y4=.5h-vair_corr; y3r=-o;
+penstroke pulled_super_arc.e(1,2)(.5superpull)
+ & pulled_super_arc.e(2,3)(.5superpull)
+ & pulled_super_arc.e(3,4)(.5superpull)
+ & pulled_super_arc.e(4,1)(.5superpull) & cycle;  % bowl
+pickup tiny.nib;
+if hefty: penpos5(1.2(.5[cap_bar,light_curve]),0); penpos6(1.2light_curve,0);
+ x5=.5w; x6r=hround(w-1.5u);
+ y5=vround .28h; y6=-d;
+ fill diag_end(6r,5r,.25,1,5l,6l)--diag_end(5l,6l,.5,1,6r,5r)--cycle;  % tail
+else: pos3'(vair,270); pos5(vair,180); pos6(vair,90);
+ pos7(cap_curve,85); penpos8(eps,180);
+ z3'=z3; x6=x3; top y6r=vround(.2h+.5vair);
+ lft x5r=hround(.5w-1.25u-.5vair); y5=.5[y3,y6];
+ bot y7l=-d; x7l=2/3[x6,x8]; y8=0; rt x8=hround(x4r+.1u);
+ filldraw stroke z3'e{left}...z5e{up}...z6e{right}
+  ..z7e{right}...z8e{up}; fi % tail
+pairequate(tca,z1r);  %top center accentpoint
+pairassign(lca,x3,.5desc_depth);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,z7); %low right accentpoint
+math_fit(-.3cap_height#*slant-.5u#,ic#); penlabels(1,2,3,4,5,6,7); endchar;
+
+% cmchar "The letter R";
+newchar(R,if serifs: 12u#+.5max(2u#,cap_curve#)
+ else:12.5u#-.5width_adj# fi,cap_height#,0);
+italcorr .75cap_height#*slant- if serifs: 1.75 else: .5 fi\\ u#;
+adjust_fit(cap_serif_fit#,0);
+pickup tiny.nib; pos1(cap_stem',0); pos2(cap_stem',0);
+lft x1l=lft x2l=hround max(2u,3u-.5cap_stem'); top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+penpos3(cap_band,90); penpos4(cap_band,90);
+penpos5(cap_curve if hefty:-3stem_corr fi,0);
+penpos6(vair,-90); penpos7(vair,-90);
+z3r=top z1; y4=y3; y5=.5[y4l,y6l]; y6=y7;
+x7=x2; y7l=vround(.5h+.5vair); x4=x6;
+if serifs: x4=.5w-.5u; x5r=hround(w-2.25u);
+else: x4=.5w+.5u; x5r=hround(w-u); fi
+x4l:=x6l:=x4-.125cap_curve;
+fill stroke z3e..pulled_arc.e(4,5) & pulled_arc.e(5,6)..z7e;  % lobe
+if serifs: pos6'(vair,-90); pos0(cap_stem,180);
+ pos8(cap_curve,180); pos9(vair,-90); pos10(hair,0);
+ z6'=z6; lft x0r=lft x8r=hround(x5-2/3u-.5cap_curve);
+ y8=1/3[y2,y7]; y0=3/5[y2,y7]; x9=.5[x8l,x10r];
+ bot y9r=-o; rt x10r=hround(w-.05u); y10=1/4[y2,y7];
+ filldraw stroke z6'e{right}..z0e---z8e....z9e{right}..z10e{up};  % tail
+ nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut);  % upper serif
+ dish_serif(2,1,c,1/3,cap_jut,d,1/3,cap_jut);  % lower serif
+else: penpos8(cap_stem-2stem_corr,0); penpos9(cap_stem,0);
+ x8=x6+.5u; y8=y6; x9r=hround(w-.5u); y9=0;
+ fill z8l--diag_end(8l,9l,.5,1,9r,8r)--z8r--cycle; fi  % tail
+pairequate(tca,z4);  %top center accentpoint
+pairassign(lca,.5[x2,x9],0);  %low center accentpoint
+pairequate(tra,tca); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z2); %low left accentpoint
+pairequate(lra,z9); %low right accentpoint
+math_fit(0,.75ic#); penlabels(0,1,2,3,4,5,6,7,8,9,10); endchar;
+
+% cmchar "The letter S";
+newchar(S,10u#,cap_height#,0);
+italcorr cap_height#*slant-u#;
+adjust_fit(0,0);
+numeric theta; theta=90-angle(50u,h); slope:=-h/50u;  % angle at middle
+numeric s_slab; s_slab=if serifs:slab else:vround .2[slab,cap_stem] fi;
+numeric ess'; ess'=max(fine.breadth,cap_ess);
+pickup fine.nib; pos2(max(fine.breadth,s_slab-vround vair_corr),-90);
+pos0(ess',theta); pos7(s_slab,-90);
+x2+x7=2x0=w; x7-x2=if serifs: u else: 0 fi; top y2l=h+o; bot y7r=-o;
+y0=.52h; lft x3l=hround u; rt x6r=hround(w-u);
+x3r-x3l=x6r-x6l=hround .5[s_slab,ess']-fine;
+ellipse_set(2l,3l,4l,0l); ellipse_set(2r,3r,4r,0r); y3=y3r;
+ellipse_set(7l,6l,5l,0l); ellipse_set(7r,6r,5r,0r); y6=y6r;
+filldraw stroke super_arc.e(2,3) & z3e{down}
+ ..z4e---z5e..z6e{down} & super_arc.e(6,7);  % main stroke
+if serifs: pos1(hair,180); pos8(hair,180);
+ rt x1l=hround(w-1.5u); lft x8r=hround u;
+ bot y1=vround 2/3h+1; top y8=vround 1/3h-1;
+ filldraw stroke z1e{x2-x1,10(y2-y1)}....{left}z2e;  % upper arc
+ filldraw stroke z7e{left}....{up}z8e;  % lower arc
+ path upper_arc, lower_arc;
+ upper_arc=z1{x2-x1,10(y2-y1)}....{left}z2;
+ lower_arc=z7{left}....{up}z8;
+ pos10(.3[fine.breadth,cap_hair],0); pos9(.3[fine.breadth,cap_hair],0);
+ x10r=x1l; top y10=top y2l; x9l=x8r; bot y9=bot y7r;
+ x1l-x1'=x8'-x8r=1.6cap_curve-fine; y1'=y1; y8'=y8;
+ numeric t; t=xpart(upper_arc intersectiontimes(z10l--z1'));
+ filldraw z1l--z10r--z10l--subpath(t,0) of upper_arc--cycle;  % upper barb
+ t:=xpart(lower_arc intersectiontimes(z9r--z8'));
+ filldraw z8r--z9l--z9r--subpath(t,1) of lower_arc--cycle;  % lower barb
+else: pos1(1.2flare,-100); pos8(1.2flare,-100);
+ x1l=good.x(x1l+w-1.75u-rt x1); lft x8r=hround .8u;
+ top y1l=vround .93h+o; bot y8r=vround .1h-o;
+ filldraw stroke term.e(2,1,right,.9,4);  % upper arc and terminal
+ filldraw stroke term.e(7,8,left,1,4); fi  % lower arc and terminal
+pairequate(tca,z2l);  %top center accentpoint
+pairequate(lca,z7);  %low center accentpoint
+pairequate(tra,z10); %top right accentpoint
+pairequate(tla,tca); %top left accentpoint
+pairequate(lla,z9); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(0,.5ic#); penlabels(0,1,1',2,3,4,5,6,7,8,8',9,10); endchar;
+
+% cmchar "The letter T";
+newchar(T,13u#-width_adj#,cap_height#,0);
+italcorr cap_height#*slant-beak_jut#-.25u#;
+adjust_fit(0,0);
+h:=vround(h-2stem_corr);
+pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0);
+lft x1l=lft x2l=hround(.5w-.5cap_stem); top y1=h; bot y2=0;
+filldraw stroke z1e--z2e; % stem
+pickup crisp.nib; pos3(slab,90); pos4(hair,0);
+top y3r=h; x3=x1; rt x4r=hround(w-.65u); y4=good.y(y3l-beak)-eps;
+arm(3,4,e,beak_darkness,.7beak_jut);  % right arm and beak
+pos5(hair,180); x5=w-x4; y5=y4;
+arm(3,5,f,beak_darkness,-.7beak_jut);  % left arm and beak
+if serifs: dish_serif(2,1,c,1/3,1.414cap_jut,d,1/3,1.414cap_jut);  % lower serif
+ nodish_serif(1,2,a,1/3,.5cap_jut,b,1/3,.5cap_jut); fi  % upper bracketing
+pairequate(tca,z3);  %top center accentpoint
+pairequate(lca,z2);  %low center accentpoint
+pairequate(tra,z.e0); %top right accentpoint
+pairequate(tla,z.f0); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(-.75cap_height#*slant,ic#-2.5u#); penlabels(1,2,3,4,5,6); endchar;
+
+% cmchar "The letter U";
+newchar(U,13u#+.5width_adj#,cap_height#,0);
+italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#);
+if monospace: adjust_fit(cap_serif_fit#-.5u#,cap_serif_fit#-.5u#)
+else: adjust_fit(cap_serif_fit#,cap_serif_fit#) fi;
+pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0);
+pos2'(cap_stem,180); z2'=z2;
+pos3(cap_band,-90);
+pos4(cap_hair,0); pos5(cap_hair,0);
+x1=x2; x3=.5[x1,x5]; x4=x5; x1l=w-x5r;
+top y1=top y5=h; y2=y4=1/3h; bot y3r=-o;
+lft x1l=hround max(2u,3u-.5cap_stem);
+filldraw stroke z1e--z2e; % left stem
+filldraw stroke pulled_arc.e(2',3)
+ & pulled_arc.e(3,4)&z4e--z5e; % arc and right stem
+if serifs: dish_serif(1,2,a,1/3,cap_jut,b,1/3,cap_jut); % left serif
+ dish_serif(5,4,c,1/2,cap_jut,d,1/2,cap_jut)(dark); fi  % right serif
+pairassign(tca,x3,cap_height);  %top center accentpoint
+pairequate(lca,z3);  %low center accentpoint
+pairequate(tra,z5); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(-cap_serif_fit#-.3cap_height#*slant-min(cap_height#*slant,u#),
+ max(.5ic#-.5u#,0)); penlabels(1,2,3,4,5); endchar;
+
+% cmchar "The letter V";
+newchar(V,13u#,cap_height#,0);
+italcorr cap_height#*slant+.25u#;
+adjust_fit(cap_serif_fit#,cap_serif_fit#);
+numeric left_stem,right_stem,outer_jut,alpha;
+left_stem=cap_stem-stem_corr;
+right_stem=min(cap_hair if hefty:-2stem_corr fi,left_stem);
+outer_jut=.75cap_jut; x1l=w-x4r=l+letter_fit+outer_jut+.25u; y1=y4=h;
+x2-x1=x4-x3; x2l+apex_corr=x3l; y2=y3=-apex_o;
+alpha=diag_ratio(2,right_stem,y1-y2,x4r-x1l-apex_corr);
+penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0);
+penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0);
+z0=whatever[z1r,z2r]=whatever[z3l,z4l];
+if y0>cap_notch_cut: y0:=cap_notch_cut;
+  fill z0+.5right{up}...{z4-z3}diag_end(3l,4l,1,1,4r,3r)
+    --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1}
+    ...{down}z0+.5left--cycle; % left and right diagonals
+else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l)
+    --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals
+if serifs: numeric inner_jut; pickup tiny.nib;
+ prime_points_inside(1,2); prime_points_inside(4,3);
+ if rt x1'r+cap_jut+.5u+1<=lft x4'l-cap_jut: inner_jut=cap_jut;
+ else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi
+ dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut);  % left serif
+ dish_serif(4',3,c,.6,inner_jut,d,1/2,outer_jut)(dark); fi  % right serif
+pairassign(tca,x0,cap_height);  %top center accentpoint
+pairequate(lca,z3);  %low center accentpoint
+pairequate(tra,z4); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(.75u#-cap_height#*slant,ic#-4u#); penlabels(0,1,2,3,4); endchar;
+
+% cmchar "The letter W";
+newchar(W,18u#,cap_height#,0);
+italcorr cap_height#*slant+.25u#;
+adjust_fit(cap_serif_fit#,cap_serif_fit#);
+numeric stem[],outer_jut,upper_notch,alpha,mid_corr;
+outer_jut=.7cap_jut; x1l=w-x8r=l+letter_fit+outer_jut+.25u;
+stem1=fudged.cap_stem-stem_corr;
+stem4=min(fudged.hair if hefty:-2stem_corr fi,stem1);
+stem2=stem4 if hefty:-2stem_corr fi;
+stem3=stem1 if hefty:-2stem_corr fi;
+x2-x1=x4-x3=x6-x5=x8-x7; x2l+apex_corr=x3l; x6l+apex_corr=x7l;
+y1=y8=h; y2=y3=y6=y7=-apex_o; y4=y5=if monospace: vround .6 fi\\ h;
+mid_corr=if monospace or hefty:-apex_corr else: 1/3jut fi;
+alpha=diag_ratio(4,stem2-stem3+stem4,y1-y2,x8r-x1l+mid_corr-2apex_corr);
+penpos1(alpha*stem1,0); penpos2(alpha*stem1,0);
+penpos3(alpha*stem2,0); penpos4(alpha*stem2,0);
+penpos5(alpha*stem3,0); penpos6(alpha*stem3,0);
+penpos7(alpha*stem4,0); penpos8(alpha*stem4,0);
+x4l-x1l=floor(x4l-x1l+.5(x5r+mid_corr-x4r)); % |x5r+mid_corr| $\approx$ |x4r|
+z23=whatever[z1r,z2r]=whatever[z3l,z4l];
+z45=whatever[z3r,z4r]=whatever[z5l,z6l];
+z67=whatever[z5r,z6r]=whatever[z7l,z8l]; upper_notch=y4-cap_notch_cut;
+fill diag_end(1l,2l,1,1,3r,4r){z4-z3}
+ ...if y45<upper_notch:(x45,upper_notch)+.5left{up}
+   --(x45,upper_notch)+.5right{down} else: z45&z45 fi
+ ...{z6-z5}diag_end(5l,6l,1,1,7r,8r)--diag_end(7r,8r,1,1,8l,7l){z7-z8}
+ ...if y67>cap_notch_cut:(x67,cap_notch_cut)+.5right{down}
+   --(x67,cap_notch_cut)+.5left{up} else: z67&z67 fi
+ ...{z5-z6}special_diag_end(6,5,4,3){z3-z4}
+ ...if y23>cap_notch_cut:(x23,cap_notch_cut)+.5right{down}
+   --(x23,cap_notch_cut)+.5left{up} else: z23&z23 fi
+ ...{z1-z2}diag_end(2r,1r,1,1,1l,2l)--cycle;  % diagonals
+if serifs: numeric inner_jut[]; pickup tiny.nib;
+ prime_points_inside(1,2); prime_points_inside(5,6); prime_points_inside(8,7);
+ if monospace: inner_jut1=inner_jut4=1.5cap_jut;
+ elseif hefty: inner_jut1=inner_jut4=cap_jut;
+ else: fill diag_end(6r,5r,1,1,5l,6l)
+  --.5[z5l,z6l]--.5[z5r,z6r]--cycle; % middle stem
+  inner_jut2=.7inner_jut1; inner_jut4=1.1inner_jut3;
+  if rt x1'r+cap_jut+.5u+1<=lft x5'l-.7cap_jut: inner_jut1=cap_jut;
+  else: rt x1'r+inner_jut1+.5u+1=lft x5'l-inner_jut2; fi
+  if rt x5'r+cap_jut+.5u+1<=lft x8'l-1.1cap_jut: inner_jut3=cap_jut;
+  else: rt x5'r+inner_jut3+.5u+1=lft x8'l-inner_jut4; fi
+  dish_serif(5',6,e,1/3,inner_jut2,f,1/2,inner_jut3); fi  % middle serif
+ dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut1);  % left serif
+ dish_serif(8',7,c,.6,inner_jut4,d,1/2,outer_jut)(dark); fi  % right serif
+pairassign(tca,x45,cap_height);  %top center accentpoint
+pairassign(lca,x45,0);  %low center accentpoint
+pairequate(tra,z8); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z3); %low left accentpoint
+pairequate(lra,z7); %low right accentpoint
+math_fit(.75u#-cap_height#*slant,ic#-2.5u#);
+penlabels(0,1,2,3,4,5,6,7,8,23,45,67); endchar;
+
+% cmchar "The letter X";
+newchar(X,13u#,cap_height#,0);
+italcorr cap_height#*slant-.25u#;
+adjust_fit(cap_serif_fit#,cap_serif_fit#);
+numeric stem[],outer_jut,xjut,alpha[];
+stem1=cap_stem-2stem_corr; stem2=min(cap_hair,stem1);
+outer_jut=.75cap_jut; xjut= if serifs: (stem1-stem2)/4 else: 0 fi;
+x1l=l+letter_fit+.5u+outer_jut; x2r=r-letter_fit-u-outer_jut-xjut;
+x3l=l+letter_fit+.25u+outer_jut+xjut; x4r=r-letter_fit-.25u-outer_jut;
+y1=y2=h; y3=y4=0;
+alpha1=diag_ratio(1,stem1,h,x4r-x1l);
+alpha2=diag_ratio(1,stem2,h,x2r-x3l);
+penpos1(alpha1*stem1,0); penpos2(alpha2*stem2,0);
+penpos3(alpha2*stem2,0); penpos4(alpha1*stem1,0);
+if hefty: z0=whatever[z1,z4]=whatever[z2,z3];
+ x12=x34=x0; y13=y24=y0;
+ z12=whatever[z2l,z3l]; z13=whatever[z2l,z3l];
+ z24=whatever[z2r,z3r]; z34=whatever[z2r,z3r];
+ forsuffixes $=13,24,34: z$'=.1[z$,z0]; endfor
+ fill diag_end(12,1r,.5,1,1l,13')--z13'--diag_end(13',3l,1,.5,3r,34')--z34'
+  --diag_end(34',4l,.5,1,4r,24')--z24'
+  --diag_end(24',2r,1,.5,2l,12)--z12--cycle; % diagonals
+else: fill diag_end(4r,1r,.5,1,1l,4l)
+  --diag_end(1l,4l,.5,1,4r,1r)--cycle; % left diagonal
+ fill diag_end(2l,3l,.5,1,3r,2r)
+  --diag_end(3r,2r,.5,1,2l,3l)--cycle; fi  % right diagonal
+if serifs: numeric inner_jut[]; pickup tiny.nib;
+ prime_points_inside(1,4); prime_points_inside(2,3);
+ prime_points_inside(3,2); prime_points_inside(4,1);
+ if rt x1'r+cap_jut+.5u+1<=lft x2'l-cap_jut-xjut: inner_jut1=cap_jut;
+ else: rt x1'r+inner_jut1+.5u+1=lft x2'l-inner_jut1-xjut; fi
+ if rt x3'r+cap_jut+.5u+1<=lft x4'l-cap_jut-xjut: inner_jut2=cap_jut;
+ else: rt x3'r+inner_jut2+.5u+1=lft x4'l-inner_jut2-xjut; fi
+ dish_serif(1',4,a,1/3,outer_jut,b,2/3,inner_jut1);  % upper left serif
+ dish_serif(4',1,c,2/3,inner_jut2,d,1/3,outer_jut);  % lower right serif
+ dish_serif(2',3,e,2/3,inner_jut1+xjut,
+  f,1/2,outer_jut+xjut)(dark);  % upper right serif
+ dish_serif(3',2,g,1/2,outer_jut+xjut,
+  h,2/3,inner_jut2+xjut)(dark); fi  % lower left serif
+pairassign(tca,.5[x1,x2],cap_height);  %top center accentpoint
+pairassign(lca,.5[x3,x4],0);  %low center accentpoint
+pairequate(tra,z2); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,z3); %low left accentpoint
+pairequate(lra,z4); %low right accentpoint
+math_fit(0,.5ic#); penlabels(0,1,2,3,4,12,13,24,34); endchar;
+
+% cmchar "The letter Y";
+newchar(Y,13u#,cap_height#,0);
+italcorr cap_height#*slant+.45u#;
+adjust_fit(cap_serif_fit#,cap_serif_fit#);
+numeric left_stem,right_stem,outer_jut,dy,alpha;
+left_stem=cap_stem-stem_corr;
+right_stem=min(cap_hair if hefty:-2stem_corr fi,left_stem);
+outer_jut=.75cap_jut; x1l=w-x4r=l+letter_fit+outer_jut+.05u;
+x2l=x5l=hround(.5w-.5left_stem); x3r=x5r; y1=y4=h; y2=y3=y5=.4h;
+dy=y1-y2; alpha=((x2l-x1l)++dy)/dy;
+penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0);
+penpos3(alpha*right_stem,0); penpos4(alpha*right_stem,0);
+penpos5(left_stem,0); penpos6(left_stem,0); x5=x6; y6=0;
+z0=whatever[z1r,z2r]=whatever[z3l,z4l];
+if y0>y2+cap_notch_cut: y0:=y2+cap_notch_cut;
+  fill z0+.5right{up}...{z4-z3}diag_end(3l,4l,1,1,4r,3r)--z5r
+    --diag_end(5r,6r,1,1,6l,5l)--z5l--diag_end(2l,1l,1,1,1r,2r){z2-z1}
+    ...{down}z0+.5left--cycle; % diagonals and stem
+else: fill z0--diag_end(0,4l,1,1,4r,3r)--z5r
+    --diag_end(5r,6r,1,1,6l,5l)--z5l
+    --diag_end(2l,1l,1,1,1r,0)--cycle; fi  % diagonals and stem
+if serifs: numeric inner_jut; pickup tiny.nib;
+ prime_points_inside(1,2); prime_points_inside(4,3); prime_points_inside(6,5);
+ if rt x1'r+cap_jut+.5u+1<=lft x4'l-cap_jut: inner_jut=cap_jut;
+ else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi
+ dish_serif(1',2,a,1/3,outer_jut,b,1/2,inner_jut);  % upper left serif
+ dish_serif(4',3,c,.6,inner_jut,d,1/2,outer_jut)(dark);  % upper right serif
+ dish_serif(6',5,e,1/3,cap_jut,f,1/3,cap_jut); fi  % lower serif
+pairassign(tca,x0,cap_height);  %top center accentpoint
+pairequate(lca,z6);  %low center accentpoint
+pairequate(tra,z4); %top right accentpoint
+pairequate(tla,z1); %top left accentpoint
+pairequate(lla,lca); %low left accentpoint
+pairequate(lra,lca); %low right accentpoint
+math_fit(.5u#-cap_height#*slant,ic#-4u#);
+penlabels(0,1,2,3,4,5,6); endchar;
+
+% cmchar "The letter Z";
+newchar(Z,11u#,cap_height#,0);
+italcorr cap_height#*slant-.5u#;
+adjust_fit(0,0);
+numeric arm_thickness[],z_stem;
+if hefty: arm_thickness1=Vround(slab-vair_corr); arm_thickness2=slab;
+ z_stem=.8[vair,cap_stem];
+else: arm_thickness1=slab; arm_thickness2=vround(slab+vair_corr);
+ z_stem=.9[vair,cap_stem]; fi
+pickup tiny.nib; x3l=x4l=w-x1r=w-x2r; lft x3l=hround u;
+top y1=h; y2=min(y1,h-2/3arm_thickness1);
+bot y4=0; y3=max(y4,2/3arm_thickness2);
+numeric alpha; alpha=diag_ratio(1,z_stem-tiny,y2-y3,x2r-x3l);
+penpos1(alpha*(z_stem-tiny),0); penpos2(alpha*(z_stem-tiny),0);
+penpos3(alpha*(z_stem-tiny),0); penpos4(alpha*(z_stem-tiny),0);
+pair delta; delta=penoffset z3-z2 of currentpen;
+fill top lft z1l--z2l+delta---z3l+delta..lft z3l---lft z4l..bot z4l
+ ---bot rt z4r--z3r-delta---z2r-delta..rt z2r---rt z1r..top z1r
+ ---cycle;  % diagonal
+pickup crisp.nib; pos5(arm_thickness1,90); pos6(hair,180);
+top y5r=h; x5=x1; lft x6r=hround 1.25u; y6=good.y(y5l-beak)-eps;
+arm(5,6,a,beak_darkness**.8,-.4beak_jut);  % upper arm and beak
+pos7(arm_thickness2,-90); pos8(hair,0);
+bot y7r=0; x7=x4; rt x8r=hround(w-.9u); y8=good.y(y7l+1.2beak)+eps;
+arm(7,8,b,beak_darkness**.9,.6beak_jut);  % lower arm and beak
+if serifs: pairassign(tca,x.a2,cap_height);  %top center accentpoint
+  pairassign(lca,x.b2,0);  %low center accentpoint
+  pairequate(tla,z.a0); %top left accentpoint
+  pairequate(lra,z.b0); %low right accentpoint
+else: pairassign(tca,.5w,cap_height);  %top center accentpoint
+  pairassign(lca,.5w,0);  %low center accentpoint
+  pairassign(tla,x3,cap_height); %top left accentpoint
+  pairassign(lra,x8,0); %low right accentpoint
+fi
+pairequate(tra,z1); %top right accentpoint
+pairequate(lla,z4); %low left accentpoint
+math_fit(0,.5ic#); penlabels(1,2,3,4,5,6,7,8); endchar;
+
+% end of file romanua.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/sktmisc.mf b/Master/texmf-dist/fonts/source/public/wnri/sktmisc.mf
new file mode 100644
index 00000000000..2e195a25de9
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/sktmisc.mf
@@ -0,0 +1,72 @@
+%
+% Washington Romanized Indic miscellaneous characters
+%
+% File       : sktmisc.mf 
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Italic and encoded according to
+% the Classical Sanskrit/Classical Sanskrit eXtended character set. 
+% See wnindic.map for more details.
+%
+% Contains programs to produce the characters "es-zet" and "rootsign".
+%
+
+% cmchar "German letter es-zet (sharp s)";
+newchar(eszett,4.5u#+max(4.5u#,.5stem#+flare#+curve#),asc_height#,0);
+italcorr asc_height#*slant-u#;
+adjust_fit(serif_fit#,0);
+pickup tiny.nib; pos1(stem',0); pos2(stem',0);
+lft x1l=lft x2l=hround(2.5u-.5stem'); bot y1=0; y2=y4=.5[x_height,y3];
+penpos3(vair-fine,90); fine.top y3r=h+oo;
+filldraw stroke z1e--z2e;  % stem
+numeric stem_edge,curve'; stem_edge=rt x1r; curve'=hround .5[stem',curve];
+pickup fine.nib; pos4(curve',0); pos5(vair,-90);
+pos2'(stem',180); z2'=z2; x3=.5[x2,x4]; rt x4r=hround(w-u);
+top y5l=x_height; lft x5=min(lft x4l,hround(stem_edge+u));
+filldraw stroke pulled_super_arc.e(2',3)(.5superpull)
+ & pulled_super_arc.e(3,4)(.5superpull)
+ & pulled_super_arc.e(4,5)(.5superpull);  % upper bowl
+pos5'(vair,90); z5'=z5; pos6(curve',0); pos7(vair,-90);
+rt x6r=hround(w-.5u)+3eps; y6=.4x_height; bot y7r=-oo;
+if serifs: pos8(hair,-180) else: pos8(vair,-110) fi;
+lft x8r=min(hround(stem_edge+.5u+1),lft x8r+x6r-2eps-x8l);
+x7=max(x8l+eps,.4[lft x8r,x6]);
+filldraw stroke pulled_super_arc.e(5',6)(.5superpull)
+ & pulled_super_arc.e(6,7)(.5superpull);  % lower bowl
+if serifs: pos9(5/7[vair,flare],-180);
+ y9-(x9-lft x9r)=vround .07x_height; bulb(7,8,9);  % bulb
+ penpos0(stem'-tiny,0); x0=x1; tiny.top y0=x_height;
+ serif(0,1,a,0,-jut);  % bar
+ dish_serif(1,2,b,1/3,jut,c,0,epsilon);  % serif
+else: bot y8r=vround .01h; x8l:=good.x x8l; y8l:=good.y(y8l+.5);
+ filldraw stroke term.e(7,8,left,1,4); fi  % terminal
+penlabels(0,1,2,3,4,5,6,7,8,9); endchar;
+
+% cmchar "Root sign";
+newchar(rootsign,8.5u#,body_height#,paren_depth#-rule_thickness#);
+ adjust_fit(0,-letter_fit#); pickup rule.nib;
+ w':=7u;
+ x1=good.x 1/9w'; x2=good.x .65w'; bot y1=-.5d; bot y2=asc_height;
+ draw z1--z2;  % diagonal
+ pickup crisp.nib; pos3(if monospace: else: .7 fi max(curve,rule_thickness),0);
+ x3l=1.5[x2,x1]; y3=.5[y1,y2];
+ pos4(rule_thickness,0); x4=x1; bot y4=-.5d;
+ pos5(vair,-45); x5l=good.x(x3l-u); z5l=whatever[z3r,z2];
+ z6=z5r+whatever*(z2-z3r)=whatever[z3l,z4l];
+ z7=whatever[z1,z2]=z3r+whatever*(z4l-z3l);
+ filldraw z5r--z6--z4l--z4--z7--z3r--z5l--cycle;  % left diagonal and serif
+x8=x2+2u; y8=y2;
+pickup rule.nib;
+draw z2--z8;
+picture V; transform t; t=identity shifted(2.5u,0);
+V=currentpicture transformed t; currentpicture:=V;
+% penlabels(1,2,3,4,5,6,7,8); 
+endchar;
+
+% end of file sktmisc.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/tildacct.mf b/Master/texmf-dist/fonts/source/public/wnri/tildacct.mf
new file mode 100644
index 00000000000..29b1f5e3b39
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/tildacct.mf
@@ -0,0 +1,37 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macro to draw tilde accent 
+%
+
+cmchar "Tilde (squiggle) accent";
+beginchar(oct"176",9u#,min(asc_height#,10/7x_height#+.5dot_size#),0);
+italcorr h#*slant-u#;
+adjust_fit(0,0);
+if serifs: numeric theta; theta=angle(1/6(6u-vair),1/4(h-x_height));
+ pickup crisp.nib; numeric mid_width; mid_width=.4[vair,stem];
+ pos1(vair,theta+90); pos2(vair,theta+90);
+ pos3(vair,theta+90); pos4(vair,theta+90);
+ z2-z1=z4-z3=(mid_width-crisp)*dir theta;
+ lft x1r=w-rt x4l=hround 1.5u; top y4r=h;
+ bot y1l=vround(bot y1l+min(2/3[x_height,h],y3l-.25vair)-top y1r);
+ pair delta; ypart delta=3(y3l-y1l); delta=whatever*dir theta;
+ filldraw z1l..controls(z1l+delta)and(z3l-delta)..z3l..z4l
+  --z4r..controls(z4r-delta)and(z2r+delta)..z2r..z1r--cycle;  % stroke
+else: pickup fine.nib; pos1(vair,180); pos2(vair,90);
+ pos3(.5[vair,slab],90); pos4(vair,90); pos5(vair,180);
+ lft x1r=w-rt x5l=hround 1.5u; x2-x1=x3-x2=x4-x3=x5-x4;
+ bot y1=bot y4l=vround(.75[x_height,h]-vair);
+ top y2r=top y5=h; y3=.5[y2,y4];
+ filldraw stroke z1e{up}...z2e{right}..z3e..{right}z4e...{up}z5e; fi % stroke
+makeACCENT(TildPic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(TildPic);  ah; oechar; ";
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = tild enddef;
+
+% end of file tildacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/u-ring.mf b/Master/texmf-dist/fonts/source/public/wnri/u-ring.mf
new file mode 100644
index 00000000000..31c2789f3e0
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/u-ring.mf
@@ -0,0 +1,18 @@
+%
+% TO REPLACE CURRENT UNDERRING ACCENT FILE
+%
+
+cmchar "subscript Scandinavian circle accent";
+newchar(Ring,5u#+hair#,0,desc_depth#);
+adjust_fit(0,0);
+numeric circ_hair,circ_vair; h:=asc_height;
+circ_hair=hround min(hair,u+.5); circ_vair=vround min(vair,(asc_height-x_height)/6+.5);
+penpos1(circ_vair,90); penpos3(circ_vair,-90);
+penpos2(circ_hair,180); penpos4(circ_hair,0);
+x2r=hround(.5w-1.5u-.5circ_hair);
+x4r=w-x2r; x1=x3=.5w; y1r=h+apex_o; y2=y4=.5[y1,y3];
+y3r=vround(1/3[x_height,h]+apex_o);
+penstroke pulled_arc.e(1,2) & pulled_arc.e(2,3)
+ & pulled_arc.e(3,4) & pulled_arc.e(4,1) & cycle;  % bowl
+currentpicture:=currentpicture shifted (0,-(asc_height+dot_size)*aspect_ratio);
+endchar;
diff --git a/Master/texmf-dist/fonts/source/public/wnri/ubaracct.mf b/Master/texmf-dist/fonts/source/public/wnri/ubaracct.mf
new file mode 100644
index 00000000000..c388fb12f9f
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/ubaracct.mf
@@ -0,0 +1,28 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macro to draw underbar accents 
+%
+
+cmchar "Macron (bar) accent";
+numeric macron_breadth#; macron_breadth#=.2[vair#,stem#];
+beginchar(oct"026",9u#,.4[x_height#,asc_height#]+macron_breadth#,0);
+italcorr h#*slant-.75u#;
+adjust_fit(0,0);
+numeric macron_breadth; macron_breadth:=Vround .2[vair,stem];
+pickup if serifs: crisp.nib else: fine.nib fi;
+pos1(macron_breadth,90); pos2(macron_breadth,90);
+top y1r=top y2r=h+o; lft x1=w-rt x2=hround 1.25u;
+filldraw stroke z1e--z2e;  % bar
+transform Tf; Tf=identity shifted(-.5w+slant*(-h-.25x_height),aspect_ratio*(-h-.25x_height));
+savePicture(MacronPic);
+endgroup;
+extra_endchar:=
+%  " czdm ap(MacronPic);  ad; oechar; ";
+  " czd ap(MacronPic);  ad; oechar; ";
+boolean dotson; dotson=true; % don't omit dots on i, j, and possibly etc.
+
+def cp = ubar enddef;
+
+% end of file ubaracct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/ubrvacct.mf b/Master/texmf-dist/fonts/source/public/wnri/ubrvacct.mf
new file mode 100644
index 00000000000..06fe8e76d97
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/ubrvacct.mf
@@ -0,0 +1,29 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macro to draw subscript breve accent
+%
+
+cmchar "Breve accent";
+beginchar(oct"025",9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant+.5vair#-1.5u#;
+adjust_fit(0,0);
+pickup crisp.nib; pos1(vair,-180); pos3(vair,0);
+top y1=top y3=h; lft x1r=w-rt x3r=hround(2u-.5vair);
+numeric mid_thickness; mid_thickness=vround 1/3[vair,stem];
+pos2(mid_thickness,-90); x2=.5w;
+%bot y2r=vround max(x_height+o+tiny,1/3[x_height,h]+o-.5mid_thickness);
+bot y2r=h - vround max(2.5mid_thickness,1.5stem);
+filldraw stroke z1e{down}...z2e{right}...{up}z3e;  % stroke
+transform Tf; Tf=identity shifted(-.5w+slant*(-h-.25x_height),aspect_ratio*(-h-.25x_height));
+savePicture(UBrevPic);
+endgroup;
+
+extra_endchar:=
+  " czd ap(UBrevPic);  ah; oechar; ";
+boolean dotson; dotson=true; % don't omit dots on i, j, and possibly etc.
+
+def cp = ubrv enddef;
+
+% end of file ubrvacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/udacacct.mf b/Master/texmf-dist/fonts/source/public/wnri/udacacct.mf
new file mode 100644
index 00000000000..c387e13278a
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/udacacct.mf
@@ -0,0 +1,44 @@
+%
+% Washington Romanized Indic accent driver 
+%
+% Macros to draw combination acute accent and underdot
+%
+
+cmchar "Dot accent";
+numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#);
+beginchar(oct"137",5u#,min(asc_height#,10/7x_height#+.5dot_diam#),0);
+define_whole_blacker_pixels(dot_diam);
+italcorr h#*slant+.5dot_diam#-2u#;
+adjust_fit(0,0);
+pickup tiny.nib; pos1(dot_diam,0); pos2(dot_diam,90);
+x1=x2=.5w; top y2r=h+1;
+if bot y2l<x_height+o+slab: y2l:=min(y2r-eps,x_height+o+slab+.5tiny); fi
+y1=.5[y2l,y2r]; dot(1,2);  % dot
+transform Tf; Tf = identity shifted (-.5w+ slant*(-h-.325desc_depth),aspect_ratio*(-h-.325desc_depth));
+savePicture(UdotPic); 
+endgroup;
+
+cmchar "Acute accent";
+beginchar(oct"023",9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant-if serifs: 1.5 fi u#;
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1+.5stem=hround(w-2u); x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ rt x1r=hround(w-1.5u); lft x2l=hround(.5w-.25u-.5vair);
+ top y1=h; bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+makeACCENT(AcutePic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(AcutePic);  czdm  ap(UdotPic); ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+def cp = udac enddef;
+
+% end of file udacacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/udgracct.mf b/Master/texmf-dist/fonts/source/public/wnri/udgracct.mf
new file mode 100644
index 00000000000..3116437ba9a
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/udgracct.mf
@@ -0,0 +1,43 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw combination grave accent and underdot
+%
+
+cmchar "Dot accent";
+numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#);
+beginchar(oct"137",5u#,min(asc_height#,10/7x_height#+.5dot_diam#),0);
+define_whole_blacker_pixels(dot_diam);
+italcorr h#*slant+.5dot_diam#-2u#;
+adjust_fit(0,0);
+pickup tiny.nib; pos1(dot_diam,0); pos2(dot_diam,90);
+x1=x2=.5w; top y2r=h+1;
+if bot y2l<x_height+o+slab: y2l:=min(y2r-eps,x_height+o+slab+.5tiny); fi
+y1=.5[y2l,y2r]; dot(1,2);  % dot
+transform Tf; Tf = identity shifted (-.5w+ slant*(-h-.325desc_depth),aspect_ratio*(-h-.325desc_depth));
+savePicture(UdotPic); 
+endgroup;
+
+cmchar "Grave accent";
+beginchar(oct"022",9u#,min(asc_height#,2x_height#),0);
+adjust_fit(0,0);
+if serifs: pickup crisp.nib; x1-.5stem=hround 2u; x2=2/3[x1,w-x1];
+ y1+.5stem=h+eps; y2=max(2/3[h,x_height],x_height+o+hair);
+ numeric theta; theta=angle(z2-z1)+90;
+ pos1(stem,theta); pos2(hair,theta);
+ filldraw circ_stroke z1e--z2e;  % diagonal
+else: pickup fine.nib; pos1(stem,0); pos2(vair,0);
+ lft x1l=hround 1.5u; rt x2r=hround(.5w+.25u+.5vair);
+ top y1=h; bot y2=vround 2/3[h,x_height];
+ filldraw stroke z1e--z2e; fi  % diagonal
+makeACCENT(GravePic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(GravePic);  czdm ap(UdotPic); ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+def cp = udgr enddef;
+
+% end of file udgracct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/udmcacct.mf b/Master/texmf-dist/fonts/source/public/wnri/udmcacct.mf
new file mode 100644
index 00000000000..eea75adca34
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/udmcacct.mf
@@ -0,0 +1,43 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw combination macron accent and underdot
+%
+
+cmchar "Dot accent";
+numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#);
+beginchar(oct"137",5u#,min(asc_height#,10/7x_height#+.5dot_diam#),0);
+define_whole_blacker_pixels(dot_diam);
+italcorr h#*slant+.5dot_diam#-2u#;
+adjust_fit(0,0);
+pickup tiny.nib; pos1(dot_diam,0); pos2(dot_diam,90);
+x1=x2=.5w; top y2r=h+1;
+if bot y2l<x_height+o+slab: y2l:=min(y2r-eps,x_height+o+slab+.5tiny); fi
+y1=.5[y2l,y2r]; dot(1,2);  % dot
+transform Tf; Tf = identity shifted (-.5w+ slant*(-h-.325desc_depth),aspect_ratio*(-h-.325desc_depth));
+savePicture(UdotPic); 
+endgroup;
+
+cmchar "Macron accent";
+numeric macron_breadth#; macron_breadth#=.2[vair#,stem#];
+beginchar(oct"026",9u#,.4[x_height#,asc_height#]+macron_breadth#,0);
+italcorr h#*slant-.75u#;
+adjust_fit(0,0);
+numeric macron_breadth; macron_breadth:=Vround .2[vair,stem];
+pickup if serifs: crisp.nib else: fine.nib fi;
+pos1(macron_breadth,90); pos2(macron_breadth,90);
+top y1r=top y2r=h+o; lft x1=w-rt x2=hround 1.25u;
+filldraw stroke z1e--z2e;  % bar
+if monospace: currentpicture:=currentpicture shifted(0,1/2aspect_ratio*dot_size); fi
+makeACCENT(MacronPic);
+endgroup;
+
+
+extra_endchar:=
+  " czu ap(MacronPic);  czdm ap(UdotPic); ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+def cp = udmc enddef;
+
+% end of file udmcacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/udotacct.mf b/Master/texmf-dist/fonts/source/public/wnri/udotacct.mf
new file mode 100644
index 00000000000..c864770a090
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/udotacct.mf
@@ -0,0 +1,29 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw subscript dot accents 
+%
+
+cmchar "Dot accent";
+numeric dot_diam#; dot_diam#=max(dot_size#,cap_curve#);
+beginchar(oct"137",5u#,min(asc_height#,10/7x_height#+.5dot_diam#),0);
+define_whole_blacker_pixels(dot_diam);
+italcorr h#*slant+.5dot_diam#-2u#;
+adjust_fit(0,0);
+pickup tiny.nib; pos1(dot_diam,0); pos2(dot_diam,90);
+x1=x2=.5w; top y2r=h+1;
+if bot y2l<x_height+o+slab: y2l:=min(y2r-eps,x_height+o+slab+.5tiny); fi
+y1=.5[y2l,y2r]; dot(1,2);  % dot
+transform Tf; Tf = identity shifted (-.5w+ slant*(-h-.325desc_depth),aspect_ratio*(-h-.325desc_depth));
+savePicture(UdotPic); transform Tf;
+endgroup;
+
+extra_endchar:=
+  " czdm ap(UdotPic); ad; oechar; ";
+
+boolean dotson; dotson=true; % don't omit dots on i, j, and possibly etc.
+
+def cp = udot enddef;
+
+% end of file udotacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/uibvacct.mf b/Master/texmf-dist/fonts/source/public/wnri/uibvacct.mf
new file mode 100644
index 00000000000..13eac2ab344
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/uibvacct.mf
@@ -0,0 +1,30 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw subscript inverted breve accents 
+%
+
+cmchar "inverted Breve accent";
+beginchar(oct"025",9u#,min(asc_height#,2x_height#),0);
+italcorr h#*slant+.5vair#-1.5u#;
+adjust_fit(0,0);
+pickup crisp.nib; pos1(vair,180); pos3(vair,0);
+bot y1=bot y3=vround max(x_height+o+tiny,1/3[x_height,h]+o-.5mid_thickness); 
+lft x1r=w-rt x3r=hround(2u-.5vair);
+numeric mid_thickness; mid_thickness=vround 1/3[vair,stem];
+pos2(mid_thickness,90); x2=.5w;
+top y2r=h;
+filldraw stroke z1e{down}...z2e{right}...{up}z3e;  % stroke
+transform Tf; Tf = identity shifted (-.5w+slant*(-h-.25x_height),aspect_ratio*(-h-.25x_height));
+savePicture(IbrvPic);
+endgroup;
+
+extra_endchar:=
+  " czd ap(IbrvPic);  ad; oechar; ";
+
+boolean dotson; dotson=true; % don't omit dots on i, j, and possibly etc.
+
+def cp = uibv enddef;
+
+% end of file uibvacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/umlaacct.mf b/Master/texmf-dist/fonts/source/public/wnri/umlaacct.mf
new file mode 100644
index 00000000000..c54db5c646e
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/umlaacct.mf
@@ -0,0 +1,30 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macro to draw umlaut/diaresis accent
+%
+
+cmchar "Umlaut (double dot) accent";
+numeric dot_diam#,dot_diam;
+dot_diam#=max(dot_size#,cap_curve#);
+beginchar(oct"177",9u#,min(asc_height#,10/7x_height#+.5dot_diam#),0);
+dot_diam=max(tiny.breadth,hround(max(dot_size,cap_curve)-2stem_corr));
+italcorr h#*slant+.5dot_diam#-2.25u#;
+adjust_fit(0,0);
+pickup tiny.nib; pos1(dot_diam,0); pos2(dot_diam,90);
+x1=x2=2.75u; top y2r=h+1;
+if bot y2l<x_height+o+slab: y2l:=min(y2r-eps,x_height+o+slab+.5tiny); fi
+y1=.5[y2l,y2r]; dot(1,2);  % left dot
+pos3(dot_diam,0); penpos4(y2r-y2l,90); y3=y4=y1; x3=x4=w-x1;
+dot(3,4);  % right dot
+makeACCENT(UmlPic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(UmlPic);  ah; oechar; ";
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+
+def cp = uml enddef;
+
+% end of file umlaacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/urmcacct.mf b/Master/texmf-dist/fonts/source/public/wnri/urmcacct.mf
new file mode 100644
index 00000000000..bf40b538e72
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/urmcacct.mf
@@ -0,0 +1,44 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macros to draw combination macron accent and underring
+%
+
+cmchar "Vocalic underring accent";
+beginchar(oct"027",13u#+4/3(asc_height#-x_height#)*slant,asc_height#,0);
+adjust_fit(cap_serif_fit#,cap_serif_fit#);
+numeric circ_hair,circ_vair;
+circ_hair=hround min(hair,u+.5); circ_vair=vround min(vair,(h-x_height)/6+.5);
+penpos1(circ_vair,90); penpos3(circ_vair,-90);
+penpos2(circ_hair,180); penpos4(circ_hair,0);
+x2r=hround(.5w-1.5u-.5circ_hair);
+x4r=w-x2r; x1=x3=.5w; y1r=h+apex_o; y2=y4=.5[y1,y3];
+y3r=vround(1/3[x_height,h]+apex_o);
+penstroke pulled_arc.e(1,2) & pulled_arc.e(2,3)
+ & pulled_arc.e(3,4) & pulled_arc.e(4,1) & cycle;  % bowl
+transform Tf; Tf = identity shifted (-.5w+slant*(-y1r-.25x_height),-y1r-.25x_height);
+savePicture(RingPic);
+endgroup;
+
+cmchar "Macron accent";
+numeric macron_breadth#; macron_breadth#=.2[vair#,stem#];
+beginchar(oct"026",9u#,.4[x_height#,asc_height#]+macron_breadth#,0);
+italcorr h#*slant-.75u#;
+adjust_fit(0,0);
+numeric macron_breadth; macron_breadth:=Vround .2[vair,stem];
+pickup if serifs: crisp.nib else: fine.nib fi;
+pos1(macron_breadth,90); pos2(macron_breadth,90);
+top y1r=top y2r=h+o; lft x1=w-rt x2=hround 1.25u;
+filldraw stroke z1e--z2e;  % bar
+if monospace: currentpicture:=currentpicture shifted(0,1/2aspect_ratio*dot_size); fi
+makeACCENT(MacronPic);
+endgroup;
+
+extra_endchar:=
+  " czu ap(MacronPic);  czdm ap(RingPic); ah; oechar; ";
+
+boolean dotson; dotson=false; % omit dots on i, j, and possibly etc.
+def cp = urmc enddef;
+
+% end of file urmcacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/urngacct.mf b/Master/texmf-dist/fonts/source/public/wnri/urngacct.mf
new file mode 100644
index 00000000000..7fee37d73d8
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/urngacct.mf
@@ -0,0 +1,31 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macro for vocalic underring accent
+%
+
+cmchar "Vocalic underring accent";
+beginchar(oct"027",13u#+4/3(asc_height#-x_height#)*slant,asc_height#,0);
+adjust_fit(cap_serif_fit#,cap_serif_fit#);
+numeric circ_hair,circ_vair;
+circ_hair=hround min(hair,u+.5); circ_vair=vround min(vair,(h-x_height)/6+.5);
+penpos1(circ_vair,90); penpos3(circ_vair,-90);
+penpos2(circ_hair,180); penpos4(circ_hair,0);
+x2r=hround(.5w-1.5u-.5circ_hair);
+x4r=w-x2r; x1=x3=.5w; y1r=h+apex_o; y2=y4=.5[y1,y3];
+y3r=vround(1/3[x_height,h]+apex_o);
+penstroke pulled_arc.e(1,2) & pulled_arc.e(2,3)
+ & pulled_arc.e(3,4) & pulled_arc.e(4,1) & cycle;  % bowl
+transform Tf; Tf = identity shifted (-.5w+slant*(-y1r-.25x_height),-y1r-.25x_height);
+savePicture(RingPic);
+endgroup;
+
+extra_endchar:=
+  " czd ap(RingPic);  ad; oechar; ";
+
+boolean dotson; dotson=true; % don't omit dots on i, j, and possibly etc.
+
+def cp = urng enddef;
+
+% end of file urngacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/uumlacct.mf b/Master/texmf-dist/fonts/source/public/wnri/uumlacct.mf
new file mode 100644
index 00000000000..42b80d28d31
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/uumlacct.mf
@@ -0,0 +1,31 @@
+%
+% Washington Romanized Indic accent driver
+%
+% Macro to draw subscript umlaut accent
+%
+
+cmchar "Umlaut (diaresis) accent";
+numeric dot_diam#,dot_diam;
+dot_diam#=max(dot_size#,cap_curve#);
+beginchar(oct"177",9u#,min(asc_height#,10/7x_height#+.5dot_diam#),0);
+dot_diam=max(tiny.breadth,hround(max(dot_size,cap_curve)-2stem_corr));
+italcorr h#*slant+.5dot_diam#-2.25u#;
+adjust_fit(0,0);
+pickup tiny.nib; pos1(dot_diam,0); pos2(dot_diam,90);
+x1=x2=2.75u; top y2r=h+1;
+if bot y2l<x_height+o+slab: y2l:=min(y2r-eps,x_height+o+slab+.5tiny); fi
+y1=.5[y2l,y2r]; dot(1,2);  % left dot
+pos3(dot_diam,0); penpos4(y2r-y2l,90); y3=y4=y1; x3=x4=w-x1;
+dot(3,4);  % right dot
+transform Tf; Tf = identity shifted (-.5w+ slant*(-h-.325desc_depth),aspect_ratio*(-h-.325desc_depth));
+savePicture(UmlPic);
+endgroup;
+
+extra_endchar:=
+  " czdm ap(UmlPic);  ah; oechar; ";
+boolean dotson; dotson=true; % don't omit dots on i, j, and possibly etc.
+
+def cp = uuml enddef;
+
+% end of file uumlacct.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/wnindic.map b/Master/texmf-dist/fonts/source/public/wnri/wnindic.map
new file mode 100644
index 00000000000..3a319460003
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/wnindic.map
@@ -0,0 +1,146 @@
+%
+% Washington Romanized Indic font map file
+%
+% File       : wnindic.map
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Roman Bold and encoded according 
+% to the Classical Sanskrit/Classical Sanskrit eXtended character set. 
+%
+
+cdil.C := 128 ;          %  cedilla C : HACC extended CSX
+uml.u := 129 ;           %  umlaut u : HACC extended CSX
+acute.e := 130 ;         %  acute e : HACC extended CSX
+ubar.k := 131 ;          %  underbar k : HACC extended CSX
+uml.a := 132 ;           %  umlaut a : HACC extended CSX
+grave.a := 133 ;         %  grave a : HACC extended CSX
+odot.g := 134 ;          %  overdot g : HACC extended CSX
+cdil.c := 135 ;          %  cedilla c : HACC extended CSX
+ubar.h := 136 ;          %  underbar h : HACC extended CSX
+uml.e := 137 ;           %  umlaut e : HACC extended CSX
+grave.e := 138 ;         %  grave e : HACC extended CSX
+uml.i := 139 ;           %  umlaut i : HACC extended CSX
+uuml.L := 140 ;          %  underumlaut L : HACC extended CSX
+grave.i := 141 ;         %  grave i : HACC extended CSX
+uml.A := 142 ;           %  umlaut A : HACC extended CSX
+odot.G := 143 ;          %  overdot G : HACC extended CSX
+acute.E := 144 ;         %  acute E : HACC extended CSX
+plain.ae := 145 ;        %  plain aesc : HACC extended CSX
+plain.AE := 146 ;        %  plain Aesc : HACC extended CSX
+ubar.K := 147 ;          %  underbar K : HACC extended CSX
+uml.o := 148 ;           %  umlaut o : HACC extended CSX
+grave.o := 149 ;         %  grave o : HACC extended CSX
+odot.A := 150 ;          %  overdot A : HACC extended CSX
+grave.u := 151 ;         %  grave u : HACC extended CSX
+uuml.R := 152 ;          %  underumlaut R : HACC extended CSX
+uml.O := 153 ;           %  umlaut O : HACC extended CSX
+uml.U := 154 ;           %  umlaut U : HACC extended CSX
+macron.e := 155 ;        %  macron e : HACC extended CSX
+macron.E := 156 ;        %  macron E : HACC extended CSX
+macron.o := 157 ;        %  macron o : HACC extended CSX
+macron.O := 158 ;        %  macron O : HACC extended CSX
+ubar.r := 159 ;          %  underbar r : CSX
+acute.a := 160 ;         %  acute a : HACC extended CSX
+acute.i := 161 ;         %  acute i : HACC extended CSX
+acute.o := 162 ;         %  acute o : HACC extended CSX
+acute.u := 163 ;         %  acute u : HACC extended CSX
+tild.n := 164 ;          %  tilde n : HACC extended CSX
+tild.N := 165 ;          %  tilde N : HACC extended CSX
+tild.l := 166 ;          %  tilde l : CSX
+odot.m := 167 ;          %  overdot m : CSX
+mcbrv.a := 168 ;         %  macron breve a : CSX
+mcbrv.i := 169 ;         %  macron breve i : CSX
+mcbrv.u := 170 ;         %  macron breve u : CSX
+hach.z := 171 ;          %  hachek z : HACC extended CSX
+hach.Z := 172 ;          %  hachek Z : HACC extended CSX
+ubar.n := 173 ;          %  underbar n : CSX
+udot.k := 174 ;          %  underdot k : HACC extended CSX
+udot.K := 175 ;          %  underdot K : HACC extended CSX
+hach.c := 176 ;          %  hachek c : HACC extended CSX
+hach.C := 177 ;          %  hachek C : HACC extended CSX
+hach.s := 178 ;          %  hachek s : HACC extended CSX
+uuml.r := 179 ;          %  underumlaut r : HACC extended CSX
+ubar.t := 180 ;          %  underbar t : HACC extended CSX
+baract.a := 181 ;        %  macron acute a : CSX
+bargrv.a := 182 ;        %  macron grave a : CSX
+baract.i := 183 ;        %  macron acute i : CSX
+bargrv.i := 184 ;        %  macron grave i : CSX
+ubar.D := 185 ;          %  underbar D : HACC extended CSX
+ubar.S := 186 ;          %  underbar S : HACC extended CSX
+ubar.T := 187 ;          %  underbar T : HACC extended CSX
+ubar.Z := 188 ;          %  underbar Z : HACC extended CSX
+baract.u := 189 ;        %  macron acute u : CSX
+bargrv.u := 190 ;        %  macron grave u : CSX
+bindu.m := 191 ;         %  candrabindu m : HACC extended CSX
+mcbrv.e := 192 ;         %  macron breve e : HACC extended CSX
+mcbrv.o := 193 ;         %  macron breve o : HACC extended CSX
+plain.lgam := 194 ;      %  plain gamma : HACC extended CSX
+ubrv.H := 195 ;          %  underbreve H : HACC extended CSX
+ubar.d := 196 ;          %  underbar d : HACC extended CSX
+uuml.l := 197 ;          %  underumlaut l : HACC extended CSX
+udac.r := 198 ;          %  underdot acute r : CSX
+udgr.r := 199 ;          %  underdot grave r : CSX
+odot.Y := 200 ;          %  overdot Y : HACC extended CSX
+ubar.z := 201 ;          %  underbar z : HACC extended CSX
+ubar.s := 202 ;          %  underbar s : HACC extended CSX
+ubar.N := 203 ;          %  underbar N : HACC extended CSX
+ubar.L := 204 ;          %  underbar L : HACC extended CSX
+odot.y := 205 ;          %  overdot y : HACC extended CSX
+ubar.R := 206 ;          %  underbar R : HACC extended CSX
+muda.r := 207 ;          %  macron acute underdot r : CSX
+tild.a := 208 ;          %  tilde a : CSX
+tild.i := 209 ;          %  tilde i : CSX
+tild.u := 210 ;          %  tilde u : CSX
+tild.e := 211 ;          %  tilde e : CSX
+tild.o := 212 ;          %  tilde o : CSX
+brev.e := 213 ;          %  breve e : CSX
+brev.o := 214 ;          %  breve o : CSX
+ubar.l := 215 ;          %  underbar l : CSX
+plain.CGam := 216 ;      %  plain Gamma : HACC extended CSX
+odot.a := 217 ;          %  overdot a : HACC extended CSX
+udot.z := 218 ;          %  underdot z : HACC extended CSX
+hach.S := 219 ;          %  hachek S : HACC extended CSX
+hach.j := 220 ;          %  hachek j : HACC extended CSX
+udot.Z := 221 ;          %  underdot Z : HACC extended CSX
+ubrv.h := 222 ;          %  underbreve h : HACC extended CSX
+hach.J := 223 ;          %  hachek J : HACC extended CSX
+macron.a := 224 ;        %  macron a : CSX
+plain.eszett := 225 ;    %  plain eszett : HACC extended CSX
+macron.A := 226 ;        %  macron A : CSX
+macron.i := 227 ;        %  macron i : CSX
+macron.I := 228 ;        %  macron I : CSX
+macron.u := 229 ;        %  macron u : CSX
+macron.U := 230 ;        %  macron U : CSX
+udot.r := 231 ;          %  underdot r : CSX
+udot.R := 232 ;          %  underdot R : CSX
+udmc.r := 233 ;          %  underdot macron r : CSX
+udmc.R := 234 ;          %  underdot macron R : CSX
+udot.l := 235 ;          %  underdot l : CSX
+udot.L := 236 ;          %  underdot L : CSX
+udmc.l := 237 ;          %  underdot macron l : CSX
+udmc.L := 238 ;          %  underdot macron L : CSX
+odot.n := 239 ;          %  overdot n : CSX
+odot.N := 240 ;          %  overdot N : CSX
+udot.t := 241 ;          %  underdot t : CSX
+udot.T := 242 ;          %  underdot T : CSX
+udot.d := 243 ;          %  underdot d : CSX
+udot.D := 244 ;          %  underdot D : CSX
+udot.n := 245 ;          %  underdot n : CSX
+udot.N := 246 ;          %  underdot N : CSX
+acute.s := 247 ;         %  acute s : CSX
+acute.S := 248 ;         %  acute S : CSX
+udot.s := 249 ;          %  underdot s : CSX
+udot.S := 250 ;          %  underdot S : CSX
+plain.rootsign := 251 ;  %  plain rootsign : HACC extended CSX
+udot.m := 252 ;          %  underdot m : CSX
+udot.M := 253 ;          %  underdot M : CSX
+udot.h := 254 ;          %  underdot h : CSX
+udot.H := 255 ;          %  underdot H : CSX
diff --git a/Master/texmf-dist/fonts/source/public/wnri/wnrib10.mf b/Master/texmf-dist/fonts/source/public/wnri/wnrib10.mf
new file mode 100644
index 00000000000..9fc735e4be7
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/wnrib10.mf
@@ -0,0 +1,96 @@
+%
+% Washington Romanized Indic Roman Bold 10 point
+%
+% File       : wnrib10.mf 
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Roman Bold and encoded according 
+% to the Classical Sanskrit/Classical Sanskrit eXtended character set. 
+% See wnindic.map for more details.
+%
+
+if unknown cmbase: input cmbase fi
+
+font_identifier:="WNRIB"; font_size 10pt#;
+
+u#:=20/36pt#;             % unit width
+width_adj#:=10/36pt#;     % width adjustment for certain characters
+serif_fit#:=0pt#;         % extra sidebar near lowercase serifs
+cap_serif_fit#:=6/36pt#;  % extra sidebar near uppercase serifs
+letter_fit#:=0pt#;        % extra space added to all sidebars
+
+body_height#:=270/36pt#;  % height of tallest characters
+asc_height#:=250/36pt#;   % height of lowercase ascenders
+cap_height#:=247/36pt#;   % height of caps
+fig_height#:=232/36pt#;   % height of numerals
+x_height#:=160/36pt#;     % height of lowercase without ascenders
+math_axis#:=90/36pt#;     % axis of symmetry for math symbols
+bar_height#:=85/36pt#;    % height of crossbar in lowercase e
+comma_depth#:=70/36pt#;   % depth of comma below baseline
+desc_depth#:=70/36pt#;    % depth of lowercase descenders
+
+crisp#:=0pt#;             % diameter of serif corners
+tiny#:=13/36pt#;          % diameter of rounded corners
+fine#:=10/36pt#;          % diameter of sharply rounded corners
+thin_join#:=10/36pt#;     % width of extrafine details
+hair#:=17/36pt#;          % lowercase hairline breadth
+stem#:=41/36pt#;          % lowercase stem breadth
+curve#:=46/36pt#;         % lowercase curve breadth
+ess#:=38/36pt#;           % breadth in middle of lowercase s
+flare#:=45/36pt#;         % diameter of bulbs or breadth of terminals
+dot_size#:=56/36pt#;      % diameter of dots
+cap_hair#:=19/36pt#;      % uppercase hairline breadth
+cap_stem#:=51/36pt#;      % uppercase stem breadth
+cap_curve#:=55/36pt#;     % uppercase curve breadth
+cap_ess#:=53/36pt#;       % breadth in middle of uppercase s
+rule_thickness#:=.6pt#;   % thickness of lines in math symbols
+
+dish#:=1/36pt#;           % amount erased at top or bottom of serifs
+bracket#:=10/36pt#;       % vertical distance from serif base to tangent
+jut#:=25/36pt#;           % protrusion of lowercase serifs
+cap_jut#:=34/36pt#;       % protrusion of uppercase serifs
+beak_jut#:=11/36pt#;      % horizontal protrusion of beak serifs
+beak#:=70/36pt#;          % vertical protrusion of beak serifs
+vair#:=13/36pt#;          % vertical diameter of hairlines
+notch_cut#:=10pt#;        % maximum breadth above or below notches
+bar#:=17/36pt#;           % lowercase bar thickness
+slab#:=17/36pt#;          % serif and arm thickness
+cap_bar#:=17/36pt#;       % uppercase bar thickness
+cap_band#:=17/36pt#;      % uppercase thickness above/below lobes
+cap_notch_cut#:=10pt#;    % max breadth above/below uppercase notches
+serif_drop#:=3/36pt#;     % vertical drop of sloped serifs
+stem_corr#:=2/36pt#;      % for small refinements of stem breadth
+vair_corr#:=1.5/36pt#;    % for small refinements of hairline height
+apex_corr#:=0pt#;         % extra width at diagonal junctions
+
+o#:=4/36pt#;              % amount of overshoot for curves
+apex_o#:=3/36pt#;         % amount of overshoot for diagonal junctions
+
+slant:=0;                 % tilt ratio $(^Delta x/^Delta y)$
+fudge:=1;                 % factor applied to weights of heavy characters
+math_spread:=.5;          % extra openness of math symbols
+superness:=8/11;          % parameter for superellipses
+superpull:=1/8;           % extra openness inside bowls
+beak_darkness:=.4;        % fraction of triangle inside beak serifs
+ligs:=2;                  % level of ligatures to be included
+
+square_dots:=false;       % should dots be square?
+hefty:=false;             % should we try hard not to be overweight?
+serifs:=true;             % should serifs and bulbs be attached?
+monospace:=false;         % should all characters have the same width?
+variant_g:=false;         % should an italic-style g be used?
+low_asterisk:=false;      % should the asterisk be centered at the axis?
+math_fitting:=false;      % should math-mode spacing be used?
+
+generate romanskt         % switch to the driver file
+
+% end of file wnrib10.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/wnrib8.mf b/Master/texmf-dist/fonts/source/public/wnri/wnrib8.mf
new file mode 100644
index 00000000000..4cc4cd3eab9
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/wnrib8.mf
@@ -0,0 +1,96 @@
+%
+% Washington Romanized Indic Bold (Extended) 8 point
+%
+% File       : wnrib8.mf
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Roman Bold Extended and encoded 
+% according to the Classical Sanskrit/Classical Sanskrit eXtended 
+% character set. See wnindic.map for more details.
+%
+
+if unknown cmbase: input cmbase fi
+
+font_identifier:="WNRIB"; font_size 8pt#;
+
+u#:=19.6/36pt#;            % unit width
+width_adj#:=9.4/36pt#;     % width adjustment for certain characters
+serif_fit#:=0pt#;          % extra sidebar near lowercase serifs
+cap_serif_fit#:=5.4/36pt#; % extra sidebar near uppercase serifs
+letter_fit#:=0pt#;         % extra space added to all sidebars
+
+body_height#:=216/36pt#;  % height of tallest characters
+asc_height#:=200/36pt#;   % height of lowercase ascenders
+cap_height#:=197.6/36pt#; % height of caps
+fig_height#:=185.6/36pt#; % height of numerals
+x_height#:=128/36pt#;     % height of lowercase without ascenders
+math_axis#:=72/36pt#;     % axis of symmetry for math symbols
+bar_height#:=67/36pt#;    % height of crossbar in lowercase e
+comma_depth#:=56/36pt#;   % depth of comma below baseline
+desc_depth#:=56/36pt#;    % depth of lowercase descenders
+
+crisp#:=0pt#;             % diameter of serif corners
+tiny#:=12/36pt#;          % diameter of rounded corners
+fine#:=10/36pt#;          % diameter of sharply rounded corners
+thin_join#:=10/36pt#;     % width of extrafine details
+hair#:=16.2/36pt#;        % lowercase hairline breadth
+stem#:=35/36pt#;          % lowercase stem breadth
+curve#:=39/36pt#;         % lowercase curve breadth
+ess#:=32/36pt#;           % breadth in middle of lowercase s
+flare#:=39/36pt#;         % diameter of bulbs or breadth of terminals
+dot_size#:=46/36pt#;      % diameter of dots
+cap_hair#:=19/36pt#;      % uppercase hairline breadth
+cap_stem#:=43/36pt#;      % uppercase stem breadth
+cap_curve#:=46/36pt#;     % uppercase curve breadth
+cap_ess#:=43/36pt#;       % breadth in middle of uppercase s
+rule_thickness#:=.54pt#;  % thickness of lines in math symbols
+
+dish#:=1/36pt#;           % amount erased at top or bottom of serifs
+bracket#:=8/36pt#;        % vertical distance from serif base to tangent
+jut#:=19/36pt#;           % protrusion of lowercase serifs
+cap_jut#:=31/36pt#;       % protrusion of uppercase serifs
+beak_jut#:=9.4/36pt#;     % horizontal protrusion of beak serifs
+beak#:=55/36pt#;          % vertical protrusion of beak serifs
+vair#:=12/36pt#;          % vertical diameter of hairlines
+notch_cut#:=8pt#;         % maximum breadth above or below notches
+bar#:=15/36pt#;           % lowercase bar thickness
+slab#:=15/36pt#;          % serif and arm thickness
+cap_bar#:=15/36pt#;       % uppercase bar thickness
+cap_band#:=15/36pt#;      % uppercase thickness above/below lobes
+cap_notch_cut#:=8pt#;     % max breadth above/below uppercase notches
+serif_drop#:=2.4/36pt#;   % vertical drop of sloped serifs
+stem_corr#:=1.8/36pt#;    % for small refinements of stem breadth
+vair_corr#:=1.3/36pt#;    % for small refinements of hairline height
+apex_corr#:=0pt#;         % extra width at diagonal junctions
+
+o#:=4/36pt#;              % amount of overshoot for curves
+apex_o#:=3/36pt#;         % amount of overshoot for diagonal junctions
+
+slant:=0;                 % tilt ratio $(\Delta x/\Delta y)$
+fudge:=1;                 % factor applied to weights of heavy characters
+math_spread:=.9;          % extra openness of math symbols
+superness:=8/11;          % parameter for superellipses
+superpull:=1/8;           % extra openness inside bowls
+beak_darkness:=.4;        % fraction of triangle inside beak serifs
+ligs:=2;                  % level of ligatures to be included
+
+square_dots:=false;       % should dots be square?
+hefty:=false;             % should we try hard not to be overweight?
+serifs:=true;             % should serifs and bulbs be attached?
+monospace:=false;         % should all characters have the same width?
+variant_g:=false;         % should an italic-style g be used?
+low_asterisk:=false;      % should the asterisk be centered at the axis?
+math_fitting:=false;      % should math-mode spacing be used?
+
+generate romanskt         % switch to the driver file
+
+% end of file wnrib8.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/wnribi10.mf b/Master/texmf-dist/fonts/source/public/wnri/wnribi10.mf
new file mode 100644
index 00000000000..38f49999b2c
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/wnribi10.mf
@@ -0,0 +1,96 @@
+%
+% Washington Romanized Indic Bold (Extended) Italic 10 point
+%
+% File       : wnribi10.mf
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Bold Extended Italic and encoded 
+% according to the Classical Sanskrit/Classical Sanskrit eXtended 
+% character set. See wnindic.map for more details.
+%
+
+if unknown cmbase: input cmbase fi
+
+font_identifier:="WNRIBI"; font_size 10pt#;
+
+u#:=21.2/36pt#;           % unit width
+width_adj#:=11/36pt#;     % width adjustment for certain characters
+serif_fit#:=0pt#;         % extra sidebar near lowercase serifs
+cap_serif_fit#:=7/36pt#;  % extra sidebar near uppercase serifs
+letter_fit#:=11/36pt#;    % extra space added to all sidebars
+
+body_height#:=270/36pt#;  % height of tallest characters
+asc_height#:=250/36pt#;   % height of lowercase ascenders
+cap_height#:=247/36pt#;   % height of caps
+fig_height#:=232/36pt#;   % height of numerals
+x_height#:=160/36pt#;     % height of lowercase without ascenders
+math_axis#:=90/36pt#;     % axis of symmetry for math symbols
+bar_height#:=85/36pt#;    % height of crossbar in lowercase e
+comma_depth#:=70/36pt#;   % depth of comma below baseline
+desc_depth#:=70/36pt#;    % depth of lowercase descenders
+
+crisp#:=13/36pt#;         % diameter of serif corners
+tiny#:=13/36pt#;          % diameter of rounded corners
+fine#:=10/36pt#;          % diameter of sharply rounded corners
+thin_join#:=10/36pt#;     % width of extrafine details
+hair#:=20/36pt#;          % lowercase hairline breadth
+stem#:=38/36pt#;          % lowercase stem breadth
+curve#:=43/36pt#;         % lowercase curve breadth
+ess#:=35/36pt#;           % breadth in middle of lowercase s
+flare#:=42/36pt#;         % diameter of bulbs or breadth of terminals
+dot_size#:=53/36pt#;      % diameter of dots
+cap_hair#:=22/36pt#;      % uppercase hairline breadth
+cap_stem#:=49/36pt#;      % uppercase stem breadth
+cap_curve#:=52/36pt#;     % uppercase curve breadth
+cap_ess#:=50/36pt#;       % breadth in middle of uppercase s
+rule_thickness#:=.6pt#;   % thickness of lines in math symbols
+
+dish#:=1/36pt#;           % amount erased at top or bottom of serifs
+bracket#:=10/36pt#;       % vertical distance from serif base to tangent
+jut#:=27/36pt#;           % protrusion of lowercase serifs
+cap_jut#:=39/36pt#;       % protrusion of uppercase serifs
+beak_jut#:=10/36pt#;      % horizontal protrusion of beak serifs
+beak#:=70/36pt#;          % vertical protrusion of beak serifs
+vair#:=13/36pt#;          % vertical diameter of hairlines
+notch_cut#:=10pt#;        % maximum breadth above or below notches
+bar#:=17/36pt#;           % lowercase bar thickness
+slab#:=17/36pt#;          % serif and arm thickness
+cap_bar#:=17/36pt#;       % uppercase bar thickness
+cap_band#:=17/36pt#;      % uppercase thickness above/below lobes
+cap_notch_cut#:=10pt#;    % max breadth above/below uppercase notches
+serif_drop#:=3/36pt#;     % vertical drop of sloped serifs
+stem_corr#:=2/36pt#;      % for small refinements of stem breadth
+vair_corr#:=1.5/36pt#;    % for small refinements of hairline height
+apex_corr#:=0pt#;         % extra width at diagonal junctions
+
+o#:=6/36pt#;              % amount of overshoot for curves
+apex_o#:=6/36pt#;         % amount of overshoot for diagonal junctions
+
+slant:=.25;               % tilt ratio $(^Delta x/^Delta y)$
+fudge:=1;                 % factor applied to weights of heavy characters
+math_spread:=.5;          % extra openness of math symbols
+superness:=8/11;          % parameter for superellipses
+superpull:=1/8;           % extra openness inside bowls
+beak_darkness:=.4;        % fraction of triangle inside beak serifs
+ligs:=2;                  % level of ligatures to be included
+
+square_dots:=false;       % should dots be square?
+hefty:=false;             % should we try hard not to be overweight?
+serifs:=true;             % should serifs and bulbs be attached?
+monospace:=false;         % should all characters have the same width?
+variant_g:=true;          % should an italic-style g be used?
+low_asterisk:=false;      % should the asterisk be centered at the axis?
+math_fitting:=false;      % should math-mode spacing be used?
+
+generate italcskt         % switch to the driver file
+
+% end of file wnribi10.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/wnrii10.mf b/Master/texmf-dist/fonts/source/public/wnri/wnrii10.mf
new file mode 100644
index 00000000000..a3506dd34f7
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/wnrii10.mf
@@ -0,0 +1,98 @@
+%
+% Washington Romanized Indic Italic 10 point
+%
+% File       : wnrii10.mf
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Roman and encoded according to
+% the Classical Sanskrit/Classical Sanskrit eXtended character set. 
+% See wnindic.map for more details.
+%
+
+if unknown cmbase: input cmbase fi
+
+font_identifier:="WNRII"; font_size 10pt#;
+
+u#:=18.4/36pt#;           % unit width
+width_adj#:=0pt#;         % width adjustment for certain characters
+serif_fit#:=0pt#;         % extra sidebar near lowercase serifs
+cap_serif_fit#:=5/36pt#;  % extra sidebar near uppercase serifs
+letter_fit#:=9.2/36pt#;   % extra space added to all sidebars
+
+body_height#:=270/36pt#;  % height of tallest characters
+asc_height#:=250/36pt#;   % height of lowercase ascenders
+cap_height#:=246/36pt#;   % height of caps
+fig_height#:=232/36pt#;   % height of numerals
+x_height#:=155/36pt#;     % height of lowercase without ascenders
+math_axis#:=90/36pt#;     % axis of symmetry for math symbols
+bar_height#:=87/36pt#;    % height of crossbar in lowercase e
+comma_depth#:=70/36pt#;   % depth of comma below baseline
+desc_depth#:=70/36pt#;    % depth of lowercase descenders
+
+crisp#:=8/36pt#;          % diameter of serif corners
+tiny#:=8/36pt#;           % diameter of rounded corners
+fine#:=7/36pt#;           % diameter of sharply rounded corners
+thin_join#:=7/36pt#;      % width of extrafine details
+hair#:=11/36pt#;          % lowercase hairline breadth
+stem#:=23/36pt#;          % lowercase stem breadth
+curve#:=28/36pt#;         % lowercase curve breadth
+ess#:=27/36pt#;           % breadth in middle of lowercase s
+flare#:=29/36pt#;         % diameter of bulbs or breadth of terminals
+dot_size#:=38/36pt#;      % diameter of dots
+cap_hair#:=11/36pt#;      % uppercase hairline breadth
+cap_stem#:=29/36pt#;      % uppercase stem breadth
+cap_curve#:=34/36pt#;     % uppercase curve breadth
+cap_ess#:=31/36pt#;       % breadth in middle of uppercase s
+rule_thickness#:=.4pt#;   % thickness of lines in math symbols
+
+dish#:=1/36pt#;           % amount erased at top or bottom of serifs
+bracket#:=20/36pt#;       % vertical distance from serif base to tangent
+jut#:=30/36pt#;           % protrusion of lowercase serifs
+cap_jut#:=34/36pt#;       % protrusion of uppercase serifs
+beak_jut#:=9/36pt#;       % horizontal protrusion of beak serifs
+beak#:=70/36pt#;          % vertical protrusion of beak serifs
+vair#:=8/36pt#;           % vertical diameter of hairlines
+notch_cut#:=10pt#;        % maximum breadth above or below notches
+bar#:=11/36pt#;           % lowercase bar thickness
+slab#:=11/36pt#;          % serif and arm thickness
+cap_bar#:=11/36pt#;       % uppercase bar thickness
+cap_band#:=11/36pt#;      % uppercase thickness above/below lobes
+cap_notch_cut#:=10pt#;    % max breadth above/below uppercase notches
+serif_drop#:=4/36pt#;     % vertical drop of sloped serifs
+stem_corr#:=1/36pt#;      % for small refinements of stem breadth
+vair_corr#:=1/36pt#;      % for small refinements of hairline height
+apex_corr#:=0pt#;         % extra width at diagonal junctions
+
+o#:=8/36pt#;              % amount of overshoot for curves
+apex_o#:=8/36pt#;         % amount of overshoot for diagonal junctions
+
+slant:=.25;               % tilt ratio $(\Delta x/\Delta y)$
+fudge:=1;                 % factor applied to weights of heavy characters
+math_spread:=0;           % extra openness of math symbols
+superness:=1/sqrt2;       % parameter for superellipses
+superpull:=1/6;           % extra openness inside bowls
+beak_darkness:=11/30;     % fraction of triangle inside beak serifs
+ligs:=2;                  % level of ligatures to be included
+
+square_dots:=false;       % should dots be square?
+hefty:=false;             % should we try hard not to be overweight?
+serifs:=true;             % should serifs and bulbs be attached?
+monospace:=false;         % should all characters have the same width?
+variant_g:=true;          % should an italic-style g be used?
+low_asterisk:=false;      % should the asterisk be centered at the axis?
+math_fitting:=false;      % should math-mode spacing be used?
+
+generate italcskt;        % switch to the driver file
+
+% end of file wnrii10.mf
+
+
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/wnrii8.mf b/Master/texmf-dist/fonts/source/public/wnri/wnrii8.mf
new file mode 100644
index 00000000000..375644628fc
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/wnrii8.mf
@@ -0,0 +1,96 @@
+%
+% Washington Romanized Indic Italic 8 point
+%
+% File       : wnrii8.mf
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Italic and encoded according to
+% the Classical Sanskrit/Classical Sanskrit eXtended character set. 
+% See wnindic.map for more details.
+%
+
+if unknown cmbase: input cmbase fi
+
+font_identifier:="WNRII"; font_size 8pt#;
+
+u#:=15.8/36pt#;            % unit width
+width_adj#:=0pt#;          % width adjustment for certain characters
+serif_fit#:=0pt#;          % extra sidebar near lowercase serifs
+cap_serif_fit#:=4.1/36pt#; % extra sidebar near uppercase serifs
+letter_fit#:=7.9/36pt#;    % extra space added to all sidebars
+
+body_height#:=216/36pt#;   % height of tallest characters
+asc_height#:=200/36pt#;    % height of lowercase ascenders
+cap_height#:=196.8/36pt#;  % height of caps
+fig_height#:=185.6/36pt#;  % height of numerals
+x_height#:=124/36pt#;      % height of lowercase without ascenders
+math_axis#:=72/36pt#;      % axis of symmetry for math symbols
+bar_height#:=69.6/36pt#;   % height of crossbar in lowercase e
+comma_depth#:=56/36pt#;    % depth of comma below baseline
+desc_depth#:=56/36pt#;     % depth of lowercase descenders
+
+crisp#:=8/36pt#;           % diameter of serif corners
+tiny#:=8/36pt#;            % diameter of rounded corners
+fine#:=7/36pt#;            % diameter of sharply rounded corners
+thin_join#:=7/36pt#;       % width of extrafine details
+hair#:=11/36pt#;           % lowercase hairline breadth
+stem#:=20/36pt#;           % lowercase stem breadth
+curve#:=23.5/36pt#;        % lowercase curve breadth
+ess#:=23/36pt#;            % breadth in middle of lowercase s
+flare#:=24/36pt#;          % diameter of bulbs or breadth of terminals
+dot_size#:=32/36pt#;       % diameter of dots
+cap_hair#:=11/36pt#;       % uppercase hairline breadth
+cap_stem#:=23.5/36pt#;     % uppercase stem breadth
+cap_curve#:=27/36pt#;      % uppercase curve breadth
+cap_ess#:=24/36pt#;        % breadth in middle of uppercase s
+rule_thickness#:=.36pt#;   % thickness of lines in math symbols
+
+dish#:=1/36pt#;            % amount erased at top or bottom of serifs
+bracket#:=16/36pt#;        % vertical distance from serif base to tangent
+jut#:=24/36pt#;            % protrusion of lowercase serifs
+cap_jut#:=27/36pt#;        % protrusion of uppercase serifs
+beak_jut#:=7.9/36pt#;      % horizontal protrusion of beak serifs
+beak#:=56/36pt#;           % vertical protrusion of beak serifs
+vair#:=8/36pt#;            % vertical diameter of hairlines
+notch_cut#:=8pt#;          % maximum breadth above or below notches
+bar#:=9.5/36pt#;           % lowercase bar thickness
+slab#:=9.5/36pt#;          % serif and arm thickness
+cap_bar#:=9.5/36pt#;       % uppercase bar thickness
+cap_band#:=9.5/36pt#;      % uppercase thickness above/below lobes
+cap_notch_cut#:=8pt#;      % max breadth above/below uppercase notches
+serif_drop#:=3.2/36pt#;    % vertical drop of sloped serifs
+stem_corr#:=1/36pt#;       % for small refinements of stem breadth
+vair_corr#:=1/36pt#;       % for small refinements of hairline height
+apex_corr#:=0pt#;          % extra width at diagonal junctions
+
+o#:=6/36pt#;               % amount of overshoot for curves
+apex_o#:=6/36pt#;          % amount of overshoot for diagonal junctions
+
+slant:=.25;                % tilt ratio $(\Delta x/\Delta y)$
+fudge:=1;                  % factor applied to weights of heavy characters
+math_spread:=.4;           % extra openness of math symbols
+superness:=1/sqrt2;        % parameter for superellipses
+superpull:=1/6;            % extra openness inside bowls
+beak_darkness:=11/30;      % fraction of triangle inside beak serifs
+ligs:=2;                   % level of ligatures to be included
+
+square_dots:=false;        % should dots be square?
+hefty:=false;              % should we try hard not to be overweight?
+serifs:=true;              % should serifs and bulbs be attached?
+monospace:=false;          % should all characters have the same width?
+variant_g:=true;           % should an italic-style g be used?
+low_asterisk:=false;       % should the asterisk be centered at the axis?
+math_fitting:=false;       % should math-mode spacing be used?
+
+generate italcskt          % switch to the driver file
+
+% end of file wnrii8.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/wnrir10.mf b/Master/texmf-dist/fonts/source/public/wnri/wnrir10.mf
new file mode 100644
index 00000000000..4e45ab08976
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/wnrir10.mf
@@ -0,0 +1,97 @@
+%
+% Washington Romanized Indic Roman 10 point
+%
+% File       : wnrir10.mf
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Roman and encoded according to
+% the Classical Sanskrit/Classical Sanskrit eXtended character set. 
+% See wnindic.map for more details.
+%
+
+if unknown cmbase: input cmbase fi
+
+font_identifier:="WNRIR"; font_size 10pt#;
+
+u#:=20/36pt#;             % unit width
+width_adj#:=0pt#;         % width adjustment for certain characters
+serif_fit#:=0pt#;         % extra sidebar near lowercase serifs
+cap_serif_fit#:=5/36pt#;  % extra sidebar near uppercase serifs
+letter_fit#:=0pt#;        % extra space added to all sidebars
+
+body_height#:=270/36pt#;  % height of tallest characters
+asc_height#:=250/36pt#;   % height of lowercase ascenders
+cap_height#:=246/36pt#;   % height of caps
+fig_height#:=232/36pt#;   % height of numerals
+x_height#:=155/36pt#;     % height of lowercase without ascenders
+math_axis#:=90/36pt#;     % axis of symmetry for math symbols
+bar_height#:=87/36pt#;    % height of crossbar in lowercase e
+comma_depth#:=70/36pt#;   % depth of comma below baseline
+desc_depth#:=70/36pt#;    % depth of lowercase descenders
+
+crisp#:=0pt#;             % diameter of serif corners
+tiny#:=8/36pt#;           % diameter of rounded corners
+fine#:=7/36pt#;           % diameter of sharply rounded corners
+thin_join#:=7/36pt#;      % width of extrafine details
+hair#:=9/36pt#;           % lowercase hairline breadth
+stem#:=25/36pt#;          % lowercase stem breadth
+curve#:=30/36pt#;         % lowercase curve breadth
+ess#:=27/36pt#;           % breadth in middle of lowercase s
+flare#:=33/36pt#;         % diameter of bulbs or breadth of terminals
+dot_size#:=38/36pt#;      % diameter of dots
+cap_hair#:=11/36pt#;      % uppercase hairline breadth
+cap_stem#:=32/36pt#;      % uppercase stem breadth
+cap_curve#:=37/36pt#;     % uppercase curve breadth
+cap_ess#:=35/36pt#;       % breadth in middle of uppercase s
+rule_thickness#:=.4pt#;   % thickness of lines in math symbols
+
+dish#:=1/36pt#;           % amount erased at top or bottom of serifs
+bracket#:=20/36pt#;       % vertical distance from serif base to tangent
+jut#:=28/36pt#;           % protrusion of lowercase serifs
+cap_jut#:=37/36pt#;       % protrusion of uppercase serifs
+beak_jut#:=10/36pt#;      % horizontal protrusion of beak serifs
+beak#:=70/36pt#;          % vertical protrusion of beak serifs
+vair#:=8/36pt#;           % vertical diameter of hairlines
+notch_cut#:=10pt#;        % maximum breadth above or below notches
+bar#:=11/36pt#;           % lowercase bar thickness
+slab#:=11/36pt#;          % serif and arm thickness
+cap_bar#:=11/36pt#;       % uppercase bar thickness
+cap_band#:=11/36pt#;      % uppercase thickness above/below lobes
+cap_notch_cut#:=10pt#;    % max breadth above/below uppercase notches
+serif_drop#:=4/36pt#;     % vertical drop of sloped serifs
+stem_corr#:=1/36pt#;      % for small refinements of stem breadth
+vair_corr#:=1/36pt#;      % for small refinements of hairline height
+apex_corr#:=0pt#;         % extra width at diagonal junctions
+
+o#:=8/36pt#;              % amount of overshoot for curves
+apex_o#:=8/36pt#;         % amount of overshoot for diagonal junctions
+
+slant:=0;                 % tilt ratio $(\Delta x/\Delta y)$
+fudge:=1;                 % factor applied to weights of heavy characters
+math_spread:=0;           % extra openness of math symbols
+superness:=1/sqrt2;       % parameter for superellipses
+superpull:=1/6;           % extra openness inside bowls
+beak_darkness:=11/30;     % fraction of triangle inside beak serifs
+ligs:=2;                  % level of ligatures to be included
+
+square_dots:=false;       % should dots be square?
+hefty:=false;             % should we try hard not to be overweight?
+serifs:=true;             % should serifs and bulbs be attached?
+monospace:=false;         % should all characters have the same width?
+variant_g:=false;         % should an italic-style g be used?
+low_asterisk:=false;      % should the asterisk be centered at the axis?
+math_fitting:=false;      % should math-mode spacing be used?
+
+generate romanskt;        % switch to the driver file
+
+% end of file wnrir10.mf
+
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/wnrir8.mf b/Master/texmf-dist/fonts/source/public/wnri/wnrir8.mf
new file mode 100644
index 00000000000..7b42cbcaf11
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/wnrir8.mf
@@ -0,0 +1,96 @@
+%
+% Washington Romanized Indic Roman 8 point
+%
+% File       : wnrir8.mf
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% Date       : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Roman and encoded according to
+% the Classical Sanskrit/Classical Sanskrit eXtended character set. 
+% See wnindic.map for more details.
+%
+
+if unknown cmbase: input cmbase fi
+
+font_identifier:="WNRIR"; font_size 8pt#;
+
+u#:=17/36pt#;              % unit width
+width_adj#:=0pt#;          % width adjustment for certain characters
+serif_fit#:=0pt#;          % extra sidebar near lowercase serifs
+cap_serif_fit#:=4.1/36pt#; % extra sidebar near uppercase serifs
+letter_fit#:=0pt#;         % extra space added to all sidebars
+
+body_height#:=216/36pt#;   % height of tallest characters
+asc_height#:=200/36pt#;    % height of lowercase ascenders
+cap_height#:=196.8/36pt#;  % height of caps
+fig_height#:=185.6/36pt#;  % height of numerals
+x_height#:=124/36pt#;      % height of lowercase without ascenders
+math_axis#:=72/36pt#;      % axis of symmetry for math symbols
+bar_height#:=69.6/36pt#;   % height of crossbar in lowercase e
+comma_depth#:=56/36pt#;    % depth of comma below baseline
+desc_depth#:=56/36pt#;     % depth of lowercase descenders
+
+crisp#:=0pt#;              % diameter of serif corners
+tiny#:=8/36pt#;            % diameter of rounded corners
+fine#:=7/36pt#;            % diameter of sharply rounded corners
+thin_join#:=7/36pt#;       % width of extrafine details
+hair#:=9/36pt#;            % lowercase hairline breadth
+stem#:=22/36pt#;           % lowercase stem breadth
+curve#:=25.5/36pt#;        % lowercase curve breadth
+ess#:=23/36pt#;            % breadth in middle of lowercase s
+flare#:=27/36pt#;          % diameter of bulbs or breadth of terminals
+dot_size#:=32/36pt#;       % diameter of dots
+cap_hair#:=9.5/36pt#;      % uppercase hairline breadth
+cap_stem#:=26.5/36pt#;     % uppercase stem breadth
+cap_curve#:=30/36pt#;      % uppercase curve breadth
+cap_ess#:=27/36pt#;        % breadth in middle of uppercase s
+rule_thickness#:=.36pt#;   % thickness of lines in math symbols
+
+dish#:=1/36pt#;            % amount erased at top or bottom of serifs
+bracket#:=16/36pt#;        % vertical distance from serif base to tangent
+jut#:=22/36pt#;            % protrusion of lowercase serifs
+cap_jut#:=29/36pt#;        % protrusion of uppercase serifs
+beak_jut#:=8.4/36pt#;      % horizontal protrusion of beak serifs
+beak#:=56/36pt#;           % vertical protrusion of beak serifs
+vair#:=8/36pt#;            % vertical diameter of hairlines
+notch_cut#:=8pt#;          % maximum breadth above or below notches
+bar#:=9.5/36pt#;           % lowercase bar thickness
+slab#:=9.5/36pt#;          % serif and arm thickness
+cap_bar#:=9.5/36pt#;       % uppercase bar thickness
+cap_band#:=9.5/36pt#;      % uppercase thickness above/below lobes
+cap_notch_cut#:=8pt#;      % max breadth above/below uppercase notches
+serif_drop#:=3.2/36pt#;    % vertical drop of sloped serifs
+stem_corr#:=1/36pt#;       % for small refinements of stem breadth
+vair_corr#:=1/36pt#;       % for small refinements of hairline height
+apex_corr#:=0pt#;          % extra width at diagonal junctions
+
+o#:=6/36pt#;               % amount of overshoot for curves
+apex_o#:=6/36pt#;          % amount of overshoot for diagonal junctions
+
+slant:=0;                  % tilt ratio $(\Delta x/\Delta y)$
+fudge:=1;                  % factor applied to weights of heavy characters
+math_spread:=.4;           % extra openness of math symbols
+superness:=1/sqrt2;        % parameter for superellipses
+superpull:=1/6;            % extra openness inside bowls
+beak_darkness:=11/30;      % fraction of triangle inside beak serifs
+ligs:=2;                   % level of ligatures to be included
+
+square_dots:=false;        % should dots be square?
+hefty:=false;              % should we try hard not to be overweight?
+serifs:=true;              % should serifs and bulbs be attached?
+monospace:=false;          % should all characters have the same width?
+variant_g:=false;          % should an italic-style g be used?
+low_asterisk:=false;       % should the asterisk be centered at the axis?
+math_fitting:=false;       % should math-mode spacing be used?
+
+generate romanskt          % switch to the driver file
+
+% end of file wnrir8.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/wnris10.mf b/Master/texmf-dist/fonts/source/public/wnri/wnris10.mf
new file mode 100644
index 00000000000..e45b6f62360
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/wnris10.mf
@@ -0,0 +1,96 @@
+%
+% Washington Romanized Indic San Serif 10 point
+%
+% File       : wnris10.mf
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Roman and encoded according to
+% the Classical Sanskrit/Classical Sanskrit eXtended character set. 
+% See wnindic.map for more details.
+%
+
+if unknown cmbase: input cmbase fi
+
+font_identifier:="WNRIS"; font_size 10pt#;
+
+u#:=20/36pt#;              % unit width
+width_adj#:=15/36pt#;      % width adjustment for certain characters
+serif_fit#:=-7/36pt#;      % extra sidebar near lowercase serifs
+cap_serif_fit#:=-10/36pt#; % extra sidebar near uppercase serifs
+letter_fit#:=0pt#;         % extra space added to all sidebars
+
+body_height#:=270/36pt#;   % height of tallest characters
+asc_height#:=250/36pt#;    % height of lowercase ascenders
+cap_height#:=250/36pt#;    % height of caps
+fig_height#:=236/36pt#;    % height of numerals
+x_height#:=160/36pt#;      % height of lowercase without ascenders
+math_axis#:=90/36pt#;      % axis of symmetry for math symbols
+bar_height#:=79/36pt#;     % height of crossbar in lowercase e
+comma_depth#:=45/36pt#;    % depth of comma below baseline
+desc_depth#:=70/36pt#;     % depth of lowercase descenders
+
+crisp#:=0pt#;              % diameter of serif corners
+tiny#:=0pt#;               % diameter of rounded corners
+fine#:=0pt#;               % diameter of sharply rounded corners
+thin_join#:=17/36pt#;      % width of extrafine details
+hair#:=28/36pt#;           % lowercase hairline breadth
+stem#:=28/36pt#;           % lowercase stem breadth
+curve#:=28/36pt#;          % lowercase curve breadth
+ess#:=28/36pt#;            % breadth in middle of lowercase s
+flare#:=25/36pt#;          % diameter of bulbs or breadth of terminals
+dot_size#:=30/36pt#;       % diameter of dots
+cap_hair#:=28/36pt#;       % uppercase hairline breadth
+cap_stem#:=32/36pt#;       % uppercase stem breadth
+cap_curve#:=32/36pt#;      % uppercase curve breadth
+cap_ess#:=32/36pt#;        % breadth in middle of uppercase s
+rule_thickness#:=.4pt#;    % thickness of lines in math symbols
+
+dish#:=0pt#;               % amount erased at top or bottom of serifs
+bracket#:=0pt#;            % vertical distance from serif base to tangent
+jut#:=0pt#;                % protrusion of lowercase serifs
+cap_jut#:=0pt#;            % protrusion of uppercase serifs
+beak_jut#:=0pt#;           % horizontal protrusion of beak serifs
+beak#:=.5/36pt#;           % vertical protrusion of beak serifs
+vair#:=22/36pt#;           % vertical diameter of hairlines
+notch_cut#:=18/36pt#;      % maximum breadth above or below notches
+bar#:=21/36pt#;            % lowercase bar thickness
+slab#:=23/36pt#;           % serif and arm thickness
+cap_bar#:=22/36pt#;        % uppercase bar thickness
+cap_band#:=20/36pt#;       % uppercase thickness above/below lobes
+cap_notch_cut#:=25/36pt#;  % max breadth above/below uppercase notches
+serif_drop#:=2/36pt#;      % vertical drop of sloped serifs
+stem_corr#:=1/36pt#;       % for small refinements of stem breadth
+vair_corr#:=1/36pt#;       % for small refinements of hairline height
+apex_corr#:=5/36pt#;       % extra width at diagonal junctions
+
+o#:=8/36pt#;               % amount of overshoot for curves
+apex_o#:=0pt#;             % amount of overshoot for diagonal junctions
+
+slant:=0;                  % tilt ratio $(\Delta x/\Delta y)$
+fudge:=.96;                % factor applied to weights of heavy characters
+math_spread:=0;            % extra openness of math symbols
+superness:=1/sqrt 2;       % parameter for superellipses
+superpull:=1/20;           % extra openness inside bowls
+beak_darkness:=0;          % fraction of triangle inside beak serifs
+ligs:=2;                   % level of ligatures to be included
+
+square_dots:=true;         % should dots be square?
+hefty:=true;               % should we try hard not to be overweight?
+serifs:=false;             % should serifs and bulbs be attached?
+monospace:=false;          % should all characters have the same width?
+variant_g:=false;          % should an italic-style g be used?
+low_asterisk:=false;       % should the asterisk be centered at the axis?
+math_fitting:=false;       % should math-mode spacing be used?
+
+generate romanskt          % switch to the driver file
+
+% end of file wnris10.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/wnris8.mf b/Master/texmf-dist/fonts/source/public/wnri/wnris8.mf
new file mode 100644
index 00000000000..6d7f9b70980
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/wnris8.mf
@@ -0,0 +1,96 @@
+%
+% Washington Romanized Indic San Serif 8 point
+%
+% File       : wnris8.mf
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Roman and encoded according to
+% the Classical Sanskrit/Classical Sanskrit eXtended character set. 
+% See wnindic.map for more details.
+%
+
+if unknown cmbase: input cmbase fi
+
+font_identifier:="WNRIS"; font_size 8pt#;
+
+u#:=17/36pt#;               % unit width
+width_adj#:=12/36pt#;       % width adjustment for certain characters
+serif_fit#:=-6/36pt#;       % extra sidebar near lowercase serifs
+cap_serif_fit#:=-8.5/36pt#; % extra sidebar near uppercase serifs
+letter_fit#:=0pt#;          % extra space added to all sidebars
+
+body_height#:=216/36pt#;   % height of tallest characters
+asc_height#:=200/36pt#;    % height of lowercase ascenders
+cap_height#:=200/36pt#;    % height of caps
+fig_height#:=189/36pt#;    % height of numerals
+x_height#:=128/36pt#;      % height of lowercase without ascenders
+math_axis#:=72/36pt#;      % axis of symmetry for math symbols
+bar_height#:=63/36pt#;     % height of crossbar in lowercase e
+comma_depth#:=37/36pt#;    % depth of comma below baseline
+desc_depth#:=56/36pt#;     % depth of lowercase descenders
+
+crisp#:=0pt#;              % diameter of serif corners
+tiny#:=0pt#;               % diameter of rounded corners
+fine#:=0pt#;               % diameter of sharply rounded corners
+thin_join#:=15/36pt#;      % width of extrafine details
+hair#:=25/36pt#;           % lowercase hairline breadth
+stem#:=25/36pt#;           % lowercase stem breadth
+curve#:=25/36pt#;          % lowercase curve breadth
+ess#:=25/36pt#;            % breadth in middle of lowercase s
+flare#:=22/36pt#;          % diameter of bulbs or breadth of terminals
+dot_size#:=26/36pt#;       % diameter of dots
+cap_hair#:=25/36pt#;       % uppercase hairline breadth
+cap_stem#:=29/36pt#;       % uppercase stem breadth
+cap_curve#:=29/36pt#;      % uppercase curve breadth
+cap_ess#:=28/36pt#;        % breadth in middle of uppercase s
+rule_thickness#:=.36pt#;   % thickness of lines in math symbols
+
+dish#:=0pt#;               % amount erased at top or bottom of serifs
+bracket#:=0pt#;            % vertical distance from serif base to tangent
+jut#:=0pt#;                % protrusion of lowercase serifs
+cap_jut#:=0pt#;            % protrusion of uppercase serifs
+beak_jut#:=0pt#;           % horizontal protrusion of beak serifs
+beak#:=.4/36pt#;           % vertical protrusion of beak serifs
+vair#:=19/36pt#;           % vertical diameter of hairlines
+notch_cut#:=16/36pt#;      % maximum breadth above or below notches
+bar#:=18/36pt#;            % lowercase bar thickness
+slab#:=20/36pt#;           % serif and arm thickness
+cap_bar#:=19/36pt#;        % uppercase bar thickness
+cap_band#:=17/36pt#;       % uppercase thickness above/below lobes
+cap_notch_cut#:=22/36pt#;  % max breadth above/below uppercase notches
+serif_drop#:=2/36pt#;      % vertical drop of sloped serifs
+stem_corr#:=1/36pt#;       % for small refinements of stem breadth
+vair_corr#:=1/36pt#;       % for small refinements of hairline height
+apex_corr#:=4/36pt#;       % extra width at diagonal junctions
+
+o#:=6/36pt#;               % amount of overshoot for curves
+apex_o#:=0pt#;             % amount of overshoot for diagonal junctions
+
+slant:=0;                  % tilt ratio $(\Delta x/\Delta y)$
+fudge:=.93;                % factor applied to weights of heavy characters
+math_spread:=.4;           % extra openness of math symbols
+superness:=1/sqrt 2;       % parameter for superellipses
+superpull:=1/20;           % extra openness inside bowls
+beak_darkness:=0;          % fraction of triangle inside beak serifs
+ligs:=2;                   % level of ligatures to be included
+
+square_dots:=true;         % should dots be square?
+hefty:=true;               % should we try hard not to be overweight?
+serifs:=false;             % should serifs and bulbs be attached?
+monospace:=false;          % should all characters have the same width?
+variant_g:=false;          % should an italic-style g be used?
+low_asterisk:=false;       % should the asterisk be centered at the axis?
+math_fitting:=false;       % should math-mode spacing be used?
+
+generate romanskt          % switch to the driver file
+
+% end of file wnris8.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/wnrit10.mf b/Master/texmf-dist/fonts/source/public/wnri/wnrit10.mf
new file mode 100644
index 00000000000..8dfce9704bc
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/wnrit10.mf
@@ -0,0 +1,96 @@
+%
+% Washington Romanized Indic Typewriter 10 point
+%
+% File       : wnrit10.mf
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Typewriter and encoded according 
+% to the Classical Sanskrit/Classical Sanskrit eXtended character 
+% set. See wnindic.map for more details.
+%
+
+if unknown cmbase: input cmbase fi
+
+font_identifier:="WNRIT"; font_size 10pt#;
+
+u#:=21/36pt#;              % unit width
+width_adj#:=0pt#;          % width adjustment for certain characters
+serif_fit#:=0pt#;          % extra sidebar near lowercase serifs
+cap_serif_fit#:=0pt#;      % extra sidebar near uppercase serifs
+letter_fit#:=0pt#;         % extra space added to all sidebars
+
+body_height#:=250/36pt#;   % height of tallest characters
+asc_height#:=220/36pt#;    % height of lowercase ascenders
+cap_height#:=220/36pt#;    % height of caps
+fig_height#:=220/36pt#;    % height of numerals
+x_height#:=155/36pt#;      % height of lowercase without ascenders
+math_axis#:=110/36pt#;     % axis of symmetry for math symbols
+bar_height#:=79/36pt#;     % height of crossbar in lowercase e
+comma_depth#:=50/36pt#;    % depth of comma below baseline
+desc_depth#:=80/36pt#;     % depth of lowercase descenders
+
+crisp#:=22/36pt#;          % diameter of serif corners
+tiny#:=22/36pt#;           % diameter of rounded corners
+fine#:=21/36pt#;           % diameter of sharply rounded corners
+thin_join#:=21/36pt#;      % width of extrafine details
+hair#:=25/36pt#;           % lowercase hairline breadth
+stem#:=25/36pt#;           % lowercase stem breadth
+curve#:=25/36pt#;          % lowercase curve breadth
+ess#:=22/36pt#;            % breadth in middle of lowercase s
+flare#:=32/36pt#;          % diameter of bulbs or breadth of terminals
+dot_size#:=36/36pt#;       % diameter of dots
+cap_hair#:=25/36pt#;       % uppercase hairline breadth
+cap_stem#:=25/36pt#;       % uppercase stem breadth
+cap_curve#:=25/36pt#;      % uppercase curve breadth
+cap_ess#:=25/36pt#;        % breadth in middle of uppercase s
+rule_thickness#:=25/36pt#; % thickness of lines in math symbols
+
+dish#:=0pt#;               % amount erased at top or bottom of serifs
+bracket#:=0pt#;            % vertical distance from serif base to tangent
+jut#:=34/36pt#;            % protrusion of lowercase serifs
+cap_jut#:=34/36pt#;        % protrusion of uppercase serifs
+beak_jut#:=0pt#;           % horizontal protrusion of beak serifs
+beak#:=34/36pt#;           % vertical protrusion of beak serifs
+vair#:=22/36pt#;           % vertical diameter of hairlines
+notch_cut#:=25/36pt#;      % maximum breadth above or below notches
+bar#:=22/36pt#;            % lowercase bar thickness
+slab#:=22/36pt#;           % serif and arm thickness
+cap_bar#:=22/36pt#;        % uppercase bar thickness
+cap_band#:=22/36pt#;       % uppercase thickness above/below lobes
+cap_notch_cut#:=25/36pt#;  % max breadth above/below uppercase notches
+serif_drop#:=0pt#;         % vertical drop of sloped serifs
+stem_corr#:=0pt#;          % for small refinements of stem breadth
+vair_corr#:=0pt#;          % for small refinements of hairline height
+apex_corr#:=10/36pt#;      % extra width at diagonal junctions
+
+o#:=4/36pt#;               % amount of overshoot for curves
+apex_o#:=3/36pt#;          % amount of overshoot for diagonal junctions
+
+slant:=0;                  % tilt ratio $(\Delta x/\Delta y)$
+fudge:=0.81;               % factor applied to weights of heavy characters
+math_spread:=-1;           % extra openness of math symbols
+superness:=1/sqrt2;        % parameter for superellipses
+superpull:=0;              % extra openness inside bowls
+beak_darkness:=0;          % fraction of triangle inside beak serifs
+ligs:=0;                   % level of ligatures to be included
+
+square_dots:=false;        % should dots be square?
+hefty:=true;               % should we try hard not to be overweight?
+serifs:=true;              % should serifs and bulbs be attached?
+monospace:=true;           % should all characters have the same width?
+variant_g:=false;          % should an italic-style g be used?
+low_asterisk:=true;        % should the asterisk be centered at the axis?
+math_fitting:=false;       % should math-mode spacing be used?
+
+generate romanskt          % switch to the driver file
+
+% end of file wnrit10.mf
+
diff --git a/Master/texmf-dist/fonts/source/public/wnri/wnrit8.mf b/Master/texmf-dist/fonts/source/public/wnri/wnrit8.mf
new file mode 100644
index 00000000000..353b4cc5983
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/wnri/wnrit8.mf
@@ -0,0 +1,96 @@
+%
+% Washington Romanized Indic Typewriter 8 point
+%
+% File       : wnrit8.mf
+% Author     : Thomas Ridgeway <ridgeway@u.washington.edu>
+% Date       : May 19 1992
+%
+% Updated by : Anshuman Pandey <apandey@u.washington.edu>
+% On         : 18 Feb 1998
+%
+% Copyright 1992 Humanities and Arts Computing Center, University of 
+% Washington. Licensed to the public according to the terms of the 
+% Free Software Foundation General Public License.
+%
+% WNRI is based on Computer Modern Typewriter and encoded according 
+% to the Classical Sanskrit/Classical Sanskrit eXtended character 
+% set. See wnindic.map for more details.
+%
+
+if unknown cmbase: input cmbase fi
+
+font_identifier:="WNRIT"; font_size 8pt#;
+
+u#:=17/36pt#;              % unit width
+width_adj#:=0pt#;          % width adjustment for certain characters
+serif_fit#:=0pt#;          % extra sidebar near lowercase serifs
+cap_serif_fit#:=0pt#;      % extra sidebar near uppercase serifs
+letter_fit#:=0pt#;         % extra space added to all sidebars
+
+body_height#:=200/36pt#;   % height of tallest characters
+asc_height#:=176/36pt#;    % height of lowercase ascenders
+cap_height#:=176/36pt#;    % height of caps
+fig_height#:=176/36pt#;    % height of numerals
+x_height#:=124/36pt#;      % height of lowercase without ascenders
+math_axis#:=88/36pt#;      % axis of symmetry for math symbols
+bar_height#:=63/36pt#;     % height of crossbar in lowercase e
+comma_depth#:=40/36pt#;    % depth of comma below baseline
+desc_depth#:=64/36pt#;     % depth of lowercase descenders
+
+crisp#:=19/36pt#;          % diameter of serif corners
+tiny#:=19/36pt#;           % diameter of rounded corners
+fine#:=18/36pt#;           % diameter of sharply rounded corners
+thin_join#:=18/36pt#;      % width of extrafine details
+hair#:=22/36pt#;           % lowercase hairline breadth
+stem#:=22/36pt#;           % lowercase stem breadth
+curve#:=22/36pt#;          % lowercase curve breadth
+ess#:=19/36pt#;            % breadth in middle of lowercase s
+flare#:=28/36pt#;          % diameter of bulbs or breadth of terminals
+dot_size#:=31/36pt#;       % diameter of dots
+cap_hair#:=22/36pt#;       % uppercase hairline breadth
+cap_stem#:=22/36pt#;       % uppercase stem breadth
+cap_curve#:=22/36pt#;      % uppercase curve breadth
+cap_ess#:=22/36pt#;        % breadth in middle of uppercase s
+rule_thickness#:=22/36pt#; % thickness of lines in math symbols
+
+dish#:=0pt#;               % amount erased at top or bottom of serifs
+bracket#:=0pt#;            % vertical distance from serif base to tangent
+jut#:=27/36pt#;            % protrusion of lowercase serifs
+cap_jut#:=27/36pt#;        % protrusion of uppercase serifs
+beak_jut#:=0pt#;           % horizontal protrusion of beak serifs
+beak#:=27/36pt#;           % vertical protrusion of beak serifs
+vair#:=19/36pt#;           % vertical diameter of hairlines
+notch_cut#:=22/36pt#;      % maximum breadth above or below notches
+bar#:=19/36pt#;            % lowercase bar thickness
+slab#:=19/36pt#;           % serif and arm thickness
+cap_bar#:=19/36pt#;        % uppercase bar thickness
+cap_band#:=19/36pt#;       % uppercase thickness above/below lobes
+cap_notch_cut#:=22/36pt#;  % max breadth above/below uppercase notches
+serif_drop#:=0pt#;         % vertical drop of sloped serifs
+stem_corr#:=0pt#;          % for small refinements of stem breadth
+vair_corr#:=0pt#;          % for small refinements of hairline height
+apex_corr#:=8/36pt#;       % extra width at diagonal junctions
+
+o#:=3/36pt#;               % amount of overshoot for curves
+apex_o#:=3/36pt#;          % amount of overshoot for diagonal junctions
+
+slant:=0;                  % tilt ratio $(\Delta x/\Delta y)$
+fudge:=0.81;               % factor applied to weights of heavy characters
+math_spread:=-1;           % extra openness of math symbols
+superness:=1/sqrt2;        % parameter for superellipses
+superpull:=0;              % extra openness inside bowls
+beak_darkness:=0;          % fraction of triangle inside beak serifs
+ligs:=0;                   % level of ligatures to be included
+
+square_dots:=false;        % should dots be square?
+hefty:=true;               % should we try hard not to be overweight?
+serifs:=true;              % should serifs and bulbs be attached?
+monospace:=true;           % should all characters have the same width?
+variant_g:=false;          % should an italic-style g be used?
+low_asterisk:=true;        % should the asterisk be centered at the axis?
+math_fitting:=false;       % should math-mode spacing be used?
+
+generate romanskt          % switch to the driver file
+
+% end of file wnrit8.mf
+