From a731c2c045c14b88099c4576c874b8df2990f2ea Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Sat, 25 Jul 2020 03:02:45 +0000
Subject: CTAN sync 202007250302

---
 fonts/almendra/latex/almendra.sty | 41 ++++++++++-----------------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

(limited to 'fonts/almendra/latex/almendra.sty')

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
 
-- 
cgit v1.2.3

