marcellus (24jul20)

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

67 files changed, 21 insertions, 1249 deletions

diff --git a/Master/texmf-dist/doc/fonts/marcellus/README b/Master/texmf-dist/doc/fonts/marcellus/README
index abdb202904b..cb22c42c8bc 100644
--- a/Master/texmf-dist/doc/fonts/marcellus/README
+++ b/Master/texmf-dist/doc/fonts/marcellus/README
@@ -1,8 +1,8 @@
 This is the README for the marcellus package, version
-2019-10-13.
+2020-07-23.
 
-This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
-support for the Marcellus family of fonts, designed by
+This package provides 
+the Marcellus family of fonts, designed by
 Brian J. Bonislawsky. Marcellus is a flared-serif family, 
 inspired by classic Roman inscription letterforms.  There is
 currently just a regular weight and small-caps. The regular
@@ -14,8 +14,7 @@ TeX system download the file
 preferred URL for "tex-archive" is http://mirrors.ctan.org.
 Unzip the archive at the root of an appropriate texmf tree,
 likely a personal or local tree. If necessary, update the
-file-name database (e.g., texhash). Update the font-map
-files by enabling the Map file marcellus.map.
+file-name database (e.g., texhash). 
 
 To use, add
 
@@ -24,24 +23,17 @@ To use, add
 to the preamble of your document. This will activate
 Marcellus as the main (serifed) text font.
 
-LuaLaTeX and xeLaTeX users who might prefer type1 fonts or
-who wish to avoid fontspec may use the type1 option.
-
 Options scaled=<number> or scale=<number> may be used to
 scale the fonts.
 
 The only figure style is proportional lining.
 
-Font encodings supported are OT1, T1, LY1, and TS1.
-
-The original Truetype fonts were obtained from
+The Truetype fonts were obtained from
 
 https://fonts.google.com/specimen/Marcellus
 
-and are licensed under the SIL Open Font License, 
-version 1.1; the text may be found in the doc directory. 
-The type1 versions were created using fontforge. The
-support files were created using autoinst and otftotfm and
-are licensed under the terms of the LaTeX Project Public
-License. The maintainer of this package is Bob Tennent (rdt
-at cs.queensu.ca)
+and are licensed under the SIL Open Font License, version
+1.1; the text may be found in the doc directory. The rest
+of the package is licensed under the terms of the LaTeX
+Project Public License. The maintainer of this package is
+Bob Tennent (rdt at cs.queensu.ca)
diff --git a/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.pdf b/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.pdf
index df700a9d751..42019dc830a 100644
--- a/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.pdf
diff --git a/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.tex b/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.tex
index 24ed419ed30..353c7a2fd0f 100644
--- a/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.tex
+++ b/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.tex
@@ -1,5 +1,4 @@
 \documentclass{article}
-\usepackage[T1]{fontenc}
 \usepackage{marcellus}
 \usepackage{lipsum}
 \begin{document}
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_4cvize.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_4cvize.enc
deleted file mode 100644
index 627143816d8..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_4cvize.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_4cvizetsvyupkbfckcbzyvhwag
-% Encoding created by otftotfm on Sat May 11 10:06:35 2019
-% Command line follows encoding
-/AutoEnc_4cvizetsvyupkbfckcbzyvhwag [
-%00
-  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae /oe /oslash /AE /OE /Oslash
-%20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
-  /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
-  /degree /plusminus /twosuperior /threesuperior /acute /micro /paragraph /periodcentered
-  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
-  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
-  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
-  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/marcellus
-% --vf-directory=texmf/fonts/vf/public/marcellus
-% --type1-directory=texmf/fonts/type1/public/marcellus
-% --truetype-directory=texmf/fonts/truetype/public/marcellus
-% --encoding-directory=texmf/fonts/enc/dvips/marcellus
-% --map-file=texmf/fonts/map/dvips/marcellus/Marcellus.map --no-updmap
-% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * --unicoding=germandbls =:
-% SSsmall MarcellusSmallCaps.ttf MarcellusSmallCaps-sup-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_5ago63.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_5ago63.enc
deleted file mode 100644
index 7464fc21810..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_5ago63.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_5ago632vnelsekyxdx56qkw6id
-% Encoding created by otftotfm on Sat May 11 10:06:34 2019
-% Command line follows encoding
-/AutoEnc_5ago632vnelsekyxdx56qkw6id [
-%00
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /fi /fl /.notdef /.notdef /.notdef
-%10
-  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
-  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/marcellus
-% --vf-directory=texmf/fonts/vf/public/marcellus
-% --type1-directory=texmf/fonts/type1/public/marcellus
-% --truetype-directory=texmf/fonts/truetype/public/marcellus
-% --encoding-directory=texmf/fonts/enc/dvips/marcellus
-% --map-file=texmf/fonts/map/dvips/marcellus/Marcellus.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% Marcellus-Regular.ttf Marcellus-Regular-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_5az7w7.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_5az7w7.enc
deleted file mode 100644
index 033766b7233..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_5az7w7.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_5az7w72w5hf5ruah35anfcnwvd
-% Encoding created by otftotfm on Sat May 11 10:06:34 2019
-% Command line follows encoding
-/AutoEnc_5az7w72w5hf5ruah35anfcnwvd [
-%00
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
-  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven
-  /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/marcellus
-% --vf-directory=texmf/fonts/vf/public/marcellus
-% --type1-directory=texmf/fonts/type1/public/marcellus
-% --truetype-directory=texmf/fonts/truetype/public/marcellus
-% --encoding-directory=texmf/fonts/enc/dvips/marcellus
-% --map-file=texmf/fonts/map/dvips/marcellus/Marcellus.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=sups --ligkern=* {KL} * Marcellus-Regular.ttf
-% Marcellus-Regular-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_cvodtw.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_cvodtw.enc
deleted file mode 100644
index d11d47dc5b0..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_cvodtw.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_cvodtwnr5rlhu7mqkgyzybdxjg
-% Encoding created by otftotfm on Sat May 11 10:06:36 2019
-% Command line follows encoding
-/AutoEnc_cvodtwnr5rlhu7mqkgyzybdxjg [
-%00
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
-%10
-  /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
-%20
-  /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
-  /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
-%30
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
-%40
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%60
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
-  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
-  /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
-  /degree /plusminus /twosuperior /threesuperior /.notdef /micro /paragraph /periodcentered
-  /.notdef /onesuperior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro
-%C0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=texmf/fonts/tfm/public/marcellus
-% --vf-directory=texmf/fonts/vf/public/marcellus
-% --type1-directory=texmf/fonts/type1/public/marcellus
-% --truetype-directory=texmf/fonts/truetype/public/marcellus
-% --encoding-directory=texmf/fonts/enc/dvips/marcellus
-% --map-file=texmf/fonts/map/dvips/marcellus/Marcellus.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
-% --feature=kern --feature=liga --unicoding=germandbls =: SSsmall
-% MarcellusSmallCaps.ttf MarcellusSmallCaps-lf-sc-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_dfyae6.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_dfyae6.enc
deleted file mode 100644
index d2a57ca3f43..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_dfyae6.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_dfyae6rpk2yrr3lzb7ea4gv4dg
-% Encoding created by otftotfm on Sat May 11 10:06:35 2019
-% Command line follows encoding
-/AutoEnc_dfyae6rpk2yrr3lzb7ea4gv4dg [
-%00
-  /fi /Euro /fl /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
-  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
-  /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
-  /degree /plusminus /twosuperior /threesuperior /acute /micro /paragraph /periodcentered
-  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
-  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
-  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
-  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
-  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/marcellus
-% --vf-directory=texmf/fonts/vf/public/marcellus
-% --type1-directory=texmf/fonts/type1/public/marcellus
-% --truetype-directory=texmf/fonts/truetype/public/marcellus
-% --encoding-directory=texmf/fonts/enc/dvips/marcellus
-% --map-file=texmf/fonts/map/dvips/marcellus/Marcellus.map --no-updmap
-% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga Marcellus-Regular.ttf Marcellus-Regular-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_hxcgcn.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_hxcgcn.enc
deleted file mode 100644
index 2806e9cdf68..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_hxcgcn.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_hxcgcngs3hum7d5pbyap726ujd
-% Encoding created by otftotfm on Sat May 11 10:06:35 2019
-% Command line follows encoding
-/AutoEnc_hxcgcngs3hum7d5pbyap726ujd [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
-  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
-  /.notdef /dotlessi /dotlessj /fi /fl /.notdef /.notdef /.notdef
-%20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
-%A0
-  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
-  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
-%B0
-  /rcaron /sacute /scaron /scedilla /tcaron /tcommaaccent /uhungarumlaut /uring
-  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
-  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
-  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
-  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/marcellus
-% --vf-directory=texmf/fonts/vf/public/marcellus
-% --type1-directory=texmf/fonts/type1/public/marcellus
-% --truetype-directory=texmf/fonts/truetype/public/marcellus
-% --encoding-directory=texmf/fonts/enc/dvips/marcellus
-% --map-file=texmf/fonts/map/dvips/marcellus/Marcellus.map --no-updmap
-% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga Marcellus-Regular.ttf
-% Marcellus-Regular-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_l63c5y.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_l63c5y.enc
deleted file mode 100644
index f2746815b16..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_l63c5y.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_l63c5y4cphahr2uk4ehjslxjva
-% Encoding created by otftotfm on Sat May 11 10:06:35 2019
-% Command line follows encoding
-/AutoEnc_l63c5y4cphahr2uk4ehjslxjva [
-%00
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /C /bar
-%10
-  /asterisk /exclam /quotedblbase /exclamdown /question /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
-%20
-  /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
-  /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
-%30
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
-%40
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%60
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
-  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
-  /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
-  /degree /plusminus /twosuperior /threesuperior /.notdef /micro /paragraph /periodcentered
-  /.notdef /onesuperior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro
-%C0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=texmf/fonts/tfm/public/marcellus
-% --vf-directory=texmf/fonts/vf/public/marcellus
-% --type1-directory=texmf/fonts/type1/public/marcellus
-% --truetype-directory=texmf/fonts/truetype/public/marcellus
-% --encoding-directory=texmf/fonts/enc/dvips/marcellus
-% --map-file=texmf/fonts/map/dvips/marcellus/Marcellus.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
-% Marcellus-Regular.ttf Marcellus-Regular-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_lo2l42.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_lo2l42.enc
deleted file mode 100644
index f71aa752720..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_lo2l42.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_lo2l42oncdbogrxnkwdhtqzute
-% Encoding created by otftotfm on Sat May 11 10:06:36 2019
-% Command line follows encoding
-/AutoEnc_lo2l42oncdbogrxnkwdhtqzute [
-%00
-  /fi /Euro /fl /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae /oe /oslash /AE /OE /Oslash
-%20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
-  /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
-  /degree /plusminus /twosuperior /threesuperior /acute /micro /paragraph /periodcentered
-  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
-  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
-  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
-  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/marcellus
-% --vf-directory=texmf/fonts/vf/public/marcellus
-% --type1-directory=texmf/fonts/type1/public/marcellus
-% --truetype-directory=texmf/fonts/truetype/public/marcellus
-% --encoding-directory=texmf/fonts/enc/dvips/marcellus
-% --map-file=texmf/fonts/map/dvips/marcellus/Marcellus.map --no-updmap
-% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --unicoding=germandbls =: SSsmall MarcellusSmallCaps.ttf
-% MarcellusSmallCaps-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_mqz6jr.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_mqz6jr.enc
deleted file mode 100644
index c303f19cc35..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_mqz6jr.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_mqz6jrllipnucf24xyrydslfib
-% Encoding created by otftotfm on Sat May 11 10:06:35 2019
-% Command line follows encoding
-/AutoEnc_mqz6jrllipnucf24xyrydslfib [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
-  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
-  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
-%20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
-%A0
-  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
-  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
-%B0
-  /rcaron /sacute /scaron /scedilla /tcaron /tcommaaccent /uhungarumlaut /uring
-  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
-  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
-  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
-  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/marcellus
-% --vf-directory=texmf/fonts/vf/public/marcellus
-% --type1-directory=texmf/fonts/type1/public/marcellus
-% --truetype-directory=texmf/fonts/truetype/public/marcellus
-% --encoding-directory=texmf/fonts/enc/dvips/marcellus
-% --map-file=texmf/fonts/map/dvips/marcellus/Marcellus.map --no-updmap
-% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
-% --unicoding=germandbls =: SSsmall MarcellusSmallCaps.ttf
-% MarcellusSmallCaps-sup-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_oyecj6.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_oyecj6.enc
deleted file mode 100644
index 144f1e9561d..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_oyecj6.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_oyecj6vz7phl24x4jeyz7casnf
-% Encoding created by otftotfm on Sat May 11 10:06:35 2019
-% Command line follows encoding
-/AutoEnc_oyecj6vz7phl24x4jeyz7casnf [
-%00
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /fi /fl /.notdef /.notdef /.notdef
-%10
-  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae /oe /oslash /AE /OE /Oslash
-%20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/marcellus
-% --vf-directory=texmf/fonts/vf/public/marcellus
-% --type1-directory=texmf/fonts/type1/public/marcellus
-% --truetype-directory=texmf/fonts/truetype/public/marcellus
-% --encoding-directory=texmf/fonts/enc/dvips/marcellus
-% --map-file=texmf/fonts/map/dvips/marcellus/Marcellus.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --unicoding=germandbls =: SSsmall MarcellusSmallCaps.ttf
-% MarcellusSmallCaps-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_pp6sje.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_pp6sje.enc
deleted file mode 100644
index 5c99cb7ef19..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_pp6sje.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_pp6sjely4szo5wr65yzgfoi6qa
-% Encoding created by otftotfm on Sat May 11 10:06:35 2019
-% Command line follows encoding
-/AutoEnc_pp6sjely4szo5wr65yzgfoi6qa [
-%00
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae /oe /oslash /AE /OE /Oslash
-%20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven
-  /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/marcellus
-% --vf-directory=texmf/fonts/vf/public/marcellus
-% --type1-directory=texmf/fonts/type1/public/marcellus
-% --truetype-directory=texmf/fonts/truetype/public/marcellus
-% --encoding-directory=texmf/fonts/enc/dvips/marcellus
-% --map-file=texmf/fonts/map/dvips/marcellus/Marcellus.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=sups --ligkern=* {KL} * --unicoding=germandbls =: SSsmall
-% MarcellusSmallCaps.ttf MarcellusSmallCaps-sup-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_rfafok.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_rfafok.enc
deleted file mode 100644
index 940fda6114a..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_rfafok.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_rfafokxbolqchblrqwwcgjbjqg
-% Encoding created by otftotfm on Sat May 11 10:06:34 2019
-% Command line follows encoding
-/AutoEnc_rfafokxbolqchblrqwwcgjbjqg [
-%00
-  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
-  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
-  /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
-  /degree /plusminus /twosuperior /threesuperior /acute /micro /paragraph /periodcentered
-  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
-  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
-  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
-  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
-  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/marcellus
-% --vf-directory=texmf/fonts/vf/public/marcellus
-% --type1-directory=texmf/fonts/type1/public/marcellus
-% --truetype-directory=texmf/fonts/truetype/public/marcellus
-% --encoding-directory=texmf/fonts/enc/dvips/marcellus
-% --map-file=texmf/fonts/map/dvips/marcellus/Marcellus.map --no-updmap
-% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * Marcellus-Regular.ttf
-% Marcellus-Regular-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_rwr7kk.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_rwr7kk.enc
deleted file mode 100644
index 1f35bb60788..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_rwr7kk.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_rwr7kkiu3wdyqveg45bg3rwypc
-% Encoding created by otftotfm on Sat May 11 10:06:34 2019
-% Command line follows encoding
-/AutoEnc_rwr7kkiu3wdyqveg45bg3rwypc [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
-  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
-  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
-%20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
-%A0
-  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
-  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
-%B0
-  /rcaron /sacute /scaron /scedilla /tcaron /tcommaaccent /uhungarumlaut /uring
-  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
-  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
-  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
-  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/marcellus
-% --vf-directory=texmf/fonts/vf/public/marcellus
-% --type1-directory=texmf/fonts/type1/public/marcellus
-% --truetype-directory=texmf/fonts/truetype/public/marcellus
-% --encoding-directory=texmf/fonts/enc/dvips/marcellus
-% --map-file=texmf/fonts/map/dvips/marcellus/Marcellus.map --no-updmap
-% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
-% Marcellus-Regular.ttf Marcellus-Regular-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_tzgqbn.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_tzgqbn.enc
deleted file mode 100644
index 00c64ae7b69..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcl_tzgqbn.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_tzgqbnwowyfbyyiscaejd7aybg
-% Encoding created by otftotfm on Sat May 11 10:06:35 2019
-% Command line follows encoding
-/AutoEnc_tzgqbnwowyfbyyiscaejd7aybg [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
-  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
-  /.notdef /dotlessi /dotlessj /fi /fl /.notdef /.notdef /.notdef
-%20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
-%A0
-  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
-  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
-%B0
-  /rcaron /sacute /scaron /scedilla /tcaron /tcommaaccent /uhungarumlaut /uring
-  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
-  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
-  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
-  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/marcellus
-% --vf-directory=texmf/fonts/vf/public/marcellus
-% --type1-directory=texmf/fonts/type1/public/marcellus
-% --truetype-directory=texmf/fonts/truetype/public/marcellus
-% --encoding-directory=texmf/fonts/enc/dvips/marcellus
-% --map-file=texmf/fonts/map/dvips/marcellus/Marcellus.map --no-updmap
-% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --unicoding=germandbls =: SSsmall
-% MarcellusSmallCaps.ttf MarcellusSmallCaps-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/map/dvips/marcellus/marcellus.map b/Master/texmf-dist/fonts/map/dvips/marcellus/marcellus.map
deleted file mode 100644
index df34c835f4f..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/marcellus/marcellus.map
+++ /dev/null
@@ -1,16 +0,0 @@
-% Automatically maintained by otftotfm or other programs. Do not edit.
-
-Marcellus-Regular-sup-ot1 Marcellus-Regular "AutoEnc_5az7w72w5hf5ruah35anfcnwvd ReEncodeFont" <[mrcl_5az7w7.enc <Marcellus-Regular.pfb
-Marcellus-Regular-sup-t1--base Marcellus-Regular "AutoEnc_rwr7kkiu3wdyqveg45bg3rwypc ReEncodeFont" <[mrcl_rwr7kk.enc <Marcellus-Regular.pfb
-Marcellus-Regular-sup-ly1--base Marcellus-Regular "AutoEnc_rfafokxbolqchblrqwwcgjbjqg ReEncodeFont" <[mrcl_rfafok.enc <Marcellus-Regular.pfb
-Marcellus-Regular-lf-ot1 Marcellus-Regular "AutoEnc_5ago632vnelsekyxdx56qkw6id ReEncodeFont" <[mrcl_5ago63.enc <Marcellus-Regular.pfb
-Marcellus-Regular-lf-t1--base Marcellus-Regular "AutoEnc_hxcgcngs3hum7d5pbyap726ujd ReEncodeFont" <[mrcl_hxcgcn.enc <Marcellus-Regular.pfb
-Marcellus-Regular-lf-ly1--base Marcellus-Regular "AutoEnc_dfyae6rpk2yrr3lzb7ea4gv4dg ReEncodeFont" <[mrcl_dfyae6.enc <Marcellus-Regular.pfb
-Marcellus-Regular-lf-ts1--base Marcellus-Regular "AutoEnc_l63c5y4cphahr2uk4ehjslxjva ReEncodeFont" <[mrcl_l63c5y.enc <Marcellus-Regular.pfb
-MarcellusSmallCaps-sup-sc-ot1--base MarcellusSmallCaps "AutoEnc_pp6sjely4szo5wr65yzgfoi6qa ReEncodeFont" <[mrcl_pp6sje.enc <MarcellusSmallCaps.pfb
-MarcellusSmallCaps-sup-sc-t1--base MarcellusSmallCaps "AutoEnc_mqz6jrllipnucf24xyrydslfib ReEncodeFont" <[mrcl_mqz6jr.enc <MarcellusSmallCaps.pfb
-MarcellusSmallCaps-sup-sc-ly1--base MarcellusSmallCaps "AutoEnc_4cvizetsvyupkbfckcbzyvhwag ReEncodeFont" <[mrcl_4cvize.enc <MarcellusSmallCaps.pfb
-MarcellusSmallCaps-lf-sc-ot1--base MarcellusSmallCaps "AutoEnc_oyecj6vz7phl24x4jeyz7casnf ReEncodeFont" <[mrcl_oyecj6.enc <MarcellusSmallCaps.pfb
-MarcellusSmallCaps-lf-sc-t1--base MarcellusSmallCaps "AutoEnc_tzgqbnwowyfbyyiscaejd7aybg ReEncodeFont" <[mrcl_tzgqbn.enc <MarcellusSmallCaps.pfb
-MarcellusSmallCaps-lf-sc-ly1--base MarcellusSmallCaps "AutoEnc_lo2l42oncdbogrxnkwdhtqzute ReEncodeFont" <[mrcl_lo2l42.enc <MarcellusSmallCaps.pfb
-MarcellusSmallCaps-lf-sc-ts1--base MarcellusSmallCaps "AutoEnc_cvodtwnr5rlhu7mqkgyzybdxjg ReEncodeFont" <[mrcl_cvodtw.enc <MarcellusSmallCaps.pfb
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ly1--base.tfm
deleted file mode 100644
index 391aac62737..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ly1.tfm
deleted file mode 100644
index e6872026008..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ly1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ot1.tfm
deleted file mode 100644
index cdeee235f12..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ot1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-t1--base.tfm
deleted file mode 100644
index 5051c5c1dee..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-t1.tfm
deleted file mode 100644
index 125b732c0b5..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-t1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ts1--base.tfm
deleted file mode 100644
index 00149d1ace1..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ts1.tfm
deleted file mode 100644
index 26a8a9df501..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-lf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-ly1--base.tfm
deleted file mode 100644
index 2d053e5ff96..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-ly1.tfm
deleted file mode 100644
index 94f17f385b1..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-ly1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-ot1.tfm
deleted file mode 100644
index e8dff5d0024..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-ot1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-t1--base.tfm
deleted file mode 100644
index 142bd8354c6..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-t1.tfm
deleted file mode 100644
index 0b75f07233d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/Marcellus-Regular-sup-t1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ly1--base.tfm
deleted file mode 100644
index 55fa7e0dee1..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ly1.tfm
deleted file mode 100644
index e91c3f52f26..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ly1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ot1--base.tfm
deleted file mode 100644
index eea6f8e1230..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ot1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ot1.tfm
deleted file mode 100644
index f54ed1b836b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ot1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-t1--base.tfm
deleted file mode 100644
index 77b8e399723..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-t1.tfm
deleted file mode 100644
index cba98554cbc..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-t1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ts1--base.tfm
deleted file mode 100644
index 3d1557ca372..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ts1.tfm
deleted file mode 100644
index 3409ae792a2..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-lf-sc-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-ly1--base.tfm
deleted file mode 100644
index 9acc6c5910a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-ly1.tfm
deleted file mode 100644
index 76d8e3f77a2..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-ly1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-ot1--base.tfm
deleted file mode 100644
index 3bc42df096f..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-ot1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-ot1.tfm
deleted file mode 100644
index b6729c44068..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-ot1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-t1--base.tfm
deleted file mode 100644
index 64a1e9eea38..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-t1.tfm
deleted file mode 100644
index 62cc14e7bbd..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/marcellus/MarcellusSmallCaps-sup-sc-t1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/public/marcellus/Marcellus-Regular.pfb b/Master/texmf-dist/fonts/type1/public/marcellus/Marcellus-Regular.pfb
deleted file mode 100644
index ba3680f3699..00000000000
--- a/Master/texmf-dist/fonts/type1/public/marcellus/Marcellus-Regular.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/public/marcellus/MarcellusSmallCaps.pfb b/Master/texmf-dist/fonts/type1/public/marcellus/MarcellusSmallCaps.pfb
deleted file mode 100644
index 468e8060da4..00000000000
--- a/Master/texmf-dist/fonts/type1/public/marcellus/MarcellusSmallCaps.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-lf-ly1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-lf-ly1.vf
deleted file mode 100644
index 7ed738a588c..00000000000
--- a/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-lf-ly1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-lf-t1.vf
deleted file mode 100644
index 2af451e18b9..00000000000
--- a/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-lf-t1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-lf-ts1.vf
deleted file mode 100644
index d01469f59a2..00000000000
--- a/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-lf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-sup-ly1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-sup-ly1.vf
deleted file mode 100644
index 32adefc0c00..00000000000
--- a/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-sup-ly1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-sup-t1.vf
deleted file mode 100644
index 89d574b0079..00000000000
--- a/Master/texmf-dist/fonts/vf/public/marcellus/Marcellus-Regular-sup-t1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-lf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-lf-sc-ly1.vf
deleted file mode 100644
index 428883be7c2..00000000000
--- a/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-lf-sc-ly1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-lf-sc-ot1.vf
deleted file mode 100644
index 3ce598cf207..00000000000
--- a/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-lf-sc-ot1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-lf-sc-t1.vf
deleted file mode 100644
index 3095f0159cf..00000000000
--- a/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-lf-sc-t1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-lf-sc-ts1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-lf-sc-ts1.vf
deleted file mode 100644
index b7f996d25f1..00000000000
--- a/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-lf-sc-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-sup-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-sup-sc-ly1.vf
deleted file mode 100644
index 569471a6b36..00000000000
--- a/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-sup-sc-ly1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-sup-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-sup-sc-ot1.vf
deleted file mode 100644
index 61ab88d639c..00000000000
--- a/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-sup-sc-ot1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-sup-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-sup-sc-t1.vf
deleted file mode 100644
index f23828f6d79..00000000000
--- a/Master/texmf-dist/fonts/vf/public/marcellus/MarcellusSmallCaps-sup-sc-t1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-LF.fd b/Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-LF.fd
deleted file mode 100644
index 5069ba277a1..00000000000
--- a/Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-LF.fd
+++ /dev/null
@@ -1,39 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{LY1Marcellus-LF.fd}
-    [2019/05/11 (autoinst)  Font definitions for LY1/Marcellus-LF.]
-
-\expandafter\ifx\csname Marcellus@scale\endcsname\relax
-    \let\Marcellus@@scale\@empty
-\else
-    \edef\Marcellus@@scale{s*[\csname Marcellus@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{Marcellus-LF}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{LY1}{Marcellus-LF}{regular}{sc}{
-      <-> \Marcellus@@scale MarcellusSmallCaps-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{Marcellus-LF}{regular}{n}{
-      <-> \Marcellus@@scale Marcellus-Regular-lf-ly1
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
-
-\DeclareFontShape{LY1}{Marcellus-LF}{m}{sc}{
-      <-> ssub * Marcellus-LF/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{Marcellus-LF}{m}{n}{
-      <-> ssub * Marcellus-LF/regular/n
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-Sup.fd b/Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-Sup.fd
deleted file mode 100644
index 8e9909841a8..00000000000
--- a/Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-Sup.fd
+++ /dev/null
@@ -1,39 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{LY1Marcellus-Sup.fd}
-    [2019/05/11 (autoinst)  Font definitions for LY1/Marcellus-Sup.]
-
-\expandafter\ifx\csname Marcellus@scale\endcsname\relax
-    \let\Marcellus@@scale\@empty
-\else
-    \edef\Marcellus@@scale{s*[\csname Marcellus@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{Marcellus-Sup}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{LY1}{Marcellus-Sup}{regular}{sc}{
-      <-> \Marcellus@@scale MarcellusSmallCaps-sup-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{Marcellus-Sup}{regular}{n}{
-      <-> \Marcellus@@scale Marcellus-Regular-sup-ly1
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
-
-\DeclareFontShape{LY1}{Marcellus-Sup}{m}{sc}{
-      <-> ssub * Marcellus-Sup/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{Marcellus-Sup}{m}{n}{
-      <-> ssub * Marcellus-Sup/regular/n
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-LF.fd b/Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-LF.fd
deleted file mode 100644
index d6c794a88c8..00000000000
--- a/Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-LF.fd
+++ /dev/null
@@ -1,39 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{OT1Marcellus-LF.fd}
-    [2019/05/11 (autoinst)  Font definitions for OT1/Marcellus-LF.]
-
-\expandafter\ifx\csname Marcellus@scale\endcsname\relax
-    \let\Marcellus@@scale\@empty
-\else
-    \edef\Marcellus@@scale{s*[\csname Marcellus@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{Marcellus-LF}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{OT1}{Marcellus-LF}{regular}{sc}{
-      <-> \Marcellus@@scale MarcellusSmallCaps-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Marcellus-LF}{regular}{n}{
-      <-> \Marcellus@@scale Marcellus-Regular-lf-ot1
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
-
-\DeclareFontShape{OT1}{Marcellus-LF}{m}{sc}{
-      <-> ssub * Marcellus-LF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{Marcellus-LF}{m}{n}{
-      <-> ssub * Marcellus-LF/regular/n
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-Sup.fd b/Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-Sup.fd
deleted file mode 100644
index d09c5ad85fe..00000000000
--- a/Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-Sup.fd
+++ /dev/null
@@ -1,39 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{OT1Marcellus-Sup.fd}
-    [2019/05/11 (autoinst)  Font definitions for OT1/Marcellus-Sup.]
-
-\expandafter\ifx\csname Marcellus@scale\endcsname\relax
-    \let\Marcellus@@scale\@empty
-\else
-    \edef\Marcellus@@scale{s*[\csname Marcellus@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{Marcellus-Sup}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{OT1}{Marcellus-Sup}{regular}{sc}{
-      <-> \Marcellus@@scale MarcellusSmallCaps-sup-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Marcellus-Sup}{regular}{n}{
-      <-> \Marcellus@@scale Marcellus-Regular-sup-ot1
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
-
-\DeclareFontShape{OT1}{Marcellus-Sup}{m}{sc}{
-      <-> ssub * Marcellus-Sup/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{Marcellus-Sup}{m}{n}{
-      <-> ssub * Marcellus-Sup/regular/n
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/marcellus/T1Marcellus-LF.fd b/Master/texmf-dist/tex/latex/marcellus/T1Marcellus-LF.fd
deleted file mode 100644
index ee8f9675187..00000000000
--- a/Master/texmf-dist/tex/latex/marcellus/T1Marcellus-LF.fd
+++ /dev/null
@@ -1,39 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{T1Marcellus-LF.fd}
-    [2019/05/11 (autoinst)  Font definitions for T1/Marcellus-LF.]
-
-\expandafter\ifx\csname Marcellus@scale\endcsname\relax
-    \let\Marcellus@@scale\@empty
-\else
-    \edef\Marcellus@@scale{s*[\csname Marcellus@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{Marcellus-LF}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{T1}{Marcellus-LF}{regular}{sc}{
-      <-> \Marcellus@@scale MarcellusSmallCaps-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Marcellus-LF}{regular}{n}{
-      <-> \Marcellus@@scale Marcellus-Regular-lf-t1
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
-
-\DeclareFontShape{T1}{Marcellus-LF}{m}{sc}{
-      <-> ssub * Marcellus-LF/regular/sc
-}{}
-
-\DeclareFontShape{T1}{Marcellus-LF}{m}{n}{
-      <-> ssub * Marcellus-LF/regular/n
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/marcellus/T1Marcellus-Sup.fd b/Master/texmf-dist/tex/latex/marcellus/T1Marcellus-Sup.fd
deleted file mode 100644
index 86925bafce1..00000000000
--- a/Master/texmf-dist/tex/latex/marcellus/T1Marcellus-Sup.fd
+++ /dev/null
@@ -1,39 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{T1Marcellus-Sup.fd}
-    [2019/05/11 (autoinst)  Font definitions for T1/Marcellus-Sup.]
-
-\expandafter\ifx\csname Marcellus@scale\endcsname\relax
-    \let\Marcellus@@scale\@empty
-\else
-    \edef\Marcellus@@scale{s*[\csname Marcellus@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{Marcellus-Sup}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{T1}{Marcellus-Sup}{regular}{sc}{
-      <-> \Marcellus@@scale MarcellusSmallCaps-sup-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Marcellus-Sup}{regular}{n}{
-      <-> \Marcellus@@scale Marcellus-Regular-sup-t1
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
-
-\DeclareFontShape{T1}{Marcellus-Sup}{m}{sc}{
-      <-> ssub * Marcellus-Sup/regular/sc
-}{}
-
-\DeclareFontShape{T1}{Marcellus-Sup}{m}{n}{
-      <-> ssub * Marcellus-Sup/regular/n
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/marcellus/TS1Marcellus-LF.fd b/Master/texmf-dist/tex/latex/marcellus/TS1Marcellus-LF.fd
deleted file mode 100644
index 73932e90bb7..00000000000
--- a/Master/texmf-dist/tex/latex/marcellus/TS1Marcellus-LF.fd
+++ /dev/null
@@ -1,39 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{TS1Marcellus-LF.fd}
-    [2019/05/11 (autoinst)  Font definitions for TS1/Marcellus-LF.]
-
-\expandafter\ifx\csname Marcellus@scale\endcsname\relax
-    \let\Marcellus@@scale\@empty
-\else
-    \edef\Marcellus@@scale{s*[\csname Marcellus@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{Marcellus-LF}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{TS1}{Marcellus-LF}{regular}{sc}{
-      <-> \Marcellus@@scale MarcellusSmallCaps-lf-sc-ts1
-}{}
-
-\DeclareFontShape{TS1}{Marcellus-LF}{regular}{n}{
-      <-> \Marcellus@@scale Marcellus-Regular-lf-ts1
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
-
-\DeclareFontShape{TS1}{Marcellus-LF}{m}{sc}{
-      <-> ssub * Marcellus-LF/regular/sc
-}{}
-
-\DeclareFontShape{TS1}{Marcellus-LF}{m}{n}{
-      <-> ssub * Marcellus-LF/regular/n
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/marcellus/marcellus.sty b/Master/texmf-dist/tex/latex/marcellus/marcellus.sty
index e7cf2e9d7a1..c292555fa0a 100644
--- a/Master/texmf-dist/tex/latex/marcellus/marcellus.sty
+++ b/Master/texmf-dist/tex/latex/marcellus/marcellus.sty
@@ -1,33 +1,24 @@
 \ProvidesPackage{marcellus}[%
-   2019/10/13 (Bob Tennent)  Supports Marcellus fonts for all LaTeX engines. ] 
+   2020/07/23 (Bob Tennent)  Supports Marcellus fonts for XeLaTeX or LuaLaTeX. ] 
 
-\RequirePackage{ifxetex,ifluatex,textcomp}
+\RequirePackage{iftex}
+
+\ifpdftex
+\PackageError{marcellus}{%
+ *****************************************\MessageBreak
+  Please process using XeLaTeX or luaLaTeX\MessageBreak
+ *****************************************}
+\fi  
 
-\newif\ifmarcellus@ttf
-\ifxetex
-  \marcellus@ttftrue
-\else\ifluatex
-  \marcellus@ttftrue
-\else  % [pdf]LaTeX
-  \marcellus@ttffalse
-\fi\fi
 
 \newcommand*{\Marcellus@scale}{1}  
 \RequirePackage{xkeyval}
 \DeclareOptionX{scaled}{\renewcommand*{\Marcellus@scale}{#1}}
 \DeclareOptionX{scale}{\renewcommand*{\Marcellus@scale}{#1}}
 
-\DeclareOptionX{type1}{\marcellus@ttffalse}
-
 \ProcessOptionsX\relax
 
-\ifmarcellus@ttf
-  \RequirePackage{fontspec}
-\else
-  \RequirePackage{fontenc,fontaxes,mweights}
-\fi
-
-\ifmarcellus@ttf
+\RequirePackage{fontspec}
   \ifxetex\XeTeXtracingfonts=1\fi
   \defaultfontfeatures{
      Ligatures = TeX ,
@@ -46,20 +37,8 @@
       ]
       {Marcellus}
 
-\else % type1
-
-  \def\mdseries@rm{m}
-  \def\bfseries@rm{m}
-  \def\marcellusfamily{Marcellus-LF}
-  \renewcommand*\rmdefault{\marcellusfamily}
-  \newcommand*\marcellus{\fontfamily{\marcellusfamily}\selectfont}
-
-\fi
-
 % turn off defaults in case other fonts are selected:
-\ifmarcellus@ttf
-  \defaultfontfeatures{}
-\fi
+\defaultfontfeatures{}
 
 \endinput
 
diff --git a/Master/tlpkg/tlpsrc/marcellus.tlpsrc b/Master/tlpkg/tlpsrc/marcellus.tlpsrc
index 493569ed3f6..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/marcellus.tlpsrc
+++ b/Master/tlpkg/tlpsrc/marcellus.tlpsrc
@@ -1 +0,0 @@
-execute addMap ${PKGNAME}.map