summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-01-31 17:07:04 +0000
committerKarl Berry <karl@freefriends.org>2014-01-31 17:07:04 +0000
commit9202c6b515b0543a66b6d74a31631c6e1a3d63f2 (patch)
treeec7e77cae94e3dfcb6e4c2bbc49f676f6031a2c9
parent0aa2304636143cf73b6718e82646736aa7dc5f10 (diff)
new knuth-local fonts cmntt10, diam12, etc.
git-svn-id: svn://tug.org/texlive/trunk@32831 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/fonts/source/public/cmextra/bible12.mf75
-rw-r--r--Master/texmf-dist/fonts/source/public/cmextra/cmman.mf (renamed from Master/texmf-dist/fonts/source/public/misc/cmman.mf)344
-rw-r--r--Master/texmf-dist/fonts/source/public/cmextra/cmntex10.mf78
-rw-r--r--Master/texmf-dist/fonts/source/public/cmextra/cmntt10.mf78
-rw-r--r--Master/texmf-dist/fonts/source/public/cmextra/cmsytt10.mf97
-rw-r--r--Master/texmf-dist/fonts/source/public/cmextra/cmtim.mf78
-rw-r--r--Master/texmf-dist/fonts/source/public/cmextra/diam12.mf18
-rw-r--r--Master/texmf-dist/fonts/source/public/cmextra/gen.mf91
-rw-r--r--Master/texmf-dist/fonts/source/public/cmextra/gen10.mf14
-rw-r--r--Master/texmf-dist/fonts/source/public/cmextra/gen8.mf13
-rw-r--r--Master/texmf-dist/fonts/source/public/cmextra/gen9.mf13
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/bible12.tfmbin0 -> 1412 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmbxcd10.tfmbin520 -> 456 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmbxti12.tfmbin1528 -> 1464 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmbxti7.tfmbin1516 -> 1452 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmcscsl10.tfmbin1508 -> 1444 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmfibs8.tfmbin1496 -> 1432 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmitt12.tfmbin772 -> 708 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmitt9.tfmbin764 -> 700 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmman.tfmbin0 -> 616 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmntex10.tfmbin0 -> 704 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmntt10.tfmbin0 -> 704 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmsl6.tfmbin1508 -> 1444 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmsltt9.tfmbin768 -> 704 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmssbxo10.tfmbin1464 -> 1400 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmsslu30.tfmbin1292 -> 1228 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmssu30.tfmbin1304 -> 1240 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmsytt10.tfmbin0 -> 772 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmtim.tfmbin0 -> 1240 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/cmvtti10.tfmbin1396 -> 1332 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/diam12.tfmbin0 -> 64 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/gen10.tfmbin0 -> 344 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/gen8.tfmbin0 -> 344 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cmextra/gen9.tfmbin0 -> 344 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/misc/cmman.tfmbin600 -> 0 bytes
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds65
-rw-r--r--Master/tlpkg/tlpsrc/cmextra.tlpsrc1
38 files changed, 940 insertions, 27 deletions
diff --git a/Master/texmf-dist/fonts/source/public/cmextra/bible12.mf b/Master/texmf-dist/fonts/source/public/cmextra/bible12.mf
new file mode 100644
index 00000000000..ce74383a7c3
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/cmextra/bible12.mf
@@ -0,0 +1,75 @@
+% Computer Modern Bold Extended Text Italic Halfslanted 12 point
+if unknown cmbase: input cmbase fi
+
+font_identifier:="CMBIBL"; font_size 12pt#;
+
+u#:=25/36pt#; % unit width
+width_adj#:=13/36pt#; % width adjustment for certain characters
+serif_fit#:=0pt#; % extra sidebar near lowercase serifs
+cap_serif_fit#:=8/36pt#; % extra sidebar near uppercase serifs
+letter_fit#:=13/36pt#; % extra space added to all sidebars
+
+body_height#:=324/36pt#; % height of tallest characters
+asc_height#:=300/36pt#; % height of lowercase ascenders
+cap_height#:=296.4/36pt#; % height of caps
+fig_height#:=278.4/36pt#; % height of numerals
+x_height#:=192/36pt#; % height of lowercase without ascenders
+math_axis#:=108/36pt#; % axis of symmetry for math symbols
+bar_height#:=102/36pt#; % height of crossbar in lowercase e
+comma_depth#:=84/36pt#; % depth of comma below baseline
+desc_depth#:=84/36pt#; % depth of lowercase descenders
+
+crisp#:=15/36pt#; % diameter of serif corners
+tiny#:=15/36pt#; % diameter of rounded corners
+fine#:=10/36pt#; % diameter of sharply rounded corners
+thin_join#:=11/36pt#; % width of extrafine details
+hair#:=23/36pt#; % lowercase hairline breadth
+stem#:=44/36pt#; % lowercase stem breadth
+curve#:=48/36pt#; % lowercase curve breadth
+ess#:=41/36pt#; % breadth in middle of lowercase s
+flare#:=45/36pt#; % diameter of bulbs or breadth of terminals
+dot_size#:=57/36pt#; % diameter of dots
+cap_hair#:=24/36pt#; % uppercase hairline breadth
+cap_stem#:=53/36pt#; % uppercase stem breadth
+cap_curve#:=56/36pt#; % uppercase curve breadth
+cap_ess#:=54/36pt#; % breadth in middle of uppercase s
+rule_thickness#:=.66pt#; % thickness of lines in math symbols
+
+dish#:=1/36pt#; % amount erased at top or bottom of serifs
+bracket#:=12/36pt#; % vertical distance from serif base to tangent
+jut#:=33/36pt#; % protrusion of lowercase serifs
+cap_jut#:=46/36pt#; % protrusion of uppercase serifs
+beak_jut#:=12/36pt#; % horizontal protrusion of beak serifs
+beak#:=84/36pt#; % vertical protrusion of beak serifs
+vair#:=16/36pt#; % vertical diameter of hairlines
+notch_cut#:=12pt#; % maximum breadth above or below notches
+bar#:=18.5/36pt#; % lowercase bar thickness
+slab#:=18.5/36pt#; % serif and arm thickness
+cap_bar#:=18.5/36pt#; % uppercase bar thickness
+cap_band#:=18.5/36pt#; % uppercase thickness above/below lobes
+cap_notch_cut#:=12pt#; % max breadth above/below uppercase notches
+serif_drop#:=3.6/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:=1/8; % tilt ratio $(\Delta x/\Delta y)$
+fudge:=1; % factor applied to weights of heavy characters
+math_spread:=.4; % 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 textit % switch to the driver file
diff --git a/Master/texmf-dist/fonts/source/public/misc/cmman.mf b/Master/texmf-dist/fonts/source/public/cmextra/cmman.mf
index 3e0ccced4ff..8cd476f6226 100644
--- a/Master/texmf-dist/fonts/source/public/misc/cmman.mf
+++ b/Master/texmf-dist/fonts/source/public/cmextra/cmman.mf
@@ -506,6 +506,350 @@ if serifs: numeric inner_jut;
dish_serif(6,5,f,1/2,inner_jut,g,1/3,right_jut)(dark);fi % lower diagonal serif
penlabels(0,1,2,3,4,5,6,11); endchar;
+message "Typewriter type variant g"; % 9pt
+u#:=18.9/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#:=225/36pt#; % height of tallest characters
+asc_height#:=198/36pt#; % height of lowercase ascenders
+cap_height#:=198/36pt#; % height of caps
+fig_height#:=198/36pt#; % height of numerals
+x_height#:=139.5/36pt#; % height of lowercase without ascenders
+math_axis#:=99/36pt#; % axis of symmetry for math symbols
+bar_height#:=71/36pt#; % height of crossbar in lowercase e
+comma_depth#:=45/36pt#; % depth of comma below baseline
+desc_depth#:=72/36pt#; % depth of lowercase descenders
+
+crisp#:=21/36pt#; % diameter of serif corners
+tiny#:=21/36pt#; % diameter of rounded corners
+fine#:=20/36pt#; % diameter of sharply rounded corners
+thin_join#:=20/36pt#; % width of extrafine details
+hair#:=24/36pt#; % lowercase hairline breadth
+stem#:=24/36pt#; % lowercase stem breadth
+curve#:=24/36pt#; % lowercase curve breadth
+ess#:=21/36pt#; % breadth in middle of lowercase s
+flare#:=30/36pt#; % diameter of bulbs or breadth of terminals
+dot_size#:=33/36pt#; % diameter of dots
+cap_hair#:=24/36pt#; % uppercase hairline breadth
+cap_stem#:=24/36pt#; % uppercase stem breadth
+cap_curve#:=24/36pt#; % uppercase curve breadth
+cap_ess#:=24/36pt#; % breadth in middle of uppercase s
+rule_thickness#:=24/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#:=31/36pt#; % protrusion of lowercase serifs
+cap_jut#:=31/36pt#; % protrusion of uppercase serifs
+beak_jut#:=0pt#; % horizontal protrusion of beak serifs
+beak#:=31/36pt#; % vertical protrusion of beak serifs
+vair#:=21/36pt#; % vertical diameter of hairlines
+notch_cut#:=24/36pt#; % maximum breadth above or below notches
+bar#:=21/36pt#; % lowercase bar thickness
+slab#:=21/36pt#; % serif and arm thickness
+cap_bar#:=21/36pt#; % uppercase bar thickness
+cap_band#:=21/36pt#; % uppercase thickness above/below lobes
+cap_notch_cut#:=24/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#:=9/36pt#; % extra width at diagonal junctions
+
+o#:=3.5/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?
+
+font_setup;
+
+cmchar "Variant letter g";
+beginchar("x",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
+penlabels(0,1,2,3,4,5,6,7,8,9,10,11); endchar;
+
+message "Normal roman variant g"; % 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?
+
+font_setup;
+
+cmchar "Variant letter g";
+beginchar("y",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
+penlabels(0,1,2,3,4,5,6,7,8,9,10,11); endchar;
+
+message "Bold roman variant g"; % 9pt
+
+u#:=21.3/36pt#; % unit width
+width_adj#:=10.2/36pt#; % width adjustment for certain characters
+serif_fit#:=0pt#; % extra sidebar near lowercase serifs
+cap_serif_fit#:=6.2/36pt#; % extra sidebar near uppercase serifs
+letter_fit#:=0pt#; % extra space added to all sidebars
+
+body_height#:=243/36pt#; % height of tallest characters
+asc_height#:=225/36pt#; % height of lowercase ascenders
+cap_height#:=222.3/36pt#; % height of caps
+fig_height#:=208.8/36pt#; % height of numerals
+x_height#:=144/36pt#; % height of lowercase without ascenders
+math_axis#:=81/36pt#; % axis of symmetry for math symbols
+bar_height#:=76/36pt#; % height of crossbar in lowercase e
+comma_depth#:=63/36pt#; % depth of comma below baseline
+desc_depth#:=63/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#:=16.6/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#:=51/36pt#; % diameter of dots
+cap_hair#:=19/36pt#; % uppercase hairline breadth
+cap_stem#:=47/36pt#; % uppercase stem breadth
+cap_curve#:=51/36pt#; % uppercase curve breadth
+cap_ess#:=48/36pt#; % breadth in middle of uppercase s
+rule_thickness#:=.57pt#; % thickness of lines in math symbols
+
+dish#:=1/36pt#; % amount erased at top or bottom of serifs
+bracket#:=9/36pt#; % vertical distance from serif base to tangent
+jut#:=22/36pt#; % protrusion of lowercase serifs
+cap_jut#:=35/36pt#; % protrusion of uppercase serifs
+beak_jut#:=10.2/36pt#; % horizontal protrusion of beak serifs
+beak#:=63/36pt#; % vertical protrusion of beak serifs
+vair#:=12.5/36pt#; % vertical diameter of hairlines
+notch_cut#:=9pt#; % maximum breadth above or below notches
+bar#:=16/36pt#; % lowercase bar thickness
+slab#:=16/36pt#; % serif and arm thickness
+cap_bar#:=16/36pt#; % uppercase bar thickness
+cap_band#:=16/36pt#; % uppercase thickness above/below lobes
+cap_notch_cut#:=9pt#; % max breadth above/below uppercase notches
+serif_drop#:=2.7/36pt#; % vertical drop of sloped serifs
+stem_corr#:=1.9/36pt#; % for small refinements of stem breadth
+vair_corr#:=1.4/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:=.7; % 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?
+
+font_setup;
+
+cmchar "Variant letter g";
+beginchar("z",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
+penlabels(0,1,2,3,4,5,6,7,8,9,10,11); endchar;
+
font_identifier "CMMAN"; % restore the clobbered value
bye
diff --git a/Master/texmf-dist/fonts/source/public/cmextra/cmntex10.mf b/Master/texmf-dist/fonts/source/public/cmextra/cmntex10.mf
new file mode 100644
index 00000000000..6266c5a40b7
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/cmextra/cmntex10.mf
@@ -0,0 +1,78 @@
+% Computer Modern Narrow TeX extended ASCII characters for use with 10 point
+if unknown cmbase: input cmbase fi
+
+font_identifier:="CMNTEX"; font_size 10pt#;
+
+u#:=(26pc#/84)/9; % unit width (84 characters = 26 picas, for DT book)
+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#:=17/36pt#; % diameter of serif corners
+tiny#:=17/36pt#; % diameter of rounded corners
+fine#:=16/36pt#; % diameter of sharply rounded corners
+thin_join#:=16/36pt#; % width of extrafine details
+hair#:=20/36pt#; % lowercase hairline breadth
+stem#:=20/36pt#; % lowercase stem breadth
+curve#:=20/36pt#; % lowercase curve breadth
+ess#:=17/36pt#; % breadth in middle of lowercase s
+flare#:=25/36pt#; % diameter of bulbs or breadth of terminals
+dot_size#:=28/36pt#; % diameter of dots
+cap_hair#:=20/36pt#; % uppercase hairline breadth
+cap_stem#:=20/36pt#; % uppercase stem breadth
+cap_curve#:=20/36pt#; % uppercase curve breadth
+cap_ess#:=20/36pt#; % breadth in middle of uppercase s
+rule_thickness#:=20/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#:=25/36pt#; % protrusion of lowercase serifs
+cap_jut#:=25/36pt#; % protrusion of uppercase serifs
+beak_jut#:=0pt#; % horizontal protrusion of beak serifs
+beak#:=25/36pt#; % vertical protrusion of beak serifs
+vair#:=17/36pt#; % vertical diameter of hairlines
+notch_cut#:=20/36pt#; % 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#:=20/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#:=7/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:=.25; % 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?
+
+extra_beginchar:=extra_beginchar&"rule_thickness:=hair;" % for lowres
+ & "pickup pencircle scaled rule_thickness; rule.nib:=savepen; clearpen;";
+
+generate texset % switch to the driver file
diff --git a/Master/texmf-dist/fonts/source/public/cmextra/cmntt10.mf b/Master/texmf-dist/fonts/source/public/cmextra/cmntt10.mf
new file mode 100644
index 00000000000..85e965bb16f
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/cmextra/cmntt10.mf
@@ -0,0 +1,78 @@
+% Computer Modern Narrow TeX extended ASCII characters for use with 10 point
+if unknown cmbase: input cmbase fi
+
+font_identifier:="CMNTT"; font_size 10pt#;
+
+u#:=(26pc#/84)/9; % unit width (84 characters = 26 picas, for DT book)
+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#:=17/36pt#; % diameter of serif corners
+tiny#:=17/36pt#; % diameter of rounded corners
+fine#:=16/36pt#; % diameter of sharply rounded corners
+thin_join#:=16/36pt#; % width of extrafine details
+hair#:=20/36pt#; % lowercase hairline breadth
+stem#:=20/36pt#; % lowercase stem breadth
+curve#:=20/36pt#; % lowercase curve breadth
+ess#:=17/36pt#; % breadth in middle of lowercase s
+flare#:=25/36pt#; % diameter of bulbs or breadth of terminals
+dot_size#:=28/36pt#; % diameter of dots
+cap_hair#:=20/36pt#; % uppercase hairline breadth
+cap_stem#:=20/36pt#; % uppercase stem breadth
+cap_curve#:=20/36pt#; % uppercase curve breadth
+cap_ess#:=20/36pt#; % breadth in middle of uppercase s
+rule_thickness#:=20/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#:=25/36pt#; % protrusion of lowercase serifs
+cap_jut#:=25/36pt#; % protrusion of uppercase serifs
+beak_jut#:=0pt#; % horizontal protrusion of beak serifs
+beak#:=25/36pt#; % vertical protrusion of beak serifs
+vair#:=17/36pt#; % vertical diameter of hairlines
+notch_cut#:=20/36pt#; % 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#:=20/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#:=7/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?
+
+extra_beginchar:=extra_beginchar&"rule_thickness:=hair;" % for lowres
+ & "pickup pencircle scaled rule_thickness; rule.nib:=savepen; clearpen;";
+
+generate roman % switch to the driver file
diff --git a/Master/texmf-dist/fonts/source/public/cmextra/cmsytt10.mf b/Master/texmf-dist/fonts/source/public/cmextra/cmsytt10.mf
new file mode 100644
index 00000000000..1a28aefc6b0
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/cmextra/cmsytt10.mf
@@ -0,0 +1,97 @@
+% Computer Modern Math Symbols 10 point Typewriter
+if unknown cmbase: input cmbase fi
+
+font_identifier:="CMSYTT"; 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?
+
+% the following font parameters are explained in {\sl The \TeX book}, Appendix G
+% I've copied them from cmsy10 (maybe a bad idea, but for today it's OK...)
+
+subs:=7/10; % subscripts to 10pt will normally be in 7pt type
+rth#:=.4pt#; % assume that rules will come from cmex10
+fontdimen 8: % parameters $\sigma_8$ through $\sigma_{22}$ will now be listed
+ math_axis#+3.51rth#+54/36pt#+subs*desc_depth#, % num1
+ math_axis#+1.51rth#+30/36pt#, % num2
+ math_axis#+1.51rth#+48/36pt#, % num3
+ -(math_axis#-3.51rth#-subs*fig_height#-124/36pt#), % denom1
+ -(math_axis#-1.51rth#-subs*fig_height#-30/36pt#), % denom2
+ 8.99pt#-subs*asc_height#, % sup1
+ 8.49pt#-subs*asc_height#, % sup2
+ 104/36pt#, % sup3
+ 54/36pt#, % sub1
+ -(8.49pt#-2subs*asc_height#-3.1rth#), % sub2
+ subs*asc_height#-36/36pt#, % sup\_drop
+ 18/36pt#, % sub\_drop
+ 23.9pt#, % delim1
+ 10.1pt#, % delim2
+ math_axis#; % axis\_height
+
+generate mathsy % switch to the driver file
diff --git a/Master/texmf-dist/fonts/source/public/cmextra/cmtim.mf b/Master/texmf-dist/fonts/source/public/cmextra/cmtim.mf
new file mode 100644
index 00000000000..020b825d368
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/cmextra/cmtim.mf
@@ -0,0 +1,78 @@
+% crude approximation to Time Magazine font of 1980
+% based on cmr8 scaled 1050 but then twiddled
+
+if unknown cmbase: input cmbase fi
+
+font_identifier:="CMTIM"; font_size 9pt#;
+
+bpt#:=1.05pt#;
+u#:=1.02*17/36bpt#; % unit width
+width_adj#:=0bpt#; % width adjustment for certain characters
+serif_fit#:=0bpt#; % extra sidebar near lowercase serifs
+cap_serif_fit#:=4.1/36bpt#; % extra sidebar near uppercase serifs
+letter_fit#:=-1/36bpt#; % extra space added to all sidebars
+
+body_height#:=9/8*216/36bpt#; % height of tallest characters
+asc_height#:=9/8*200/36bpt#; % height of lowercase ascenders
+cap_height#:=9/8*196.8/36bpt#; % height of caps
+fig_height#:=9/8*185.6/36bpt#; % height of numerals
+x_height#:=8/7*124/36bpt#; % height of lowercase without ascenders
+math_axis#:=9/8*72/36bpt#; % axis of symmetry for math symbols
+bar_height#:=8/7*69.6/36bpt#; % height of crossbar in lowercase e
+comma_depth#:=7/8*56/36bpt#; % depth of comma below baseline
+desc_depth#:=7/8*56/36bpt#; % depth of lowercase descenders
+
+crisp#:=0bpt#; % diameter of serif corners
+tiny#:=8/36bpt#; % diameter of rounded corners
+fine#:=7/36bpt#; % diameter of sharply rounded corners
+thin_join#:=7/36bpt#; % width of extrafine details
+hair#:=9/36bpt#; % lowercase hairline breadth
+stem#:=22/36bpt#; % lowercase stem breadth
+curve#:=25.5/36bpt#; % lowercase curve breadth
+ess#:=23/36bpt#; % breadth in middle of lowercase s
+flare#:=27/36bpt#; % diameter of bulbs or breadth of terminals
+dot_size#:=32/36bpt#; % diameter of dots
+cap_hair#:=9.5/36bpt#; % uppercase hairline breadth
+cap_stem#:=26.5/36bpt#; % uppercase stem breadth
+cap_curve#:=30/36bpt#; % uppercase curve breadth
+cap_ess#:=27/36bpt#; % breadth in middle of uppercase s
+rule_thickness#:=.36bpt#; % thickness of lines in math symbols
+
+dish#:=1/36bpt#; % amount erased at top or bottom of serifs
+bracket#:=16/36bpt#; % vertical distance from serif base to tangent
+jut#:=22/36bpt#; % protrusion of lowercase serifs
+cap_jut#:=29/36bpt#; % protrusion of uppercase serifs
+beak_jut#:=8.4/36bpt#; % horizontal protrusion of beak serifs
+beak#:=56/36bpt#; % vertical protrusion of beak serifs
+vair#:=8/36bpt#; % vertical diameter of hairlines
+notch_cut#:=8bpt#; % maximum breadth above or below notches
+bar#:=9.5/36bpt#; % lowercase bar thickness
+slab#:=9.5/36bpt#; % serif and arm thickness
+cap_bar#:=9.5/36bpt#; % uppercase bar thickness
+cap_band#:=9.5/36bpt#; % uppercase thickness above/below lobes
+cap_notch_cut#:=8bpt#; % max breadth above/below uppercase notches
+serif_drop#:=3.2/36bpt#; % vertical drop of sloped serifs
+stem_corr#:=1/36bpt#; % for small refinements of stem breadth
+vair_corr#:=1/36bpt#; % for small refinements of hairline height
+apex_corr#:=0bpt#; % extra width at diagonal junctions
+
+o#:=6/36bpt#; % amount of overshoot for curves
+apex_o#:=6/36bpt#; % 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 roman % switch to the driver file
diff --git a/Master/texmf-dist/fonts/source/public/cmextra/diam12.mf b/Master/texmf-dist/fonts/source/public/cmextra/diam12.mf
new file mode 100644
index 00000000000..2f4494d8c38
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/cmextra/diam12.mf
@@ -0,0 +1,18 @@
+% make a solid diamond to use as a calligraphic-style bullet
+if unknown cmbase: input cmbase fi % omit if CMMF can be assumed
+mode_setup;
+
+def generate suffix t= enddef;
+input cmr12; font_setup;
+
+cmchar "Solid diamond"; % cf Diamond operator in sym.mf
+beginchar("d",9u#,v_center(7u#));
+italcorr math_axis#*slant;
+adjust_fit(0,0); pickup rule.nib;
+numeric a; a=(lft 3.5u)*sqrt(3.14159/2); % an attempt to match circle area
+x4=x8=good.x .5w; center_on(x4); x2=w-x6=good.x(x4+a);
+y2=y6=.5[y4,y8]=math_axis; y8=good.y(y2+a);
+fill (rt z2)--(top z8)--(lft z6)--(bot z4)--cycle; % bowl
+labels(2,4,6,8); endchar;
+
+end
diff --git a/Master/texmf-dist/fonts/source/public/cmextra/gen.mf b/Master/texmf-dist/fonts/source/public/cmextra/gen.mf
new file mode 100644
index 00000000000..32a55c77a04
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/cmextra/gen.mf
@@ -0,0 +1,91 @@
+% characters for Jill's genealogy publications
+
+cmchar "Cross (death symbol)";
+beginchar("d",9u#,.65[x_height#,asc_height#],.1(asc_height#-x_height#));
+adjust_fit(0,0); pickup tiny.nib; light_stem=Vround .5[vair,stem];
+pos1(stem,0); pos2(.4[hair,stem],0); pos3(stem,0);
+%pos4(stem,90); pos5(.5[vair,stem],90); pos6(stem,90);
+pos4(light_stem,90); pos5(.5[vair,light_stem],90); pos6(light_stem,90);
+x1=x2=x3=.5w; top y1=h; bot y3=-d; y2=y4r;
+y4=y5=y6; y4l=good.y .6[-d,h]; x4=good.x u; x6=r-x4; x5=x2;
+filldraw z1l...z2l{down}...z3l--z3r...z2r{up}...z1r--cycle; % vertical stroke
+filldraw z4l...z5l...z6l--z6r...z5r...z4r--cycle; % horizontal stroke
+penlabels(1,2,3,4,5,6); endchar;
+
+cmchar "Rings (marriage symbol)";
+beginchar("m",9u#,v_center(x_height#));
+adjust_fit(0,0); pickup tiny.nib;
+numeric light_stem; light_stem=Vround .5[vair,stem];
+pos1(light_stem,90); pos3(light_stem,-90);
+pos2(light_stem,180); pos4(.3[hair,light_stem],0);
+x1=x3=.5[x2,x4]; lft x2r=hround(-u-.5light_stem); rt x4r=hround(.6w+.5stem);
+%top y1r=vround(h+.5light_stem); y2=y4=.5[y1,y3];
+%bot y3r=vround(-d-.5light_stem);
+top y1r=h; y2=y4=.5[y1,y3];
+bot y3r=-d;
+pos5(light_stem,90); pos7(light_stem,-90);
+pos6(.3[hair,light_stem],180); pos8(light_stem,0);
+x5-x1=x6-x2=x7-x3=x8-x4; rt x8r=hround(w+u+.5light_stem);
+y5-y1=y6-y2=y7-y3=y8-y4=0;
+filldraw stroke pulled_arc.e(1,2)&pulled_arc.e(2,3)&pulled_arc.e(3,4)
+ &pulled_arc.e(4,1); % left ring
+filldraw stroke pulled_arc.e(5,6)&pulled_arc.e(6,7)&pulled_arc.e(7,8)
+ &pulled_arc.e(8,5); % right ring
+penlabels(1,2,3,4,5,6,7,8); endchar;
+
+cmchar "Five-pointed star (birth symbol)";
+beginchar("b",9u#,v_center(x_height#));
+adjust_fit(0,0); pickup tiny.nib;
+numeric theta; theta=360/5; % degrees between points
+pos0(curve,0); pos1(rule_thickness,90); x0=x1=good.x .5w;
+top y1r=vround(math_axis+.5x_height+.5rule_thickness);
+ypart(.5[z1,z0+(z1-z2) rotated 2theta])=math_axis;
+pos2(curve,theta); pos3(rule_thickness,90+theta);
+z2=z0; z3-z0=(z1-z0) rotated theta;
+z4=whatever[z0l,z1r]=whatever[z2r,z3r];
+filldraw for n=0 upto 4:
+ z0+(z1r-z0)rotated(n*theta)--z0+(z4-z0)rotated(n*theta)--endfor
+ cycle; % star
+penlabels(0,1,2,3,4); endchar;
+
+cmchar "Divided rings (divorce symbol)";
+beginchar("1",9u#,v_center(x_height#));
+adjust_fit(0,0); pickup tiny.nib;
+numeric light_stem; light_stem=Vround .5[vair,stem];
+pos11(stem,0); pos12(.4[hair,stem],0); pos13(stem,0);
+x11=x12=x13=.5w; top y11=round 1.3h; bot y13=round(-d-.3h); y12=.6[y13,y11];
+filldraw z11l...z12l{down}...z13l
+ --z13r...z12r{up}...z11r--cycle; % vertical stroke
+pos1(light_stem,90); pos3(light_stem,-90);
+pos2(light_stem,180); pos4(.3[hair,light_stem],0);
+x1=x3=.5[x2,x4]; lft x2r=hround(-3u-.5light_stem); rt x4r=hround(.25w+.5stem);
+top y1r=h; y2=y4=.5[y1,y3];
+bot y3r=-d;
+pos5(light_stem,90); pos7(light_stem,-90);
+pos6(.3[hair,light_stem],180); pos8(light_stem,0);
+x5-x1=x6-x2=x7-x3=x8-x4; rt x8r=hround(w+3u+.5light_stem);
+y5-y1=y6-y2=y7-y3=y8-y4=0;
+filldraw stroke pulled_arc.e(1,2)&pulled_arc.e(2,3)&pulled_arc.e(3,4)
+ &pulled_arc.e(4,1); % left ring
+filldraw stroke pulled_arc.e(5,6)&pulled_arc.e(6,7)&pulled_arc.e(7,8)
+ &pulled_arc.e(8,5); % right ring
+penlabels(1,2,3,4,5,6,7,8,11,12,13); endchar;
+
+cmchar "Leaf";
+beginchar("l",18u#,asc_height#,0);
+adjust_fit(0,0); pickup pencircle scaled .6rule_thickness;
+z1=(0,0); z2=(w,h);
+z3=.5[z1,z2]+.25((z2-z1)rotated 90);
+z4=.5[z1,z2]+.25((z2-z1)rotated-90);
+path p[]; p3=z1...z3{z2-z1}...z2; p4=z1...z4{z2-z1}...z2;
+draw p3; % upper edge
+draw p4; % lower edge
+draw z1 -- z2; % stem
+z5=1/4[z1,z2]; z6=.55[z1,z2];
+z35=p3 intersectionpoint (z5--(x5,2h));
+z36=p3 intersectionpoint (z6--(x6,2h));
+z45=p4 intersectionpoint (z5--(2w,y5));
+z46=p4 intersectionpoint (z6--(2w,y6));
+draw z35--z5--z45; % vein
+draw z36--z6--z46; % vein
+labels(1,2,3,4,5,6,35,36,45,46); endchar;
diff --git a/Master/texmf-dist/fonts/source/public/cmextra/gen10.mf b/Master/texmf-dist/fonts/source/public/cmextra/gen10.mf
new file mode 100644
index 00000000000..5f2db849bc6
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/cmextra/gen10.mf
@@ -0,0 +1,14 @@
+% 10-point genealogy font
+if unknown cmbase: input cmbase fi % omit if CMMF can be assumed
+mode_setup;
+
+def generate suffix t= enddef;
+input cmr10; font_setup;
+
+font_identifier:="GEN";
+font_slant slant; font_x_height x_height#;
+font_normal_space 6u#+2letter_fit#;
+font_quad 18u#+4letter_fit#;
+
+input gen;
+end
diff --git a/Master/texmf-dist/fonts/source/public/cmextra/gen8.mf b/Master/texmf-dist/fonts/source/public/cmextra/gen8.mf
new file mode 100644
index 00000000000..1e13f6dbe89
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/cmextra/gen8.mf
@@ -0,0 +1,13 @@
+% 8-point genealogy font
+if unknown cmbase: input cmbase fi % omit if CMMF can be assumed
+mode_setup;
+
+def generate suffix t= enddef;
+input cmr8; font_setup;
+
+font_slant slant; font_x_height x_height#;
+font_normal_space 6u#+2letter_fit#;
+font_quad 18u#+4letter_fit#;
+
+input gen;
+end
diff --git a/Master/texmf-dist/fonts/source/public/cmextra/gen9.mf b/Master/texmf-dist/fonts/source/public/cmextra/gen9.mf
new file mode 100644
index 00000000000..eb056926a0f
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/cmextra/gen9.mf
@@ -0,0 +1,13 @@
+% 9-point genealogy font
+if unknown cmbase: input cmbase fi % omit if CMMF can be assumed
+mode_setup;
+
+def generate suffix t= enddef;
+input cmr9; font_setup;
+
+font_slant slant; font_x_height x_height#;
+font_normal_space 6u#+2letter_fit#;
+font_quad 18u#+4letter_fit#;
+
+input gen;
+end
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/bible12.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/bible12.tfm
new file mode 100644
index 00000000000..9b4aa3066c5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/bible12.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmbxcd10.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmbxcd10.tfm
index 52fc5ddf2bc..7722afad89c 100644
--- a/Master/texmf-dist/fonts/tfm/public/cmextra/cmbxcd10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmbxcd10.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmbxti12.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmbxti12.tfm
index d155d69aa07..b1c879b31dc 100644
--- a/Master/texmf-dist/fonts/tfm/public/cmextra/cmbxti12.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmbxti12.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmbxti7.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmbxti7.tfm
index e6fa7d2df6f..3200428c568 100644
--- a/Master/texmf-dist/fonts/tfm/public/cmextra/cmbxti7.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmbxti7.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmcscsl10.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmcscsl10.tfm
index f310aa06334..7946e27dcbf 100644
--- a/Master/texmf-dist/fonts/tfm/public/cmextra/cmcscsl10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmcscsl10.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmfibs8.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmfibs8.tfm
index f3f2ecf7efb..c05e66611a1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cmextra/cmfibs8.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmfibs8.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmitt12.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmitt12.tfm
index 8bffde801d3..cdf9ca453d8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cmextra/cmitt12.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmitt12.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmitt9.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmitt9.tfm
index 9f3e3aa908a..37868d79cb1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cmextra/cmitt9.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmitt9.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmman.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmman.tfm
new file mode 100644
index 00000000000..cf3343b64dd
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmman.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmntex10.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmntex10.tfm
new file mode 100644
index 00000000000..970e906a77a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmntex10.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmntt10.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmntt10.tfm
new file mode 100644
index 00000000000..1f6640744b7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmntt10.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmsl6.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmsl6.tfm
index 874a92c424d..fad7e28d670 100644
--- a/Master/texmf-dist/fonts/tfm/public/cmextra/cmsl6.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmsl6.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmsltt9.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmsltt9.tfm
index 562032354e7..9d4828c80a4 100644
--- a/Master/texmf-dist/fonts/tfm/public/cmextra/cmsltt9.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmsltt9.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmssbxo10.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmssbxo10.tfm
index 68e04ffd050..8154aa8c054 100644
--- a/Master/texmf-dist/fonts/tfm/public/cmextra/cmssbxo10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmssbxo10.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmsslu30.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmsslu30.tfm
index e516b9b9561..546fc648ab5 100644
--- a/Master/texmf-dist/fonts/tfm/public/cmextra/cmsslu30.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmsslu30.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmssu30.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmssu30.tfm
index 83eb59abafa..82c57fe24df 100644
--- a/Master/texmf-dist/fonts/tfm/public/cmextra/cmssu30.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmssu30.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmsytt10.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmsytt10.tfm
new file mode 100644
index 00000000000..bb4ac0fbbf1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmsytt10.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmtim.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmtim.tfm
new file mode 100644
index 00000000000..c597cd00558
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmtim.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/cmvtti10.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/cmvtti10.tfm
index 865dbfa7699..96320ce4423 100644
--- a/Master/texmf-dist/fonts/tfm/public/cmextra/cmvtti10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/cmvtti10.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/diam12.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/diam12.tfm
new file mode 100644
index 00000000000..41fb16d903f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/diam12.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/gen10.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/gen10.tfm
new file mode 100644
index 00000000000..23ef099bf27
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/gen10.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/gen8.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/gen8.tfm
new file mode 100644
index 00000000000..88918fd2394
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/gen8.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cmextra/gen9.tfm b/Master/texmf-dist/fonts/tfm/public/cmextra/gen9.tfm
new file mode 100644
index 00000000000..fb3485516d1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cmextra/gen9.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/misc/cmman.tfm b/Master/texmf-dist/fonts/tfm/public/misc/cmman.tfm
deleted file mode 100644
index 1fa33b2c4f6..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/misc/cmman.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 0cdcd0d19fc..d74b1f1c8b3 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -120,7 +120,7 @@ my @TLP_working = qw(
clefval cleveref clipboard
clock clrscode cm-lgc cm-super cm-unicode
cmap cmarrows cmbright cmcyr
- cmdstring cmdtrack cmll cmpica cmpj cmsd cmtiup cnbwp cnltx
+ cmdstring cmdtrack cmextra cmll cmpica cmpj cmsd cmtiup cnbwp cnltx
codedoc codepage codicefiscaleitaliano
collcell collectbox collref colordoc colorinfo colorsep colortab
colortbl colorwav colorweb colourchange
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 961a1b6af67..78e578e391b 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -498,7 +498,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'ipa', "die 'skipping, part of wsuipa'",
'ipaex-type1', "&MAKEflatten",
'isostds', "die 'skipping, use iso or iso10303'",
- 'itrans', "die 'skipping, no longer maintained (maybe you mean xetex-itrans?), too complex'",
+ 'itrans', "die 'skipping, no longer maintained (maybe you want xetex-itrans?), too complex'",
'itrans-processor', "die 'skipping, no longer maintained, too complex'",
'iwona', "&MAKEcopy",
'jadetex', "&MAKEjadetex",
@@ -1104,6 +1104,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'cals' => '&PREHOOK_cals',
'chess' => '&PREHOOK_chess',
'cm-super' => '&PREHOOK_cm_super',
+ 'cmextra' => '&PREHOOK_cmextra',
'concrete' => '&PREHOOK_concrete',
'download' => '&PREHOOK_savepdf',
'dynblocks' => '&PREHOOK_flatten1',
@@ -1995,6 +1996,7 @@ $standardsource='\.(bat|c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh';
'burmese', '\.pl',
'carlisle', '\.dtx|\.ins|ltxtable\.tex',
'chemarrow', '\.mp|\.vfb',
+ 'cmextra', 'NULL',
'concmath-fonts', 'NULL',
'crossword', $standardsource . '|AcrossLite',
'cyrplain', 'NULL', # all in tex
@@ -2274,6 +2276,7 @@ $standardmf='[0-9]\.mf';
'cirth', 'cir.*\.mf',
'clock', 'clock.mf',
'cmcyr', 'NULL', # already made
+ 'cmextra', 'cm(man|tim)|' . $standardmf,
'cookingsymbols', 'cookingsymbols\.mf',
'cmpica', 'cmpic.*\.mf',
'dancers', 'dancers\.mf',
@@ -3339,6 +3342,20 @@ sub domf {
&install ($mfdir, $mf_inst_patt);
}
+sub runmf {
+ my ($mfpatt) = @_;
+ print "\t doing runmf for $package ($mfpatt)\n";
+ print " from filenames: @filenames\n";
+ for my $file (grep (/$mfpatt/, @filenames)) {
+ ($FileBase,$Filepath,$Filesuffix) = fileparse ($file, "\.[A-z]*");
+ if (! -e "$FileBase.tfm") {
+ print "\t\t Make TFM from $file\n";
+ &runjob ("mktextfm --destdir=`pwd` $FileBase.tfm");
+ &SYSTEM ("$RM *pk"); # not worth the space
+ }
+ }
+}
+
sub rundvi {
local($thispatt) = @_;
$TEX = $specialTEX{$package};
@@ -3490,19 +3507,6 @@ sub buildfilelist {
closedir (DIR);
}
-sub runmf {
- my ($mfpatt) = @_;
- print "\t doing runmf for $package ($mfpatt)\n";
- for my $file (grep (/$mfpatt/, @filenames)) {
- ($FileBase,$Filepath,$Filesuffix) = fileparse ($file, "\.[A-z]*");
- if (! -e "$FileBase.tfm") {
- print "\t\t Make TFM from $file\n";
- &runjob ("mktextfm --destdir=`pwd` $FileBase.tfm");
- &SYSTEM ("$RM *pk"); # not worth the space
- }
- }
-}
-
sub runfonts {
$Foundry = $specialfoundry{$package} || $standardfoundry;
for (grep(/\.vf$/, @filenames)) {
@@ -4718,6 +4722,16 @@ sub PREHOOK_cm_super {
&SYSTEM ("$RM -rf dvipdfm");
}
+sub PREHOOK_cmextra {
+ print "PREHOOK_$package - knuth/local/cm is our cmextra\n";
+ #
+ # remove concrete since we have always had that separately.
+ &SYSTEM ("rm cm/cc* cm/odigs.mf");
+ &SYSTEM ("rm cm/ebigop.mf"); # ditto old cmex for euler
+ &SYSTEM ("rm -rf [^c]*"); # ditto everything non-cm
+ &SYSTEM ("$MV cm/* ."); # flatten for normal setup
+}
+
sub PREHOOK_concrete {
print "PREHOOK_$package - instantiate symlinks from symlink\n";
# would be better done in tlpkginfo --prepare.
@@ -5330,7 +5344,7 @@ sub POSTinteractiveworkbook {
}
sub POSTjfontmaps {
- print "\t POST$package - move directories around\n";
+ print "POST$package - move directories around\n";
# dir "src" content -> run files
# dir "no_runtime" content -> source files
# dir "tool" as a whole -> source files
@@ -5396,12 +5410,12 @@ sub POSTlatex2html {
}
sub POSTlatex2e_help_texinfo {
- print "\t POST$package - remove translation subdir\n";
+ print "POST$package - remove translation subdir\n";
&SYSTEM ("$RM -rf spanish");
}
sub POSTlhcyr {
- print "\t POST$package - move to source, avoid dups\n";
+ print "POST$package - move to source, avoid dups\n";
&xchdir ("$DEST/tex/latex/$package");
# Sebastian moved tex files to the top level, removed from other dirs.
# We just follow what he did, years ago.
@@ -5423,29 +5437,28 @@ sub POSTlhcyr {
}
sub POSTlilyglyphs {
- print "\t POST$package - move directories around\n";
+ print "POST$package - move directories around\n";
&rename_with_mkdir ("fonts", "$DEST/fonts/opentype/public/$package");
&rename_with_mkdir ("source", "$DEST/source/luatex/$package");
&rename_with_mkdir ("tex", "$DEST/tex/lualatex/$package");
}
sub POSTlistbib {
- print "\t POST$package - move .doc to .bst\n";
+ print "POST$package - move .doc to .bst\n";
my $dest = "$DEST/bibtex/bst/$package";
&xmkdir ($dest);
&SYSTEM ("$MV $package.doc $dest/$package.bst");
}
sub POSTlithuanian {
- print "\t POST$package - remove old language support\n";
+ print "POST$package - remove old language support, fix .dfu location\n";
# these files are no longer used in TL.
&SYSTEM ("$RM language.lt.dat $DEST/tex/latex/lithuanian/language.lt.def");
- print "\t POST$package - fix location of .dfu file\n";
&SYSTEM ("$MV $DEST/doc/latex/lithuanian/l7xenc.dfu $DEST/tex/latex/lithuanian/");
}
sub POSTluatexja {
- print "\t POST$package - runins, move directories\n";
+ print "POST$package - runins, move directories\n";
&xchdir ("src");
{
local @filenames = glob ("*"); # dynamic redef for runins call.
@@ -5473,7 +5486,7 @@ sub POSTluatexja {
}
sub POSTmathdesign {
- print "PREHOOK_$package - mv files\n";
+ print "POST$package - mv files\n";
&SYSTEM ("$RM non-free/enc/tex*.enc"); # dup of standard enc files
&SYSTEM ("$RM non-free/enc/7t.enc");
# one way of merging dirtree A into dirtree B.
@@ -5498,18 +5511,18 @@ sub POSTmusixtex {
}
sub POSTmontex {
- print "\t POST$package - avoid 00readme case clash\n";
+ print "POST$package - avoid 00readme case clash\n";
# these files are no longer used in TL.
&SYSTEM ("$MV 00readme 00readme.mfinput.km");
}
sub POSTnumericplots {
- print "\t POST$package - mv latex subdir\n";
+ print "POST$package - mv latex subdir\n";
&SYSTEM ("$MV latex $DEST/tex/latex/$package");
}
sub POSTpas_vc {
- print "\t POST$package - mv latex subdir, doc files\n";
+ print "POST$package - mv latex subdir, doc files\n";
&SYSTEM ("$MV latex $DEST/tex/latex/$package");
&SYSTEM ("$MV $DEST/tex/latex/$package/photo.png .");
&SYSTEM ("$MV doc/* .");
diff --git a/Master/tlpkg/tlpsrc/cmextra.tlpsrc b/Master/tlpkg/tlpsrc/cmextra.tlpsrc
index 1ea7c75a3d3..95575f5aebe 100644
--- a/Master/tlpkg/tlpsrc/cmextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cmextra.tlpsrc
@@ -1,3 +1,4 @@
+catalogue knuth-local
runpattern +!d texmf-dist/fonts/afm/public/amsfonts/cmextra
runpattern +!d texmf-dist/fonts/source/public/amsfonts/cmextra
runpattern +!d texmf-dist/fonts/tfm/public/amsfonts/cmextra