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.sty52
1 files changed, 37 insertions, 15 deletions
diff --git a/fonts/almendra/latex/almendra.sty b/fonts/almendra/latex/almendra.sty
index cd9c564516..c400a76276 100644
--- a/fonts/almendra/latex/almendra.sty
+++ b/fonts/almendra/latex/almendra.sty
@@ -1,35 +1,45 @@
\ProvidesPackage{almendra}[%
- 2020/07/23 (Bob Tennent) Supports Almendra fonts for XeLaTeX or LuaLaTeX. ]
+ 2020/08/02 (Bob Tennent) Supports Almendra fonts for all LaTeX engines. ]
-\RequirePackage{iftex}
+\RequirePackage{ifxetex,ifluatex,textcomp}
-\ifpdftex
-\PackageError{almendra}{%
- *****************************************\MessageBreak
- Please process using XeLaTeX or luaLaTeX\MessageBreak
- *****************************************}
-\fi
+\newif\ifalmendra@ttf
+\ifxetex
+ \almendra@ttftrue
+\else\ifluatex
+ \almendra@ttftrue
+\else % [pdf]LaTeX
+ \almendra@ttffalse
+\fi\fi
-\newcommand*{\Almendra@scale}{1}
+\newcommand*{\Almndr@scale}{1}
\RequirePackage{xkeyval}
-\DeclareOptionX{scaled}{\renewcommand*{\Almendra@scale}{#1}}
-\DeclareOptionX{scale}{\renewcommand*{\Almendra@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\Almndr@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\Almndr@scale}{#1}}
+
+\DeclareOptionX{type1}{\almendra@ttffalse}
\ProcessOptionsX\relax
-\RequirePackage{fontspec}
+\ifalmendra@ttf
+ \RequirePackage{fontspec}
+\else
+ \RequirePackage{fontenc,fontaxes,mweights}
+\fi
+\ifalmendra@ttf
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
Extension = .ttf ,
+ Scale = \Almndr@scale,
}
\setmainfont
[ UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-Bold ,
BoldItalicFont = *-BoldItalic ,
- SmallCapsFont = {AlmendraSmallCaps}
+ SmallCapsFont = {AlmendraSC-Regular}
]
{Almendra}
\newfontfamily\almendra
@@ -37,12 +47,24 @@
ItalicFont = *-Italic ,
BoldFont = *-Bold ,
BoldItalicFont = *-BoldItalic ,
- SmallCapsFont = {AlmendraSmallCaps}
+ SmallCapsFont = {AlmendraSC-Regular}
]
{Almendra}
+\else % type1
+
+ \def\bfseries@rm{b}
+ \def\mdseries@rm{m}
+ \def\almendrafamily{Almndr-OsF}
+ \renewcommand*\rmdefault{\almendrafamily}
+ \newcommand*\almendra{\fontfamily{\almendrafamily}\selectfont}
+
+\fi
+
% turn off defaults in case other fonts are selected:
-\defaultfontfeatures{}
+\ifalmendra@ttf
+ \defaultfontfeatures{}
+\fi
\endinput