summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/fonts/enc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-11-18 23:19:50 +0000
committerKarl Berry <karl@freefriends.org>2016-11-18 23:19:50 +0000
commitd7711554f1e7c2b8a7dfb9324494e705539c48b2 (patch)
treebce5f765e50db9e8672785b6087d6494643552e5 /Master/texmf-dist/fonts/enc
parent9288aeee16feddc5f88047725178f2ab2068aa55 (diff)
baskervillef (18nov16)
git-svn-id: svn://tug.org/texlive/trunk@42529 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts/enc')
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_2vphkl.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_323rzo.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_4s6ffc.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5iwusi.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5p43xi.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5uo5ql.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_63ao4i.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_67hdfc.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6aig4m.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6gja5t.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_77oqdq.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7c5ufm.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7en3z2.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7ykrj7.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_a6e5yi.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bbd2ra.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bds6pt.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bguowg.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_c76n5g.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_chi3og.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cn6fgj.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_coef4z.enc57
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cvjygd.enc57
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_dxocay.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e6dqmu.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e6zmok.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fex7hn.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fl2r4r.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fv24fa.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gcpsbm.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gdav67.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gtwjjp.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_h3ld5p.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hcuwye.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hh5nd6.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_i75lhj.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_i7xozg.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ij7jd5.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_izzn24.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_j4z3cc.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_j65xbs.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kamlpe.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kjjlvj.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kpovnp.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_l5lp2j.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lcyowo.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_m55nq3.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_myk2bc.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n3f3jl.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n6x6xr.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_o4lzby.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oatqyt.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ohl6cl.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oij2u6.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_q4ab4o.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qerubm.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qwd3dx.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_r2xnwj.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_renr32.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rf3vka.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rkc5zd.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rmbehh.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rohq7o.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rqbadf.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_sf4kho.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tkk54u.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tpisx6.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tshrsw.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ttjjmx.enc57
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_u3c7yf.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uea64s.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uggj2o.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vjaqds.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vjflwo.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vkedkr.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wcixnv.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wesofd.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xgz3wi.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ydjrw6.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_yy6alv.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zfni6x.enc65
81 files changed, 5273 insertions, 0 deletions
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_2vphkl.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_2vphkl.enc
new file mode 100644
index 00000000000..fb5f6125313
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_2vphkl.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2vphklix7vr2ycbks3b6d2wwjg
+% Encoding created by otftotfm on Thu Nov 17 22:53:31 2016
+% Command line follows encoding
+/AutoEnc_2vphklix7vr2ycbks3b6d2wwjg [
+%00
+ /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_323rzo.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_323rzo.enc
new file mode 100644
index 00000000000..44c2f670959
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_323rzo.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_323rzogpbtrdqac7fbwo7ybsqh
+% Encoding created by otftotfm on Thu Nov 17 22:53:35 2016
+% Command line follows encoding
+/AutoEnc_323rzogpbtrdqac7fbwo7ybsqh [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /s_t /c_t /s_p /f_b /f_h /f_j /f_k /f_t
+ /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
+% --feature=onum --feature=pnum --include-alternates=*.swash --feature=aalt
+% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_4s6ffc.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_4s6ffc.enc
new file mode 100644
index 00000000000..a12d8d101e4
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_4s6ffc.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_4s6ffckhlh4hez5ybxghajlr6e
+% Encoding created by otftotfm on Thu Nov 17 22:53:34 2016
+% Command line follows encoding
+/AutoEnc_4s6ffckhlh4hez5ybxghajlr6e [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question.sc
+%40
+ /at.sc /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.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --feature=pnum --feature=smcp --unicoding=germandbls =: SSsmall
+% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5iwusi.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5iwusi.enc
new file mode 100644
index 00000000000..67dea5ffb21
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5iwusi.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_5iwusioyq5cwjlwvp6zm4e4lsf
+% Encoding created by otftotfm on Thu Nov 17 22:53:31 2016
+% Command line follows encoding
+/AutoEnc_5iwusioyq5cwjlwvp6zm4e4lsf [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /.notdef /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /uni015F.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /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.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5p43xi.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5p43xi.enc
new file mode 100644
index 00000000000..9f34c8a80e8
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5p43xi.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_5p43xinslidyyykw4hkiecn6xh
+% Encoding created by otftotfm on Thu Nov 17 22:53:29 2016
+% Command line follows encoding
+/AutoEnc_5p43xinslidyyykw4hkiecn6xh [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.superior /parenright.superior /asterisk /plus /comma.superior /hyphen.superior /period.superior /slash.superior
+%30
+ /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
+ /eight.superior /nine.superior /colon /semicolon /less /equal /greater /question
+%40
+ /at.superior /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
+ /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
+%50
+ /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
+ /X.superior /Y.superior /Z.superior /bracketleft.superior /backslash.superior /bracketright.superior /circumflex /underscore
+%60
+ /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
+ /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
+%70
+ /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
+ /x.superior /y.superior /z.superior /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
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=sups --ligkern=* {KL} * --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5uo5ql.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5uo5ql.enc
new file mode 100644
index 00000000000..be4f2630554
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5uo5ql.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_5uo5qlhznkbp4efnrfnjywzjjg
+% Encoding created by otftotfm on Thu Nov 17 22:53:29 2016
+% Command line follows encoding
+/AutoEnc_5uo5qlhznkbp4efnrfnjywzjjg [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.superior /parenright.superior /asterisk /plus /comma.superior /hyphen.superior /period.superior /slash.superior
+%30
+ /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
+ /eight.superior /nine.superior /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at.superior /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
+ /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
+%50
+ /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
+ /X.superior /Y.superior /Z.superior /bracketleft.superior /quotedblleft /bracketright.superior /circumflex /dotaccent
+%60
+ /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
+ /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
+%70
+ /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
+ /x.superior /y.superior /z.superior /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=sups
+% --ligkern=* {KL} * --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_63ao4i.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_63ao4i.enc
new file mode 100644
index 00000000000..eea2c267c4a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_63ao4i.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_63ao4ihzr5r3aduarnnpnlcl4d
+% Encoding created by otftotfm on Thu Nov 17 22:53:24 2016
+% Command line follows encoding
+/AutoEnc_63ao4ihzr5r3aduarnnpnlcl4d [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question.sc
+%40
+ /at.sc /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.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
+% --feature=pnum --feature=smcp --unicoding=germandbls =: SSsmall
+% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_67hdfc.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_67hdfc.enc
new file mode 100644
index 00000000000..523f105c8d5
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_67hdfc.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_67hdfcaxqwmmtlvgxpuuh2syhg
+% Encoding created by otftotfm on Thu Nov 17 22:53:27 2016
+% Command line follows encoding
+/AutoEnc_67hdfcaxqwmmtlvgxpuuh2syhg [
+%00
+ /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6aig4m.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6aig4m.enc
new file mode 100644
index 00000000000..379fdcf443e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6aig4m.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_6aig4m7eyob5qwadij2vmxmleb
+% Encoding created by otftotfm on Thu Nov 17 22:53:50 2016
+% Command line follows encoding
+/AutoEnc_6aig4m7eyob5qwadij2vmxmleb [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.denominator /one.denominator /two.denominator /three.denominator /four.denominator /five.denominator /six.denominator /seven.denominator
+ /eight.denominator /nine.denominator /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
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom
+% --feature=kern --feature=liga --ligkern=* {KL} * --xheight=x
+% BaskervilleF-Italic.otf BaskervilleF-Italic-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6gja5t.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6gja5t.enc
new file mode 100644
index 00000000000..c2d3cd629ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6gja5t.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_6gja5toodx5kelquw3dgkjac6h
+% Encoding created by otftotfm on Thu Nov 17 22:54:15 2016
+% Command line follows encoding
+/AutoEnc_6gja5toodx5kelquw3dgkjac6h [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /s_t /c_t /s_p /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
+% --feature=onum --feature=tnum --include-alternates=*.swash --feature=aalt
+% --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-tosf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_77oqdq.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_77oqdq.enc
new file mode 100644
index 00000000000..ff52265bfe5
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_77oqdq.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_77oqdqyhchabwlloiokxlgbjdb
+% Encoding created by otftotfm on Thu Nov 17 22:54:18 2016
+% Command line follows encoding
+/AutoEnc_77oqdqyhchabwlloiokxlgbjdb [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /s_t /c_t /s_p /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
+% --feature=onum --feature=pnum --include-alternates=*.swash --feature=aalt
+% --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7c5ufm.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7c5ufm.enc
new file mode 100644
index 00000000000..f58be8708cf
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7c5ufm.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7c5ufmebtdawigdnehvracdwna
+% Encoding created by otftotfm on Thu Nov 17 22:53:26 2016
+% Command line follows encoding
+/AutoEnc_7c5ufmebtdawigdnehvracdwna [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /f_b /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7en3z2.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7en3z2.enc
new file mode 100644
index 00000000000..8fa7e4037d3
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7en3z2.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7en3z2ckkxugezfuqymrmbx5uh
+% Encoding created by otftotfm on Thu Nov 17 22:53:25 2016
+% Command line follows encoding
+/AutoEnc_7en3z2ckkxugezfuqymrmbx5uh [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /s_t /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
+% --feature=kern --feature=liga --feature=lnum --feature=pnum
+% --include-alternates=*.swash --feature=aalt --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-lf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7ykrj7.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7ykrj7.enc
new file mode 100644
index 00000000000..8c43d8f1e96
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7ykrj7.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7ykrj7yurmwbb7z4cumh637btb
+% Encoding created by otftotfm on Thu Nov 17 22:54:03 2016
+% Command line follows encoding
+/AutoEnc_7ykrj7yurmwbb7z4cumh637btb [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at.sc /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.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --feature=pnum --feature=smcp --unicoding=germandbls =: SSsmall
+% --xheight=x BaskervilleF-Italic.otf BaskervilleF-Italic-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_a6e5yi.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_a6e5yi.enc
new file mode 100644
index 00000000000..cdaf4fc1e0c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_a6e5yi.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_a6e5yigbzibh7uwhy4iqho24of
+% Encoding created by otftotfm on Thu Nov 17 22:53:30 2016
+% Command line follows encoding
+/AutoEnc_a6e5yigbzibh7uwhy4iqho24of [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /f_b /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=tnum --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bbd2ra.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bbd2ra.enc
new file mode 100644
index 00000000000..b80fd58c831
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bbd2ra.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_bbd2ra23uqsga66h2olimxs5dc
+% Encoding created by otftotfm on Thu Nov 17 22:53:27 2016
+% Command line follows encoding
+/AutoEnc_bbd2ra23uqsga66h2olimxs5dc [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /.notdef /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /uni015F.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /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.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bds6pt.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bds6pt.enc
new file mode 100644
index 00000000000..ac91e1eb49d
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bds6pt.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_bds6pt5qbvyqzepmtbjqccknfa
+% Encoding created by otftotfm on Thu Nov 17 22:53:47 2016
+% Command line follows encoding
+/AutoEnc_bds6pt5qbvyqzepmtbjqccknfa [
+%00
+ /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_f_i /f_f_l /.notdef /f_b /f_h /f_k /f_j /f_t
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /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
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bguowg.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bguowg.enc
new file mode 100644
index 00000000000..c088fff36d3
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bguowg.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_bguowghfogn2xc5exiwqtaeyva
+% Encoding created by otftotfm on Thu Nov 17 22:53:40 2016
+% Command line follows encoding
+/AutoEnc_bguowghfogn2xc5exiwqtaeyva [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_k /f_j /f_t /f_f_b /f_f_h /f_f_k
+ /f_f_j /f_f_t /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
+% --feature=tnum --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_c76n5g.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_c76n5g.enc
new file mode 100644
index 00000000000..53441e86f41
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_c76n5g.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_c76n5gif3peavxpndqb4zukhrd
+% Encoding created by otftotfm on Thu Nov 17 22:53:35 2016
+% Command line follows encoding
+/AutoEnc_c76n5gif3peavxpndqb4zukhrd [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /.notdef /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /uni015F.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /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.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_chi3og.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_chi3og.enc
new file mode 100644
index 00000000000..2af535f1011
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_chi3og.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_chi3ogo7u2fd5dijikvtzhw7ld
+% Encoding created by otftotfm on Thu Nov 17 22:53:30 2016
+% Command line follows encoding
+/AutoEnc_chi3ogo7u2fd5dijikvtzhw7ld [
+%00
+ /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_f_i /f_f_l /.notdef /f_b /f_h /f_j /f_k /f_t
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /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
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=tnum --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cn6fgj.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cn6fgj.enc
new file mode 100644
index 00000000000..1de4c62edee
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cn6fgj.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cn6fgjzfhh72xowxw3ttfj3dda
+% Encoding created by otftotfm on Thu Nov 17 22:53:26 2016
+% Command line follows encoding
+/AutoEnc_cn6fgjzfhh72xowxw3ttfj3dda [
+%00
+ /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_f_i /f_f_l /.notdef /f_b /f_h /f_j /f_k /f_t
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_coef4z.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_coef4z.enc
new file mode 100644
index 00000000000..7f30ed8884c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_coef4z.enc
@@ -0,0 +1,57 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_coef4zpl3r5lkholacwbc7wa2d
+% Encoding created by otftotfm on Thu Nov 17 22:54:22 2016
+% Command line follows encoding
+/AutoEnc_coef4zpl3r5lkholacwbc7wa2d [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam.up /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.up /parenright.up /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon.up /semicolon.up /exclamdown.up /equal /questiondown.up /question.up
+%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.up /quotedblleft /bracketright.up /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_k /f_j /f_t /f_f_b /f_f_h /f_f_k
+ /f_f_j /f_f_t /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm -e fontools_ot1 BaskervilleF-Italic.otf -fkern
+% -fliga -fonum -ftnum -fsalt --xheight=x BaskervilleF-Italic-tosf-th-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cvjygd.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cvjygd.enc
new file mode 100644
index 00000000000..b17b8bc60bd
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cvjygd.enc
@@ -0,0 +1,57 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cvjygdpe4epyombwll26l27qbd
+% Encoding created by otftotfm on Thu Nov 17 22:54:23 2016
+% Command line follows encoding
+/AutoEnc_cvjygdpe4epyombwll26l27qbd [
+%00
+ /f_b /Euro /f_h /f_k /fraction /dotaccent /hungarumlaut /ogonek
+ /f_l /f_j /.notdef /f_f /f_i /f_t /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam.up /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.up /parenright.up /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon.up /semicolon.up /less /equal /greater /question.up
+%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.up /backslash /bracketright.up /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.up /bar /braceright.up /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /f_f_b /perthousand /Scaron /guilsinglleft /f_f_h /Zcaron /asciicircum /minus
+%90
+ /lslash /f_f_k /f_f_j /quotedblleft /quotedblright /bullet /endash /emdash
+ /f_f_t /trademark /scaron /guilsinglright /.notdef /zcaron /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown.up /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /.notdef
+%B0
+ /degree /plusminus /two.superior /three.superior /.notdef /mu /paragraph /periodcentered
+ /.notdef /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.up
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /.notdef /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /.notdef /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /.notdef /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /.notdef /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm -e texnansx BaskervilleF-Italic.otf -fkern -fliga
+% -fonum -ftnum -fsalt --xheight=x BaskervilleF-Italic-tosf-th-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_dxocay.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_dxocay.enc
new file mode 100644
index 00000000000..54c9a622032
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_dxocay.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_dxocayv6m6t6orsdnra4z3h7rf
+% Encoding created by otftotfm on Thu Nov 17 22:53:37 2016
+% Command line follows encoding
+/AutoEnc_dxocayv6m6t6orsdnra4z3h7rf [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_k /f_j /f_t /f_f_b /f_f_h /f_f_k
+ /f_f_j /f_f_t /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
+% --feature=pnum --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e6dqmu.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e6dqmu.enc
new file mode 100644
index 00000000000..804e3f8b143
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e6dqmu.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_e6dqmue5pcfq7kbb2isw2oahda
+% Encoding created by otftotfm on Thu Nov 17 22:53:41 2016
+% Command line follows encoding
+/AutoEnc_e6dqmue5pcfq7kbb2isw2oahda [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e6zmok.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e6zmok.enc
new file mode 100644
index 00000000000..5e8115b0f42
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e6zmok.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_e6zmoklsjochw72tyskltg32lh
+% Encoding created by otftotfm on Thu Nov 17 22:53:51 2016
+% Command line follows encoding
+/AutoEnc_e6zmoklsjochw72tyskltg32lh [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.denominator /one.denominator /two.denominator /three.denominator /four.denominator /five.denominator /six.denominator /seven.denominator
+ /eight.denominator /nine.denominator /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dnom
+% --feature=kern --feature=liga --ligkern=* {KL} * --xheight=x
+% BaskervilleF-Italic.otf BaskervilleF-Italic-dnom-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fex7hn.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fex7hn.enc
new file mode 100644
index 00000000000..e7bdb0195ac
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fex7hn.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_fex7hnupe2lhfzub2ox2unbrfh
+% Encoding created by otftotfm on Thu Nov 17 22:54:04 2016
+% Command line follows encoding
+/AutoEnc_fex7hnupe2lhfzub2ox2unbrfh [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /.notdef /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /uni015F.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /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.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fl2r4r.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fl2r4r.enc
new file mode 100644
index 00000000000..7907fa5c2bc
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fl2r4r.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_fl2r4rzoerut7nqnwcjzjrffgb
+% Encoding created by otftotfm on Thu Nov 17 22:53:37 2016
+% Command line follows encoding
+/AutoEnc_fl2r4rzoerut7nqnwcjzjrffgb [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fv24fa.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fv24fa.enc
new file mode 100644
index 00000000000..c2aae21b9f3
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fv24fa.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_fv24fawtsowiyjcqkb4pe3ntvg
+% Encoding created by otftotfm on Thu Nov 17 22:53:32 2016
+% Command line follows encoding
+/AutoEnc_fv24fawtsowiyjcqkb4pe3ntvg [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /s_t /c_t /s_p /f_b /f_h /f_j /f_k /f_t
+ /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
+% --feature=onum --feature=tnum --include-alternates=*.swash --feature=aalt
+% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gcpsbm.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gcpsbm.enc
new file mode 100644
index 00000000000..d4e440e252d
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gcpsbm.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gcpsbmnymay5s4vrtic3poy5wc
+% Encoding created by otftotfm on Thu Nov 17 22:53:44 2016
+% Command line follows encoding
+/AutoEnc_gcpsbmnymay5s4vrtic3poy5wc [
+%00
+ /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_f_i /f_f_l /.notdef /f_b /f_h /f_k /f_j /f_t
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /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
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=tnum --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gdav67.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gdav67.enc
new file mode 100644
index 00000000000..9424699fe77
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gdav67.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gdav677p6w2qrkpzo6f6qnz7ec
+% Encoding created by otftotfm on Thu Nov 17 22:53:24 2016
+% Command line follows encoding
+/AutoEnc_gdav677p6w2qrkpzo6f6qnz7ec [
+%00
+ /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gtwjjp.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gtwjjp.enc
new file mode 100644
index 00000000000..6ce1c61ea2c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gtwjjp.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gtwjjptqc2bbppuueg7ctr7h6a
+% Encoding created by otftotfm on Thu Nov 17 22:53:52 2016
+% Command line follows encoding
+/AutoEnc_gtwjjptqc2bbppuueg7ctr7h6a [
+%00
+ /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_h3ld5p.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_h3ld5p.enc
new file mode 100644
index 00000000000..805bcd1db05
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_h3ld5p.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_h3ld5poqynxhakibh3awcqopgg
+% Encoding created by otftotfm on Thu Nov 17 22:53:47 2016
+% Command line follows encoding
+/AutoEnc_h3ld5poqynxhakibh3awcqopgg [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_k /f_j /f_t /f_f_b /f_f_h /f_f_k
+ /f_f_j /f_f_t /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --feature=pnum --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hcuwye.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hcuwye.enc
new file mode 100644
index 00000000000..a06b4caa8f4
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hcuwye.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_hcuwyefdqr3l6b5gcqtnpgn3vd
+% Encoding created by otftotfm on Thu Nov 17 22:54:03 2016
+% Command line follows encoding
+/AutoEnc_hcuwyefdqr3l6b5gcqtnpgn3vd [
+%00
+ /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hh5nd6.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hh5nd6.enc
new file mode 100644
index 00000000000..fd935f9407b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hh5nd6.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_hh5nd6hxyum6kyhpraivwtpbsh
+% Encoding created by otftotfm on Thu Nov 17 22:53:28 2016
+% Command line follows encoding
+/AutoEnc_hh5nd6hxyum6kyhpraivwtpbsh [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /s_t /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
+% --feature=kern --feature=liga --feature=lnum --feature=tnum
+% --include-alternates=*.swash --feature=aalt --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_i75lhj.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_i75lhj.enc
new file mode 100644
index 00000000000..9e10c33c457
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_i75lhj.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_i75lhjlcqzqekp2gihg3mtfobb
+% Encoding created by otftotfm on Thu Nov 17 22:53:25 2016
+% Command line follows encoding
+/AutoEnc_i75lhjlcqzqekp2gihg3mtfobb [
+%00
+ /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_f_i /f_f_l /.notdef /s_t /c_t /s_p /f_b /f_h
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /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
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
+% --feature=kern --feature=liga --feature=lnum --feature=pnum
+% --include-alternates=*.swash --feature=aalt --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-lf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_i7xozg.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_i7xozg.enc
new file mode 100644
index 00000000000..c2e764acc49
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_i7xozg.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_i7xozght4lvf74ofnybk67ujie
+% Encoding created by otftotfm on Thu Nov 17 22:53:33 2016
+% Command line follows encoding
+/AutoEnc_i7xozght4lvf74ofnybk67ujie [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --feature=pnum --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ij7jd5.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ij7jd5.enc
new file mode 100644
index 00000000000..ba64f1dee5e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ij7jd5.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ij7jd5g2gejihwxinuvbfypjmc
+% Encoding created by otftotfm on Thu Nov 17 22:54:00 2016
+% Command line follows encoding
+/AutoEnc_ij7jd5g2gejihwxinuvbfypjmc [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at.sc /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.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --feature=smcp --feature=tnum --unicoding=germandbls =: SSsmall
+% --xheight=x BaskervilleF-Italic.otf BaskervilleF-Italic-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_izzn24.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_izzn24.enc
new file mode 100644
index 00000000000..dc65f6c99d2
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_izzn24.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_izzn24hc4q6yjoalwnbz2mauhe
+% Encoding created by otftotfm on Thu Nov 17 22:53:23 2016
+% Command line follows encoding
+/AutoEnc_izzn24hc4q6yjoalwnbz2mauhe [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
+% --feature=pnum --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_j4z3cc.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_j4z3cc.enc
new file mode 100644
index 00000000000..c03d2947d0f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_j4z3cc.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_j4z3cchocvgsmxe7ln7a4bjwce
+% Encoding created by otftotfm on Thu Nov 17 22:53:55 2016
+% Command line follows encoding
+/AutoEnc_j4z3cchocvgsmxe7ln7a4bjwce [
+%00
+ /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_j65xbs.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_j65xbs.enc
new file mode 100644
index 00000000000..3e4a4669466
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_j65xbs.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_j65xbskfenxebjgsjsqafqw7od
+% Encoding created by otftotfm on Thu Nov 17 22:53:31 2016
+% Command line follows encoding
+/AutoEnc_j65xbskfenxebjgsjsqafqw7od [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question.sc
+%40
+ /at.sc /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.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --feature=smcp --feature=tnum --unicoding=germandbls =: SSsmall
+% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kamlpe.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kamlpe.enc
new file mode 100644
index 00000000000..b0a8363723d
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kamlpe.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_kamlpep4cyvktpdwubthryn5pc
+% Encoding created by otftotfm on Thu Nov 17 22:53:34 2016
+% Command line follows encoding
+/AutoEnc_kamlpep4cyvktpdwubthryn5pc [
+%00
+ /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kjjlvj.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kjjlvj.enc
new file mode 100644
index 00000000000..e482fb03152
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kjjlvj.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_kjjlvjrwjcub47a5vevekvnwxe
+% Encoding created by otftotfm on Thu Nov 17 22:53:23 2016
+% Command line follows encoding
+/AutoEnc_kjjlvjrwjcub47a5vevekvnwxe [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /f_b /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kpovnp.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kpovnp.enc
new file mode 100644
index 00000000000..100a407a066
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kpovnp.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_kpovnpr7ndeucs5n7dx3gy4ccf
+% Encoding created by otftotfm on Thu Nov 17 22:53:45 2016
+% Command line follows encoding
+/AutoEnc_kpovnpr7ndeucs5n7dx3gy4ccf [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_l5lp2j.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_l5lp2j.enc
new file mode 100644
index 00000000000..22234ad0eab
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_l5lp2j.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_l5lp2jhu5ka3ub3wzzjrr75qec
+% Encoding created by otftotfm on Thu Nov 17 22:53:52 2016
+% Command line follows encoding
+/AutoEnc_l5lp2jhu5ka3ub3wzzjrr75qec [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at.sc /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.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
+% --feature=pnum --feature=smcp --unicoding=germandbls =: SSsmall
+% --xheight=x BaskervilleF-Italic.otf BaskervilleF-Italic-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lcyowo.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lcyowo.enc
new file mode 100644
index 00000000000..7e721d69d14
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lcyowo.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_lcyowodclnmvob5ftzktejlk4b
+% Encoding created by otftotfm on Thu Nov 17 22:53:35 2016
+% Command line follows encoding
+/AutoEnc_lcyowodclnmvob5ftzktejlk4b [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /s_t /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
+% --feature=kern --feature=liga --feature=onum --feature=pnum
+% --include-alternates=*.swash --feature=aalt --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-osf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_m55nq3.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_m55nq3.enc
new file mode 100644
index 00000000000..acbf7a11075
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_m55nq3.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_m55nq3suxahqqo5ho2vmc475ye
+% Encoding created by otftotfm on Thu Nov 17 22:54:08 2016
+% Command line follows encoding
+/AutoEnc_m55nq3suxahqqo5ho2vmc475ye [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /s_t /c_t /s_p /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --include-alternates=*.swash --feature=aalt
+% --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-lf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_myk2bc.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_myk2bc.enc
new file mode 100644
index 00000000000..5c3410070c9
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_myk2bc.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_myk2bcbibfqhjusxaxal4f7nna
+% Encoding created by otftotfm on Thu Nov 17 22:53:39 2016
+% Command line follows encoding
+/AutoEnc_myk2bcbibfqhjusxaxal4f7nna [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_k /f_j /f_t /f_f_b /f_f_h /f_f_k
+ /f_f_j /f_f_t /s_t /c_t /s_p /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --include-alternates=*.swash --feature=aalt
+% --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-lf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n3f3jl.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n3f3jl.enc
new file mode 100644
index 00000000000..1827f34d5de
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n3f3jl.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_n3f3jlpaykpggdqc2bosgbn2sa
+% Encoding created by otftotfm on Thu Nov 17 22:53:46 2016
+% Command line follows encoding
+/AutoEnc_n3f3jlpaykpggdqc2bosgbn2sa [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_k /f_j /f_t /f_f_b /f_f_h /f_f_k
+ /f_f_j /f_f_t /s_t /c_t /s_p /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
+% --feature=onum --feature=tnum --include-alternates=*.swash --feature=aalt
+% --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-tosf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n6x6xr.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n6x6xr.enc
new file mode 100644
index 00000000000..b4e97b7487e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n6x6xr.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_n6x6xrfgjf3o356p3htusdc65e
+% Encoding created by otftotfm on Thu Nov 17 22:53:56 2016
+% Command line follows encoding
+/AutoEnc_n6x6xrfgjf3o356p3htusdc65e [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at.sc /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.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
+% --feature=smcp --feature=tnum --unicoding=germandbls =: SSsmall
+% --xheight=x BaskervilleF-Italic.otf BaskervilleF-Italic-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_o4lzby.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_o4lzby.enc
new file mode 100644
index 00000000000..aa584d2103f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_o4lzby.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_o4lzby3sspqy62vgdgol5qrx4g
+% Encoding created by otftotfm on Thu Nov 17 22:53:35 2016
+% Command line follows encoding
+/AutoEnc_o4lzby3sspqy62vgdgol5qrx4g [
+%00
+ /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_f_i /f_f_l /.notdef /s_t /c_t /s_p /f_b /f_h
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /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
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
+% --feature=kern --feature=liga --feature=onum --feature=pnum
+% --include-alternates=*.swash --feature=aalt --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-osf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oatqyt.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oatqyt.enc
new file mode 100644
index 00000000000..55d3885ef92
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oatqyt.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_oatqyt5cg6jn4h7moxyxn77uhb
+% Encoding created by otftotfm on Thu Nov 17 22:53:49 2016
+% Command line follows encoding
+/AutoEnc_oatqyt5cg6jn4h7moxyxn77uhb [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_k /f_j /f_t /f_f_b /f_f_h /f_f_k
+ /f_f_j /f_f_t /s_t /c_t /s_p /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
+% --feature=onum --feature=pnum --include-alternates=*.swash --feature=aalt
+% --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ohl6cl.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ohl6cl.enc
new file mode 100644
index 00000000000..7186b5adbb7
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ohl6cl.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ohl6clzh7gvvy5yopvn3tsxyze
+% Encoding created by otftotfm on Thu Nov 17 22:53:30 2016
+% Command line follows encoding
+/AutoEnc_ohl6clzh7gvvy5yopvn3tsxyze [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --feature=tnum --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oij2u6.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oij2u6.enc
new file mode 100644
index 00000000000..c576046c415
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oij2u6.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_oij2u6arbrjg6d2ypzm2m6kync
+% Encoding created by otftotfm on Thu Nov 17 22:53:23 2016
+% Command line follows encoding
+/AutoEnc_oij2u6arbrjg6d2ypzm2m6kync [
+%00
+ /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_f_i /f_f_l /.notdef /f_b /f_h /f_j /f_k /f_t
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /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
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_q4ab4o.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_q4ab4o.enc
new file mode 100644
index 00000000000..110bd383e9b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_q4ab4o.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_q4ab4ovkwyxlgxwo6jh24g7fnd
+% Encoding created by otftotfm on Thu Nov 17 22:53:25 2016
+% Command line follows encoding
+/AutoEnc_q4ab4ovkwyxlgxwo6jh24g7fnd [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /s_t /c_t /s_p /f_b /f_h /f_j /f_k /f_t
+ /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --include-alternates=*.swash --feature=aalt
+% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-lf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qerubm.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qerubm.enc
new file mode 100644
index 00000000000..cecef1f833c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qerubm.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_qerubmcahvaakky54cnpxxdjhf
+% Encoding created by otftotfm on Thu Nov 17 22:53:29 2016
+% Command line follows encoding
+/AutoEnc_qerubmcahvaakky54cnpxxdjhf [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.superior /parenright.superior /asterisk /plus /comma.superior /hyphen.superior /period.superior /slash.superior
+%30
+ /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
+ /eight.superior /nine.superior /colon /semicolon /less /equal /greater /question
+%40
+ /at.superior /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
+ /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
+%50
+ /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
+ /X.superior /Y.superior /Z.superior /bracketleft.superior /backslash.superior /bracketright.superior /asciicircum /underscore
+%60
+ /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
+ /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
+%70
+ /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
+ /x.superior /y.superior /z.superior /braceleft /bar /braceright /asciitilde /hyphen.superior
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=sups --ligkern=* {KL} * --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qwd3dx.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qwd3dx.enc
new file mode 100644
index 00000000000..dadf88dc3e7
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qwd3dx.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_qwd3dxzfap76xuil44dvec5kih
+% Encoding created by otftotfm on Thu Nov 17 22:54:00 2016
+% Command line follows encoding
+/AutoEnc_qwd3dxzfap76xuil44dvec5kih [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /.notdef /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /uni015F.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /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.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_r2xnwj.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_r2xnwj.enc
new file mode 100644
index 00000000000..7d9219b1651
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_r2xnwj.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_r2xnwjip7fzolk3hdw4ejvt3lf
+% Encoding created by otftotfm on Thu Nov 17 22:53:40 2016
+% Command line follows encoding
+/AutoEnc_r2xnwjip7fzolk3hdw4ejvt3lf [
+%00
+ /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_f_i /f_f_l /.notdef /f_b /f_h /f_k /f_j /f_t
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_renr32.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_renr32.enc
new file mode 100644
index 00000000000..a1f6bfe94ad
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_renr32.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_renr32ubsuscuykbqyvpjqacre
+% Encoding created by otftotfm on Thu Nov 17 22:53:48 2016
+% Command line follows encoding
+/AutoEnc_renr32ubsuscuykbqyvpjqacre [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rf3vka.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rf3vka.enc
new file mode 100644
index 00000000000..a537b08be1d
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rf3vka.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_rf3vkasg3r3ieudiwqoacdhabb
+% Encoding created by otftotfm on Thu Nov 17 22:53:42 2016
+% Command line follows encoding
+/AutoEnc_rf3vkasg3r3ieudiwqoacdhabb [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_k /f_j /f_t /f_f_b /f_f_h /f_f_k
+ /f_f_j /f_f_t /s_t /c_t /s_p /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
+% --feature=lnum --feature=tnum --include-alternates=*.swash --feature=aalt
+% --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-tlf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rkc5zd.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rkc5zd.enc
new file mode 100644
index 00000000000..4d74b113ea4
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rkc5zd.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_rkc5zd6fmhnv2llwnhxkei2dld
+% Encoding created by otftotfm on Thu Nov 17 22:53:26 2016
+% Command line follows encoding
+/AutoEnc_rkc5zd6fmhnv2llwnhxkei2dld [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
+%10
+ /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
+%20
+ /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+ /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
+%30
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
+%40
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%50
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.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 /servicemark
+%A0
+ /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
+%B0
+ /degree /plusminus /two.superior /three.superior /.notdef /mu /paragraph /periodcentered
+ /.notdef /one.superior /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
+ /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ts1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
+% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rmbehh.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rmbehh.enc
new file mode 100644
index 00000000000..7fa74973dfa
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rmbehh.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_rmbehhugelvxcjrx4tdhkaxgub
+% Encoding created by otftotfm on Thu Nov 17 22:53:33 2016
+% Command line follows encoding
+/AutoEnc_rmbehhugelvxcjrx4tdhkaxgub [
+%00
+ /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_f_i /f_f_l /.notdef /f_b /f_h /f_j /f_k /f_t
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /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
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rohq7o.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rohq7o.enc
new file mode 100644
index 00000000000..c980ae6f085
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rohq7o.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_rohq7obmolyx2i5s56su6qqrqc
+% Encoding created by otftotfm on Thu Nov 17 22:53:27 2016
+% Command line follows encoding
+/AutoEnc_rohq7obmolyx2i5s56su6qqrqc [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question.sc
+%40
+ /at.sc /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.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
+% --feature=smcp --feature=tnum --unicoding=germandbls =: SSsmall
+% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rqbadf.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rqbadf.enc
new file mode 100644
index 00000000000..5c5e779bd25
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rqbadf.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_rqbadfscg2blowtkr3dks5acqd
+% Encoding created by otftotfm on Thu Nov 17 22:54:11 2016
+% Command line follows encoding
+/AutoEnc_rqbadfscg2blowtkr3dks5acqd [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /s_t /c_t /s_p /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
+% --feature=lnum --feature=tnum --include-alternates=*.swash --feature=aalt
+% --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-tlf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_sf4kho.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_sf4kho.enc
new file mode 100644
index 00000000000..26ba52fbdfa
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_sf4kho.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_sf4khom6danuc7ppwyun5j575g
+% Encoding created by otftotfm on Thu Nov 17 22:53:50 2016
+% Command line follows encoding
+/AutoEnc_sf4khom6danuc7ppwyun5j575g [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.denominator /one.denominator /two.denominator /three.denominator /four.denominator /five.denominator /six.denominator /seven.denominator
+ /eight.denominator /nine.denominator /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=dnom --feature=kern --feature=liga
+% --ligkern=* {KL} * --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-dnom-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tkk54u.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tkk54u.enc
new file mode 100644
index 00000000000..19639b5aa6f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tkk54u.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_tkk54u4ux4fq2lp44d2pwccavg
+% Encoding created by otftotfm on Thu Nov 17 22:53:53 2016
+% Command line follows encoding
+/AutoEnc_tkk54u4ux4fq2lp44d2pwccavg [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /.notdef /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /uni015F.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /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.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tpisx6.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tpisx6.enc
new file mode 100644
index 00000000000..5e77dbcdd78
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tpisx6.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_tpisx6ulksohs7dgkbskss3cpg
+% Encoding created by otftotfm on Thu Nov 17 22:53:43 2016
+% Command line follows encoding
+/AutoEnc_tpisx6ulksohs7dgkbskss3cpg [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
+ /eight.superior /nine.superior /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at.superior /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
+ /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
+%50
+ /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
+ /X.superior /Y.superior /Z.superior /bracketleft.superior /quotedblleft /bracketright.superior /circumflex /dotaccent
+%60
+ /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
+ /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
+%70
+ /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
+ /x.superior /y.superior /z.superior /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=sups
+% --ligkern=* {KL} * --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tshrsw.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tshrsw.enc
new file mode 100644
index 00000000000..4de59c9f983
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tshrsw.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_tshrswqumfhrho5soqfhbax3me
+% Encoding created by otftotfm on Thu Nov 17 22:53:32 2016
+% Command line follows encoding
+/AutoEnc_tshrswqumfhrho5soqfhbax3me [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /s_t /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
+% --feature=kern --feature=liga --feature=onum --feature=tnum
+% --include-alternates=*.swash --feature=aalt --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ttjjmx.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ttjjmx.enc
new file mode 100644
index 00000000000..f1306a1496e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ttjjmx.enc
@@ -0,0 +1,57 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ttjjmxek3rnsbjxvsvjgakyt3e
+% Encoding created by otftotfm on Thu Nov 17 22:54:19 2016
+% Command line follows encoding
+/AutoEnc_ttjjmxek3rnsbjxvsvjgakyt3e [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /f_b /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+%20
+ /.notdef /exclam.up /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.up /parenright.up /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon.up /semicolon.up /less /equal /greater /question.up
+%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.up /backslash /bracketright.up /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.up /bar /braceright.up /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown.up /questiondown.up /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 -e ec BaskervilleF-Italic.otf -fkern -fliga -fonum
+% -ftnum -fsalt --xheight=x BaskervilleF-Italic-tosf-th-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_u3c7yf.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_u3c7yf.enc
new file mode 100644
index 00000000000..f3002ff95ba
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_u3c7yf.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_u3c7yfqm3xzzx2ojpxd636erjd
+% Encoding created by otftotfm on Thu Nov 17 22:53:43 2016
+% Command line follows encoding
+/AutoEnc_u3c7yfqm3xzzx2ojpxd636erjd [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
+ /eight.superior /nine.superior /colon /semicolon /less /equal /greater /question
+%40
+ /at.superior /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
+ /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
+%50
+ /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
+ /X.superior /Y.superior /Z.superior /bracketleft.superior /backslash.superior /bracketright.superior /asciicircum /underscore
+%60
+ /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
+ /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
+%70
+ /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
+ /x.superior /y.superior /z.superior /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave.superior /eacute.superior /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=sups --ligkern=* {KL} * --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uea64s.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uea64s.enc
new file mode 100644
index 00000000000..ef893767a10
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uea64s.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_uea64sjyax7lnouzj6gabgtgzg
+% Encoding created by otftotfm on Thu Nov 17 22:53:28 2016
+% Command line follows encoding
+/AutoEnc_uea64sjyax7lnouzj6gabgtgzg [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /s_t /c_t /s_p /f_b /f_h /f_j /f_k /f_t
+ /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
+% --feature=lnum --feature=tnum --include-alternates=*.swash --feature=aalt
+% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uggj2o.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uggj2o.enc
new file mode 100644
index 00000000000..2f1e297484b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uggj2o.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_uggj2omb2wkisbuptlebqtwwmc
+% Encoding created by otftotfm on Thu Nov 17 22:53:43 2016
+% Command line follows encoding
+/AutoEnc_uggj2omb2wkisbuptlebqtwwmc [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
+ /eight.superior /nine.superior /colon /semicolon /less /equal /greater /question
+%40
+ /at.superior /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
+ /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
+%50
+ /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
+ /X.superior /Y.superior /Z.superior /bracketleft.superior /backslash.superior /bracketright.superior /circumflex /underscore
+%60
+ /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
+ /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
+%70
+ /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
+ /x.superior /y.superior /z.superior /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
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /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.superior /eacute.superior /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=sups --ligkern=* {KL} * --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vjaqds.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vjaqds.enc
new file mode 100644
index 00000000000..05c8c2e94b0
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vjaqds.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_vjaqdszirigjb5qaddq6xm6shc
+% Encoding created by otftotfm on Thu Nov 17 22:53:28 2016
+% Command line follows encoding
+/AutoEnc_vjaqdszirigjb5qaddq6xm6shc [
+%00
+ /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_f_i /f_f_l /.notdef /s_t /c_t /s_p /f_b /f_h
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
+% --feature=kern --feature=liga --feature=lnum --feature=tnum
+% --include-alternates=*.swash --feature=aalt --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vjflwo.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vjflwo.enc
new file mode 100644
index 00000000000..10ec5b3f6be
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vjflwo.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_vjflwosihdq3burbyagom4axfd
+% Encoding created by otftotfm on Thu Nov 17 22:53:24 2016
+% Command line follows encoding
+/AutoEnc_vjflwosihdq3burbyagom4axfd [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /.notdef /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /uni015F.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /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.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vkedkr.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vkedkr.enc
new file mode 100644
index 00000000000..4ca7ee86646
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vkedkr.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_vkedkronv2mvepxsiornm56beg
+% Encoding created by otftotfm on Thu Nov 17 22:53:26 2016
+% Command line follows encoding
+/AutoEnc_vkedkronv2mvepxsiornm56beg [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
+% --feature=tnum --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wcixnv.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wcixnv.enc
new file mode 100644
index 00000000000..888b87ea0fd
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wcixnv.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_wcixnvwpxv57vt6smtwjjb6l2b
+% Encoding created by otftotfm on Thu Nov 17 22:53:32 2016
+% Command line follows encoding
+/AutoEnc_wcixnvwpxv57vt6smtwjjb6l2b [
+%00
+ /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_f_i /f_f_l /.notdef /s_t /c_t /s_p /f_b /f_h
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /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
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
+% --feature=kern --feature=liga --feature=onum --feature=tnum
+% --include-alternates=*.swash --feature=aalt --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wesofd.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wesofd.enc
new file mode 100644
index 00000000000..863294b8b5c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wesofd.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_wesofdrc3ccjimjsmnm44psolb
+% Encoding created by otftotfm on Thu Nov 17 22:53:34 2016
+% Command line follows encoding
+/AutoEnc_wesofdrc3ccjimjsmnm44psolb [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /f_b /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xgz3wi.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xgz3wi.enc
new file mode 100644
index 00000000000..15155dc4120
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xgz3wi.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_xgz3wipxufw6m2alfwtx5vq6ld
+% Encoding created by otftotfm on Thu Nov 17 22:54:00 2016
+% Command line follows encoding
+/AutoEnc_xgz3wipxufw6m2alfwtx5vq6ld [
+%00
+ /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ydjrw6.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ydjrw6.enc
new file mode 100644
index 00000000000..f6898912ca7
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ydjrw6.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ydjrw6jsbp4rtssejldco7yxah
+% Encoding created by otftotfm on Thu Nov 17 22:53:56 2016
+% Command line follows encoding
+/AutoEnc_ydjrw6jsbp4rtssejldco7yxah [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /.notdef /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /uni015F.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /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.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_yy6alv.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_yy6alv.enc
new file mode 100644
index 00000000000..600fc29e5f0
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_yy6alv.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_yy6alvrdivbfwkozvf47kpdlwe
+% Encoding created by otftotfm on Thu Nov 17 22:53:36 2016
+% Command line follows encoding
+/AutoEnc_yy6alvrdivbfwkozvf47kpdlwe [
+%00
+ /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_f_i /f_f_l /.notdef /f_b /f_h /f_k /f_j /f_t
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /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
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zfni6x.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zfni6x.enc
new file mode 100644
index 00000000000..a8557be4734
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zfni6x.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_zfni6xqvzwbijnsclqma6rlhgh
+% Encoding created by otftotfm on Thu Nov 17 22:53:44 2016
+% Command line follows encoding
+/AutoEnc_zfni6xqvzwbijnsclqma6rlhgh [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f /f_i /f_l /f_f_i /f_f_l
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_b /f_h /f_k /f_j /f_t /f_f_b /f_f_h /f_f_k
+ /f_f_j /f_f_t /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --truetype-directory=texmf/fonts/truetype/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --feature=tnum --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-tosf-ot1'