diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/marcellus/marcellus.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/marcellus/marcellus.sty | 54 |
1 files changed, 38 insertions, 16 deletions
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 |