summaryrefslogtreecommitdiff
path: root/fonts/lobster2/latex/LobsterTwo.sty
diff options
context:
space:
mode:
Diffstat (limited to 'fonts/lobster2/latex/LobsterTwo.sty')
-rw-r--r--fonts/lobster2/latex/LobsterTwo.sty77
1 files changed, 30 insertions, 47 deletions
diff --git a/fonts/lobster2/latex/LobsterTwo.sty b/fonts/lobster2/latex/LobsterTwo.sty
index 82599deff2..324c209567 100644
--- a/fonts/lobster2/latex/LobsterTwo.sty
+++ b/fonts/lobster2/latex/LobsterTwo.sty
@@ -1,63 +1,46 @@
\ProvidesPackage{LobsterTwo}[%
- 2014/01/08 (Bob Tennent) Supports Lobster Two fonts for all LaTeX engines. ]
+ 2020/07/22 (Bob Tennent) Supports Lobster Two fonts for modern LaTeX engines. ]
-\RequirePackage{ifxetex,ifluatex,textcomp}
+\RequirePackage{iftex}
+
+\ifpdftex
+\PackageError{lobster2}{%
+ *****************************************\MessageBreak
+ Please Process using xelatex or lualatex\MessageBreak
+ *****************************************}
+\fi
-\newif\ifLobsterTwo@otf
-\ifxetex
- \LobsterTwo@otftrue
-\else\ifluatex
- \LobsterTwo@otftrue
-\else % [pdf]LaTeX
- \LobsterTwo@otffalse
-\fi\fi
\newcommand*{\LobsterTwo@scale}{1}
\RequirePackage{xkeyval}
\DeclareOptionX{scaled}{\renewcommand*{\LobsterTwo@scale}{#1}}
\DeclareOptionX{scale}{\renewcommand*{\LobsterTwo@scale}{#1}}
-\DeclareOptionX{type1}{\LobsterTwo@otffalse}
-
\ProcessOptionsX\relax
-\ifLobsterTwo@otf
- \RequirePackage{fontspec}
-\else
- \RequirePackage{fontenc,fontaxes}
-\fi
-
-\ifLobsterTwo@otf
- \ifxetex\XeTeXtracingfonts=1\fi
- \defaultfontfeatures{
- Ligatures = TeX ,
- Extension = .otf ,
- }
- \setmainfont
- [ UprightFont = *-Regular ,
- ItalicFont = *-Italic ,
- BoldFont = *-Bold ,
- BoldItalicFont = *-BoldItalic ]
- {LobsterTwo}
- \newfontfamily\LobsterTwo
- [ UprightFont = *-Regular ,
- ItalicFont = *-Italic ,
- BoldFont = *-Bold ,
- BoldItalicFont = *-BoldItalic ]
- {LobsterTwo}
-
-\else % type1
-
- \def\LobsterTwofamily{LobsterTwo-LF}
- \renewcommand*\rmdefault{\LobsterTwofamily}
- \newcommand*\LobsterTwo{\fontfamily{\LobsterTwofamily}\selectfont}
-
-\fi
+\RequirePackage{fontspec}
+
+\ifxetex\XeTeXtracingfonts=1\fi
+\defaultfontfeatures{
+ Ligatures = TeX ,
+ Extension = .ttf ,
+ Scale = \LobsterTwo@scale ,
+}
+\setmainfont
+ [ UprightFont = *-Regular ,
+ ItalicFont = *-Italic ,
+ BoldFont = *-Bold ,
+ BoldItalicFont = *-BoldItalic ]
+ {LobsterTwo}
+\newfontfamily\LobsterTwo
+ [ UprightFont = *-Regular ,
+ ItalicFont = *-Italic ,
+ BoldFont = *-Bold ,
+ BoldItalicFont = *-BoldItalic ]
+ {LobsterTwo}
% turn off defaults in case other fonts are selected:
-\ifLobsterTwo@otf
- \defaultfontfeatures{}
-\fi
+\defaultfontfeatures{}
\endinput