40 files changed, 2 insertions, 560 deletions
diff --git a/Master/texmf-dist/source/latex/mflogo/CATALOGUE b/Master/texmf-dist/doc/latex/mflogo/CATALOGUE
index 6af9a9e20a8..6af9a9e20a8 100644
--- a/Master/texmf-dist/source/latex/mflogo/CATALOGUE
+++ b/Master/texmf-dist/doc/latex/mflogo/CATALOGUE
diff --git a/Master/texmf-dist/source/latex/mflogo/Makefile b/Master/texmf-dist/doc/latex/mflogo/Makefile
index 8bb2967f3da..8bb2967f3da 100644
--- a/Master/texmf-dist/source/latex/mflogo/Makefile
+++ b/Master/texmf-dist/doc/latex/mflogo/Makefile
diff --git a/Master/texmf-dist/source/latex/mflogo/README b/Master/texmf-dist/doc/latex/mflogo/README
index c05dd100f38..c05dd100f38 100644
--- a/Master/texmf-dist/source/latex/mflogo/README
+++ b/Master/texmf-dist/doc/latex/mflogo/README
diff --git a/Master/texmf-dist/doc/latex/mflogo/fonts b/Master/texmf-dist/doc/latex/mflogo/fonts
new file mode 120000
index 00000000000..71c2b745a99
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mflogo/fonts
@@ -0,0 +1 @@
+../../../../fonts/mflogo
+\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logo10.afm b/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logo10.afm
deleted file mode 100644
index 6c5759a4504..00000000000
--- a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logo10.afm
+++ /dev/null
@@ -1,44 +0,0 @@
-StartFontMetrics 2.0
-Comment Panose 2 0 0 6 2 0 0 2 0 0
-FullName LOGO10
-FontName LOGO10
-FamilyName LOGO10
-Weight Medium
-Notice Copyright (c) Taco Hoekwater, 1998. All rights reserved.
-Version 001.002
-IsFixedPitch false
-ItalicAngle 0.00
-FontBBox 0 -11 722 611
-Ascender 700
-Descender -200
-XHeight 0
-CapHeight 600
-UnderlinePosition -100
-UnderlineThickness 50
-StdHW 60
-StdVW 66
-EncodingScheme FontSpecific
-StartCharMetrics 10
-C 69 ; WX 622 ; N E ; B 78 0 556 600 ;
-C 70 ; WX 622 ; N F ; B 78 -11 556 600 ;
-C 77 ; WX 800 ; N M ; B 78 -11 722 611 ;
-C 78 ; WX 667 ; N N ; B 78 -11 588 611 ;
-C 79 ; WX 667 ; N O ; B 33 -11 633 611 ;
-C 80 ; WX 622 ; N P ; B 78 -11 583 600 ;
-C 83 ; WX 622 ; N S ; B 78 0 583 600 ;
-C 84 ; WX 578 ; N T ; B 0 -11 578 600 ;
-C 65 ; WX 667 ; N A ; B 78 -11 589 611 ;
-C 32 ; WX 267 ; N space ; B 0 0 0 0 ;
-EndCharMetrics
-StartKernData
-StartKernPairs 3
-KPX F O -44
-
-KPX P O 44
-
-KPX T A -22
-
-EndKernPairs
-EndKernData
-EndFontMetrics
-
-\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logo8.afm b/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logo8.afm
deleted file mode 100644
index 0b76479f8cf..00000000000
--- a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logo8.afm
+++ /dev/null
@@ -1,44 +0,0 @@
-StartFontMetrics 2.0
-Comment Panose 2 0 0 3 2 0 0 2 0 0
-FullName LOGO8
-FontName LOGO8
-FamilyName LOGO8
-Weight Medium
-Notice Copyright (c) Taco Hoekwater, 1998. All rights reserved.
-Version 001.002
-IsFixedPitch false
-ItalicAngle 0.00
-FontBBox 0 -10 764 610
-Ascender 700
-Descender -200
-XHeight 0
-CapHeight 600
-UnderlinePosition -100
-UnderlineThickness 50
-StdHW 60
-StdVW 66
-EncodingScheme FontSpecific
-StartCharMetrics 10
-C 69 ; WX 688 ; N E ; B 106 0 593 600 ;
-C 70 ; WX 688 ; N F ; B 106 -10 593 600 ;
-C 77 ; WX 870 ; N M ; B 106 -10 764 610 ;
-C 78 ; WX 733 ; N N ; B 106 -10 628 610 ;
-C 79 ; WX 733 ; N O ; B 60 -10 673 610 ;
-C 80 ; WX 688 ; N P ; B 106 -10 634 600 ;
-C 83 ; WX 688 ; N S ; B 106 0 635 600 ;
-C 84 ; WX 642 ; N T ; B 0 -10 642 600 ;
-C 65 ; WX 733 ; N A ; B 106 -10 627 610 ;
-C 32 ; WX 323 ; N space ; B 0 0 0 0 ;
-EndCharMetrics
-StartKernData
-StartKernPairs 3
-KPX F O -45
-
-KPX P O 45
-
-KPX T A -22
-
-EndKernPairs
-EndKernData
-EndFontMetrics
-
-\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logo9.afm b/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logo9.afm
deleted file mode 100644
index 1b953ed3b72..00000000000
--- a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logo9.afm
+++ /dev/null
@@ -1,44 +0,0 @@
-StartFontMetrics 2.0
-Comment Panose 2 0 0 3 2 0 0 2 0 0
-FullName LOGO9
-FontName LOGO9
-FamilyName LOGO9
-Weight Medium
-Notice Copyright (c) Taco Hoekwater, 1998. All rights reserved.
-Version 001.002
-IsFixedPitch false
-ItalicAngle 0.00
-FontBBox 0 -11 738 611
-Ascender 700
-Descender -200
-XHeight 0
-CapHeight 600
-UnderlinePosition -100
-UnderlineThickness 50
-StdHW 60
-StdVW 66
-EncodingScheme FontSpecific
-StartCharMetrics 10
-C 69 ; WX 647 ; N E ; B 88 0 570 600 ;
-C 70 ; WX 647 ; N F ; B 88 -11 570 600 ;
-C 77 ; WX 827 ; N M ; B 89 -11 738 611 ;
-C 78 ; WX 692 ; N N ; B 88 -11 604 611 ;
-C 79 ; WX 692 ; N O ; B 43 -11 649 611 ;
-C 80 ; WX 647 ; N P ; B 88 -11 603 600 ;
-C 83 ; WX 647 ; N S ; B 88 0 603 600 ;
-C 84 ; WX 602 ; N T ; B 0 -11 602 600 ;
-C 65 ; WX 689 ; N A ; B 89 -11 603 610 ;
-C 32 ; WX 287 ; N space ; B 0 0 0 0 ;
-EndCharMetrics
-StartKernData
-StartKernPairs 3
-KPX F O -44
-
-KPX P O 44
-
-KPX T A -22
-
-EndKernPairs
-EndKernData
-EndFontMetrics
-
-\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logobf10.afm b/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logobf10.afm
deleted file mode 100644
index cc050637938..00000000000
--- a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logobf10.afm
+++ /dev/null
@@ -1,44 +0,0 @@
-StartFontMetrics 2.0
-Comment Panose 2 0 0 3 2 0 0 2 0 0
-FullName LOGOBF10
-FontName LOGOBF10
-FamilyName LOGOBF10
-Weight Bold
-Notice Copyright (c) Taco Hoekwater, 1998. All rights reserved.
-Version 001.002
-IsFixedPitch false
-ItalicAngle 0.00
-FontBBox 0 -11 863 611
-Ascender 700
-Descender -200
-XHeight 0
-CapHeight 600
-UnderlinePosition -100
-UnderlineThickness 50
-StdHW 110
-StdVW 122
-EncodingScheme FontSpecific
-StartCharMetrics 10
-C 69 ; WX 736 ; N E ; B 77 0 670 600 ;
-C 70 ; WX 736 ; N F ; B 77 -11 670 600 ;
-C 77 ; WX 940 ; N M ; B 77 -11 863 611 ;
-C 78 ; WX 787 ; N N ; B 77 -11 710 611 ;
-C 79 ; WX 787 ; N O ; B 26 -11 761 611 ;
-C 80 ; WX 736 ; N P ; B 77 -11 696 600 ;
-C 83 ; WX 736 ; N S ; B 77 0 697 600 ;
-C 84 ; WX 684 ; N T ; B 0 -11 684 600 ;
-C 65 ; WX 787 ; N A ; B 77 -11 710 611 ;
-C 32 ; WX 327 ; N space ; B 0 0 0 0 ;
-EndCharMetrics
-StartKernData
-StartKernPairs 3
-KPX F O -51
-
-KPX P O 51
-
-KPX T A -25
-
-EndKernPairs
-EndKernData
-EndFontMetrics
-
-\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logod10.afm b/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logod10.afm
deleted file mode 100644
index a9b31620bfe..00000000000
--- a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logod10.afm
+++ /dev/null
@@ -1,37 +0,0 @@
-StartFontMetrics 2.0
-FontName LOGOD10
-FullName LOGOD10
-FamilyName LOGOD10
-FontBBox 0 -14 771 613
-Weight Demi
-Notice Copyright (c) Taco Hoekwater, 1998. All rights reserved.
-IsFixedPitch false
-ItalicAngle -12.00
-XHeight 0
-CapHeight 600
-UnderlinePosition -100
-UnderlineThickness 50
-StdHW 60
-StdVW 66
-FontBBox 0 -14 884 611
-EncodingScheme FontSpecific
-StartCharMetrics 10
-C 32 ; WX 280 ; N space ; B 0 0 0 0 ;
-C 65 ; WX 700 ; N A ; B 67 -11 633 611 ;
-C 69 ; WX 653 ; N E ; B 69 0 595 600 ;
-C 70 ; WX 653 ; N F ; B 69 -11 595 600 ;
-C 77 ; WX 840 ; N M ; B 69 -11 771 611 ;
-C 78 ; WX 700 ; N N ; B 69 -11 631 611 ;
-C 79 ; WX 700 ; N O ; B 20 -14 680 613 ;
-C 80 ; WX 653 ; N P ; B 69 -11 619 603 ;
-C 83 ; WX 653 ; N S ; B 67 -2 619 600 ;
-C 84 ; WX 607 ; N T ; B 0 -11 607 600 ;
-EndCharMetrics
-StartKernData
-StartKernPairs 3
-KPX F O -47
-KPX P O 47
-KPX T A -23
-EndKernPairs
-EndKernData
-EndFontMetrics
diff --git a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logosl10.afm b/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logosl10.afm
deleted file mode 100644
index 233309d40d5..00000000000
--- a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logosl10.afm
+++ /dev/null
@@ -1,44 +0,0 @@
-StartFontMetrics 2.0
-Comment Panose 2 0 0 6 2 0 0 2 0 0
-FullName LOGOSL10
-FontName LOGOSL10
-FamilyName LOGOSL10
-Weight Medium
-Notice Copyright (c) Taco Hoekwater, 1998. All rights reserved.
-Version 001.002
-IsFixedPitch false
-ItalicAngle -12.00
-FontBBox 0 -11 867 611
-Ascender 700
-Descender -200
-XHeight 0
-CapHeight 600
-UnderlinePosition -100
-UnderlineThickness 50
-StdHW 60
-StdVW 66
-EncodingScheme FontSpecific
-StartCharMetrics 10
-C 69 ; WX 622 ; N E ; B 85 0 698 600 ;
-C 70 ; WX 622 ; N F ; B 83 -11 698 600 ;
-C 77 ; WX 800 ; N M ; B 83 -11 867 611 ;
-C 78 ; WX 667 ; N N ; B 83 -11 734 611 ;
-C 79 ; WX 667 ; N O ; B 80 -11 728 611 ;
-C 80 ; WX 622 ; N P ; B 83 -11 698 600 ;
-C 83 ; WX 622 ; N S ; B 85 0 687 600 ;
-C 84 ; WX 578 ; N T ; B 142 -11 720 600 ;
-C 65 ; WX 667 ; N A ; B 83 -11 686 611 ;
-C 32 ; WX 267 ; N space ; B 0 0 0 0 ;
-EndCharMetrics
-StartKernData
-StartKernPairs 3
-KPX F O -44
-
-KPX P O 44
-
-KPX T A -22
-
-EndKernPairs
-EndKernData
-EndFontMetrics
-
-\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logosl8.afm b/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logosl8.afm
deleted file mode 100644
index 2028bbb12fb..00000000000
--- a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logosl8.afm
+++ /dev/null
@@ -1,38 +0,0 @@
-StartFontMetrics 2.0
-FontName LOGOSL8
-FullName LOGOSL8
-FamilyName LOGOSL8
-Comment UniqueID 0
-Weight Medium
-Notice Copyright (c) Taco Hoekwater, 1998. All rights reserved.
-IsFixedPitch false
-ItalicAngle -12.00
-FontBBox 0 -11 867 611
-XHeight 0
-CapHeight 600
-UnderlinePosition -100
-UnderlineThickness 50
-StdHW 60
-StdVW 66
-FontBBox 0 -14 910 611
-EncodingScheme FontSpecific
-StartCharMetrics 10
-C 32 ; WX 323 ; N space ; B 0 0 0 0 ;
-C 65 ; WX 733 ; N A ; B 110 -10 745 610 ;
-C 69 ; WX 688 ; N E ; B 113 0 735 600 ;
-C 70 ; WX 688 ; N F ; B 110 -10 735 600 ;
-C 77 ; WX 870 ; N M ; B 110 -10 910 610 ;
-C 78 ; WX 733 ; N N ; B 110 -10 773 610 ;
-C 79 ; WX 733 ; N O ; B 86 -14 791 611 ;
-C 80 ; WX 688 ; N P ; B 110 -10 764 603 ;
-C 83 ; WX 688 ; N S ; B 113 -1 725 600 ;
-C 84 ; WX 642 ; N T ; B 143 -10 785 600 ;
-EndCharMetrics
-StartKernData
-StartKernPairs 3
-KPX F O -46
-KPX P O 46
-KPX T A -23
-EndKernPairs
-EndKernData
-EndFontMetrics
diff --git a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logosl9.afm b/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logosl9.afm
deleted file mode 100644
index 6cb2796e8fb..00000000000
--- a/Master/texmf-dist/fonts/afm/hoekwater/mflogo/logosl9.afm
+++ /dev/null
@@ -1,37 +0,0 @@
-StartFontMetrics 2.0
-FontName LOGOSL9
-FullName LOGOSL9
-FamilyName LOGOSL9
-Weight Medium
-Notice Copyright (c) Taco Hoekwater, 1998. All rights reserved.
-IsFixedPitch false
-ItalicAngle -12.00
-FontBBox 0 -11 867 611
-XHeight 0
-CapHeight 600
-UnderlinePosition -100
-UnderlineThickness 50
-StdHW 60
-StdVW 66
-FontBBox 0 -14 884 611
-EncodingScheme FontSpecific
-StartCharMetrics 10
-C 32 ; WX 287 ; N space ; B 0 0 0 0 ;
-C 65 ; WX 692 ; N A ; B 93 -11 721 611 ;
-C 69 ; WX 647 ; N E ; B 95 0 713 600 ;
-C 70 ; WX 647 ; N F ; B 93 -11 713 600 ;
-C 77 ; WX 827 ; N M ; B 93 -11 884 611 ;
-C 78 ; WX 692 ; N N ; B 93 -11 749 611 ;
-C 79 ; WX 692 ; N O ; B 68 -14 767 611 ;
-C 80 ; WX 647 ; N P ; B 93 -11 733 603 ;
-C 83 ; WX 647 ; N S ; B 95 -1 702 600 ;
-C 84 ; WX 602 ; N T ; B 142 -11 744 600 ;
-EndCharMetrics
-StartKernData
-StartKernPairs 3
-KPX F O -45
-KPX P O 45
-KPX T A -22
-EndKernPairs
-EndKernData
-EndFontMetrics
diff --git a/Master/texmf-dist/fonts/map/dvips/mflogo/mflogo.map b/Master/texmf-dist/fonts/map/dvips/mflogo/mflogo.map
deleted file mode 100644
index a70d2b6d906..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/mflogo/mflogo.map
+++ /dev/null
@@ -1,9 +0,0 @@
-% Thomas Esser, 1998, public domain.
-logo10 LOGO10 <logo10.pfb
-logo8 LOGO8 <logo8.pfb
-logo9 LOGO9 <logo9.pfb
-logobf10 LOGOBF10 <logobf10.pfb
-logod10 LOGOD10 <logod10.pfb
-logosl10 LOGOSL10 <logosl10.pfb
-logosl8 LOGOSL8 <logosl8.pfb
-logosl9 LOGOSL9 <logosl9.pfb
diff --git a/Master/texmf-dist/fonts/source/public/mflogo/flogo.mf b/Master/texmf-dist/fonts/source/public/mflogo/flogo.mf
deleted file mode 100644
index 0af2a2a76a4..00000000000
--- a/Master/texmf-dist/fonts/source/public/mflogo/flogo.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-% fat version of METAFONT logo
-font_size 10pt#;  % the "design size" of this font
-ht#:=6pt#;    % height of characters
-xgap#:=2pt#;    % horizontal adjustment
-u#:=4/3pt#;    % unit width
-s#:=-2/3pt#;    % extra space at the left and the right
-o#:=1/9pt#;    % overshoot
-px#:=1/3pt#;    % horizontal thickness of pen
-input logo    % now generate the font
-end      % and stop.
diff --git a/Master/texmf-dist/fonts/source/public/mflogo/logo.mf b/Master/texmf-dist/fonts/source/public/mflogo/logo.mf
deleted file mode 100644
index 2a308ab917b..00000000000
--- a/Master/texmf-dist/fonts/source/public/mflogo/logo.mf
+++ /dev/null
@@ -1,127 +0,0 @@
-% Routines for the METAFONT logo, as found in The METAFONTbook
-% Extended to characters P and S for John Hobby's METAPOST
-% (logo10.mf is a typical parameter file)
-
-mode_setup;
-if unknown slant: slant:=0 else: currenttransform:=
- identity slanted slant yscaled aspect_ratio fi;
-
-ygap#:=(ht#/13.5u#)*xgap#;              % vertical adjustment
-ho#:=o#;                                % horizontal overshoot
-leftstemloc#:=2.5u#+s#;                 % position of left stem
-barheight#:=.45ht#;                     % height of bar lines
-py#:=.9px#;                             % vertical pen thickness
-
-define_pixels(s,u);
-define_whole_pixels(xgap);
-define_whole_vertical_pixels(ygap);
-define_blacker_pixels(px,py);
-pickup pencircle xscaled px yscaled py;
-logo_pen:=savepen;
-define_good_x_pixels(leftstemloc);
-define_good_y_pixels(barheight);
-define_corrected_pixels(o);
-define_horizontal_corrected_pixels(ho);
-
-def beginlogochar(expr code, unit_width) =
- beginchar(code,unit_width*u#+2s#,ht#,0);
- pickup logo_pen enddef;
-
-def super_half(suffix i,j,k) =
- draw z.i{0,y.j-y.i}
- ... (.8[x.j,x.i],.8[y.i,y.j]){z.j-z.i}
- ... z.j{x.k-x.i,0}
- ... (.8[x.j,x.k],.8[y.k,y.j]){z.k-z.j}
- ... z.k{0,y.k-y.j} enddef;
-
-def super_crescent(suffix i,j,k) =
- draw z.i{x.j-x.i,0}
- ... (.8[x.i,x.j],.8[y.j,y.i]){z.j-z.i}
- ... z.j{0,y.k-y.i}
- ... (.8[x.k,x.j],.8[y.j,y.k]){z.k-z.j}
- ... z.k{x.k-x.j,0} enddef;
-
-beginlogochar("M",18);
-x1=x2=leftstemloc; x4=x5=w-x1; x3=w-x3;
-y1=y5; y2=y4; bot y1=-o;
-top y2=h+o; y3=y1+ygap;
-draw z1--z2--z3--z4--z5;
-labels(1,2,3,4,5); endchar;
-
-beginlogochar("E",14);
-x1=x2=x3=leftstemloc;
-x4=x6=w-x1+ho; x5=x4-xgap;
-y1=y6; y2=y5; y3=y4;
-bot y1=0; top y3=h; y2=barheight;
-draw z6--z1--z3--z4; draw z2--z5;
-labels(1,2,3,4,5,6); endchar;
-
-beginlogochar("T",13);
-italcorr ht#*slant + .5u#;
-if .5w<>good.x .5w: change_width; fi
-lft x1=-eps; x2=w-x1; x3=x4=.5w;
-y1=y2=y3; top y1=h; bot y4=-o;
-draw z1--z2; draw z3--z4;
-labels(1,2,3,4); endchar;
-
-beginlogochar("A",15);
-x1=.5w; x2=x4=leftstemloc; x3=x5=w-x2;
-top y1=h+o; y2=y3=barheight;
-bot y4=bot y5=-o;
-draw z4--z2--z3--z5; super_half(2,1,3);
-labels(1,2,3,4,5); endchar;
-
-beginlogochar("F",14);
-x1=x2=x3=leftstemloc;
-x4=w-x1+ho; x5=x4-xgap;
-y2=y5; y3=y4; bot y1=-o;
-top y3=h; y2=barheight;
-draw z1--z3--z4; draw z2--z5;
-labels(1,2,3,4,5); endchar;
-
-beginlogochar("P",14);
-x1=x2=x3=leftstemloc;
-x4=x5=.618[x1,w-x1];
-y2=y5; y3=y4; bot y1=-o;
-top y3=h; y2=barheight;
-draw z1--z3--z4; draw z2--z5;
-x6=.5[w-x1,lft w]; y6=.5[y4,y5];
-super_crescent(4,6,5);
-labels(1,2,3,4,5,6); endchar;
-
-beginlogochar("S",14);
-x3=x8=leftstemloc;
-x1=w-x3;
-x2=x4=.382[x3,x1];
-x5=x7=.9[x3,x1];
-x6=.5[x1,w];
-top y1=h; y4=barheight; bot y8=0;
-y1=y2; y3=.6[y2,y4]; y4=y5; y6=.3[y5,y7]; y7=y8;
-draw z1--z2; draw z4--z5; draw z7--z8;
-super_crescent(2,3,4);
-super_crescent(5,6,7);
-labels(1,2,3,4,5,6,7,8); endchar;
-
-beginlogochar("O",15);
-x1=x4=.5w; top y1=h+o; bot y4=-o;
-x2=w-x3=good.x(1.5u+s); y2=y3=barheight;
-super_half(2,1,3); super_half(2,4,3);
-labels(1,2,3,4); endchar;
-
-beginlogochar("N",15);
-x1=x2=leftstemloc; x3=x4=x5=w-x1;
-bot y1=bot y4=-o;
-top y2=top y5=h+o; y3=y4+ygap;
-draw z1--z2--z3; draw z4--z5;
-labels(1,2,3,4,5); endchar;
-
-ligtable "T": "A" kern -.5u#;
-ligtable "F": "O" kern -u#;
-ligtable "P": "O" kern u#;
-
-font_quad:=18u#+2s#;
-font_normal_space:=6u#+2s#;
-font_normal_stretch:=3u#;
-font_normal_shrink:=2u#;
-font_identifier:="MFLOGO" if slant<>0: & "SL" fi;
-font_coding_scheme:="AEFMNOPST only";
diff --git a/Master/texmf-dist/fonts/source/public/mflogo/logo10.mf b/Master/texmf-dist/fonts/source/public/mflogo/logo10.mf
deleted file mode 100644
index 2b89c710d10..00000000000
--- a/Master/texmf-dist/fonts/source/public/mflogo/logo10.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-% 10-point METAFONT logo
-font_size 10pt#;  % the "design size" of this font
-ht#:=6pt#;    % height of characters
-xgap#:=0.6pt#;    % horizontal adjustment
-u#:=4/9pt#;    % unit width
-s#:=0;      % extra space at the left and the right
-o#:=1/9pt#;    % overshoot
-px#:=2/3pt#;    % horizontal thickness of pen
-input logo    % now generate the font
-bye      % and stop.
diff --git a/Master/texmf-dist/fonts/source/public/mflogo/logo8.mf b/Master/texmf-dist/fonts/source/public/mflogo/logo8.mf
deleted file mode 100644
index 59b37c072bc..00000000000
--- a/Master/texmf-dist/fonts/source/public/mflogo/logo8.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-% 8-point METAFONT logo
-font_size 8pt#;    % the "design size" of this font
-ht#:=.8*6pt#;    % height of characters
-xgap#:=.8*0.6pt#;  % horizontal adjustment
-u#:=.82*4/9pt#;    % unit width
-s#:=.2pt#;    % extra space at the left and the right
-o#:=1/12pt#;    % overshoot
-px#:=.8*2/3pt#;    % horizontal thickness of pen
-input logo    % now generate the font
-bye      % and stop.
diff --git a/Master/texmf-dist/fonts/source/public/mflogo/logo9.mf b/Master/texmf-dist/fonts/source/public/mflogo/logo9.mf
deleted file mode 100644
index 49ea7e99f75..00000000000
--- a/Master/texmf-dist/fonts/source/public/mflogo/logo9.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-% 9-point METAFONT logo
-font_size 9pt#;    % the "design size" of this font
-ht#:=.9*6pt#;    % height of characters
-xgap#:=.9*0.6pt#;  % horizontal adjustment
-u#:=.91*4/9pt#;    % unit width
-s#:=.08pt#;    % extra space at the left and the right
-o#:=1/10pt#;    % overshoot
-px#:=.9*2/3pt#;    % horizontal thickness of pen
-input logo    % now generate the font
-bye      % and stop.
diff --git a/Master/texmf-dist/fonts/source/public/mflogo/logobf10.mf b/Master/texmf-dist/fonts/source/public/mflogo/logobf10.mf
deleted file mode 100644
index f943053ff5a..00000000000
--- a/Master/texmf-dist/fonts/source/public/mflogo/logobf10.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-% 10-point boldface METAFONT logo
-font_size 10pt#;  % the "design size" of this font
-ht#:=6pt#;    % height of characters
-xgap#:=23/20*0.6pt#;    % horizontal adjustment
-u#:=23/20*4/9pt#;    % unit width
-s#:=.1pt#;    % extra space at the left and the right
-o#:=1/9pt#;    % overshoot
-px#:=44/36pt#;    % horizontal thickness of pen
-input logo    % now generate the font
-bye      % and stop.
diff --git a/Master/texmf-dist/fonts/source/public/mflogo/logosl10.mf b/Master/texmf-dist/fonts/source/public/mflogo/logosl10.mf
deleted file mode 100644
index 741fdb9fa2e..00000000000
--- a/Master/texmf-dist/fonts/source/public/mflogo/logosl10.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-% 10-point slanted METAFONT logo
-slant := 1/4;
-input logo10
diff --git a/Master/texmf-dist/fonts/source/public/mflogo/logosl8.mf b/Master/texmf-dist/fonts/source/public/mflogo/logosl8.mf
deleted file mode 100644
index 5684ce948f2..00000000000
--- a/Master/texmf-dist/fonts/source/public/mflogo/logosl8.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-% 8-point slanted METAFONT logo
-% [ heavily borrowed from D. E. Knuth ]
-
-% Copyright (C) 1995--1999 Ulrik Vieth
-%
-% This program is free software; you can redistribute it and/or
-% modify it under the terms of the LaTeX Project Public License
-% as described in lppl.txt in the base LaTeX distribution; either
-% version 1 of the License, or (at your option) any later version.
-
-slant := 1/4;
-input logo8
diff --git a/Master/texmf-dist/fonts/source/public/mflogo/nlogo.mf b/Master/texmf-dist/fonts/source/public/mflogo/nlogo.mf
deleted file mode 100644
index b43a3924665..00000000000
--- a/Master/texmf-dist/fonts/source/public/mflogo/nlogo.mf
+++ /dev/null
@@ -1,15 +0,0 @@
-% Driver file for the METAFONT logo
-if unknown logobase: input logobase fi
-
-mode_setup; font_setup;
-input METAFON
-
-ligtable "T": "A" kern -.5u#;
-ligtable "F": "O" kern -u#;
-
-font_quad:=18u#+2s#;
-font_normal_space:=6u#+2s#;
-font_normal_stretch:=3u#;
-font_normal_shrink:=2u#;
-font_identifier:="MFLOGO" if slant<>0: & "SL" fi;
-font_coding_scheme:="AEFMNOT only";
diff --git a/Master/texmf-dist/fonts/source/public/mflogo/sklogo.mf b/Master/texmf-dist/fonts/source/public/mflogo/sklogo.mf
deleted file mode 100644
index 4a6f0d82b1a..00000000000
--- a/Master/texmf-dist/fonts/source/public/mflogo/sklogo.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-% skinny variant of METAFONT logo
-font_size 30pt#;  % the "design size" of this font
-ht#:=25pt#;    % height of characters
-xgap#:=1.5pt#;    % horizontal adjustment
-u#:=3/9pt#;    % unit width
-s#:=1/3pt#;    % extra space at the left and the right
-o#:=2/9pt#;    % overshoot
-px#:=1pt#;    % horizontal thickness of pen
-slant:=-1/9;    % leftward bias
-input nlogo    % now generate the font (testing the driver approach)
-bye      % and stop.
diff --git a/Master/texmf-dist/fonts/tfm/public/mflogo/logo10.tfm b/Master/texmf-dist/fonts/tfm/public/mflogo/logo10.tfm
deleted file mode 100644
index 67e7898d322..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/mflogo/logo10.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/mflogo/logo8.tfm b/Master/texmf-dist/fonts/tfm/public/mflogo/logo8.tfm
deleted file mode 100644
index 67785167506..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/mflogo/logo8.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/mflogo/logo9.tfm b/Master/texmf-dist/fonts/tfm/public/mflogo/logo9.tfm
deleted file mode 100644
index 071f935b64f..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/mflogo/logo9.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/mflogo/logobf10.tfm b/Master/texmf-dist/fonts/tfm/public/mflogo/logobf10.tfm
deleted file mode 100644
index eafccbb845b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/mflogo/logobf10.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/mflogo/logod10.tfm b/Master/texmf-dist/fonts/tfm/public/mflogo/logod10.tfm
deleted file mode 100644
index 86ad1717fbf..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/mflogo/logod10.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/mflogo/logosl10.tfm b/Master/texmf-dist/fonts/tfm/public/mflogo/logosl10.tfm
deleted file mode 100644
index f7a64db6b18..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/mflogo/logosl10.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/mflogo/logosl8.tfm b/Master/texmf-dist/fonts/tfm/public/mflogo/logosl8.tfm
deleted file mode 100644
index 387d53df614..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/mflogo/logosl8.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/mflogo/logosl9.tfm b/Master/texmf-dist/fonts/tfm/public/mflogo/logosl9.tfm
deleted file mode 100644
index a1d8c723839..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/mflogo/logosl9.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logo10.pfb b/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logo10.pfb
deleted file mode 100644
index 9bb42aaef34..00000000000
--- a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logo10.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logo8.pfb b/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logo8.pfb
deleted file mode 100644
index 89fdddd3da8..00000000000
--- a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logo8.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logo9.pfb b/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logo9.pfb
deleted file mode 100644
index 0b41fa015a1..00000000000
--- a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logo9.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logobf10.pfb b/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logobf10.pfb
deleted file mode 100644
index 3e64ef34877..00000000000
--- a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logobf10.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logod10.pfb b/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logod10.pfb
deleted file mode 100644
index ec701f48e1f..00000000000
--- a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logod10.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logosl10.pfb b/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logosl10.pfb
deleted file mode 100644
index 13ab0a37d1a..00000000000
--- a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logosl10.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logosl8.pfb b/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logosl8.pfb
deleted file mode 100644
index 247a73bef15..00000000000
--- a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logosl8.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logosl9.pfb b/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logosl9.pfb
deleted file mode 100644
index 321c0ca3225..00000000000
--- a/Master/texmf-dist/fonts/type1/hoekwater/mflogo/logosl9.pfb
+++ /dev/null
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 6d334dedcc0..cdcd696d736 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -333,7 +333,7 @@ my @TLP_working = qw(
     metafont-beginners metago metalogo metaobj metaplot
     metapost-examples metatex metauml
     method metre metrix
-    mf2pt1 mflogo-font mfnfss mfpic mfpic4ode mftinc mhchem
+    mf2pt1 mflogo mflogo-font mfnfss mfpic mfpic4ode mftinc mhchem
     mhequ microtype microtype-de midnight midpage mil3 miller
     minibox minifp minipage-marginpar miniplot minitoc minorrevision
     minted mintspirit minutes