diff options
author | Karl Berry <karl@freefriends.org> | 2020-08-03 21:32:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-08-03 21:32:55 +0000 |
commit | 2cc1428902acf89607839209b9cf261aec5cf40d (patch) | |
tree | 310436d33780130c424fb48a9dab206fd17eb30b /Master/texmf-dist/tex/latex/almendra | |
parent | 1810c18fe8f41a849528b91a208354bdac30538e (diff) |
almendra (3aug20)
git-svn-id: svn://tug.org/texlive/trunk@56035 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/almendra')
5 files changed, 425 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/almendra/LY1Almndr-OsF.fd b/Master/texmf-dist/tex/latex/almendra/LY1Almndr-OsF.fd new file mode 100644 index 00000000000..f77df5738ab --- /dev/null +++ b/Master/texmf-dist/tex/latex/almendra/LY1Almndr-OsF.fd @@ -0,0 +1,99 @@ +%% Generated by autoinst on 2020/08/02 +%% +\ProvidesFile{LY1Almndr-OsF.fd} + [2020/08/02 (autoinst) Font definitions for LY1/Almndr-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname Almndr@scale\endcsname\relax + \let\Almndr@@scale\@empty +\else + \edef\Almndr@@scale{s*[\csname Almndr@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{Almndr-OsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{Almndr-OsF}{m}{sc}{ + <-> \Almndr@@scale AlmndrSC-Regular-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Almndr-OsF}{regular}{sc}{ + <-> alias * Almndr-OsF/m/sc +}{} + +\DeclareFontShape{LY1}{Almndr-OsF}{m}{n}{ + <-> \Almndr@@scale Almndr-Regular-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Almndr-OsF}{regular}{n}{ + <-> alias * Almndr-OsF/m/n +}{} + +\DeclareFontShape{LY1}{Almndr-OsF}{m}{it}{ + <-> \Almndr@@scale Almndr-Italic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Almndr-OsF}{regular}{it}{ + <-> alias * Almndr-OsF/m/it +}{} + +\DeclareFontShape{LY1}{Almndr-OsF}{m}{sl}{ + <-> ssub * Almndr-OsF/m/it +}{} + +\DeclareFontShape{LY1}{Almndr-OsF}{regular}{sl}{ + <-> ssub * Almndr-OsF/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{LY1}{Almndr-OsF}{b}{n}{ + <-> \Almndr@@scale Almndr-Bold-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Almndr-OsF}{bold}{n}{ + <-> alias * Almndr-OsF/b/n +}{} + +\DeclareFontShape{LY1}{Almndr-OsF}{b}{it}{ + <-> \Almndr@@scale Almndr-BoldItalic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Almndr-OsF}{bold}{it}{ + <-> alias * Almndr-OsF/b/it +}{} + +\DeclareFontShape{LY1}{Almndr-OsF}{b}{sl}{ + <-> ssub * Almndr-OsF/b/it +}{} + +\DeclareFontShape{LY1}{Almndr-OsF}{bold}{sl}{ + <-> ssub * Almndr-OsF/bold/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{LY1}{Almndr-OsF}{bx}{n}{ + <-> ssub * Almndr-OsF/b/n +}{} + +\DeclareFontShape{LY1}{Almndr-OsF}{bx}{sl}{ + <-> ssub * Almndr-OsF/b/sl +}{} + +\DeclareFontShape{LY1}{Almndr-OsF}{bx}{it}{ + <-> ssub * Almndr-OsF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/almendra/OT1Almndr-OsF.fd b/Master/texmf-dist/tex/latex/almendra/OT1Almndr-OsF.fd new file mode 100644 index 00000000000..15b70682a2b --- /dev/null +++ b/Master/texmf-dist/tex/latex/almendra/OT1Almndr-OsF.fd @@ -0,0 +1,99 @@ +%% Generated by autoinst on 2020/08/02 +%% +\ProvidesFile{OT1Almndr-OsF.fd} + [2020/08/02 (autoinst) Font definitions for OT1/Almndr-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname Almndr@scale\endcsname\relax + \let\Almndr@@scale\@empty +\else + \edef\Almndr@@scale{s*[\csname Almndr@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{Almndr-OsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{Almndr-OsF}{m}{sc}{ + <-> \Almndr@@scale AlmndrSC-Regular-osf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Almndr-OsF}{regular}{sc}{ + <-> alias * Almndr-OsF/m/sc +}{} + +\DeclareFontShape{OT1}{Almndr-OsF}{m}{n}{ + <-> \Almndr@@scale Almndr-Regular-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Almndr-OsF}{regular}{n}{ + <-> alias * Almndr-OsF/m/n +}{} + +\DeclareFontShape{OT1}{Almndr-OsF}{m}{it}{ + <-> \Almndr@@scale Almndr-Italic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Almndr-OsF}{regular}{it}{ + <-> alias * Almndr-OsF/m/it +}{} + +\DeclareFontShape{OT1}{Almndr-OsF}{m}{sl}{ + <-> ssub * Almndr-OsF/m/it +}{} + +\DeclareFontShape{OT1}{Almndr-OsF}{regular}{sl}{ + <-> ssub * Almndr-OsF/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{OT1}{Almndr-OsF}{b}{n}{ + <-> \Almndr@@scale Almndr-Bold-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Almndr-OsF}{bold}{n}{ + <-> alias * Almndr-OsF/b/n +}{} + +\DeclareFontShape{OT1}{Almndr-OsF}{b}{it}{ + <-> \Almndr@@scale Almndr-BoldItalic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Almndr-OsF}{bold}{it}{ + <-> alias * Almndr-OsF/b/it +}{} + +\DeclareFontShape{OT1}{Almndr-OsF}{b}{sl}{ + <-> ssub * Almndr-OsF/b/it +}{} + +\DeclareFontShape{OT1}{Almndr-OsF}{bold}{sl}{ + <-> ssub * Almndr-OsF/bold/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{OT1}{Almndr-OsF}{bx}{n}{ + <-> ssub * Almndr-OsF/b/n +}{} + +\DeclareFontShape{OT1}{Almndr-OsF}{bx}{sl}{ + <-> ssub * Almndr-OsF/b/sl +}{} + +\DeclareFontShape{OT1}{Almndr-OsF}{bx}{it}{ + <-> ssub * Almndr-OsF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/almendra/T1Almndr-OsF.fd b/Master/texmf-dist/tex/latex/almendra/T1Almndr-OsF.fd new file mode 100644 index 00000000000..8d0cef55e75 --- /dev/null +++ b/Master/texmf-dist/tex/latex/almendra/T1Almndr-OsF.fd @@ -0,0 +1,99 @@ +%% Generated by autoinst on 2020/08/02 +%% +\ProvidesFile{T1Almndr-OsF.fd} + [2020/08/02 (autoinst) Font definitions for T1/Almndr-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname Almndr@scale\endcsname\relax + \let\Almndr@@scale\@empty +\else + \edef\Almndr@@scale{s*[\csname Almndr@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{Almndr-OsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T1}{Almndr-OsF}{m}{sc}{ + <-> \Almndr@@scale AlmndrSC-Regular-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Almndr-OsF}{regular}{sc}{ + <-> alias * Almndr-OsF/m/sc +}{} + +\DeclareFontShape{T1}{Almndr-OsF}{m}{n}{ + <-> \Almndr@@scale Almndr-Regular-osf-t1 +}{} + +\DeclareFontShape{T1}{Almndr-OsF}{regular}{n}{ + <-> alias * Almndr-OsF/m/n +}{} + +\DeclareFontShape{T1}{Almndr-OsF}{m}{it}{ + <-> \Almndr@@scale Almndr-Italic-osf-t1 +}{} + +\DeclareFontShape{T1}{Almndr-OsF}{regular}{it}{ + <-> alias * Almndr-OsF/m/it +}{} + +\DeclareFontShape{T1}{Almndr-OsF}{m}{sl}{ + <-> ssub * Almndr-OsF/m/it +}{} + +\DeclareFontShape{T1}{Almndr-OsF}{regular}{sl}{ + <-> ssub * Almndr-OsF/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T1}{Almndr-OsF}{b}{n}{ + <-> \Almndr@@scale Almndr-Bold-osf-t1 +}{} + +\DeclareFontShape{T1}{Almndr-OsF}{bold}{n}{ + <-> alias * Almndr-OsF/b/n +}{} + +\DeclareFontShape{T1}{Almndr-OsF}{b}{it}{ + <-> \Almndr@@scale Almndr-BoldItalic-osf-t1 +}{} + +\DeclareFontShape{T1}{Almndr-OsF}{bold}{it}{ + <-> alias * Almndr-OsF/b/it +}{} + +\DeclareFontShape{T1}{Almndr-OsF}{b}{sl}{ + <-> ssub * Almndr-OsF/b/it +}{} + +\DeclareFontShape{T1}{Almndr-OsF}{bold}{sl}{ + <-> ssub * Almndr-OsF/bold/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T1}{Almndr-OsF}{bx}{n}{ + <-> ssub * Almndr-OsF/b/n +}{} + +\DeclareFontShape{T1}{Almndr-OsF}{bx}{sl}{ + <-> ssub * Almndr-OsF/b/sl +}{} + +\DeclareFontShape{T1}{Almndr-OsF}{bx}{it}{ + <-> ssub * Almndr-OsF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/almendra/TS1Almndr-OsF.fd b/Master/texmf-dist/tex/latex/almendra/TS1Almndr-OsF.fd new file mode 100644 index 00000000000..674cebd2f65 --- /dev/null +++ b/Master/texmf-dist/tex/latex/almendra/TS1Almndr-OsF.fd @@ -0,0 +1,91 @@ +%% Generated by autoinst on 2020/08/02 +%% +\ProvidesFile{TS1Almndr-OsF.fd} + [2020/08/02 (autoinst) Font definitions for TS1/Almndr-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname Almndr@scale\endcsname\relax + \let\Almndr@@scale\@empty +\else + \edef\Almndr@@scale{s*[\csname Almndr@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{Almndr-OsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{TS1}{Almndr-OsF}{m}{n}{ + <-> \Almndr@@scale Almndr-Regular-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Almndr-OsF}{regular}{n}{ + <-> alias * Almndr-OsF/m/n +}{} + +\DeclareFontShape{TS1}{Almndr-OsF}{m}{it}{ + <-> \Almndr@@scale Almndr-Italic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Almndr-OsF}{regular}{it}{ + <-> alias * Almndr-OsF/m/it +}{} + +\DeclareFontShape{TS1}{Almndr-OsF}{m}{sl}{ + <-> ssub * Almndr-OsF/m/it +}{} + +\DeclareFontShape{TS1}{Almndr-OsF}{regular}{sl}{ + <-> ssub * Almndr-OsF/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{TS1}{Almndr-OsF}{b}{n}{ + <-> \Almndr@@scale Almndr-Bold-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Almndr-OsF}{bold}{n}{ + <-> alias * Almndr-OsF/b/n +}{} + +\DeclareFontShape{TS1}{Almndr-OsF}{b}{it}{ + <-> \Almndr@@scale Almndr-BoldItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Almndr-OsF}{bold}{it}{ + <-> alias * Almndr-OsF/b/it +}{} + +\DeclareFontShape{TS1}{Almndr-OsF}{b}{sl}{ + <-> ssub * Almndr-OsF/b/it +}{} + +\DeclareFontShape{TS1}{Almndr-OsF}{bold}{sl}{ + <-> ssub * Almndr-OsF/bold/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{TS1}{Almndr-OsF}{bx}{n}{ + <-> ssub * Almndr-OsF/b/n +}{} + +\DeclareFontShape{TS1}{Almndr-OsF}{bx}{sl}{ + <-> ssub * Almndr-OsF/b/sl +}{} + +\DeclareFontShape{TS1}{Almndr-OsF}{bx}{it}{ + <-> ssub * Almndr-OsF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/almendra/almendra.sty b/Master/texmf-dist/tex/latex/almendra/almendra.sty index cd9c564516a..c400a76276f 100644 --- a/Master/texmf-dist/tex/latex/almendra/almendra.sty +++ b/Master/texmf-dist/tex/latex/almendra/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 |