texlive[55925] Master: almendra (24jul20)
commits+karl at tug.org
commits+karl at tug.org
Fri Jul 24 23:50:51 CEST 2020
Revision: 55925
http://tug.org/svn/texlive?view=revision&revision=55925
Author: karl
Date: 2020-07-24 23:50:50 +0200 (Fri, 24 Jul 2020)
Log Message:
-----------
almendra (24jul20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/fonts/almendra/README
trunk/Master/texmf-dist/doc/fonts/almendra/almendra-samples.pdf
trunk/Master/texmf-dist/doc/fonts/almendra/almendra-samples.tex
trunk/Master/texmf-dist/tex/latex/almendra/almendra.sty
trunk/Master/tlpkg/tlpsrc/almendra.tlpsrc
Removed Paths:
-------------
trunk/Master/texmf-dist/fonts/enc/dvips/almendra/
trunk/Master/texmf-dist/fonts/map/dvips/almendra/
trunk/Master/texmf-dist/fonts/tfm/public/almendra/
trunk/Master/texmf-dist/fonts/type1/public/almendra/
trunk/Master/texmf-dist/fonts/vf/public/almendra/
trunk/Master/texmf-dist/tex/latex/almendra/LY1Almendra-OsF.fd
trunk/Master/texmf-dist/tex/latex/almendra/OT1Almendra-OsF.fd
trunk/Master/texmf-dist/tex/latex/almendra/T1Almendra-OsF.fd
trunk/Master/texmf-dist/tex/latex/almendra/TS1Almendra-OsF.fd
Modified: trunk/Master/texmf-dist/doc/fonts/almendra/README
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/almendra/README 2020-07-24 17:11:33 UTC (rev 55924)
+++ trunk/Master/texmf-dist/doc/fonts/almendra/README 2020-07-24 21:50:50 UTC (rev 55925)
@@ -1,9 +1,8 @@
This is the README for the almendra package, version
-2019-10-12.
+2020-07-23.
-This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
-support for the Almendra family of fonts, designed by
-Ana Sanfelippo. Almendra is a typeface design based on
+This package provides the Almendra family of fonts, designed
+by Ana Sanfelippo. Almendra is a typeface design based on
calligraphy. Its style is related to the chancery and gothic
hands. There are regular and bold weights with matching
italics. There is also a regular-weight small-caps.
@@ -14,8 +13,7 @@
preferred URL for "tex-archive" is http://mirrors.ctan.org.
Unzip the archive at the root of an appropriate texmf tree,
likely a personal or local tree. If necessary, update the
-file-name database (e.g., texhash). Update the font-map
-files by enabling the Map file almendra.map.
+file-name database (e.g., texhash).
To use, add
@@ -24,24 +22,17 @@
to the preamble of your document. This will activate
Almendra as the main (serifed) text font.
-LuaLaTeX and xeLaTeX users who might prefer type1 fonts or
-who wish to avoid fontspec may use the type1 option.
-
Options scaled=<number> or scale=<number> may be used to
scale the fonts.
The only figure style is proportional oldstyle.
-Font encodings supported are OT1, T1, LY1, and TS1.
+The Truetype fonts were obtained from
-The original Truetype fonts were obtained from
-
https://fonts.google.com/specimen/Almendra
-and are licensed under the SIL Open Font License,
-version 1.1; the text may be found in the doc directory.
-The type1 versions were created using fontforge. The
-support files were created using autoinst and otftotfm and
-are licensed under the terms of the LaTeX Project Public
-License. The maintainer of this package is Bob Tennent (rdt
-at cs.queensu.ca)
+and are licensed under the SIL Open Font License, version
+1.1; the text may be found in the doc directory. The rest
+of the package is licensed under the terms of the LaTeX
+Project Public License. The maintainer of this package is
+Bob Tennent (rdt at cs.queensu.ca)
Modified: trunk/Master/texmf-dist/doc/fonts/almendra/almendra-samples.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/fonts/almendra/almendra-samples.tex
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/almendra/almendra-samples.tex 2020-07-24 17:11:33 UTC (rev 55924)
+++ trunk/Master/texmf-dist/doc/fonts/almendra/almendra-samples.tex 2020-07-24 21:50:50 UTC (rev 55925)
@@ -1,5 +1,4 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
\usepackage{almendra}
\usepackage{lipsum}
\begin{document}
Deleted: trunk/Master/texmf-dist/tex/latex/almendra/LY1Almendra-OsF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/almendra/LY1Almendra-OsF.fd 2020-07-24 17:11:33 UTC (rev 55924)
+++ trunk/Master/texmf-dist/tex/latex/almendra/LY1Almendra-OsF.fd 2020-07-24 21:50:50 UTC (rev 55925)
@@ -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 at scale\endcsname\relax
- \let\Almendra@@scale\@empty
-\else
- \edef\Almendra@@scale{s*[\csname Almendra at 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
Deleted: trunk/Master/texmf-dist/tex/latex/almendra/OT1Almendra-OsF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/almendra/OT1Almendra-OsF.fd 2020-07-24 17:11:33 UTC (rev 55924)
+++ trunk/Master/texmf-dist/tex/latex/almendra/OT1Almendra-OsF.fd 2020-07-24 21:50:50 UTC (rev 55925)
@@ -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 at scale\endcsname\relax
- \let\Almendra@@scale\@empty
-\else
- \edef\Almendra@@scale{s*[\csname Almendra at 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
Deleted: trunk/Master/texmf-dist/tex/latex/almendra/T1Almendra-OsF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/almendra/T1Almendra-OsF.fd 2020-07-24 17:11:33 UTC (rev 55924)
+++ trunk/Master/texmf-dist/tex/latex/almendra/T1Almendra-OsF.fd 2020-07-24 21:50:50 UTC (rev 55925)
@@ -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 at scale\endcsname\relax
- \let\Almendra@@scale\@empty
-\else
- \edef\Almendra@@scale{s*[\csname Almendra at 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
Deleted: trunk/Master/texmf-dist/tex/latex/almendra/TS1Almendra-OsF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/almendra/TS1Almendra-OsF.fd 2020-07-24 17:11:33 UTC (rev 55924)
+++ trunk/Master/texmf-dist/tex/latex/almendra/TS1Almendra-OsF.fd 2020-07-24 21:50:50 UTC (rev 55925)
@@ -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 at scale\endcsname\relax
- \let\Almendra@@scale\@empty
-\else
- \edef\Almendra@@scale{s*[\csname Almendra at 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
Modified: trunk/Master/texmf-dist/tex/latex/almendra/almendra.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/almendra/almendra.sty 2020-07-24 17:11:33 UTC (rev 55924)
+++ trunk/Master/texmf-dist/tex/latex/almendra/almendra.sty 2020-07-24 21:50:50 UTC (rev 55925)
@@ -1,16 +1,14 @@
\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 at ttf
-\ifxetex
- \almendra at ttftrue
-\else\ifluatex
- \almendra at ttftrue
-\else % [pdf]LaTeX
- \almendra at ttffalse
-\fi\fi
+\ifpdftex
+\PackageError{almendra}{%
+ *****************************************\MessageBreak
+ Please process using XeLaTeX or luaLaTeX\MessageBreak
+ *****************************************}
+\fi
\newcommand*{\Almendra at scale}{1}
\RequirePackage{xkeyval}
@@ -17,17 +15,10 @@
\DeclareOptionX{scaled}{\renewcommand*{\Almendra at scale}{#1}}
\DeclareOptionX{scale}{\renewcommand*{\Almendra at scale}{#1}}
-\DeclareOptionX{type1}{\almendra at ttffalse}
-
\ProcessOptionsX\relax
-\ifalmendra at ttf
- \RequirePackage{fontspec}
-\else
- \RequirePackage{fontenc,fontaxes,mweights}
-\fi
+\RequirePackage{fontspec}
-\ifalmendra at ttf
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
@@ -50,20 +41,8 @@
]
{Almendra}
-\else % type1
-
- \def\bfseries at rm{b}
- \def\mdseries at 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 at ttf
- \defaultfontfeatures{}
-\fi
+\defaultfontfeatures{}
\endinput
Modified: trunk/Master/tlpkg/tlpsrc/almendra.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/almendra.tlpsrc 2020-07-24 17:11:33 UTC (rev 55924)
+++ trunk/Master/tlpkg/tlpsrc/almendra.tlpsrc 2020-07-24 21:50:50 UTC (rev 55925)
@@ -1 +0,0 @@
-execute addMap ${PKGNAME}.map
More information about the tex-live-commits
mailing list.