crimson (19feb16)

git-svn-id: svn://tug.org/texlive/trunk@39782 c570f23f-e606-0410-a88d-b1316a301751

41 files changed, 124 insertions, 1389 deletions

diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_2fvolj.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_2fvolj.enc
deleted file mode 100644
index 61f19226d2f..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_2fvolj.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_2fvolj4garu6x5o6rl7n3fbxtf
-% Encoding created by otftotfm on Fri Feb  5 17:20:30 2016
-% Command line follows encoding
-/AutoEnc_2fvolj4garu6x5o6rl7n3fbxtf [
-%00
-  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi.sc /uni0237 /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
-%20
-  /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand.sc /quoteright
-  /parenleft.sc /parenright.sc /asterisk /plus /comma.sc /hyphen /period.sc /slash.sc
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon.sc /semicolon.sc /exclamdown.sc /equal.sc /questiondown.sc /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=kern --feature=pnum --feature=smcp
-% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Crimson-Roman.otf Crimson-Roman-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_uoygek.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_3bejww.enc
index f815eb55108..39153405978 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_uoygek.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_3bejww.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_uoygekbwnxa566sfesayvwpjff
-% Encoding created by otftotfm on Fri Feb  5 17:20:33 2016
+%%AutoEnc_3bejwwhpxlgezgpjfxttct5kjg
+% Encoding created by otftotfm on Fri Feb 19 08:28:17 2016
 % Command line follows encoding
-/AutoEnc_uoygekbwnxa566sfesayvwpjff [
+/AutoEnc_3bejwwhpxlgezgpjfxttct5kjg [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -14,8 +14,8 @@
   /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
+  /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
@@ -60,7 +60,7 @@
 % --truetype-directory=texmf/fonts/truetype/kosch/crimson
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Crimson-SemiboldItalic.otf
-% Crimson-SemiboldItalic-lf-ly1'
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern --ligkern=f
+% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Crimson-SemiboldItalic.otf
+% Crimson-SemiboldItalic-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_47prbo.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_47prbo.enc
deleted file mode 100644
index 5eb60c686e2..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_47prbo.enc
+++ /dev/null
@@ -1,67 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_47prbojtpmsia5me3zzelaq2og
-% Encoding created by otftotfm on Fri Feb  5 17:20:27 2016
-% Command line follows encoding
-/AutoEnc_47prbojtpmsia5me3zzelaq2og [
-%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.sc /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
-%20
-  /.notdef /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period.sc /slash.sc
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon.sc /semicolon.sc /less.sc /equal.sc /greater.sc /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.sc /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.sc /bar.sc /braceright.sc /asciitilde.sc /hyphen
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /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 /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
-  /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall Crimson-Italic.otf
-% Crimson-Italic-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_5a3frx.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_5a3frx.enc
deleted file mode 100644
index 10f80309513..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_5a3frx.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_5a3frxlnjfcieadgyb4ygyqu3g
-% Encoding created by otftotfm on Fri Feb  5 17:20:24 2016
-% Command line follows encoding
-/AutoEnc_5a3frxlnjfcieadgyb4ygyqu3g [
-%00
-  /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi /uni0237 /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.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /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_f /f_i /f_l /f_f_i /f_f_l /f_b /f_k /f_h
-  /f_j /f_f_b /f_f_k /f_f_h /f_f_j /T_h /.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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=pnum Crimson-BoldItalic.otf Crimson-BoldItalic-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_7vs66b.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_7vs66b.enc
deleted file mode 100644
index d59e5622594..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_7vs66b.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_7vs66bpgcohvicgb6mneyazghh
-% Encoding created by otftotfm on Fri Feb  5 17:20:28 2016
-% Command line follows encoding
-/AutoEnc_7vs66bpgcohvicgb6mneyazghh [
-%00
-  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi /uni0237 /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.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=kern --feature=onum --feature=pnum
-% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl Crimson-Italic.otf Crimson-Italic-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_axwm4k.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_axwm4k.enc
index cc68f9a017e..c474260f835 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_axwm4k.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_axwm4k.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_axwm4ki6mf7pmmgrxrmiytro6g
-% Encoding created by otftotfm on Fri Feb  5 17:20:31 2016
+% Encoding created by otftotfm on Fri Feb 19 08:28:16 2016
 % Command line follows encoding
 /AutoEnc_axwm4ki6mf7pmmgrxrmiytro6g [
 %00
@@ -61,6 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.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 Crimson-Roman.otf
-% Crimson-Roman-lf-ts1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl Crimson-Roman.otf Crimson-Roman-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_wp5ef6.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_ayvnmf.enc
index 552353059dd..30e7fb35775 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_wp5ef6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_ayvnmf.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_wp5ef6dw4uruc7sqbd32hxh4ic
-% Encoding created by otftotfm on Fri Feb  5 17:20:24 2016
+%%AutoEnc_ayvnmfo2xttvxyp5lynkniqcyh
+% Encoding created by otftotfm on Fri Feb 19 08:28:14 2016
 % Command line follows encoding
-/AutoEnc_wp5ef6dw4uruc7sqbd32hxh4ic [
+/AutoEnc_ayvnmfo2xttvxyp5lynkniqcyh [
 %00
   /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
   /f_f_i /f_f_l /.notdef /f_b /f_k /f_h /f_j /f_f_b
@@ -14,8 +14,8 @@
   /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
+  /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
@@ -61,5 +61,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=pnum Crimson-BoldItalic.otf
-% Crimson-BoldItalic-lf-ly1'
+% --feature=liga Crimson-BoldItalic.otf Crimson-BoldItalic-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_sw5vla.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_bchha2.enc
index 4ec6c11a35c..18cd9962334 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_sw5vla.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_bchha2.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_sw5vla2c674xqwnfdhnen7y6rf
-% Encoding created by otftotfm on Fri Feb  5 17:20:30 2016
+%%AutoEnc_bchha2gkoncnye6234abxahhae
+% Encoding created by otftotfm on Fri Feb 19 08:28:16 2016
 % Command line follows encoding
-/AutoEnc_sw5vla2c674xqwnfdhnen7y6rf [
+/AutoEnc_bchha2gkoncnye6234abxahhae [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
   /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -14,8 +14,8 @@
   /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
+  /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
@@ -60,7 +60,6 @@
 % --truetype-directory=texmf/fonts/truetype/kosch/crimson
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Crimson-Roman.otf
-% Crimson-Roman-lf-ly1'
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern --ligkern=f
+% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Crimson-Roman.otf Crimson-Roman-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_bxc7kq.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_bxc7kq.enc
deleted file mode 100644
index 473e1433c2b..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_bxc7kq.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_bxc7kqvzgey36kayk3mtl4q5uc
-% Encoding created by otftotfm on Fri Feb  5 17:20:26 2016
-% Command line follows encoding
-/AutoEnc_bxc7kqvzgey36kayk3mtl4q5uc [
-%00
-  /.notdef /Euro /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi.sc /uni0237 /grave /acute /.notdef /breve /macron /.notdef
-  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
-%20
-  /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon.sc /semicolon.sc /less.sc /equal.sc /greater.sc /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 /.notdef /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.sc /bar.sc /braceright.sc /.notdef /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /ellipsis /dagger /daggerdbl
-  /.notdef /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum.sc /minus
-%90
-  /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /.notdef /.notdef /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
-%A0
-  /uni00A0 /exclamdown.sc /cent /sterling /currency /yen /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
-%B0
-  /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
-  /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
-%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.sc
-  /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.sc
-  /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =:
-% SSsmall Crimson-Bold.otf Crimson-Bold-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_do35dj.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_do35dj.enc
deleted file mode 100644
index 78ac393f557..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_do35dj.enc
+++ /dev/null
@@ -1,67 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_do35djbo2a6gkyhppzx3vbjrbe
-% Encoding created by otftotfm on Fri Feb  5 17:20:30 2016
-% Command line follows encoding
-/AutoEnc_do35djbo2a6gkyhppzx3vbjrbe [
-%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 /afii61664
-  /.notdef /dotlessi.sc /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
-%20
-  /.notdef /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
-  /parenleft.sc /parenright.sc /asterisk /plus /comma.sc /hyphen /period.sc /slash.sc
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon.sc /semicolon.sc /less.sc /equal.sc /greater.sc /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.sc /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.sc /bar.sc /braceright.sc /asciitilde.sc /hyphen
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /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 /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
-  /ydieresis.sc /zacute.sc /zcaron /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall Crimson-Roman.otf
-% Crimson-Roman-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_fllea6.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_fllea6.enc
index d62944f92f6..e89c5c66335 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_fllea6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_fllea6.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_fllea6al56hpanhrnkl7okwrac
-% Encoding created by otftotfm on Fri Feb  5 17:20:25 2016
+% Encoding created by otftotfm on Fri Feb 19 08:28:14 2016
 % Command line follows encoding
 /AutoEnc_fllea6al56hpanhrnkl7okwrac [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl Crimson-Bold.otf Crimson-Bold-lf-t1'
+% =: ffi --ligkern=ff l =: ffl Crimson-Bold.otf Crimson-Bold-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_g4bzis.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_g4bzis.enc
index 673ce0e917e..dea42387021 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_g4bzis.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_g4bzis.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_g4bziskq3pjz7cecluu2gg66th
-% Encoding created by otftotfm on Fri Feb  5 17:20:33 2016
+% Encoding created by otftotfm on Fri Feb 19 08:28:17 2016
 % Command line follows encoding
 /AutoEnc_g4bziskq3pjz7cecluu2gg66th [
 %00
@@ -60,7 +60,6 @@
 % --truetype-directory=texmf/fonts/truetype/kosch/crimson
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=pnum
-% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl Crimson-SemiboldItalic.otf
-% Crimson-SemiboldItalic-lf-ts1'
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Crimson-SemiboldItalic.otf Crimson-SemiboldItalic-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_s7hoip.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_izufyi.enc
index 26883cdd2df..69cade0e864 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_s7hoip.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_izufyi.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_s7hoipacb25int4pk5fduzjhdg
-% Encoding created by otftotfm on Fri Feb  5 17:20:29 2016
+%%AutoEnc_izufyi4uqvju53ndpgspq42ugh
+% Encoding created by otftotfm on Fri Feb 19 08:28:16 2016
 % Command line follows encoding
-/AutoEnc_s7hoipacb25int4pk5fduzjhdg [
+/AutoEnc_izufyi4uqvju53ndpgspq42ugh [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -14,8 +14,8 @@
   /.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
+  /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
@@ -61,6 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Crimson-Roman.otf
-% Crimson-Roman-lf-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl Crimson-Roman.otf Crimson-Roman-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_j6wyjb.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_j6wyjb.enc
deleted file mode 100644
index 5a2012fa71b..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_j6wyjb.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_j6wyjbrelb3rpajuiwhtpsyqhe
-% Encoding created by otftotfm on Fri Feb  5 17:20:25 2016
-% Command line follows encoding
-/AutoEnc_j6wyjbrelb3rpajuiwhtpsyqhe [
-%00
-  /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
-  /f_f_i /f_f_l /.notdef /f_b /f_k /f_h /f_j /f_f_b
-%10
-  /dotlessi /uni0237 /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.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /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 /f_f_k /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /f_f_h /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 /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
-  /cedilla /uni00B9 /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum Crimson-BoldItalic.otf
-% Crimson-BoldItalic-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_qx2olb.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_jdlmpi.enc
index f2efeff3cb7..3f67be45081 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_qx2olb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_jdlmpi.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_qx2olbheujkkjx5s2oaltrbs4a
-% Encoding created by otftotfm on Fri Feb  5 17:20:33 2016
+%%AutoEnc_jdlmpiolcjntmom4xezbfzkyyb
+% Encoding created by otftotfm on Fri Feb 19 08:28:17 2016
 % Command line follows encoding
-/AutoEnc_qx2olbheujkkjx5s2oaltrbs4a [
+/AutoEnc_jdlmpiolcjntmom4xezbfzkyyb [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -14,8 +14,8 @@
   /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
+  /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
@@ -60,7 +60,6 @@
 % --truetype-directory=texmf/fonts/truetype/kosch/crimson
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Crimson-Semibold.otf
-% Crimson-Semibold-lf-ly1'
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern --ligkern=f
+% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Crimson-Semibold.otf Crimson-Semibold-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_k7do3x.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_k7do3x.enc
deleted file mode 100644
index 126534aa0ee..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_k7do3x.enc
+++ /dev/null
@@ -1,67 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_k7do3xqqszx2jgyebpodbshaud
-% Encoding created by otftotfm on Fri Feb  5 17:20:29 2016
-% Command line follows encoding
-/AutoEnc_k7do3xqqszx2jgyebpodbshaud [
-%00
-  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi.sc /uni0237 /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
-%20
-  /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period.sc /slash.sc
-%30
-  /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /colon.sc /semicolon.sc /less.sc /equal.sc /greater.sc /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.sc /bar.sc /braceright.sc /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum.sc /minus
-%90
-  /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /.notdef /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde.sc /Ydieresis
-%A0
-  /uni00A0 /exclamdown.sc /cent /sterling /currency /yen /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
-  /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
-  /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
-%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.sc
-  /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.sc
-  /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=onum --feature=pnum --feature=smcp --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall Crimson-Italic.otf
-% Crimson-Italic-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_kna2jf.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_kna2jf.enc
deleted file mode 100644
index 7fc02fbec93..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_kna2jf.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_kna2jfizg4ts7zllrhh5kbkbva
-% Encoding created by otftotfm on Fri Feb  5 17:20:33 2016
-% Command line follows encoding
-/AutoEnc_kna2jfizg4ts7zllrhh5kbkbva [
-%00
-  /grave /acute /.notdef /.notdef /dieresis /.notdef /.notdef /.notdef
-  /breve /macron /.notdef /cedilla /.notdef /quotesinglbase /guilsinglleft /guilsinglright
-%10
-  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
-%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 /Scedilla /Tcaron /Tcommaaccent /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 /scedilla /tcaron /tcommaaccent /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Crimson-Semibold.otf
-% Crimson-Semibold-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_kwsa5r.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_kwsa5r.enc
index 052612d1c67..c5d30b7dc33 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_kwsa5r.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_kwsa5r.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_kwsa5rvbeuj7lvum2zph5kq2pf
-% Encoding created by otftotfm on Fri Feb  5 17:20:26 2016
+% Encoding created by otftotfm on Fri Feb 19 08:28:15 2016
 % Command line follows encoding
 /AutoEnc_kwsa5rvbeuj7lvum2zph5kq2pf [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl Crimson-Bold.otf Crimson-Bold-lf-ts1'
+% l =: ffl Crimson-Bold.otf Crimson-Bold-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_m6gsoc.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_m6gsoc.enc
deleted file mode 100644
index bec0d9377ed..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_m6gsoc.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_m6gsocannwqe7qqtq2oq6itwoe
-% Encoding created by otftotfm on Fri Feb  5 17:20:28 2016
-% Command line follows encoding
-/AutoEnc_m6gsocannwqe7qqtq2oq6itwoe [
-%00
-  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi.sc /uni0237 /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
-%20
-  /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period.sc /slash.sc
-%30
-  /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /colon.sc /semicolon.sc /exclamdown.sc /equal.sc /questiondown.sc /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=kern --feature=onum --feature=pnum
-% --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =:
-% SSsmall Crimson-Italic.otf Crimson-Italic-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_myjoho.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_myjoho.enc
index 8e26aaf93a0..85aba049e8d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_myjoho.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_myjoho.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_myjohovt5rgog7uilcdmktsaod
-% Encoding created by otftotfm on Fri Feb  5 17:20:28 2016
+% Encoding created by otftotfm on Fri Feb 19 08:28:15 2016
 % Command line follows encoding
 /AutoEnc_myjohovt5rgog7uilcdmktsaod [
 %00
@@ -61,6 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.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 Crimson-Italic.otf
-% Crimson-Italic-lf-ts1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl Crimson-Italic.otf Crimson-Italic-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_c5mlmi.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_n3gbj7.enc
index a210d19f14f..6cb9656b7dd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_c5mlmi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_n3gbj7.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_c5mlmi2uyuohwk5ljpc6ggczbe
-% Encoding created by otftotfm on Fri Feb  5 17:20:24 2016
+%%AutoEnc_n3gbj7cq72i3x7y67yhckg6nde
+% Encoding created by otftotfm on Fri Feb 19 08:28:14 2016
 % Command line follows encoding
-/AutoEnc_c5mlmi2uyuohwk5ljpc6ggczbe [
+/AutoEnc_n3gbj7cq72i3x7y67yhckg6nde [
 %00
   /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -14,8 +14,8 @@
   /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
+  /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
@@ -60,5 +60,5 @@
 % --truetype-directory=texmf/fonts/truetype/kosch/crimson
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=pnum
-% Crimson-BoldItalic.otf Crimson-BoldItalic-lf-ot1'
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% Crimson-BoldItalic.otf Crimson-BoldItalic-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_odbuza.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_odbuza.enc
index 9e8132d09b3..e5d9a06666e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_odbuza.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_odbuza.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_odbuzadpf3re5xepgoctabcj4d
-% Encoding created by otftotfm on Fri Feb  5 17:20:25 2016
+% Encoding created by otftotfm on Fri Feb 19 08:28:15 2016
 % Command line follows encoding
 /AutoEnc_odbuzadpf3re5xepgoctabcj4d [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern --ligkern=f
 % i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl Crimson-Bold.otf Crimson-Bold-lf-ly1'
+% --ligkern=ff l =: ffl Crimson-Bold.otf Crimson-Bold-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_x2kg4f.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_ory2k7.enc
index af28cca4e88..273e491b824 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_x2kg4f.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_ory2k7.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_x2kg4fawei6argfjo572var5xg
-% Encoding created by otftotfm on Fri Feb  5 17:20:32 2016
+%%AutoEnc_ory2k7zxmx7kcwuky4t2wgd2ae
+% Encoding created by otftotfm on Fri Feb 19 08:28:16 2016
 % Command line follows encoding
-/AutoEnc_x2kg4fawei6argfjo572var5xg [
+/AutoEnc_ory2k7zxmx7kcwuky4t2wgd2ae [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -14,8 +14,8 @@
   /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
+  /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
@@ -60,6 +60,6 @@
 % --truetype-directory=texmf/fonts/truetype/kosch/crimson
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=kern --feature=pnum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl Crimson-SemiboldItalic.otf Crimson-SemiboldItalic-lf-ot1'
+% --coding-scheme=TEX TEXT --feature=kern --ligkern=f i =: fi --ligkern=f l
+% =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% Crimson-SemiboldItalic.otf Crimson-SemiboldItalic-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_qrsm2e.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_qrsm2e.enc
index 50f48de0b01..dfd6e691595 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_qrsm2e.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_qrsm2e.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qrsm2e3ypimnf3imu3sd2ze7va
-% Encoding created by otftotfm on Fri Feb  5 17:20:25 2016
+% Encoding created by otftotfm on Fri Feb 19 08:28:14 2016
 % Command line follows encoding
 /AutoEnc_qrsm2e3ypimnf3imu3sd2ze7va [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=kern --ligkern=f i =: fi --ligkern=f l
 % =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% Crimson-Bold.otf Crimson-Bold-lf-ot1'
+% Crimson-Bold.otf Crimson-Bold-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_2u4s6t.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_qst7o4.enc
index 57af1ae91ca..dee9a609eb2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_2u4s6t.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_qst7o4.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2u4s6tai5wp2n57c4vq4y3xvud
-% Encoding created by otftotfm on Fri Feb  5 17:20:27 2016
+%%AutoEnc_qst7o47bxlc2zlmjptvgklswvd
+% Encoding created by otftotfm on Fri Feb 19 08:28:15 2016
 % Command line follows encoding
-/AutoEnc_2u4s6tai5wp2n57c4vq4y3xvud [
+/AutoEnc_qst7o47bxlc2zlmjptvgklswvd [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -14,8 +14,8 @@
   /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
+  /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
@@ -60,7 +60,6 @@
 % --truetype-directory=texmf/fonts/truetype/kosch/crimson
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Crimson-Italic.otf
-% Crimson-Italic-lf-ly1'
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern --ligkern=f
+% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Crimson-Italic.otf Crimson-Italic-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_sc6oq6.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_sc6oq6.enc
deleted file mode 100644
index 58fa6e867f7..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_sc6oq6.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_sc6oq6h76y5trw5kw2jtdinkfc
-% Encoding created by otftotfm on Fri Feb  5 17:20:27 2016
-% Command line follows encoding
-/AutoEnc_sc6oq6h76y5trw5kw2jtdinkfc [
-%00
-  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi.sc /uni0237 /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
-%20
-  /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period.sc /slash.sc
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon.sc /semicolon.sc /exclamdown.sc /equal.sc /questiondown.sc /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=kern --feature=pnum --feature=smcp
-% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Crimson-Italic.otf Crimson-Italic-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_su4bln.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_su4bln.enc
deleted file mode 100644
index 44bd99d8b7c..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_su4bln.enc
+++ /dev/null
@@ -1,67 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_su4blnyxkoxswcfvb56vx6lkmb
-% Encoding created by otftotfm on Fri Feb  5 17:20:29 2016
-% Command line follows encoding
-/AutoEnc_su4blnyxkoxswcfvb56vx6lkmb [
-%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.sc /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
-%20
-  /.notdef /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period.sc /slash.sc
-%30
-  /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /colon.sc /semicolon.sc /less.sc /equal.sc /greater.sc /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.sc /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.sc /bar.sc /braceright.sc /asciitilde.sc /hyphen
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /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 /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
-  /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=onum --feature=pnum --feature=smcp --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall Crimson-Italic.otf
-% Crimson-Italic-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_ticopk.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_ticopk.enc
deleted file mode 100644
index 174bc052c07..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_ticopk.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ticopkoajs7kq3kt42w5lb6tpe
-% Encoding created by otftotfm on Fri Feb  5 17:20:28 2016
-% Command line follows encoding
-/AutoEnc_ticopkoajs7kq3kt42w5lb6tpe [
-%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 /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /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 /Scedilla /Tcaron /Tcommaaccent /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 /scedilla /tcaron /tcommaaccent /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% Crimson-Italic.otf Crimson-Italic-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_lmdtbn.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_tyw3ea.enc
index 9aa3337a0c9..ecc7d6d9d15 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_lmdtbn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_tyw3ea.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lmdtbnmpgjzkvygvvbjt2yq4fd
-% Encoding created by otftotfm on Fri Feb  5 17:20:27 2016
+%%AutoEnc_tyw3eaf5bk73y5bvftbs7nsqwh
+% Encoding created by otftotfm on Fri Feb 19 08:28:15 2016
 % Command line follows encoding
-/AutoEnc_lmdtbnmpgjzkvygvvbjt2yq4fd [
+/AutoEnc_tyw3eaf5bk73y5bvftbs7nsqwh [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -14,8 +14,8 @@
   /.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
+  /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
@@ -61,6 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Crimson-Italic.otf
-% Crimson-Italic-lf-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl Crimson-Italic.otf Crimson-Italic-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_u4gl2f.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_u4gl2f.enc
deleted file mode 100644
index f3da13925bf..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_u4gl2f.enc
+++ /dev/null
@@ -1,67 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_u4gl2fkd2exr7ngsq4gkupki3a
-% Encoding created by otftotfm on Fri Feb  5 17:20:27 2016
-% Command line follows encoding
-/AutoEnc_u4gl2fkd2exr7ngsq4gkupki3a [
-%00
-  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi.sc /uni0237 /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
-%20
-  /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period.sc /slash.sc
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon.sc /semicolon.sc /less.sc /equal.sc /greater.sc /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.sc /bar.sc /braceright.sc /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum.sc /minus
-%90
-  /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /.notdef /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde.sc /Ydieresis
-%A0
-  /uni00A0 /exclamdown.sc /cent /sterling /currency /yen /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
-  /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
-  /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
-%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.sc
-  /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.sc
-  /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall Crimson-Italic.otf
-% Crimson-Italic-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_mjrdvm.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_uafi7a.enc
index 7e3ccc90024..95231fcd0e1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_mjrdvm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_uafi7a.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_mjrdvmbpewpj25po76pezztyxf
-% Encoding created by otftotfm on Fri Feb  5 17:20:24 2016
+%%AutoEnc_uafi7anhkpagklqdgnybzovgbg
+% Encoding created by otftotfm on Fri Feb 19 08:28:14 2016
 % Command line follows encoding
-/AutoEnc_mjrdvmbpewpj25po76pezztyxf [
+/AutoEnc_uafi7anhkpagklqdgnybzovgbg [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -14,8 +14,8 @@
   /.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
+  /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
@@ -61,5 +61,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=pnum Crimson-BoldItalic.otf
-% Crimson-BoldItalic-lf-t1'
+% --feature=liga Crimson-BoldItalic.otf Crimson-BoldItalic-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_uc33xe.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_uc33xe.enc
deleted file mode 100644
index a806f587873..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_uc33xe.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_uc33xeddruof5fnnqxdabrl23g
-% Encoding created by otftotfm on Fri Feb  5 17:20:28 2016
-% Command line follows encoding
-/AutoEnc_uc33xeddruof5fnnqxdabrl23g [
-%00
-  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi /uni0237 /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.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /.notdef /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 /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
-  /cedilla /uni00B9 /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% Crimson-Italic.otf Crimson-Italic-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_7k2f33.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_ue2axx.enc
index f65737f723f..384ee92412d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_7k2f33.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_ue2axx.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_7k2f33cjg6zemjlnvgcipxu4mf
-% Encoding created by otftotfm on Fri Feb  5 17:20:33 2016
+%%AutoEnc_ue2axxmhofcac4jb4xw2x3bp7d
+% Encoding created by otftotfm on Fri Feb 19 08:28:17 2016
 % Command line follows encoding
-/AutoEnc_7k2f33cjg6zemjlnvgcipxu4mf [
+/AutoEnc_ue2axxmhofcac4jb4xw2x3bp7d [
 %00
   /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -14,8 +14,8 @@
   /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
+  /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
@@ -60,6 +60,6 @@
 % --truetype-directory=texmf/fonts/truetype/kosch/crimson
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=kern --feature=pnum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl Crimson-Semibold.otf Crimson-Semibold-lf-ot1'
+% --coding-scheme=TEX TEXT --feature=kern --ligkern=f i =: fi --ligkern=f l
+% =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% Crimson-Semibold.otf Crimson-Semibold-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_vcz7kx.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_vcz7kx.enc
index 866a345d7d3..c1c54d71420 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_vcz7kx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_vcz7kx.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_vcz7kxzunyfwc53bzflxbsts5b
-% Encoding created by otftotfm on Fri Feb  5 17:20:33 2016
+% Encoding created by otftotfm on Fri Feb 19 08:28:17 2016
 % Command line follows encoding
 /AutoEnc_vcz7kxzunyfwc53bzflxbsts5b [
 %00
@@ -60,6 +60,6 @@
 % --truetype-directory=texmf/fonts/truetype/kosch/crimson
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=pnum
-% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl Crimson-Semibold.otf Crimson-Semibold-lf-ts1'
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Crimson-Semibold.otf Crimson-Semibold-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_vdp5yc.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_vdp5yc.enc
deleted file mode 100644
index a33baa24211..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_vdp5yc.enc
+++ /dev/null
@@ -1,67 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_vdp5yccf2zf5fve3pocf4p4wgh
-% Encoding created by otftotfm on Fri Feb  5 17:20:30 2016
-% Command line follows encoding
-/AutoEnc_vdp5yccf2zf5fve3pocf4p4wgh [
-%00
-  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi.sc /uni0237 /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
-%20
-  /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
-  /parenleft.sc /parenright.sc /asterisk /plus /comma.sc /hyphen /period.sc /slash.sc
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon.sc /semicolon.sc /less.sc /equal.sc /greater.sc /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.sc /bar.sc /braceright.sc /tilde /dieresis
-%80
-  /Lslash /quotesingle.sc /quotesinglbase /.notdef /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum.sc /minus
-%90
-  /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron /asciitilde.sc /Ydieresis
-%A0
-  /uni00A0 /exclamdown.sc /cent /sterling /currency /yen /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
-%B0
-  /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
-  /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
-%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.sc
-  /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.sc
-  /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall Crimson-Roman.otf
-% Crimson-Roman-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_vnv7ee.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_wef5am.enc
index f46d9e53da7..17c119090ae 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_vnv7ee.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_wef5am.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_vnv7eek3l2r5tbtyapsdimaiia
-% Encoding created by otftotfm on Fri Feb  5 17:20:33 2016
+%%AutoEnc_wef5amwvdozezqjjy5gsv2yzlh
+% Encoding created by otftotfm on Fri Feb 19 08:28:16 2016
 % Command line follows encoding
-/AutoEnc_vnv7eek3l2r5tbtyapsdimaiia [
+/AutoEnc_wef5amwvdozezqjjy5gsv2yzlh [
 %00
   /grave /acute /.notdef /.notdef /dieresis /.notdef /.notdef /.notdef
   /.notdef /macron /.notdef /cedilla /.notdef /quotesinglbase /guilsinglleft /guilsinglright
@@ -14,8 +14,8 @@
   /.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
+  /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
@@ -61,6 +61,6 @@
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Crimson-SemiboldItalic.otf
-% Crimson-SemiboldItalic-lf-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl Crimson-SemiboldItalic.otf
+% Crimson-SemiboldItalic-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_wsbs26.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_wsbs26.enc
index fa65023d8bb..6d64bd1ef14 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_wsbs26.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_wsbs26.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_wsbs26yvmtzyg4tgop3j6o3yua
-% Encoding created by otftotfm on Fri Feb  5 17:20:24 2016
+% Encoding created by otftotfm on Fri Feb 19 08:28:14 2016
 % Command line follows encoding
 /AutoEnc_wsbs26yvmtzyg4tgop3j6o3yua [
 %00
@@ -61,6 +61,6 @@
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.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 Crimson-BoldItalic.otf
-% Crimson-BoldItalic-lf-ts1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl Crimson-BoldItalic.otf
+% Crimson-BoldItalic-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_4zdqo5.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_wttfgh.enc
index 927f9f39012..9cfbd13296a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_4zdqo5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_wttfgh.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_4zdqo5aienhwxx2qiqtkmswvvc
-% Encoding created by otftotfm on Fri Feb  5 17:20:26 2016
+%%AutoEnc_wttfghtig3fpyoymk3rctqbfjb
+% Encoding created by otftotfm on Fri Feb 19 08:28:15 2016
 % Command line follows encoding
-/AutoEnc_4zdqo5aienhwxx2qiqtkmswvvc [
+/AutoEnc_wttfghtig3fpyoymk3rctqbfjb [
 %00
   /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -14,8 +14,8 @@
   /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
+  /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
@@ -60,6 +60,6 @@
 % --truetype-directory=texmf/fonts/truetype/kosch/crimson
 % --encoding-directory=texmf/fonts/enc/dvips/crimson
 % --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=kern --feature=pnum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl Crimson-Italic.otf Crimson-Italic-lf-ot1'
+% --coding-scheme=TEX TEXT --feature=kern --ligkern=f i =: fi --ligkern=f l
+% =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% Crimson-Italic.otf Crimson-Italic-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_xrpepd.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_xrpepd.enc
deleted file mode 100644
index 41f76aee840..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_xrpepd.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_xrpepdmeq4zwczs2x7ox7s2d2h
-% Encoding created by otftotfm on Fri Feb  5 17:20:26 2016
-% Command line follows encoding
-/AutoEnc_xrpepdmeq4zwczs2x7ox7s2d2h [
-%00
-  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi.sc /uni0237 /grave /acute /.notdef /breve /macron /.notdef
-  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
-%20
-  /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon.sc /semicolon.sc /exclamdown.sc /equal.sc /questiondown.sc /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 /.notdef /.notdef
-%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 /.notdef /.notdef /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=kern --feature=smcp --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall Crimson-Bold.otf
-% Crimson-Bold-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_zm6fle.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_zm6fle.enc
deleted file mode 100644
index a780dbfe273..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_zm6fle.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_zm6flek6ttw4mafzxfk46ilr2b
-% Encoding created by otftotfm on Fri Feb  5 17:20:24 2016
-% Command line follows encoding
-/AutoEnc_zm6flek6ttw4mafzxfk46ilr2b [
-%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 /uni0237 /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.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /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 /Scedilla /Tcaron /Tcommaaccent /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 /scedilla /tcaron /tcommaaccent /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=pnum Crimson-BoldItalic.otf
-% Crimson-BoldItalic-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_ztmgyy.enc b/Master/texmf-dist/fonts/enc/dvips/crimson/crm_ztmgyy.enc
deleted file mode 100644
index 56333f27323..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/crimson/crm_ztmgyy.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ztmgyyxucdecj4ej72zjavedmh
-% Encoding created by otftotfm on Fri Feb  5 17:20:26 2016
-% Command line follows encoding
-/AutoEnc_ztmgyyxucdecj4ej72zjavedmh [
-%00
-  /grave /acute /.notdef /.notdef /dieresis /.notdef /.notdef /.notdef
-  /breve /macron /.notdef /cedilla /.notdef /quotesinglbase /guilsinglleft /guilsinglright
-%10
-  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
-  /.notdef /dotlessi.sc /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
-%20
-  /.notdef /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon.sc /semicolon.sc /less.sc /equal.sc /greater.sc /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.sc /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.sc /bar.sc /braceright.sc /asciitilde /hyphen
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /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 /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
-  /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /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/kosch/crimson
-% --vf-directory=texmf/fonts/vf/kosch/crimson
-% --type1-directory=texmf/fonts/type1/kosch/crimson
-% --truetype-directory=texmf/fonts/truetype/kosch/crimson
-% --encoding-directory=texmf/fonts/enc/dvips/crimson
-% --map-file=texmf/fonts/map/dvips/crimson/Crimson.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =:
-% SSsmall Crimson-Bold.otf Crimson-Bold-lf-sc-t1'