summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-07-24 21:51:37 +0000
committerKarl Berry <karl@freefriends.org>2020-07-24 21:51:37 +0000
commit8e96939ec6cb5404dd26d4b0982c2fa6d942d3fc (patch)
tree7530107cfd85247608e354ec0ba11a3049603b0f /Master/texmf-dist/tex/latex
parentf58ef978d956f2049789dfd1c256042c52356184 (diff)
marcellus (24jul20)
git-svn-id: svn://tug.org/texlive/trunk@55927 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-LF.fd39
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-Sup.fd39
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-LF.fd39
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-Sup.fd39
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/T1Marcellus-LF.fd39
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/T1Marcellus-Sup.fd39
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/TS1Marcellus-LF.fd39
-rw-r--r--Master/texmf-dist/tex/latex/marcellus/marcellus.sty43
8 files changed, 11 insertions, 305 deletions
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