diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/overlock/overlock.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/overlock/overlock.sty | 59 |
1 files changed, 39 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/overlock/overlock.sty b/Master/texmf-dist/tex/latex/overlock/overlock.sty index 622b9a03523..c9c69e3c5be 100644 --- a/Master/texmf-dist/tex/latex/overlock/overlock.sty +++ b/Master/texmf-dist/tex/latex/overlock/overlock.sty @@ -1,93 +1,112 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{overlock} - [2019/10/15 (Bob Tennent) Supports Overlock fonts for all LaTeX engines.] + [2020/07/07 (Bob Tennent) Supports Overlock fonts for all LaTeX engines.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} -\newif\ifoverlock@ttf +\newif\ifoverlock@otf \ifxetex - \overlock@ttftrue + \overlock@otftrue \else\ifluatex - \overlock@ttftrue + \overlock@otftrue \else % [pdf]LaTeX - \overlock@ttffalse + \overlock@otffalse \fi\fi \newif\ifoverlock@default \overlock@defaultfalse \newif\ifoverlock@black \overlock@blackfalse - +\newif\ifoverlock@lining \overlock@liningtrue \newcommand*{\Overlock@scale}{1} \DeclareOptionX{scaled}{\renewcommand*{\Overlock@scale}{#1}} \DeclareOptionX{scale}{\renewcommand*{\Overlock@scale}{#1}} +\DeclareOptionX{lining}{\overlock@liningtrue} +\DeclareOptionX{oldstyle}{\overlock@liningfalse} \DeclareOptionX{default}{\overlock@defaulttrue} \DeclareOptionX{sfdefault}{\overlock@defaulttrue} -\DeclareOptionX{type1}{\overlock@ttffalse} +\DeclareOptionX{type1}{\overlock@otffalse} \DeclareOptionX{black}{\overlock@blacktrue} \ProcessOptionsX\relax -\ifoverlock@ttf +\ifoverlock@otf \def\overlock@boldstyle{Bold} \ifoverlock@black\def\overlock@boldstyle{Black}\fi + \ifoverlock@lining + \def\overlock@figurestyle{} + \else + \def\overlock@figurestyle{OldStyle} + \fi \else % type1 \def\bfseries@sf{b} - \ifoverlock@black\def\bfseries@sf{eb}\fi + \ifoverlock@black\def\bfseries@sf{k}\fi + \ifoverlock@lining + \def\overlock@figurestyle{LF} + \else + \def\overlock@figurestyle{OsF} + \fi + \fi -\ifoverlock@ttf +\ifoverlock@otf \RequirePackage{fontspec} \else \RequirePackage{fontenc,fontaxes,mweights} \fi -\ifoverlock@ttf +\ifoverlock@otf \ifxetex\XeTeXtracingfonts=1\fi \defaultfontfeatures{ Ligatures = TeX , Scale = \Overlock@scale , - Extension = .ttf } + Extension = .otf } \setsansfont - [ UprightFont = *-Regular , + [ Numbers = {\overlock@figurestyle}, + UprightFont = *-Regular , ItalicFont = *-Italic , BoldFont = *-\overlock@boldstyle , - SmallCapsFont = {OverlockSC-Regular}, BoldItalicFont = *-\overlock@boldstyle Italic ] {Overlock} % grab current family in case of subsequent change: \let\overlockfamily\sfdefault \newfontfamily\overlock - [ UprightFont = *-Regular , + [ Numbers = {\overlock@figurestyle}, + UprightFont = *-Regular , ItalicFont = *-Italic , BoldFont = *-\overlock@boldstyle , - SmallCapsFont = {OverlockSC-Regular}, BoldItalicFont = *-\overlock@boldstyle Italic ] {Overlock} \newfontfamily\overlockBlack - [ UprightFont = *-Black , + [ Numbers = {\overlock@figurestyle}, + UprightFont = *-Black , ItalicFont = *-BlackItalic , BoldFont = *-Black , BoldItalicFont = *-BlackItalic ] {Overlock} + \DeclareTextFontCommand{\oldstylenums}{\addfontfeatures{Numbers={OldStyle}}} + \DeclareTextFontCommand{\liningnums}{\addfontfeatures{Numbers={Lining}}} \def\sffamily{\overlock} \ifoverlock@default \edef\familydefault{\overlockfamily} \fi \else % type1 - \def\overlockfamily{Overlock-LF} + \def\overlockfamily{Overlock-\overlock@figurestyle} \def\sfdefault{\overlockfamily} \def\sffamily{\fontfamily{\overlockfamily}\selectfont} \def\overlock{\fontfamily{\overlockfamily}\selectfont} - \def\overlockBlack{\fontfamily{\overlockfamily}\fontseries{eb}\selectfont} + \def\overlockBlack{\fontfamily{\overlockfamily}\fontseries{black}\selectfont} \ifoverlock@default\def\familydefault{\sfdefault} \fi + \DeclareTextFontCommand{\oldstylenums}{\fontfamily{Overlock-OsF}\selectfont} + \DeclareTextFontCommand{\liningnums}{\fontfamily{Overlock-LF}\selectfont} + \fi -\ifoverlock@ttf +\ifoverlock@otf % turn off defaults in case other fonts are selected: \defaultfontfeatures{} \fi |