summaryrefslogtreecommitdiff
path: root/fonts/almendra/latex/almendra.sty
diff options
context:
space:
mode:
Diffstat (limited to 'fonts/almendra/latex/almendra.sty')
-rw-r--r--fonts/almendra/latex/almendra.sty41
1 files changed, 10 insertions, 31 deletions
diff --git a/fonts/almendra/latex/almendra.sty b/fonts/almendra/latex/almendra.sty
index 7c3f98a39a..cd9c564516 100644
--- a/fonts/almendra/latex/almendra.sty
+++ b/fonts/almendra/latex/almendra.sty
@@ -1,33 +1,24 @@
\ProvidesPackage{almendra}[%
- 2019/10/12 (Bob Tennent) Supports Almendra fonts for all LaTeX engines. ]
+ 2020/07/23 (Bob Tennent) Supports Almendra fonts for XeLaTeX or LuaLaTeX. ]
-\RequirePackage{ifxetex,ifluatex,textcomp}
+\RequirePackage{iftex}
-\newif\ifalmendra@ttf
-\ifxetex
- \almendra@ttftrue
-\else\ifluatex
- \almendra@ttftrue
-\else % [pdf]LaTeX
- \almendra@ttffalse
-\fi\fi
+\ifpdftex
+\PackageError{almendra}{%
+ *****************************************\MessageBreak
+ Please process using XeLaTeX or luaLaTeX\MessageBreak
+ *****************************************}
+\fi
\newcommand*{\Almendra@scale}{1}
\RequirePackage{xkeyval}
\DeclareOptionX{scaled}{\renewcommand*{\Almendra@scale}{#1}}
\DeclareOptionX{scale}{\renewcommand*{\Almendra@scale}{#1}}
-\DeclareOptionX{type1}{\almendra@ttffalse}
-
\ProcessOptionsX\relax
-\ifalmendra@ttf
- \RequirePackage{fontspec}
-\else
- \RequirePackage{fontenc,fontaxes,mweights}
-\fi
+\RequirePackage{fontspec}
-\ifalmendra@ttf
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
@@ -50,20 +41,8 @@
]
{Almendra}
-\else % type1
-
- \def\bfseries@rm{b}
- \def\mdseries@rm{m}
- \def\almendrafamily{Almendra-OsF}
- \renewcommand*\rmdefault{\almendrafamily}
- \newcommand*\almendra{\fontfamily{\almendrafamily}\selectfont}
-
-\fi
-
% turn off defaults in case other fonts are selected:
-\ifalmendra@ttf
- \defaultfontfeatures{}
-\fi
+\defaultfontfeatures{}
\endinput