summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/fonts/almendra/README15
-rw-r--r--Master/texmf-dist/doc/fonts/almendra/almendra-samples.pdfbin26459 -> 27204 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/almendra/almendra-samples.tex1
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almndr_2bmcpz.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almndr_aphd5h.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almndr_d2g35l.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almndr_fqyk3x.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almndr_gd2dkq.enc62
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almndr_jcmsbq.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almndr_ktaaad.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almndr_ncjtqa.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almndr_piphgo.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almndr_x2ojwl.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almndr_xs7q5m.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almndr_yxs7h5.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/almendra/almndr_zt62bd.enc64
-rw-r--r--Master/texmf-dist/fonts/map/dvips/almendra/almendra.map21
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ly1--base.tfmbin0 -> 1852 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ly1.tfmbin0 -> 2036 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ot1--base.tfmbin0 -> 1348 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ot1.tfmbin0 -> 1500 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-t1--base.tfmbin0 -> 1804 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-t1.tfmbin0 -> 1984 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ts1--base.tfmbin0 -> 1324 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ts1.tfmbin0 -> 1332 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ly1--base.tfmbin0 -> 1868 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ly1.tfmbin0 -> 2212 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ot1--base.tfmbin0 -> 1316 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ot1.tfmbin0 -> 1632 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-t1--base.tfmbin0 -> 1836 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-t1.tfmbin0 -> 2176 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ts1--base.tfmbin0 -> 1336 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ts1.tfmbin0 -> 1348 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ly1--base.tfmbin0 -> 1784 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ly1.tfmbin0 -> 1964 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ot1--base.tfmbin0 -> 1264 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ot1.tfmbin0 -> 1416 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-t1--base.tfmbin0 -> 1744 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-t1.tfmbin0 -> 1920 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ts1--base.tfmbin0 -> 1336 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ts1.tfmbin0 -> 1340 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ly1--base.tfmbin0 -> 1868 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ly1.tfmbin0 -> 2092 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ot1--base.tfmbin0 -> 1384 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ot1.tfmbin0 -> 1628 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-t1--base.tfmbin0 -> 1804 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-t1.tfmbin0 -> 2044 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ts1--base.tfmbin0 -> 1360 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ts1.tfmbin0 -> 1372 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-ly1--base.tfmbin0 -> 1780 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-ly1.tfmbin0 -> 1828 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-ot1.tfmbin0 -> 1288 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-t1--base.tfmbin0 -> 1744 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-t1.tfmbin0 -> 1796 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/almendra/AlmendraSC-Regular.ttfbin0 -> 33584 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/almendra/AlmendraSmallCaps.ttfbin34576 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/Almndr-Bold.pfbbin0 -> 46827 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/Almndr-BoldItalic.pfbbin0 -> 44220 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/Almndr-Italic.pfbbin0 -> 43445 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/Almndr-Regular.pfbbin0 -> 62607 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/AlmndrSC-Regular.pfbbin0 -> 46342 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-ly1.vfbin0 -> 1576 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-ot1.vfbin0 -> 748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-t1.vfbin0 -> 1340 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-ts1.vfbin0 -> 440 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-ly1.vfbin0 -> 1576 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-ot1.vfbin0 -> 756 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-t1.vfbin0 -> 1348 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-ts1.vfbin0 -> 440 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-ly1.vfbin0 -> 1572 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-ot1.vfbin0 -> 752 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-t1.vfbin0 -> 1344 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-ts1.vfbin0 -> 436 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-ly1.vfbin0 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-ot1.vfbin0 -> 888 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-t1.vfbin0 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-ts1.vfbin0 -> 500 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/AlmndrSC-Regular-osf-sc-ly1.vfbin0 -> 1568 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/AlmndrSC-Regular-osf-sc-t1.vfbin0 -> 1344 bytes
-rw-r--r--Master/texmf-dist/tex/latex/almendra/LY1Almndr-OsF.fd99
-rw-r--r--Master/texmf-dist/tex/latex/almendra/OT1Almndr-OsF.fd99
-rw-r--r--Master/texmf-dist/tex/latex/almendra/T1Almndr-OsF.fd99
-rw-r--r--Master/texmf-dist/tex/latex/almendra/TS1Almndr-OsF.fd91
-rw-r--r--Master/texmf-dist/tex/latex/almendra/almendra.sty52
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
-rw-r--r--Master/tlpkg/tlpsrc/almendra.tlpsrc1
86 files changed, 1288 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/fonts/almendra/README b/Master/texmf-dist/doc/fonts/almendra/README
index 5df6941fcd7..f01febfadfe 100644
--- a/Master/texmf-dist/doc/fonts/almendra/README
+++ b/Master/texmf-dist/doc/fonts/almendra/README
@@ -1,5 +1,5 @@
This is the README for the almendra package, version
-2020-07-23.
+2020-08-02.
This package provides the Almendra family of fonts, designed
by Ana Sanfelippo. Almendra is a typeface design based on
@@ -13,7 +13,8 @@ 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).
+file-name database (e.g., texhash). Update the font-map
+files by enabling the Map file almendra.map.
To use, add
@@ -32,7 +33,9 @@ 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 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)
+1.1; the text may be found in the doc directory. The type1
+fonts were generated by fontforge and re-named in compliance
+with the Reserved Font Name provision of the OFL license.
+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 cc6cf761ef9..b6eb32e2f22 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 7220bd5d714..10bcb01122b 100644
--- a/Master/texmf-dist/doc/fonts/almendra/almendra-samples.tex
+++ b/Master/texmf-dist/doc/fonts/almendra/almendra-samples.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage{almendra}
\usepackage{lipsum}
\begin{document}
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_2bmcpz.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_2bmcpz.enc
new file mode 100644
index 00000000000..e57d99fee50
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_2bmcpz.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2bmcpznel5kfv7zqlii53zg3md
+% Encoding created by otftotfm on Sun Aug 2 19:06:08 2020
+% Command line follows encoding
+/AutoEnc_2bmcpznel5kfv7zqlii53zg3md [
+%00
+ /grave /acute /circumflex /tilde /dieresis /ellipsis /ring /caron
+ /.notdef /macron /.notdef /cedilla /.notdef /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /fi /fl /.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
+% --truetype-directory=texmf/fonts/truetype/public/almendra
+% --encoding-directory=texmf/fonts/enc/dvips/almendra
+% --map-file=texmf/fonts/map/dvips/almendra/Almndr.map --no-updmap --force
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Almndr-BoldItalic.ttf
+% Almndr-BoldItalic-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_aphd5h.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_aphd5h.enc
new file mode 100644
index 00000000000..4eacbbbe365
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_aphd5h.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_aphd5h4nlzefompxpeiv6jmope
+% Encoding created by otftotfm on Sun Aug 2 19:06:09 2020
+% 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
+% --truetype-directory=texmf/fonts/truetype/public/almendra
+% --encoding-directory=texmf/fonts/enc/dvips/almendra
+% --map-file=texmf/fonts/map/dvips/almendra/Almndr.map --no-updmap --force
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 Almndr-Bold.ttf
+% Almndr-Bold-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_d2g35l.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_d2g35l.enc
new file mode 100644
index 00000000000..5c857a28962
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_d2g35l.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_d2g35lu3yzcryozsmox2tr7psg
+% Encoding created by otftotfm on Sun Aug 2 19:06:09 2020
+% Command line follows encoding
+/AutoEnc_d2g35lu3yzcryozsmox2tr7psg [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /fl /fi
+%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
+% --truetype-directory=texmf/fonts/truetype/public/almendra
+% --encoding-directory=texmf/fonts/enc/dvips/almendra
+% --map-file=texmf/fonts/map/dvips/almendra/Almndr.map --no-updmap --force
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Almndr-Bold.ttf
+% Almndr-Bold-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_fqyk3x.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_fqyk3x.enc
new file mode 100644
index 00000000000..0e3a16a8297
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_fqyk3x.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_fqyk3x37qppdfdlcn32kxcxdhg
+% Encoding created by otftotfm on Sun Aug 2 19:06:10 2020
+% Command line follows encoding
+/AutoEnc_fqyk3x37qppdfdlcn32kxcxdhg [
+%00
+ /s_t /Euro /c_t /f_k /fraction /dotaccent /hungarumlaut /ogonek
+ /f_b /f_j /.notdef /f_t /T_h /f_h /fl /fi
+%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
+% --truetype-directory=texmf/fonts/truetype/public/almendra
+% --encoding-directory=texmf/fonts/enc/dvips/almendra
+% --map-file=texmf/fonts/map/dvips/almendra/Almndr.map --no-updmap --force
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Almndr-Regular.ttf
+% Almndr-Regular-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_gd2dkq.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_gd2dkq.enc
new file mode 100644
index 00000000000..462663a9a8d
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_gd2dkq.enc
@@ -0,0 +1,62 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gd2dkq3vv4gp5dssvw3h2uicbb
+% Encoding created by otftotfm on Sun Aug 2 19:06:10 2020
+% Command line follows encoding
+/AutoEnc_gd2dkq3vv4gp5dssvw3h2uicbb [
+%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 /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
+% --truetype-directory=texmf/fonts/truetype/public/almendra
+% --encoding-directory=texmf/fonts/enc/dvips/almendra
+% --map-file=texmf/fonts/map/dvips/almendra/Almndr.map --no-updmap --force
+% --coding-scheme=TEX TEXT AlmndrSC-Regular.ttf AlmndrSC-Regular-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_jcmsbq.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_jcmsbq.enc
new file mode 100644
index 00000000000..7009dec7caa
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_jcmsbq.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_jcmsbq2nh3xgcqbbfgrfymy25d
+% Encoding created by otftotfm on Sun Aug 2 19:06:10 2020
+% Command line follows encoding
+/AutoEnc_jcmsbq2nh3xgcqbbfgrfymy25d [
+%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 /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 /.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 /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
+% --truetype-directory=texmf/fonts/truetype/public/almendra
+% --encoding-directory=texmf/fonts/enc/dvips/almendra
+% --map-file=texmf/fonts/map/dvips/almendra/Almndr.map --no-updmap --force
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI AlmndrSC-Regular.ttf
+% AlmndrSC-Regular-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_ktaaad.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_ktaaad.enc
new file mode 100644
index 00000000000..003e6e2832a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_ktaaad.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ktaaadwhpxlra7pnoypdto5vmh
+% Encoding created by otftotfm on Sun Aug 2 19:06:08 2020
+% 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
+% --truetype-directory=texmf/fonts/truetype/public/almendra
+% --encoding-directory=texmf/fonts/enc/dvips/almendra
+% --map-file=texmf/fonts/map/dvips/almendra/Almndr.map --no-updmap --force
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 Almndr-BoldItalic.ttf
+% Almndr-BoldItalic-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_ncjtqa.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_ncjtqa.enc
new file mode 100644
index 00000000000..b65bf3f0372
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_ncjtqa.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ncjtqa6w53xc5iw5jpj6lsnv3a
+% Encoding created by otftotfm on Sun Aug 2 19:06:10 2020
+% 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
+% --truetype-directory=texmf/fonts/truetype/public/almendra
+% --encoding-directory=texmf/fonts/enc/dvips/almendra
+% --map-file=texmf/fonts/map/dvips/almendra/Almndr.map --no-updmap --force
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 Almndr-Regular.ttf
+% Almndr-Regular-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_piphgo.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_piphgo.enc
new file mode 100644
index 00000000000..350d36c2abf
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_piphgo.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_piphgonbkb2q6bxnrrteuvgn2d
+% Encoding created by otftotfm on Sun Aug 2 19:06:08 2020
+% Command line follows encoding
+/AutoEnc_piphgonbkb2q6bxnrrteuvgn2d [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /fi /fl /.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
+ /ellipsis /.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
+% --truetype-directory=texmf/fonts/truetype/public/almendra
+% --encoding-directory=texmf/fonts/enc/dvips/almendra
+% --map-file=texmf/fonts/map/dvips/almendra/Almndr.map --no-updmap --force
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Almndr-BoldItalic.ttf Almndr-BoldItalic-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_x2ojwl.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_x2ojwl.enc
new file mode 100644
index 00000000000..e7d645a2695
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_x2ojwl.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_x2ojwlbe6ochhsypbdju3fpjsf
+% Encoding created by otftotfm on Sun Aug 2 19:06:10 2020
+% Command line follows encoding
+/AutoEnc_x2ojwlbe6ochhsypbdju3fpjsf [
+%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 /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/almendra
+% --vf-directory=texmf/fonts/vf/public/almendra
+% --truetype-directory=texmf/fonts/truetype/public/almendra
+% --encoding-directory=texmf/fonts/enc/dvips/almendra
+% --map-file=texmf/fonts/map/dvips/almendra/Almndr.map --no-updmap --force
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN AlmndrSC-Regular.ttf
+% AlmndrSC-Regular-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_xs7q5m.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_xs7q5m.enc
new file mode 100644
index 00000000000..deffbd4e789
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_xs7q5m.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_xs7q5mr3tk6txnpep4kthmy63e
+% Encoding created by otftotfm on Sun Aug 2 19:06:08 2020
+% Command line follows encoding
+/AutoEnc_xs7q5mr3tk6txnpep4kthmy63e [
+%00
+ /.notdef /Euro /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /fl /fi
+%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
+% --truetype-directory=texmf/fonts/truetype/public/almendra
+% --encoding-directory=texmf/fonts/enc/dvips/almendra
+% --map-file=texmf/fonts/map/dvips/almendra/Almndr.map --no-updmap --force
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Almndr-BoldItalic.ttf
+% Almndr-BoldItalic-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_yxs7h5.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_yxs7h5.enc
new file mode 100644
index 00000000000..51d0b4c15ac
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_yxs7h5.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_yxs7h5zicuqj32l6e2sujov7pe
+% Encoding created by otftotfm on Sun Aug 2 19:06:10 2020
+% Command line follows encoding
+/AutoEnc_yxs7h5zicuqj32l6e2sujov7pe [
+%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_h /dotlessi /dotlessj /s_t /fi /fl /c_t /f_k
+%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
+% --truetype-directory=texmf/fonts/truetype/public/almendra
+% --encoding-directory=texmf/fonts/enc/dvips/almendra
+% --map-file=texmf/fonts/map/dvips/almendra/Almndr.map --no-updmap --force
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Almndr-Regular.ttf
+% Almndr-Regular-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_zt62bd.enc b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_zt62bd.enc
new file mode 100644
index 00000000000..f3b8eca8431
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almndr_zt62bd.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_zt62bdgoppooskampf43xt3cwc
+% Encoding created by otftotfm on Sun Aug 2 19:06:10 2020
+% Command line follows encoding
+/AutoEnc_zt62bdgoppooskampf43xt3cwc [
+%00
+ /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Omega /.notdef /fi /fl /.notdef /.notdef
+%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_h /s_t /c_t /f_k /f_b /f_j /f_t /T_h
+ /.notdef /.notdef /Lslash /ellipsis /.notdef /.notdef /.notdef /apple
+%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
+% --truetype-directory=texmf/fonts/truetype/public/almendra
+% --encoding-directory=texmf/fonts/enc/dvips/almendra
+% --map-file=texmf/fonts/map/dvips/almendra/Almndr.map --no-updmap --force
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Almndr-Regular.ttf Almndr-Regular-osf-ot1'
diff --git a/Master/texmf-dist/fonts/map/dvips/almendra/almendra.map b/Master/texmf-dist/fonts/map/dvips/almendra/almendra.map
new file mode 100644
index 00000000000..3a6cdb7118f
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/almendra/almendra.map
@@ -0,0 +1,21 @@
+% Automatically maintained by otftotfm or other programs. Do not edit.
+
+Almndr-BoldItalic-osf-ot1--base Almndr-BoldItalic "AutoEnc_piphgonbkb2q6bxnrrteuvgn2d ReEncodeFont" <[almndr_piphgo.enc <Almndr-BoldItalic.pfb
+Almndr-BoldItalic-osf-t1--base Almndr-BoldItalic "AutoEnc_2bmcpznel5kfv7zqlii53zg3md ReEncodeFont" <[almndr_2bmcpz.enc <Almndr-BoldItalic.pfb
+Almndr-BoldItalic-osf-ly1--base Almndr-BoldItalic "AutoEnc_xs7q5mr3tk6txnpep4kthmy63e ReEncodeFont" <[almndr_xs7q5m.enc <Almndr-BoldItalic.pfb
+Almndr-BoldItalic-osf-ts1--base Almndr-BoldItalic "AutoEnc_ktaaadwhpxlra7pnoypdto5vmh ReEncodeFont" <[almndr_ktaaad.enc <Almndr-BoldItalic.pfb
+Almndr-Bold-osf-ot1--base Almndr-Bold "AutoEnc_piphgonbkb2q6bxnrrteuvgn2d ReEncodeFont" <[almndr_piphgo.enc <Almndr-Bold.pfb
+Almndr-Bold-osf-t1--base Almndr-Bold "AutoEnc_2bmcpznel5kfv7zqlii53zg3md ReEncodeFont" <[almndr_2bmcpz.enc <Almndr-Bold.pfb
+Almndr-Bold-osf-ly1--base Almndr-Bold "AutoEnc_d2g35lu3yzcryozsmox2tr7psg ReEncodeFont" <[almndr_d2g35l.enc <Almndr-Bold.pfb
+Almndr-Bold-osf-ts1--base Almndr-Bold "AutoEnc_aphd5h4nlzefompxpeiv6jmope ReEncodeFont" <[almndr_aphd5h.enc <Almndr-Bold.pfb
+Almndr-Italic-osf-ot1--base Almndr-Italic "AutoEnc_piphgonbkb2q6bxnrrteuvgn2d ReEncodeFont" <[almndr_piphgo.enc <Almndr-Italic.pfb
+Almndr-Italic-osf-t1--base Almndr-Italic "AutoEnc_2bmcpznel5kfv7zqlii53zg3md ReEncodeFont" <[almndr_2bmcpz.enc <Almndr-Italic.pfb
+Almndr-Italic-osf-ly1--base Almndr-Italic "AutoEnc_xs7q5mr3tk6txnpep4kthmy63e ReEncodeFont" <[almndr_xs7q5m.enc <Almndr-Italic.pfb
+Almndr-Italic-osf-ts1--base Almndr-Italic "AutoEnc_ktaaadwhpxlra7pnoypdto5vmh ReEncodeFont" <[almndr_ktaaad.enc <Almndr-Italic.pfb
+Almndr-Regular-osf-ot1--base Almndr-Regular "AutoEnc_zt62bdgoppooskampf43xt3cwc ReEncodeFont" <[almndr_zt62bd.enc <Almndr-Regular.pfb
+Almndr-Regular-osf-t1--base Almndr-Regular "AutoEnc_yxs7h5zicuqj32l6e2sujov7pe ReEncodeFont" <[almndr_yxs7h5.enc <Almndr-Regular.pfb
+Almndr-Regular-osf-ly1--base Almndr-Regular "AutoEnc_fqyk3x37qppdfdlcn32kxcxdhg ReEncodeFont" <[almndr_fqyk3x.enc <Almndr-Regular.pfb
+Almndr-Regular-osf-ts1--base Almndr-Regular "AutoEnc_ncjtqa6w53xc5iw5jpj6lsnv3a ReEncodeFont" <[almndr_ncjtqa.enc <Almndr-Regular.pfb
+AlmndrSC-Regular-osf-sc-ot1 AlmndrSC-Regular "AutoEnc_gd2dkq3vv4gp5dssvw3h2uicbb ReEncodeFont" <[almndr_gd2dkq.enc <AlmndrSC-Regular.pfb
+AlmndrSC-Regular-osf-sc-t1--base AlmndrSC-Regular "AutoEnc_x2ojwlbe6ochhsypbdju3fpjsf ReEncodeFont" <[almndr_x2ojwl.enc <AlmndrSC-Regular.pfb
+AlmndrSC-Regular-osf-sc-ly1--base AlmndrSC-Regular "AutoEnc_jcmsbq2nh3xgcqbbfgrfymy25d ReEncodeFont" <[almndr_jcmsbq.enc <AlmndrSC-Regular.pfb
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ly1--base.tfm
new file mode 100644
index 00000000000..388a3da5441
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ly1.tfm
new file mode 100644
index 00000000000..556068f1279
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ot1--base.tfm
new file mode 100644
index 00000000000..2a6d7119f24
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ot1.tfm
new file mode 100644
index 00000000000..706602c06fa
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-t1--base.tfm
new file mode 100644
index 00000000000..8b807cd0ce1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-t1.tfm
new file mode 100644
index 00000000000..024efc4e8fb
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ts1--base.tfm
new file mode 100644
index 00000000000..0fe20a7f0ef
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ts1.tfm
new file mode 100644
index 00000000000..f1e080f8d12
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Bold-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ly1--base.tfm
new file mode 100644
index 00000000000..c979747e299
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ly1.tfm
new file mode 100644
index 00000000000..51fa3f53d1e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ot1--base.tfm
new file mode 100644
index 00000000000..22eabd4de5a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ot1.tfm
new file mode 100644
index 00000000000..a3b96585599
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-t1--base.tfm
new file mode 100644
index 00000000000..4e980b97ba9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-t1.tfm
new file mode 100644
index 00000000000..6e7fc700e27
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ts1--base.tfm
new file mode 100644
index 00000000000..87796911604
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ts1.tfm
new file mode 100644
index 00000000000..a8cdbcdd898
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-BoldItalic-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ly1--base.tfm
new file mode 100644
index 00000000000..3d162ed6d1c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ly1.tfm
new file mode 100644
index 00000000000..4be552b1c76
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ot1--base.tfm
new file mode 100644
index 00000000000..d6db1027a0a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ot1.tfm
new file mode 100644
index 00000000000..f28f39448f1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-t1--base.tfm
new file mode 100644
index 00000000000..e56149a9d0c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-t1.tfm
new file mode 100644
index 00000000000..d8229cb8d50
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ts1--base.tfm
new file mode 100644
index 00000000000..608d90ed2de
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ts1.tfm
new file mode 100644
index 00000000000..a0698ceadd9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Italic-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ly1--base.tfm
new file mode 100644
index 00000000000..2c215ef9f27
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ly1.tfm
new file mode 100644
index 00000000000..f1c0d18c9bd
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ot1--base.tfm
new file mode 100644
index 00000000000..bd6a495d01f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ot1.tfm
new file mode 100644
index 00000000000..e28f88134d0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-t1--base.tfm
new file mode 100644
index 00000000000..752d2f53bb6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-t1.tfm
new file mode 100644
index 00000000000..ac7ead52a34
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ts1--base.tfm
new file mode 100644
index 00000000000..307f863c425
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ts1.tfm
new file mode 100644
index 00000000000..05f3423dede
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almndr-Regular-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-ly1--base.tfm
new file mode 100644
index 00000000000..a51cf2dfdf6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-ly1.tfm
new file mode 100644
index 00000000000..6ed91f008f6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-ot1.tfm
new file mode 100644
index 00000000000..bbb800c5bc8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-t1--base.tfm
new file mode 100644
index 00000000000..b10040c34b4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-t1.tfm
new file mode 100644
index 00000000000..f44a228992d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/AlmndrSC-Regular-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/almendra/AlmendraSC-Regular.ttf b/Master/texmf-dist/fonts/truetype/public/almendra/AlmendraSC-Regular.ttf
new file mode 100644
index 00000000000..4cd98fce73c
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/public/almendra/AlmendraSC-Regular.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/almendra/AlmendraSmallCaps.ttf b/Master/texmf-dist/fonts/truetype/public/almendra/AlmendraSmallCaps.ttf
deleted file mode 100644
index c2278641db4..00000000000
--- a/Master/texmf-dist/fonts/truetype/public/almendra/AlmendraSmallCaps.ttf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/almendra/Almndr-Bold.pfb b/Master/texmf-dist/fonts/type1/public/almendra/Almndr-Bold.pfb
new file mode 100644
index 00000000000..3294137ca4a
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/almendra/Almndr-Bold.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/almendra/Almndr-BoldItalic.pfb b/Master/texmf-dist/fonts/type1/public/almendra/Almndr-BoldItalic.pfb
new file mode 100644
index 00000000000..0270b32e715
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/almendra/Almndr-BoldItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/almendra/Almndr-Italic.pfb b/Master/texmf-dist/fonts/type1/public/almendra/Almndr-Italic.pfb
new file mode 100644
index 00000000000..39086db72fc
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/almendra/Almndr-Italic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/almendra/Almndr-Regular.pfb b/Master/texmf-dist/fonts/type1/public/almendra/Almndr-Regular.pfb
new file mode 100644
index 00000000000..1689bb296dd
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/almendra/Almndr-Regular.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/almendra/AlmndrSC-Regular.pfb b/Master/texmf-dist/fonts/type1/public/almendra/AlmndrSC-Regular.pfb
new file mode 100644
index 00000000000..90a625b70f9
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/almendra/AlmndrSC-Regular.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-ly1.vf
new file mode 100644
index 00000000000..132377fc96f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-ot1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-ot1.vf
new file mode 100644
index 00000000000..31bf7cf2968
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-t1.vf
new file mode 100644
index 00000000000..1c6d5190514
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-ts1.vf
new file mode 100644
index 00000000000..177a87c031f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Bold-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-ly1.vf
new file mode 100644
index 00000000000..88dc54a6d27
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-ot1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-ot1.vf
new file mode 100644
index 00000000000..6365014ac3d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-t1.vf
new file mode 100644
index 00000000000..e5292d3a685
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-ts1.vf
new file mode 100644
index 00000000000..795ad7e4149
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-BoldItalic-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-ly1.vf
new file mode 100644
index 00000000000..900ddff4c2e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-ot1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-ot1.vf
new file mode 100644
index 00000000000..833edef5e94
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-t1.vf
new file mode 100644
index 00000000000..f1a6d83b6c8
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-ts1.vf
new file mode 100644
index 00000000000..4d6fa2ccb7c
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Italic-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-ly1.vf
new file mode 100644
index 00000000000..dc3a672fa8f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-ot1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-ot1.vf
new file mode 100644
index 00000000000..d6fb80d7613
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-t1.vf
new file mode 100644
index 00000000000..6c35d65ac5b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-ts1.vf
new file mode 100644
index 00000000000..40c7c65d5df
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almndr-Regular-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/AlmndrSC-Regular-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/almendra/AlmndrSC-Regular-osf-sc-ly1.vf
new file mode 100644
index 00000000000..ca04a39629d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/AlmndrSC-Regular-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/almendra/AlmndrSC-Regular-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/almendra/AlmndrSC-Regular-osf-sc-t1.vf
new file mode 100644
index 00000000000..b33f0486fdb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/AlmndrSC-Regular-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/almendra/LY1Almndr-OsF.fd b/Master/texmf-dist/tex/latex/almendra/LY1Almndr-OsF.fd
new file mode 100644
index 00000000000..f77df5738ab
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/almendra/LY1Almndr-OsF.fd
@@ -0,0 +1,99 @@
+%% Generated by autoinst on 2020/08/02
+%%
+\ProvidesFile{LY1Almndr-OsF.fd}
+ [2020/08/02 (autoinst) Font definitions for LY1/Almndr-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Almndr@scale\endcsname\relax
+ \let\Almndr@@scale\@empty
+\else
+ \edef\Almndr@@scale{s*[\csname Almndr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Almndr-OsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Almndr-OsF}{m}{sc}{
+ <-> \Almndr@@scale AlmndrSC-Regular-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Almndr-OsF}{regular}{sc}{
+ <-> alias * Almndr-OsF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{Almndr-OsF}{m}{n}{
+ <-> \Almndr@@scale Almndr-Regular-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Almndr-OsF}{regular}{n}{
+ <-> alias * Almndr-OsF/m/n
+}{}
+
+\DeclareFontShape{LY1}{Almndr-OsF}{m}{it}{
+ <-> \Almndr@@scale Almndr-Italic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Almndr-OsF}{regular}{it}{
+ <-> alias * Almndr-OsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Almndr-OsF}{m}{sl}{
+ <-> ssub * Almndr-OsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Almndr-OsF}{regular}{sl}{
+ <-> ssub * Almndr-OsF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Almndr-OsF}{b}{n}{
+ <-> \Almndr@@scale Almndr-Bold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Almndr-OsF}{bold}{n}{
+ <-> alias * Almndr-OsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Almndr-OsF}{b}{it}{
+ <-> \Almndr@@scale Almndr-BoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Almndr-OsF}{bold}{it}{
+ <-> alias * Almndr-OsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Almndr-OsF}{b}{sl}{
+ <-> ssub * Almndr-OsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Almndr-OsF}{bold}{sl}{
+ <-> ssub * Almndr-OsF/bold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{Almndr-OsF}{bx}{n}{
+ <-> ssub * Almndr-OsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Almndr-OsF}{bx}{sl}{
+ <-> ssub * Almndr-OsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{Almndr-OsF}{bx}{it}{
+ <-> ssub * Almndr-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/almendra/OT1Almndr-OsF.fd b/Master/texmf-dist/tex/latex/almendra/OT1Almndr-OsF.fd
new file mode 100644
index 00000000000..15b70682a2b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/almendra/OT1Almndr-OsF.fd
@@ -0,0 +1,99 @@
+%% Generated by autoinst on 2020/08/02
+%%
+\ProvidesFile{OT1Almndr-OsF.fd}
+ [2020/08/02 (autoinst) Font definitions for OT1/Almndr-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Almndr@scale\endcsname\relax
+ \let\Almndr@@scale\@empty
+\else
+ \edef\Almndr@@scale{s*[\csname Almndr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Almndr-OsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Almndr-OsF}{m}{sc}{
+ <-> \Almndr@@scale AlmndrSC-Regular-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Almndr-OsF}{regular}{sc}{
+ <-> alias * Almndr-OsF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{Almndr-OsF}{m}{n}{
+ <-> \Almndr@@scale Almndr-Regular-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Almndr-OsF}{regular}{n}{
+ <-> alias * Almndr-OsF/m/n
+}{}
+
+\DeclareFontShape{OT1}{Almndr-OsF}{m}{it}{
+ <-> \Almndr@@scale Almndr-Italic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Almndr-OsF}{regular}{it}{
+ <-> alias * Almndr-OsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Almndr-OsF}{m}{sl}{
+ <-> ssub * Almndr-OsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Almndr-OsF}{regular}{sl}{
+ <-> ssub * Almndr-OsF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Almndr-OsF}{b}{n}{
+ <-> \Almndr@@scale Almndr-Bold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Almndr-OsF}{bold}{n}{
+ <-> alias * Almndr-OsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Almndr-OsF}{b}{it}{
+ <-> \Almndr@@scale Almndr-BoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Almndr-OsF}{bold}{it}{
+ <-> alias * Almndr-OsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Almndr-OsF}{b}{sl}{
+ <-> ssub * Almndr-OsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Almndr-OsF}{bold}{sl}{
+ <-> ssub * Almndr-OsF/bold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{Almndr-OsF}{bx}{n}{
+ <-> ssub * Almndr-OsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Almndr-OsF}{bx}{sl}{
+ <-> ssub * Almndr-OsF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{Almndr-OsF}{bx}{it}{
+ <-> ssub * Almndr-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/almendra/T1Almndr-OsF.fd b/Master/texmf-dist/tex/latex/almendra/T1Almndr-OsF.fd
new file mode 100644
index 00000000000..8d0cef55e75
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/almendra/T1Almndr-OsF.fd
@@ -0,0 +1,99 @@
+%% Generated by autoinst on 2020/08/02
+%%
+\ProvidesFile{T1Almndr-OsF.fd}
+ [2020/08/02 (autoinst) Font definitions for T1/Almndr-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Almndr@scale\endcsname\relax
+ \let\Almndr@@scale\@empty
+\else
+ \edef\Almndr@@scale{s*[\csname Almndr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Almndr-OsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Almndr-OsF}{m}{sc}{
+ <-> \Almndr@@scale AlmndrSC-Regular-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Almndr-OsF}{regular}{sc}{
+ <-> alias * Almndr-OsF/m/sc
+}{}
+
+\DeclareFontShape{T1}{Almndr-OsF}{m}{n}{
+ <-> \Almndr@@scale Almndr-Regular-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Almndr-OsF}{regular}{n}{
+ <-> alias * Almndr-OsF/m/n
+}{}
+
+\DeclareFontShape{T1}{Almndr-OsF}{m}{it}{
+ <-> \Almndr@@scale Almndr-Italic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Almndr-OsF}{regular}{it}{
+ <-> alias * Almndr-OsF/m/it
+}{}
+
+\DeclareFontShape{T1}{Almndr-OsF}{m}{sl}{
+ <-> ssub * Almndr-OsF/m/it
+}{}
+
+\DeclareFontShape{T1}{Almndr-OsF}{regular}{sl}{
+ <-> ssub * Almndr-OsF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Almndr-OsF}{b}{n}{
+ <-> \Almndr@@scale Almndr-Bold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Almndr-OsF}{bold}{n}{
+ <-> alias * Almndr-OsF/b/n
+}{}
+
+\DeclareFontShape{T1}{Almndr-OsF}{b}{it}{
+ <-> \Almndr@@scale Almndr-BoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Almndr-OsF}{bold}{it}{
+ <-> alias * Almndr-OsF/b/it
+}{}
+
+\DeclareFontShape{T1}{Almndr-OsF}{b}{sl}{
+ <-> ssub * Almndr-OsF/b/it
+}{}
+
+\DeclareFontShape{T1}{Almndr-OsF}{bold}{sl}{
+ <-> ssub * Almndr-OsF/bold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{Almndr-OsF}{bx}{n}{
+ <-> ssub * Almndr-OsF/b/n
+}{}
+
+\DeclareFontShape{T1}{Almndr-OsF}{bx}{sl}{
+ <-> ssub * Almndr-OsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{Almndr-OsF}{bx}{it}{
+ <-> ssub * Almndr-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/almendra/TS1Almndr-OsF.fd b/Master/texmf-dist/tex/latex/almendra/TS1Almndr-OsF.fd
new file mode 100644
index 00000000000..674cebd2f65
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/almendra/TS1Almndr-OsF.fd
@@ -0,0 +1,91 @@
+%% Generated by autoinst on 2020/08/02
+%%
+\ProvidesFile{TS1Almndr-OsF.fd}
+ [2020/08/02 (autoinst) Font definitions for TS1/Almndr-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Almndr@scale\endcsname\relax
+ \let\Almndr@@scale\@empty
+\else
+ \edef\Almndr@@scale{s*[\csname Almndr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Almndr-OsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{Almndr-OsF}{m}{n}{
+ <-> \Almndr@@scale Almndr-Regular-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Almndr-OsF}{regular}{n}{
+ <-> alias * Almndr-OsF/m/n
+}{}
+
+\DeclareFontShape{TS1}{Almndr-OsF}{m}{it}{
+ <-> \Almndr@@scale Almndr-Italic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Almndr-OsF}{regular}{it}{
+ <-> alias * Almndr-OsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Almndr-OsF}{m}{sl}{
+ <-> ssub * Almndr-OsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Almndr-OsF}{regular}{sl}{
+ <-> ssub * Almndr-OsF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{Almndr-OsF}{b}{n}{
+ <-> \Almndr@@scale Almndr-Bold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Almndr-OsF}{bold}{n}{
+ <-> alias * Almndr-OsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Almndr-OsF}{b}{it}{
+ <-> \Almndr@@scale Almndr-BoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Almndr-OsF}{bold}{it}{
+ <-> alias * Almndr-OsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Almndr-OsF}{b}{sl}{
+ <-> ssub * Almndr-OsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Almndr-OsF}{bold}{sl}{
+ <-> ssub * Almndr-OsF/bold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{Almndr-OsF}{bx}{n}{
+ <-> ssub * Almndr-OsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Almndr-OsF}{bx}{sl}{
+ <-> ssub * Almndr-OsF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{Almndr-OsF}{bx}{it}{
+ <-> ssub * Almndr-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/almendra/almendra.sty b/Master/texmf-dist/tex/latex/almendra/almendra.sty
index cd9c564516a..c400a76276f 100644
--- a/Master/texmf-dist/tex/latex/almendra/almendra.sty
+++ b/Master/texmf-dist/tex/latex/almendra/almendra.sty
@@ -1,35 +1,45 @@
\ProvidesPackage{almendra}[%
- 2020/07/23 (Bob Tennent) Supports Almendra fonts for XeLaTeX or LuaLaTeX. ]
+ 2020/08/02 (Bob Tennent) Supports Almendra fonts for all LaTeX engines. ]
-\RequirePackage{iftex}
+\RequirePackage{ifxetex,ifluatex,textcomp}
-\ifpdftex
-\PackageError{almendra}{%
- *****************************************\MessageBreak
- Please process using XeLaTeX or luaLaTeX\MessageBreak
- *****************************************}
-\fi
+\newif\ifalmendra@ttf
+\ifxetex
+ \almendra@ttftrue
+\else\ifluatex
+ \almendra@ttftrue
+\else % [pdf]LaTeX
+ \almendra@ttffalse
+\fi\fi
-\newcommand*{\Almendra@scale}{1}
+\newcommand*{\Almndr@scale}{1}
\RequirePackage{xkeyval}
-\DeclareOptionX{scaled}{\renewcommand*{\Almendra@scale}{#1}}
-\DeclareOptionX{scale}{\renewcommand*{\Almendra@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\Almndr@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\Almndr@scale}{#1}}
+
+\DeclareOptionX{type1}{\almendra@ttffalse}
\ProcessOptionsX\relax
-\RequirePackage{fontspec}
+\ifalmendra@ttf
+ \RequirePackage{fontspec}
+\else
+ \RequirePackage{fontenc,fontaxes,mweights}
+\fi
+\ifalmendra@ttf
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
Extension = .ttf ,
+ Scale = \Almndr@scale,
}
\setmainfont
[ UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-Bold ,
BoldItalicFont = *-BoldItalic ,
- SmallCapsFont = {AlmendraSmallCaps}
+ SmallCapsFont = {AlmendraSC-Regular}
]
{Almendra}
\newfontfamily\almendra
@@ -37,12 +47,24 @@
ItalicFont = *-Italic ,
BoldFont = *-Bold ,
BoldItalicFont = *-BoldItalic ,
- SmallCapsFont = {AlmendraSmallCaps}
+ SmallCapsFont = {AlmendraSC-Regular}
]
{Almendra}
+\else % type1
+
+ \def\bfseries@rm{b}
+ \def\mdseries@rm{m}
+ \def\almendrafamily{Almndr-OsF}
+ \renewcommand*\rmdefault{\almendrafamily}
+ \newcommand*\almendra{\fontfamily{\almendrafamily}\selectfont}
+
+\fi
+
% turn off defaults in case other fonts are selected:
-\defaultfontfeatures{}
+\ifalmendra@ttf
+ \defaultfontfeatures{}
+\fi
\endinput
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index db8f9a3f861..82a0c6fbb17 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2886,6 +2886,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
'svn-multi' => 'latex', # interaction for .pl
'teubner' => 'latex', # interaction
'termlist' => 'tex', # interaction for .pl
+ 'thmtools' => 'latex',
'thucoursework' => 'pdflatex-preserve-pdf --engine xelatex',
'thumb' => 'latex -translate-file=empty.tcx', # no 8-bit
'tikz-page' => 'tex -8bit', # no doc remake, 8-bit name
diff --git a/Master/tlpkg/tlpsrc/almendra.tlpsrc b/Master/tlpkg/tlpsrc/almendra.tlpsrc
index e69de29bb2d..493569ed3f6 100644
--- a/Master/tlpkg/tlpsrc/almendra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/almendra.tlpsrc
@@ -0,0 +1 @@
+execute addMap ${PKGNAME}.map