From a731c2c045c14b88099c4576c874b8df2990f2ea Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 25 Jul 2020 03:02:45 +0000 Subject: CTAN sync 202007250302 --- fonts/librebaskerville/latex/librebaskerville.sty | 81 ++++++++--------------- 1 file changed, 28 insertions(+), 53 deletions(-) (limited to 'fonts/librebaskerville/latex/librebaskerville.sty') diff --git a/fonts/librebaskerville/latex/librebaskerville.sty b/fonts/librebaskerville/latex/librebaskerville.sty index 220ff31d2b..4bd08fb21a 100644 --- a/fonts/librebaskerville/latex/librebaskerville.sty +++ b/fonts/librebaskerville/latex/librebaskerville.sty @@ -1,69 +1,44 @@ \ProvidesPackage{librebaskerville}[% - 2012/12/01 (Bob Tennent) Supports LibreBaskerville fonts for all LaTeX engines. ] + 2020/07/24 (Bob Tennent) Supports LibreBaskerville fonts for XeLaTeX and LuaLaTeX. ] -\RequirePackage{ifxetex,ifluatex,textcomp} +\RequirePackage{iftex} -\newif\iflibrebaskerville@otf -\ifxetex - \librebaskerville@otftrue -\else\ifluatex - \librebaskerville@otftrue -\else % [pdf]LaTeX - \librebaskerville@otffalse -\fi\fi +\ifpdftex +\PackageError{librebaskerville}{% + *****************************************\MessageBreak + Please process using XeLaTeX or luaLaTeX\MessageBreak + *****************************************} +\fi \newcommand*{\LibreBaskerville@scale}{1} \RequirePackage{xkeyval} \DeclareOptionX{scaled}{\renewcommand*{\LibreBaskerville@scale}{#1}} \DeclareOptionX{scale}{\renewcommand*{\LibreBaskerville@scale}{#1}} -\DeclareOptionX{type1}{\librebaskerville@otffalse} - \ProcessOptionsX\relax -\iflibrebaskerville@otf - \RequirePackage{fontspec} -\else - \RequirePackage{fontenc,fontaxes} -\fi - -\iflibrebaskerville@otf - \ifxetex\XeTeXtracingfonts=1\fi - \defaultfontfeatures{ - Ligatures = TeX , - Extension = .otf , - } - \setmainfont - [ UprightFont = *-Regular , - ItalicFont = *-Italic , - BoldFont = *-Bold , - BoldItalicFont = *-BoldItalic ] - {LibreBaskerville} - \newfontfamily\librebaskerville - [ UprightFont = *-Regular , - ItalicFont = *-Italic , - BoldFont = *-Bold , - BoldItalicFont = *-BoldItalic ] - {LibreBaskerville} - \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}} - - -\else % type1 - - \fa@naming@exception{figures}{{superior}{proportional}}{Sup} - \fa@naming@exception{figures}{{superior}{tabular}}{Sup} - \providecommand\sufigures{\@nomath\sufigures\fontfigurestyle{superior}\selectfont} - \def\librebaskervillefamily{LibreBaskerville-TLF} - \renewcommand*\rmdefault{\librebaskervillefamily} - \newcommand*\librebaskerville{\fontfamily{\librebaskervillefamily}\selectfont} - -\fi -\DeclareTextFontCommand{\textsu}{\sufigures} +\RequirePackage{fontspec} + +\ifxetex\XeTeXtracingfonts=1\fi +\defaultfontfeatures{ + Ligatures = TeX , + Extension = .ttf , +} +\setmainfont + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + ] + {LibreBaskerville} +\newfontfamily\librebaskerville + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + ] + {LibreBaskerville} % turn off defaults in case other fonts are selected: -\iflibrebaskerville@otf - \defaultfontfeatures{} -\fi +\defaultfontfeatures{} \endinput -- cgit v1.2.3