summaryrefslogtreecommitdiff
path: root/fonts/librebaskerville/latex/librebaskerville.sty
diff options
context:
space:
mode:
Diffstat (limited to 'fonts/librebaskerville/latex/librebaskerville.sty')
-rw-r--r--fonts/librebaskerville/latex/librebaskerville.sty81
1 files changed, 28 insertions, 53 deletions
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