summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/fonts/enc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-24 21:29:44 +0000
committerKarl Berry <karl@freefriends.org>2018-05-24 21:29:44 +0000
commit02c7b1553e2e3ea2657ff01c3a87c5b27da2bb6a (patch)
tree527cbdcc295af819497d57365332697a8199234d /Master/texmf-dist/fonts/enc
parent7895df6ab5d011bd09484b5aba16db682a2621e9 (diff)
fira (24may18)
git-svn-id: svn://tug.org/texlive/trunk@47824 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts/enc')
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_2gmv7z.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_3r53sp.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_3ssl4k.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_44bn3d.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_4ooib3.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_4vuazg.enc17
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_5aa6fi.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_5bzluk.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_673p4v.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_6g6k33.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_6j4iko.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_6jvuba.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_72ht64.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_75hvjh.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_765q6w.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_7gpamp.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_b4v2wh.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_bzcdnd.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_djdjee.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_ejxnj6.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_f2p3ju.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_gn3mpp.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_itmofw.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_iwlvmj.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_junpg2.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_kinqlf.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_le7keq.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_ljq7ir.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_mnklhx.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_mpt7xh.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_mvxrts.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_oevvub.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_onkf6v.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_ou66re.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_p7hned.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_pre736.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_qdgi57.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_qeo2k2.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_sbcabv.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_smmr7a.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_u77sc6.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_vn43fe.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_vyx4ej.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_xbqiro.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_xeq6li.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_xrafnf.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_xrxr2g.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_xsutkk.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_xwtagr.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_yhyk3t.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fira/fir_zrx7he.enc16
51 files changed, 885 insertions, 109 deletions
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_2gmv7z.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_2gmv7z.enc
index f1ac6f3e2ce..b89bdf359b3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_2gmv7z.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_2gmv7z.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_2gmv7z6z4bimrfecdvww63a5xa
-% Encoding created by otftotfm on Sat Nov 12 02:30:20 2016
+% Encoding created by otftotfm on Wed May 23 11:15:36 2018
% Command line follows encoding
/AutoEnc_2gmv7z6z4bimrfecdvww63a5xa [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_3r53sp.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_3r53sp.enc
index 291e01d4bb4..5344d8be1e4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_3r53sp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_3r53sp.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_3r53sp43foomd77d4eykl2ojgh
-% Encoding created by otftotfm on Sat Nov 12 02:30:18 2016
+% Encoding created by otftotfm on Wed May 23 11:15:34 2018
% Command line follows encoding
/AutoEnc_3r53sp43foomd77d4eykl2ojgh [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_3ssl4k.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_3ssl4k.enc
index 47f7ec8e082..dda930d0abb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_3ssl4k.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_3ssl4k.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_3ssl4kxzwqaofftxxpp3mvlobb
-% Encoding created by otftotfm on Sat Nov 12 02:30:21 2016
+% Encoding created by otftotfm on Wed May 23 11:15:37 2018
% Command line follows encoding
/AutoEnc_3ssl4kxzwqaofftxxpp3mvlobb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_44bn3d.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_44bn3d.enc
index 41dc767ae8c..30963404fb5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_44bn3d.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_44bn3d.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_44bn3d4yxw6zuyaog4w4jtj23d
-% Encoding created by otftotfm on Sat Nov 12 02:30:22 2016
+% Encoding created by otftotfm on Wed May 23 11:15:38 2018
% Command line follows encoding
/AutoEnc_44bn3d4yxw6zuyaog4w4jtj23d [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_4ooib3.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_4ooib3.enc
new file mode 100644
index 00000000000..f90bea8f348
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_4ooib3.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_4ooib3jdif6exbt5lg5o2jmbbd
+% Encoding created by otftotfm on Wed May 23 11:15:36 2018
+% Command line follows encoding
+/AutoEnc_4ooib3jdif6exbt5lg5o2jmbbd [
+%00
+ /endash /.notdef /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB
+ /uni1FBE /uni1FBC /uni1FCC /uni1FFC /Alpha /Upsilondieresis /alpha /upsilondieresis
+%10
+ /.notdef /.notdef /uni03DF /uni03D9 /.notdef /uni03D8 /uni03DA /uni03E0
+ /Euro /perthousand /uni0259 /uni03E1 /quoteleft /quoteright /breve /macron
+%20
+ /uni1FC1 /exclam /dieresis /dieresistonos /uni1FED /percent /periodcentered /tonos
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /anoteleia /uni1FFE /equal /uni0313 /semicolon
+%40
+ /uni1FDF /Alpha /Beta /uni1FDD /uni2206 /Epsilon /Phi /Gamma
+ /Eta /Iota /Theta /Kappa /Lambda /Mu /Nu /Omicron
+%50
+ /Pi /Chi /Rho /Sigma /Tau /Upsilon /uni1FDE /uni2126
+ /Xi /Psi /Zeta /bracketleft /uni1FCF /bracketright /uni1FCE /uni1FCD
+%60
+ /uni1FEF /alpha /beta /uni03C2 /delta /epsilon /uni03D5 /gamma
+ /eta /iota /theta /kappa /lambda /uni00B5 /nu /omicron
+%70
+ /pi /chi /rho /sigma /tau /upsilon /.notdef /omega
+ /xi /psi /zeta /guillemotleft /uni037A /guillemotright /uni1FC0 /emdash
+%80
+ /uni1F70 /uni1F01 /uni1F00 /uni1F03 /uni1FB2 /uni1F81 /uni1F80 /uni1F83
+ /alphatonos /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82
+%90
+ /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /.notdef
+ /uni1F74 /uni1F21 /uni1F20 /.notdef /uni1FC2 /uni1F91 /uni1F90 /.notdef
+%A0
+ /etatonos /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93
+ /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92
+%B0
+ /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3
+ /omegatonos /uni1F65 /uni1F64 /uni1F62 /uni1FF4 /uni1FA5 /uni1FA4 /uni1FA2
+%C0
+ /uni1FF6 /uni1F67 /uni1F66 /uni03DC /uni1FF7 /uni1FA7 /uni1FA6 /.notdef
+ /uni1F76 /uni1F31 /uni1F30 /uni1F33 /uni1F7A /uni1F51 /uni1F50 /uni1F53
+%D0
+ /iotatonos /uni1F35 /uni1F34 /uni1F32 /upsilontonos /uni1F55 /uni1F54 /uni1F52
+ /uni1FD6 /uni1F37 /uni1F36 /Iotadieresis /uni1FE6 /uni1F57 /uni1F56 /Upsilondieresis
+%E0
+ /uni1F72 /uni1F11 /uni1F10 /uni1F13 /uni1F78 /uni1F41 /uni1F40 /uni1F43
+ /epsilontonos /uni1F15 /uni1F14 /uni1F12 /omicrontonos /uni1F45 /uni1F44 /uni1F42
+%F0
+ /iotadieresis /uni1FD2 /iotadieresistonos /uni1FD7 /upsilondieresis /uni1FE2 /upsilondieresistonos /uni1FE7
+ /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /.notdef /uni0374 /uni0375
+] def
+% Command line: 'otftotfm --automatic --encoding=lgr
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraSans.map --no-updmap
+% --feature=kern --feature=liga --feature=lnum --feature=pnum -fdlig
+% FiraSans-BoldItalic.otf FiraSans-BoldItalic-lf-lgr'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_4vuazg.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_4vuazg.enc
index 60ac99e2a05..371f847dd9e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_4vuazg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_4vuazg.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_4vuazg4v4h4fasnaseo2jxyl5b
-% Encoding created by otftotfm on Sun May 24 07:08:52 2015
+% Encoding created by otftotfm on Wed May 23 11:23:08 2018
% Command line follows encoding
/AutoEnc_4vuazg4v4h4fasnaseo2jxyl5b [
%00
@@ -54,12 +54,13 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf.mono/fonts/tfm/public/fira
-% --vf-directory=texmf.mono/fonts/vf/public/fira
-% --type1-directory=texmf.mono/fonts/type1/public/fira
-% --truetype-directory=texmf.mono/fonts/truetype/public/fira
-% --encoding-directory=texmf.mono/fonts/enc/dvips/fira
-% --map-file=texmf.mono/fonts/map/dvips/fira/FiraMono.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraMono.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl FiraMono-Bold.otf FiraMono-Bold-tlf-t1'
+% =: ffi --ligkern=ff l =: ffl -fdlig FiraMono-Bold.otf
+% FiraMono-Bold-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_5aa6fi.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_5aa6fi.enc
new file mode 100644
index 00000000000..84a0064e911
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_5aa6fi.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_5aa6fi5u7h7gd5l3mou4wh5aig
+% Encoding created by otftotfm on Wed May 23 11:15:40 2018
+% Command line follows encoding
+/AutoEnc_5aa6fi5u7h7gd5l3mou4wh5aig [
+%00
+ /endash /.notdef /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB
+ /uni1FBE /uni1FBC /uni1FCC /uni1FFC /Alpha /Upsilondieresis /alpha /upsilondieresis
+%10
+ /.notdef /.notdef /uni03DF /uni03D9 /.notdef /uni03D8 /uni03DA /uni03E0
+ /Euro.osf /perthousand.osf /uni0259 /uni03E1 /quoteleft /quoteright /breve /macron
+%20
+ /uni1FC1 /exclam /dieresis /dieresistonos /uni1FED /percent.osf /periodcentered /tonos
+ /parenleft /parenright /asterisk /plus.osf /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /anoteleia /uni1FFE /equal.osf /uni0313 /semicolon
+%40
+ /uni1FDF /Alpha /Beta /uni1FDD /uni2206 /Epsilon /Phi /Gamma
+ /Eta /Iota /Theta /Kappa /Lambda /Mu /Nu /Omicron
+%50
+ /Pi /Chi /Rho /Sigma /Tau /Upsilon /uni1FDE /uni2126
+ /Xi /Psi /Zeta /bracketleft /uni1FCF /bracketright /uni1FCE /uni1FCD
+%60
+ /uni1FEF /alpha /beta /uni03C2 /delta /epsilon /uni03D5 /gamma
+ /eta /iota /theta /kappa /lambda /uni00B5 /nu /omicron
+%70
+ /pi /chi /rho /sigma /tau /upsilon /.notdef /omega
+ /xi /psi /zeta /guillemotleft /uni037A /guillemotright /uni1FC0 /emdash
+%80
+ /uni1F70 /uni1F01 /uni1F00 /uni1F03 /uni1FB2 /uni1F81 /uni1F80 /uni1F83
+ /alphatonos /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82
+%90
+ /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /.notdef
+ /uni1F74 /uni1F21 /uni1F20 /.notdef /uni1FC2 /uni1F91 /uni1F90 /.notdef
+%A0
+ /etatonos /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93
+ /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92
+%B0
+ /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3
+ /omegatonos /uni1F65 /uni1F64 /uni1F62 /uni1FF4 /uni1FA5 /uni1FA4 /uni1FA2
+%C0
+ /uni1FF6 /uni1F67 /uni1F66 /uni03DC /uni1FF7 /uni1FA7 /uni1FA6 /.notdef
+ /uni1F76 /uni1F31 /uni1F30 /uni1F33 /uni1F7A /uni1F51 /uni1F50 /uni1F53
+%D0
+ /iotatonos /uni1F35 /uni1F34 /uni1F32 /upsilontonos /uni1F55 /uni1F54 /uni1F52
+ /uni1FD6 /uni1F37 /uni1F36 /Iotadieresis /uni1FE6 /uni1F57 /uni1F56 /Upsilondieresis
+%E0
+ /uni1F72 /uni1F11 /uni1F10 /uni1F13 /uni1F78 /uni1F41 /uni1F40 /uni1F43
+ /epsilontonos /uni1F15 /uni1F14 /uni1F12 /omicrontonos /uni1F45 /uni1F44 /uni1F42
+%F0
+ /iotadieresis /uni1FD2 /iotadieresistonos /uni1FD7 /upsilondieresis /uni1FE2 /upsilondieresistonos /uni1FE7
+ /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /.notdef /uni0374 /uni0375
+] def
+% Command line: 'otftotfm --automatic --encoding=lgr
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraSans.map --no-updmap
+% --feature=kern --feature=liga --feature=onum --feature=pnum -fdlig
+% FiraSans-BoldItalic.otf FiraSans-BoldItalic-osf-lgr'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_5bzluk.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_5bzluk.enc
index 19619b902ca..66695d239df 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_5bzluk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_5bzluk.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5bzlukgj6aqcglniumd3xwjxya
-% Encoding created by otftotfm on Sun May 24 07:08:52 2015
+% Encoding created by otftotfm on Wed May 23 11:23:09 2018
% Command line follows encoding
/AutoEnc_5bzlukgj6aqcglniumd3xwjxya [
%00
@@ -54,12 +54,12 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf.mono/fonts/tfm/public/fira
-% --vf-directory=texmf.mono/fonts/vf/public/fira
-% --type1-directory=texmf.mono/fonts/type1/public/fira
-% --truetype-directory=texmf.mono/fonts/truetype/public/fira
-% --encoding-directory=texmf.mono/fonts/enc/dvips/fira
-% --map-file=texmf.mono/fonts/map/dvips/fira/FiraMono.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraMono.map --no-updmap
% --coding-scheme=TEX TEXT --feature=onum --feature=tnum --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl FiraMono-Bold.otf FiraMono-Bold-tosf-ot1'
+% l =: ffl -fdlig FiraMono-Bold.otf FiraMono-Bold-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_673p4v.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_673p4v.enc
index c1210ae9850..104b46939e8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_673p4v.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_673p4v.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_673p4vaswvldtbhr3wgxbuaseb
-% Encoding created by otftotfm on Sat Nov 12 02:30:18 2016
+% Encoding created by otftotfm on Wed May 23 11:15:34 2018
% Command line follows encoding
/AutoEnc_673p4vaswvldtbhr3wgxbuaseb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_6g6k33.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_6g6k33.enc
new file mode 100644
index 00000000000..3962f6e090e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_6g6k33.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_6g6k33aqvxaumolegvlz6vkhng
+% Encoding created by otftotfm on Wed May 23 11:15:39 2018
+% Command line follows encoding
+/AutoEnc_6g6k33aqvxaumolegvlz6vkhng [
+%00
+ /endash /.notdef /.notdef /.notdef /.notdef /.notdef /uni03DB.sc /uni03DB.sc
+ /uni1FBE /uni1FBC /uni1FCC /uni1FFC /Alpha /Upsilondieresis /alpha.sc /upsilondieresis.sc
+%10
+ /.notdef /.notdef /uni03DF.sc /uni03D9.sc /.notdef /uni03D8 /uni03DA /uni03E0
+ /Euro.tosf /perthousand.tosf /uni0259.sc /uni03E1.sc /quoteleft /quoteright /breve.sc /macron.sc
+%20
+ /uni1FC1 /exclam /dieresis.sc /dieresistonos /uni1FED /percent.tosf /periodcentered /tonos
+ /parenleft /parenright /asterisk /plus.tosf /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /anoteleia /uni1FFE /equal.tosf /uni0313 /semicolon
+%40
+ /uni1FDF /Alpha /Beta /uni1FDD /uni2206 /Epsilon /Phi /Gamma
+ /Eta /Iota /Theta /Kappa /Lambda /Mu /Nu /Omicron
+%50
+ /Pi /Chi /Rho /Sigma /Tau /Upsilon /uni1FDE /uni2126
+ /Xi /Psi /Zeta /bracketleft /uni1FCF /bracketright /uni1FCE /uni1FCD
+%60
+ /uni1FEF /alpha.sc /beta.sc /uni03C2.sc /delta.sc /epsilon.sc /uni03D5.sc /gamma.sc
+ /eta.sc /iota.sc /theta.sc /kappa.sc /lambda.sc /uni00B5 /nu.sc /omicron.sc
+%70
+ /pi.sc /chi.sc /rho.sc /sigma.sc /tau.sc /upsilon.sc /.notdef /omega.sc
+ /xi.sc /psi.sc /zeta.sc /guillemotleft /uni037A /guillemotright /uni1FC0 /emdash
+%80
+ /uni1F70.sc /uni1F01.sc /uni1F00.sc /uni1F03.sc /uni1FB2.sc /uni1F81.sc /uni1F80.sc /uni1F83.sc
+ /alphatonos.sc /uni1F05.sc /uni1F04.sc /uni1F02.sc /uni1FB4.sc /uni1F85.sc /uni1F84.sc /uni1F82.sc
+%90
+ /uni1FB6.sc /uni1F07.sc /uni1F06.sc /uni03DD.sc /uni1FB7.sc /uni1F87.sc /uni1F86.sc /.notdef
+ /uni1F74.sc /uni1F21.sc /uni1F20.sc /.notdef /uni1FC2.sc /uni1F91.sc /uni1F90.sc /.notdef
+%A0
+ /etatonos.sc /uni1F25.sc /uni1F24.sc /uni1F23.sc /uni1FC4.sc /uni1F95.sc /uni1F94.sc /uni1F93.sc
+ /uni1FC6.sc /uni1F27.sc /uni1F26.sc /uni1F22.sc /uni1FC7.sc /uni1F97.sc /uni1F96.sc /uni1F92.sc
+%B0
+ /uni1F7C.sc /uni1F61.sc /uni1F60.sc /uni1F63.sc /uni1FF2.sc /uni1FA1.sc /uni1FA0.sc /uni1FA3.sc
+ /omegatonos.sc /uni1F65.sc /uni1F64.sc /uni1F62.sc /uni1FF4.sc /uni1FA5.sc /uni1FA4.sc /uni1FA2.sc
+%C0
+ /uni1FF6.sc /uni1F67.sc /uni1F66.sc /uni03DC /uni1FF7.sc /uni1FA7.sc /uni1FA6.sc /.notdef
+ /uni1F76.sc /uni1F31.sc /uni1F30.sc /uni1F33.sc /uni1F7A.sc /uni1F51.sc /uni1F50.sc /uni1F53.sc
+%D0
+ /iotatonos.sc /uni1F35.sc /uni1F34.sc /uni1F32.sc /upsilontonos.sc /uni1F55.sc /uni1F54.sc /uni1F52.sc
+ /uni1FD6.sc /uni1F37.sc /uni1F36.sc /Iotadieresis /uni1FE6.sc /uni1F57.sc /uni1F56.sc /Upsilondieresis
+%E0
+ /uni1F72.sc /uni1F11.sc /uni1F10.sc /uni1F13.sc /uni1F78.sc /uni1F41.sc /uni1F40.sc /uni1F43.sc
+ /epsilontonos.sc /uni1F15.sc /uni1F14.sc /uni1F12.sc /omicrontonos.sc /uni1F45.sc /uni1F44.sc /uni1F42.sc
+%F0
+ /iotadieresis.sc /uni1FD2.sc /iotadieresistonos.sc /uni1FD7.sc /upsilondieresis.sc /uni1FE2.sc /upsilondieresistonos.sc /uni1FE7.sc
+ /uni1FB3.sc /uni1FC3.sc /uni1FF3.sc /uni1FE5.sc /uni1FE4.sc /.notdef /uni0374 /uni0375
+] def
+% Command line: 'otftotfm --automatic --encoding=lgr
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraSans.map --no-updmap
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --unicoding=germandbls =: SSsmall -fdlig FiraSans-BoldItalic.otf
+% FiraSans-BoldItalic-tosf-sc-lgr'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_6j4iko.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_6j4iko.enc
index f1d0c7bd383..46ab91c22d4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_6j4iko.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_6j4iko.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_6j4ikou54yswh2l2rz5eq4prre
-% Encoding created by otftotfm on Sun May 24 07:08:52 2015
+% Encoding created by otftotfm on Wed May 23 11:23:09 2018
% Command line follows encoding
/AutoEnc_6j4ikou54yswh2l2rz5eq4prre [
%00
@@ -54,13 +54,13 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf.mono/fonts/tfm/public/fira
-% --vf-directory=texmf.mono/fonts/vf/public/fira
-% --type1-directory=texmf.mono/fonts/type1/public/fira
-% --truetype-directory=texmf.mono/fonts/truetype/public/fira
-% --encoding-directory=texmf.mono/fonts/enc/dvips/fira
-% --map-file=texmf.mono/fonts/map/dvips/fira/FiraMono.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraMono.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=onum
% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl FiraMono-Bold.otf
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl -fdlig FiraMono-Bold.otf
% FiraMono-Bold-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_6jvuba.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_6jvuba.enc
index d96dbaaff03..75f1eb894a9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_6jvuba.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_6jvuba.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_6jvubaghtcpkkxazfwqr6o26kf
-% Encoding created by otftotfm on Sat Nov 12 02:30:19 2016
+% Encoding created by otftotfm on Wed May 23 11:15:35 2018
% Command line follows encoding
/AutoEnc_6jvubaghtcpkkxazfwqr6o26kf [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_72ht64.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_72ht64.enc
new file mode 100644
index 00000000000..8cfded2117f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_72ht64.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_72ht64czmmbp7zrkgdbya6kf4d
+% Encoding created by otftotfm on Wed May 23 11:23:08 2018
+% Command line follows encoding
+/AutoEnc_72ht64czmmbp7zrkgdbya6kf4d [
+%00
+ /endash /.notdef /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB
+ /uni1FBE /uni1FBC /uni1FCC /uni1FFC /Alpha /Upsilondieresis /alpha /upsilondieresis
+%10
+ /.notdef /.notdef /uni03DF /uni03D9 /.notdef /uni03D8 /uni03DA /uni03E0
+ /Euro /perthousand /.notdef /uni03E1 /quoteleft /quoteright /breve /macron
+%20
+ /uni1FC1 /exclam /dieresis /dieresistonos /uni1FED /percent /periodcentered /tonos
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /anoteleia /uni1FFE /equal /uni0313 /semicolon
+%40
+ /uni1FDF /Alpha /Beta /uni1FDD /Delta /Epsilon /Phi /Gamma
+ /Eta /Iota /Theta /Kappa /Lambda /Mu /Nu /Omicron
+%50
+ /Pi /Chi /Rho /Sigma /Tau /Upsilon /uni1FDE /Omega
+ /Xi /Psi /Zeta /bracketleft /uni1FCF /bracketright /uni1FCE /uni1FCD
+%60
+ /uni1FEF /alpha /beta /uni03C2 /delta /epsilon /uni03D5 /gamma
+ /eta /iota /theta /kappa /lambda /uni00B5 /nu /omicron
+%70
+ /pi /chi /rho /sigma /tau /upsilon /.notdef /omega
+ /xi /psi /zeta /guillemotleft /uni037A /guillemotright /uni1FC0 /emdash
+%80
+ /uni1F70 /uni1F01 /uni1F00 /uni1F03 /uni1FB2 /uni1F81 /uni1F80 /uni1F83
+ /alphatonos /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82
+%90
+ /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /fl
+ /uni1F74 /uni1F21 /uni1F20 /l /uni1FC2 /uni1F91 /uni1F90 /fi
+%A0
+ /etatonos /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93
+ /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92
+%B0
+ /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3
+ /omegatonos /uni1F65 /uni1F64 /uni1F62 /uni1FF4 /uni1FA5 /uni1FA4 /uni1FA2
+%C0
+ /uni1FF6 /uni1F67 /uni1F66 /uni03DC /uni1FF7 /uni1FA7 /uni1FA6 /i
+ /uni1F76 /uni1F31 /uni1F30 /uni1F33 /uni1F7A /uni1F51 /uni1F50 /uni1F53
+%D0
+ /iotatonos /uni1F35 /uni1F34 /uni1F32 /upsilontonos /uni1F55 /uni1F54 /uni1F52
+ /uni1FD6 /uni1F37 /uni1F36 /Iotadieresis /uni1FE6 /uni1F57 /uni1F56 /Upsilondieresis
+%E0
+ /uni1F72 /uni1F11 /uni1F10 /uni1F13 /uni1F78 /uni1F41 /uni1F40 /uni1F43
+ /epsilontonos /uni1F15 /uni1F14 /uni1F12 /omicrontonos /uni1F45 /uni1F44 /uni1F42
+%F0
+ /iotadieresis /uni1FD2 /iotadieresistonos /uni1FD7 /upsilondieresis /uni1FE2 /upsilondieresistonos /uni1FE7
+ /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /f /uni0374 /uni0375
+] def
+% Command line: 'otftotfm --automatic --encoding=lgr
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraMono.map --no-updmap
+% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl -fdlig FiraMono-Bold.otf
+% FiraMono-Bold-tlf-lgr'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_75hvjh.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_75hvjh.enc
index 2f239c9b7bb..bd534446f7f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_75hvjh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_75hvjh.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_75hvjhmsuwrd2yrc2ewielovjd
-% Encoding created by otftotfm on Sat Nov 12 02:30:23 2016
+% Encoding created by otftotfm on Wed May 23 11:15:40 2018
% Command line follows encoding
/AutoEnc_75hvjhmsuwrd2yrc2ewielovjd [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_765q6w.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_765q6w.enc
index c271e4a3db4..9439f0739b4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_765q6w.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_765q6w.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_765q6wn2ep4ae4unu3ertosvna
-% Encoding created by otftotfm on Sat Nov 12 02:30:25 2016
+% Encoding created by otftotfm on Wed May 23 11:15:42 2018
% Command line follows encoding
/AutoEnc_765q6wn2ep4ae4unu3ertosvna [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_7gpamp.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_7gpamp.enc
index d072a9609f2..604cb5a893e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_7gpamp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_7gpamp.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_7gpamp4wuqpbo3j6ltxesj5iad
-% Encoding created by otftotfm on Sat Nov 12 02:30:24 2016
+% Encoding created by otftotfm on Wed May 23 11:15:41 2018
% Command line follows encoding
/AutoEnc_7gpamp4wuqpbo3j6ltxesj5iad [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_b4v2wh.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_b4v2wh.enc
new file mode 100644
index 00000000000..ce084de17f8
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_b4v2wh.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_b4v2whsozanzzkwcdozpriec2a
+% Encoding created by otftotfm on Wed May 23 11:15:36 2018
+% Command line follows encoding
+/AutoEnc_b4v2whsozanzzkwcdozpriec2a [
+%00
+ /endash /.notdef /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB
+ /uni1FBE /uni1FBC /uni1FCC /uni1FFC /Alpha /Upsilondieresis /alpha /upsilondieresis
+%10
+ /.notdef /.notdef /uni03DF /uni03D9 /.notdef /uni03D8 /uni03DA /uni03E0
+ /Euro /perthousand /uni0259 /uni03E1 /quoteleft /quoteright /breve /macron
+%20
+ /uni1FC1 /exclam /dieresis /dieresistonos /uni1FED /percent /periodcentered /tonos
+ /uni207D /uni207E /asterisk /uni207A /comma /hyphen /period /slash
+%30
+ /uni2070 /uni00B9 /uni00B2 /uni00B3 /uni2074 /uni2075 /uni2076 /uni2077
+ /uni2078 /uni2079 /colon /anoteleia /uni1FFE /uni207C /uni0313 /semicolon
+%40
+ /uni1FDF /Alpha /Beta /uni1FDD /uni2206 /Epsilon /Phi /Gamma
+ /Eta /Iota /Theta /Kappa /Lambda /Mu /Nu /Omicron
+%50
+ /Pi /Chi /Rho /Sigma /Tau /Upsilon /uni1FDE /uni2126
+ /Xi /Psi /Zeta /bracketleft /uni1FCF /bracketright /uni1FCE /uni1FCD
+%60
+ /uni1FEF /alpha /beta /uni03C2 /delta /epsilon /uni03D5 /gamma
+ /eta /iota /theta /kappa /lambda /uni00B5 /nu /omicron
+%70
+ /pi /chi /rho /sigma /tau /upsilon /.notdef /omega
+ /xi /psi /zeta /guillemotleft /uni037A /guillemotright /uni1FC0 /emdash
+%80
+ /uni1F70 /uni1F01 /uni1F00 /uni1F03 /uni1FB2 /uni1F81 /uni1F80 /uni1F83
+ /alphatonos /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82
+%90
+ /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /.notdef
+ /uni1F74 /uni1F21 /uni1F20 /.notdef /uni1FC2 /uni1F91 /uni1F90 /.notdef
+%A0
+ /etatonos /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93
+ /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92
+%B0
+ /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3
+ /omegatonos /uni1F65 /uni1F64 /uni1F62 /uni1FF4 /uni1FA5 /uni1FA4 /uni1FA2
+%C0
+ /uni1FF6 /uni1F67 /uni1F66 /uni03DC /uni1FF7 /uni1FA7 /uni1FA6 /.notdef
+ /uni1F76 /uni1F31 /uni1F30 /uni1F33 /uni1F7A /uni1F51 /uni1F50 /uni1F53
+%D0
+ /iotatonos /uni1F35 /uni1F34 /uni1F32 /upsilontonos /uni1F55 /uni1F54 /uni1F52
+ /uni1FD6 /uni1F37 /uni1F36 /Iotadieresis /uni1FE6 /uni1F57 /uni1F56 /Upsilondieresis
+%E0
+ /uni1F72 /uni1F11 /uni1F10 /uni1F13 /uni1F78 /uni1F41 /uni1F40 /uni1F43
+ /epsilontonos /uni1F15 /uni1F14 /uni1F12 /omicrontonos /uni1F45 /uni1F44 /uni1F42
+%F0
+ /iotadieresis /uni1FD2 /iotadieresistonos /uni1FD7 /upsilondieresis /uni1FE2 /upsilondieresistonos /uni1FE7
+ /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /.notdef /uni0374 /uni0375
+] def
+% Command line: 'otftotfm --automatic --encoding=lgr
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraSans.map --no-updmap
+% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} * -fdlig
+% FiraSans-BoldItalic.otf FiraSans-BoldItalic-sup-lgr'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_bzcdnd.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_bzcdnd.enc
new file mode 100644
index 00000000000..51b5b61d551
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_bzcdnd.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_bzcdndgwr2bsgvdjdrt26lsfbb
+% Encoding created by otftotfm on Wed May 23 11:15:35 2018
+% Command line follows encoding
+/AutoEnc_bzcdndgwr2bsgvdjdrt26lsfbb [
+%00
+ /endash /.notdef /.notdef /.notdef /.notdef /.notdef /uni03DB.sc /uni03DB.sc
+ /uni1FBE /uni1FBC /uni1FCC /uni1FFC /Alpha /Upsilondieresis /alpha.sc /upsilondieresis.sc
+%10
+ /.notdef /.notdef /uni03DF.sc /uni03D9.sc /.notdef /uni03D8 /uni03DA /uni03E0
+ /Euro.tf /perthousand.tf /uni0259.sc /uni03E1.sc /quoteleft /quoteright /breve.sc /macron.sc
+%20
+ /uni1FC1 /exclam /dieresis.sc /dieresistonos /uni1FED /percent.tf /periodcentered /tonos
+ /parenleft /parenright /asterisk /plus.tf /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /anoteleia /uni1FFE /equal.tf /uni0313 /semicolon
+%40
+ /uni1FDF /Alpha /Beta /uni1FDD /uni2206 /Epsilon /Phi /Gamma
+ /Eta /Iota /Theta /Kappa /Lambda /Mu /Nu /Omicron
+%50
+ /Pi /Chi /Rho /Sigma /Tau /Upsilon /uni1FDE /uni2126
+ /Xi /Psi /Zeta /bracketleft /uni1FCF /bracketright /uni1FCE /uni1FCD
+%60
+ /uni1FEF /alpha.sc /beta.sc /uni03C2.sc /delta.sc /epsilon.sc /uni03D5.sc /gamma.sc
+ /eta.sc /iota.sc /theta.sc /kappa.sc /lambda.sc /uni00B5 /nu.sc /omicron.sc
+%70
+ /pi.sc /chi.sc /rho.sc /sigma.sc /tau.sc /upsilon.sc /.notdef /omega.sc
+ /xi.sc /psi.sc /zeta.sc /guillemotleft /uni037A /guillemotright /uni1FC0 /emdash
+%80
+ /uni1F70.sc /uni1F01.sc /uni1F00.sc /uni1F03.sc /uni1FB2.sc /uni1F81.sc /uni1F80.sc /uni1F83.sc
+ /alphatonos.sc /uni1F05.sc /uni1F04.sc /uni1F02.sc /uni1FB4.sc /uni1F85.sc /uni1F84.sc /uni1F82.sc
+%90
+ /uni1FB6.sc /uni1F07.sc /uni1F06.sc /uni03DD.sc /uni1FB7.sc /uni1F87.sc /uni1F86.sc /.notdef
+ /uni1F74.sc /uni1F21.sc /uni1F20.sc /.notdef /uni1FC2.sc /uni1F91.sc /uni1F90.sc /.notdef
+%A0
+ /etatonos.sc /uni1F25.sc /uni1F24.sc /uni1F23.sc /uni1FC4.sc /uni1F95.sc /uni1F94.sc /uni1F93.sc
+ /uni1FC6.sc /uni1F27.sc /uni1F26.sc /uni1F22.sc /uni1FC7.sc /uni1F97.sc /uni1F96.sc /uni1F92.sc
+%B0
+ /uni1F7C.sc /uni1F61.sc /uni1F60.sc /uni1F63.sc /uni1FF2.sc /uni1FA1.sc /uni1FA0.sc /uni1FA3.sc
+ /omegatonos.sc /uni1F65.sc /uni1F64.sc /uni1F62.sc /uni1FF4.sc /uni1FA5.sc /uni1FA4.sc /uni1FA2.sc
+%C0
+ /uni1FF6.sc /uni1F67.sc /uni1F66.sc /uni03DC /uni1FF7.sc /uni1FA7.sc /uni1FA6.sc /.notdef
+ /uni1F76.sc /uni1F31.sc /uni1F30.sc /uni1F33.sc /uni1F7A.sc /uni1F51.sc /uni1F50.sc /uni1F53.sc
+%D0
+ /iotatonos.sc /uni1F35.sc /uni1F34.sc /uni1F32.sc /upsilontonos.sc /uni1F55.sc /uni1F54.sc /uni1F52.sc
+ /uni1FD6.sc /uni1F37.sc /uni1F36.sc /Iotadieresis /uni1FE6.sc /uni1F57.sc /uni1F56.sc /Upsilondieresis
+%E0
+ /uni1F72.sc /uni1F11.sc /uni1F10.sc /uni1F13.sc /uni1F78.sc /uni1F41.sc /uni1F40.sc /uni1F43.sc
+ /epsilontonos.sc /uni1F15.sc /uni1F14.sc /uni1F12.sc /omicrontonos.sc /uni1F45.sc /uni1F44.sc /uni1F42.sc
+%F0
+ /iotadieresis.sc /uni1FD2.sc /iotadieresistonos.sc /uni1FD7.sc /upsilondieresis.sc /uni1FE2.sc /upsilondieresistonos.sc /uni1FE7.sc
+ /uni1FB3.sc /uni1FC3.sc /uni1FF3.sc /uni1FE5.sc /uni1FE4.sc /.notdef /uni0374 /uni0375
+] def
+% Command line: 'otftotfm --automatic --encoding=lgr
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraSans.map --no-updmap
+% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
+% --unicoding=germandbls =: SSsmall -fdlig FiraSans-BoldItalic.otf
+% FiraSans-BoldItalic-tlf-sc-lgr'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_djdjee.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_djdjee.enc
index 4451ed8bd26..a96f192b108 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_djdjee.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_djdjee.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_djdjeeejxcavblm5itmggoz2yd
-% Encoding created by otftotfm on Sat Nov 12 02:30:24 2016
+% Encoding created by otftotfm on Wed May 23 11:15:41 2018
% Command line follows encoding
/AutoEnc_djdjeeejxcavblm5itmggoz2yd [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_ejxnj6.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_ejxnj6.enc
new file mode 100644
index 00000000000..c1c9924580d
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_ejxnj6.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ejxnj6sxblhm6lqyimfdqyeqca
+% Encoding created by otftotfm on Wed May 23 11:15:41 2018
+% Command line follows encoding
+/AutoEnc_ejxnj6sxblhm6lqyimfdqyeqca [
+%00
+ /endash /.notdef /.notdef /.notdef /.notdef /.notdef /uni03DB.sc /uni03DB.sc
+ /uni1FBE /uni1FBC /uni1FCC /uni1FFC /Alpha /Upsilondieresis /alpha.sc /upsilondieresis.sc
+%10
+ /.notdef /.notdef /uni03DF.sc /uni03D9.sc /.notdef /uni03D8 /uni03DA /uni03E0
+ /Euro.osf /perthousand.osf /uni0259.sc /uni03E1.sc /quoteleft /quoteright /breve.sc /macron.sc
+%20
+ /uni1FC1 /exclam /dieresis.sc /dieresistonos /uni1FED /percent.osf /periodcentered /tonos
+ /parenleft /parenright /asterisk /plus.osf /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /anoteleia /uni1FFE /equal.osf /uni0313 /semicolon
+%40
+ /uni1FDF /Alpha /Beta /uni1FDD /uni2206 /Epsilon /Phi /Gamma
+ /Eta /Iota /Theta /Kappa /Lambda /Mu /Nu /Omicron
+%50
+ /Pi /Chi /Rho /Sigma /Tau /Upsilon /uni1FDE /uni2126
+ /Xi /Psi /Zeta /bracketleft /uni1FCF /bracketright /uni1FCE /uni1FCD
+%60
+ /uni1FEF /alpha.sc /beta.sc /uni03C2.sc /delta.sc /epsilon.sc /uni03D5.sc /gamma.sc
+ /eta.sc /iota.sc /theta.sc /kappa.sc /lambda.sc /uni00B5 /nu.sc /omicron.sc
+%70
+ /pi.sc /chi.sc /rho.sc /sigma.sc /tau.sc /upsilon.sc /.notdef /omega.sc
+ /xi.sc /psi.sc /zeta.sc /guillemotleft /uni037A /guillemotright /uni1FC0 /emdash
+%80
+ /uni1F70.sc /uni1F01.sc /uni1F00.sc /uni1F03.sc /uni1FB2.sc /uni1F81.sc /uni1F80.sc /uni1F83.sc
+ /alphatonos.sc /uni1F05.sc /uni1F04.sc /uni1F02.sc /uni1FB4.sc /uni1F85.sc /uni1F84.sc /uni1F82.sc
+%90
+ /uni1FB6.sc /uni1F07.sc /uni1F06.sc /uni03DD.sc /uni1FB7.sc /uni1F87.sc /uni1F86.sc /.notdef
+ /uni1F74.sc /uni1F21.sc /uni1F20.sc /.notdef /uni1FC2.sc /uni1F91.sc /uni1F90.sc /.notdef
+%A0
+ /etatonos.sc /uni1F25.sc /uni1F24.sc /uni1F23.sc /uni1FC4.sc /uni1F95.sc /uni1F94.sc /uni1F93.sc
+ /uni1FC6.sc /uni1F27.sc /uni1F26.sc /uni1F22.sc /uni1FC7.sc /uni1F97.sc /uni1F96.sc /uni1F92.sc
+%B0
+ /uni1F7C.sc /uni1F61.sc /uni1F60.sc /uni1F63.sc /uni1FF2.sc /uni1FA1.sc /uni1FA0.sc /uni1FA3.sc
+ /omegatonos.sc /uni1F65.sc /uni1F64.sc /uni1F62.sc /uni1FF4.sc /uni1FA5.sc /uni1FA4.sc /uni1FA2.sc
+%C0
+ /uni1FF6.sc /uni1F67.sc /uni1F66.sc /uni03DC /uni1FF7.sc /uni1FA7.sc /uni1FA6.sc /.notdef
+ /uni1F76.sc /uni1F31.sc /uni1F30.sc /uni1F33.sc /uni1F7A.sc /uni1F51.sc /uni1F50.sc /uni1F53.sc
+%D0
+ /iotatonos.sc /uni1F35.sc /uni1F34.sc /uni1F32.sc /upsilontonos.sc /uni1F55.sc /uni1F54.sc /uni1F52.sc
+ /uni1FD6.sc /uni1F37.sc /uni1F36.sc /Iotadieresis /uni1FE6.sc /uni1F57.sc /uni1F56.sc /Upsilondieresis
+%E0
+ /uni1F72.sc /uni1F11.sc /uni1F10.sc /uni1F13.sc /uni1F78.sc /uni1F41.sc /uni1F40.sc /uni1F43.sc
+ /epsilontonos.sc /uni1F15.sc /uni1F14.sc /uni1F12.sc /omicrontonos.sc /uni1F45.sc /uni1F44.sc /uni1F42.sc
+%F0
+ /iotadieresis.sc /uni1FD2.sc /iotadieresistonos.sc /uni1FD7.sc /upsilondieresis.sc /uni1FE2.sc /upsilondieresistonos.sc /uni1FE7.sc
+ /uni1FB3.sc /uni1FC3.sc /uni1FF3.sc /uni1FE5.sc /uni1FE4.sc /.notdef /uni0374 /uni0375
+] def
+% Command line: 'otftotfm --automatic --encoding=lgr
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraSans.map --no-updmap
+% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
+% --unicoding=germandbls =: SSsmall -fdlig FiraSans-BoldItalic.otf
+% FiraSans-BoldItalic-osf-sc-lgr'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_f2p3ju.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_f2p3ju.enc
index 00dc6477a92..9788a5a0e42 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_f2p3ju.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_f2p3ju.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_f2p3jukhvbxlagbgjymiclk4kf
-% Encoding created by otftotfm on Sun May 24 07:08:52 2015
+% Encoding created by otftotfm on Wed May 23 11:23:08 2018
% Command line follows encoding
/AutoEnc_f2p3jukhvbxlagbgjymiclk4kf [
%00
@@ -54,12 +54,12 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf.mono/fonts/tfm/public/fira
-% --vf-directory=texmf.mono/fonts/vf/public/fira
-% --type1-directory=texmf.mono/fonts/type1/public/fira
-% --truetype-directory=texmf.mono/fonts/truetype/public/fira
-% --encoding-directory=texmf.mono/fonts/enc/dvips/fira
-% --map-file=texmf.mono/fonts/map/dvips/fira/FiraMono.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraMono.map --no-updmap
% --coding-scheme=TEX TEXT --feature=sups --ligkern=f i =: fi --ligkern=f l
% =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --ligkern=* {KL} * FiraMono-Bold.otf FiraMono-Bold-sup-ot1'
+% --ligkern=* {KL} * -fdlig FiraMono-Bold.otf FiraMono-Bold-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_gn3mpp.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_gn3mpp.enc
index f3f8adff287..98d8c04b2cb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_gn3mpp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_gn3mpp.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_gn3mppgneg7jzgrjzas66ekn3d
-% Encoding created by otftotfm on Sat Nov 12 02:30:21 2016
+% Encoding created by otftotfm on Wed May 23 11:15:37 2018
% Command line follows encoding
/AutoEnc_gn3mppgneg7jzgrjzas66ekn3d [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_itmofw.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_itmofw.enc
index 3e646752b77..3c867c8cad2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_itmofw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_itmofw.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_itmofw5tddt5a7jtnjcwsgf4sg
-% Encoding created by otftotfm on Sat Nov 12 02:30:19 2016
+% Encoding created by otftotfm on Wed May 23 11:15:35 2018
% Command line follows encoding
/AutoEnc_itmofw5tddt5a7jtnjcwsgf4sg [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_iwlvmj.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_iwlvmj.enc
new file mode 100644
index 00000000000..d203c1abf57
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_iwlvmj.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_iwlvmj4guohnqnt53zxgj7nhia
+% Encoding created by otftotfm on Wed May 23 11:15:34 2018
+% Command line follows encoding
+/AutoEnc_iwlvmj4guohnqnt53zxgj7nhia [
+%00
+ /endash /.notdef /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB
+ /uni1FBE /uni1FBC /uni1FCC /uni1FFC /Alpha /Upsilondieresis /alpha /upsilondieresis
+%10
+ /.notdef /.notdef /uni03DF /uni03D9 /.notdef /uni03D8 /uni03DA /uni03E0
+ /Euro.tf /perthousand.tf /uni0259 /uni03E1 /quoteleft /quoteright /breve /macron
+%20
+ /uni1FC1 /exclam /dieresis /dieresistonos /uni1FED /percent.tf /periodcentered /tonos
+ /parenleft /parenright /asterisk /plus.tf /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /anoteleia /uni1FFE /equal.tf /uni0313 /semicolon
+%40
+ /uni1FDF /Alpha /Beta /uni1FDD /uni2206 /Epsilon /Phi /Gamma
+ /Eta /Iota /Theta /Kappa /Lambda /Mu /Nu /Omicron
+%50
+ /Pi /Chi /Rho /Sigma /Tau /Upsilon /uni1FDE /uni2126
+ /Xi /Psi /Zeta /bracketleft /uni1FCF /bracketright /uni1FCE /uni1FCD
+%60
+ /uni1FEF /alpha /beta /uni03C2 /delta /epsilon /uni03D5 /gamma
+ /eta /iota /theta /kappa /lambda /uni00B5 /nu /omicron
+%70
+ /pi /chi /rho /sigma /tau /upsilon /.notdef /omega
+ /xi /psi /zeta /guillemotleft /uni037A /guillemotright /uni1FC0 /emdash
+%80
+ /uni1F70 /uni1F01 /uni1F00 /uni1F03 /uni1FB2 /uni1F81 /uni1F80 /uni1F83
+ /alphatonos /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82
+%90
+ /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /.notdef
+ /uni1F74 /uni1F21 /uni1F20 /.notdef /uni1FC2 /uni1F91 /uni1F90 /.notdef
+%A0
+ /etatonos /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93
+ /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92
+%B0
+ /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3
+ /omegatonos /uni1F65 /uni1F64 /uni1F62 /uni1FF4 /uni1FA5 /uni1FA4 /uni1FA2
+%C0
+ /uni1FF6 /uni1F67 /uni1F66 /uni03DC /uni1FF7 /uni1FA7 /uni1FA6 /.notdef
+ /uni1F76 /uni1F31 /uni1F30 /uni1F33 /uni1F7A /uni1F51 /uni1F50 /uni1F53
+%D0
+ /iotatonos /uni1F35 /uni1F34 /uni1F32 /upsilontonos /uni1F55 /uni1F54 /uni1F52
+ /uni1FD6 /uni1F37 /uni1F36 /Iotadieresis /uni1FE6 /uni1F57 /uni1F56 /Upsilondieresis
+%E0
+ /uni1F72 /uni1F11 /uni1F10 /uni1F13 /uni1F78 /uni1F41 /uni1F40 /uni1F43
+ /epsilontonos /uni1F15 /uni1F14 /uni1F12 /omicrontonos /uni1F45 /uni1F44 /uni1F42
+%F0
+ /iotadieresis /uni1FD2 /iotadieresistonos /uni1FD7 /upsilondieresis /uni1FE2 /upsilondieresistonos /uni1FE7
+ /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /.notdef /uni0374 /uni0375
+] def
+% Command line: 'otftotfm --automatic --encoding=lgr
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraSans.map --no-updmap
+% --feature=kern --feature=liga --feature=lnum --feature=tnum -fdlig
+% FiraSans-BoldItalic.otf FiraSans-BoldItalic-tlf-lgr'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_junpg2.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_junpg2.enc
index a560516b40f..59d3e9c6f20 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_junpg2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_junpg2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_junpg2y3rkjf7ux6erntw2swmb
-% Encoding created by otftotfm on Sat Nov 12 02:30:22 2016
+% Encoding created by otftotfm on Wed May 23 11:15:38 2018
% Command line follows encoding
/AutoEnc_junpg2y3rkjf7ux6erntw2swmb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_kinqlf.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_kinqlf.enc
index cdc83b8ff40..6611c50915d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_kinqlf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_kinqlf.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_kinqlfw436hbkzqijpocxwx4ph
-% Encoding created by otftotfm on Sat Nov 12 02:30:19 2016
+% Encoding created by otftotfm on Wed May 23 11:15:35 2018
% Command line follows encoding
/AutoEnc_kinqlfw436hbkzqijpocxwx4ph [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_le7keq.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_le7keq.enc
index 6172f37cb4a..7d1d3d714bc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_le7keq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_le7keq.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_le7keqk2rlrdtnjhimbpp7k5ze
-% Encoding created by otftotfm on Sat Nov 12 02:30:18 2016
+% Encoding created by otftotfm on Wed May 23 11:15:34 2018
% Command line follows encoding
/AutoEnc_le7keqk2rlrdtnjhimbpp7k5ze [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_ljq7ir.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_ljq7ir.enc
index 786dc8e06a1..25ef2652343 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_ljq7ir.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_ljq7ir.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ljq7irap6gxslq26rhsmhzucsf
-% Encoding created by otftotfm on Sat Nov 12 02:30:25 2016
+% Encoding created by otftotfm on Wed May 23 11:15:42 2018
% Command line follows encoding
/AutoEnc_ljq7irap6gxslq26rhsmhzucsf [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_mnklhx.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_mnklhx.enc
index 9239b6e7614..42a0dd2a8d3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_mnklhx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_mnklhx.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_mnklhxoh2nuhpdo6d5xar4rnrf
-% Encoding created by otftotfm on Sat Nov 12 02:30:22 2016
+% Encoding created by otftotfm on Wed May 23 11:15:39 2018
% Command line follows encoding
/AutoEnc_mnklhxoh2nuhpdo6d5xar4rnrf [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_mpt7xh.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_mpt7xh.enc
index 9a37d517a62..e3c013a12c0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_mpt7xh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_mpt7xh.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_mpt7xhwboeojaqhmyys3qbv7kg
-% Encoding created by otftotfm on Sun May 24 07:08:52 2015
+% Encoding created by otftotfm on Wed May 23 11:23:08 2018
% Command line follows encoding
/AutoEnc_mpt7xhwboeojaqhmyys3qbv7kg [
%00
@@ -54,13 +54,13 @@
/.notdef /.notdef /.notdef /fl /l /fi /i /f
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=texmf.mono/fonts/tfm/public/fira
-% --vf-directory=texmf.mono/fonts/vf/public/fira
-% --type1-directory=texmf.mono/fonts/type1/public/fira
-% --truetype-directory=texmf.mono/fonts/truetype/public/fira
-% --encoding-directory=texmf.mono/fonts/enc/dvips/fira
-% --map-file=texmf.mono/fonts/map/dvips/fira/FiraMono.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraMono.map --no-updmap
% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl FiraMono-Bold.otf
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl -fdlig FiraMono-Bold.otf
% FiraMono-Bold-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_mvxrts.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_mvxrts.enc
index 343ea0fdd41..f4fa93bed51 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_mvxrts.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_mvxrts.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_mvxrtsswow5roclcadhvj653qb
-% Encoding created by otftotfm on Sat Nov 12 02:30:24 2016
+% Encoding created by otftotfm on Wed May 23 11:15:41 2018
% Command line follows encoding
/AutoEnc_mvxrtsswow5roclcadhvj653qb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_oevvub.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_oevvub.enc
new file mode 100644
index 00000000000..a2cab6a40b9
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_oevvub.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_oevvubfygjrbm4vwhul5gxfekc
+% Encoding created by otftotfm on Wed May 23 11:23:09 2018
+% Command line follows encoding
+/AutoEnc_oevvubfygjrbm4vwhul5gxfekc [
+%00
+ /endash /.notdef /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB
+ /uni1FBE /uni1FBC /uni1FCC /uni1FFC /Alpha /Upsilondieresis /alpha /upsilondieresis
+%10
+ /.notdef /.notdef /uni03DF /uni03D9 /.notdef /uni03D8 /uni03DA /uni03E0
+ /Euro.tosf /perthousand.tosf /.notdef /uni03E1 /quoteleft /quoteright /breve /macron
+%20
+ /uni1FC1 /exclam /dieresis /dieresistonos /uni1FED /percent.tosf /periodcentered /tonos
+ /parenleft /parenright /asterisk /plus.tosf /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /anoteleia /uni1FFE /equal.tosf /uni0313 /semicolon
+%40
+ /uni1FDF /Alpha /Beta /uni1FDD /Delta /Epsilon /Phi /Gamma
+ /Eta /Iota /Theta /Kappa /Lambda /Mu /Nu /Omicron
+%50
+ /Pi /Chi /Rho /Sigma /Tau /Upsilon /uni1FDE /Omega
+ /Xi /Psi /Zeta /bracketleft /uni1FCF /bracketright /uni1FCE /uni1FCD
+%60
+ /uni1FEF /alpha /beta /uni03C2 /delta /epsilon /uni03D5 /gamma
+ /eta /iota /theta /kappa /lambda /uni00B5 /nu /omicron
+%70
+ /pi /chi /rho /sigma /tau /upsilon /.notdef /omega
+ /xi /psi /zeta /guillemotleft /uni037A /guillemotright /uni1FC0 /emdash
+%80
+ /uni1F70 /uni1F01 /uni1F00 /uni1F03 /uni1FB2 /uni1F81 /uni1F80 /uni1F83
+ /alphatonos /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82
+%90
+ /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /fl
+ /uni1F74 /uni1F21 /uni1F20 /l /uni1FC2 /uni1F91 /uni1F90 /fi
+%A0
+ /etatonos /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93
+ /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92
+%B0
+ /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3
+ /omegatonos /uni1F65 /uni1F64 /uni1F62 /uni1FF4 /uni1FA5 /uni1FA4 /uni1FA2
+%C0
+ /uni1FF6 /uni1F67 /uni1F66 /uni03DC /uni1FF7 /uni1FA7 /uni1FA6 /i
+ /uni1F76 /uni1F31 /uni1F30 /uni1F33 /uni1F7A /uni1F51 /uni1F50 /uni1F53
+%D0
+ /iotatonos /uni1F35 /uni1F34 /uni1F32 /upsilontonos /uni1F55 /uni1F54 /uni1F52
+ /uni1FD6 /uni1F37 /uni1F36 /Iotadieresis /uni1FE6 /uni1F57 /uni1F56 /Upsilondieresis
+%E0
+ /uni1F72 /uni1F11 /uni1F10 /uni1F13 /uni1F78 /uni1F41 /uni1F40 /uni1F43
+ /epsilontonos /uni1F15 /uni1F14 /uni1F12 /omicrontonos /uni1F45 /uni1F44 /uni1F42
+%F0
+ /iotadieresis /uni1FD2 /iotadieresistonos /uni1FD7 /upsilondieresis /uni1FE2 /upsilondieresistonos /uni1FE7
+ /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /f /uni0374 /uni0375
+] def
+% Command line: 'otftotfm --automatic --encoding=lgr
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraMono.map --no-updmap
+% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl -fdlig
+% FiraMono-Bold.otf FiraMono-Bold-tosf-lgr'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_onkf6v.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_onkf6v.enc
index c164373b9ae..abae1ee91dc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_onkf6v.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_onkf6v.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_onkf6vrg2g2ltkgax5rye7llse
-% Encoding created by otftotfm on Sat Nov 12 02:30:19 2016
+% Encoding created by otftotfm on Wed May 23 11:15:35 2018
% Command line follows encoding
/AutoEnc_onkf6vrg2g2ltkgax5rye7llse [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_ou66re.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_ou66re.enc
index 7d954bc714a..67621028920 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_ou66re.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_ou66re.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ou66re4lj7bairmr2kj55qv4nc
-% Encoding created by otftotfm on Sat Nov 12 02:30:23 2016
+% Encoding created by otftotfm on Wed May 23 11:15:40 2018
% Command line follows encoding
/AutoEnc_ou66re4lj7bairmr2kj55qv4nc [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_p7hned.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_p7hned.enc
new file mode 100644
index 00000000000..7ea9af45107
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_p7hned.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_p7hnednsorbdnqxrrcdu2gupte
+% Encoding created by otftotfm on Wed May 23 11:15:37 2018
+% Command line follows encoding
+/AutoEnc_p7hnednsorbdnqxrrcdu2gupte [
+%00
+ /endash /.notdef /.notdef /.notdef /.notdef /.notdef /uni03DB.sc /uni03DB.sc
+ /uni1FBE /uni1FBC /uni1FCC /uni1FFC /Alpha /Upsilondieresis /alpha.sc /upsilondieresis.sc
+%10
+ /.notdef /.notdef /uni03DF.sc /uni03D9.sc /.notdef /uni03D8 /uni03DA /uni03E0
+ /Euro /perthousand /uni0259.sc /uni03E1.sc /quoteleft /quoteright /breve.sc /macron.sc
+%20
+ /uni1FC1 /exclam /dieresis.sc /dieresistonos /uni1FED /percent /periodcentered /tonos
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /anoteleia /uni1FFE /equal /uni0313 /semicolon
+%40
+ /uni1FDF /Alpha /Beta /uni1FDD /uni2206 /Epsilon /Phi /Gamma
+ /Eta /Iota /Theta /Kappa /Lambda /Mu /Nu /Omicron
+%50
+ /Pi /Chi /Rho /Sigma /Tau /Upsilon /uni1FDE /uni2126
+ /Xi /Psi /Zeta /bracketleft /uni1FCF /bracketright /uni1FCE /uni1FCD
+%60
+ /uni1FEF /alpha.sc /beta.sc /uni03C2.sc /delta.sc /epsilon.sc /uni03D5.sc /gamma.sc
+ /eta.sc /iota.sc /theta.sc /kappa.sc /lambda.sc /uni00B5 /nu.sc /omicron.sc
+%70
+ /pi.sc /chi.sc /rho.sc /sigma.sc /tau.sc /upsilon.sc /.notdef /omega.sc
+ /xi.sc /psi.sc /zeta.sc /guillemotleft /uni037A /guillemotright /uni1FC0 /emdash
+%80
+ /uni1F70.sc /uni1F01.sc /uni1F00.sc /uni1F03.sc /uni1FB2.sc /uni1F81.sc /uni1F80.sc /uni1F83.sc
+ /alphatonos.sc /uni1F05.sc /uni1F04.sc /uni1F02.sc /uni1FB4.sc /uni1F85.sc /uni1F84.sc /uni1F82.sc
+%90
+ /uni1FB6.sc /uni1F07.sc /uni1F06.sc /uni03DD.sc /uni1FB7.sc /uni1F87.sc /uni1F86.sc /.notdef
+ /uni1F74.sc /uni1F21.sc /uni1F20.sc /.notdef /uni1FC2.sc /uni1F91.sc /uni1F90.sc /.notdef
+%A0
+ /etatonos.sc /uni1F25.sc /uni1F24.sc /uni1F23.sc /uni1FC4.sc /uni1F95.sc /uni1F94.sc /uni1F93.sc
+ /uni1FC6.sc /uni1F27.sc /uni1F26.sc /uni1F22.sc /uni1FC7.sc /uni1F97.sc /uni1F96.sc /uni1F92.sc
+%B0
+ /uni1F7C.sc /uni1F61.sc /uni1F60.sc /uni1F63.sc /uni1FF2.sc /uni1FA1.sc /uni1FA0.sc /uni1FA3.sc
+ /omegatonos.sc /uni1F65.sc /uni1F64.sc /uni1F62.sc /uni1FF4.sc /uni1FA5.sc /uni1FA4.sc /uni1FA2.sc
+%C0
+ /uni1FF6.sc /uni1F67.sc /uni1F66.sc /uni03DC /uni1FF7.sc /uni1FA7.sc /uni1FA6.sc /.notdef
+ /uni1F76.sc /uni1F31.sc /uni1F30.sc /uni1F33.sc /uni1F7A.sc /uni1F51.sc /uni1F50.sc /uni1F53.sc
+%D0
+ /iotatonos.sc /uni1F35.sc /uni1F34.sc /uni1F32.sc /upsilontonos.sc /uni1F55.sc /uni1F54.sc /uni1F52.sc
+ /uni1FD6.sc /uni1F37.sc /uni1F36.sc /Iotadieresis /uni1FE6.sc /uni1F57.sc /uni1F56.sc /Upsilondieresis
+%E0
+ /uni1F72.sc /uni1F11.sc /uni1F10.sc /uni1F13.sc /uni1F78.sc /uni1F41.sc /uni1F40.sc /uni1F43.sc
+ /epsilontonos.sc /uni1F15.sc /uni1F14.sc /uni1F12.sc /omicrontonos.sc /uni1F45.sc /uni1F44.sc /uni1F42.sc
+%F0
+ /iotadieresis.sc /uni1FD2.sc /iotadieresistonos.sc /uni1FD7.sc /upsilondieresis.sc /uni1FE2.sc /upsilondieresistonos.sc /uni1FE7.sc
+ /uni1FB3.sc /uni1FC3.sc /uni1FF3.sc /uni1FE5.sc /uni1FE4.sc /.notdef /uni0374 /uni0375
+] def
+% Command line: 'otftotfm --automatic --encoding=lgr
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraSans.map --no-updmap
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --unicoding=germandbls =: SSsmall -fdlig FiraSans-BoldItalic.otf
+% FiraSans-BoldItalic-lf-sc-lgr'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_pre736.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_pre736.enc
index bbcabb80096..fdebb503086 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_pre736.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_pre736.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_pre736q7atti2lq743bq7zsi6c
-% Encoding created by otftotfm on Sat Nov 12 02:30:20 2016
+% Encoding created by otftotfm on Wed May 23 11:15:37 2018
% Command line follows encoding
/AutoEnc_pre736q7atti2lq743bq7zsi6c [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_qdgi57.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_qdgi57.enc
index b61c41998d1..5aa09e9ffc8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_qdgi57.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_qdgi57.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_qdgi5753parfcxibrdvbshnaya
-% Encoding created by otftotfm on Sat Nov 12 02:30:19 2016
+% Encoding created by otftotfm on Wed May 23 11:15:36 2018
% Command line follows encoding
/AutoEnc_qdgi5753parfcxibrdvbshnaya [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_qeo2k2.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_qeo2k2.enc
index 47c1d7b921d..a2b44e5f64f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_qeo2k2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_qeo2k2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_qeo2k2dmlbt2nlehu6xh5jqbwb
-% Encoding created by otftotfm on Sat Nov 12 02:30:21 2016
+% Encoding created by otftotfm on Wed May 23 11:15:38 2018
% Command line follows encoding
/AutoEnc_qeo2k2dmlbt2nlehu6xh5jqbwb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_sbcabv.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_sbcabv.enc
new file mode 100644
index 00000000000..ad985c2e4e8
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_sbcabv.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_sbcabvuloe7stqr4w7ytbs6kge
+% Encoding created by otftotfm on Wed May 23 11:23:08 2018
+% Command line follows encoding
+/AutoEnc_sbcabvuloe7stqr4w7ytbs6kge [
+%00
+ /endash /.notdef /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB
+ /uni1FBE /uni1FBC /uni1FCC /uni1FFC /Alpha /Upsilondieresis /alpha /upsilondieresis
+%10
+ /.notdef /.notdef /uni03DF /uni03D9 /.notdef /uni03D8 /uni03DA /uni03E0
+ /Euro /perthousand /.notdef /uni03E1 /quoteleft /quoteright /breve /macron
+%20
+ /uni1FC1 /exclam /dieresis /dieresistonos /uni1FED /percent /periodcentered /tonos
+ /uni207D /uni207E /asterisk /uni207A /comma /hyphen /period /slash
+%30
+ /uni2070 /uni00B9 /uni00B2 /uni00B3 /uni2074 /uni2075 /uni2076 /uni2077
+ /uni2078 /uni2079 /colon /anoteleia /uni1FFE /uni207C /uni0313 /semicolon
+%40
+ /uni1FDF /Alpha /Beta /uni1FDD /Delta /Epsilon /Phi /Gamma
+ /Eta /Iota /Theta /Kappa /Lambda /Mu /Nu /Omicron
+%50
+ /Pi /Chi /Rho /Sigma /Tau /Upsilon /uni1FDE /Omega
+ /Xi /Psi /Zeta /bracketleft /uni1FCF /bracketright /uni1FCE /uni1FCD
+%60
+ /uni1FEF /alpha /beta /uni03C2 /delta /epsilon /uni03D5 /gamma
+ /eta /iota /theta /kappa /lambda /uni00B5 /nu /omicron
+%70
+ /pi /chi /rho /sigma /tau /upsilon /.notdef /omega
+ /xi /psi /zeta /guillemotleft /uni037A /guillemotright /uni1FC0 /emdash
+%80
+ /uni1F70 /uni1F01 /uni1F00 /uni1F03 /uni1FB2 /uni1F81 /uni1F80 /uni1F83
+ /alphatonos /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82
+%90
+ /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /fl
+ /uni1F74 /uni1F21 /uni1F20 /l /uni1FC2 /uni1F91 /uni1F90 /fi
+%A0
+ /etatonos /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93
+ /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92
+%B0
+ /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3
+ /omegatonos /uni1F65 /uni1F64 /uni1F62 /uni1FF4 /uni1FA5 /uni1FA4 /uni1FA2
+%C0
+ /uni1FF6 /uni1F67 /uni1F66 /uni03DC /uni1FF7 /uni1FA7 /uni1FA6 /i
+ /uni1F76 /uni1F31 /uni1F30 /uni1F33 /uni1F7A /uni1F51 /uni1F50 /uni1F53
+%D0
+ /iotatonos /uni1F35 /uni1F34 /uni1F32 /upsilontonos /uni1F55 /uni1F54 /uni1F52
+ /uni1FD6 /uni1F37 /uni1F36 /Iotadieresis /uni1FE6 /uni1F57 /uni1F56 /Upsilondieresis
+%E0
+ /uni1F72 /uni1F11 /uni1F10 /uni1F13 /uni1F78 /uni1F41 /uni1F40 /uni1F43
+ /epsilontonos /uni1F15 /uni1F14 /uni1F12 /omicrontonos /uni1F45 /uni1F44 /uni1F42
+%F0
+ /iotadieresis /uni1FD2 /iotadieresistonos /uni1FD7 /upsilondieresis /uni1FE2 /upsilondieresistonos /uni1FE7
+ /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /f /uni0374 /uni0375
+] def
+% Command line: 'otftotfm --automatic --encoding=lgr
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraMono.map --no-updmap
+% --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * -fdlig
+% FiraMono-Bold.otf FiraMono-Bold-sup-lgr'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_smmr7a.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_smmr7a.enc
index 610a3fab216..5ffc8c0f5f6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_smmr7a.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_smmr7a.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_smmr7ayyws2clswmhbwvs6opnh
-% Encoding created by otftotfm on Sat Nov 12 02:30:23 2016
+% Encoding created by otftotfm on Wed May 23 11:15:39 2018
% Command line follows encoding
/AutoEnc_smmr7ayyws2clswmhbwvs6opnh [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_u77sc6.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_u77sc6.enc
index 7316a19a956..b03011e93ca 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_u77sc6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_u77sc6.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_u77sc6dm6y5silyw6sctdg22zb
-% Encoding created by otftotfm on Sat Nov 12 02:30:23 2016
+% Encoding created by otftotfm on Wed May 23 11:15:40 2018
% Command line follows encoding
/AutoEnc_u77sc6dm6y5silyw6sctdg22zb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_vn43fe.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_vn43fe.enc
index ea544617768..fbdcb805e9e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_vn43fe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_vn43fe.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_vn43fe4rboectehadiy4xaanqd
-% Encoding created by otftotfm on Sat Nov 12 02:30:20 2016
+% Encoding created by otftotfm on Wed May 23 11:15:37 2018
% Command line follows encoding
/AutoEnc_vn43fe4rboectehadiy4xaanqd [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_vyx4ej.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_vyx4ej.enc
index 673fce8bd03..2e56a72cf5b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_vyx4ej.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_vyx4ej.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_vyx4ej23i2qibl2l3b3gy7ffqa
-% Encoding created by otftotfm on Sat Nov 12 02:30:22 2016
+% Encoding created by otftotfm on Wed May 23 11:15:39 2018
% Command line follows encoding
/AutoEnc_vyx4ej23i2qibl2l3b3gy7ffqa [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_xbqiro.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_xbqiro.enc
index e8c88224b25..6144885f2ac 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_xbqiro.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_xbqiro.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_xbqiroa3xwawd542xjv5bejo3c
-% Encoding created by otftotfm on Sun May 24 07:08:52 2015
+% Encoding created by otftotfm on Wed May 23 11:23:09 2018
% Command line follows encoding
/AutoEnc_xbqiroa3xwawd542xjv5bejo3c [
%00
@@ -54,13 +54,13 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf.mono/fonts/tfm/public/fira
-% --vf-directory=texmf.mono/fonts/vf/public/fira
-% --type1-directory=texmf.mono/fonts/type1/public/fira
-% --truetype-directory=texmf.mono/fonts/truetype/public/fira
-% --encoding-directory=texmf.mono/fonts/enc/dvips/fira
-% --map-file=texmf.mono/fonts/map/dvips/fira/FiraMono.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraMono.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=onum
% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl FiraMono-Bold.otf
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl -fdlig FiraMono-Bold.otf
% FiraMono-Bold-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_xeq6li.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_xeq6li.enc
index 6975e7c8afb..02f644bc63a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_xeq6li.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_xeq6li.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_xeq6lid34ywhkvujbswftc5uhf
-% Encoding created by otftotfm on Sat Nov 12 02:30:21 2016
+% Encoding created by otftotfm on Wed May 23 11:15:38 2018
% Command line follows encoding
/AutoEnc_xeq6lid34ywhkvujbswftc5uhf [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_xrafnf.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_xrafnf.enc
index b2c30ddcbd5..c4776bd0cbc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_xrafnf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_xrafnf.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_xrafnfccc2c46ixsxmzrjuqqba
-% Encoding created by otftotfm on Sun May 24 07:08:52 2015
+% Encoding created by otftotfm on Wed May 23 11:23:09 2018
% Command line follows encoding
/AutoEnc_xrafnfccc2c46ixsxmzrjuqqba [
%00
@@ -54,13 +54,13 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf.mono/fonts/tfm/public/fira
-% --vf-directory=texmf.mono/fonts/vf/public/fira
-% --type1-directory=texmf.mono/fonts/type1/public/fira
-% --truetype-directory=texmf.mono/fonts/truetype/public/fira
-% --encoding-directory=texmf.mono/fonts/enc/dvips/fira
-% --map-file=texmf.mono/fonts/map/dvips/fira/FiraMono.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraMono.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sups
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * FiraMono-Bold.otf
+% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * -fdlig FiraMono-Bold.otf
% FiraMono-Bold-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_xrxr2g.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_xrxr2g.enc
index 9b17cfb31a3..ad7353039cb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_xrxr2g.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_xrxr2g.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_xrxr2ghddkjossqfkr5h4oblfa
-% Encoding created by otftotfm on Sat Nov 12 02:30:20 2016
+% Encoding created by otftotfm on Wed May 23 11:15:36 2018
% Command line follows encoding
/AutoEnc_xrxr2ghddkjossqfkr5h4oblfa [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_xsutkk.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_xsutkk.enc
index 7a37945090b..cb79d001585 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_xsutkk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_xsutkk.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_xsutkk5qpbtpithjvjqe7koprd
-% Encoding created by otftotfm on Sun May 24 07:08:52 2015
+% Encoding created by otftotfm on Wed May 23 11:23:08 2018
% Command line follows encoding
/AutoEnc_xsutkk5qpbtpithjvjqe7koprd [
%00
@@ -54,12 +54,12 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf.mono/fonts/tfm/public/fira
-% --vf-directory=texmf.mono/fonts/vf/public/fira
-% --type1-directory=texmf.mono/fonts/type1/public/fira
-% --truetype-directory=texmf.mono/fonts/truetype/public/fira
-% --encoding-directory=texmf.mono/fonts/enc/dvips/fira
-% --map-file=texmf.mono/fonts/map/dvips/fira/FiraMono.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraMono.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=tnum --ligkern=f
% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl FiraMono-Bold.otf FiraMono-Bold-tlf-ly1'
+% --ligkern=ff l =: ffl -fdlig FiraMono-Bold.otf FiraMono-Bold-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_xwtagr.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_xwtagr.enc
new file mode 100644
index 00000000000..85184a054d8
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_xwtagr.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_xwtagrgimq36il5bways5fmjwh
+% Encoding created by otftotfm on Wed May 23 11:15:38 2018
+% Command line follows encoding
+/AutoEnc_xwtagrgimq36il5bways5fmjwh [
+%00
+ /endash /.notdef /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB
+ /uni1FBE /uni1FBC /uni1FCC /uni1FFC /Alpha /Upsilondieresis /alpha /upsilondieresis
+%10
+ /.notdef /.notdef /uni03DF /uni03D9 /.notdef /uni03D8 /uni03DA /uni03E0
+ /Euro.tosf /perthousand.tosf /uni0259 /uni03E1 /quoteleft /quoteright /breve /macron
+%20
+ /uni1FC1 /exclam /dieresis /dieresistonos /uni1FED /percent.tosf /periodcentered /tonos
+ /parenleft /parenright /asterisk /plus.tosf /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /anoteleia /uni1FFE /equal.tosf /uni0313 /semicolon
+%40
+ /uni1FDF /Alpha /Beta /uni1FDD /uni2206 /Epsilon /Phi /Gamma
+ /Eta /Iota /Theta /Kappa /Lambda /Mu /Nu /Omicron
+%50
+ /Pi /Chi /Rho /Sigma /Tau /Upsilon /uni1FDE /uni2126
+ /Xi /Psi /Zeta /bracketleft /uni1FCF /bracketright /uni1FCE /uni1FCD
+%60
+ /uni1FEF /alpha /beta /uni03C2 /delta /epsilon /uni03D5 /gamma
+ /eta /iota /theta /kappa /lambda /uni00B5 /nu /omicron
+%70
+ /pi /chi /rho /sigma /tau /upsilon /.notdef /omega
+ /xi /psi /zeta /guillemotleft /uni037A /guillemotright /uni1FC0 /emdash
+%80
+ /uni1F70 /uni1F01 /uni1F00 /uni1F03 /uni1FB2 /uni1F81 /uni1F80 /uni1F83
+ /alphatonos /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82
+%90
+ /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /.notdef
+ /uni1F74 /uni1F21 /uni1F20 /.notdef /uni1FC2 /uni1F91 /uni1F90 /.notdef
+%A0
+ /etatonos /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93
+ /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92
+%B0
+ /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3
+ /omegatonos /uni1F65 /uni1F64 /uni1F62 /uni1FF4 /uni1FA5 /uni1FA4 /uni1FA2
+%C0
+ /uni1FF6 /uni1F67 /uni1F66 /uni03DC /uni1FF7 /uni1FA7 /uni1FA6 /.notdef
+ /uni1F76 /uni1F31 /uni1F30 /uni1F33 /uni1F7A /uni1F51 /uni1F50 /uni1F53
+%D0
+ /iotatonos /uni1F35 /uni1F34 /uni1F32 /upsilontonos /uni1F55 /uni1F54 /uni1F52
+ /uni1FD6 /uni1F37 /uni1F36 /Iotadieresis /uni1FE6 /uni1F57 /uni1F56 /Upsilondieresis
+%E0
+ /uni1F72 /uni1F11 /uni1F10 /uni1F13 /uni1F78 /uni1F41 /uni1F40 /uni1F43
+ /epsilontonos /uni1F15 /uni1F14 /uni1F12 /omicrontonos /uni1F45 /uni1F44 /uni1F42
+%F0
+ /iotadieresis /uni1FD2 /iotadieresistonos /uni1FD7 /upsilondieresis /uni1FE2 /upsilondieresistonos /uni1FE7
+ /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /.notdef /uni0374 /uni0375
+] def
+% Command line: 'otftotfm --automatic --encoding=lgr
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraSans.map --no-updmap
+% --feature=kern --feature=liga --feature=onum --feature=tnum -fdlig
+% FiraSans-BoldItalic.otf FiraSans-BoldItalic-tosf-lgr'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_yhyk3t.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_yhyk3t.enc
index 687cc5fcddd..51a33ac3b12 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_yhyk3t.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_yhyk3t.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_yhyk3tkaj2h6tzs5mizckqlo3d
-% Encoding created by otftotfm on Sun May 24 07:08:52 2015
+% Encoding created by otftotfm on Wed May 23 11:23:08 2018
% Command line follows encoding
/AutoEnc_yhyk3tkaj2h6tzs5mizckqlo3d [
%00
@@ -54,12 +54,12 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf.mono/fonts/tfm/public/fira
-% --vf-directory=texmf.mono/fonts/vf/public/fira
-% --type1-directory=texmf.mono/fonts/type1/public/fira
-% --truetype-directory=texmf.mono/fonts/truetype/public/fira
-% --encoding-directory=texmf.mono/fonts/enc/dvips/fira
-% --map-file=texmf.mono/fonts/map/dvips/fira/FiraMono.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraMono.map --no-updmap
% --coding-scheme=TEX TEXT --feature=tnum --ligkern=f i =: fi --ligkern=f l
% =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% FiraMono-Bold.otf FiraMono-Bold-tlf-ot1'
+% -fdlig FiraMono-Bold.otf FiraMono-Bold-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/fira/fir_zrx7he.enc b/Master/texmf-dist/fonts/enc/dvips/fira/fir_zrx7he.enc
index ffbef3573ab..848624d4396 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fira/fir_zrx7he.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fira/fir_zrx7he.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_zrx7hendybrk4jnl2b34fbm2kf
-% Encoding created by otftotfm on Sun May 24 07:08:52 2015
+% Encoding created by otftotfm on Wed May 23 11:23:09 2018
% Command line follows encoding
/AutoEnc_zrx7hendybrk4jnl2b34fbm2kf [
%00
@@ -54,13 +54,13 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf.mono/fonts/tfm/public/fira
-% --vf-directory=texmf.mono/fonts/vf/public/fira
-% --type1-directory=texmf.mono/fonts/type1/public/fira
-% --truetype-directory=texmf.mono/fonts/truetype/public/fira
-% --encoding-directory=texmf.mono/fonts/enc/dvips/fira
-% --map-file=texmf.mono/fonts/map/dvips/fira/FiraMono.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/fira
+% --vf-directory=texmf/fonts/vf/public/fira
+% --type1-directory=texmf/fonts/type1/public/fira
+% --truetype-directory=texmf/fonts/truetype/public/fira
+% --encoding-directory=texmf/fonts/enc/dvips/fira
+% --map-file=texmf/fonts/map/dvips/fira/FiraMono.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups --ligkern=f
% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --ligkern=* {KL} * FiraMono-Bold.otf
+% --ligkern=ff l =: ffl --ligkern=* {KL} * -fdlig FiraMono-Bold.otf
% FiraMono-Bold-sup-ly1'