summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
Diffstat (limited to 'fonts')
-rw-r--r--fonts/librebaskerville/README9
-rw-r--r--fonts/librebaskerville/doc/librebaskerville-samples.pdfbin21432 -> 48233 bytes
-rw-r--r--fonts/librebaskerville/doc/librebaskerville-samples.tex3
-rw-r--r--fonts/librebaskerville/enc/lbskvl_4uz6a2.enc6
-rw-r--r--fonts/librebaskerville/enc/lbskvl_4yc6wb.enc6
-rw-r--r--fonts/librebaskerville/enc/lbskvl_6hj2ra.enc4
-rw-r--r--fonts/librebaskerville/enc/lbskvl_p6yehx.enc4
-rw-r--r--fonts/librebaskerville/enc/lbskvl_uf5aa7.enc4
-rw-r--r--fonts/librebaskerville/enc/lbskvl_ufnake.enc4
-rw-r--r--fonts/librebaskerville/enc/lbskvl_vepvv3.enc2
-rw-r--r--fonts/librebaskerville/enc/lbskvl_wpcz7d.enc2
-rw-r--r--fonts/librebaskerville/enc/lbskvl_yeotsr.enc6
-rw-r--r--fonts/librebaskerville/latex/LY1LibreBskvl-LF.fd24
-rw-r--r--fonts/librebaskerville/latex/LY1LibreBskvl-Sup.fd24
-rw-r--r--fonts/librebaskerville/latex/LibreBskvl.sty59
-rw-r--r--fonts/librebaskerville/latex/OT1LibreBskvl-LF.fd24
-rw-r--r--fonts/librebaskerville/latex/OT1LibreBskvl-Sup.fd24
-rw-r--r--fonts/librebaskerville/latex/T1LibreBskvl-LF.fd24
-rw-r--r--fonts/librebaskerville/latex/T1LibreBskvl-Sup.fd24
-rw-r--r--fonts/librebaskerville/latex/TS1LibreBskvl-LF.fd24
-rw-r--r--fonts/librebaskerville/latex/librebaskerville.sty4
-rw-r--r--fonts/librebaskerville/map/LibreBaskerville.map7
-rw-r--r--fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ly1--base.tfmbin0 -> 2124 bytes
-rw-r--r--fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ly1.tfmbin0 -> 47240 bytes
-rw-r--r--fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ot1.tfmbin0 -> 14160 bytes
-rw-r--r--fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-t1--base.tfmbin0 -> 2016 bytes
-rw-r--r--fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-t1.tfmbin0 -> 65464 bytes
-rw-r--r--fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ts1--base.tfmbin0 -> 1524 bytes
-rw-r--r--fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ts1.tfmbin0 -> 1528 bytes
-rw-r--r--fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-ly1--base.tfmbin0 -> 2084 bytes
-rw-r--r--fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-ly1.tfmbin0 -> 2088 bytes
-rw-r--r--fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-ot1.tfmbin0 -> 1524 bytes
-rw-r--r--fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-t1--base.tfmbin0 -> 2004 bytes
-rw-r--r--fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-t1.tfmbin0 -> 2012 bytes
-rw-r--r--fonts/librebaskerville/truetype/LibreBskvl-BoldItalic.ttfbin0 -> 130228 bytes
-rw-r--r--fonts/librebaskerville/type1/LibreBskvl-BoldItalic.pfbbin0 -> 105915 bytes
-rw-r--r--fonts/librebaskerville/vf/LibreBskvl-BoldItalic-lf-ly1.vfbin0 -> 1736 bytes
-rw-r--r--fonts/librebaskerville/vf/LibreBskvl-BoldItalic-lf-t1.vfbin0 -> 1736 bytes
-rw-r--r--fonts/librebaskerville/vf/LibreBskvl-BoldItalic-lf-ts1.vfbin0 -> 500 bytes
-rw-r--r--fonts/librebaskerville/vf/LibreBskvl-BoldItalic-sup-ly1.vfbin0 -> 1676 bytes
-rw-r--r--fonts/librebaskerville/vf/LibreBskvl-BoldItalic-sup-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/lobster2/README54
-rw-r--r--fonts/lobster2/doc/lobster2-samples.pdfbin64585 -> 26798 bytes
-rw-r--r--fonts/lobster2/enc/lbstr_2rydtx.enc65
-rw-r--r--fonts/lobster2/enc/lbstr_bucufw.enc64
-rw-r--r--fonts/lobster2/enc/lbstr_pvoz5h.enc65
-rw-r--r--fonts/lobster2/enc/lbstr_t7yaon.enc63
-rw-r--r--fonts/lobster2/latex/LY1Lbstr-LF.fd97
-rw-r--r--fonts/lobster2/latex/LobsterTwo.sty78
-rw-r--r--fonts/lobster2/latex/OT1Lbstr-LF.fd97
-rw-r--r--fonts/lobster2/latex/T1Lbstr-LF.fd97
-rw-r--r--fonts/lobster2/latex/TS1Lbstr-LF.fd97
-rw-r--r--fonts/lobster2/map/LobsterTwo.map30
-rw-r--r--fonts/lobster2/opentype/LobsterTwo-Bold.otfbin0 -> 70108 bytes
-rw-r--r--fonts/lobster2/opentype/LobsterTwo-BoldItalic.otfbin0 -> 72448 bytes
-rw-r--r--fonts/lobster2/opentype/LobsterTwo-Italic.otfbin0 -> 71552 bytes
-rw-r--r--fonts/lobster2/opentype/LobsterTwo-Regular.otfbin0 -> 69420 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Bold-lf-ly1--base.tfmbin0 -> 1964 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Bold-lf-ly1--lcdfj.tfmbin0 -> 152 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Bold-lf-ly1.tfmbin0 -> 27728 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Bold-lf-ot1--base.tfmbin0 -> 1844 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Bold-lf-ot1--lcdfj.tfmbin0 -> 152 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Bold-lf-ot1.tfmbin0 -> 22840 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Bold-lf-t1--base.tfmbin0 -> 2004 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Bold-lf-t1--lcdfj.tfmbin0 -> 152 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Bold-lf-t1.tfmbin0 -> 29848 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Bold-lf-ts1--base.tfmbin0 -> 1384 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Bold-lf-ts1.tfmbin0 -> 1392 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ly1--base.tfmbin0 -> 2132 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ly1--lcdfj.tfmbin0 -> 156 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ly1.tfmbin0 -> 28256 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ot1--base.tfmbin0 -> 1912 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ot1--lcdfj.tfmbin0 -> 156 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ot1.tfmbin0 -> 22840 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-BoldItalic-lf-t1--base.tfmbin0 -> 2136 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-BoldItalic-lf-t1--lcdfj.tfmbin0 -> 156 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-BoldItalic-lf-t1.tfmbin0 -> 30360 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ts1--base.tfmbin0 -> 1436 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ts1.tfmbin0 -> 1436 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Italic-lf-ly1--base.tfmbin0 -> 2108 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Italic-lf-ly1--lcdfj.tfmbin0 -> 156 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Italic-lf-ly1.tfmbin0 -> 28272 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Italic-lf-ot1--base.tfmbin0 -> 1868 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Italic-lf-ot1--lcdfj.tfmbin0 -> 156 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Italic-lf-ot1.tfmbin0 -> 23508 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Italic-lf-t1--base.tfmbin0 -> 2100 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Italic-lf-t1--lcdfj.tfmbin0 -> 156 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Italic-lf-t1.tfmbin0 -> 30592 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Italic-lf-ts1--base.tfmbin0 -> 1424 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Italic-lf-ts1.tfmbin0 -> 1424 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Regular-lf-ly1--base.tfmbin0 -> 1960 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Regular-lf-ly1--lcdfj.tfmbin0 -> 156 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Regular-lf-ly1.tfmbin0 -> 27888 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Regular-lf-ot1--base.tfmbin0 -> 1808 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Regular-lf-ot1--lcdfj.tfmbin0 -> 156 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Regular-lf-ot1.tfmbin0 -> 23120 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Regular-lf-t1--base.tfmbin0 -> 1972 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Regular-lf-t1--lcdfj.tfmbin0 -> 156 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Regular-lf-t1.tfmbin0 -> 30228 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Regular-lf-ts1--base.tfmbin0 -> 1372 bytes
-rw-r--r--fonts/lobster2/tfm/Lbstr-Regular-lf-ts1.tfmbin0 -> 1380 bytes
-rw-r--r--fonts/lobster2/truetype/LobsterTwo-Bold.ttfbin241104 -> 0 bytes
-rw-r--r--fonts/lobster2/truetype/LobsterTwo-BoldItalic.ttfbin235632 -> 0 bytes
-rw-r--r--fonts/lobster2/truetype/LobsterTwo-Italic.ttfbin249896 -> 0 bytes
-rw-r--r--fonts/lobster2/truetype/LobsterTwo-Regular.ttfbin254332 -> 0 bytes
-rw-r--r--fonts/lobster2/type1/Lbstr-Bold.pfbbin0 -> 79788 bytes
-rw-r--r--fonts/lobster2/type1/Lbstr-BoldItalic.pfbbin0 -> 79840 bytes
-rw-r--r--fonts/lobster2/type1/Lbstr-BoldItalicLCDFJ.pfbbin0 -> 7005 bytes
-rw-r--r--fonts/lobster2/type1/Lbstr-BoldLCDFJ.pfbbin0 -> 6981 bytes
-rw-r--r--fonts/lobster2/type1/Lbstr-Italic.pfbbin0 -> 76803 bytes
-rw-r--r--fonts/lobster2/type1/Lbstr-ItalicLCDFJ.pfbbin0 -> 6995 bytes
-rw-r--r--fonts/lobster2/type1/Lbstr-Regular.pfbbin0 -> 76963 bytes
-rw-r--r--fonts/lobster2/type1/Lbstr-RegularLCDFJ.pfbbin0 -> 7153 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-Bold-lf-ly1.vfbin0 -> 1764 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-Bold-lf-ot1.vfbin0 -> 1352 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-Bold-lf-t1.vfbin0 -> 1764 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-Bold-lf-ts1.vfbin0 -> 476 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-BoldItalic-lf-ly1.vfbin0 -> 1776 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-BoldItalic-lf-ot1.vfbin0 -> 1364 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-BoldItalic-lf-t1.vfbin0 -> 1776 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-BoldItalic-lf-ts1.vfbin0 -> 484 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-Italic-lf-ly1.vfbin0 -> 1768 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-Italic-lf-ot1.vfbin0 -> 1356 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-Italic-lf-t1.vfbin0 -> 1768 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-Italic-lf-ts1.vfbin0 -> 480 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-Regular-lf-ly1.vfbin0 -> 1772 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-Regular-lf-ot1.vfbin0 -> 1356 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-Regular-lf-t1.vfbin0 -> 1768 bytes
-rw-r--r--fonts/lobster2/vf/Lbstr-Regular-lf-ts1.vfbin0 -> 480 bytes
-rw-r--r--fonts/utilities/fontools/README7
-rwxr-xr-xfonts/utilities/fontools/bin/afm2afm4
-rwxr-xr-xfonts/utilities/fontools/bin/autoinst733
-rwxr-xr-xfonts/utilities/fontools/bin/ot2kpx4
-rwxr-xr-xfonts/utilities/fontools/bin/splitttc4
-rw-r--r--fonts/utilities/fontools/doc/afm2afm.pdfbin27062 -> 26995 bytes
-rw-r--r--fonts/utilities/fontools/doc/autoinst.pdfbin73672 -> 68451 bytes
-rw-r--r--fonts/utilities/fontools/doc/ot2kpx.pdfbin27440 -> 27380 bytes
-rw-r--r--fonts/utilities/fontools/doc/splitttc.pdfbin20443 -> 20385 bytes
138 files changed, 1467 insertions, 380 deletions
diff --git a/fonts/librebaskerville/README b/fonts/librebaskerville/README
index 03fc9e5804..67c9379b46 100644
--- a/fonts/librebaskerville/README
+++ b/fonts/librebaskerville/README
@@ -1,8 +1,9 @@
This is the README for the librebaskerville package, version
-2020-07-28.
+2020-07-29.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
the Libre Baskerville family of fonts, designed by Pablo Impallari.
+A BoldItalic variant has been artificially generated.
To install this package on a TDS-compliant TeX system download the
file "tex-archive"/install/fonts/librebaskerville.tds.zip, where the
@@ -36,8 +37,8 @@ https://github.com/impallari/Libre-Baskerville
and are licensed under the SIL Open Font License, (version
1.1); the text may be found in the doc directory. The
-opentype and type1 versions were created using fontforge.
-The support files were created using autoinst and are
-licensed under the terms of the LaTeX Project Public
+re-named truetype and type1 versions were created using
+fontforge. The support files were created using autoinst 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/fonts/librebaskerville/doc/librebaskerville-samples.pdf b/fonts/librebaskerville/doc/librebaskerville-samples.pdf
index a922dc5d3e..ec83b99876 100644
--- a/fonts/librebaskerville/doc/librebaskerville-samples.pdf
+++ b/fonts/librebaskerville/doc/librebaskerville-samples.pdf
Binary files differ
diff --git a/fonts/librebaskerville/doc/librebaskerville-samples.tex b/fonts/librebaskerville/doc/librebaskerville-samples.tex
index 9aef815afe..487cf66dfa 100644
--- a/fonts/librebaskerville/doc/librebaskerville-samples.tex
+++ b/fonts/librebaskerville/doc/librebaskerville-samples.tex
@@ -13,4 +13,7 @@
\subsection*{Bold}
\textbf{\lipsum[3]}
+\subsection*{BoldItalic}
+\textbf{\textit{\lipsum[4]}}
+
\end{document}
diff --git a/fonts/librebaskerville/enc/lbskvl_4uz6a2.enc b/fonts/librebaskerville/enc/lbskvl_4uz6a2.enc
index 21d76e2d5d..59a18ebdb2 100644
--- a/fonts/librebaskerville/enc/lbskvl_4uz6a2.enc
+++ b/fonts/librebaskerville/enc/lbskvl_4uz6a2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_4uz6a2melkgi2nfsinzqmqjrog
-% Encoding created by otftotfm on Mon Jul 27 08:40:33 2020
+% Encoding created by otftotfm on Mon Jul 27 17:39:25 2020
% Command line follows encoding
/AutoEnc_4uz6a2melkgi2nfsinzqmqjrog [
%00
@@ -61,5 +61,5 @@
% --map-file=texmf/fonts/map/dvips/librebaskerville/LibreBskvl.map
% --no-updmap --no-type1 --coding-scheme=TEX TEXT --feature=kern
% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl LibreBskvl-Bold.ttf
-% LibreBskvl-Bold-lf-ot1'
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl LibreBskvl-BoldItalic.ttf
+% LibreBskvl-BoldItalic-lf-ot1'
diff --git a/fonts/librebaskerville/enc/lbskvl_4yc6wb.enc b/fonts/librebaskerville/enc/lbskvl_4yc6wb.enc
index 5f63d3501a..96784e281a 100644
--- a/fonts/librebaskerville/enc/lbskvl_4yc6wb.enc
+++ b/fonts/librebaskerville/enc/lbskvl_4yc6wb.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_4yc6wbf5o5xsiezmmnzenarz2b
-% Encoding created by otftotfm on Mon Jul 27 08:40:33 2020
+% Encoding created by otftotfm on Mon Jul 27 17:39:25 2020
% Command line follows encoding
/AutoEnc_4yc6wbf5o5xsiezmmnzenarz2b [
%00
@@ -60,5 +60,5 @@
% --encoding-directory=texmf/fonts/enc/dvips/librebaskerville
% --map-file=texmf/fonts/map/dvips/librebaskerville/LibreBskvl.map
% --no-updmap --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=sups --ligkern=* {KL} * LibreBskvl-Bold.ttf
-% LibreBskvl-Bold-sup-t1'
+% --feature=sups --ligkern=* {KL} * LibreBskvl-BoldItalic.ttf
+% LibreBskvl-BoldItalic-sup-t1'
diff --git a/fonts/librebaskerville/enc/lbskvl_6hj2ra.enc b/fonts/librebaskerville/enc/lbskvl_6hj2ra.enc
index 5305a26661..0d6c6f13be 100644
--- a/fonts/librebaskerville/enc/lbskvl_6hj2ra.enc
+++ b/fonts/librebaskerville/enc/lbskvl_6hj2ra.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_6hj2rapzurgnmpgep5fle5mloc
-% Encoding created by otftotfm on Mon Jul 27 08:40:33 2020
+% Encoding created by otftotfm on Mon Jul 27 17:39:25 2020
% Command line follows encoding
/AutoEnc_6hj2rapzurgnmpgep5fle5mloc [
%00
@@ -60,4 +60,4 @@
% --encoding-directory=texmf/fonts/enc/dvips/librebaskerville
% --map-file=texmf/fonts/map/dvips/librebaskerville/LibreBskvl.map
% --no-updmap --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
-% LibreBskvl-Bold.ttf LibreBskvl-Bold-lf-ts1'
+% LibreBskvl-BoldItalic.ttf LibreBskvl-BoldItalic-lf-ts1'
diff --git a/fonts/librebaskerville/enc/lbskvl_p6yehx.enc b/fonts/librebaskerville/enc/lbskvl_p6yehx.enc
index de6d818bf4..7e30e7df32 100644
--- a/fonts/librebaskerville/enc/lbskvl_p6yehx.enc
+++ b/fonts/librebaskerville/enc/lbskvl_p6yehx.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_p6yehxsl2c5oq6rlgs5qbdprqa
-% Encoding created by otftotfm on Mon Jul 27 08:40:32 2020
+% Encoding created by otftotfm on Mon Jul 27 17:39:24 2020
% Command line follows encoding
/AutoEnc_p6yehxsl2c5oq6rlgs5qbdprqa [
%00
@@ -60,4 +60,4 @@
% --encoding-directory=texmf/fonts/enc/dvips/librebaskerville
% --map-file=texmf/fonts/map/dvips/librebaskerville/LibreBskvl.map
% --no-updmap --no-type1 --coding-scheme=TEX TEXT --feature=sups --ligkern=*
-% {KL} * LibreBskvl-Bold.ttf LibreBskvl-Bold-sup-ot1'
+% {KL} * LibreBskvl-BoldItalic.ttf LibreBskvl-BoldItalic-sup-ot1'
diff --git a/fonts/librebaskerville/enc/lbskvl_uf5aa7.enc b/fonts/librebaskerville/enc/lbskvl_uf5aa7.enc
index 0deedb3a2b..baeeb3ffb6 100644
--- a/fonts/librebaskerville/enc/lbskvl_uf5aa7.enc
+++ b/fonts/librebaskerville/enc/lbskvl_uf5aa7.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_uf5aa7qjk6zmrqsgnyzon5oxdh
-% Encoding created by otftotfm on Mon Jul 27 08:40:33 2020
+% Encoding created by otftotfm on Mon Jul 27 17:39:25 2020
% Command line follows encoding
/AutoEnc_uf5aa7qjk6zmrqsgnyzon5oxdh [
%00
@@ -62,4 +62,4 @@
% --no-updmap --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl
% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% LibreBskvl-Bold.ttf LibreBskvl-Bold-lf-t1'
+% LibreBskvl-BoldItalic.ttf LibreBskvl-BoldItalic-lf-t1'
diff --git a/fonts/librebaskerville/enc/lbskvl_ufnake.enc b/fonts/librebaskerville/enc/lbskvl_ufnake.enc
index fee3e1407b..55e2d47cc8 100644
--- a/fonts/librebaskerville/enc/lbskvl_ufnake.enc
+++ b/fonts/librebaskerville/enc/lbskvl_ufnake.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ufnakejmq66d2q7od2fmvev6bg
-% Encoding created by otftotfm on Mon Jul 27 08:40:33 2020
+% Encoding created by otftotfm on Mon Jul 27 17:39:25 2020
% Command line follows encoding
/AutoEnc_ufnakejmq66d2q7od2fmvev6bg [
%00
@@ -62,4 +62,4 @@
% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl
% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% LibreBskvl-Bold.ttf LibreBskvl-Bold-lf-ly1'
+% LibreBskvl-BoldItalic.ttf LibreBskvl-BoldItalic-lf-ly1'
diff --git a/fonts/librebaskerville/enc/lbskvl_vepvv3.enc b/fonts/librebaskerville/enc/lbskvl_vepvv3.enc
index f6fb2fe4e9..567a639b12 100644
--- a/fonts/librebaskerville/enc/lbskvl_vepvv3.enc
+++ b/fonts/librebaskerville/enc/lbskvl_vepvv3.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_vepvv3q36nrtphy6auzi4ht6kf
-% Encoding created by otftotfm on Mon Jul 27 08:40:34 2020
+% Encoding created by otftotfm on Mon Jul 27 17:39:27 2020
% Command line follows encoding
/AutoEnc_vepvv3q36nrtphy6auzi4ht6kf [
%00
diff --git a/fonts/librebaskerville/enc/lbskvl_wpcz7d.enc b/fonts/librebaskerville/enc/lbskvl_wpcz7d.enc
index e800e59104..0571be13a8 100644
--- a/fonts/librebaskerville/enc/lbskvl_wpcz7d.enc
+++ b/fonts/librebaskerville/enc/lbskvl_wpcz7d.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_wpcz7df3cfgdql6umqmufdgekb
-% Encoding created by otftotfm on Mon Jul 27 08:40:34 2020
+% Encoding created by otftotfm on Mon Jul 27 17:39:27 2020
% Command line follows encoding
/AutoEnc_wpcz7df3cfgdql6umqmufdgekb [
%00
diff --git a/fonts/librebaskerville/enc/lbskvl_yeotsr.enc b/fonts/librebaskerville/enc/lbskvl_yeotsr.enc
index 801a1c2496..86548879c0 100644
--- a/fonts/librebaskerville/enc/lbskvl_yeotsr.enc
+++ b/fonts/librebaskerville/enc/lbskvl_yeotsr.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_yeotsr6o4yrhzxgnwzr7vod3ca
-% Encoding created by otftotfm on Mon Jul 27 08:40:32 2020
+% Encoding created by otftotfm on Mon Jul 27 17:39:24 2020
% Command line follows encoding
/AutoEnc_yeotsr6o4yrhzxgnwzr7vod3ca [
%00
@@ -60,5 +60,5 @@
% --encoding-directory=texmf/fonts/enc/dvips/librebaskerville
% --map-file=texmf/fonts/map/dvips/librebaskerville/LibreBskvl.map
% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=sups --ligkern=* {KL} * LibreBskvl-Bold.ttf
-% LibreBskvl-Bold-sup-ly1'
+% --feature=sups --ligkern=* {KL} * LibreBskvl-BoldItalic.ttf
+% LibreBskvl-BoldItalic-sup-ly1'
diff --git a/fonts/librebaskerville/latex/LY1LibreBskvl-LF.fd b/fonts/librebaskerville/latex/LY1LibreBskvl-LF.fd
index 255f55f7b3..61da1d1309 100644
--- a/fonts/librebaskerville/latex/LY1LibreBskvl-LF.fd
+++ b/fonts/librebaskerville/latex/LY1LibreBskvl-LF.fd
@@ -41,6 +41,14 @@
<-> \LibreBskvl@@scale LibreBskvl-Bold-lf-ly1
}{}
+\DeclareFontShape{LY1}{LibreBskvl-LF}{bold}{it}{
+ <-> \LibreBskvl@@scale LibreBskvl-BoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{LibreBskvl-LF}{bold}{sl}{
+ <-> ssub * LibreBskvl-LF/bold/it
+}{}
+
%
% Extra 'alias' rules to map the standard NFSS codes to our fancy names
%
@@ -62,12 +70,28 @@
% b --> bold
+\DeclareFontShape{LY1}{LibreBskvl-LF}{b}{sl}{
+ <-> alias * LibreBskvl-LF/bold/sl
+}{}
+
\DeclareFontShape{LY1}{LibreBskvl-LF}{b}{n}{
<-> alias * LibreBskvl-LF/bold/n
}{}
+\DeclareFontShape{LY1}{LibreBskvl-LF}{b}{it}{
+ <-> alias * LibreBskvl-LF/bold/it
+}{}
+
\DeclareFontShape{LY1}{LibreBskvl-LF}{bx}{n}{
<-> ssub * LibreBskvl-LF/b/n
}{}
+\DeclareFontShape{LY1}{LibreBskvl-LF}{bx}{sl}{
+ <-> ssub * LibreBskvl-LF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{LibreBskvl-LF}{bx}{it}{
+ <-> ssub * LibreBskvl-LF/b/it
+}{}
+
\endinput
diff --git a/fonts/librebaskerville/latex/LY1LibreBskvl-Sup.fd b/fonts/librebaskerville/latex/LY1LibreBskvl-Sup.fd
index e625f92b53..5788223301 100644
--- a/fonts/librebaskerville/latex/LY1LibreBskvl-Sup.fd
+++ b/fonts/librebaskerville/latex/LY1LibreBskvl-Sup.fd
@@ -41,6 +41,14 @@
<-> \LibreBskvl@@scale LibreBskvl-Bold-sup-ly1
}{}
+\DeclareFontShape{LY1}{LibreBskvl-Sup}{bold}{it}{
+ <-> \LibreBskvl@@scale LibreBskvl-BoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{LibreBskvl-Sup}{bold}{sl}{
+ <-> ssub * LibreBskvl-Sup/bold/it
+}{}
+
%
% Extra 'alias' rules to map the standard NFSS codes to our fancy names
%
@@ -62,12 +70,28 @@
% b --> bold
+\DeclareFontShape{LY1}{LibreBskvl-Sup}{b}{sl}{
+ <-> alias * LibreBskvl-Sup/bold/sl
+}{}
+
\DeclareFontShape{LY1}{LibreBskvl-Sup}{b}{n}{
<-> alias * LibreBskvl-Sup/bold/n
}{}
+\DeclareFontShape{LY1}{LibreBskvl-Sup}{b}{it}{
+ <-> alias * LibreBskvl-Sup/bold/it
+}{}
+
\DeclareFontShape{LY1}{LibreBskvl-Sup}{bx}{n}{
<-> ssub * LibreBskvl-Sup/b/n
}{}
+\DeclareFontShape{LY1}{LibreBskvl-Sup}{bx}{sl}{
+ <-> ssub * LibreBskvl-Sup/b/sl
+}{}
+
+\DeclareFontShape{LY1}{LibreBskvl-Sup}{bx}{it}{
+ <-> ssub * LibreBskvl-Sup/b/it
+}{}
+
\endinput
diff --git a/fonts/librebaskerville/latex/LibreBskvl.sty b/fonts/librebaskerville/latex/LibreBskvl.sty
new file mode 100644
index 0000000000..7576135f43
--- /dev/null
+++ b/fonts/librebaskerville/latex/LibreBskvl.sty
@@ -0,0 +1,59 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{LibreBskvl}
+ [2020/07/27 (autoinst) Style file for LibreBskvl fonts.]
+
+\RequirePackage{xkeyval}
+\newcommand*{\LibreBskvl@scale}{1}
+\DeclareOptionX{scale}{\renewcommand*{\LibreBskvl@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\LibreBskvl@scale}{#1}}
+
+\DeclareOptionX{lining}{\edef\LibreBskvl@figurestyle{LF}}
+\DeclareOptionX{proportional}{\edef\LibreBskvl@figurealign{}}
+\DeclareOptionX{mainfont}{
+ \renewcommand{\familydefault}{\rmdefault}
+}
+\DeclareOptionX{bold}{\edef\bfseries@rm{bold}}
+\DeclareOptionX{regular}{\edef\mdseries@rm{regular}}
+\ExecuteOptionsX{lining,proportional,bold,regular}
+\ProcessOptionsX\relax
+
+\RequirePackage{fontenc,textcomp}
+\RequirePackage{ifthen}
+\RequirePackage{mweights}
+
+\IfFileExists{fontaxes.sty}{
+ \RequirePackage{fontaxes}
+ \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
+ \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
+ \def\supfigures{\@nomath\supfigures
+ \fontfigurestyle{superior}\selectfont}
+ \let\sufigures\supfigures
+ \DeclareTextFontCommand{\textsup}{\supfigures}
+ \let\textsu\textsup
+ \let\textsuperior\textsup
+
+}{}
+
+% Here we implement the scale=MatchLowercase option.
+% If this is given, we must compute the correct value of
+% the "\LibreBskvl@scale" parameter before loading the .fd files;
+% but to determine that value we of course need the font's x-height.
+% To avoid triggering the loading of .fd files,
+% we use plain TeX's \font primitive to load the testfont.
+% We then compute the ratio of the current x-height to our font's x-height;
+% this is the "\LibreBskvl@scale" we will pass to the .fd files.
+\ifthenelse{\equal{\LibreBskvl@scale}{MatchLowercase}}
+ { \newlength{\LibreBskvl@currentx}
+ \settoheight{\LibreBskvl@currentx}{x}
+ \newlength{\LibreBskvl@xheight}
+ \settoheight{\LibreBskvl@xheight}
+ {{\font\testfont=LibreBskvl-Regular-lf-ot1 at \f@size pt\testfont x}}
+ \renewcommand*{\LibreBskvl@scale}
+ {\strip@pt\dimexpr\number\numexpr\number\dimexpr\LibreBskvl@currentx\relax*65536/\number\dimexpr\LibreBskvl@xheight\relax\relax sp\relax}}
+ {}
+
+\renewcommand*
+ {\rmdefault}
+ {LibreBskvl-\LibreBskvl@figurealign\LibreBskvl@figurestyle}
+
+\endinput
diff --git a/fonts/librebaskerville/latex/OT1LibreBskvl-LF.fd b/fonts/librebaskerville/latex/OT1LibreBskvl-LF.fd
index 28cc888913..d6febb4e22 100644
--- a/fonts/librebaskerville/latex/OT1LibreBskvl-LF.fd
+++ b/fonts/librebaskerville/latex/OT1LibreBskvl-LF.fd
@@ -41,6 +41,14 @@
<-> \LibreBskvl@@scale LibreBskvl-Bold-lf-ot1
}{}
+\DeclareFontShape{OT1}{LibreBskvl-LF}{bold}{it}{
+ <-> \LibreBskvl@@scale LibreBskvl-BoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{LibreBskvl-LF}{bold}{sl}{
+ <-> ssub * LibreBskvl-LF/bold/it
+}{}
+
%
% Extra 'alias' rules to map the standard NFSS codes to our fancy names
%
@@ -62,12 +70,28 @@
% b --> bold
+\DeclareFontShape{OT1}{LibreBskvl-LF}{b}{sl}{
+ <-> alias * LibreBskvl-LF/bold/sl
+}{}
+
\DeclareFontShape{OT1}{LibreBskvl-LF}{b}{n}{
<-> alias * LibreBskvl-LF/bold/n
}{}
+\DeclareFontShape{OT1}{LibreBskvl-LF}{b}{it}{
+ <-> alias * LibreBskvl-LF/bold/it
+}{}
+
\DeclareFontShape{OT1}{LibreBskvl-LF}{bx}{n}{
<-> ssub * LibreBskvl-LF/b/n
}{}
+\DeclareFontShape{OT1}{LibreBskvl-LF}{bx}{sl}{
+ <-> ssub * LibreBskvl-LF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{LibreBskvl-LF}{bx}{it}{
+ <-> ssub * LibreBskvl-LF/b/it
+}{}
+
\endinput
diff --git a/fonts/librebaskerville/latex/OT1LibreBskvl-Sup.fd b/fonts/librebaskerville/latex/OT1LibreBskvl-Sup.fd
index 34a543bba0..38ed25bd2c 100644
--- a/fonts/librebaskerville/latex/OT1LibreBskvl-Sup.fd
+++ b/fonts/librebaskerville/latex/OT1LibreBskvl-Sup.fd
@@ -41,6 +41,14 @@
<-> \LibreBskvl@@scale LibreBskvl-Bold-sup-ot1
}{}
+\DeclareFontShape{OT1}{LibreBskvl-Sup}{bold}{it}{
+ <-> \LibreBskvl@@scale LibreBskvl-BoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{LibreBskvl-Sup}{bold}{sl}{
+ <-> ssub * LibreBskvl-Sup/bold/it
+}{}
+
%
% Extra 'alias' rules to map the standard NFSS codes to our fancy names
%
@@ -62,12 +70,28 @@
% b --> bold
+\DeclareFontShape{OT1}{LibreBskvl-Sup}{b}{sl}{
+ <-> alias * LibreBskvl-Sup/bold/sl
+}{}
+
\DeclareFontShape{OT1}{LibreBskvl-Sup}{b}{n}{
<-> alias * LibreBskvl-Sup/bold/n
}{}
+\DeclareFontShape{OT1}{LibreBskvl-Sup}{b}{it}{
+ <-> alias * LibreBskvl-Sup/bold/it
+}{}
+
\DeclareFontShape{OT1}{LibreBskvl-Sup}{bx}{n}{
<-> ssub * LibreBskvl-Sup/b/n
}{}
+\DeclareFontShape{OT1}{LibreBskvl-Sup}{bx}{sl}{
+ <-> ssub * LibreBskvl-Sup/b/sl
+}{}
+
+\DeclareFontShape{OT1}{LibreBskvl-Sup}{bx}{it}{
+ <-> ssub * LibreBskvl-Sup/b/it
+}{}
+
\endinput
diff --git a/fonts/librebaskerville/latex/T1LibreBskvl-LF.fd b/fonts/librebaskerville/latex/T1LibreBskvl-LF.fd
index 56ed58e0f9..a521c01269 100644
--- a/fonts/librebaskerville/latex/T1LibreBskvl-LF.fd
+++ b/fonts/librebaskerville/latex/T1LibreBskvl-LF.fd
@@ -41,6 +41,14 @@
<-> \LibreBskvl@@scale LibreBskvl-Bold-lf-t1
}{}
+\DeclareFontShape{T1}{LibreBskvl-LF}{bold}{it}{
+ <-> \LibreBskvl@@scale LibreBskvl-BoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{LibreBskvl-LF}{bold}{sl}{
+ <-> ssub * LibreBskvl-LF/bold/it
+}{}
+
%
% Extra 'alias' rules to map the standard NFSS codes to our fancy names
%
@@ -62,12 +70,28 @@
% b --> bold
+\DeclareFontShape{T1}{LibreBskvl-LF}{b}{sl}{
+ <-> alias * LibreBskvl-LF/bold/sl
+}{}
+
\DeclareFontShape{T1}{LibreBskvl-LF}{b}{n}{
<-> alias * LibreBskvl-LF/bold/n
}{}
+\DeclareFontShape{T1}{LibreBskvl-LF}{b}{it}{
+ <-> alias * LibreBskvl-LF/bold/it
+}{}
+
\DeclareFontShape{T1}{LibreBskvl-LF}{bx}{n}{
<-> ssub * LibreBskvl-LF/b/n
}{}
+\DeclareFontShape{T1}{LibreBskvl-LF}{bx}{sl}{
+ <-> ssub * LibreBskvl-LF/b/sl
+}{}
+
+\DeclareFontShape{T1}{LibreBskvl-LF}{bx}{it}{
+ <-> ssub * LibreBskvl-LF/b/it
+}{}
+
\endinput
diff --git a/fonts/librebaskerville/latex/T1LibreBskvl-Sup.fd b/fonts/librebaskerville/latex/T1LibreBskvl-Sup.fd
index 0f0fccc70f..9f1f45e503 100644
--- a/fonts/librebaskerville/latex/T1LibreBskvl-Sup.fd
+++ b/fonts/librebaskerville/latex/T1LibreBskvl-Sup.fd
@@ -41,6 +41,14 @@
<-> \LibreBskvl@@scale LibreBskvl-Bold-sup-t1
}{}
+\DeclareFontShape{T1}{LibreBskvl-Sup}{bold}{it}{
+ <-> \LibreBskvl@@scale LibreBskvl-BoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{LibreBskvl-Sup}{bold}{sl}{
+ <-> ssub * LibreBskvl-Sup/bold/it
+}{}
+
%
% Extra 'alias' rules to map the standard NFSS codes to our fancy names
%
@@ -62,12 +70,28 @@
% b --> bold
+\DeclareFontShape{T1}{LibreBskvl-Sup}{b}{sl}{
+ <-> alias * LibreBskvl-Sup/bold/sl
+}{}
+
\DeclareFontShape{T1}{LibreBskvl-Sup}{b}{n}{
<-> alias * LibreBskvl-Sup/bold/n
}{}
+\DeclareFontShape{T1}{LibreBskvl-Sup}{b}{it}{
+ <-> alias * LibreBskvl-Sup/bold/it
+}{}
+
\DeclareFontShape{T1}{LibreBskvl-Sup}{bx}{n}{
<-> ssub * LibreBskvl-Sup/b/n
}{}
+\DeclareFontShape{T1}{LibreBskvl-Sup}{bx}{sl}{
+ <-> ssub * LibreBskvl-Sup/b/sl
+}{}
+
+\DeclareFontShape{T1}{LibreBskvl-Sup}{bx}{it}{
+ <-> ssub * LibreBskvl-Sup/b/it
+}{}
+
\endinput
diff --git a/fonts/librebaskerville/latex/TS1LibreBskvl-LF.fd b/fonts/librebaskerville/latex/TS1LibreBskvl-LF.fd
index 053893001e..e7bd770a82 100644
--- a/fonts/librebaskerville/latex/TS1LibreBskvl-LF.fd
+++ b/fonts/librebaskerville/latex/TS1LibreBskvl-LF.fd
@@ -41,6 +41,14 @@
<-> \LibreBskvl@@scale LibreBskvl-Bold-lf-ts1
}{}
+\DeclareFontShape{TS1}{LibreBskvl-LF}{bold}{it}{
+ <-> \LibreBskvl@@scale LibreBskvl-BoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{LibreBskvl-LF}{bold}{sl}{
+ <-> ssub * LibreBskvl-LF/bold/it
+}{}
+
%
% Extra 'alias' rules to map the standard NFSS codes to our fancy names
%
@@ -62,12 +70,28 @@
% b --> bold
+\DeclareFontShape{TS1}{LibreBskvl-LF}{b}{sl}{
+ <-> alias * LibreBskvl-LF/bold/sl
+}{}
+
\DeclareFontShape{TS1}{LibreBskvl-LF}{b}{n}{
<-> alias * LibreBskvl-LF/bold/n
}{}
+\DeclareFontShape{TS1}{LibreBskvl-LF}{b}{it}{
+ <-> alias * LibreBskvl-LF/bold/it
+}{}
+
\DeclareFontShape{TS1}{LibreBskvl-LF}{bx}{n}{
<-> ssub * LibreBskvl-LF/b/n
}{}
+\DeclareFontShape{TS1}{LibreBskvl-LF}{bx}{sl}{
+ <-> ssub * LibreBskvl-LF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{LibreBskvl-LF}{bx}{it}{
+ <-> ssub * LibreBskvl-LF/b/it
+}{}
+
\endinput
diff --git a/fonts/librebaskerville/latex/librebaskerville.sty b/fonts/librebaskerville/latex/librebaskerville.sty
index 8700cdfa35..e30362dcb8 100644
--- a/fonts/librebaskerville/latex/librebaskerville.sty
+++ b/fonts/librebaskerville/latex/librebaskerville.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{librebaskerville}[%
- 2020/07/28 (Bob Tennent) Supports LibreBaskerville fonts for all LaTeX engines. ]
+ 2020/07/29 (Bob Tennent) Supports LibreBaskerville fonts for all LaTeX engines. ]
\RequirePackage{ifxetex,ifluatex,textcomp}
@@ -37,12 +37,14 @@
[ UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-Bold ,
+ BoldItalicFont = LibreBskvl-BoldItalic,
]
{LibreBaskerville}
\newfontfamily\librebaskerville
[ UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-Bold ,
+ BoldItalicFont = LibreBskvl-BoldItalic,
]
{LibreBaskerville}
\providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}}
diff --git a/fonts/librebaskerville/map/LibreBaskerville.map b/fonts/librebaskerville/map/LibreBaskerville.map
index 3b8c3e6215..325daedd1d 100644
--- a/fonts/librebaskerville/map/LibreBaskerville.map
+++ b/fonts/librebaskerville/map/LibreBaskerville.map
@@ -1,5 +1,12 @@
% Automatically maintained by otftotfm or other programs. Do not edit.
+LibreBskvl-BoldItalic-sup-ot1 LibreBskvl-BoldItalic "AutoEnc_p6yehxsl2c5oq6rlgs5qbdprqa ReEncodeFont" <[lbskvl_p6yehx.enc <LibreBskvl-BoldItalic.pfb
+LibreBskvl-BoldItalic-sup-ly1--base LibreBskvl-BoldItalic "AutoEnc_yeotsr6o4yrhzxgnwzr7vod3ca ReEncodeFont" <[lbskvl_yeotsr.enc <LibreBskvl-BoldItalic.pfb
+LibreBskvl-BoldItalic-sup-t1--base LibreBskvl-BoldItalic "AutoEnc_4yc6wbf5o5xsiezmmnzenarz2b ReEncodeFont" <[lbskvl_4yc6wb.enc <LibreBskvl-BoldItalic.pfb
+LibreBskvl-BoldItalic-lf-ot1 LibreBskvl-BoldItalic "AutoEnc_4uz6a2melkgi2nfsinzqmqjrog ReEncodeFont" <[lbskvl_4uz6a2.enc <LibreBskvl-BoldItalic.pfb
+LibreBskvl-BoldItalic-lf-ly1--base LibreBskvl-BoldItalic "AutoEnc_ufnakejmq66d2q7od2fmvev6bg ReEncodeFont" <[lbskvl_ufnake.enc <LibreBskvl-BoldItalic.pfb
+LibreBskvl-BoldItalic-lf-t1--base LibreBskvl-BoldItalic "AutoEnc_uf5aa7qjk6zmrqsgnyzon5oxdh ReEncodeFont" <[lbskvl_uf5aa7.enc <LibreBskvl-BoldItalic.pfb
+LibreBskvl-BoldItalic-lf-ts1--base LibreBskvl-BoldItalic "AutoEnc_6hj2rapzurgnmpgep5fle5mloc ReEncodeFont" <[lbskvl_6hj2ra.enc <LibreBskvl-BoldItalic.pfb
LibreBskvl-Bold-sup-ot1 LibreBskvl-Bold "AutoEnc_p6yehxsl2c5oq6rlgs5qbdprqa ReEncodeFont" <[lbskvl_p6yehx.enc <LibreBskvl-Bold.pfb
LibreBskvl-Bold-sup-ly1--base LibreBskvl-Bold "AutoEnc_yeotsr6o4yrhzxgnwzr7vod3ca ReEncodeFont" <[lbskvl_yeotsr.enc <LibreBskvl-Bold.pfb
LibreBskvl-Bold-sup-t1--base LibreBskvl-Bold "AutoEnc_4yc6wbf5o5xsiezmmnzenarz2b ReEncodeFont" <[lbskvl_4yc6wb.enc <LibreBskvl-Bold.pfb
diff --git a/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ly1--base.tfm b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ly1--base.tfm
new file mode 100644
index 0000000000..925477bcd6
--- /dev/null
+++ b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ly1--base.tfm
Binary files differ
diff --git a/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ly1.tfm b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ly1.tfm
new file mode 100644
index 0000000000..2cadae02c5
--- /dev/null
+++ b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ly1.tfm
Binary files differ
diff --git a/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ot1.tfm b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ot1.tfm
new file mode 100644
index 0000000000..c56be6c544
--- /dev/null
+++ b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ot1.tfm
Binary files differ
diff --git a/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-t1--base.tfm b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-t1--base.tfm
new file mode 100644
index 0000000000..391412b9c7
--- /dev/null
+++ b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-t1.tfm b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-t1.tfm
new file mode 100644
index 0000000000..9c72df09dd
--- /dev/null
+++ b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-t1.tfm
Binary files differ
diff --git a/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ts1--base.tfm b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ts1--base.tfm
new file mode 100644
index 0000000000..dd41311d6a
--- /dev/null
+++ b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ts1.tfm b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ts1.tfm
new file mode 100644
index 0000000000..84d69271f8
--- /dev/null
+++ b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-lf-ts1.tfm
Binary files differ
diff --git a/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-ly1--base.tfm b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-ly1--base.tfm
new file mode 100644
index 0000000000..06d69a88a1
--- /dev/null
+++ b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-ly1--base.tfm
Binary files differ
diff --git a/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-ly1.tfm b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-ly1.tfm
new file mode 100644
index 0000000000..592270f4b0
--- /dev/null
+++ b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-ly1.tfm
Binary files differ
diff --git a/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-ot1.tfm b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-ot1.tfm
new file mode 100644
index 0000000000..6579b466dc
--- /dev/null
+++ b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-ot1.tfm
Binary files differ
diff --git a/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-t1--base.tfm b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-t1--base.tfm
new file mode 100644
index 0000000000..bcd9ea129c
--- /dev/null
+++ b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-t1.tfm b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-t1.tfm
new file mode 100644
index 0000000000..83e6108379
--- /dev/null
+++ b/fonts/librebaskerville/tfm/LibreBskvl-BoldItalic-sup-t1.tfm
Binary files differ
diff --git a/fonts/librebaskerville/truetype/LibreBskvl-BoldItalic.ttf b/fonts/librebaskerville/truetype/LibreBskvl-BoldItalic.ttf
new file mode 100644
index 0000000000..a35f570204
--- /dev/null
+++ b/fonts/librebaskerville/truetype/LibreBskvl-BoldItalic.ttf
Binary files differ
diff --git a/fonts/librebaskerville/type1/LibreBskvl-BoldItalic.pfb b/fonts/librebaskerville/type1/LibreBskvl-BoldItalic.pfb
new file mode 100644
index 0000000000..21d72c49e2
--- /dev/null
+++ b/fonts/librebaskerville/type1/LibreBskvl-BoldItalic.pfb
Binary files differ
diff --git a/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-lf-ly1.vf b/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-lf-ly1.vf
new file mode 100644
index 0000000000..647178f1db
--- /dev/null
+++ b/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-lf-ly1.vf
Binary files differ
diff --git a/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-lf-t1.vf b/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-lf-t1.vf
new file mode 100644
index 0000000000..e465636209
--- /dev/null
+++ b/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-lf-t1.vf
Binary files differ
diff --git a/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-lf-ts1.vf b/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-lf-ts1.vf
new file mode 100644
index 0000000000..d0551b544f
--- /dev/null
+++ b/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-lf-ts1.vf
Binary files differ
diff --git a/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-sup-ly1.vf b/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-sup-ly1.vf
new file mode 100644
index 0000000000..8e1bf8c540
--- /dev/null
+++ b/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-sup-ly1.vf
Binary files differ
diff --git a/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-sup-t1.vf b/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-sup-t1.vf
new file mode 100644
index 0000000000..681ad41e1b
--- /dev/null
+++ b/fonts/librebaskerville/vf/LibreBskvl-BoldItalic-sup-t1.vf
Binary files differ
diff --git a/fonts/lobster2/README b/fonts/lobster2/README
index ca5ab57fe7..159fd900d7 100644
--- a/fonts/lobster2/README
+++ b/fonts/lobster2/README
@@ -1,34 +1,40 @@
-This is the README for the LobsterTwo package, version 2020-07-22.
-
-This package provides the Lobster Two family of fonts,
-designed by Pablo Impallari. This is a family of script
-fonts with many ligatures and terminal forms for use with
-XeLaTeX or LuaLaTeX. There are two weights and italic
-variants for both.
-
-To install this package on a TDS-compliant TeX system
-download the file tex-archive/install/fonts/lobster2.tds.zip
-and unzip 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 LobsterTwo.map.
+This is the README for the LobsterTwo package, version 2020-07-29.
+
+This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support
+for the Lobster Two family of fonts, designed by Pablo Impallari.
+This is a family of script fonts with many ligatures and terminal
+forms; for the best results, use XeLaTeX or LuaLaTeX. There are two
+weights and italic variants for both.
+
+To install this package on a TDS-compliant TeX system download
+the file "tex-archive"/install/fonts/lobster2.tds.zip, where the
+preferred URL for "tex-archive" is http://mirror.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
+LobsterTwo.map.
To use, add
\usepackage{LobsterTwo}
-to the preamble of your document. This will activate Lobster
-Two as the main (serifed) text font.
+to the preamble of your document. This will activate Lobster Two
+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.
+Options scaled=<number> or scale=<number> may be used to scale the
+fonts.
-The only figure style supported is proportional-lining.
+The only figure style supported is proportional-lining. Font encodings
+supported are OT1, T1, LY1 and TS1; for best results, use LY1.
Macro \LobsterTwo selects the Lobster Two family.
-The original fonts are available at http://www.google.com
-and are licensed under the SIL Open Font License, (version
-1.1); the text may be found in the doc directory. The
-maintainer of this package is Bob Tennent (rdt at
-cs.queensu.ca).
+The original fonts are available at http://www.google.com and are
+licensed under the SIL Open Font License, (version 1.1); the text
+may be found in the doc directory. The support files and the type1
+variants were created using autoinst 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/fonts/lobster2/doc/lobster2-samples.pdf b/fonts/lobster2/doc/lobster2-samples.pdf
index 4cf4b02371..e492f5eb69 100644
--- a/fonts/lobster2/doc/lobster2-samples.pdf
+++ b/fonts/lobster2/doc/lobster2-samples.pdf
Binary files differ
diff --git a/fonts/lobster2/enc/lbstr_2rydtx.enc b/fonts/lobster2/enc/lbstr_2rydtx.enc
new file mode 100644
index 0000000000..ae7b69caaa
--- /dev/null
+++ b/fonts/lobster2/enc/lbstr_2rydtx.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2rydtxan5zvryhkciglaoeolte
+% Encoding created by otftotfm on Tue Jul 28 21:50:40 2020
+% Command line follows encoding
+/AutoEnc_2rydtxan5zvryhkciglaoeolte [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /E_x /F_i /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /T_h /dotlessi /.notdef /ff /fi /fl /ffi /ffl
+%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
+ /T_i /Aogonek /Cacute /Ccaron /d.end /u.end /Eogonek /Gbreve
+ /a_x /a_z /Lslash /Nacute /b_s /c_x /Ohungarumlaut /c_z
+%90
+ /e_x /Sacute /Scaron /e_z /f_t /f_u /Uhungarumlaut /f_x
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /g_p /dcroat /section
+%A0
+ /g_x /aogonek /cacute /ccaron /g_z /i_x /eogonek /gbreve
+ /i_z /j_x /lslash /nacute /j_z /l_x /ohungarumlaut /l_z
+%B0
+ /m_x /sacute /scaron /m_z /n_z /o_s /uhungarumlaut /o_x
+ /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/impallari/lobster2
+% --vf-directory=texmf/fonts/vf/impallari/lobster2
+% --type1-directory=texmf/fonts/type1/impallari/lobster2
+% --encoding-directory=texmf/fonts/enc/dvips/lobster2
+% --map-file=texmf/fonts/map/dvips/lobster2/Lbstr.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Lbstr-BoldItalic.otf
+% Lbstr-BoldItalic-lf-t1'
diff --git a/fonts/lobster2/enc/lbstr_bucufw.enc b/fonts/lobster2/enc/lbstr_bucufw.enc
new file mode 100644
index 0000000000..5552db0fae
--- /dev/null
+++ b/fonts/lobster2/enc/lbstr_bucufw.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_bucufwnzcetjsph7rxnncoqmjd
+% Encoding created by otftotfm on Tue Jul 28 21:50:40 2020
+% Command line follows encoding
+/AutoEnc_bucufwnzcetjsph7rxnncoqmjd [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+ /dotlessi /.notdef /grave /acute /caron /breve /.notdef /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 /hungarumlaut /tilde /dieresis
+%80
+ /E_x /F_i /T_h /T_i /IJ /d.end /u.end /ij
+ /a_x /a_z /Lslash /b_s /c_x /c_z /e_x /e_z
+%90
+ /f_t /f_u /f_x /g_p /g_x /g_z /i_x /i_z
+ /j_x /j_z /l_x /l_z /m_x /m_z /n_z /o_s
+%A0
+ /o_x /r_x /r_z /s_x /s_z /t_x /t_z /u_v
+ /u_x /y_p /lslash /y_x /y_z /f_f_t /f_i_x /f_i_z
+%B0
+ /f_l_x /f_l_z /b_s_x /b_s_z /o_ae /o_s_x /o_s_z /a.end
+ /c.end /e.end /g.end /h.end /i.end /j.end /k.end /l.end
+%C0
+ /m.end /n.end /o.end /s.end /t.end /x.end /y.end /fi.end
+ /fl.end /a_x.end /b_s.end /e_x.end /f_u.end /i_x.end /ij.end /o_s.end
+%D0
+ /u_x.end /.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/impallari/lobster2
+% --vf-directory=texmf/fonts/vf/impallari/lobster2
+% --type1-directory=texmf/fonts/type1/impallari/lobster2
+% --encoding-directory=texmf/fonts/enc/dvips/lobster2
+% --map-file=texmf/fonts/map/dvips/lobster2/Lbstr.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Lbstr-BoldItalic.otf Lbstr-BoldItalic-lf-ot1'
diff --git a/fonts/lobster2/enc/lbstr_pvoz5h.enc b/fonts/lobster2/enc/lbstr_pvoz5h.enc
new file mode 100644
index 0000000000..fed2ec42e0
--- /dev/null
+++ b/fonts/lobster2/enc/lbstr_pvoz5h.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_pvoz5hsgwinjn7v2zvsvoldswh
+% Encoding created by otftotfm on Tue Jul 28 21:50:40 2020
+% Command line follows encoding
+/AutoEnc_pvoz5hsgwinjn7v2zvsvoldswh [
+%00
+ /E_x /Euro /F_i /T_h /d.end /u.end /hungarumlaut /ogonek
+ /T_i /IJ /.notdef /ffl /ffi /ff /fl /fi
+%10
+ /dotlessi /.notdef /grave /acute /caron /breve /ij /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
+ /a_x /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /a_z
+%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/impallari/lobster2
+% --vf-directory=texmf/fonts/vf/impallari/lobster2
+% --type1-directory=texmf/fonts/type1/impallari/lobster2
+% --encoding-directory=texmf/fonts/enc/dvips/lobster2
+% --map-file=texmf/fonts/map/dvips/lobster2/Lbstr.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Lbstr-BoldItalic.otf
+% Lbstr-BoldItalic-lf-ly1'
diff --git a/fonts/lobster2/enc/lbstr_t7yaon.enc b/fonts/lobster2/enc/lbstr_t7yaon.enc
new file mode 100644
index 0000000000..da52251c48
--- /dev/null
+++ b/fonts/lobster2/enc/lbstr_t7yaon.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_t7yaonlyowlpa3ms34zhn2lipa
+% Encoding created by otftotfm on Tue Jul 28 21:50:40 2020
+% Command line follows encoding
+/AutoEnc_t7yaonlyowlpa3ms34zhn2lipa [
+%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 /.notdef
+%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 /.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 /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 /.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/impallari/lobster2
+% --vf-directory=texmf/fonts/vf/impallari/lobster2
+% --type1-directory=texmf/fonts/type1/impallari/lobster2
+% --encoding-directory=texmf/fonts/enc/dvips/lobster2
+% --map-file=texmf/fonts/map/dvips/lobster2/Lbstr.map --no-updmap
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 Lbstr-BoldItalic.otf
+% Lbstr-BoldItalic-lf-ts1'
diff --git a/fonts/lobster2/latex/LY1Lbstr-LF.fd b/fonts/lobster2/latex/LY1Lbstr-LF.fd
new file mode 100644
index 0000000000..3c17ae2181
--- /dev/null
+++ b/fonts/lobster2/latex/LY1Lbstr-LF.fd
@@ -0,0 +1,97 @@
+%% Generated by autoinst on 2020/07/28
+%%
+\ProvidesFile{LY1Lbstr-LF.fd}
+ [2020/07/28 (autoinst) Font definitions for LY1/Lbstr-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Lbstr@scale\endcsname\relax
+ \let\Lbstr@@scale\@empty
+\else
+ \edef\Lbstr@@scale{s*[\csname Lbstr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Lbstr-LF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{Lbstr-LF}{regular}{n}{
+ <-> \Lbstr@@scale Lbstr-Regular-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Lbstr-LF}{regular}{it}{
+ <-> \Lbstr@@scale Lbstr-Italic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Lbstr-LF}{regular}{sl}{
+ <-> ssub * Lbstr-LF/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{Lbstr-LF}{bold}{n}{
+ <-> \Lbstr@@scale Lbstr-Bold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Lbstr-LF}{bold}{it}{
+ <-> \Lbstr@@scale Lbstr-BoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Lbstr-LF}{bold}{sl}{
+ <-> ssub * Lbstr-LF/bold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{LY1}{Lbstr-LF}{m}{sl}{
+ <-> alias * Lbstr-LF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{Lbstr-LF}{m}{n}{
+ <-> alias * Lbstr-LF/regular/n
+}{}
+
+\DeclareFontShape{LY1}{Lbstr-LF}{m}{it}{
+ <-> alias * Lbstr-LF/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LY1}{Lbstr-LF}{b}{sl}{
+ <-> alias * Lbstr-LF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{Lbstr-LF}{b}{n}{
+ <-> alias * Lbstr-LF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{Lbstr-LF}{b}{it}{
+ <-> alias * Lbstr-LF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{Lbstr-LF}{bx}{n}{
+ <-> ssub * Lbstr-LF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Lbstr-LF}{bx}{sl}{
+ <-> ssub * Lbstr-LF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{Lbstr-LF}{bx}{it}{
+ <-> ssub * Lbstr-LF/b/it
+}{}
+
+\endinput
diff --git a/fonts/lobster2/latex/LobsterTwo.sty b/fonts/lobster2/latex/LobsterTwo.sty
index 324c209567..c8bca9b8fb 100644
--- a/fonts/lobster2/latex/LobsterTwo.sty
+++ b/fonts/lobster2/latex/LobsterTwo.sty
@@ -1,46 +1,64 @@
\ProvidesPackage{LobsterTwo}[%
- 2020/07/22 (Bob Tennent) Supports Lobster Two fonts for modern LaTeX engines. ]
+ 2020/07/29 (Bob Tennent) Supports Lobster Two fonts for all LaTeX engines. ]
-\RequirePackage{iftex}
-
-\ifpdftex
-\PackageError{lobster2}{%
- *****************************************\MessageBreak
- Please Process using xelatex or lualatex\MessageBreak
- *****************************************}
-\fi
+\RequirePackage{ifxetex,ifluatex,textcomp}
+\newif\ifLobsterTwo@otf
+\ifxetex
+ \LobsterTwo@otftrue
+\else\ifluatex
+ \LobsterTwo@otftrue
+\else % [pdf]LaTeX
+ \LobsterTwo@otffalse
+\fi\fi
\newcommand*{\LobsterTwo@scale}{1}
\RequirePackage{xkeyval}
\DeclareOptionX{scaled}{\renewcommand*{\LobsterTwo@scale}{#1}}
\DeclareOptionX{scale}{\renewcommand*{\LobsterTwo@scale}{#1}}
+\DeclareOptionX{type1}{\LobsterTwo@otffalse}
+
\ProcessOptionsX\relax
-\RequirePackage{fontspec}
-
-\ifxetex\XeTeXtracingfonts=1\fi
-\defaultfontfeatures{
- Ligatures = TeX ,
- Extension = .ttf ,
- Scale = \LobsterTwo@scale ,
-}
-\setmainfont
- [ UprightFont = *-Regular ,
- ItalicFont = *-Italic ,
- BoldFont = *-Bold ,
- BoldItalicFont = *-BoldItalic ]
- {LobsterTwo}
-\newfontfamily\LobsterTwo
- [ UprightFont = *-Regular ,
- ItalicFont = *-Italic ,
- BoldFont = *-Bold ,
- BoldItalicFont = *-BoldItalic ]
- {LobsterTwo}
+\ifLobsterTwo@otf
+ \RequirePackage{fontspec}
+\else
+ \RequirePackage{fontenc,fontaxes}
+\fi
+
+\ifLobsterTwo@otf
+ \ifxetex\XeTeXtracingfonts=1\fi
+ \defaultfontfeatures{
+ Ligatures = TeX ,
+ Extension = .otf ,
+ Scale = \LobsterTwo@scale ,
+ }
+ \setmainfont
+ [ UprightFont = *-Regular ,
+ ItalicFont = *-Italic ,
+ BoldFont = *-Bold ,
+ BoldItalicFont = *-BoldItalic ]
+ {LobsterTwo}
+ \newfontfamily\LobsterTwo
+ [ UprightFont = *-Regular ,
+ ItalicFont = *-Italic ,
+ BoldFont = *-Bold ,
+ BoldItalicFont = *-BoldItalic ]
+ {LobsterTwo}
+
+\else % type1
+
+ \def\LobsterTwofamily{Lbstr-LF}
+ \renewcommand*\rmdefault{\LobsterTwofamily}
+ \newcommand*\LobsterTwo{\fontfamily{\LobsterTwofamily}\selectfont}
+
+\fi
% turn off defaults in case other fonts are selected:
-\defaultfontfeatures{}
+\ifLobsterTwo@otf
+ \defaultfontfeatures{}
+\fi
\endinput
diff --git a/fonts/lobster2/latex/OT1Lbstr-LF.fd b/fonts/lobster2/latex/OT1Lbstr-LF.fd
new file mode 100644
index 0000000000..a241c40607
--- /dev/null
+++ b/fonts/lobster2/latex/OT1Lbstr-LF.fd
@@ -0,0 +1,97 @@
+%% Generated by autoinst on 2020/07/28
+%%
+\ProvidesFile{OT1Lbstr-LF.fd}
+ [2020/07/28 (autoinst) Font definitions for OT1/Lbstr-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Lbstr@scale\endcsname\relax
+ \let\Lbstr@@scale\@empty
+\else
+ \edef\Lbstr@@scale{s*[\csname Lbstr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Lbstr-LF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{Lbstr-LF}{regular}{n}{
+ <-> \Lbstr@@scale Lbstr-Regular-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Lbstr-LF}{regular}{it}{
+ <-> \Lbstr@@scale Lbstr-Italic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Lbstr-LF}{regular}{sl}{
+ <-> ssub * Lbstr-LF/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{Lbstr-LF}{bold}{n}{
+ <-> \Lbstr@@scale Lbstr-Bold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Lbstr-LF}{bold}{it}{
+ <-> \Lbstr@@scale Lbstr-BoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Lbstr-LF}{bold}{sl}{
+ <-> ssub * Lbstr-LF/bold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{OT1}{Lbstr-LF}{m}{sl}{
+ <-> alias * Lbstr-LF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{Lbstr-LF}{m}{n}{
+ <-> alias * Lbstr-LF/regular/n
+}{}
+
+\DeclareFontShape{OT1}{Lbstr-LF}{m}{it}{
+ <-> alias * Lbstr-LF/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{OT1}{Lbstr-LF}{b}{sl}{
+ <-> alias * Lbstr-LF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{Lbstr-LF}{b}{n}{
+ <-> alias * Lbstr-LF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{Lbstr-LF}{b}{it}{
+ <-> alias * Lbstr-LF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{Lbstr-LF}{bx}{n}{
+ <-> ssub * Lbstr-LF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Lbstr-LF}{bx}{sl}{
+ <-> ssub * Lbstr-LF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{Lbstr-LF}{bx}{it}{
+ <-> ssub * Lbstr-LF/b/it
+}{}
+
+\endinput
diff --git a/fonts/lobster2/latex/T1Lbstr-LF.fd b/fonts/lobster2/latex/T1Lbstr-LF.fd
new file mode 100644
index 0000000000..d38a17c3aa
--- /dev/null
+++ b/fonts/lobster2/latex/T1Lbstr-LF.fd
@@ -0,0 +1,97 @@
+%% Generated by autoinst on 2020/07/28
+%%
+\ProvidesFile{T1Lbstr-LF.fd}
+ [2020/07/28 (autoinst) Font definitions for T1/Lbstr-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Lbstr@scale\endcsname\relax
+ \let\Lbstr@@scale\@empty
+\else
+ \edef\Lbstr@@scale{s*[\csname Lbstr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Lbstr-LF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{Lbstr-LF}{regular}{n}{
+ <-> \Lbstr@@scale Lbstr-Regular-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Lbstr-LF}{regular}{it}{
+ <-> \Lbstr@@scale Lbstr-Italic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Lbstr-LF}{regular}{sl}{
+ <-> ssub * Lbstr-LF/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{Lbstr-LF}{bold}{n}{
+ <-> \Lbstr@@scale Lbstr-Bold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Lbstr-LF}{bold}{it}{
+ <-> \Lbstr@@scale Lbstr-BoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Lbstr-LF}{bold}{sl}{
+ <-> ssub * Lbstr-LF/bold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{T1}{Lbstr-LF}{m}{sl}{
+ <-> alias * Lbstr-LF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{Lbstr-LF}{m}{n}{
+ <-> alias * Lbstr-LF/regular/n
+}{}
+
+\DeclareFontShape{T1}{Lbstr-LF}{m}{it}{
+ <-> alias * Lbstr-LF/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{T1}{Lbstr-LF}{b}{sl}{
+ <-> alias * Lbstr-LF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{Lbstr-LF}{b}{n}{
+ <-> alias * Lbstr-LF/bold/n
+}{}
+
+\DeclareFontShape{T1}{Lbstr-LF}{b}{it}{
+ <-> alias * Lbstr-LF/bold/it
+}{}
+
+\DeclareFontShape{T1}{Lbstr-LF}{bx}{n}{
+ <-> ssub * Lbstr-LF/b/n
+}{}
+
+\DeclareFontShape{T1}{Lbstr-LF}{bx}{sl}{
+ <-> ssub * Lbstr-LF/b/sl
+}{}
+
+\DeclareFontShape{T1}{Lbstr-LF}{bx}{it}{
+ <-> ssub * Lbstr-LF/b/it
+}{}
+
+\endinput
diff --git a/fonts/lobster2/latex/TS1Lbstr-LF.fd b/fonts/lobster2/latex/TS1Lbstr-LF.fd
new file mode 100644
index 0000000000..69bd29ad1c
--- /dev/null
+++ b/fonts/lobster2/latex/TS1Lbstr-LF.fd
@@ -0,0 +1,97 @@
+%% Generated by autoinst on 2020/07/28
+%%
+\ProvidesFile{TS1Lbstr-LF.fd}
+ [2020/07/28 (autoinst) Font definitions for TS1/Lbstr-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Lbstr@scale\endcsname\relax
+ \let\Lbstr@@scale\@empty
+\else
+ \edef\Lbstr@@scale{s*[\csname Lbstr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Lbstr-LF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{Lbstr-LF}{regular}{n}{
+ <-> \Lbstr@@scale Lbstr-Regular-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Lbstr-LF}{regular}{it}{
+ <-> \Lbstr@@scale Lbstr-Italic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Lbstr-LF}{regular}{sl}{
+ <-> ssub * Lbstr-LF/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{Lbstr-LF}{bold}{n}{
+ <-> \Lbstr@@scale Lbstr-Bold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Lbstr-LF}{bold}{it}{
+ <-> \Lbstr@@scale Lbstr-BoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Lbstr-LF}{bold}{sl}{
+ <-> ssub * Lbstr-LF/bold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{TS1}{Lbstr-LF}{m}{sl}{
+ <-> alias * Lbstr-LF/regular/sl
+}{}
+
+\DeclareFontShape{TS1}{Lbstr-LF}{m}{n}{
+ <-> alias * Lbstr-LF/regular/n
+}{}
+
+\DeclareFontShape{TS1}{Lbstr-LF}{m}{it}{
+ <-> alias * Lbstr-LF/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{TS1}{Lbstr-LF}{b}{sl}{
+ <-> alias * Lbstr-LF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{Lbstr-LF}{b}{n}{
+ <-> alias * Lbstr-LF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{Lbstr-LF}{b}{it}{
+ <-> alias * Lbstr-LF/bold/it
+}{}
+
+\DeclareFontShape{TS1}{Lbstr-LF}{bx}{n}{
+ <-> ssub * Lbstr-LF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Lbstr-LF}{bx}{sl}{
+ <-> ssub * Lbstr-LF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{Lbstr-LF}{bx}{it}{
+ <-> ssub * Lbstr-LF/b/it
+}{}
+
+\endinput
diff --git a/fonts/lobster2/map/LobsterTwo.map b/fonts/lobster2/map/LobsterTwo.map
new file mode 100644
index 0000000000..98f2a7cbac
--- /dev/null
+++ b/fonts/lobster2/map/LobsterTwo.map
@@ -0,0 +1,30 @@
+% Automatically maintained by otftotfm or other programs. Do not edit.
+
+Lbstr-BoldItalic-lf-ot1--lcdfj Lbstr-BoldItalicLCDFJ "" <Lbstr-BoldItalicLCDFJ.pfb
+Lbstr-BoldItalic-lf-ot1--base Lbstr-BoldItalic "AutoEnc_bucufwnzcetjsph7rxnncoqmjd ReEncodeFont" <[lbstr_bucufw.enc <Lbstr-BoldItalic.pfb
+Lbstr-BoldItalic-lf-t1--lcdfj Lbstr-BoldItalicLCDFJ "" <Lbstr-BoldItalicLCDFJ.pfb
+Lbstr-BoldItalic-lf-t1--base Lbstr-BoldItalic "AutoEnc_2rydtxan5zvryhkciglaoeolte ReEncodeFont" <[lbstr_2rydtx.enc <Lbstr-BoldItalic.pfb
+Lbstr-BoldItalic-lf-ly1--lcdfj Lbstr-BoldItalicLCDFJ "" <Lbstr-BoldItalicLCDFJ.pfb
+Lbstr-BoldItalic-lf-ly1--base Lbstr-BoldItalic "AutoEnc_pvoz5hsgwinjn7v2zvsvoldswh ReEncodeFont" <[lbstr_pvoz5h.enc <Lbstr-BoldItalic.pfb
+Lbstr-BoldItalic-lf-ts1--base Lbstr-BoldItalic "AutoEnc_t7yaonlyowlpa3ms34zhn2lipa ReEncodeFont" <[lbstr_t7yaon.enc <Lbstr-BoldItalic.pfb
+Lbstr-Bold-lf-ot1--lcdfj Lbstr-BoldLCDFJ "" <Lbstr-BoldLCDFJ.pfb
+Lbstr-Bold-lf-ot1--base Lbstr-Bold "AutoEnc_bucufwnzcetjsph7rxnncoqmjd ReEncodeFont" <[lbstr_bucufw.enc <Lbstr-Bold.pfb
+Lbstr-Bold-lf-t1--lcdfj Lbstr-BoldLCDFJ "" <Lbstr-BoldLCDFJ.pfb
+Lbstr-Bold-lf-t1--base Lbstr-Bold "AutoEnc_2rydtxan5zvryhkciglaoeolte ReEncodeFont" <[lbstr_2rydtx.enc <Lbstr-Bold.pfb
+Lbstr-Bold-lf-ly1--lcdfj Lbstr-BoldLCDFJ "" <Lbstr-BoldLCDFJ.pfb
+Lbstr-Bold-lf-ly1--base Lbstr-Bold "AutoEnc_pvoz5hsgwinjn7v2zvsvoldswh ReEncodeFont" <[lbstr_pvoz5h.enc <Lbstr-Bold.pfb
+Lbstr-Bold-lf-ts1--base Lbstr-Bold "AutoEnc_t7yaonlyowlpa3ms34zhn2lipa ReEncodeFont" <[lbstr_t7yaon.enc <Lbstr-Bold.pfb
+Lbstr-Italic-lf-ot1--lcdfj Lbstr-ItalicLCDFJ "" <Lbstr-ItalicLCDFJ.pfb
+Lbstr-Italic-lf-ot1--base Lbstr-Italic "AutoEnc_bucufwnzcetjsph7rxnncoqmjd ReEncodeFont" <[lbstr_bucufw.enc <Lbstr-Italic.pfb
+Lbstr-Italic-lf-t1--lcdfj Lbstr-ItalicLCDFJ "" <Lbstr-ItalicLCDFJ.pfb
+Lbstr-Italic-lf-t1--base Lbstr-Italic "AutoEnc_2rydtxan5zvryhkciglaoeolte ReEncodeFont" <[lbstr_2rydtx.enc <Lbstr-Italic.pfb
+Lbstr-Italic-lf-ly1--lcdfj Lbstr-ItalicLCDFJ "" <Lbstr-ItalicLCDFJ.pfb
+Lbstr-Italic-lf-ly1--base Lbstr-Italic "AutoEnc_pvoz5hsgwinjn7v2zvsvoldswh ReEncodeFont" <[lbstr_pvoz5h.enc <Lbstr-Italic.pfb
+Lbstr-Italic-lf-ts1--base Lbstr-Italic "AutoEnc_t7yaonlyowlpa3ms34zhn2lipa ReEncodeFont" <[lbstr_t7yaon.enc <Lbstr-Italic.pfb
+Lbstr-Regular-lf-ot1--lcdfj Lbstr-RegularLCDFJ "" <Lbstr-RegularLCDFJ.pfb
+Lbstr-Regular-lf-ot1--base Lbstr-Regular "AutoEnc_bucufwnzcetjsph7rxnncoqmjd ReEncodeFont" <[lbstr_bucufw.enc <Lbstr-Regular.pfb
+Lbstr-Regular-lf-t1--lcdfj Lbstr-RegularLCDFJ "" <Lbstr-RegularLCDFJ.pfb
+Lbstr-Regular-lf-t1--base Lbstr-Regular "AutoEnc_2rydtxan5zvryhkciglaoeolte ReEncodeFont" <[lbstr_2rydtx.enc <Lbstr-Regular.pfb
+Lbstr-Regular-lf-ly1--lcdfj Lbstr-RegularLCDFJ "" <Lbstr-RegularLCDFJ.pfb
+Lbstr-Regular-lf-ly1--base Lbstr-Regular "AutoEnc_pvoz5hsgwinjn7v2zvsvoldswh ReEncodeFont" <[lbstr_pvoz5h.enc <Lbstr-Regular.pfb
+Lbstr-Regular-lf-ts1--base Lbstr-Regular "AutoEnc_t7yaonlyowlpa3ms34zhn2lipa ReEncodeFont" <[lbstr_t7yaon.enc <Lbstr-Regular.pfb
diff --git a/fonts/lobster2/opentype/LobsterTwo-Bold.otf b/fonts/lobster2/opentype/LobsterTwo-Bold.otf
new file mode 100644
index 0000000000..d4bc8a1cbd
--- /dev/null
+++ b/fonts/lobster2/opentype/LobsterTwo-Bold.otf
Binary files differ
diff --git a/fonts/lobster2/opentype/LobsterTwo-BoldItalic.otf b/fonts/lobster2/opentype/LobsterTwo-BoldItalic.otf
new file mode 100644
index 0000000000..ac0d1fd97a
--- /dev/null
+++ b/fonts/lobster2/opentype/LobsterTwo-BoldItalic.otf
Binary files differ
diff --git a/fonts/lobster2/opentype/LobsterTwo-Italic.otf b/fonts/lobster2/opentype/LobsterTwo-Italic.otf
new file mode 100644
index 0000000000..fc4ca1507e
--- /dev/null
+++ b/fonts/lobster2/opentype/LobsterTwo-Italic.otf
Binary files differ
diff --git a/fonts/lobster2/opentype/LobsterTwo-Regular.otf b/fonts/lobster2/opentype/LobsterTwo-Regular.otf
new file mode 100644
index 0000000000..e41e05f744
--- /dev/null
+++ b/fonts/lobster2/opentype/LobsterTwo-Regular.otf
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Bold-lf-ly1--base.tfm b/fonts/lobster2/tfm/Lbstr-Bold-lf-ly1--base.tfm
new file mode 100644
index 0000000000..4a91c8ea05
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Bold-lf-ly1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Bold-lf-ly1--lcdfj.tfm b/fonts/lobster2/tfm/Lbstr-Bold-lf-ly1--lcdfj.tfm
new file mode 100644
index 0000000000..d0f0dc2197
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Bold-lf-ly1--lcdfj.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Bold-lf-ly1.tfm b/fonts/lobster2/tfm/Lbstr-Bold-lf-ly1.tfm
new file mode 100644
index 0000000000..4ea17748f2
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Bold-lf-ly1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Bold-lf-ot1--base.tfm b/fonts/lobster2/tfm/Lbstr-Bold-lf-ot1--base.tfm
new file mode 100644
index 0000000000..6bbff6ff95
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Bold-lf-ot1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Bold-lf-ot1--lcdfj.tfm b/fonts/lobster2/tfm/Lbstr-Bold-lf-ot1--lcdfj.tfm
new file mode 100644
index 0000000000..d0f0dc2197
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Bold-lf-ot1--lcdfj.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Bold-lf-ot1.tfm b/fonts/lobster2/tfm/Lbstr-Bold-lf-ot1.tfm
new file mode 100644
index 0000000000..82e165cf7f
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Bold-lf-ot1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Bold-lf-t1--base.tfm b/fonts/lobster2/tfm/Lbstr-Bold-lf-t1--base.tfm
new file mode 100644
index 0000000000..26ae4a187d
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Bold-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Bold-lf-t1--lcdfj.tfm b/fonts/lobster2/tfm/Lbstr-Bold-lf-t1--lcdfj.tfm
new file mode 100644
index 0000000000..d0f0dc2197
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Bold-lf-t1--lcdfj.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Bold-lf-t1.tfm b/fonts/lobster2/tfm/Lbstr-Bold-lf-t1.tfm
new file mode 100644
index 0000000000..bdf53864c3
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Bold-lf-t1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Bold-lf-ts1--base.tfm b/fonts/lobster2/tfm/Lbstr-Bold-lf-ts1--base.tfm
new file mode 100644
index 0000000000..dd700b9bfa
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Bold-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Bold-lf-ts1.tfm b/fonts/lobster2/tfm/Lbstr-Bold-lf-ts1.tfm
new file mode 100644
index 0000000000..6ab6c434da
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Bold-lf-ts1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ly1--base.tfm b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ly1--base.tfm
new file mode 100644
index 0000000000..b1bb76200c
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ly1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ly1--lcdfj.tfm b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ly1--lcdfj.tfm
new file mode 100644
index 0000000000..2e32bc125b
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ly1--lcdfj.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ly1.tfm b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ly1.tfm
new file mode 100644
index 0000000000..e9ab5807f2
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ly1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ot1--base.tfm b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ot1--base.tfm
new file mode 100644
index 0000000000..b46cab7562
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ot1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ot1--lcdfj.tfm b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ot1--lcdfj.tfm
new file mode 100644
index 0000000000..2e32bc125b
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ot1--lcdfj.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ot1.tfm b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ot1.tfm
new file mode 100644
index 0000000000..9328b4d6fc
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ot1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-t1--base.tfm b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-t1--base.tfm
new file mode 100644
index 0000000000..6e6f96f711
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-t1--lcdfj.tfm b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-t1--lcdfj.tfm
new file mode 100644
index 0000000000..2e32bc125b
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-t1--lcdfj.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-t1.tfm b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-t1.tfm
new file mode 100644
index 0000000000..7c5e8d2aaf
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-t1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ts1--base.tfm b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ts1--base.tfm
new file mode 100644
index 0000000000..36214239ef
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ts1.tfm b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ts1.tfm
new file mode 100644
index 0000000000..3bb39deff0
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-BoldItalic-lf-ts1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Italic-lf-ly1--base.tfm b/fonts/lobster2/tfm/Lbstr-Italic-lf-ly1--base.tfm
new file mode 100644
index 0000000000..c87b1b1d5b
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Italic-lf-ly1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Italic-lf-ly1--lcdfj.tfm b/fonts/lobster2/tfm/Lbstr-Italic-lf-ly1--lcdfj.tfm
new file mode 100644
index 0000000000..b9a7522f0e
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Italic-lf-ly1--lcdfj.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Italic-lf-ly1.tfm b/fonts/lobster2/tfm/Lbstr-Italic-lf-ly1.tfm
new file mode 100644
index 0000000000..6c0d065a00
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Italic-lf-ly1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Italic-lf-ot1--base.tfm b/fonts/lobster2/tfm/Lbstr-Italic-lf-ot1--base.tfm
new file mode 100644
index 0000000000..87a8ee0ddf
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Italic-lf-ot1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Italic-lf-ot1--lcdfj.tfm b/fonts/lobster2/tfm/Lbstr-Italic-lf-ot1--lcdfj.tfm
new file mode 100644
index 0000000000..b9a7522f0e
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Italic-lf-ot1--lcdfj.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Italic-lf-ot1.tfm b/fonts/lobster2/tfm/Lbstr-Italic-lf-ot1.tfm
new file mode 100644
index 0000000000..5083b75418
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Italic-lf-ot1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Italic-lf-t1--base.tfm b/fonts/lobster2/tfm/Lbstr-Italic-lf-t1--base.tfm
new file mode 100644
index 0000000000..7573b3a261
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Italic-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Italic-lf-t1--lcdfj.tfm b/fonts/lobster2/tfm/Lbstr-Italic-lf-t1--lcdfj.tfm
new file mode 100644
index 0000000000..b9a7522f0e
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Italic-lf-t1--lcdfj.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Italic-lf-t1.tfm b/fonts/lobster2/tfm/Lbstr-Italic-lf-t1.tfm
new file mode 100644
index 0000000000..e61d92848a
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Italic-lf-t1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Italic-lf-ts1--base.tfm b/fonts/lobster2/tfm/Lbstr-Italic-lf-ts1--base.tfm
new file mode 100644
index 0000000000..bcac18a3c4
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Italic-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Italic-lf-ts1.tfm b/fonts/lobster2/tfm/Lbstr-Italic-lf-ts1.tfm
new file mode 100644
index 0000000000..686136c2dc
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Italic-lf-ts1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Regular-lf-ly1--base.tfm b/fonts/lobster2/tfm/Lbstr-Regular-lf-ly1--base.tfm
new file mode 100644
index 0000000000..089e84cd7e
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Regular-lf-ly1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Regular-lf-ly1--lcdfj.tfm b/fonts/lobster2/tfm/Lbstr-Regular-lf-ly1--lcdfj.tfm
new file mode 100644
index 0000000000..38f0678966
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Regular-lf-ly1--lcdfj.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Regular-lf-ly1.tfm b/fonts/lobster2/tfm/Lbstr-Regular-lf-ly1.tfm
new file mode 100644
index 0000000000..7dd9967e89
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Regular-lf-ly1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Regular-lf-ot1--base.tfm b/fonts/lobster2/tfm/Lbstr-Regular-lf-ot1--base.tfm
new file mode 100644
index 0000000000..fa9cde1e93
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Regular-lf-ot1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Regular-lf-ot1--lcdfj.tfm b/fonts/lobster2/tfm/Lbstr-Regular-lf-ot1--lcdfj.tfm
new file mode 100644
index 0000000000..38f0678966
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Regular-lf-ot1--lcdfj.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Regular-lf-ot1.tfm b/fonts/lobster2/tfm/Lbstr-Regular-lf-ot1.tfm
new file mode 100644
index 0000000000..206a03139b
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Regular-lf-ot1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Regular-lf-t1--base.tfm b/fonts/lobster2/tfm/Lbstr-Regular-lf-t1--base.tfm
new file mode 100644
index 0000000000..89aec9fe20
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Regular-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Regular-lf-t1--lcdfj.tfm b/fonts/lobster2/tfm/Lbstr-Regular-lf-t1--lcdfj.tfm
new file mode 100644
index 0000000000..38f0678966
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Regular-lf-t1--lcdfj.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Regular-lf-t1.tfm b/fonts/lobster2/tfm/Lbstr-Regular-lf-t1.tfm
new file mode 100644
index 0000000000..c8f47390e8
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Regular-lf-t1.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Regular-lf-ts1--base.tfm b/fonts/lobster2/tfm/Lbstr-Regular-lf-ts1--base.tfm
new file mode 100644
index 0000000000..54f0c72386
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Regular-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/lobster2/tfm/Lbstr-Regular-lf-ts1.tfm b/fonts/lobster2/tfm/Lbstr-Regular-lf-ts1.tfm
new file mode 100644
index 0000000000..afad1b9bc5
--- /dev/null
+++ b/fonts/lobster2/tfm/Lbstr-Regular-lf-ts1.tfm
Binary files differ
diff --git a/fonts/lobster2/truetype/LobsterTwo-Bold.ttf b/fonts/lobster2/truetype/LobsterTwo-Bold.ttf
deleted file mode 100644
index ffb1f5ef3a..0000000000
--- a/fonts/lobster2/truetype/LobsterTwo-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/lobster2/truetype/LobsterTwo-BoldItalic.ttf b/fonts/lobster2/truetype/LobsterTwo-BoldItalic.ttf
deleted file mode 100644
index 1a9a2c5882..0000000000
--- a/fonts/lobster2/truetype/LobsterTwo-BoldItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/lobster2/truetype/LobsterTwo-Italic.ttf b/fonts/lobster2/truetype/LobsterTwo-Italic.ttf
deleted file mode 100644
index 26fbca8cbb..0000000000
--- a/fonts/lobster2/truetype/LobsterTwo-Italic.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/lobster2/truetype/LobsterTwo-Regular.ttf b/fonts/lobster2/truetype/LobsterTwo-Regular.ttf
deleted file mode 100644
index f3c629d944..0000000000
--- a/fonts/lobster2/truetype/LobsterTwo-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/lobster2/type1/Lbstr-Bold.pfb b/fonts/lobster2/type1/Lbstr-Bold.pfb
new file mode 100644
index 0000000000..32696b2e4f
--- /dev/null
+++ b/fonts/lobster2/type1/Lbstr-Bold.pfb
Binary files differ
diff --git a/fonts/lobster2/type1/Lbstr-BoldItalic.pfb b/fonts/lobster2/type1/Lbstr-BoldItalic.pfb
new file mode 100644
index 0000000000..64685d4bd5
--- /dev/null
+++ b/fonts/lobster2/type1/Lbstr-BoldItalic.pfb
Binary files differ
diff --git a/fonts/lobster2/type1/Lbstr-BoldItalicLCDFJ.pfb b/fonts/lobster2/type1/Lbstr-BoldItalicLCDFJ.pfb
new file mode 100644
index 0000000000..fa57713e6e
--- /dev/null
+++ b/fonts/lobster2/type1/Lbstr-BoldItalicLCDFJ.pfb
Binary files differ
diff --git a/fonts/lobster2/type1/Lbstr-BoldLCDFJ.pfb b/fonts/lobster2/type1/Lbstr-BoldLCDFJ.pfb
new file mode 100644
index 0000000000..9c7c989388
--- /dev/null
+++ b/fonts/lobster2/type1/Lbstr-BoldLCDFJ.pfb
Binary files differ
diff --git a/fonts/lobster2/type1/Lbstr-Italic.pfb b/fonts/lobster2/type1/Lbstr-Italic.pfb
new file mode 100644
index 0000000000..e775ccb2e6
--- /dev/null
+++ b/fonts/lobster2/type1/Lbstr-Italic.pfb
Binary files differ
diff --git a/fonts/lobster2/type1/Lbstr-ItalicLCDFJ.pfb b/fonts/lobster2/type1/Lbstr-ItalicLCDFJ.pfb
new file mode 100644
index 0000000000..dc4f7a79bf
--- /dev/null
+++ b/fonts/lobster2/type1/Lbstr-ItalicLCDFJ.pfb
Binary files differ
diff --git a/fonts/lobster2/type1/Lbstr-Regular.pfb b/fonts/lobster2/type1/Lbstr-Regular.pfb
new file mode 100644
index 0000000000..1c2ca45c9a
--- /dev/null
+++ b/fonts/lobster2/type1/Lbstr-Regular.pfb
Binary files differ
diff --git a/fonts/lobster2/type1/Lbstr-RegularLCDFJ.pfb b/fonts/lobster2/type1/Lbstr-RegularLCDFJ.pfb
new file mode 100644
index 0000000000..f20cd1f07a
--- /dev/null
+++ b/fonts/lobster2/type1/Lbstr-RegularLCDFJ.pfb
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-Bold-lf-ly1.vf b/fonts/lobster2/vf/Lbstr-Bold-lf-ly1.vf
new file mode 100644
index 0000000000..b46acc2bd7
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-Bold-lf-ly1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-Bold-lf-ot1.vf b/fonts/lobster2/vf/Lbstr-Bold-lf-ot1.vf
new file mode 100644
index 0000000000..7af8009047
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-Bold-lf-ot1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-Bold-lf-t1.vf b/fonts/lobster2/vf/Lbstr-Bold-lf-t1.vf
new file mode 100644
index 0000000000..71bcfd28fa
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-Bold-lf-t1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-Bold-lf-ts1.vf b/fonts/lobster2/vf/Lbstr-Bold-lf-ts1.vf
new file mode 100644
index 0000000000..4a25530230
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-Bold-lf-ts1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-BoldItalic-lf-ly1.vf b/fonts/lobster2/vf/Lbstr-BoldItalic-lf-ly1.vf
new file mode 100644
index 0000000000..1c10d4367f
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-BoldItalic-lf-ly1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-BoldItalic-lf-ot1.vf b/fonts/lobster2/vf/Lbstr-BoldItalic-lf-ot1.vf
new file mode 100644
index 0000000000..b17cdd9a43
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-BoldItalic-lf-ot1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-BoldItalic-lf-t1.vf b/fonts/lobster2/vf/Lbstr-BoldItalic-lf-t1.vf
new file mode 100644
index 0000000000..f60f9c3d0a
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-BoldItalic-lf-t1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-BoldItalic-lf-ts1.vf b/fonts/lobster2/vf/Lbstr-BoldItalic-lf-ts1.vf
new file mode 100644
index 0000000000..b59e125bc7
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-BoldItalic-lf-ts1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-Italic-lf-ly1.vf b/fonts/lobster2/vf/Lbstr-Italic-lf-ly1.vf
new file mode 100644
index 0000000000..78fe155807
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-Italic-lf-ly1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-Italic-lf-ot1.vf b/fonts/lobster2/vf/Lbstr-Italic-lf-ot1.vf
new file mode 100644
index 0000000000..1b83a0f947
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-Italic-lf-ot1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-Italic-lf-t1.vf b/fonts/lobster2/vf/Lbstr-Italic-lf-t1.vf
new file mode 100644
index 0000000000..7b4fd0ab7f
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-Italic-lf-t1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-Italic-lf-ts1.vf b/fonts/lobster2/vf/Lbstr-Italic-lf-ts1.vf
new file mode 100644
index 0000000000..506faa5ea9
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-Italic-lf-ts1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-Regular-lf-ly1.vf b/fonts/lobster2/vf/Lbstr-Regular-lf-ly1.vf
new file mode 100644
index 0000000000..f671fb3ec4
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-Regular-lf-ly1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-Regular-lf-ot1.vf b/fonts/lobster2/vf/Lbstr-Regular-lf-ot1.vf
new file mode 100644
index 0000000000..6f0e068276
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-Regular-lf-ot1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-Regular-lf-t1.vf b/fonts/lobster2/vf/Lbstr-Regular-lf-t1.vf
new file mode 100644
index 0000000000..3bed804f57
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-Regular-lf-t1.vf
Binary files differ
diff --git a/fonts/lobster2/vf/Lbstr-Regular-lf-ts1.vf b/fonts/lobster2/vf/Lbstr-Regular-lf-ts1.vf
new file mode 100644
index 0000000000..9daf0cf2aa
--- /dev/null
+++ b/fonts/lobster2/vf/Lbstr-Regular-lf-ts1.vf
Binary files differ
diff --git a/fonts/utilities/fontools/README b/fonts/utilities/fontools/README
index 50e0114ac2..d6c1bb177f 100644
--- a/fonts/utilities/fontools/README
+++ b/fonts/utilities/fontools/README
@@ -32,9 +32,10 @@ Perl
for Windows, try ActivePerl (http://www.activestate.com)
or Strawberry Perl (http://strawberryperl.com).
-LCDF TypeTools
- Of course, Autoinst needs the LCDF TypeTools;
- they should be installed in a directory on your PATH.
+LCDF TypeTools and T1Utils
+ Of course, Autoinst needs the LCDF TypeTools and T1Utils
+ (available from www.lcdf.org/type, and also on CTAN and in TeXLive);
+ these should be installed in a directory on your PATH.
Kpathsea
Automatically installing the fonts into a suitable TEXMF tree
diff --git a/fonts/utilities/fontools/bin/afm2afm b/fonts/utilities/fontools/bin/afm2afm
index a2718125c0..d379d73fb7 100755
--- a/fonts/utilities/fontools/bin/afm2afm
+++ b/fonts/utilities/fontools/bin/afm2afm
@@ -37,7 +37,7 @@ use File::Basename;
use Getopt::Long;
use Pod::Usage;
-my $VERSION = "20200619";
+my $VERSION = "20200729";
parse_commandline();
@@ -421,7 +421,7 @@ See the GNU General Public License for more details.
=head1 VERSION
-This document describes B<afm2afm> version 20200619.
+This document describes B<afm2afm> version 20200729.
=head1 RECENT CHANGES
diff --git a/fonts/utilities/fontools/bin/autoinst b/fonts/utilities/fontools/bin/autoinst
index 1dde782834..494f84b6dc 100755
--- a/fonts/utilities/fontools/bin/autoinst
+++ b/fonts/utilities/fontools/bin/autoinst
@@ -40,7 +40,7 @@ use Getopt::Long ();
use Pod::Usage ();
use POSIX ();
-my $VERSION = '20200619';
+my $VERSION = '20200729';
my ($d, $m, $y) = (localtime time)[3 .. 5];
my $TODAY = sprintf "%04d/%02d/%02d", $y + 1900, $m + 1, $d;
@@ -129,8 +129,19 @@ sub main {
$log->log_commands(\@commands) if $ARGV{verbose} >= 1;
if (!$ARGV{dryrun}) {
+ $nfss_mapping = NFSS::invert_mapping($nfss_mapping);
LaTeX::create_support_files(\@workitems, $family, $nfss_mapping);
Otftotfm::run_commands(\@commands, $family, $log);
+
+ if ($ARGV{t1suffix}) {
+ Work::modify_fontnames($family, $fontlist);
+ }
+
+ print <<"END_MESSAGE_UPDMAP";
+[INFO] Done generating fonts!
+ Please update TeX's databases (by calling 'texhash' and 'updmap'
+ or their equivalents on your system) before using these fonts.
+END_MESSAGE_UPDMAP
}
$log->close();
@@ -275,6 +286,12 @@ sub new {
sub process_basicinfo {
my ($self, $data) = @_;
+ $self->{originalfamily} = $data->{family};
+
+ for my $key (keys %{$data}) {
+ $data->{$key} =~ s/\s+//xmsg;
+ }
+
$data->{family} = $data->{preferredfamily} || $data->{family};
$data->{subfamily} = $data->{preferredsubfamily} || $data->{subfamily};
$data->{fullname} =~ s/\A$data->{family}//xms;
@@ -282,9 +299,7 @@ sub process_basicinfo {
# clean up family name (it's used in LaTeX command names)
my @DIGITS = qw(Zero One Two Three Four Five Six Seven Eight Nine);
- $data->{family} =~ s/\A(?: Adobe | DTL | FF | ITC | LT | MT)//xms;
$data->{family} =~ s/(?: LT | MT)(?: Std | Pro )\z//xms;
- $data->{family} =~ s/ Std \z//xms;
$data->{family} =~ s/(\d)/$DIGITS[$1]/xmsge;
$data->{family} =~ s/[^A-Za-z]+//xmsg;
@@ -403,11 +418,6 @@ sub process_basicinfo {
$self->{weight} = NFSS::unabbreviate(lc($2));
}
- # Strip off the "Text" from family names that contain this string.
- # This was a crude way to fix a bug in the previous paragraph;
- # it's unnecessary now, but we don't want to break the old behaviour.
- $self->{family} =~ s/text \z//xmsi;
-
$self->{basicshape} = NFSS::get_nfss_shape($self->{shape});
# We define 'series' as 'weight + width'. This matches NFSS,
@@ -510,7 +520,6 @@ sub get_basicinfo {
or die "[ERROR] Could not fork(): $!";
my %data = map { my ($k,$v) = m/\A\s* ([^:]+?) \s*:\s* ([^\r\n]+)/xms;
$k =~ s/\s+//xmsg;
- $v =~ s/\s+//xmsg;
(lc $k => $v);
}
grep { m/\A\s* [^:]+? \s*:\s* [^\r\n]+/xms } <$otfinfo>;
@@ -738,27 +747,21 @@ END_STY_MAINFONT
: die "[ERROR] Internal bug, please report!"
;
- my $default_bold;
for my $series (qw(heavy black extrabold demibold semibold bold)) {
if ( $seen{$series} ) {
print {$STY}
"\\DeclareOptionX{$series}{\\edef\\bfseries\@$ARGV{nfss}",
"{$series}}\n";
- $default_bold = $series;
}
}
- $defaults .= ",$default_bold" if $default_bold;
- my $default_regular;
- for my $series (qw(medium book text regular)) {
+ for my $series (qw(medium book text normal regular)) {
if ( $seen{$series} ) {
print {$STY}
"\\DeclareOptionX{$series}{\\edef\\mdseries\@$ARGV{nfss}",
"{$series}}\n";
- $default_regular = $series;
}
}
- $defaults .= ",$default_regular" if $default_regular;
if ($ARGV{math}) {
print {$STY} <<"END_STY_MATHOPTION";
@@ -908,8 +911,9 @@ END_STY_FONTAXES_DNOM
my $testfont = eval {
my $testenc = $ARGV{encoding}[0];
my $testfig = ( grep { exists $data->{$testenc}{$_} }
- qw(OsF LF TOsF TLF) )[0] or die;
- my $testweight = $nfss_mapping->{weight}{""}[0] or die;
+ qw(OsF LF TOsF TLF) )[0] or die;
+ my $testweight = ( grep { $nfss_mapping->{$_} eq "m" }
+ keys %{$nfss_mapping} )[0] or die;
my $testshape
= ( grep { exists $data->{$testenc}{$testfig}{$testweight}{$_} }
qw(n sc it sl)
@@ -1334,12 +1338,21 @@ sub create_fdfile {
END_FD_HEADER
while (my ($series, $fdseries) = each %$data) {
- print {$FD} "\n% ---- $series ----\n\n";
+ my $nfssseries = $nfss_mapping->{$series};
+
+ my $alias = $series;
+ if (defined $nfssseries) {
+ print {$FD} "\n% ---- $nfssseries = $series ----\n\n";
+ $series = $nfssseries;
+ }
+ else {
+ print {$FD} "\n% ---- $series ----\n\n";
+ }
while (my ($shape, $fdshape) = each %$fdseries) {
print {$FD}
"\\DeclareFontShape{$enc}{$fam-$sty}{$series}{$shape}{\n";
my @sizes = sort { $a->[0] <=> $b->[0] }
- @{$fdshape};
+ @{$fdshape};
$sizes[0][0] = $sizes[-1][1] = '';
$sizes[$_][0] = $sizes[$_ - 1][1] for (1 .. $#sizes);
for my $size (@sizes) {
@@ -1347,6 +1360,15 @@ END_FD_HEADER
"\\$fam\@\@scale $size->[2]\n";
}
print {$FD} "}{}\n\n";
+
+ if (defined $nfssseries) {
+ print {$FD} <<"END_ALIAS_SERIES";
+\\DeclareFontShape{$enc}{$fam-$sty}{$alias}{$shape}{
+ <-> alias * $fam-$sty/$nfssseries/$shape
+}{}
+
+END_ALIAS_SERIES
+ }
}
# ssub italic for missing slanted, or vice versa
@@ -1354,51 +1376,33 @@ END_FD_HEADER
if (!exists $fdseries->{$shape} && exists $fdseries->{$replace}) {
print {$FD} <<"END_SSUB_SHAPE";
\\DeclareFontShape{$enc}{$fam-$sty}{$series}{$shape}{
- <-> ssub * $fam-$sty/$series/$replace
+ <-> ssub * $fam-$sty/$series/$replace
}{}
END_SSUB_SHAPE
+ if (defined $nfssseries) {
+ print {$FD} <<"END_SSUB_ALIAS";
+\\DeclareFontShape{$enc}{$fam-$sty}{$alias}{$shape}{
+ <-> ssub * $fam-$sty/$alias/$replace
+}{}
+
+END_SSUB_ALIAS
+ }
$fdseries->{$shape} = 1;
}
}
}
- print {$FD} <<"END_COMMENT";
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-END_COMMENT
my %seen;
- NFSSWEIGHT:
- for my $nfssweight (NFSS::get_all_nfss_weights()) {
- NFSSWIDTH:
- for my $nfsswidth (NFSS::get_all_nfss_widths()) {
- my $nfssseries = ($nfssweight . $nfsswidth) || 'm';
-
- for my $weight (@{$nfss_mapping->{weight}{$nfssweight}}) {
- $weight = '' if $weight eq 'regular';
- for my $width (@{$nfss_mapping->{width}{$nfsswidth}}) {
- $width = '' if $width eq 'regular';
- my $series = ($weight . $width) || 'regular';
- if ( exists $data->{$series} ) {
- print {$FD} "\n% $nfssseries --> $series\n\n";
- for my $shape (keys %{$data->{$series}}) {
- print {$FD} <<"END_SSUB_SERIES";
-\\DeclareFontShape{$enc}{$fam-$sty}{$nfssseries}{$shape}{
- <-> alias * $fam-$sty/$series/$shape
-}{}
-
-END_SSUB_SERIES
- $seen{$nfssseries}{$shape} = 1;
- }
- next NFSSWIDTH;
- }
- }
+ while (my ($series, $nfssseries) = each %{$nfss_mapping}) {
+ if (exists $data->{$series}) {
+ for my $shape (keys %{$data->{$series}}) {
+ $seen{$nfssseries}{$shape} = 1;
}
}
}
- # Add ssub rules to map bx to b
+ print {$FD} "\n% ---- Extra 'ssub' rules to map 'bx' to 'b' ----\n\n";
for my $shape (keys %{$seen{b}}) {
if (!exists $seen{bx}{$shape}) {
print {$FD} <<"END_SSUB_BX";
@@ -1506,18 +1510,19 @@ I'm using the following options:
fractions: @{[ $ARGV{fractions} ? 'yes' : 'no' ]}
ligatures: @{[ $ARGV{ligatures} ? 'yes' : 'no' ]}
- auto/manual: @{[ $ARGV{manual} ? 'manual' : 'auto' ]}
target: $ARGV{target}
extra: $ARGV{extra}
- figurekern: @{[ $ARGV{figurekern} ? 'keep' : 'remove' ]}
+ figurekern: @{[ $ARGV{figurekern} ? 'keep' : 'remove' ]}
nfssweight: @{[ join q{, }, @{$ARGV{nfssweight}} ]}
nfsswidth: @{[ join q{, }, @{$ARGV{nfsswidth}} ]}
- math: @{[ $ARGV{math} ? 'yes' : 'no' ]}
+ math: @{[ $ARGV{math} ? 'yes' : 'no' ]}
mathspacing: $ARGV{mathspacing}
+ fontname suffix: @{[ $ARGV{t1suffix} || '(none)' ]}
+
END_ARGUMENTS
if ($ARGV{fig_height} or $ARGV{fig_width}) {
@@ -1741,7 +1746,7 @@ my %FULL_FORM = (
=cut
my @WEIGHT = (
- ul => [ qw( ultralight thin 100 hairline eight four two ) ],
+ ul => [ qw( ultralight thin 100 hairline ) ],
el => [ qw( extralight 200 ) ],
l => [ qw( light 300 ) ],
sl => [ qw( semilight blond ) ],
@@ -1959,7 +1964,6 @@ sub get_all_shapes {
return @allshapes;
}
-#
# --------------------------------------------------------------------------
# Returns a mapping of NFSS codes to weight and width names.
# --------------------------------------------------------------------------
@@ -2046,6 +2050,34 @@ sub map_nfss_codes {
return $mapping;
}
+# --------------------------------------------------------------------------
+# Returns a mapping of weight and width names to NFSS codes.
+# --------------------------------------------------------------------------
+sub invert_mapping {
+ my $nfss_mapping = shift;
+
+ my %to_nfss;
+ NFSSWEIGHT:
+ for my $nfssweight (NFSS::get_all_nfss_weights()) {
+ next unless @{$nfss_mapping->{weight}{$nfssweight}};
+ my $weight = $nfss_mapping->{weight}{$nfssweight}[0];
+ $weight = "" if $weight eq 'regular';
+
+ NFSSWIDTH:
+ for my $nfsswidth (NFSS::get_all_nfss_widths()) {
+ my $nfssseries = ($nfssweight . $nfsswidth) || 'm';
+
+ next unless @{$nfss_mapping->{width}{$nfsswidth}};
+ my $width = $nfss_mapping->{width}{$nfsswidth}[0];
+ $width = "" if $width eq 'regular';
+ my $series = ($weight . $width) || 'regular';
+ $to_nfss{$series} = $nfssseries;
+ }
+ }
+
+ return \%to_nfss;
+}
+
############################################################################
@@ -2091,8 +2123,6 @@ Possible options:
-target="DIRECTORY" Install files into specified TEXMF tree
-vendor="VENDOR" Only used for naming directories
-typeface="TYPEFACE" Only used for naming directories
- -(no)updmap Toggle running of updmap
- -manual Manual mode (see documentation)
-(no)figurekern Keep or remove kerns between tabular figures
@@ -2109,6 +2139,8 @@ Possible options:
-math Generate basic math fonts
-mathspacing=AMOUNT Letterspace the math fonts by AMOUNT/1000 em
+ -t1suffix=SUFFIX Add SUFFIX to name of generated pfb fonts
+
font[s] The fonts (.otf or .ttf format) to install.
Please report any bugs or suggestions to <marcpenninga@gmail.com>.
@@ -2137,8 +2169,6 @@ END_USAGE
target => '',
vendor => 'lcdftools',
typeface => '',
- updmap => '1', # 0 = no, 1 = yes
- manual => '0', # 0 = no, 1 = yes
dryrun => '0', # 0 = no, 1 = yes
logfile => '',
figurekern => '1', # 0 = no, 1 = yes
@@ -2147,6 +2177,7 @@ END_USAGE
nfssweight => [],
math => 0,
mathspacing => 0,
+ t1suffix => 'none',
);
@@ -2186,9 +2217,7 @@ sub parse_options {
'target=s' => \$ARGV{target},
'vendor=s' => \$ARGV{vendor},
'typeface=s' => \$ARGV{typeface},
- 'updmap!' => \$ARGV{updmap},
'dryrun' => \$ARGV{dryrun},
- 'manual' => \$ARGV{manual},
'figurekern!' => \$ARGV{figurekern},
'logfile=s' => \$ARGV{logfile},
'verbose+' => \$ARGV{verbose},
@@ -2214,6 +2243,7 @@ sub parse_options {
},
'math!' => \$ARGV{math},
'mathspacing=i' => \$ARGV{mathspacing},
+ 't1suffix:s' => \$ARGV{t1suffix},
)
or die "$USAGE";
@@ -2299,13 +2329,11 @@ sub create_command {
|| Util::any( map { $_ eq 'liga' } @{$workitem->{features}} );
return join q( ), 'otftotfm',
- ($ARGV{manual} ? '--pl' : '--automatic'),
+ '--automatic',
"--encoding=$workitem->{enc_file}",
$targetdirs,
'--no-updmap',
- ($workitem->{font}{filename} =~ m/[.]ttf\z/xmsi
- ? '--no-type1'
- : q()),
+ '--force',
($SCHEME{$workitem->{encoding}}
? qq(--coding-scheme="$SCHEME{$workitem->{encoding}}")
: q()),
@@ -2327,44 +2355,33 @@ sub create_command {
# --------------------------------------------------------------------------
-# Executes (or saves to file, when $ARGV{manual} is true) all commands.
+# Executes all commands.
# --------------------------------------------------------------------------
sub run_commands {
my ($commandlist, $family, $log) = @_;
- # Make sure the last command *does* call updmap.
- $commandlist->[-1] =~ s/--no-updmap//xms if $ARGV{updmap};
-
- if ($ARGV{manual}) {
- open my $BAT, '>', 'autoinst.bat'
- or die "[ERROR] Can't create 'autoinst.bat': $!";
- print {$BAT} "$_\n" for @{$commandlist};
- close $BAT;
+ my $oops = 0;
+ $| = 1; # turn on autoflush, to make a poor man's progress bar
+ print "[INFO] Generating fonts for $family ";
+ for my $command (@{$commandlist}) {
+ print '.';
+ open my $otftotfm, '-|', "$command 2>&1"
+ or die "could not fork(): $!";
+ my $msgs = do { local $/; <$otftotfm> };
+ close $otftotfm
+ or do {
+ warn "\n$command\n\n$msgs\n";
+ $log->log("\n$command\n\n$msgs\n");
+ $oops = 1;
+ };
}
- else {
- my $oops = 0;
- $| = 1; # turn on autoflush, to make a poor man's progress bar
- print "[INFO] Generating fonts for $family ";
- for my $command (@{$commandlist}) {
- print '.';
- open my $otftotfm, '-|', "$command 2>&1"
- or die "could not fork(): $!";
- my $msgs = do { local $/; <$otftotfm> };
- close $otftotfm
- or do {
- warn "\n$command\n\n$msgs\n";
- $log->log("\n$command\n\n$msgs\n");
- $oops = 1;
- };
- }
- print "\n";
- $| = 0;
- if ($oops) {
- warn <<"END_OTFTOTFM_WARNING";
+ print "\n";
+ $| = 0;
+ if ($oops) {
+ warn <<"END_OTFTOTFM_WARNING";
[ERROR] One or more calls to 'otftotfm' returned a non-zero status code;
please check the messages above and in the log file.
END_OTFTOTFM_WARNING
- }
}
return;
@@ -2631,6 +2648,7 @@ sub process_options {
process_styles_options();
process_encoding_options();
process_target_options();
+ process_output_options();
return;
}
@@ -2767,21 +2785,7 @@ sub process_encoding_options {
sub process_target_options{
my $localtarget = File::Spec->catdir( Cwd::getcwd(), 'autoinst_output' );
- if ($ARGV{manual}) {
- warn "[WARNING] Option '-target' overridden by '-manual'!\n"
- if $ARGV{target};
- $ARGV{target} = $localtarget;
- $ARGV{updmap} = 0;
- }
- elsif ($ARGV{target}) {
- $ARGV{updmap} = 0;
- warn <<"END_WARNING_TARGET_UPDMAP";
-[WARNING] The '-target' option may interfere with kpathsea and updmap;
- automatic calling of updmap has been disabled.
- Please call updmap manually.
-END_WARNING_TARGET_UPDMAP
- }
- elsif (!$ARGV{target}) {
+ if (!$ARGV{target}) {
my $is_windows_os = ( $^O =~ /^MSWin/i );
my $kpsepath = $is_windows_os
? eval { qx( kpsewhich -expand-var=\$TEXMFLOCAL;\$TEXMFHOME ) }
@@ -2809,7 +2813,6 @@ END_WARNING_KPSEWHICH
if (!$ARGV{target}) {
$ARGV{target} = $localtarget;
- $ARGV{updmap} = 0;
warn <<"END_WARNING_DUMPING_FILES";
[WARNING] No user-writable TEXMF-tree found!
@@ -2835,6 +2838,30 @@ END_WARNING_SPACES_IN_PATHS
# --------------------------------------------------------------------------
+# Processes the output related options.
+# --------------------------------------------------------------------------
+sub process_output_options{
+ # If the user gave -t1suffix *without* value as the last option,
+ # Getopt::Long may mistake the next argument (a font filename)
+ # for the value of -t1suffix; we take care of this case
+ # by testing whether the value refers to an existing file
+ # and repairing things if necessary.
+ if (-e $ARGV{t1suffix}) {
+ unshift @ARGV, $ARGV{t1suffix};
+ $ARGV{t1suffix} = '';
+ }
+
+ $ARGV{t1suffix} ||= 'PS';
+
+ if ($ARGV{t1suffix} eq 'none') {
+ $ARGV{t1suffix} = '';
+ }
+
+ return;
+}
+
+
+# --------------------------------------------------------------------------
# Processes command line options with font family-specific defaults.
# --------------------------------------------------------------------------
sub process_family_dependent_options {
@@ -3127,6 +3154,120 @@ sub cleanup {
}
+# --------------------------------------------------------------------------
+# Modify the font and file names of all generated .pfb files.
+# --------------------------------------------------------------------------
+sub modify_fontnames {
+ my ($family, $fontlist) = @_;
+
+ my %has_fonttype = map { ($_->{fonttype} => 1) } @{$fontlist};
+ return unless $has_fonttype{opentype};
+
+ my $pfb_dir = File::Spec->catdir(
+ $ARGV{target},
+ 'fonts',
+ 'type1',
+ $ARGV{vendor},
+ $ARGV{typeface} || $family);
+
+ # The otftotfm-generated map file refers to the original otf files;
+ # we need to change this to use our name-modifyd Type1 fonts instead.
+ my $mapfile = File::Spec->catfile(
+ $ARGV{target},
+ 'fonts',
+ 'map',
+ 'dvips',
+ $ARGV{typeface} || $family,
+ $family . '.map');
+ open my $map, '<', $mapfile
+ or die "[ERROR] Cannot open '$mapfile' for reading";
+ my $mapdata = do { local $/; <$map> };
+ close $map;
+
+ my $NOTICE = 'Converted to Type1 by autoinst/cfftot1; '
+ . 'for use with pdfTeX only! ';
+
+ my $newfam = $family . $ARGV{t1suffix};
+
+ for my $font (@{$fontlist}) {
+ next unless $font->{fonttype} eq 'opentype';
+
+ my $full_family = $font->{originalfamily};
+ if (index($full_family, $family) > -1) {
+ $full_family = $family;
+ }
+ else {
+ while ($full_family =~ m/[ ]/xms) {
+ (my $no_space = $full_family) =~ s/[ ]+//xmsg;
+ last if $no_space eq $family;
+ $full_family =~ s/[ ]\S*\z//xms;
+ }
+ $full_family ||= $family;
+ }
+ my $newfullfam = $full_family . q( ) . $ARGV{t1suffix};
+
+ my $newname = $font->{name};
+ if ($newname =~ m/$family/xms) {
+ $newname =~ s/$family/$newfam/xms;
+ }
+ else {
+ $newname =~ s/(.+?)(-|\z)/$1$ARGV{t1suffix$2}/xms;
+ }
+
+ for my $suffix (q(), q(LCDFJ)) {
+ my $oldfn = File::Spec->catfile(
+ $pfb_dir, $font->{name} . $suffix . '.pfb');
+ my $newfn = File::Spec->catfile(
+ $pfb_dir, $newname . $suffix . '.pfb');
+
+ next unless -e $oldfn;
+ if ($suffix eq 'LCDFJ' and -z $oldfn) {
+ unlink $oldfn;
+ next;
+ }
+
+ my $cmd = qq(t1disasm "$oldfn");
+ open my $t1disasm, '-|:raw', $cmd
+ or die "[ERROR] Could not fork(): $!";
+ my @pfbdata = readline $t1disasm;
+ close $t1disasm
+ or die "[ERROR] '$cmd' failed";
+
+ for (@pfbdata) {
+ if (m/%!PS-AdobeFont-1.0:[ ] | \/FontName[ ]/xms) {
+ s/$font->{name}/$newname/;
+ }
+ if (m/\/Notice[ ]/xms) {
+ s/[(]/($NOTICE/xms;
+ }
+ if (m/\/FullName[ ] | \/FamilyName[ ]/xms) {
+ s/$full_family/$newfullfam/
+ or s/(.+?)(-|\z)/$1$ARGV{t1suffix}$2/;
+ }
+ }
+
+ $cmd = qq(t1asm --pfb >"$newfn");
+ open my $t1asm, '|-:raw', $cmd
+ or die "[ERROR] Could not fork(): $!";
+ print {$t1asm} @pfbdata;
+ close $t1asm
+ or die "[ERROR] '$cmd' failed";
+
+ unlink $oldfn unless $oldfn eq $newfn;
+
+ $mapdata =~ s/$font->{name}$suffix.pfb/$newname$suffix.pfb/g;
+ }
+ }
+
+ open $map, '>', $mapfile
+ or die "[ERROR] Cannot open '$mapfile' for writing";
+ print {$map} $mapdata;
+ close $map;
+
+ return;
+}
+
+
############################################################################
@@ -3291,13 +3432,9 @@ Titling characters; see above
ornaments
-=item I<Numr>
-
-numerators
-
-=item I<Dnom>
+=item I<Numr>, I<Dnom>
-denominators
+numerators and denominators
=back
@@ -3345,20 +3482,20 @@ so that its x-height matches that of the previously active font
font package before this one).
The name C<scaled> may be used as a synonym for C<scale>.
-=item C<medium>, C<book>, C<text>, C<regular>
+=item C<medium>, C<book>, C<text>, C<normal>, C<regular>
-Select the weight that LaTeX will use as the `regular' weight;
-the default is C<regular>.
+Select the weight that LaTeX will use as the `regular' weight.
=item C<heavy>, C<black>, C<extrabold>, C<demibold>, C<semibold>, C<bold>
-Select the weight that LaTeX will use as the `bold' weight;
-the default is C<bold>.
+Select the weight that LaTeX will use as the `bold' weight.
=back
The last two groups of options will only work if
you have the F<mweights> package installed.
+The default here is not to change LaTeX's default,
+i.e. use the `m' and `b' weights.
The style file will also try to load the F<fontaxes> package
(on CTAN), which gives easy access to various font shapes and styles.
@@ -3459,7 +3596,7 @@ these offending characters.
Once again: test the results before using them!
If the characters themselves are fine but spaced too tightly,
you may try increasing the side bearings in math fonts with
-the I<-mathspacing> option (see below), e.g. C<-mathspacing=100>.
+the I<-mathspacing> option (see below), e.g. C<-mathspacing=50>.
=head2 NFSS codes
@@ -3492,17 +3629,10 @@ The mapping of shapes to NFSS codes is done using the following table:
we map the first of these to `n', for the second one we (ab)use the `it' code
as this family doesn't contain an Italic shape.)
-The mapping of weights and widths to NFSS codes is a more complex,
-two-step proces.
-In the first step, all fonts are assigned a `series' name that is simply
-the concatenation of its weight and width
-(after expanding any abbreviations and converting to lowercase).
-A font with `Cond' width and `Ultra' weight will then be known
-as `ultrablackcondensed'.
-
-In the second step, B<autoinst> tries to map all combinations of NFSS codes
+For weights and widths, B<autoinst> tries to the standard NFSS codes
(ul, el, l, sl, m, sb, b, eb and ub for weights;
-uc, ec, c, sc, m, sx, x, ex and ux for widths) to actual fonts.
+uc, ec, c, sc, m, sx, x, ex and ux for widths)
+as much as possible.
Of course, not all 81 combinations of these NFSS weights and widths will map
to existing fonts;
and conversely it may not be possible to assign every existing font
@@ -3510,12 +3640,14 @@ a unique code in a sane way (especially for the weights, some font families
offer more choices or finer granularity than NFSS's codes can handle;
e.g., Fira Sans contains fifteen(!) different weights,
including an additional `Medium' weight between Regular and Semibold).
+Therefore every font is also assigned a `series' name that is simply
+the concatenation of its weight and width
+(after expanding any abbreviations and converting to lowercase).
+A font with `Cond' width and `Ultra' weight will then be known
+as `ultrablackcondensed'.
-B<autoinst> tries hard to ensure that the most common NFSS codes
-(and high-level commands such as C<\bfseries>,
-which are built on top of those codes) will `just work'.
-
-To see exactly which NFSS codes map to which fonts, see the log file
+The exact mapping between fonts and NFSS codes can be found
+in the generated F<fd> files and in the log file
(pro tip: run B<autoinst> with the I<-dryrun> option
to check the chosen mapping beforehand).
The I<-nfssweight> and I<-nfsswidth> command-line options can be used
@@ -3548,6 +3680,55 @@ differently, and fonts and style files generated by those versions
are not compatible with files generated by newer versions.
+=head1 WARNINGS AND CAVEATS
+
+=head2 OpenType fonts and licensing issues
+
+Since F<pdfTeX> cannot subset otf-flavoured OpenType fonts,
+I<otftotfm> will convert such fonts to Type1 (pfb) format.
+However, many fonts (at least those licensed under the SIL Open Font License)
+do not allow distributing such converted versions under their original name.
+
+To meet these licensing requirements, B<autoinst> provides
+a C<-t1suffix> command-line option that appends
+a (user-defined) suffix to the names (both filename and internal font name)
+of all generated Type1 fonts; see L</COMMAND-LINE OPTIONS> below.
+
+
+=head2 A note for MiKTeX users
+
+Automatically installing the fonts into a suitable TEXMF tree
+(as B<autoinst> tries to do by default) only works for TeX-installations
+that use the F<kpathsea> library; with TeX distributions that implement
+their own directory searching (such as MiKTeX), B<autoinst> will complain
+that it cannot find the F<kpsewhich> program and move all generated files
+into a subdirectory C<./autoinst_output/> of the current directory.
+If you use such a TeX distribution, you should either move these files
+to their correct destinations by hand, or use the I<-target> option
+(see L</COMMAND-LINE OPTIONS> below) to manually specify a TEXMF tree.
+
+Also, some OpenType fonts contain so many kerning pairs that the resulting
+F<pl> and F<vpl> files are too big for MiKTeX's F<pltotf> and F<vptovf>;
+the versions that come with W32TeX (F<http://www.w32tex.org>)
+and TeXLive (F<http://tug.org/texlive>) don't seem to have this problem.
+
+
+=head2 A note for MacTeX users
+
+By default, B<autoinst> will try to install all generated files into
+the $TEXMFLOCAL tree; when this directory isn't user-writable,
+it will use the $TEXMFHOME tree instead. Unfortunately, MacTeX's version
+of C<updmap-sys> doesn't search in $TEXMFHOME,
+and hence MacTeX will not find the new fonts.
+
+To remedy this, either run B<autoinst> as root (so that it can install
+everything into $TEXMFLOCAL) or manually run C<updmap -user> to tell
+TeX about the files in $TEXMFHOME.
+The latter option does, however, have some caveats;
+see F<https://tug.org/texlive/scripts-sys-user.html>.
+
+
+
=head1 COMMAND-LINE OPTIONS
B<autoinst> tries hard to do The Right Thing (TM) by default,
@@ -3560,11 +3741,9 @@ and option names may be shortened to a unique prefix
but B<-e> is ambiguous (it may mean either B<-encoding> or B<-extra>)).
-=over 4
-
-=item B<-version>
+=head2 General options
-Print B<autoinst>'s version number and exit.
+=over 4
=item B<-help>
@@ -3575,16 +3754,21 @@ Print a (relatively) short help text and exit.
Don't generate output; just parse input fonts and write
a log file saying what B<autoinst> would have done.
-=item B<-logfile>=I<filename>
-
-Write log data to F<filename> instead of the default F<< <fontfamily>.log >>.
-If the file already exists, B<autoinst> appends to it;
-it doesn't overwrite an existing file.
-
=item B<-verbose>
Add more details to the log file.
+=item B<-version>
+
+Print B<autoinst>'s version number and exit.
+
+=back
+
+
+=head2 Font creation options
+
+=over 4
+
=item B<-encoding>=I<encoding[,encoding]>
Generate the specified encoding(s) for the text fonts.
@@ -3605,27 +3789,6 @@ Control the creation of TS1-encoded fonts. The default is B<-ts1>
if the text encodings (see I<-encoding> above) include T1,
B<-nots1> otherwise.
-=item B<-serif>/B<-sanserif>/B<-typewriter>
-
-Install the font as a serif, sanserif or typewriter font, respectively.
-This changes how you access the font in LaTeX:
-with C<\rmfamily>/C<\textrm>, C<\sffamily>/C<\textsf>
-or C<\ttfamily>/C<\texttt>.
-
-Installing the font as a typewriter font will cause two further changes:
-it will - by default - turn off the use of f-ligatures
-(though this can be overridden with the I<-ligatures> option),
-and it will disable hyphenation for this font.
-This latter effect cannot be re-enabled in B<autoinst>;
-if you want typewriter text to be hyphenated, use the F<hyphenat> package.
-
-If none of these options is specified, B<autoinst> tries to guess:
-if the font's filename contains the string `mono'
-or if the field C<isFixedPitch> in the font's I<post> table is True,
-it will select B<-typewriter>;
-else if the filename contains `sans' it will select B<-sanserif>;
-otherwise it will opt for B<-serif>.
-
=item B<-lining>/B<-nolining>
Control the creation of fonts with lining figures. The default is
@@ -3666,7 +3829,7 @@ The default is B<-superiors>.
=item B<-noinferiors>
-=item B<-inferiors> [= B<none> | B<auto> | B<subs> | B<sinf> | B<dnom> ]
+=item B<-inferiors> [ = B<none> | B<auto> | B<subs> | B<sinf> | B<dnom> ]
The OpenType standard defines several kinds of digits that might be used
as inferiors or subscripts: `Subscripts' (OpenType feature `subs'),
@@ -3687,22 +3850,42 @@ with inferiors at all; it won't try to substitute one of the other styles. >>
Control the creation of fonts with numerators and denominators.
The default is B<-nofractions>.
-=item B<-ornaments>/B<-noornaments>
-
-Control the creation of ornament fonts. The default is B<-ornaments>.
-
=item B<-ligatures>/B<-noligatures>
Some fonts create glyphs for the standard f-ligatures (ff, fi, fl, ffi, ffl),
but don't provide a `liga' feature to access these.
This option tells B<autoinst> to add extra C<LIGKERN> rules to
the generated fonts to enable the use of these ligatures.
-The default is B<-ligatures>,
-unless the user specified the I<-typewriter> option.
+The default is B<-ligatures>, except for typewriter fonts.
-Specify B<-noligatures> to disable the generation of ligatures even for fonts
+Specify B<-noligatures> to disable generation of ligatures even for fonts
that do contain a `liga' feature.
+=item B<-ornaments>/B<-noornaments>
+
+Control the creation of ornament fonts. The default is B<-ornaments>.
+
+=item B<-serif>/B<-sanserif>/B<-typewriter>
+
+Install the font as a serif, sanserif or typewriter font, respectively.
+This changes how you access the font in LaTeX:
+with C<\rmfamily>/C<\textrm>, C<\sffamily>/C<\textsf>
+or C<\ttfamily>/C<\texttt>.
+
+Installing the font as a typewriter font will cause two further changes:
+it will - by default - turn off the use of f-ligatures
+(though this can be overridden with the I<-ligatures> option),
+and it will disable hyphenation for this font.
+This latter effect cannot be re-enabled in B<autoinst>;
+if you want typewriter text to be hyphenated, use the F<hyphenat> package.
+
+If none of these options is specified, B<autoinst> tries to guess:
+if the font's filename contains the string `mono'
+or if the field C<isFixedPitch> in the font's I<post> table is True,
+it will select B<-typewriter>;
+else if the filename contains `sans' it will select B<-sanserif>;
+otherwise it will opt for B<-serif>.
+
=item B<-math>
Tells B<autoinst> to create basic math fonts (see above).
@@ -3714,77 +3897,23 @@ where 1000 units equal one em.
In my opinion, many text fonts benefit from letterspacing by 50 to 100 units
when used in maths; some fonts need even more. Use your own judgement!
-=item B<-defaultlining>/B<-defaultoldstyle>
-
-=item B<-defaulttabular>/B<-defaultproportional>
-
-Tell B<autoinst> which figure style is the current font family's default
-(i.e., which figures you get when you don't specify any OpenType features).
-
-I<Don't use these options unless you are certain you need them!>
-They are only needed for fonts that don't provide OpenType features
-for their default figure style; and even in that case,
-B<autoinst>'s default values (B<-defaultlining> and B<-defaulttabular>)
-are usually correct.
-
-=item B<-nofigurekern>
-
-Some fonts provide kerning pairs for tabular figures.
-This is very probably not what you want
-(e.g., numbers in tables won't line up exactly).
-This option adds extra I< --ligkern> options
-to the commands for I<otftotfm> to suppress such kerns.
-Note that this option leads to very long commands (it adds
-one hundred I< --ligkern> options), which may cause problems on some systems.
-
-=item B<-nfssweight>=I<code>=I<weight>
-
-=item B<-nfsswidth>=I<code>=I<width>
-
-Map the NFSS code I<code> to the given weight or width,
-overriding the built-in tables.
-Each of these options may be given multiple times,
-to override more than one NFSS code.
-Example: to map the `ul' code to the `Thin' weight,
-use C<-nfssweight=ul=thin>.
-To inhibit the use of the `ul' code completely,
-use C<-nfssweight=ul=>.
-
-=item B<-extra>=I<extra>
-
-Append I<extra> as extra options to the command lines for I<otftotfm>.
-To prevent I<extra> from accidentily being interpreted as options
-to B<autoinst>, it should be properly quoted.
-
-=item B<-manual>
-
-Manual mode; for users who want to post-process the generated files
-and commands. By default, B<autoinst> immediately executes all
-F<otftotfm> commands it generates;
-in manual mode, these are instead written to a file F<autoinst.bat>.
-Furthermore it tells F<otftotfm> to generate human readable (and editable)
-F<pl/vpl> files instead of the default F<tfm/vf> ones,
-and to place all generated files in a subdirectory C<./autoinst_output/>
-of the current directory, rather than install them into your TeX installation.
+=back
-When using this option, you need to execute the following manual steps after
-B<autoinst> has finished:
-=over 2
+=head2 Output options
-=item - run F<pltotf> and F<vptovf> on the generated F<pl> and F<vf> files,
-to convert them to F<tfm/vf> format;
-
-=item - move all generated files to a proper TEXMF tree,
-and, if necessary, update the filename database;
+=over 4
-=item - tell TeX about the new F<map> file
-(usually by running C<updmap> or similar).
+=item B<-t1suffix> [ = I<SUFFIX> ]
-=back
+Tell B<autoinst> to modify the font names of all generated Type1-fonts,
+by adding I<SUFFIX> to the family name.
+If you use this option without specifying a I<SUFFIX> value,
+B<autoinst> will use the value ``PS''.
+The default behaviour when this option is not given
+is to not modify font names at all.
-Note that some options (I<-target>, I<-vendor> and I<-typeface>,
-I<-[no]updmap>) are meaningless, and hence ignored, in manual mode.
+See also L</OpenType fonts and licensing issues> above.
=item B<-target>=I<DIRECTORY>
@@ -3800,13 +3929,6 @@ It's then up to the user to move the generated files to a better location
and update all relevant databases
(usually by calling F<texhash> and F<updmap>).
-I<WARNING:> using this option may interfere with F<kpathsea> and F<updmap>
-(especially when the chosen directory is outside the standard TEXMF trees),
-so using I<-target> will disable the automatic call to F<updmap>
-(as if I<-noupdmap> had been given).
-It is up to the user to manually update all databases (i.e., by calling
-F<texhash> and F<updmap> or similar).
-
=item B<-vendor>=I<VENDOR>
=item B<-typeface>=I<TYPEFACE>
@@ -3815,62 +3937,78 @@ These options are equivalent to F<otftotfm>'s I< --vendor> and I< --typeface>
options: they change the `vendor' and `typeface' parts of the names of the
subdirectories in the TEXMF tree where generated files will be stored.
The default values are `lcdftools' and the font's FontFamily name.
-
-Note that these options change I<only> directory names,
+These options change I<only> directory names,
not the names of any generated files.
-=item B<-updmap>/B<-noupdmap>
+=item B<-logfile>=I<filename>
-Control whether or not F<updmap> is called after the last call to F<otftotfm>.
-The default is B<-updmap>.
+Write log data to F<filename> instead of the default F<< <fontfamily>.log >>.
+If the file already exists, B<autoinst> appends to it;
+it doesn't overwrite an existing file.
=back
-=head2 A note for MiKTeX users
+=head2 Specialist options
-Automatically installing the fonts into a suitable TEXMF tree
-(as B<autoinst> tries to do by default) only works for TeX-installations
-that use the F<kpathsea> library; with TeX distributions that implement
-their own directory searching (such as MiKTeX), B<autoinst> will complain
-that it cannot find the F<kpsewhich> program and move all generated files
-into a subdirectory C<./autoinst_output/> of the current directory.
-If you use such a TeX distribution, you should either move these files
-to their correct destinations by hand, or use the I<-target> option
-(see L</COMMAND-LINE OPTIONS> below) to manually specify a TEXMF tree.
+=over 4
-Also, some OpenType fonts contain so many kerning pairs that the resulting
-F<pl> and F<vpl> files are too big for MiKTeX's F<pltotf> and F<vptovf>;
-the versions that come with W32TeX (F<http://www.w32tex.org>)
-and TeXLive (F<http://tug.org/texlive>) don't seem to have this problem.
+=item B<-defaultlining>/B<-defaultoldstyle>
+=item B<-defaulttabular>/B<-defaultproportional>
-=head2 A note for MacTeX users
+Tell B<autoinst> which figure style is the current font family's default
+(i.e., which figures you get when you don't specify any OpenType features).
-By default, B<autoinst> will try to install all generated files into
-the $TEXMFLOCAL tree; when this directory isn't user-writable,
-it will use the $TEXMFHOME tree instead. Unfortunately, MacTeX's version
-of C<updmap-sys> (which is called behind the scenes) doesn't search
-in $TEXMFHOME, and hence MacTeX will not find the new fonts.
+I<Don't use these options unless you are certain you need them!>
+They are only needed for fonts that don't provide OpenType features
+for their default figure style; and even in that case,
+B<autoinst>'s default values (B<-defaultlining> and B<-defaulttabular>)
+are usually correct.
-To remedy this, either run B<autoinst> as root (so that it can install
-everything into $TEXMFLOCAL) or manually run C<updmap -user> to tell
-TeX about the files in $TEXMFHOME.
-The latter option does, however, have some caveats;
-see F<https://tug.org/texlive/scripts-sys-user.html>.
+=item B<-nfssweight>=I<code>=I<weight>
+
+=item B<-nfsswidth>=I<code>=I<width>
+
+Map the NFSS code I<code> to the given weight or width,
+overriding the built-in tables.
+Each of these options may be given multiple times,
+to override more than one NFSS code.
+Example: to map the `ul' code to the `Thin' weight,
+use C<-nfssweight=ul=thin>.
+To inhibit the use of the `ul' code completely,
+use C<-nfssweight=ul=>.
+
+=item B<-extra>=I<extra>
+
+Append I<extra> as extra options to the command lines for I<otftotfm>.
+To prevent I<extra> from accidentily being interpreted as options
+to B<autoinst>, it should be properly quoted.
+
+=item B<-nofigurekern>
+
+Some fonts provide kerning pairs for tabular figures.
+This is very probably not what you want
+(e.g., numbers in tables won't line up exactly).
+This option adds extra I< --ligkern> options
+to the commands for I<otftotfm> to suppress such kerns.
+Note that this option leads to very long commands (it adds
+one hundred I< --ligkern> options), which may cause problems on some systems.
+
+=back
=head1 SEE ALSO
-Eddie Kohler's B<TypeTools> (F<http://www.lcdf.org/type>).
+Eddie Kohler's B<TypeTools> and B<T1Utils> (F<http://www.lcdf.org/type>).
B<Perl> can be obtained from F<http://www.perl.org>;
it is included in most Linux distributions.
For Windows, try ActivePerl (F<http://www.activestate.com>)
or Strawberry Perl (F<http://strawberryperl.com>).
-B<XeTeX> (F<http://www.tug.org/xetex>) and
-B<LuaTeX> (F<http://www.luatex.org>)
+B<LuaTeX> (F<http://www.luatex.org>) and
+B<XeTeX> (F<http://www.tug.org/xetex>)
are Unicode-aware TeX engines that can use OpenType fonts directly,
without any (La)TeX-specific support files.
@@ -3915,7 +4053,7 @@ GNU General Public License for more details.
=head1 VERSION
-This document describes B<autoinst> version 20200619.
+This document describes B<autoinst> version 20200729.
=head1 RECENT CHANGES
@@ -3924,6 +4062,15 @@ This document describes B<autoinst> version 20200619.
=over 12
+=item I<2020-07-29>
+
+Some changes in the generated F<sty> and F<fd> files,
+to improve compatibility with the F<microtype> package.
+Made sure that F<pfb> fonts are always generated whenever
+the input fonts are in F<otf> format.
+Added the C<-t1suffix> command-line option,
+to modify the font and file names of those generated Type1 fonts.
+
=item I<2020-06-19>
Added the C<nomathgreek> option to generated style files.
@@ -3958,6 +4105,13 @@ an argument to I<-inferiors>.
Don't create empty subdirectories in the target TEXMF tree.
+=back
+
+
+=begin Really_old_history
+
+=over 12
+
=item I<2019-11-18>
Fine-tuned calling of F<kpsewhich> on Windows (patch by Akira Kakuto).
@@ -4080,7 +4234,7 @@ Fine-tuned the decision where to put generated files;
in particular, create $TEXMFHOME if it doesn't already exist
and $TEXMFLOCAL isn't user-writable.
-In manual mode, or when we can't find a user-writable TEXMF tree,
+When we can't find a user-writable TEXMF tree,
put all generated files into a subdirectory C<./autoinst_output/>
instead of all over the current working directory.
@@ -4098,13 +4252,6 @@ Then we add `ssub' rules to the F<fd> files to map the standard NFSS codes
to our fancy names (see the section B<NFSS codes>;
based on discussions with Frank Mittelbach and Bob Tennent).
-=back
-
-
-=begin Really_old_history
-
-=over 12
-
=item I<2018-08-10>
Added encoding files for LGR and T2A/B/C to I<fontools>.
diff --git a/fonts/utilities/fontools/bin/ot2kpx b/fonts/utilities/fontools/bin/ot2kpx
index 830415e2c5..cb7809f1e4 100755
--- a/fonts/utilities/fontools/bin/ot2kpx
+++ b/fonts/utilities/fontools/bin/ot2kpx
@@ -38,7 +38,7 @@ use Getopt::Long ();
use List::Util @List::Util::EXPORT_OK;
use Pod::Usage;
-my $VERSION = "20200619";
+my $VERSION = "20200729";
our ($NUM_GLYPHS, $UNITS_PER_EM, %kern);
@@ -858,7 +858,7 @@ See the GNU General Public License for more details.
=head1 VERSION
-This document describes B<ot2kpx> version 20200619.
+This document describes B<ot2kpx> version 20200729.
=head1 RECENT CHANGES
diff --git a/fonts/utilities/fontools/bin/splitttc b/fonts/utilities/fontools/bin/splitttc
index b4045270c7..b039b33875 100755
--- a/fonts/utilities/fontools/bin/splitttc
+++ b/fonts/utilities/fontools/bin/splitttc
@@ -38,7 +38,7 @@ use File::Basename;
use Getopt::Long;
use Pod::Usage;
-my $VERSION = "20200619";
+my $VERSION = "20200729";
parse_commandline();
@@ -303,7 +303,7 @@ See the GNU General Public License for more details.
=head1 VERSION
-This document describes B<splitttc> version 20200619.
+This document describes B<splitttc> version 20200729.
=head1 RECENT CHANGES
diff --git a/fonts/utilities/fontools/doc/afm2afm.pdf b/fonts/utilities/fontools/doc/afm2afm.pdf
index b94797fe47..1ca5d13897 100644
--- a/fonts/utilities/fontools/doc/afm2afm.pdf
+++ b/fonts/utilities/fontools/doc/afm2afm.pdf
Binary files differ
diff --git a/fonts/utilities/fontools/doc/autoinst.pdf b/fonts/utilities/fontools/doc/autoinst.pdf
index 23ed25890d..7c11671def 100644
--- a/fonts/utilities/fontools/doc/autoinst.pdf
+++ b/fonts/utilities/fontools/doc/autoinst.pdf
Binary files differ
diff --git a/fonts/utilities/fontools/doc/ot2kpx.pdf b/fonts/utilities/fontools/doc/ot2kpx.pdf
index 0d61a1737b..392db35467 100644
--- a/fonts/utilities/fontools/doc/ot2kpx.pdf
+++ b/fonts/utilities/fontools/doc/ot2kpx.pdf
Binary files differ
diff --git a/fonts/utilities/fontools/doc/splitttc.pdf b/fonts/utilities/fontools/doc/splitttc.pdf
index 9ffc6518ac..2a9f50b7a1 100644
--- a/fonts/utilities/fontools/doc/splitttc.pdf
+++ b/fonts/utilities/fontools/doc/splitttc.pdf
Binary files differ