summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-08-01 20:54:27 +0000
committerKarl Berry <karl@freefriends.org>2020-08-01 20:54:27 +0000
commitb34b09bec31bc880bb6157d9a847899dd4fa29c1 (patch)
tree71f8cf8ed951d8d6f69e8abab14bc578435ad71b /Master
parent99cba3c7708975b84acbb927a3e1c02875be5596 (diff)
marcellus (1aug20)
git-svn-id: svn://tug.org/texlive/trunk@56016 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/fonts/marcellus/README15
-rw-r--r--Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.pdfbin14079 -> 16844 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.tex1
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_37huou.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_5az7w7.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_cvodtw.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_rfafok.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_rwr7kk.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_rzkwvt.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_stzmvz.enc65
-rw-r--r--Master/texmf-dist/fonts/map/dvips/marcellus/marcellus.map15
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ly1--base.tfmbin0 -> 1784 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ly1.tfmbin0 -> 6472 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ot1.tfmbin0 -> 2600 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-t1--base.tfmbin0 -> 1724 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-t1.tfmbin0 -> 8352 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ts1--base.tfmbin0 -> 1340 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ts1.tfmbin0 -> 1356 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-ly1--base.tfmbin0 -> 1768 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-ly1.tfmbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-ot1.tfmbin0 -> 1228 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-t1--base.tfmbin0 -> 1712 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-t1.tfmbin0 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-ly1--base.tfmbin0 -> 1780 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-ly1.tfmbin0 -> 11300 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-ot1.tfmbin0 -> 3692 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-t1--base.tfmbin0 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-t1.tfmbin0 -> 16168 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-ly1--base.tfmbin0 -> 1760 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-ly1.tfmbin0 -> 1764 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-ot1.tfmbin0 -> 1248 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-t1--base.tfmbin0 -> 1704 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-t1.tfmbin0 -> 1712 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/marcellus/MarcellusSC-Regular.ttfbin0 -> 44524 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/marcellus/MarcellusSmallCaps.ttfbin45772 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/marcellus/Mrcls-Regular.pfbbin0 -> 72896 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/marcellus/MrclsSC-Regular.pfbbin0 -> 65843 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-lf-ly1.vfbin0 -> 1680 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-lf-t1.vfbin0 -> 1704 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-lf-ts1.vfbin0 -> 488 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-sup-ly1.vfbin0 -> 1668 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-sup-t1.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-lf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-lf-sc-t1.vfbin0 -> 1712 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-sup-sc-ly1.vfbin0 -> 1672 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-sup-sc-t1.vfbin0 -> 1696 bytes
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/LY1Mrcls-LF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/LY1Mrcls-Sup.fd44
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/OT1Mrcls-LF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/OT1Mrcls-Sup.fd44
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/T1Mrcls-LF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/T1Mrcls-Sup.fd44
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/TS1Mrcls-LF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/marcellus.sty54
-rw-r--r--Master/tlpkg/tlpsrc/marcellus.tlpsrc1
55 files changed, 810 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/fonts/marcellus/README b/Master/texmf-dist/doc/fonts/marcellus/README
index cb22c42c8bc..71f02916851 100644
--- a/Master/texmf-dist/doc/fonts/marcellus/README
+++ b/Master/texmf-dist/doc/fonts/marcellus/README
@@ -1,5 +1,5 @@
This is the README for the marcellus package, version
-2020-07-23.
+2020-08-01.
This package provides
the Marcellus family of fonts, designed by
@@ -14,7 +14,8 @@ 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).
+file-name database (e.g., texhash). Update the font-map
+files by enabling the Map file marcellus.map.
To use, add
@@ -33,7 +34,9 @@ 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 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)
+1.1; the text may be found in the doc directory. The type1
+fonts were generated by fontforge and are re-named in
+compliance with the Reserved Font Name provision of the OFL
+license. 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 42019dc830a..c70c412e8ed 100644
--- a/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.tex b/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.tex
index 353c7a2fd0f..24ed419ed30 100644
--- a/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.tex
+++ b/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage{marcellus}
\usepackage{lipsum}
\begin{document}
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_37huou.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_37huou.enc
new file mode 100644
index 00000000000..030d4c5403b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_37huou.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_37huouxxtueygvvjdifbslxjke
+% Encoding created by otftotfm on Sat Aug 1 08:37:06 2020
+% Command line follows encoding
+/AutoEnc_37huouxxtueygvvjdifbslxjke [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /fl /fi
+%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
+% --truetype-directory=texmf/fonts/truetype/public/marcellus
+% --encoding-directory=texmf/fonts/enc/dvips/marcellus
+% --map-file=texmf/fonts/map/dvips/marcellus/Mrcls.map --no-updmap --force
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Mrcls-Regular.ttf
+% Mrcls-Regular-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_5az7w7.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_5az7w7.enc
new file mode 100644
index 00000000000..ec90cd44f7b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_5az7w7.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_5az7w72w5hf5ruah35anfcnwvd
+% Encoding created by otftotfm on Sat Aug 1 08:37:06 2020
+% 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
+% --truetype-directory=texmf/fonts/truetype/public/marcellus
+% --encoding-directory=texmf/fonts/enc/dvips/marcellus
+% --map-file=texmf/fonts/map/dvips/marcellus/Mrcls.map --no-updmap --force
+% --coding-scheme=TEX TEXT --feature=sups --ligkern=* {KL} *
+% Mrcls-Regular.ttf Mrcls-Regular-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_cvodtw.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_cvodtw.enc
new file mode 100644
index 00000000000..e1768e55135
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_cvodtw.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cvodtwnr5rlhu7mqkgyzybdxjg
+% Encoding created by otftotfm on Sat Aug 1 08:37:07 2020
+% 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
+% --truetype-directory=texmf/fonts/truetype/public/marcellus
+% --encoding-directory=texmf/fonts/enc/dvips/marcellus
+% --map-file=texmf/fonts/map/dvips/marcellus/Mrcls.map --no-updmap --force
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 Mrcls-Regular.ttf
+% Mrcls-Regular-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_rfafok.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_rfafok.enc
new file mode 100644
index 00000000000..52e651a059a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_rfafok.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_rfafokxbolqchblrqwwcgjbjqg
+% Encoding created by otftotfm on Sat Aug 1 08:37:06 2020
+% 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
+% --truetype-directory=texmf/fonts/truetype/public/marcellus
+% --encoding-directory=texmf/fonts/enc/dvips/marcellus
+% --map-file=texmf/fonts/map/dvips/marcellus/Mrcls.map --no-updmap --force
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups --ligkern=*
+% {KL} * Mrcls-Regular.ttf Mrcls-Regular-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_rwr7kk.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_rwr7kk.enc
new file mode 100644
index 00000000000..d9c07b1be41
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_rwr7kk.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_rwr7kkiu3wdyqveg45bg3rwypc
+% Encoding created by otftotfm on Sat Aug 1 08:37:06 2020
+% 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
+% --truetype-directory=texmf/fonts/truetype/public/marcellus
+% --encoding-directory=texmf/fonts/enc/dvips/marcellus
+% --map-file=texmf/fonts/map/dvips/marcellus/Mrcls.map --no-updmap --force
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sups
+% --ligkern=* {KL} * Mrcls-Regular.ttf Mrcls-Regular-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_rzkwvt.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_rzkwvt.enc
new file mode 100644
index 00000000000..70a44a203b0
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_rzkwvt.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_rzkwvt23h5v4ocdewjs7uwz7ig
+% Encoding created by otftotfm on Sat Aug 1 08:37:06 2020
+% Command line follows encoding
+/AutoEnc_rzkwvt23h5v4ocdewjs7uwz7ig [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /fi /fl /.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
+% --truetype-directory=texmf/fonts/truetype/public/marcellus
+% --encoding-directory=texmf/fonts/enc/dvips/marcellus
+% --map-file=texmf/fonts/map/dvips/marcellus/Mrcls.map --no-updmap --force
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Mrcls-Regular.ttf Mrcls-Regular-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_stzmvz.enc b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_stzmvz.enc
new file mode 100644
index 00000000000..2cf5bf18ded
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/marcellus/mrcls_stzmvz.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_stzmvzs2aexkjyn3ypn7c2hlag
+% Encoding created by otftotfm on Sat Aug 1 08:37:06 2020
+% Command line follows encoding
+/AutoEnc_stzmvzs2aexkjyn3ypn7c2hlag [
+%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 /fi /fl /.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
+% --truetype-directory=texmf/fonts/truetype/public/marcellus
+% --encoding-directory=texmf/fonts/enc/dvips/marcellus
+% --map-file=texmf/fonts/map/dvips/marcellus/Mrcls.map --no-updmap --force
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Mrcls-Regular.ttf
+% Mrcls-Regular-lf-t1'
diff --git a/Master/texmf-dist/fonts/map/dvips/marcellus/marcellus.map b/Master/texmf-dist/fonts/map/dvips/marcellus/marcellus.map
new file mode 100644
index 00000000000..2f009ff5968
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/marcellus/marcellus.map
@@ -0,0 +1,15 @@
+% Automatically maintained by otftotfm or other programs. Do not edit.
+
+Mrcls-Regular-sup-ot1 Mrcls-Regular "AutoEnc_5az7w72w5hf5ruah35anfcnwvd ReEncodeFont" <[mrcls_5az7w7.enc <Mrcls-Regular.pfb
+Mrcls-Regular-sup-t1--base Mrcls-Regular "AutoEnc_rwr7kkiu3wdyqveg45bg3rwypc ReEncodeFont" <[mrcls_rwr7kk.enc <Mrcls-Regular.pfb
+Mrcls-Regular-sup-ly1--base Mrcls-Regular "AutoEnc_rfafokxbolqchblrqwwcgjbjqg ReEncodeFont" <[mrcls_rfafok.enc <Mrcls-Regular.pfb
+Mrcls-Regular-lf-ot1 Mrcls-Regular "AutoEnc_rzkwvt23h5v4ocdewjs7uwz7ig ReEncodeFont" <[mrcls_rzkwvt.enc <Mrcls-Regular.pfb
+Mrcls-Regular-lf-t1--base Mrcls-Regular "AutoEnc_stzmvzs2aexkjyn3ypn7c2hlag ReEncodeFont" <[mrcls_stzmvz.enc <Mrcls-Regular.pfb
+Mrcls-Regular-lf-ly1--base Mrcls-Regular "AutoEnc_37huouxxtueygvvjdifbslxjke ReEncodeFont" <[mrcls_37huou.enc <Mrcls-Regular.pfb
+Mrcls-Regular-lf-ts1--base Mrcls-Regular "AutoEnc_cvodtwnr5rlhu7mqkgyzybdxjg ReEncodeFont" <[mrcls_cvodtw.enc <Mrcls-Regular.pfb
+MrclsSC-Regular-sup-sc-ot1 MrclsSC-Regular "AutoEnc_5az7w72w5hf5ruah35anfcnwvd ReEncodeFont" <[mrcls_5az7w7.enc <MrclsSC-Regular.pfb
+MrclsSC-Regular-sup-sc-t1--base MrclsSC-Regular "AutoEnc_rwr7kkiu3wdyqveg45bg3rwypc ReEncodeFont" <[mrcls_rwr7kk.enc <MrclsSC-Regular.pfb
+MrclsSC-Regular-sup-sc-ly1--base MrclsSC-Regular "AutoEnc_rfafokxbolqchblrqwwcgjbjqg ReEncodeFont" <[mrcls_rfafok.enc <MrclsSC-Regular.pfb
+MrclsSC-Regular-lf-sc-ot1 MrclsSC-Regular "AutoEnc_rzkwvt23h5v4ocdewjs7uwz7ig ReEncodeFont" <[mrcls_rzkwvt.enc <MrclsSC-Regular.pfb
+MrclsSC-Regular-lf-sc-t1--base MrclsSC-Regular "AutoEnc_stzmvzs2aexkjyn3ypn7c2hlag ReEncodeFont" <[mrcls_stzmvz.enc <MrclsSC-Regular.pfb
+MrclsSC-Regular-lf-sc-ly1--base MrclsSC-Regular "AutoEnc_37huouxxtueygvvjdifbslxjke ReEncodeFont" <[mrcls_37huou.enc <MrclsSC-Regular.pfb
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ly1--base.tfm
new file mode 100644
index 00000000000..f1b10e35e00
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ly1.tfm
new file mode 100644
index 00000000000..c23d5bf213e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ot1.tfm
new file mode 100644
index 00000000000..8c32f17e42a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-t1--base.tfm
new file mode 100644
index 00000000000..b5876339b17
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-t1.tfm
new file mode 100644
index 00000000000..fa4c79d23e6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ts1--base.tfm
new file mode 100644
index 00000000000..c2052ad7c65
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ts1.tfm
new file mode 100644
index 00000000000..11f4692820c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-lf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-ly1--base.tfm
new file mode 100644
index 00000000000..72546d6decc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-ly1.tfm
new file mode 100644
index 00000000000..f29bfe6fc3f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-ot1.tfm
new file mode 100644
index 00000000000..b29d66998e0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-t1--base.tfm
new file mode 100644
index 00000000000..1dc0e151864
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-t1.tfm
new file mode 100644
index 00000000000..444157f7359
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/Mrcls-Regular-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-ly1--base.tfm
new file mode 100644
index 00000000000..f6ae96eca71
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-ly1.tfm
new file mode 100644
index 00000000000..1d855e13474
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-ot1.tfm
new file mode 100644
index 00000000000..3946af5252f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-t1--base.tfm
new file mode 100644
index 00000000000..3fa28aa97c6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-t1.tfm
new file mode 100644
index 00000000000..99fb4efff2c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-ly1--base.tfm
new file mode 100644
index 00000000000..2d0aeeaa01b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-ly1.tfm
new file mode 100644
index 00000000000..f2ce4e673f0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-ot1.tfm
new file mode 100644
index 00000000000..04fe1028391
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-t1--base.tfm
new file mode 100644
index 00000000000..f3f25cebf6d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-t1.tfm
new file mode 100644
index 00000000000..1f53e5ccaa8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/marcellus/MrclsSC-Regular-sup-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/marcellus/MarcellusSC-Regular.ttf b/Master/texmf-dist/fonts/truetype/public/marcellus/MarcellusSC-Regular.ttf
new file mode 100644
index 00000000000..85eb7dfd8dc
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/public/marcellus/MarcellusSC-Regular.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/marcellus/MarcellusSmallCaps.ttf b/Master/texmf-dist/fonts/truetype/public/marcellus/MarcellusSmallCaps.ttf
deleted file mode 100644
index 911d8395737..00000000000
--- a/Master/texmf-dist/fonts/truetype/public/marcellus/MarcellusSmallCaps.ttf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/marcellus/Mrcls-Regular.pfb b/Master/texmf-dist/fonts/type1/public/marcellus/Mrcls-Regular.pfb
new file mode 100644
index 00000000000..ec2e2a54b84
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/marcellus/Mrcls-Regular.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/marcellus/MrclsSC-Regular.pfb b/Master/texmf-dist/fonts/type1/public/marcellus/MrclsSC-Regular.pfb
new file mode 100644
index 00000000000..06c28d84327
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/marcellus/MrclsSC-Regular.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-lf-ly1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-lf-ly1.vf
new file mode 100644
index 00000000000..4f645b4a254
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-lf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-lf-t1.vf
new file mode 100644
index 00000000000..bd314d3c8b3
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-lf-ts1.vf
new file mode 100644
index 00000000000..82739c0d9f4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-lf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-sup-ly1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-sup-ly1.vf
new file mode 100644
index 00000000000..82fc50796a6
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-sup-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-sup-t1.vf
new file mode 100644
index 00000000000..1bc97df2708
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/marcellus/Mrcls-Regular-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-lf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-lf-sc-ly1.vf
new file mode 100644
index 00000000000..882220ad1f3
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-lf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-lf-sc-t1.vf
new file mode 100644
index 00000000000..6a9470af1fd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-lf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-sup-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-sup-sc-ly1.vf
new file mode 100644
index 00000000000..e1df6cff029
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-sup-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-sup-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-sup-sc-t1.vf
new file mode 100644
index 00000000000..32daa4db1a5
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/marcellus/MrclsSC-Regular-sup-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/marcellus/LY1Mrcls-LF.fd b/Master/texmf-dist/tex/latex/marcellus/LY1Mrcls-LF.fd
new file mode 100644
index 00000000000..052e61d41bc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/marcellus/LY1Mrcls-LF.fd
@@ -0,0 +1,44 @@
+%% Generated by autoinst on 2020/08/01
+%%
+\ProvidesFile{LY1Mrcls-LF.fd}
+ [2020/08/01 (autoinst) Font definitions for LY1/Mrcls-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Mrcls@scale\endcsname\relax
+ \let\Mrcls@@scale\@empty
+\else
+ \edef\Mrcls@@scale{s*[\csname Mrcls@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Mrcls-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Mrcls-LF}{m}{sc}{
+ <-> \Mrcls@@scale MrclsSC-Regular-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Mrcls-LF}{regular}{sc}{
+ <-> alias * Mrcls-LF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{Mrcls-LF}{m}{n}{
+ <-> \Mrcls@@scale Mrcls-Regular-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Mrcls-LF}{regular}{n}{
+ <-> alias * Mrcls-LF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/marcellus/LY1Mrcls-Sup.fd b/Master/texmf-dist/tex/latex/marcellus/LY1Mrcls-Sup.fd
new file mode 100644
index 00000000000..9e2b11c0f50
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/marcellus/LY1Mrcls-Sup.fd
@@ -0,0 +1,44 @@
+%% Generated by autoinst on 2020/08/01
+%%
+\ProvidesFile{LY1Mrcls-Sup.fd}
+ [2020/08/01 (autoinst) Font definitions for LY1/Mrcls-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Mrcls@scale\endcsname\relax
+ \let\Mrcls@@scale\@empty
+\else
+ \edef\Mrcls@@scale{s*[\csname Mrcls@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Mrcls-Sup}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Mrcls-Sup}{m}{sc}{
+ <-> \Mrcls@@scale MrclsSC-Regular-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Mrcls-Sup}{regular}{sc}{
+ <-> alias * Mrcls-Sup/m/sc
+}{}
+
+\DeclareFontShape{LY1}{Mrcls-Sup}{m}{n}{
+ <-> \Mrcls@@scale Mrcls-Regular-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Mrcls-Sup}{regular}{n}{
+ <-> alias * Mrcls-Sup/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/marcellus/OT1Mrcls-LF.fd b/Master/texmf-dist/tex/latex/marcellus/OT1Mrcls-LF.fd
new file mode 100644
index 00000000000..c3acfb6059f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/marcellus/OT1Mrcls-LF.fd
@@ -0,0 +1,44 @@
+%% Generated by autoinst on 2020/08/01
+%%
+\ProvidesFile{OT1Mrcls-LF.fd}
+ [2020/08/01 (autoinst) Font definitions for OT1/Mrcls-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Mrcls@scale\endcsname\relax
+ \let\Mrcls@@scale\@empty
+\else
+ \edef\Mrcls@@scale{s*[\csname Mrcls@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Mrcls-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Mrcls-LF}{m}{sc}{
+ <-> \Mrcls@@scale MrclsSC-Regular-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Mrcls-LF}{regular}{sc}{
+ <-> alias * Mrcls-LF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{Mrcls-LF}{m}{n}{
+ <-> \Mrcls@@scale Mrcls-Regular-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Mrcls-LF}{regular}{n}{
+ <-> alias * Mrcls-LF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/marcellus/OT1Mrcls-Sup.fd b/Master/texmf-dist/tex/latex/marcellus/OT1Mrcls-Sup.fd
new file mode 100644
index 00000000000..b83864004d0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/marcellus/OT1Mrcls-Sup.fd
@@ -0,0 +1,44 @@
+%% Generated by autoinst on 2020/08/01
+%%
+\ProvidesFile{OT1Mrcls-Sup.fd}
+ [2020/08/01 (autoinst) Font definitions for OT1/Mrcls-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Mrcls@scale\endcsname\relax
+ \let\Mrcls@@scale\@empty
+\else
+ \edef\Mrcls@@scale{s*[\csname Mrcls@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Mrcls-Sup}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Mrcls-Sup}{m}{sc}{
+ <-> \Mrcls@@scale MrclsSC-Regular-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Mrcls-Sup}{regular}{sc}{
+ <-> alias * Mrcls-Sup/m/sc
+}{}
+
+\DeclareFontShape{OT1}{Mrcls-Sup}{m}{n}{
+ <-> \Mrcls@@scale Mrcls-Regular-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Mrcls-Sup}{regular}{n}{
+ <-> alias * Mrcls-Sup/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/marcellus/T1Mrcls-LF.fd b/Master/texmf-dist/tex/latex/marcellus/T1Mrcls-LF.fd
new file mode 100644
index 00000000000..2c9096a2b3c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/marcellus/T1Mrcls-LF.fd
@@ -0,0 +1,44 @@
+%% Generated by autoinst on 2020/08/01
+%%
+\ProvidesFile{T1Mrcls-LF.fd}
+ [2020/08/01 (autoinst) Font definitions for T1/Mrcls-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Mrcls@scale\endcsname\relax
+ \let\Mrcls@@scale\@empty
+\else
+ \edef\Mrcls@@scale{s*[\csname Mrcls@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Mrcls-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Mrcls-LF}{m}{sc}{
+ <-> \Mrcls@@scale MrclsSC-Regular-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Mrcls-LF}{regular}{sc}{
+ <-> alias * Mrcls-LF/m/sc
+}{}
+
+\DeclareFontShape{T1}{Mrcls-LF}{m}{n}{
+ <-> \Mrcls@@scale Mrcls-Regular-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Mrcls-LF}{regular}{n}{
+ <-> alias * Mrcls-LF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/marcellus/T1Mrcls-Sup.fd b/Master/texmf-dist/tex/latex/marcellus/T1Mrcls-Sup.fd
new file mode 100644
index 00000000000..c88bfab27e5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/marcellus/T1Mrcls-Sup.fd
@@ -0,0 +1,44 @@
+%% Generated by autoinst on 2020/08/01
+%%
+\ProvidesFile{T1Mrcls-Sup.fd}
+ [2020/08/01 (autoinst) Font definitions for T1/Mrcls-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Mrcls@scale\endcsname\relax
+ \let\Mrcls@@scale\@empty
+\else
+ \edef\Mrcls@@scale{s*[\csname Mrcls@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Mrcls-Sup}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Mrcls-Sup}{m}{sc}{
+ <-> \Mrcls@@scale MrclsSC-Regular-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Mrcls-Sup}{regular}{sc}{
+ <-> alias * Mrcls-Sup/m/sc
+}{}
+
+\DeclareFontShape{T1}{Mrcls-Sup}{m}{n}{
+ <-> \Mrcls@@scale Mrcls-Regular-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Mrcls-Sup}{regular}{n}{
+ <-> alias * Mrcls-Sup/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/marcellus/TS1Mrcls-LF.fd b/Master/texmf-dist/tex/latex/marcellus/TS1Mrcls-LF.fd
new file mode 100644
index 00000000000..28b312edc35
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/marcellus/TS1Mrcls-LF.fd
@@ -0,0 +1,36 @@
+%% Generated by autoinst on 2020/08/01
+%%
+\ProvidesFile{TS1Mrcls-LF.fd}
+ [2020/08/01 (autoinst) Font definitions for TS1/Mrcls-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Mrcls@scale\endcsname\relax
+ \let\Mrcls@@scale\@empty
+\else
+ \edef\Mrcls@@scale{s*[\csname Mrcls@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Mrcls-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{Mrcls-LF}{m}{n}{
+ <-> \Mrcls@@scale Mrcls-Regular-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Mrcls-LF}{regular}{n}{
+ <-> alias * Mrcls-LF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/marcellus/marcellus.sty b/Master/texmf-dist/tex/latex/marcellus/marcellus.sty
index c292555fa0a..46b74eec86b 100644
--- a/Master/texmf-dist/tex/latex/marcellus/marcellus.sty
+++ b/Master/texmf-dist/tex/latex/marcellus/marcellus.sty
@@ -1,44 +1,66 @@
\ProvidesPackage{marcellus}[%
- 2020/07/23 (Bob Tennent) Supports Marcellus fonts for XeLaTeX or LuaLaTeX. ]
+ 2020/08/01 (Bob Tennent) Supports Marcellus fonts for all LaTeX engines. ]
-\RequirePackage{iftex}
+\RequirePackage{ifxetex,ifluatex,textcomp}
-\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}
+\newcommand*{\Mrcls@scale}{1}
\RequirePackage{xkeyval}
-\DeclareOptionX{scaled}{\renewcommand*{\Marcellus@scale}{#1}}
-\DeclareOptionX{scale}{\renewcommand*{\Marcellus@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\Mrcls@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\Mrcls@scale}{#1}}
+
+\DeclareOptionX{type1}{\marcellus@ttffalse}
\ProcessOptionsX\relax
-\RequirePackage{fontspec}
+\ifmarcellus@ttf
+ \RequirePackage{fontspec}
+\else
+ \RequirePackage{fontenc,fontaxes,mweights}
+\fi
+
+\ifmarcellus@ttf
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
Extension = .ttf ,
+ Scale = \Mrcls@scale ,
}
\setmainfont
[ UprightFont = *-Regular ,
BoldFont = *-Regular,
- SmallCapsFont = {MarcellusSmallCaps}
+ SmallCapsFont = {MarcellusSC-Regular},
]
{Marcellus}
\newfontfamily\marcellus
[ UprightFont = *-Regular ,
BoldFont = *-Regular,
- SmallCapsFont = {MarcellusSmallCaps}
+ SmallCapsFont = {MarcellusSC-Regular},
]
{Marcellus}
+\else % type1
+
+ \def\mdseries@rm{m}
+ \def\bfseries@rm{m}
+ \def\marcellusfamily{Mrcls-LF}
+ \renewcommand*\rmdefault{\marcellusfamily}
+ \newcommand*\marcellus{\fontfamily{\marcellusfamily}\selectfont}
+
+\fi
+
% turn off defaults in case other fonts are selected:
-\defaultfontfeatures{}
+\ifmarcellus@ttf
+ \defaultfontfeatures{}
+\fi
\endinput
diff --git a/Master/tlpkg/tlpsrc/marcellus.tlpsrc b/Master/tlpkg/tlpsrc/marcellus.tlpsrc
index e69de29bb2d..493569ed3f6 100644
--- a/Master/tlpkg/tlpsrc/marcellus.tlpsrc
+++ b/Master/tlpkg/tlpsrc/marcellus.tlpsrc
@@ -0,0 +1 @@
+execute addMap ${PKGNAME}.map