summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/fonts/almendra/OFL.txt93
-rw-r--r--Master/texmf-dist/doc/fonts/almendra/README47
-rw-r--r--Master/texmf-dist/doc/fonts/almendra/almendra-samples.pdfbin0 -> 23352 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/almendra/almendra-samples.tex23
-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.tfmbin0 -> 1856 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ly1.tfmbin0 -> 2036 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ot1--base.tfmbin0 -> 1352 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ot1.tfmbin0 -> 1504 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-t1--base.tfmbin0 -> 1804 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-t1.tfmbin0 -> 1984 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ts1--base.tfmbin0 -> 1324 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ts1.tfmbin0 -> 1332 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ly1--base.tfmbin0 -> 1872 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ly1.tfmbin0 -> 2212 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ot1--base.tfmbin0 -> 1320 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ot1.tfmbin0 -> 1636 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-t1--base.tfmbin0 -> 1836 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-t1.tfmbin0 -> 2176 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ts1--base.tfmbin0 -> 1336 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ts1.tfmbin0 -> 1348 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ly1--base.tfmbin0 -> 1788 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ly1.tfmbin0 -> 1964 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ot1--base.tfmbin0 -> 1268 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ot1.tfmbin0 -> 1420 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-t1--base.tfmbin0 -> 1744 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-t1.tfmbin0 -> 1920 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ts1--base.tfmbin0 -> 1336 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ts1.tfmbin0 -> 1340 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ly1--base.tfmbin0 -> 1868 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ly1.tfmbin0 -> 2088 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ot1--base.tfmbin0 -> 1384 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ot1.tfmbin0 -> 1628 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-t1--base.tfmbin0 -> 1804 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-t1.tfmbin0 -> 2044 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ts1--base.tfmbin0 -> 1360 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ts1.tfmbin0 -> 1372 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ly1--base.tfmbin0 -> 1776 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ly1.tfmbin0 -> 1828 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ot1--base.tfmbin0 -> 1252 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ot1.tfmbin0 -> 1288 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-t1--base.tfmbin0 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-t1.tfmbin0 -> 1796 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ts1--base.tfmbin0 -> 1324 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ts1.tfmbin0 -> 1332 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/almendra/Almendra-Bold.ttfbin0 -> 34224 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/almendra/Almendra-BoldItalic.ttfbin0 -> 32988 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/almendra/Almendra-Italic.ttfbin0 -> 32876 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/almendra/Almendra-Regular.ttfbin0 -> 57324 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/almendra/AlmendraSmallCaps.ttfbin0 -> 34576 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/Almendra-Bold.pfbbin0 -> 46837 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/Almendra-BoldItalic.pfbbin0 -> 44230 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/Almendra-Italic.pfbbin0 -> 43455 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/Almendra-Regular.pfbbin0 -> 62617 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/AlmendraDisplay-Regular.pfbbin0 -> 46586 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/almendra/AlmendraSmallCaps.pfbbin0 -> 46354 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ly1.vfbin0 -> 1580 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ot1.vfbin0 -> 748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-t1.vfbin0 -> 1344 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ts1.vfbin0 -> 440 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ly1.vfbin0 -> 1580 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ot1.vfbin0 -> 756 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-t1.vfbin0 -> 1348 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ts1.vfbin0 -> 440 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ly1.vfbin0 -> 1576 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ot1.vfbin0 -> 752 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-t1.vfbin0 -> 1344 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ts1.vfbin0 -> 436 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ly1.vfbin0 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ot1.vfbin0 -> 888 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-t1.vfbin0 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ts1.vfbin0 -> 504 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ly1.vfbin0 -> 1568 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ot1.vfbin0 -> 732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-t1.vfbin0 -> 1344 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ts1.vfbin0 -> 440 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.sty69
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rw-r--r--Master/tlpkg/tlpsrc/almendra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc1
97 files changed, 1481 insertions, 1 deletions
diff --git a/Master/texmf-dist/doc/fonts/almendra/OFL.txt b/Master/texmf-dist/doc/fonts/almendra/OFL.txt
new file mode 100644
index 00000000000..d35e302f780
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/almendra/OFL.txt
@@ -0,0 +1,93 @@
+Copyright (c) 2011-2012, Ana Sanfelippo (anasanfe@gmail.com), with Reserved Font Name 'Almendra'
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/Master/texmf-dist/doc/fonts/almendra/README b/Master/texmf-dist/doc/fonts/almendra/README
new file mode 100644
index 00000000000..66580919164
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/almendra/README
@@ -0,0 +1,47 @@
+This is the README for the almendra package, version
+2019-05-11.
+
+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
+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.
+
+To install this package on a TDS-compliant
+TeX system download the file
+"tex-archive"/install/fonts/almendra.tds.zip where the
+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.
+
+To use, add
+
+\usepackage{almendra}
+
+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
+
+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)
diff --git a/Master/texmf-dist/doc/fonts/almendra/almendra-samples.pdf b/Master/texmf-dist/doc/fonts/almendra/almendra-samples.pdf
new file mode 100644
index 00000000000..f5e0bfeba6f
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..40dd1b5ae98
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/almendra/almendra-samples.tex
@@ -0,0 +1,23 @@
+\documentclass{article}
+\usepackage[T1]{fontenc}
+\usepackage{almendra}
+\usepackage{lipsum}
+\begin{document}
+
+\begin{center}\huge
+\textsc{A\,l\,m\,e\,n\,d\,r\,a}
+\end{center}
+
+\subsection*{Regular}
+\lipsum[1]
+
+\subsection*{Italic}
+\textit{\lipsum[2]}
+
+\subsection*{Bold}
+\textbf{\lipsum[3]}
+
+\subsection*{Bold Italic}
+\textbf{\textit{\lipsum[4]}}
+
+\end{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
new file mode 100644
index 00000000000..c40885674b4
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3ehf7b.enc
@@ -0,0 +1,64 @@
+% 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
new file mode 100644
index 00000000000..61fb2e50aed
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3qmmf2.enc
@@ -0,0 +1,65 @@
+% 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
new file mode 100644
index 00000000000..95ac6eb4283
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_3smkg7.enc
@@ -0,0 +1,65 @@
+% 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
new file mode 100644
index 00000000000..007c6dda5e3
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_4ostoe.enc
@@ -0,0 +1,64 @@
+% 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
new file mode 100644
index 00000000000..70c02bd02a9
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_aisq53.enc
@@ -0,0 +1,64 @@
+% 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
new file mode 100644
index 00000000000..100e904a92a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_aphd5h.enc
@@ -0,0 +1,64 @@
+% 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
new file mode 100644
index 00000000000..39f2ab73e9b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_cksmvz.enc
@@ -0,0 +1,64 @@
+% 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
new file mode 100644
index 00000000000..798ad88cdfa
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_ktaaad.enc
@@ -0,0 +1,64 @@
+% 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
new file mode 100644
index 00000000000..ce0bdb82ad7
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_ncjtqa.enc
@@ -0,0 +1,64 @@
+% 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
new file mode 100644
index 00000000000..f1854d00eff
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_qv6mtu.enc
@@ -0,0 +1,64 @@
+% 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
new file mode 100644
index 00000000000..4ad016628cc
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_w4vl5k.enc
@@ -0,0 +1,64 @@
+% 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
new file mode 100644
index 00000000000..857c802a4da
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_yh7c3k.enc
@@ -0,0 +1,65 @@
+% 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
new file mode 100644
index 00000000000..b52de8cd285
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/almendra/almnd_yuo247.enc
@@ -0,0 +1,65 @@
+% 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
new file mode 100644
index 00000000000..6601f88a347
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/almendra/almendra.map
@@ -0,0 +1,22 @@
+% 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
new file mode 100644
index 00000000000..77541d2e4d8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ly1--base.tfm
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
new file mode 100644
index 00000000000..2a97f0d60eb
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ly1.tfm
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
new file mode 100644
index 00000000000..e0e590f89a7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ot1--base.tfm
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
new file mode 100644
index 00000000000..1ce07d5571a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ot1.tfm
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
new file mode 100644
index 00000000000..d80e4b6d5f0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-t1--base.tfm
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
new file mode 100644
index 00000000000..fdb397ea991
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-t1.tfm
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
new file mode 100644
index 00000000000..c1264a31525
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ts1--base.tfm
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
new file mode 100644
index 00000000000..bbac5aa3c24
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Bold-osf-ts1.tfm
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
new file mode 100644
index 00000000000..e7950c9dc00
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ly1--base.tfm
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
new file mode 100644
index 00000000000..b57f7f7e7c7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ly1.tfm
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
new file mode 100644
index 00000000000..73bbb4951df
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ot1--base.tfm
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
new file mode 100644
index 00000000000..8748653b96b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ot1.tfm
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
new file mode 100644
index 00000000000..11c43635c4f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-t1--base.tfm
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
new file mode 100644
index 00000000000..343f40a68eb
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-t1.tfm
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
new file mode 100644
index 00000000000..9f94d2fc804
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ts1--base.tfm
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
new file mode 100644
index 00000000000..b1792b3b345
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-BoldItalic-osf-ts1.tfm
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
new file mode 100644
index 00000000000..314f12ccca2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ly1--base.tfm
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
new file mode 100644
index 00000000000..7ef61b2a27c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ly1.tfm
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
new file mode 100644
index 00000000000..ca9cd5ea04f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ot1--base.tfm
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
new file mode 100644
index 00000000000..ce3687016d8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ot1.tfm
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
new file mode 100644
index 00000000000..6a5194b0c25
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-t1--base.tfm
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
new file mode 100644
index 00000000000..d86c587e0b9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-t1.tfm
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
new file mode 100644
index 00000000000..719b2352019
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ts1--base.tfm
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
new file mode 100644
index 00000000000..adc81b5a129
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Italic-osf-ts1.tfm
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
new file mode 100644
index 00000000000..34e784f36b2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ly1--base.tfm
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
new file mode 100644
index 00000000000..26cd7fe6ecf
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ly1.tfm
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
new file mode 100644
index 00000000000..0f181c8ccf5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ot1--base.tfm
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
new file mode 100644
index 00000000000..40e0a045199
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ot1.tfm
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
new file mode 100644
index 00000000000..ca1cee96b3c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-t1--base.tfm
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
new file mode 100644
index 00000000000..5646d3470df
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-t1.tfm
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
new file mode 100644
index 00000000000..570dd06ed22
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ts1--base.tfm
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
new file mode 100644
index 00000000000..beca7606109
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/Almendra-Regular-osf-ts1.tfm
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
new file mode 100644
index 00000000000..0c18db41ae5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ly1--base.tfm
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
new file mode 100644
index 00000000000..a31b3401d9a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ly1.tfm
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
new file mode 100644
index 00000000000..f2e67575b47
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ot1--base.tfm
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
new file mode 100644
index 00000000000..a11e8902b57
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ot1.tfm
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
new file mode 100644
index 00000000000..ebdec13cef5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-t1--base.tfm
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
new file mode 100644
index 00000000000..be526cf9390
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-t1.tfm
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
new file mode 100644
index 00000000000..78ad26f56c2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ts1--base.tfm
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
new file mode 100644
index 00000000000..3a352b387d4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/almendra/AlmendraSmallCaps-osf-sc-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/almendra/Almendra-Bold.ttf b/Master/texmf-dist/fonts/truetype/public/almendra/Almendra-Bold.ttf
new file mode 100644
index 00000000000..6aaba708b13
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/public/almendra/Almendra-Bold.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/almendra/Almendra-BoldItalic.ttf b/Master/texmf-dist/fonts/truetype/public/almendra/Almendra-BoldItalic.ttf
new file mode 100644
index 00000000000..0a3b1db3558
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/public/almendra/Almendra-BoldItalic.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/almendra/Almendra-Italic.ttf b/Master/texmf-dist/fonts/truetype/public/almendra/Almendra-Italic.ttf
new file mode 100644
index 00000000000..aeaeff5bfa3
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/public/almendra/Almendra-Italic.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/almendra/Almendra-Regular.ttf b/Master/texmf-dist/fonts/truetype/public/almendra/Almendra-Regular.ttf
new file mode 100644
index 00000000000..43e080fa9d2
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/public/almendra/Almendra-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
new file mode 100644
index 00000000000..c2278641db4
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/public/almendra/AlmendraSmallCaps.ttf
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
new file mode 100644
index 00000000000..74822befbb7
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/almendra/Almendra-Bold.pfb
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
new file mode 100644
index 00000000000..9c555b02097
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/almendra/Almendra-BoldItalic.pfb
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
new file mode 100644
index 00000000000..7570bcef026
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/almendra/Almendra-Italic.pfb
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
new file mode 100644
index 00000000000..e383bd8ba35
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/almendra/Almendra-Regular.pfb
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
new file mode 100644
index 00000000000..8232624afc5
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/almendra/AlmendraDisplay-Regular.pfb
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
new file mode 100644
index 00000000000..2002b61ceb8
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/almendra/AlmendraSmallCaps.pfb
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
new file mode 100644
index 00000000000..4f86bc147b2
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ly1.vf
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
new file mode 100644
index 00000000000..5af096dc8ac
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ot1.vf
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
new file mode 100644
index 00000000000..69d8d526ede
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-t1.vf
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
new file mode 100644
index 00000000000..7ecf81b1b48
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Bold-osf-ts1.vf
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
new file mode 100644
index 00000000000..7fb430081b7
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ly1.vf
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
new file mode 100644
index 00000000000..74d1c33eaf4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ot1.vf
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
new file mode 100644
index 00000000000..32c7c6a1ed4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-t1.vf
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
new file mode 100644
index 00000000000..8750a1946ae
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-BoldItalic-osf-ts1.vf
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
new file mode 100644
index 00000000000..a6b64851a53
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ly1.vf
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
new file mode 100644
index 00000000000..c9dce0feccd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ot1.vf
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
new file mode 100644
index 00000000000..5ba3b9880a2
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-t1.vf
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
new file mode 100644
index 00000000000..e84928728dd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Italic-osf-ts1.vf
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
new file mode 100644
index 00000000000..b4d4fc8eb9d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ly1.vf
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
new file mode 100644
index 00000000000..89b8e13d6a6
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ot1.vf
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
new file mode 100644
index 00000000000..1d57931bdf0
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-t1.vf
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
new file mode 100644
index 00000000000..583f1755094
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/Almendra-Regular-osf-ts1.vf
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
new file mode 100644
index 00000000000..dd97800c78d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ly1.vf
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
new file mode 100644
index 00000000000..79f317cdb02
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ot1.vf
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
new file mode 100644
index 00000000000..a62547640f4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-t1.vf
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
new file mode 100644
index 00000000000..429d22c1d48
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/almendra/AlmendraSmallCaps-osf-sc-ts1.vf
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
new file mode 100644
index 00000000000..7b9db689fbc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/almendra/LY1Almendra-OsF.fd
@@ -0,0 +1,97 @@
+%% 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
new file mode 100644
index 00000000000..dbd905a94f2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/almendra/OT1Almendra-OsF.fd
@@ -0,0 +1,97 @@
+%% 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
new file mode 100644
index 00000000000..5decb728a09
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/almendra/T1Almendra-OsF.fd
@@ -0,0 +1,97 @@
+%% 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
new file mode 100644
index 00000000000..b7b563dbced
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/almendra/TS1Almendra-OsF.fd
@@ -0,0 +1,97 @@
+%% 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
new file mode 100644
index 00000000000..567dd5aaaec
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/almendra/almendra.sty
@@ -0,0 +1,69 @@
+\ProvidesPackage{almendra}[%
+ 2019/05/11 (Bob Tennent) Supports Almendra fonts for all LaTeX engines. ]
+
+\RequirePackage{ifxetex,ifluatex,textcomp}
+
+\newif\ifalmendra@ttf
+\ifxetex
+ \almendra@ttftrue
+\else\ifluatex
+ \almendra@ttftrue
+\else % [pdf]LaTeX
+ \almendra@ttffalse
+\fi\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
+
+\ifalmendra@ttf
+ \ifxetex\XeTeXtracingfonts=1\fi
+ \defaultfontfeatures{
+ Ligatures = TeX ,
+ Extension = .ttf ,
+ }
+ \setmainfont
+ [ UprightFont = *-Regular ,
+ ItalicFont = *-Italic ,
+ BoldFont = *-Bold ,
+ BoldItalicFont = *-BoldItalic ,
+ SmallCapsFont = {AlmendraSmallcaps}
+ ]
+ {Almendra}
+ \newfontfamily\almendra
+ [ UprightFont = *-Regular ,
+ ItalicFont = *-Italic ,
+ BoldFont = *-Bold ,
+ BoldItalicFont = *-BoldItalic ,
+ SmallCapsFont = {AlmendraSmallcaps}
+ ]
+ {Almendra}
+
+\else % type1
+
+ \def\bfseries@rm{bold}
+ \def\mdseries@rm{regular}
+ \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
+
+\endinput
+
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index dd617c616bc..16dd0ada4a2 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -34,7 +34,7 @@ my @TLP_working = qw(
aguplus aiaa aichej ajl akktex akletter alegreya alertmessage
alg algobox algolrevived algorithm2e algorithmicx algorithms
aligned-overset
- alkalami allrunes almfixed alnumsec alpha-persian alterqcm
+ alkalami allrunes almendra almfixed alnumsec alpha-persian alterqcm
altfont ametsoc amiri amsaddr amscls amscls-doc amsfonts amslatex-primer
amsldoc-it amsldoc-vn
amsmath amsmath-it amsrefs amstex amsthdoc-it
diff --git a/Master/tlpkg/tlpsrc/almendra.tlpsrc b/Master/tlpkg/tlpsrc/almendra.tlpsrc
new file mode 100644
index 00000000000..493569ed3f6
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/almendra.tlpsrc
@@ -0,0 +1 @@
+execute addMap ${PKGNAME}.map
diff --git a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
index 925c02072e0..aeef25143ea 100644
--- a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
@@ -12,6 +12,7 @@ depend aecc
depend alegreya
depend algolrevived
depend allrunes
+depend almendra
depend almfixed
depend anonymouspro
depend antiqua