From e5053aca346b6b429f77806ea89e37d67da94b29 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 3 Aug 2020 03:01:12 +0000 Subject: CTAN sync 202008030301 --- fonts/forum/latex/forum.sty | 48 +++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) (limited to 'fonts/forum/latex/forum.sty') diff --git a/fonts/forum/latex/forum.sty b/fonts/forum/latex/forum.sty index 9c83728fe9..1dbd695e8f 100644 --- a/fonts/forum/latex/forum.sty +++ b/fonts/forum/latex/forum.sty @@ -1,40 +1,64 @@ \ProvidesPackage{forum}[% - 2020/07/25 (Bob Tennent) Supports Forum font for xeLaTeX and luaLaTeX. ] + 2020/08/01 (Bob Tennent) Supports Forum fonts for all LaTeX engines. ] -\RequirePackage{iftex} +\RequirePackage{ifxetex,ifluatex,textcomp} -\ifpdftex -\PackageError{forum}{% - *****************************************\MessageBreak - Please process using XeLaTeX or luaLaTeX\MessageBreak - *****************************************} -\fi +\newif\ifforum@otf +\ifxetex + \forum@otftrue +\else\ifluatex + \forum@otftrue +\else % [pdf]LaTeX + \forum@otffalse +\fi\fi -\newcommand*{\Forum@scale}{1} +\newcommand*{\Frm@scale}{1} \RequirePackage{xkeyval} -\DeclareOptionX{scaled}{\renewcommand*{\Forum@scale}{#1}} -\DeclareOptionX{scale}{\renewcommand*{\Forum@scale}{#1}} +\DeclareOptionX{scaled}{\renewcommand*{\Frm@scale}{#1}} +\DeclareOptionX{scale}{\renewcommand*{\Frm@scale}{#1}} + +\DeclareOptionX{type1}{\forum@otffalse} \ProcessOptionsX\relax +\ifforum@otf \RequirePackage{fontspec} +\else + \RequirePackage{fontenc,fontaxes,mweights} +\fi +\ifforum@otf \ifxetex\XeTeXtracingfonts=1\fi \defaultfontfeatures{ Ligatures = TeX , - Extension = .ttf , + Extension = .otf , + Scale = \Frm@scale, } \setmainfont [ UprightFont = *-Regular , + BoldFont = Frm-Bold, ] {Forum} \newfontfamily\forum [ UprightFont = *-Regular , + BoldFont = Frm-Bold, ] {Forum} +\else % type1 + + \def\mdseries@rm{regular} + \def\bfseries@rm{bold} + \def\forumfamily{Frm-LF} + \renewcommand*\rmdefault{\forumfamily} + \newcommand*\forum{\fontfamily{\forumfamily}\selectfont} + +\fi + % turn off defaults in case other fonts are selected: +\ifforum@otf \defaultfontfeatures{} +\fi \endinput -- cgit v1.2.3