diff options
author | Karl Berry <karl@freefriends.org> | 2020-07-24 21:51:37 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-07-24 21:51:37 +0000 |
commit | 8e96939ec6cb5404dd26d4b0982c2fa6d942d3fc (patch) | |
tree | 7530107cfd85247608e354ec0ba11a3049603b0f /Master/texmf-dist/tex/latex/marcellus/marcellus.sty | |
parent | f58ef978d956f2049789dfd1c256042c52356184 (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/marcellus/marcellus.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/marcellus/marcellus.sty | 43 |
1 files changed, 11 insertions, 32 deletions
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 |