summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
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/texmf-dist/tex/latex
parent99cba3c7708975b84acbb927a3e1c02875be5596 (diff)
marcellus (1aug20)
git-svn-id: svn://tug.org/texlive/trunk@56016 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-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
8 files changed, 338 insertions, 16 deletions
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