summaryrefslogtreecommitdiff
path: root/fonts/almendra/latex
diff options
context:
space:
mode:
Diffstat (limited to 'fonts/almendra/latex')
-rw-r--r--fonts/almendra/latex/LY1Almendra-OsF.fd97
-rw-r--r--fonts/almendra/latex/OT1Almendra-OsF.fd97
-rw-r--r--fonts/almendra/latex/T1Almendra-OsF.fd97
-rw-r--r--fonts/almendra/latex/TS1Almendra-OsF.fd97
-rw-r--r--fonts/almendra/latex/almendra.sty41
5 files changed, 10 insertions, 419 deletions
diff --git a/fonts/almendra/latex/LY1Almendra-OsF.fd b/fonts/almendra/latex/LY1Almendra-OsF.fd
deleted file mode 100644
index 7b9db689fb..0000000000
--- a/fonts/almendra/latex/LY1Almendra-OsF.fd
+++ /dev/null
@@ -1,97 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{LY1Almendra-OsF.fd}
- [2019/05/11 (autoinst) Font definitions for LY1/Almendra-OsF.]
-
-\expandafter\ifx\csname Almendra@scale\endcsname\relax
- \let\Almendra@@scale\@empty
-\else
- \edef\Almendra@@scale{s*[\csname Almendra@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{Almendra-OsF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{LY1}{Almendra-OsF}{regular}{sc}{
- <-> \Almendra@@scale AlmendraSmallCaps-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{Almendra-OsF}{regular}{n}{
- <-> \Almendra@@scale Almendra-Regular-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Almendra-OsF}{regular}{it}{
- <-> \Almendra@@scale Almendra-Italic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Almendra-OsF}{regular}{sl}{
- <-> ssub * Almendra-OsF/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{LY1}{Almendra-OsF}{bold}{n}{
- <-> \Almendra@@scale Almendra-Bold-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Almendra-OsF}{bold}{it}{
- <-> \Almendra@@scale Almendra-BoldItalic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Almendra-OsF}{bold}{sl}{
- <-> ssub * Almendra-OsF/bold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{LY1}{Almendra-OsF}{m}{sl}{
- <-> ssub * Almendra-OsF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{Almendra-OsF}{m}{sc}{
- <-> ssub * Almendra-OsF/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{Almendra-OsF}{m}{n}{
- <-> ssub * Almendra-OsF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{Almendra-OsF}{m}{it}{
- <-> ssub * Almendra-OsF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{LY1}{Almendra-OsF}{b}{sl}{
- <-> ssub * Almendra-OsF/bold/sl
-}{}
-
-\DeclareFontShape{LY1}{Almendra-OsF}{b}{n}{
- <-> ssub * Almendra-OsF/bold/n
-}{}
-
-\DeclareFontShape{LY1}{Almendra-OsF}{b}{it}{
- <-> ssub * Almendra-OsF/bold/it
-}{}
-
-\DeclareFontShape{LY1}{Almendra-OsF}{bx}{n}{
- <-> ssub * Almendra-OsF/b/n
-}{}
-
-\DeclareFontShape{LY1}{Almendra-OsF}{bx}{sl}{
- <-> ssub * Almendra-OsF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{Almendra-OsF}{bx}{it}{
- <-> ssub * Almendra-OsF/b/it
-}{}
-
-\endinput
diff --git a/fonts/almendra/latex/OT1Almendra-OsF.fd b/fonts/almendra/latex/OT1Almendra-OsF.fd
deleted file mode 100644
index dbd905a94f..0000000000
--- a/fonts/almendra/latex/OT1Almendra-OsF.fd
+++ /dev/null
@@ -1,97 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{OT1Almendra-OsF.fd}
- [2019/05/11 (autoinst) Font definitions for OT1/Almendra-OsF.]
-
-\expandafter\ifx\csname Almendra@scale\endcsname\relax
- \let\Almendra@@scale\@empty
-\else
- \edef\Almendra@@scale{s*[\csname Almendra@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{Almendra-OsF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{OT1}{Almendra-OsF}{regular}{sc}{
- <-> \Almendra@@scale AlmendraSmallCaps-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Almendra-OsF}{regular}{n}{
- <-> \Almendra@@scale Almendra-Regular-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Almendra-OsF}{regular}{it}{
- <-> \Almendra@@scale Almendra-Italic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Almendra-OsF}{regular}{sl}{
- <-> ssub * Almendra-OsF/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{OT1}{Almendra-OsF}{bold}{n}{
- <-> \Almendra@@scale Almendra-Bold-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Almendra-OsF}{bold}{it}{
- <-> \Almendra@@scale Almendra-BoldItalic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Almendra-OsF}{bold}{sl}{
- <-> ssub * Almendra-OsF/bold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{OT1}{Almendra-OsF}{m}{sl}{
- <-> ssub * Almendra-OsF/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{Almendra-OsF}{m}{sc}{
- <-> ssub * Almendra-OsF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{Almendra-OsF}{m}{n}{
- <-> ssub * Almendra-OsF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{Almendra-OsF}{m}{it}{
- <-> ssub * Almendra-OsF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{OT1}{Almendra-OsF}{b}{sl}{
- <-> ssub * Almendra-OsF/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{Almendra-OsF}{b}{n}{
- <-> ssub * Almendra-OsF/bold/n
-}{}
-
-\DeclareFontShape{OT1}{Almendra-OsF}{b}{it}{
- <-> ssub * Almendra-OsF/bold/it
-}{}
-
-\DeclareFontShape{OT1}{Almendra-OsF}{bx}{n}{
- <-> ssub * Almendra-OsF/b/n
-}{}
-
-\DeclareFontShape{OT1}{Almendra-OsF}{bx}{sl}{
- <-> ssub * Almendra-OsF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{Almendra-OsF}{bx}{it}{
- <-> ssub * Almendra-OsF/b/it
-}{}
-
-\endinput
diff --git a/fonts/almendra/latex/T1Almendra-OsF.fd b/fonts/almendra/latex/T1Almendra-OsF.fd
deleted file mode 100644
index 5decb728a0..0000000000
--- a/fonts/almendra/latex/T1Almendra-OsF.fd
+++ /dev/null
@@ -1,97 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{T1Almendra-OsF.fd}
- [2019/05/11 (autoinst) Font definitions for T1/Almendra-OsF.]
-
-\expandafter\ifx\csname Almendra@scale\endcsname\relax
- \let\Almendra@@scale\@empty
-\else
- \edef\Almendra@@scale{s*[\csname Almendra@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{Almendra-OsF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{T1}{Almendra-OsF}{regular}{sc}{
- <-> \Almendra@@scale AlmendraSmallCaps-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Almendra-OsF}{regular}{n}{
- <-> \Almendra@@scale Almendra-Regular-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Almendra-OsF}{regular}{it}{
- <-> \Almendra@@scale Almendra-Italic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Almendra-OsF}{regular}{sl}{
- <-> ssub * Almendra-OsF/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{T1}{Almendra-OsF}{bold}{n}{
- <-> \Almendra@@scale Almendra-Bold-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Almendra-OsF}{bold}{it}{
- <-> \Almendra@@scale Almendra-BoldItalic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Almendra-OsF}{bold}{sl}{
- <-> ssub * Almendra-OsF/bold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{T1}{Almendra-OsF}{m}{sl}{
- <-> ssub * Almendra-OsF/regular/sl
-}{}
-
-\DeclareFontShape{T1}{Almendra-OsF}{m}{sc}{
- <-> ssub * Almendra-OsF/regular/sc
-}{}
-
-\DeclareFontShape{T1}{Almendra-OsF}{m}{n}{
- <-> ssub * Almendra-OsF/regular/n
-}{}
-
-\DeclareFontShape{T1}{Almendra-OsF}{m}{it}{
- <-> ssub * Almendra-OsF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{T1}{Almendra-OsF}{b}{sl}{
- <-> ssub * Almendra-OsF/bold/sl
-}{}
-
-\DeclareFontShape{T1}{Almendra-OsF}{b}{n}{
- <-> ssub * Almendra-OsF/bold/n
-}{}
-
-\DeclareFontShape{T1}{Almendra-OsF}{b}{it}{
- <-> ssub * Almendra-OsF/bold/it
-}{}
-
-\DeclareFontShape{T1}{Almendra-OsF}{bx}{n}{
- <-> ssub * Almendra-OsF/b/n
-}{}
-
-\DeclareFontShape{T1}{Almendra-OsF}{bx}{sl}{
- <-> ssub * Almendra-OsF/b/sl
-}{}
-
-\DeclareFontShape{T1}{Almendra-OsF}{bx}{it}{
- <-> ssub * Almendra-OsF/b/it
-}{}
-
-\endinput
diff --git a/fonts/almendra/latex/TS1Almendra-OsF.fd b/fonts/almendra/latex/TS1Almendra-OsF.fd
deleted file mode 100644
index b7b563dbce..0000000000
--- a/fonts/almendra/latex/TS1Almendra-OsF.fd
+++ /dev/null
@@ -1,97 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{TS1Almendra-OsF.fd}
- [2019/05/11 (autoinst) Font definitions for TS1/Almendra-OsF.]
-
-\expandafter\ifx\csname Almendra@scale\endcsname\relax
- \let\Almendra@@scale\@empty
-\else
- \edef\Almendra@@scale{s*[\csname Almendra@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{Almendra-OsF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{TS1}{Almendra-OsF}{regular}{sc}{
- <-> \Almendra@@scale AlmendraSmallCaps-osf-sc-ts1
-}{}
-
-\DeclareFontShape{TS1}{Almendra-OsF}{regular}{n}{
- <-> \Almendra@@scale Almendra-Regular-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Almendra-OsF}{regular}{it}{
- <-> \Almendra@@scale Almendra-Italic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Almendra-OsF}{regular}{sl}{
- <-> ssub * Almendra-OsF/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{TS1}{Almendra-OsF}{bold}{n}{
- <-> \Almendra@@scale Almendra-Bold-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Almendra-OsF}{bold}{it}{
- <-> \Almendra@@scale Almendra-BoldItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Almendra-OsF}{bold}{sl}{
- <-> ssub * Almendra-OsF/bold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{TS1}{Almendra-OsF}{m}{sl}{
- <-> ssub * Almendra-OsF/regular/sl
-}{}
-
-\DeclareFontShape{TS1}{Almendra-OsF}{m}{sc}{
- <-> ssub * Almendra-OsF/regular/sc
-}{}
-
-\DeclareFontShape{TS1}{Almendra-OsF}{m}{n}{
- <-> ssub * Almendra-OsF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{Almendra-OsF}{m}{it}{
- <-> ssub * Almendra-OsF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{TS1}{Almendra-OsF}{b}{sl}{
- <-> ssub * Almendra-OsF/bold/sl
-}{}
-
-\DeclareFontShape{TS1}{Almendra-OsF}{b}{n}{
- <-> ssub * Almendra-OsF/bold/n
-}{}
-
-\DeclareFontShape{TS1}{Almendra-OsF}{b}{it}{
- <-> ssub * Almendra-OsF/bold/it
-}{}
-
-\DeclareFontShape{TS1}{Almendra-OsF}{bx}{n}{
- <-> ssub * Almendra-OsF/b/n
-}{}
-
-\DeclareFontShape{TS1}{Almendra-OsF}{bx}{sl}{
- <-> ssub * Almendra-OsF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{Almendra-OsF}{bx}{it}{
- <-> ssub * Almendra-OsF/b/it
-}{}
-
-\endinput
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