summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-07-24 21:50:50 +0000
committerKarl Berry <karl@freefriends.org>2020-07-24 21:50:50 +0000
commitbbcb8495568f73fca040ac32ff01877ce161fcfb (patch)
tree7df80c9dc861f882e48876c18526724bb6d4c9e0 /Master
parent4dd49cada5835bfc549721d204b310ba45523804 (diff)
almendra (24jul20)
git-svn-id: svn://tug.org/texlive/trunk@55925 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/fonts/almendra/README29
-rw-r--r--Master/texmf-dist/doc/fonts/almendra/almendra-samples.pdfbin29135 -> 26459 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/almendra/almendra-samples.tex1
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3ehf7b.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3qmmf2.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3smkg7.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almnd_4ostoe.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almnd_aisq53.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almnd_aphd5h.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almnd_cksmvz.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almnd_ktaaad.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almnd_ncjtqa.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almnd_qv6mtu.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almnd_w4vl5k.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almnd_yh7c3k.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almnd_yuo247.enc65
-rw-r--r--Master/texmf-dist/fonts/map/dvips/almendra/almendra.map22
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ly1--base.tfmbin1856 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ly1.tfmbin2036 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ot1--base.tfmbin1352 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ot1.tfmbin1504 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-t1--base.tfmbin1804 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-t1.tfmbin1984 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ts1--base.tfmbin1324 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ts1.tfmbin1332 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ly1--base.tfmbin1872 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ly1.tfmbin2212 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ot1--base.tfmbin1320 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ot1.tfmbin1636 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-t1--base.tfmbin1836 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-t1.tfmbin2176 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ts1--base.tfmbin1336 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ts1.tfmbin1348 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ly1--base.tfmbin1788 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ly1.tfmbin1964 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ot1--base.tfmbin1268 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ot1.tfmbin1420 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-t1--base.tfmbin1744 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-t1.tfmbin1920 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ts1--base.tfmbin1336 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ts1.tfmbin1340 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ly1--base.tfmbin1868 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ly1.tfmbin2088 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ot1--base.tfmbin1384 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ot1.tfmbin1628 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-t1--base.tfmbin1804 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-t1.tfmbin2044 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ts1--base.tfmbin1360 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ts1.tfmbin1372 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ly1--base.tfmbin1776 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ly1.tfmbin1828 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ot1--base.tfmbin1252 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ot1.tfmbin1288 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-t1--base.tfmbin1736 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-t1.tfmbin1796 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ts1--base.tfmbin1324 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ts1.tfmbin1332 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/Almendra-Bold.pfbbin46837 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/Almendra-BoldItalic.pfbbin44230 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/Almendra-Italic.pfbbin43455 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/Almendra-Regular.pfbbin62617 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/AlmendraDisplay-Regular.pfbbin46586 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/AlmendraSmallCaps.pfbbin46354 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ly1.vfbin1580 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ot1.vfbin748 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-t1.vfbin1344 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ts1.vfbin440 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ly1.vfbin1580 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ot1.vfbin756 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-t1.vfbin1348 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ts1.vfbin440 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ly1.vfbin1576 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ot1.vfbin752 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-t1.vfbin1344 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ts1.vfbin436 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ly1.vfbin1732 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ot1.vfbin888 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-t1.vfbin1732 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ts1.vfbin504 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ly1.vfbin1568 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ot1.vfbin732 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-t1.vfbin1344 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ts1.vfbin440 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/latex/almendra/LY1Almendra-OsF.fd97
-rw-r--r--Master/texmf-dist/tex/latex/almendra/OT1Almendra-OsF.fd97
-rw-r--r--Master/texmf-dist/tex/latex/almendra/T1Almendra-OsF.fd97
-rw-r--r--Master/texmf-dist/tex/latex/almendra/TS1Almendra-OsF.fd97
-rw-r--r--Master/texmf-dist/tex/latex/almendra/almendra.sty41
-rw-r--r--Master/tlpkg/tlpsrc/almendra.tlpsrc1
89 files changed, 20 insertions, 1298 deletions
diff --git a/Master/texmf-dist/doc/fonts/almendra/README b/Master/texmf-dist/doc/fonts/almendra/README
index 2230c455111..5df6941fcd7 100644
--- a/Master/texmf-dist/doc/fonts/almendra/README
+++ b/Master/texmf-dist/doc/fonts/almendra/README
@@ -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 @@ TeX system download the file
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 use, add
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 original Truetype fonts were obtained from
+The 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)
diff --git a/Master/texmf-dist/doc/fonts/almendra/almendra-samples.pdf b/Master/texmf-dist/doc/fonts/almendra/almendra-samples.pdf
index 6e558480398..cc6cf761ef9 100644
--- a/Master/texmf-dist/doc/fonts/almendra/almendra-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/almendra/almendra-samples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/almendra/almendra-samples.tex b/Master/texmf-dist/doc/fonts/almendra/almendra-samples.tex
index 10bcb01122b..7220bd5d714 100644
--- a/Master/texmf-dist/doc/fonts/almendra/almendra-samples.tex
+++ b/Master/texmf-dist/doc/fonts/almendra/almendra-samples.tex
@@ -1,5 +1,4 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
\usepackage{almendra}
\usepackage{lipsum}
\begin{document}
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3ehf7b.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3ehf7b.enc
deleted file mode 100644
index c40885674b4..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3ehf7b.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_3ehf7b7hkdwzofdbscgez4iuwe
-% Encoding created by otftotfm on Sat May 11 07:17:41 2019
-% Command line follows encoding
-/AutoEnc_3ehf7b7hkdwzofdbscgez4iuwe [
-%00
- /fi /Euro /fl /f_h /fraction /dotaccent /hungarumlaut /ogonek
- /s_t /c_t /.notdef /f_k /f_b /f_j /f_t /T_h
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
- /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
- /nbspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
-%B0
- /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
- /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/almendra
-% --vf-directory=texmf/fonts/vf/public/almendra
-% --type1-directory=texmf/fonts/type1/public/almendra
-% --truetype-directory=texmf/fonts/truetype/public/almendra
-% --encoding-directory=texmf/fonts/enc/dvips/almendra
-% --map-file=texmf/fonts/map/dvips/almendra/Almendra.map --no-updmap
-% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga Almendra-Regular.ttf Almendra-Regular-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3qmmf2.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3qmmf2.enc
deleted file mode 100644
index 61fb2e50aed..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3qmmf2.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_3qmmf27szfq6zngjzlbcn4egfh
-% Encoding created by otftotfm on Sat May 11 07:17:41 2019
-% Command line follows encoding
-/AutoEnc_3qmmf27szfq6zngjzlbcn4egfh [
-%00
- /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
- /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_k /dotlessi /dotlessj /fi /fl /f_h /s_t /c_t
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
- /f_b /f_j /Lslash /Nacute /Ncaron /f_t /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /T_h /section
-%A0
- /abreve /aogonek /cacute /ccaron /.notdef /ecaron /eogonek /gbreve
- /lacute /.notdef /lslash /nacute /ncaron /ellipsis /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /scedilla /.notdef /tcedilla /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/almendra
-% --vf-directory=texmf/fonts/vf/public/almendra
-% --type1-directory=texmf/fonts/type1/public/almendra
-% --truetype-directory=texmf/fonts/truetype/public/almendra
-% --encoding-directory=texmf/fonts/enc/dvips/almendra
-% --map-file=texmf/fonts/map/dvips/almendra/Almendra.map --no-updmap
-% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga Almendra-Regular.ttf
-% Almendra-Regular-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3smkg7.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3smkg7.enc
deleted file mode 100644
index 95ac6eb4283..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3smkg7.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_3smkg7w7wjkxf2dzis7khtvdwd
-% Encoding created by otftotfm on Sat May 11 07:17:42 2019
-% Command line follows encoding
-/AutoEnc_3smkg7w7wjkxf2dzis7khtvdwd [
-%00
- /grave /acute /circumflex /tilde /dieresis /.notdef /ring /caron
- /.notdef /macron /.notdef /cedilla /.notdef /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Lslash /Nacute /.notdef /.notdef /.notdef /Racute
-%90
- /Rcaron /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef
- /Ydieresis /.notdef /Zcaron /.notdef /IJ /.notdef /.notdef /section
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /nacute /.notdef /.notdef /.notdef /.notdef
-%B0
- /rcaron /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /ydieresis /.notdef /.notdef /.notdef /ij /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/almendra
-% --vf-directory=texmf/fonts/vf/public/almendra
-% --type1-directory=texmf/fonts/type1/public/almendra
-% --truetype-directory=texmf/fonts/truetype/public/almendra
-% --encoding-directory=texmf/fonts/enc/dvips/almendra
-% --map-file=texmf/fonts/map/dvips/almendra/Almendra.map --no-updmap
-% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --unicoding=germandbls =: SSsmall AlmendraSmallCaps.ttf
-% AlmendraSmallCaps-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_4ostoe.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_4ostoe.enc
deleted file mode 100644
index 007c6dda5e3..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_4ostoe.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_4ostoee4nqd6p2zkkqba3bsn4g
-% Encoding created by otftotfm on Sat May 11 07:17:40 2019
-% Command line follows encoding
-/AutoEnc_4ostoee4nqd6p2zkkqba3bsn4g [
-%00
- /fi /Euro /fl /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /.notdef /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
- /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /ellipsis /.notdef /.notdef
- /circumflex /.notdef /.notdef /guilsinglleft /OE /.notdef /asciicircum /.notdef
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /.notdef /.notdef /guilsinglright /oe /.notdef /asciitilde /.notdef
-%A0
- /nbspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
-%B0
- /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
- /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/almendra
-% --vf-directory=texmf/fonts/vf/public/almendra
-% --type1-directory=texmf/fonts/type1/public/almendra
-% --truetype-directory=texmf/fonts/truetype/public/almendra
-% --encoding-directory=texmf/fonts/enc/dvips/almendra
-% --map-file=texmf/fonts/map/dvips/almendra/Almendra.map --no-updmap
-% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga Almendra-BoldItalic.ttf Almendra-BoldItalic-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_aisq53.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_aisq53.enc
deleted file mode 100644
index 70c02bd02a9..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_aisq53.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_aisq5364u5nccykxiaciq45q3d
-% Encoding created by otftotfm on Sat May 11 07:17:40 2019
-% Command line follows encoding
-/AutoEnc_aisq5364u5nccykxiaciq45q3d [
-%00
- /fi /Euro /fl /.notdef /fraction /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /.notdef /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
- /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /ellipsis /.notdef /.notdef
- /circumflex /.notdef /.notdef /guilsinglleft /OE /.notdef /asciicircum /.notdef
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /.notdef /.notdef /guilsinglright /oe /.notdef /asciitilde /.notdef
-%A0
- /nbspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
-%B0
- /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
- /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/almendra
-% --vf-directory=texmf/fonts/vf/public/almendra
-% --type1-directory=texmf/fonts/type1/public/almendra
-% --truetype-directory=texmf/fonts/truetype/public/almendra
-% --encoding-directory=texmf/fonts/enc/dvips/almendra
-% --map-file=texmf/fonts/map/dvips/almendra/Almendra.map --no-updmap
-% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga Almendra-Bold.ttf Almendra-Bold-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_aphd5h.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_aphd5h.enc
deleted file mode 100644
index 100e904a92a..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_aphd5h.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_aphd5h4nlzefompxpeiv6jmope
-% Encoding created by otftotfm on Sat May 11 07:17:40 2019
-% Command line follows encoding
-/AutoEnc_aphd5h4nlzefompxpeiv6jmope [
-%00
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /cedilla /.notdef /quotesinglbase /exclam /asterisk
-%10
- /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
-%20
- /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
- /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
-%30
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%40
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%60
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /bullet /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
- /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
- /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered
- /.notdef /onesuperior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=texmf/fonts/tfm/public/almendra
-% --vf-directory=texmf/fonts/vf/public/almendra
-% --type1-directory=texmf/fonts/type1/public/almendra
-% --truetype-directory=texmf/fonts/truetype/public/almendra
-% --encoding-directory=texmf/fonts/enc/dvips/almendra
-% --map-file=texmf/fonts/map/dvips/almendra/Almendra.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
-% Almendra-Bold.ttf Almendra-Bold-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_cksmvz.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_cksmvz.enc
deleted file mode 100644
index 39f2ab73e9b..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_cksmvz.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_cksmvzzobhm4g4thik2ivc3v5h
-% Encoding created by otftotfm on Sat May 11 07:17:41 2019
-% Command line follows encoding
-/AutoEnc_cksmvzzobhm4g4thik2ivc3v5h [
-%00
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /.notdef /macron /ring
- /cedilla /.notdef /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /.notdef
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /.notdef /tilde /dieresis
-%80
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/almendra
-% --vf-directory=texmf/fonts/vf/public/almendra
-% --type1-directory=texmf/fonts/type1/public/almendra
-% --truetype-directory=texmf/fonts/truetype/public/almendra
-% --encoding-directory=texmf/fonts/enc/dvips/almendra
-% --map-file=texmf/fonts/map/dvips/almendra/Almendra.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT --unicoding=germandbls =: SSsmall
-% AlmendraSmallCaps.ttf AlmendraSmallCaps-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_ktaaad.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_ktaaad.enc
deleted file mode 100644
index 798ad88cdfa..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_ktaaad.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ktaaadwhpxlra7pnoypdto5vmh
-% Encoding created by otftotfm on Sat May 11 07:17:40 2019
-% Command line follows encoding
-/AutoEnc_ktaaadwhpxlra7pnoypdto5vmh [
-%00
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /cedilla /.notdef /quotesinglbase /exclam /asterisk
-%10
- /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
-%20
- /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
- /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /.notdef
-%30
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%40
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%60
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /bullet /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
- /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
- /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered
- /.notdef /onesuperior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=texmf/fonts/tfm/public/almendra
-% --vf-directory=texmf/fonts/vf/public/almendra
-% --type1-directory=texmf/fonts/type1/public/almendra
-% --truetype-directory=texmf/fonts/truetype/public/almendra
-% --encoding-directory=texmf/fonts/enc/dvips/almendra
-% --map-file=texmf/fonts/map/dvips/almendra/Almendra.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
-% Almendra-BoldItalic.ttf Almendra-BoldItalic-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_ncjtqa.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_ncjtqa.enc
deleted file mode 100644
index ce0bdb82ad7..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_ncjtqa.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ncjtqa6w53xc5iw5jpj6lsnv3a
-% Encoding created by otftotfm on Sat May 11 07:17:41 2019
-% Command line follows encoding
-/AutoEnc_ncjtqa6w53xc5iw5jpj6lsnv3a [
-%00
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
-%10
- /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
-%20
- /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
- /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
-%30
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
-%40
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%60
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
- /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
- /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef
-%90
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
- /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
- /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered
- /.notdef /onesuperior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=texmf/fonts/tfm/public/almendra
-% --vf-directory=texmf/fonts/vf/public/almendra
-% --type1-directory=texmf/fonts/type1/public/almendra
-% --truetype-directory=texmf/fonts/truetype/public/almendra
-% --encoding-directory=texmf/fonts/enc/dvips/almendra
-% --map-file=texmf/fonts/map/dvips/almendra/Almendra.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
-% Almendra-Regular.ttf Almendra-Regular-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_qv6mtu.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_qv6mtu.enc
deleted file mode 100644
index f1854d00eff..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_qv6mtu.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_qv6mtu7vaiq5evjztm7ldmmvpa
-% Encoding created by otftotfm on Sat May 11 07:17:41 2019
-% Command line follows encoding
-/AutoEnc_qv6mtu7vaiq5evjztm7ldmmvpa [
-%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omega /fi /fl /f_h /s_t /c_t
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
- /f_k /f_b /f_j /f_t /T_h /.notdef /.notdef /ellipsis
- /.notdef /.notdef /Lslash /.notdef /apple /.notdef /.notdef /.notdef
-%90
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/almendra
-% --vf-directory=texmf/fonts/vf/public/almendra
-% --type1-directory=texmf/fonts/type1/public/almendra
-% --truetype-directory=texmf/fonts/truetype/public/almendra
-% --encoding-directory=texmf/fonts/enc/dvips/almendra
-% --map-file=texmf/fonts/map/dvips/almendra/Almendra.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% Almendra-Regular.ttf Almendra-Regular-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_w4vl5k.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_w4vl5k.enc
deleted file mode 100644
index 4ad016628cc..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_w4vl5k.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_w4vl5kthdukrcw3f25lsfcynug
-% Encoding created by otftotfm on Sat May 11 07:17:40 2019
-% Command line follows encoding
-/AutoEnc_w4vl5kthdukrcw3f25lsfcynug [
-%00
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /fi /fl /ellipsis /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /.notdef /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /.notdef
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /.notdef /tilde /dieresis
-%80
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/almendra
-% --vf-directory=texmf/fonts/vf/public/almendra
-% --type1-directory=texmf/fonts/type1/public/almendra
-% --truetype-directory=texmf/fonts/truetype/public/almendra
-% --encoding-directory=texmf/fonts/enc/dvips/almendra
-% --map-file=texmf/fonts/map/dvips/almendra/Almendra.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% Almendra-BoldItalic.ttf Almendra-BoldItalic-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_yh7c3k.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_yh7c3k.enc
deleted file mode 100644
index 857c802a4da..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_yh7c3k.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_yh7c3klfhblfebmqf26s6i2cxa
-% Encoding created by otftotfm on Sat May 11 07:17:40 2019
-% Command line follows encoding
-/AutoEnc_yh7c3klfhblfebmqf26s6i2cxa [
-%00
- /grave /acute /circumflex /tilde /dieresis /.notdef /ring /caron
- /.notdef /macron /.notdef /cedilla /.notdef /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /.notdef /dotlessi /dotlessj /fi /fl /ellipsis /.notdef /.notdef
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Lslash /Nacute /.notdef /.notdef /.notdef /Racute
-%90
- /Rcaron /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /IJ /.notdef /.notdef /section
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /nacute /.notdef /.notdef /.notdef /.notdef
-%B0
- /rcaron /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /ydieresis /.notdef /.notdef /.notdef /ij /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/almendra
-% --vf-directory=texmf/fonts/vf/public/almendra
-% --type1-directory=texmf/fonts/type1/public/almendra
-% --truetype-directory=texmf/fonts/truetype/public/almendra
-% --encoding-directory=texmf/fonts/enc/dvips/almendra
-% --map-file=texmf/fonts/map/dvips/almendra/Almendra.map --no-updmap
-% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga Almendra-BoldItalic.ttf
-% Almendra-BoldItalic-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_yuo247.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_yuo247.enc
deleted file mode 100644
index b52de8cd285..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_yuo247.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_yuo247oz2buxu7zv2po5o7nige
-% Encoding created by otftotfm on Sat May 11 07:17:42 2019
-% Command line follows encoding
-/AutoEnc_yuo247oz2buxu7zv2po5o7nige [
-%00
- /.notdef /Euro /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /.notdef /macron /ring
- /cedilla /.notdef /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
- /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /.notdef /.notdef /.notdef
- /circumflex /.notdef /Scaron /guilsinglleft /OE /Zcaron /asciicircum /.notdef
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /.notdef /.notdef /guilsinglright /oe /.notdef /asciitilde /Ydieresis
-%A0
- /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
-%B0
- /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
- /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/almendra
-% --vf-directory=texmf/fonts/vf/public/almendra
-% --type1-directory=texmf/fonts/type1/public/almendra
-% --truetype-directory=texmf/fonts/truetype/public/almendra
-% --encoding-directory=texmf/fonts/enc/dvips/almendra
-% --map-file=texmf/fonts/map/dvips/almendra/Almendra.map --no-updmap
-% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --unicoding=germandbls =: SSsmall AlmendraSmallCaps.ttf
-% AlmendraSmallCaps-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/map/dvips/almendra/almendra.map b/Master/texmf-dist/fonts/map/dvips/almendra/almendra.map
deleted file mode 100644
index 6601f88a347..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/almendra/almendra.map
+++ /dev/null
@@ -1,22 +0,0 @@
-% Automatically maintained by otftotfm or other programs. Do not edit.
-
-Almendra-BoldItalic-osf-ot1--base Almendra-BoldItalic "AutoEnc_w4vl5kthdukrcw3f25lsfcynug ReEncodeFont" <[almnd_w4vl5k.enc <Almendra-BoldItalic.pfb
-Almendra-BoldItalic-osf-t1--base Almendra-BoldItalic "AutoEnc_yh7c3klfhblfebmqf26s6i2cxa ReEncodeFont" <[almnd_yh7c3k.enc <Almendra-BoldItalic.pfb
-Almendra-BoldItalic-osf-ly1--base Almendra-BoldItalic "AutoEnc_4ostoee4nqd6p2zkkqba3bsn4g ReEncodeFont" <[almnd_4ostoe.enc <Almendra-BoldItalic.pfb
-Almendra-BoldItalic-osf-ts1--base Almendra-BoldItalic "AutoEnc_ktaaadwhpxlra7pnoypdto5vmh ReEncodeFont" <[almnd_ktaaad.enc <Almendra-BoldItalic.pfb
-Almendra-Bold-osf-ot1--base Almendra-Bold "AutoEnc_w4vl5kthdukrcw3f25lsfcynug ReEncodeFont" <[almnd_w4vl5k.enc <Almendra-Bold.pfb
-Almendra-Bold-osf-t1--base Almendra-Bold "AutoEnc_yh7c3klfhblfebmqf26s6i2cxa ReEncodeFont" <[almnd_yh7c3k.enc <Almendra-Bold.pfb
-Almendra-Bold-osf-ly1--base Almendra-Bold "AutoEnc_aisq5364u5nccykxiaciq45q3d ReEncodeFont" <[almnd_aisq53.enc <Almendra-Bold.pfb
-Almendra-Bold-osf-ts1--base Almendra-Bold "AutoEnc_aphd5h4nlzefompxpeiv6jmope ReEncodeFont" <[almnd_aphd5h.enc <Almendra-Bold.pfb
-Almendra-Italic-osf-ot1--base Almendra-Italic "AutoEnc_w4vl5kthdukrcw3f25lsfcynug ReEncodeFont" <[almnd_w4vl5k.enc <Almendra-Italic.pfb
-Almendra-Italic-osf-t1--base Almendra-Italic "AutoEnc_yh7c3klfhblfebmqf26s6i2cxa ReEncodeFont" <[almnd_yh7c3k.enc <Almendra-Italic.pfb
-Almendra-Italic-osf-ly1--base Almendra-Italic "AutoEnc_4ostoee4nqd6p2zkkqba3bsn4g ReEncodeFont" <[almnd_4ostoe.enc <Almendra-Italic.pfb
-Almendra-Italic-osf-ts1--base Almendra-Italic "AutoEnc_ktaaadwhpxlra7pnoypdto5vmh ReEncodeFont" <[almnd_ktaaad.enc <Almendra-Italic.pfb
-Almendra-Regular-osf-ot1--base Almendra-Regular "AutoEnc_qv6mtu7vaiq5evjztm7ldmmvpa ReEncodeFont" <[almnd_qv6mtu.enc <Almendra-Regular.pfb
-Almendra-Regular-osf-t1--base Almendra-Regular "AutoEnc_3qmmf27szfq6zngjzlbcn4egfh ReEncodeFont" <[almnd_3qmmf2.enc <Almendra-Regular.pfb
-Almendra-Regular-osf-ly1--base Almendra-Regular "AutoEnc_3ehf7b7hkdwzofdbscgez4iuwe ReEncodeFont" <[almnd_3ehf7b.enc <Almendra-Regular.pfb
-Almendra-Regular-osf-ts1--base Almendra-Regular "AutoEnc_ncjtqa6w53xc5iw5jpj6lsnv3a ReEncodeFont" <[almnd_ncjtqa.enc <Almendra-Regular.pfb
-AlmendraSmallCaps-osf-sc-ot1--base AlmendraSmallCaps "AutoEnc_cksmvzzobhm4g4thik2ivc3v5h ReEncodeFont" <[almnd_cksmvz.enc <AlmendraSmallCaps.pfb
-AlmendraSmallCaps-osf-sc-t1--base AlmendraSmallCaps "AutoEnc_3smkg7w7wjkxf2dzis7khtvdwd ReEncodeFont" <[almnd_3smkg7.enc <AlmendraSmallCaps.pfb
-AlmendraSmallCaps-osf-sc-ly1--base AlmendraSmallCaps "AutoEnc_yuo247oz2buxu7zv2po5o7nige ReEncodeFont" <[almnd_yuo247.enc <AlmendraSmallCaps.pfb
-AlmendraSmallCaps-osf-sc-ts1--base AlmendraSmallCaps "AutoEnc_ktaaadwhpxlra7pnoypdto5vmh ReEncodeFont" <[almnd_ktaaad.enc <AlmendraSmallCaps.pfb
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ly1--base.tfm
deleted file mode 100644
index 77541d2e4d8..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ly1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ly1.tfm
deleted file mode 100644
index 2a97f0d60eb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ly1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ot1--base.tfm
deleted file mode 100644
index e0e590f89a7..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ot1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ot1.tfm
deleted file mode 100644
index 1ce07d5571a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-t1--base.tfm
deleted file mode 100644
index d80e4b6d5f0..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-t1.tfm
deleted file mode 100644
index fdb397ea991..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ts1--base.tfm
deleted file mode 100644
index c1264a31525..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ts1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ts1.tfm
deleted file mode 100644
index bbac5aa3c24..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ly1--base.tfm
deleted file mode 100644
index e7950c9dc00..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ly1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ly1.tfm
deleted file mode 100644
index b57f7f7e7c7..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ly1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ot1--base.tfm
deleted file mode 100644
index 73bbb4951df..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ot1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ot1.tfm
deleted file mode 100644
index 8748653b96b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-t1--base.tfm
deleted file mode 100644
index 11c43635c4f..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-t1.tfm
deleted file mode 100644
index 343f40a68eb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ts1--base.tfm
deleted file mode 100644
index 9f94d2fc804..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ts1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ts1.tfm
deleted file mode 100644
index b1792b3b345..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ly1--base.tfm
deleted file mode 100644
index 314f12ccca2..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ly1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ly1.tfm
deleted file mode 100644
index 7ef61b2a27c..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ly1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ot1--base.tfm
deleted file mode 100644
index ca9cd5ea04f..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ot1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ot1.tfm
deleted file mode 100644
index ce3687016d8..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-t1--base.tfm
deleted file mode 100644
index 6a5194b0c25..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-t1.tfm
deleted file mode 100644
index d86c587e0b9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ts1--base.tfm
deleted file mode 100644
index 719b2352019..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ts1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ts1.tfm
deleted file mode 100644
index adc81b5a129..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ly1--base.tfm
deleted file mode 100644
index 34e784f36b2..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ly1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ly1.tfm
deleted file mode 100644
index 26cd7fe6ecf..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ly1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ot1--base.tfm
deleted file mode 100644
index 0f181c8ccf5..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ot1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ot1.tfm
deleted file mode 100644
index 40e0a045199..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-t1--base.tfm
deleted file mode 100644
index ca1cee96b3c..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-t1.tfm
deleted file mode 100644
index 5646d3470df..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ts1--base.tfm
deleted file mode 100644
index 570dd06ed22..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ts1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ts1.tfm
deleted file mode 100644
index beca7606109..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ly1--base.tfm
deleted file mode 100644
index 0c18db41ae5..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ly1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ly1.tfm
deleted file mode 100644
index a31b3401d9a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ly1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ot1--base.tfm
deleted file mode 100644
index f2e67575b47..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ot1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ot1.tfm
deleted file mode 100644
index a11e8902b57..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-t1--base.tfm
deleted file mode 100644
index ebdec13cef5..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-t1.tfm
deleted file mode 100644
index be526cf9390..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ts1--base.tfm
deleted file mode 100644
index 78ad26f56c2..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ts1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ts1.tfm
deleted file mode 100644
index 3a352b387d4..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/almendra/Almendra-Bold.pfb b/Master/texmf-dist/fonts/type1/public/almendra/Almendra-Bold.pfb
deleted file mode 100644
index 74822befbb7..00000000000
--- a/Master/texmf-dist/fonts/type1/public/almendra/Almendra-Bold.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/almendra/Almendra-BoldItalic.pfb b/Master/texmf-dist/fonts/type1/public/almendra/Almendra-BoldItalic.pfb
deleted file mode 100644
index 9c555b02097..00000000000
--- a/Master/texmf-dist/fonts/type1/public/almendra/Almendra-BoldItalic.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/almendra/Almendra-Italic.pfb b/Master/texmf-dist/fonts/type1/public/almendra/Almendra-Italic.pfb
deleted file mode 100644
index 7570bcef026..00000000000
--- a/Master/texmf-dist/fonts/type1/public/almendra/Almendra-Italic.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/almendra/Almendra-Regular.pfb b/Master/texmf-dist/fonts/type1/public/almendra/Almendra-Regular.pfb
deleted file mode 100644
index e383bd8ba35..00000000000
--- a/Master/texmf-dist/fonts/type1/public/almendra/Almendra-Regular.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/almendra/AlmendraDisplay-Regular.pfb b/Master/texmf-dist/fonts/type1/public/almendra/AlmendraDisplay-Regular.pfb
deleted file mode 100644
index 8232624afc5..00000000000
--- a/Master/texmf-dist/fonts/type1/public/almendra/AlmendraDisplay-Regular.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/almendra/AlmendraSmallCaps.pfb b/Master/texmf-dist/fonts/type1/public/almendra/AlmendraSmallCaps.pfb
deleted file mode 100644
index 2002b61ceb8..00000000000
--- a/Master/texmf-dist/fonts/type1/public/almendra/AlmendraSmallCaps.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ly1.vf
deleted file mode 100644
index 4f86bc147b2..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ly1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ot1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ot1.vf
deleted file mode 100644
index 5af096dc8ac..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ot1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-t1.vf
deleted file mode 100644
index 69d8d526ede..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-t1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ts1.vf
deleted file mode 100644
index 7ecf81b1b48..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ts1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ly1.vf
deleted file mode 100644
index 7fb430081b7..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ly1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ot1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ot1.vf
deleted file mode 100644
index 74d1c33eaf4..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ot1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-t1.vf
deleted file mode 100644
index 32c7c6a1ed4..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-t1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ts1.vf
deleted file mode 100644
index 8750a1946ae..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ts1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ly1.vf
deleted file mode 100644
index a6b64851a53..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ly1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ot1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ot1.vf
deleted file mode 100644
index c9dce0feccd..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ot1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-t1.vf
deleted file mode 100644
index 5ba3b9880a2..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-t1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ts1.vf
deleted file mode 100644
index e84928728dd..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ts1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ly1.vf
deleted file mode 100644
index b4d4fc8eb9d..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ly1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ot1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ot1.vf
deleted file mode 100644
index 89b8e13d6a6..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ot1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-t1.vf
deleted file mode 100644
index 1d57931bdf0..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-t1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ts1.vf
deleted file mode 100644
index 583f1755094..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ts1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ly1.vf
deleted file mode 100644
index dd97800c78d..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ly1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ot1.vf
deleted file mode 100644
index 79f317cdb02..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ot1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-t1.vf
deleted file mode 100644
index a62547640f4..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-t1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ts1.vf b/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ts1.vf
deleted file mode 100644
index 429d22c1d48..00000000000
--- a/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ts1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/almendra/LY1Almendra-OsF.fd b/Master/texmf-dist/tex/latex/almendra/LY1Almendra-OsF.fd
deleted file mode 100644
index 7b9db689fbc..00000000000
--- a/Master/texmf-dist/tex/latex/almendra/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/Master/texmf-dist/tex/latex/almendra/OT1Almendra-OsF.fd b/Master/texmf-dist/tex/latex/almendra/OT1Almendra-OsF.fd
deleted file mode 100644
index dbd905a94f2..00000000000
--- a/Master/texmf-dist/tex/latex/almendra/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/Master/texmf-dist/tex/latex/almendra/T1Almendra-OsF.fd b/Master/texmf-dist/tex/latex/almendra/T1Almendra-OsF.fd
deleted file mode 100644
index 5decb728a09..00000000000
--- a/Master/texmf-dist/tex/latex/almendra/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/Master/texmf-dist/tex/latex/almendra/TS1Almendra-OsF.fd b/Master/texmf-dist/tex/latex/almendra/TS1Almendra-OsF.fd
deleted file mode 100644
index b7b563dbced..00000000000
--- a/Master/texmf-dist/tex/latex/almendra/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/Master/texmf-dist/tex/latex/almendra/almendra.sty b/Master/texmf-dist/tex/latex/almendra/almendra.sty
index 7c3f98a39a2..cd9c564516a 100644
--- a/Master/texmf-dist/tex/latex/almendra/almendra.sty
+++ b/Master/texmf-dist/tex/latex/almendra/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
diff --git a/Master/tlpkg/tlpsrc/almendra.tlpsrc b/Master/tlpkg/tlpsrc/almendra.tlpsrc
index 493569ed3f6..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/almendra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/almendra.tlpsrc
@@ -1 +0,0 @@
-execute addMap ${PKGNAME}.map