cochineal (16oct18)

git-svn-id: svn://tug.org/texlive/trunk@48917 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2018-10-16 21:10:19 +0000
committer: Karl Berry <karl@freefriends.org> 2018-10-16 21:10:19 +0000
commit: b0acd0d7fcc352d9bc432e42ccc43792a9c28888 (patch)
tree: be5192e767efb856575279631f98d2362994f0a5
parent: 9f437ce6a740b12e0822fbec90144e0793420454 (diff)
359 files changed, 337 insertions, 539 deletions
diff --git a/Master/texmf-dist/doc/fonts/cochineal/README b/Master/texmf-dist/doc/fonts/cochineal/README
index 9b063cbafab..eff8e50439d 100644
--- a/Master/texmf-dist/doc/fonts/cochineal/README
+++ b/Master/texmf-dist/doc/fonts/cochineal/README
@@ -18,7 +18,12 @@ LaTeX support file cochineal.sty are
 Files provided "as is", with no warranties.
 
 The support files are provided in encodings OT1, T1, TS1 and LY1 for users of Western scripts, LGR for Greek scripts and T2A and OT2 for Cyrillic scripts.
-1701
+
+Current version: 1.048
+
+Changes in version 1.048
+1. Corrected some accents (esp., macron, tilde) in upright bold.
+2. Corrected the TS1 encoded tfm files. They now work as intended.
 
 Changes in version 1.047
 Corrected spacing and kerning for upper-case Greek letters with diacritics.
diff --git a/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.pdf b/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.pdf
index 95e7b9cd657..dea4682d17b 100644
--- a/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex b/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex
index 2cb0ded5271..51a2e3edf85 100644
--- a/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex
+++ b/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex
@@ -111,6 +111,9 @@ and variance $1$ on a probability space $(\Omega,\mathcal{F},\Pr)$. Then}
 \frac{\mathrm{e}^{-t^2/2}}{\sqrt{2\uppi}}\,\mathrm{d}t
 \quad\mbox{as $n\to\infty$, for every $f\in\mathrm{b}
 \mathcal{C}(\mathbb{R})$.}\]
+\section*{Cochineal's TS1 (textcomp)}
+\fonttable{Cochineal-Roman-ts1}
+\newpage
  \section*{Typesetting Greek with LaTeX}
 Cochineal offers a rather complete LGR-encoded glyph collection, lacking just a few ancient symbols.
 \fonttable{Cochineal-Roman-tlf-lgr}
diff --git a/Master/texmf-dist/fonts/afm/public/cochineal/Cochineal-Bold.afm b/Master/texmf-dist/fonts/afm/public/cochineal/Cochineal-Bold.afm
index 9ee5cbc24f7..c1a05ccb79e 100644
--- a/Master/texmf-dist/fonts/afm/public/cochineal/Cochineal-Bold.afm
+++ b/Master/texmf-dist/fonts/afm/public/cochineal/Cochineal-Bold.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20170730
-Comment Creation Date: Wed Sep 12 17:11:15 2018
+Comment Creation Date: Mon Oct 15 09:29:44 2018
 FontName Cochineal-Bold
 FullName Cochineal Bold
 FamilyName Cochineal
@@ -15,7 +15,7 @@ UnderlinePosition -99
 UnderlineThickness 49
 Version 0.9
 EncodingScheme ISO10646-1
-FontBBox -482 -291 1331 1078
+FontBBox -503 -291 1331 1078
 CapHeight 679
 XHeight 443
 Ascender 705
@@ -130,7 +130,7 @@ C 170 ; WX 386 ; N ordfeminine ; B 43 248 358 557 ;
 C 171 ; WX 501 ; N guillemotleft ; B 26 73 457 423 ;
 C 172 ; WX 588 ; N logicalnot ; B 46 160 520 420 ;
 C 174 ; WX 652 ; N registered ; B 53 89 600 635 ;
-C 175 ; WX 468 ; N macron ; B 562 546 794 597 ;
+C 175 ; WX 276 ; N macron ; B 22 546 254 597 ;
 C 176 ; WX 289 ; N degree ; B 34 425 256 647 ;
 C 177 ; WX 581 ; N plusminus ; B 50 9 531 574 ;
 C 178 ; WX 348 ; N uni00B2 ; B 17 256 334 648 ;
@@ -182,7 +182,7 @@ C 223 ; WX 589 ; N germandbls ; B 18 -10 562 698 ;
 C 224 ; WX 471 ; N agrave ; B 31 -8 458 687 ;
 C 225 ; WX 471 ; N aacute ; B 31 -8 458 687 ;
 C 226 ; WX 471 ; N acircumflex ; B 31 -8 458 679 ;
-C 227 ; WX 471 ; N atilde ; B 31 -8 458 639 ;
+C 227 ; WX 471 ; N atilde ; B 28 -8 458 639 ;
 C 228 ; WX 471 ; N adieresis ; B 31 -8 458 649 ;
 C 229 ; WX 471 ; N aring ; B 31 -8 458 720 ;
 C 230 ; WX 695 ; N ae ; B 31 -9 665 449 ;
@@ -252,7 +252,7 @@ C -1 ; WX 582 ; N hcircumflex ; B 12 -4 579 870 ;
 C -1 ; WX 740 ; N Hbar ; B 34 -4 707 662 ;
 C -1 ; WX 582 ; N hbar ; B 12 -4 579 695 ;
 C -1 ; WX 359 ; N Itilde ; B -2 -4 378 854 ;
-C -1 ; WX 314 ; N itilde ; B 10 -4 319 639 ;
+C -1 ; WX 314 ; N itilde ; B 0 -4 309 639 ;
 C -1 ; WX 359 ; N Imacron ; B 29 -4 337 787 ;
 C -1 ; WX 314 ; N imacron ; B 7 -4 304 588 ;
 C -1 ; WX 359 ; N Ibreve ; B 34 -4 326 827 ;
@@ -290,7 +290,7 @@ C -1 ; WX 578 ; N eng ; B 25 -218 516 446 ;
 C -1 ; WX 759 ; N Omacron ; B 40 -10 720 787 ;
 C -1 ; WX 531 ; N omacron ; B 32 -7 500 588 ;
 C -1 ; WX 759 ; N Obreve ; B 40 -10 720 827 ;
-C -1 ; WX 531 ; N obreve ; B -228 -7 500 631 ;
+C -1 ; WX 531 ; N obreve ; B 32 -7 500 631 ;
 C -1 ; WX 759 ; N Ohungarumlaut ; B 40 -10 720 869 ;
 C -1 ; WX 531 ; N ohungarumlaut ; B 32 -7 500 675 ;
 C -1 ; WX 1014 ; N OE ; B 40 -3 993 664 ;
@@ -420,8 +420,8 @@ C -1 ; WX 379 ; N hungarumlaut ; B 28 522 340 687 ;
 C -1 ; WX 0 ; N gravecomb ; B -249 522 -76 687 ;
 C -1 ; WX 0 ; N acutecomb ; B -249 522 -76 687 ;
 C -1 ; WX 284 ; N uni0302 ; B 31 493 267 662 ;
-C -1 ; WX 692 ; N tildecomb ; B 66 519 375 646 ;
-C -1 ; WX 430 ; N uni0304 ; B 53 559 337 608 ;
+C -1 ; WX 368 ; N tildecomb ; B 26 519 335 646 ;
+C -1 ; WX 350 ; N uni0304 ; B 33 559 317 608 ;
 C -1 ; WX 562 ; N uni0305 ; B -16 734 586 806 ;
 C -1 ; WX 0 ; N uni0306 ; B -370 521 -144 642 ;
 C -1 ; WX 316 ; N uni0307 ; B 87 521 221 657 ;
@@ -733,9 +733,9 @@ C -1 ; WX 589 ; N uni1E35 ; B 12 -118 590 695 ;
 C -1 ; WX 578 ; N uni1E36 ; B 34 -212 580 662 ;
 C -1 ; WX 305 ; N uni1E37 ; B 12 -215 294 695 ;
 C -1 ; WX 578 ; N uni1E38 ; B 27 -212 581 776 ;
-C -1 ; WX 305 ; N uni1E39 ; B 12 -215 298 804 ;
-C -1 ; WX 578 ; N uni1E3A ; B 34 -116 580 662 ;
-C -1 ; WX 305 ; N uni1E3B ; B 12 -116 294 695 ;
+C -1 ; WX 305 ; N uni1E39 ; B -6 -215 294 804 ;
+C -1 ; WX 578 ; N uni1E3A ; B -358 -116 580 662 ;
+C -1 ; WX 305 ; N uni1E3B ; B -503 -116 294 695 ;
 C -1 ; WX 578 ; N uni1E3C ; B 34 -3 580 662 ;
 C -1 ; WX 305 ; N uni1E3D ; B 12 -4 294 695 ;
 C -1 ; WX 906 ; N uni1E3E ; B 16 -8 882 869 ;
@@ -853,7 +853,7 @@ C -1 ; WX 471 ; N uni1EB3 ; B 34 -8 461 868 ;
 C -1 ; WX 674 ; N uni1EB4 ; B 16 -4 712 1023 ;
 C -1 ; WX 471 ; N uni1EB5 ; B 34 -8 461 821 ;
 C -1 ; WX 674 ; N uni1EB6 ; B 16 -213 712 828 ;
-C -1 ; WX 471 ; N uni1EB7 ; B -239 -217 461 631 ;
+C -1 ; WX 471 ; N uni1EB7 ; B 34 -217 461 631 ;
 C -1 ; WX 601 ; N uni1EB8 ; B 30 -213 576 664 ;
 C -1 ; WX 459 ; N uni1EB9 ; B 35 -217 432 447 ;
 C -1 ; WX 601 ; N uni1EBA ; B 30 -1 576 904 ;
@@ -934,8 +934,8 @@ C -1 ; WX 753 ; N uni1F0A ; B -2 -12 761 668 ;
 C -1 ; WX 733 ; N uni1F0B ; B 0 -12 741 668 ;
 C -1 ; WX 737 ; N uni1F0C ; B 0 -12 745 671 ;
 C -1 ; WX 762 ; N uni1F0D ; B 0 -12 769 668 ;
-C -1 ; WX 756 ; N uni1F0E ; B -1 -12 763 721 ;
-C -1 ; WX 758 ; N uni1F0F ; B 0 -12 764 721 ;
+C -1 ; WX 756 ; N uni1F0E ; B -41 -12 763 721 ;
+C -1 ; WX 758 ; N uni1F0F ; B -40 -12 764 721 ;
 C -1 ; WX 372 ; N uni1F10 ; B 43 -6 350 687 ;
 C -1 ; WX 372 ; N uni1F11 ; B 43 -6 350 654 ;
 C -1 ; WX 372 ; N uni1F12 ; B 39 -6 350 712 ;
@@ -962,24 +962,24 @@ C -1 ; WX 844 ; N uni1F2A ; B 0 -17 795 668 ;
 C -1 ; WX 822 ; N uni1F2B ; B 0 -17 773 668 ;
 C -1 ; WX 826 ; N uni1F2C ; B 0 -17 777 668 ;
 C -1 ; WX 850 ; N uni1F2D ; B 0 -17 801 668 ;
-C -1 ; WX 855 ; N uni1F2E ; B 0 -17 806 720 ;
-C -1 ; WX 855 ; N uni1F2F ; B 0 -17 806 720 ;
+C -1 ; WX 855 ; N uni1F2E ; B -40 -17 806 720 ;
+C -1 ; WX 855 ; N uni1F2F ; B -40 -17 806 720 ;
 C -1 ; WX 267 ; N uni1F30 ; B 52 -3 250 687 ;
 C -1 ; WX 267 ; N uni1F31 ; B 31 -3 250 654 ;
 C -1 ; WX 267 ; N uni1F32 ; B -37 -3 250 712 ;
 C -1 ; WX 267 ; N uni1F33 ; B -32 -3 251 712 ;
 C -1 ; WX 267 ; N uni1F34 ; B 5 -3 254 712 ;
 C -1 ; WX 267 ; N uni1F35 ; B -30 -3 250 712 ;
-C -1 ; WX 267 ; N uni1F36 ; B -31 -3 278 798 ;
-C -1 ; WX 267 ; N uni1F37 ; B -34 -3 275 798 ;
+C -1 ; WX 267 ; N uni1F36 ; B -71 -3 250 798 ;
+C -1 ; WX 267 ; N uni1F37 ; B -74 -3 250 798 ;
 C -1 ; WX 347 ; N uni1F38 ; B 0 -16 307 667 ;
 C -1 ; WX 361 ; N uni1F39 ; B 0 -16 321 664 ;
 C -1 ; WX 482 ; N uni1F3A ; B 0 -16 442 668 ;
 C -1 ; WX 460 ; N uni1F3B ; B 0 -16 420 668 ;
 C -1 ; WX 464 ; N uni1F3C ; B 0 -16 424 668 ;
 C -1 ; WX 488 ; N uni1F3D ; B 0 -16 448 668 ;
-C -1 ; WX 513 ; N uni1F3E ; B 0 -16 473 721 ;
-C -1 ; WX 513 ; N uni1F3F ; B 0 -16 473 721 ;
+C -1 ; WX 513 ; N uni1F3E ; B -40 -16 473 721 ;
+C -1 ; WX 513 ; N uni1F3F ; B -40 -16 473 721 ;
 C -1 ; WX 497 ; N uni1F40 ; B 41 -8 457 687 ;
 C -1 ; WX 497 ; N uni1F41 ; B 41 -8 457 654 ;
 C -1 ; WX 497 ; N uni1F42 ; B 41 -8 457 712 ;
@@ -999,11 +999,11 @@ C -1 ; WX 448 ; N uni1F53 ; B 32 -7 409 712 ;
 C -1 ; WX 448 ; N uni1F54 ; B 32 -7 409 712 ;
 C -1 ; WX 448 ; N uni1F55 ; B 32 -7 409 712 ;
 C -1 ; WX 448 ; N uni1F56 ; B 32 -7 409 806 ;
-C -1 ; WX 448 ; N uni1F57 ; B 32 -7 409 806 ;
+C -1 ; WX 448 ; N uni1F57 ; B 24 -7 409 806 ;
 C -1 ; WX 719 ; N uni1F59 ; B 0 -16 727 668 ;
 C -1 ; WX 826 ; N uni1F5B ; B 0 -16 833 668 ;
 C -1 ; WX 866 ; N uni1F5D ; B 0 -16 873 668 ;
-C -1 ; WX 870 ; N uni1F5F ; B 0 -16 877 721 ;
+C -1 ; WX 870 ; N uni1F5F ; B -40 -16 877 721 ;
 C -1 ; WX 665 ; N uni1F60 ; B 41 -7 625 687 ;
 C -1 ; WX 665 ; N uni1F61 ; B 41 -7 625 654 ;
 C -1 ; WX 665 ; N uni1F62 ; B 41 -7 625 712 ;
@@ -1018,8 +1018,8 @@ C -1 ; WX 1027 ; N uni1F6A ; B 6 0 976 668 ;
 C -1 ; WX 975 ; N uni1F6B ; B -2 0 944 668 ;
 C -1 ; WX 940 ; N uni1F6C ; B 0 0 909 668 ;
 C -1 ; WX 966 ; N uni1F6D ; B 0 0 935 668 ;
-C -1 ; WX 946 ; N uni1F6E ; B 0 0 915 721 ;
-C -1 ; WX 946 ; N uni1F6F ; B 0 0 915 721 ;
+C -1 ; WX 946 ; N uni1F6E ; B -40 0 915 721 ;
+C -1 ; WX 946 ; N uni1F6F ; B -40 0 915 721 ;
 C -1 ; WX 505 ; N uni1F70 ; B 41 -10 479 712 ;
 C -1 ; WX 505 ; N uni1F71 ; B 37 -10 475 724 ;
 C -1 ; WX 372 ; N uni1F72 ; B 43 -6 350 710 ;
@@ -1048,8 +1048,8 @@ C -1 ; WX 756 ; N uni1F8A ; B 0 -221 763 668 ;
 C -1 ; WX 734 ; N uni1F8B ; B 0 -221 741 668 ;
 C -1 ; WX 737 ; N uni1F8C ; B 0 -199 745 671 ;
 C -1 ; WX 761 ; N uni1F8D ; B 0 -221 769 668 ;
-C -1 ; WX 756 ; N uni1F8E ; B 0 -221 764 721 ;
-C -1 ; WX 756 ; N uni1F8F ; B 0 -221 764 721 ;
+C -1 ; WX 756 ; N uni1F8E ; B -40 -221 764 721 ;
+C -1 ; WX 756 ; N uni1F8F ; B -40 -221 764 721 ;
 C -1 ; WX 527 ; N uni1F90 ; B 13 -230 480 687 ;
 C -1 ; WX 527 ; N uni1F91 ; B 13 -230 480 654 ;
 C -1 ; WX 527 ; N uni1F92 ; B 13 -230 480 722 ;
@@ -1064,8 +1064,8 @@ C -1 ; WX 844 ; N uni1F9A ; B 0 -205 795 668 ;
 C -1 ; WX 821 ; N uni1F9B ; B -1 -205 772 668 ;
 C -1 ; WX 826 ; N uni1F9C ; B 0 -205 777 668 ;
 C -1 ; WX 850 ; N uni1F9D ; B 0 -205 801 668 ;
-C -1 ; WX 855 ; N uni1F9E ; B 0 -205 806 720 ;
-C -1 ; WX 855 ; N uni1F9F ; B 0 -205 806 720 ;
+C -1 ; WX 855 ; N uni1F9E ; B -40 -205 806 720 ;
+C -1 ; WX 855 ; N uni1F9F ; B -40 -205 806 720 ;
 C -1 ; WX 665 ; N uni1FA0 ; B 41 -221 625 687 ;
 C -1 ; WX 665 ; N uni1FA1 ; B 41 -221 625 654 ;
 C -1 ; WX 665 ; N uni1FA2 ; B 41 -221 625 712 ;
@@ -1080,8 +1080,8 @@ C -1 ; WX 952 ; N uni1FAA ; B 0 -205 922 705 ;
 C -1 ; WX 976 ; N uni1FAB ; B 0 -205 946 668 ;
 C -1 ; WX 939 ; N uni1FAC ; B 0 -205 909 669 ;
 C -1 ; WX 966 ; N uni1FAD ; B 1 -205 936 668 ;
-C -1 ; WX 946 ; N uni1FAE ; B 0 -205 915 721 ;
-C -1 ; WX 946 ; N uni1FAF ; B 0 -205 915 721 ;
+C -1 ; WX 946 ; N uni1FAE ; B -40 -205 915 721 ;
+C -1 ; WX 946 ; N uni1FAF ; B -40 -205 915 721 ;
 C -1 ; WX 505 ; N uni1FB0 ; B 41 -10 479 620 ;
 C -1 ; WX 505 ; N uni1FB1 ; B 41 -10 479 586 ;
 C -1 ; WX 505 ; N uni1FB2 ; B 41 -221 479 712 ;
@@ -1097,7 +1097,7 @@ C -1 ; WX 597 ; N uni1FBC ; B -10 -221 605 662 ;
 C -1 ; WX 435 ; N uni1FBD ; B 167 500 277 687 ;
 C -1 ; WX 228 ; N uni1FBE ; B 41 -208 183 -41 ;
 C -1 ; WX 524 ; N uni1FBF ; B 172 493 282 680 ;
-C -1 ; WX 692 ; N uni1FC0 ; B 487 525 796 652 ;
+C -1 ; WX 382 ; N uni1FC0 ; B 37 525 346 652 ;
 C -1 ; WX 336 ; N uni1FC1 ; B 14 475 323 761 ;
 C -1 ; WX 527 ; N uni1FC2 ; B 13 -230 480 713 ;
 C -1 ; WX 527 ; N uni1FC3 ; B 13 -230 480 449 ;
@@ -1111,7 +1111,7 @@ C -1 ; WX 707 ; N uni1FCB ; B 0 -17 658 676 ;
 C -1 ; WX 594 ; N uni1FCC ; B 48 -205 545 664 ;
 C -1 ; WX 508 ; N uni1FCD ; B 77 493 338 705 ;
 C -1 ; WX 510 ; N uni1FCE ; B 100 493 349 705 ;
-C -1 ; WX 508 ; N uni1FCF ; B 101 469 410 767 ;
+C -1 ; WX 508 ; N uni1FCF ; B 61 469 370 767 ;
 C -1 ; WX 267 ; N uni1FD0 ; B 11 -3 250 620 ;
 C -1 ; WX 267 ; N uni1FD1 ; B -7 -3 277 546 ;
 C -1 ; WX 267 ; N uni1FD2 ; B -21 -3 278 770 ;
@@ -1124,8 +1124,8 @@ C -1 ; WX 337 ; N uni1FDA ; B 0 -16 297 668 ;
 C -1 ; WX 344 ; N uni1FDB ; B 0 -16 304 676 ;
 C -1 ; WX 507 ; N uni1FDD ; B 74 492 313 705 ;
 C -1 ; WX 508 ; N uni1FDE ; B 76 472 349 705 ;
-C -1 ; WX 508 ; N uni1FDF ; B 101 469 410 767 ;
-C -1 ; WX 448 ; N uni1FE0 ; B -303 -7 409 620 ;
+C -1 ; WX 508 ; N uni1FDF ; B 61 469 370 767 ;
+C -1 ; WX 448 ; N uni1FE0 ; B 32 -7 409 620 ;
 C -1 ; WX 448 ; N uni1FE1 ; B 32 -7 409 546 ;
 C -1 ; WX 448 ; N uni1FE2 ; B 32 -7 409 770 ;
 C -1 ; WX 448 ; N uni1FE3 ; B 32 -7 409 774 ;
@@ -1346,8 +1346,8 @@ C -1 ; WX 598 ; N gdotaccent.sc ; B 39 -6 575 643 ;
 C -1 ; WX 598 ; N gcommaaccent.sc ; B 39 -218 575 459 ;
 C -1 ; WX 620 ; N hcircumflex.sc ; B 41 -6 579 692 ;
 C -1 ; WX 623 ; N hbar.sc ; B 43 -4 581 454 ;
-C -1 ; WX 325 ; N itilde.sc ; B 19 -6 328 652 ;
-C -1 ; WX 325 ; N imacron.sc ; B 31 -6 315 601 ;
+C -1 ; WX 325 ; N itilde.sc ; B 9 -6 318 652 ;
+C -1 ; WX 325 ; N imacron.sc ; B 21 -6 305 601 ;
 C -1 ; WX 325 ; N ibreve.sc ; B 41 -6 284 644 ;
 C -1 ; WX 324 ; N iogonek.sc ; B 44 -216 282 454 ;
 C -1 ; WX 340 ; N Idotaccent.sc ; B 37 -4 304 643 ;
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2bdexd.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2bdexd.enc
index c591424cfdd..3a5a0eaa77b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2bdexd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2bdexd.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_2bdexd3bheqplp2o6xukmhzera
-% Encoding created by otftotfm on Mon Sep 17 18:50:37 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:51 2018
 % Command line follows encoding
 /AutoEnc_2bdexd3bheqplp2o6xukmhzera [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2gcnb2.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2gcnb2.enc
index 55719335f0b..d9126c1ecb0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2gcnb2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2gcnb2.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_2gcnb2qqzo2t7amd4qeyt2gflf
-% Encoding created by otftotfm on Mon Sep 17 18:50:41 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:59 2018
 % Command line follows encoding
 /AutoEnc_2gcnb2qqzo2t7amd4qeyt2gflf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2hlayp.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2hlayp.enc
index 1185b817318..f87ef4a3b79 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2hlayp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2hlayp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_2hlaypvjknmdmdwlmdelewm4ph
-% Encoding created by otftotfm on Mon Sep 17 18:51:02 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:10 2018
 % Command line follows encoding
 /AutoEnc_2hlaypvjknmdmdwlmdelewm4ph [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2lm36b.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2lm36b.enc
index ef04b07b564..1160183860c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2lm36b.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2lm36b.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_2lm36bljrtfzfgm3j66m43i3nd
-% Encoding created by otftotfm on Mon Sep 17 18:50:33 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:48 2018
 % Command line follows encoding
 /AutoEnc_2lm36bljrtfzfgm3j66m43i3nd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_327ero.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_327ero.enc
index 145e92587cf..08907a98fbd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_327ero.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_327ero.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_327erotlfdchg5e3n2ycuhf4og
-% Encoding created by otftotfm on Mon Sep 17 18:51:31 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:39 2018
 % Command line follows encoding
 /AutoEnc_327erotlfdchg5e3n2ycuhf4og [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3ahcfy.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3ahcfy.enc
index d2f76150bed..63573a8bb3b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3ahcfy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3ahcfy.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_3ahcfywe37dany2hmtslgvhu6b
-% Encoding created by otftotfm on Mon Sep 17 18:51:30 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:49 2018
 % Command line follows encoding
 /AutoEnc_3ahcfywe37dany2hmtslgvhu6b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3knxwx.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3knxwx.enc
index 13cb600e621..722db962147 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3knxwx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3knxwx.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_3knxwxu4r25ng4o3o7xjzxfu5e
-% Encoding created by otftotfm on Mon Sep 17 18:50:55 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:13 2018
 % Command line follows encoding
 /AutoEnc_3knxwxu4r25ng4o3o7xjzxfu5e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3pp4wv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3pp4wv.enc
index b5ae6aea92b..830c85a126f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3pp4wv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3pp4wv.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_3pp4wv2uj6mmdoq3sg7cdfphkf
-% Encoding created by otftotfm on Mon Sep 17 18:51:08 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:26 2018
 % Command line follows encoding
 /AutoEnc_3pp4wv2uj6mmdoq3sg7cdfphkf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3uurxv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3uurxv.enc
index 927dc3de3f5..8e1bf8faf18 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3uurxv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3uurxv.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_3uurxv4dydpgh6ogolzuygq4ug
-% Encoding created by otftotfm on Mon Sep 17 18:51:33 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:40 2018
 % Command line follows encoding
 /AutoEnc_3uurxv4dydpgh6ogolzuygq4ug [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3uwymq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3uwymq.enc
index 5ef581e35e5..e900edbbe8b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3uwymq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3uwymq.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_3uwymqsd6ycnc2tcu2qfe5itkh
-% Encoding created by otftotfm on Mon Sep 17 18:50:39 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:57 2018
 % Command line follows encoding
 /AutoEnc_3uwymqsd6ycnc2tcu2qfe5itkh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4kirwg.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4kirwg.enc
index 003efb9bfbf..3e8d643818e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4kirwg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4kirwg.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_4kirwgvpfcoydkjgxkwsln6hdb
-% Encoding created by otftotfm on Mon Sep 17 18:51:16 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:24 2018
 % Command line follows encoding
 /AutoEnc_4kirwgvpfcoydkjgxkwsln6hdb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4pifhx.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4pifhx.enc
index 471e505faa0..d74753a5e52 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4pifhx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4pifhx.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_4pifhx7b5j5uxjxeilzq6kgx2a
-% Encoding created by otftotfm on Mon Sep 17 18:51:26 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:44 2018
 % Command line follows encoding
 /AutoEnc_4pifhx7b5j5uxjxeilzq6kgx2a [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4se4qw.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4se4qw.enc
index ea75ef244cb..284522dc8ee 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4se4qw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4se4qw.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_4se4qwhuysfzv2xl2aggteitsg
-% Encoding created by otftotfm on Mon Sep 17 18:51:40 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:55 2018
 % Command line follows encoding
 /AutoEnc_4se4qwhuysfzv2xl2aggteitsg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4w37pe.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4w37pe.enc
index 0d2e7b2aa43..a455a24f03f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4w37pe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4w37pe.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_4w37pe64v3eq3yxyufs2ifskka
-% Encoding created by otftotfm on Mon Sep 17 18:50:40 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:58 2018
 % Command line follows encoding
 /AutoEnc_4w37pe64v3eq3yxyufs2ifskka [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4wsvu7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4wsvu7.enc
index 7799aaa8f1e..a6617c8b82c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4wsvu7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4wsvu7.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_4wsvu7vr6nqqjcfnf66hpqdaga
-% Encoding created by otftotfm on Mon Sep 17 18:51:31 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:38 2018
 % Command line follows encoding
 /AutoEnc_4wsvu7vr6nqqjcfnf66hpqdaga [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_irjahv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_52z6yf.enc
index 8af096ccc14..f0abb80994d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_irjahv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_52z6yf.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_irjahvsqtr56xb5ljosnqymrfb
-% Encoding created by otftotfm on Mon Sep 17 18:50:44 2018
+%%AutoEnc_52z6yf4a2bosnhm57gn33ncjtc
+% Encoding created by otftotfm on Mon Oct 15 11:35:02 2018
 % Command line follows encoding
-/AutoEnc_irjahvsqtr56xb5ljosnqymrfb [
+/AutoEnc_52z6yf4a2bosnhm57gn33ncjtc [
 %00
   /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /uni03A9 /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5iuvne.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5iuvne.enc
index 2775b834160..78eb80d94cd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5iuvne.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5iuvne.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_5iuvneucbvorso2wvejyt7lv7b
-% Encoding created by otftotfm on Mon Sep 17 18:50:40 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:57 2018
 % Command line follows encoding
 /AutoEnc_5iuvneucbvorso2wvejyt7lv7b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5rx6tx.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5rx6tx.enc
index d4a113dbb6c..d5bb475f83d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5rx6tx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5rx6tx.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_5rx6tx4apyvc3kpanj2g75rz5b
-% Encoding created by otftotfm on Mon Sep 17 18:51:33 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:40 2018
 % Command line follows encoding
 /AutoEnc_5rx6tx4apyvc3kpanj2g75rz5b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5v3q2i.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5v3q2i.enc
index 87cb9671dbe..d7d6e48cc54 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5v3q2i.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5v3q2i.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_5v3q2ik7vctzjtjmp5wezb2t5c
-% Encoding created by otftotfm on Mon Sep 17 18:51:22 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:47 2018
 % Command line follows encoding
 /AutoEnc_5v3q2ik7vctzjtjmp5wezb2t5c [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5ye6em.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5ye6em.enc
index 57f66c952de..c2ea35ce3b6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5ye6em.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5ye6em.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_5ye6emtshbvxfaac7ctanvfiwd
-% Encoding created by otftotfm on Mon Sep 17 18:51:27 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:45 2018
 % Command line follows encoding
 /AutoEnc_5ye6emtshbvxfaac7ctanvfiwd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6iuvsw.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6iuvsw.enc
index 7eae74c547c..280c631f67d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6iuvsw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6iuvsw.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_6iuvswur6skc4icjipjt2tngtb
-% Encoding created by otftotfm on Mon Sep 17 18:50:36 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:51 2018
 % Command line follows encoding
 /AutoEnc_6iuvswur6skc4icjipjt2tngtb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6n7xb4.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6n7xb4.enc
index 261167a8c3d..7bbe109986f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6n7xb4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6n7xb4.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_6n7xb4k65uam6j32wkkxchqjke
-% Encoding created by otftotfm on Mon Sep 17 18:51:06 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:22 2018
 % Command line follows encoding
 /AutoEnc_6n7xb4k65uam6j32wkkxchqjke [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6samag.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6samag.enc
index 461a420b01f..2f65b67f9ea 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6samag.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6samag.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_6samag633x7qv5delozyb3m3nd
-% Encoding created by otftotfm on Mon Sep 17 18:51:09 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:27 2018
 % Command line follows encoding
 /AutoEnc_6samag633x7qv5delozyb3m3nd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6xkbmk.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6xkbmk.enc
deleted file mode 100644
index 6fe3690ab65..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6xkbmk.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_6xkbmkl3zqccaqybx5dyh57ome
-% Encoding created by otftotfm on Mon Sep 17 18:50:38 2018
-% Command line follows encoding
-/AutoEnc_6xkbmkl3zqccaqybx5dyh57ome [
-%00
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
-%10
-  /question /bar /quotedblbase /exclamdown /questiondown /.notdef /.notdef /.notdef
-  /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /endash /.notdef
-%20
-  /.notdef /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
-  /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
-%30
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
-%40
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni03A9
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown
-%60
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
-  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
-  /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
-  /degree /plusminus /.notdef /.notdef /.notdef /mu /paragraph /periodcentered
-  /.notdef /.notdef /ordmasculine /radical /onequarter /onehalf /threequarters /.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 /multiply /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /.notdef /.notdef /.notdef /.notdef /l /.notdef /i /f
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
-% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7dsvym.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7dsvym.enc
index 01a1b7ae237..bb0c249e961 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7dsvym.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7dsvym.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_7dsvymb2elp4lhhlisrdlapfng
-% Encoding created by otftotfm on Mon Sep 17 18:50:37 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:52 2018
 % Command line follows encoding
 /AutoEnc_7dsvymb2elp4lhhlisrdlapfng [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7n5ozw.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7n5ozw.enc
index 127714293e0..e205e841215 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7n5ozw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7n5ozw.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_7n5ozwifmjdqmta6eqqsurutme
-% Encoding created by otftotfm on Mon Sep 17 18:50:42 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:00 2018
 % Command line follows encoding
 /AutoEnc_7n5ozwifmjdqmta6eqqsurutme [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7uj7io.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7uj7io.enc
deleted file mode 100644
index 1560507a5c8..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7uj7io.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_7uj7iokoaokbvpxwp2bnnoqsbe
-% Encoding created by otftotfm on Mon Sep 17 18:51:22 2018
-% Command line follows encoding
-/AutoEnc_7uj7iokoaokbvpxwp2bnnoqsbe [
-%00
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
-%10
-  /question /bar /quotedblbase /exclamdown /questiondown /.notdef /.notdef /.notdef
-  /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /endash /.notdef
-%20
-  /.notdef /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
-  /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
-%30
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
-%40
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown
-%60
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
-  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /lira /.notdef /.notdef /.notdef /.notdef /trademark
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
-  /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
-  /degree /plusminus /.notdef /.notdef /.notdef /mu /paragraph /periodcentered
-  /.notdef /.notdef /ordmasculine /radical /onequarter /onehalf /threequarters /.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 /multiply /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /.notdef /.notdef /.notdef /.notdef /l /.notdef /i /f
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
-% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7wf654.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7wf654.enc
index 14279fd9550..19c90dc8476 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7wf654.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7wf654.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_7wf6546ucxuem4rfi6fq3qv6cg
-% Encoding created by otftotfm on Mon Sep 17 18:50:43 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:01 2018
 % Command line follows encoding
 /AutoEnc_7wf6546ucxuem4rfi6fq3qv6cg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7ylujt.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7ylujt.enc
index e8dc88dc8f7..e663451ef76 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7ylujt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7ylujt.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_7ylujtvhkdkummpgarkbptl2zf
-% Encoding created by otftotfm on Mon Sep 17 18:51:14 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:32 2018
 % Command line follows encoding
 /AutoEnc_7ylujtvhkdkummpgarkbptl2zf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_a2bs3v.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_a2bs3v.enc
index 7dc063e7b8f..fafb92cc965 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_a2bs3v.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_a2bs3v.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_a2bs3vm2rjznnueklgt6o373sb
-% Encoding created by otftotfm on Mon Sep 17 18:50:52 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:08 2018
 % Command line follows encoding
 /AutoEnc_a2bs3vm2rjznnueklgt6o373sb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aiszvi.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aiszvi.enc
index 5b71be73426..7368eda8caa 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aiszvi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aiszvi.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_aiszvioatmgagbut46lhbf6ebh
-% Encoding created by otftotfm on Mon Sep 17 18:50:43 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:01 2018
 % Command line follows encoding
 /AutoEnc_aiszvioatmgagbut46lhbf6ebh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_alu2zh.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_alu2zh.enc
index 0a038797cf3..e8e67cb1a29 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_alu2zh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_alu2zh.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_alu2zhctgc6e2jtnsb2xah2s7d
-% Encoding created by otftotfm on Mon Sep 17 18:50:37 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:52 2018
 % Command line follows encoding
 /AutoEnc_alu2zhctgc6e2jtnsb2xah2s7d [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ankljj.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ankljj.enc
index 9a2689cbdb6..66ce7236bd6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ankljj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ankljj.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ankljjoqw6lfcrqpceyasnkk5e
-% Encoding created by otftotfm on Mon Sep 17 18:51:13 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:31 2018
 % Command line follows encoding
 /AutoEnc_ankljjoqw6lfcrqpceyasnkk5e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aonoag.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aonoag.enc
index cd605884332..6a47526f336 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aonoag.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aonoag.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_aonoagx5km2dirxcekh7la3hwb
-% Encoding created by otftotfm on Mon Sep 17 18:50:49 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:56 2018
 % Command line follows encoding
 /AutoEnc_aonoagx5km2dirxcekh7la3hwb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_arhfdy.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_arhfdy.enc
index 091388e1347..f71fbe5fd98 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_arhfdy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_arhfdy.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_arhfdyx6yjijj2nyyirhoswr2g
-% Encoding created by otftotfm on Mon Sep 17 18:51:13 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:31 2018
 % Command line follows encoding
 /AutoEnc_arhfdyx6yjijj2nyyirhoswr2g [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_atrkq4.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_atrkq4.enc
index b652b5e4a56..c020722cbff 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_atrkq4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_atrkq4.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_atrkq46e4ea7b6gr32p6d6wbpe
-% Encoding created by otftotfm on Mon Sep 17 18:51:06 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:21 2018
 % Command line follows encoding
 /AutoEnc_atrkq46e4ea7b6gr32p6d6wbpe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ayubby.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ayubby.enc
index 4988fd069d8..4c13ad24952 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ayubby.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ayubby.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ayubbyqyvxmd7caho34ukudcqf
-% Encoding created by otftotfm on Mon Sep 17 18:51:10 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:28 2018
 % Command line follows encoding
 /AutoEnc_ayubbyqyvxmd7caho34ukudcqf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bebzcd.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bebzcd.enc
index fb64e54c04f..3a3270af071 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bebzcd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bebzcd.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_bebzcdw5tofjbeemat4lxq42we
-% Encoding created by otftotfm on Mon Sep 17 18:50:49 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:55 2018
 % Command line follows encoding
 /AutoEnc_bebzcdw5tofjbeemat4lxq42we [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhawim.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhawim.enc
index d03085bce14..2d2b1bc0846 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhawim.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhawim.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_bhawimte6yf2vqtvpcc2c27woa
-% Encoding created by otftotfm on Mon Sep 17 18:50:59 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:17 2018
 % Command line follows encoding
 /AutoEnc_bhawimte6yf2vqtvpcc2c27woa [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_un2dh6.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_boduzw.enc
index 803959aad89..0c7fd080ccf 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_un2dh6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_boduzw.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_un2dh6jhgg6fp4xrax3n6r2hsa
-% Encoding created by otftotfm on Mon Sep 17 18:50:48 2018
+%%AutoEnc_boduzws2hdfkr66mvcshvvri5e
+% Encoding created by otftotfm on Mon Oct 15 11:34:54 2018
 % Command line follows encoding
-/AutoEnc_un2dh6jhgg6fp4xrax3n6r2hsa [
+/AutoEnc_boduzws2hdfkr66mvcshvvri5e [
 %00
   /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /uni03A9 /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_c4bkpi.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_c4bkpi.enc
index c08a9f95c8d..9ff8d4557ad 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_c4bkpi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_c4bkpi.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_c4bkpi3savowvqs5e673sjzvka
-% Encoding created by otftotfm on Mon Sep 17 18:50:48 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:55 2018
 % Command line follows encoding
 /AutoEnc_c4bkpi3savowvqs5e673sjzvka [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_c6u7ho.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_c6u7ho.enc
index e22279a95ce..a9919852b9f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_c6u7ho.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_c6u7ho.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_c6u7hoqrcpsp2nner7qhc3kdhf
-% Encoding created by otftotfm on Mon Sep 17 18:51:41 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:56 2018
 % Command line follows encoding
 /AutoEnc_c6u7hoqrcpsp2nner7qhc3kdhf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cipscc.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cipscc.enc
index dd270651cef..53d0a13a314 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cipscc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cipscc.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_cipscccaapzswuamqjr3qamnhd
-% Encoding created by otftotfm on Mon Sep 17 18:51:22 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:37 2018
 % Command line follows encoding
 /AutoEnc_cipscccaapzswuamqjr3qamnhd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dgjfkn.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dgjfkn.enc
index 28bfc052fcb..5c03f4a17bb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dgjfkn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dgjfkn.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_dgjfknhqalenbw2pipatvxjn5b
-% Encoding created by otftotfm on Mon Sep 17 18:51:06 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:22 2018
 % Command line follows encoding
 /AutoEnc_dgjfknhqalenbw2pipatvxjn5b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dpslmo.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dpslmo.enc
index 45835f4afbe..cfbfd1012d1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dpslmo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dpslmo.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_dpslmojvuql3ou6lxoqbln6rka
-% Encoding created by otftotfm on Mon Sep 17 18:51:30 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:49 2018
 % Command line follows encoding
 /AutoEnc_dpslmojvuql3ou6lxoqbln6rka [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dzpwzr.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dzpwzr.enc
index 1bbe78d103c..955f2e810be 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dzpwzr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dzpwzr.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_dzpwzrhpt3n5kirp2tgnu2ilgb
-% Encoding created by otftotfm on Mon Sep 17 18:51:41 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:57 2018
 % Command line follows encoding
 /AutoEnc_dzpwzrhpt3n5kirp2tgnu2ilgb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e3g2vu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e3g2vu.enc
index 7c26996b771..c6a43b3b6f4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e3g2vu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e3g2vu.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_e3g2vupqmfkvq73zoliw5gbd2g
-% Encoding created by otftotfm on Mon Sep 17 18:50:49 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:56 2018
 % Command line follows encoding
 /AutoEnc_e3g2vupqmfkvq73zoliw5gbd2g [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eecs2o.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eecs2o.enc
index efe44567d54..abae9d6df0e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eecs2o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eecs2o.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_eecs2oia4uua7j7dwgorxlswef
-% Encoding created by otftotfm on Mon Sep 17 18:51:05 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:21 2018
 % Command line follows encoding
 /AutoEnc_eecs2oia4uua7j7dwgorxlswef [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ehnbpv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ehnbpv.enc
index be92489e862..38f643418cd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ehnbpv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ehnbpv.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ehnbpvkehyccjs7svp6ot3oine
-% Encoding created by otftotfm on Mon Sep 17 18:50:36 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:50 2018
 % Command line follows encoding
 /AutoEnc_ehnbpvkehyccjs7svp6ot3oine [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ernfwg.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ernfwg.enc
index dd8955d0a7f..e33857d2935 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ernfwg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ernfwg.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ernfwgkcnnskrvyw626vfei46g
-% Encoding created by otftotfm on Mon Sep 17 18:51:22 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:38 2018
 % Command line follows encoding
 /AutoEnc_ernfwgkcnnskrvyw626vfei46g [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eyqo5t.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eyqo5t.enc
index ea803d0f5f4..77f829fbd64 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eyqo5t.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eyqo5t.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_eyqo5tnzgt7lfehgwtz6my3ayd
-% Encoding created by otftotfm on Mon Sep 17 18:51:42 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:57 2018
 % Command line follows encoding
 /AutoEnc_eyqo5tnzgt7lfehgwtz6my3ayd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eyy6oe.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eyy6oe.enc
index b92e54da881..debd901d8d9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eyy6oe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eyy6oe.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_eyy6oetl7xvgw5z27q5rks4a5a
-% Encoding created by otftotfm on Mon Sep 17 18:50:58 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:16 2018
 % Command line follows encoding
 /AutoEnc_eyy6oetl7xvgw5z27q5rks4a5a [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_f6gyh3.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_f6gyh3.enc
index b81080b9532..1911421597f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_f6gyh3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_f6gyh3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_f6gyh3en4btxeafjq2sk35t2de
-% Encoding created by otftotfm on Mon Sep 17 18:50:34 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:48 2018
 % Command line follows encoding
 /AutoEnc_f6gyh3en4btxeafjq2sk35t2de [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_faomqb.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_faomqb.enc
index 1d8430aee14..eb98c7e3664 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_faomqb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_faomqb.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_faomqbtlu355bhkduaafwwngfb
-% Encoding created by otftotfm on Mon Sep 17 18:51:32 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:39 2018
 % Command line follows encoding
 /AutoEnc_faomqbtlu355bhkduaafwwngfb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gcgtqo.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fh7c2n.enc
index bf2870600e5..764310a6427 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gcgtqo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fh7c2n.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_gcgtqoqyz6fclnkw6f4brrkasb
-% Encoding created by otftotfm on Mon Sep 17 18:51:25 2018
+%%AutoEnc_fh7c2n3ya2hzlbyqwuodrfjgte
+% Encoding created by otftotfm on Mon Oct 15 11:35:43 2018
 % Command line follows encoding
-/AutoEnc_gcgtqoqyz6fclnkw6f4brrkasb [
+/AutoEnc_fh7c2n3ya2hzlbyqwuodrfjgte [
 %00
   /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /Omega /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fhk6mz.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fhk6mz.enc
index db9319f26c8..3dafc45f548 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fhk6mz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fhk6mz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_fhk6mzqd6yu4to5ncysyg2z7re
-% Encoding created by otftotfm on Mon Sep 17 18:51:27 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:44 2018
 % Command line follows encoding
 /AutoEnc_fhk6mzqd6yu4to5ncysyg2z7re [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fiecpa.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fiecpa.enc
index e64d50fa035..db9038f08f7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fiecpa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fiecpa.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_fiecpaq43umhqpg7ygx2qunm5h
-% Encoding created by otftotfm on Mon Sep 17 18:50:45 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:03 2018
 % Command line follows encoding
 /AutoEnc_fiecpaq43umhqpg7ygx2qunm5h [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j7segj.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fld3r2.enc
index fbe6e6c31d4..dc4c9824602 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j7segj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fld3r2.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_j7segjn7gjh4bgkgusrq3evpge
-% Encoding created by otftotfm on Mon Sep 17 18:51:21 2018
+%%AutoEnc_fld3r2fueuuouim2zjiemdqhyb
+% Encoding created by otftotfm on Mon Oct 15 11:35:36 2018
 % Command line follows encoding
-/AutoEnc_j7segjn7gjh4bgkgusrq3evpge [
+/AutoEnc_fld3r2fueuuouim2zjiemdqhyb [
 %00
   /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /Omega /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fuez2l.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fuez2l.enc
index 8947db4364b..1a4a732806a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fuez2l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fuez2l.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_fuez2loyeq3otooi5bad5do6la
-% Encoding created by otftotfm on Mon Sep 17 18:51:33 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:41 2018
 % Command line follows encoding
 /AutoEnc_fuez2loyeq3otooi5bad5do6la [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gbdy7g.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gbdy7g.enc
index a8dfe8ce5c2..6ab49940321 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gbdy7g.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gbdy7g.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_gbdy7gnwiokzptgmeoou4ywn3a
-% Encoding created by otftotfm on Mon Sep 17 18:51:15 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:23 2018
 % Command line follows encoding
 /AutoEnc_gbdy7gnwiokzptgmeoou4ywn3a [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gpocnf.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gpocnf.enc
index f90b1daba89..aa4c972b0a7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gpocnf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gpocnf.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_gpocnfjk3xfuihw5b67t2ntt7e
-% Encoding created by otftotfm on Mon Sep 17 18:51:25 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:43 2018
 % Command line follows encoding
 /AutoEnc_gpocnfjk3xfuihw5b67t2ntt7e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gujmrc.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gujmrc.enc
index d5026217b80..228c0b9bac7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gujmrc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gujmrc.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_gujmrcyzp7e3vvbkcuesnl4gxb
-% Encoding created by otftotfm on Mon Sep 17 18:51:15 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:33 2018
 % Command line follows encoding
 /AutoEnc_gujmrcyzp7e3vvbkcuesnl4gxb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hd573s.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hd573s.enc
index 46fd8a09fa3..4f9b8a1be7c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hd573s.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hd573s.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_hd573sojpnzhshqzj7xo6j25ja
-% Encoding created by otftotfm on Mon Sep 17 18:51:16 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:24 2018
 % Command line follows encoding
 /AutoEnc_hd573sojpnzhshqzj7xo6j25ja [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hskcu3.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hskcu3.enc
index 153bc3a5cc2..0c347b9d47d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hskcu3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hskcu3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_hskcu3xl333t3y34htyugj4dyg
-% Encoding created by otftotfm on Mon Sep 17 18:51:19 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:35 2018
 % Command line follows encoding
 /AutoEnc_hskcu3xl333t3y34htyugj4dyg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_i4ioss.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_i4ioss.enc
index 9f337eb00c2..1bf78ce81c2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_i4ioss.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_i4ioss.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_i4iossdmew24jyu7dmrvxalh3a
-% Encoding created by otftotfm on Mon Sep 17 18:51:20 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:35 2018
 % Command line follows encoding
 /AutoEnc_i4iossdmew24jyu7dmrvxalh3a [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_iatrlr.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_iatrlr.enc
index 90e45b37293..c613a0e993b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_iatrlr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_iatrlr.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_iatrlrrvj2a7g6mmbulciuxg7g
-% Encoding created by otftotfm on Mon Sep 17 18:51:08 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:32 2018
 % Command line follows encoding
 /AutoEnc_iatrlrrvj2a7g6mmbulciuxg7g [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5dxihi.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_iqe3vy.enc
index 33d9cdf9e79..53d7256fd35 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5dxihi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_iqe3vy.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5dxihil3gosz2b753ewpmuje6e
-% Encoding created by otftotfm on Mon Sep 17 18:50:55 2018
+%%AutoEnc_iqe3vyx5o45deicpgjoyggboqd
+% Encoding created by otftotfm on Mon Oct 15 11:35:13 2018
 % Command line follows encoding
-/AutoEnc_5dxihil3gosz2b753ewpmuje6e [
+/AutoEnc_iqe3vyx5o45deicpgjoyggboqd [
 %00
   /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /uni03A9 /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_irol7d.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_irol7d.enc
index eb5d37f7471..2a2253eec8d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_irol7d.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_irol7d.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_irol7dr62ntqnatjfivwjkpdof
-% Encoding created by otftotfm on Mon Sep 17 18:51:39 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:55 2018
 % Command line follows encoding
 /AutoEnc_irol7dr62ntqnatjfivwjkpdof [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_isal6u.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_isal6u.enc
index 53f93dfeb73..fcea6f4ff4e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_isal6u.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_isal6u.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_isal6ugo5yoko6jknukdppi4lg
-% Encoding created by otftotfm on Mon Sep 17 18:51:18 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:26 2018
 % Command line follows encoding
 /AutoEnc_isal6ugo5yoko6jknukdppi4lg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ixgauz.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ixgauz.enc
index 810af67d446..76a5070a4ff 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ixgauz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ixgauz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ixgauzjoc5rxzvxhp5y75vym6e
-% Encoding created by otftotfm on Mon Sep 17 18:51:10 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:28 2018
 % Command line follows encoding
 /AutoEnc_ixgauzjoc5rxzvxhp5y75vym6e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j5n6tq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j5n6tq.enc
index f0b5a38530d..1137374efe5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j5n6tq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j5n6tq.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_j5n6tqfmfcjogmntrdb6k7zwrc
-% Encoding created by otftotfm on Mon Sep 17 18:50:38 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:04 2018
 % Command line follows encoding
 /AutoEnc_j5n6tqfmfcjogmntrdb6k7zwrc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jfgxgm.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jfgxgm.enc
index ce22c91216a..b86d7316408 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jfgxgm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jfgxgm.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_jfgxgm56cq6ww72o3ladlxjwwa
-% Encoding created by otftotfm on Mon Sep 17 18:51:29 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:46 2018
 % Command line follows encoding
 /AutoEnc_jfgxgm56cq6ww72o3ladlxjwwa [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jwtej4.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jwtej4.enc
index 758e93d8a28..23c874f1eb8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jwtej4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jwtej4.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_jwtej46ikg63o2bjthb2ofxtxe
-% Encoding created by otftotfm on Mon Sep 17 18:50:41 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:59 2018
 % Command line follows encoding
 /AutoEnc_jwtej46ikg63o2bjthb2ofxtxe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_auhtqr.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jzhnnr.enc
index 7f1642e0e6c..50302c66bc4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_auhtqr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jzhnnr.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_auhtqrrsun2sgdw5eyoygubv5g
-% Encoding created by otftotfm on Mon Sep 17 18:51:10 2018
+%%AutoEnc_jzhnnr2ozetsvfi6ebgmvbxcna
+% Encoding created by otftotfm on Mon Oct 15 11:35:28 2018
 % Command line follows encoding
-/AutoEnc_auhtqrrsun2sgdw5eyoygubv5g [
+/AutoEnc_jzhnnr2ozetsvfi6ebgmvbxcna [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /uni03A9 /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k3hebr.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k3hebr.enc
index 1588f95aee1..5f1e5e5269b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k3hebr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k3hebr.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_k3hebrtvx4pjtlknlwwhfg255f
-% Encoding created by otftotfm on Mon Sep 17 18:51:24 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:42 2018
 % Command line follows encoding
 /AutoEnc_k3hebrtvx4pjtlknlwwhfg255f [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k4nkpy.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k4nkpy.enc
index 68d2d794231..c9f31e5d854 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k4nkpy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k4nkpy.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_k4nkpypmjzxgvtblbkuytt63oh
-% Encoding created by otftotfm on Mon Sep 17 18:51:43 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:58 2018
 % Command line follows encoding
 /AutoEnc_k4nkpypmjzxgvtblbkuytt63oh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kdbvpj.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kdbvpj.enc
index 389db2b5100..2730963000c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kdbvpj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kdbvpj.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_kdbvpjkfbhagbkmjybnta65fib
-% Encoding created by otftotfm on Mon Sep 17 18:50:47 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:53 2018
 % Command line follows encoding
 /AutoEnc_kdbvpjkfbhagbkmjybnta65fib [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kj462m.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kj462m.enc
index 40a76a1b007..ae63d31dee2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kj462m.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kj462m.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_kj462mzbm275orhz5jkw4b43kf
-% Encoding created by otftotfm on Mon Sep 17 18:50:35 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:49 2018
 % Command line follows encoding
 /AutoEnc_kj462mzbm275orhz5jkw4b43kf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3ckcz6.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kolx6r.enc
index de53f28e493..e0a3cddaf58 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3ckcz6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kolx6r.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3ckcz6agums4m3r5kvdmiodwaa
-% Encoding created by otftotfm on Mon Sep 17 18:50:58 2018
+%%AutoEnc_kolx6rcy3u5md5z52cdfktgrzh
+% Encoding created by otftotfm on Mon Oct 15 11:35:16 2018
 % Command line follows encoding
-/AutoEnc_3ckcz6agums4m3r5kvdmiodwaa [
+/AutoEnc_kolx6rcy3u5md5z52cdfktgrzh [
 %00
   /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /uni03A9 /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ksvfey.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ksvfey.enc
index 90e37964a11..dd99ca256af 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ksvfey.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ksvfey.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ksvfeytniyxjikxj54uvcpjp3a
-% Encoding created by otftotfm on Mon Sep 17 18:51:21 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:37 2018
 % Command line follows encoding
 /AutoEnc_ksvfeytniyxjikxj54uvcpjp3a [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3lkmdq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kz2hmz.enc
index 1d0305573ef..420668a46a8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3lkmdq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kz2hmz.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3lkmdqkeptmwde6bufkz6esege
-% Encoding created by otftotfm on Mon Sep 17 18:51:28 2018
+%%AutoEnc_kz2hmzcyyw5bxqce4y4yfznphd
+% Encoding created by otftotfm on Mon Oct 15 11:35:46 2018
 % Command line follows encoding
-/AutoEnc_3lkmdqkeptmwde6bufkz6esege [
+/AutoEnc_kz2hmzcyyw5bxqce4y4yfznphd [
 %00
   /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /Omega /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l35a4c.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l35a4c.enc
index b4ad7a7755f..dd179322850 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l35a4c.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l35a4c.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_l35a4cqz5d6bagoehhtwfmasga
-% Encoding created by otftotfm on Mon Sep 17 18:50:39 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:04 2018
 % Command line follows encoding
 /AutoEnc_l35a4cqz5d6bagoehhtwfmasga [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l5f66w.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l5f66w.enc
index 76e7d3818e1..a5ace12f2a7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l5f66w.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l5f66w.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_l5f66w6zasibyyrcc7mimjdw4c
-% Encoding created by otftotfm on Mon Sep 17 18:50:41 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:58 2018
 % Command line follows encoding
 /AutoEnc_l5f66w6zasibyyrcc7mimjdw4c [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lbfs4w.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lbfs4w.enc
index 7f20c3ce42f..fb81cc478d2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lbfs4w.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lbfs4w.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_lbfs4waeh3n3wb64wvmynmaede
-% Encoding created by otftotfm on Mon Sep 17 18:51:08 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:33 2018
 % Command line follows encoding
 /AutoEnc_lbfs4waeh3n3wb64wvmynmaede [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lhezve.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lhezve.enc
index 4d5785a03a9..f8b90768605 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lhezve.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lhezve.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_lhezvewx2s7wwsoln7ys6nlvba
-% Encoding created by otftotfm on Mon Sep 17 18:51:42 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:57 2018
 % Command line follows encoding
 /AutoEnc_lhezvewx2s7wwsoln7ys6nlvba [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lmiqva.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lmiqva.enc
index 171f4377ecc..1eeacf79fd0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lmiqva.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lmiqva.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_lmiqvaclzuykdqmvvs5b32qitd
-% Encoding created by otftotfm on Mon Sep 17 18:51:09 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:27 2018
 % Command line follows encoding
 /AutoEnc_lmiqvaclzuykdqmvvs5b32qitd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wtyigc.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lnpsyi.enc
index de68e8668ca..a9dfbd8509f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wtyigc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lnpsyi.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_wtyigcd5mdigtin22wb6owbswh
-% Encoding created by otftotfm on Mon Sep 17 18:51:17 2018
+%%AutoEnc_lnpsyizi5ugmjjegxodsbkqhwd
+% Encoding created by otftotfm on Mon Oct 15 11:35:25 2018
 % Command line follows encoding
-/AutoEnc_wtyigcd5mdigtin22wb6owbswh [
+/AutoEnc_lnpsyizi5ugmjjegxodsbkqhwd [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /uni03A9 /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mlajwi.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mlajwi.enc
index b4b625f3566..7d0a93d8a35 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mlajwi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mlajwi.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_mlajwisaovo3plx2ve7fuftjdg
-% Encoding created by otftotfm on Mon Sep 17 18:51:02 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:11 2018
 % Command line follows encoding
 /AutoEnc_mlajwisaovo3plx2ve7fuftjdg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mqh25s.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mqh25s.enc
index 38692794a62..959b753197b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mqh25s.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mqh25s.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_mqh25steqi22gkdynmjpbb3jvd
-% Encoding created by otftotfm on Mon Sep 17 18:50:47 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:53 2018
 % Command line follows encoding
 /AutoEnc_mqh25steqi22gkdynmjpbb3jvd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mxqklu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mxqklu.enc
index 0c7de47f98c..f1d2119710f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mxqklu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mxqklu.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_mxqklui2cz3uivj2jkxxoouk7c
-% Encoding created by otftotfm on Mon Sep 17 18:51:20 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:36 2018
 % Command line follows encoding
 /AutoEnc_mxqklui2cz3uivj2jkxxoouk7c [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_n2swpv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_n2swpv.enc
index 3188761b152..e162fa25644 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_n2swpv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_n2swpv.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_n2swpvb2gl2y7dzhwt7clphv2f
-% Encoding created by otftotfm on Mon Sep 17 18:51:23 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:48 2018
 % Command line follows encoding
 /AutoEnc_n2swpvb2gl2y7dzhwt7clphv2f [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nxryuq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_njkfui.enc
index 646f8928cb0..6604008d757 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nxryuq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_njkfui.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_nxryuqgiyzui7oedcyuyf2se5c
-% Encoding created by otftotfm on Mon Sep 17 18:50:40 2018
+%%AutoEnc_njkfuiag3gs4afp47yvykk76lg
+% Encoding created by otftotfm on Mon Oct 15 11:34:58 2018
 % Command line follows encoding
-/AutoEnc_nxryuqgiyzui7oedcyuyf2se5c [
+/AutoEnc_njkfuiag3gs4afp47yvykk76lg [
 %00
   /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /uni03A9 /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nwjjp7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nwjjp7.enc
index 2d74a9844f1..7d8e7d780f1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nwjjp7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nwjjp7.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_nwjjp7jze6vwsjvylr6ioz4cnd
-% Encoding created by otftotfm on Mon Sep 17 18:50:44 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:02 2018
 % Command line follows encoding
 /AutoEnc_nwjjp7jze6vwsjvylr6ioz4cnd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nxl6ld.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nxl6ld.enc
index 342608bcc37..e55f8c473ea 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nxl6ld.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nxl6ld.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_nxl6ldkbrawbju6gbw2dvb23hd
-% Encoding created by otftotfm on Mon Sep 17 18:50:46 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:05 2018
 % Command line follows encoding
 /AutoEnc_nxl6ldkbrawbju6gbw2dvb23hd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nzj7ho.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nzj7ho.enc
index c8acc817041..640ad6e7a78 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nzj7ho.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nzj7ho.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_nzj7ho6yuclyfo2xkkbajiyf3g
-% Encoding created by otftotfm on Mon Sep 17 18:51:28 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:45 2018
 % Command line follows encoding
 /AutoEnc_nzj7ho6yuclyfo2xkkbajiyf3g [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ov2w53.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ov2w53.enc
index 3435fbbdb25..c00116780f9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ov2w53.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ov2w53.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ov2w53nf7iaapwryvvvxgmkxmg
-% Encoding created by otftotfm on Mon Sep 17 18:51:41 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:56 2018
 % Command line follows encoding
 /AutoEnc_ov2w53nf7iaapwryvvvxgmkxmg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oxg6eq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oxg6eq.enc
index 7cbbb9c283f..eb1e3d8626e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oxg6eq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oxg6eq.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_oxg6eqosr2a4bxceykpqbjm7jf
-% Encoding created by otftotfm on Mon Sep 17 18:50:46 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:05 2018
 % Command line follows encoding
 /AutoEnc_oxg6eqosr2a4bxceykpqbjm7jf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oz3bqn.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oz3bqn.enc
index 63ec0d8605c..7c7dd2005a1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oz3bqn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oz3bqn.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_oz3bqnjk6mmdxduv5yldlglrxe
-% Encoding created by otftotfm on Mon Sep 17 18:51:04 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:20 2018
 % Command line follows encoding
 /AutoEnc_oz3bqnjk6mmdxduv5yldlglrxe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pauxlo.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pauxlo.enc
index b147a9a6422..1f88da44e8d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pauxlo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pauxlo.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_pauxlorik63pb4y4uyiln5hklg
-% Encoding created by otftotfm on Mon Sep 17 18:50:48 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:54 2018
 % Command line follows encoding
 /AutoEnc_pauxlorik63pb4y4uyiln5hklg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ptok33.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ptok33.enc
index 865d51aaf3a..c52c1d5031f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ptok33.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ptok33.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ptok33kbty7wonypumq2sjnmkc
-% Encoding created by otftotfm on Mon Sep 17 18:51:05 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:20 2018
 % Command line follows encoding
 /AutoEnc_ptok33kbty7wonypumq2sjnmkc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pyiqqv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pyiqqv.enc
index f0fc04426fc..57753d57a26 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pyiqqv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pyiqqv.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_pyiqqvr6zjl5tgrvwyf3ahtrlf
-% Encoding created by otftotfm on Mon Sep 17 18:51:12 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:30 2018
 % Command line follows encoding
 /AutoEnc_pyiqqvr6zjl5tgrvwyf3ahtrlf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pzuqaa.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pzuqaa.enc
index 66f739ba6f8..ee2689c3da9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pzuqaa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pzuqaa.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_pzuqaavtjtpeu6knd5tj2vapkd
-% Encoding created by otftotfm on Mon Sep 17 18:50:39 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:56 2018
 % Command line follows encoding
 /AutoEnc_pzuqaavtjtpeu6knd5tj2vapkd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qb7eej.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qb7eej.enc
index 7a303f0eed8..5afaf54b8c3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qb7eej.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qb7eej.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qb7eej56vddxkh3wah2d3sqj7e
-% Encoding created by otftotfm on Mon Sep 17 18:51:42 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:58 2018
 % Command line follows encoding
 /AutoEnc_qb7eej56vddxkh3wah2d3sqj7e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5g7rcl.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qdmrmj.enc
index b010dc65d23..7f0489c9fc5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5g7rcl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qdmrmj.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5g7rclcrr5zkeag2ydoawrqhqa
-% Encoding created by otftotfm on Mon Sep 17 18:51:06 2018
+%%AutoEnc_qdmrmjuakgjvktxdnmhmdsq2td
+% Encoding created by otftotfm on Mon Oct 15 11:35:22 2018
 % Command line follows encoding
-/AutoEnc_5g7rclcrr5zkeag2ydoawrqhqa [
+/AutoEnc_qdmrmjuakgjvktxdnmhmdsq2td [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /uni03A9 /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qv7cwz.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qv7cwz.enc
index 8b0d5726f16..9da7c51993f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qv7cwz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qv7cwz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qv7cwznncg5q244orfktskrhhd
-% Encoding created by otftotfm on Mon Sep 17 18:51:18 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:34 2018
 % Command line follows encoding
 /AutoEnc_qv7cwznncg5q244orfktskrhhd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qxsaxp.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qxsaxp.enc
index c874df7068a..63820dc84cc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qxsaxp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qxsaxp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qxsaxpv7mkjqy44m7dytww4x4g
-% Encoding created by otftotfm on Mon Sep 17 18:50:56 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:14 2018
 % Command line follows encoding
 /AutoEnc_qxsaxpv7mkjqy44m7dytww4x4g [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r3xgod.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r3xgod.enc
index 9add12b5bf7..d721f06b580 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r3xgod.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r3xgod.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_r3xgod5t3c7ttynyndipgkbmcg
-% Encoding created by otftotfm on Mon Sep 17 18:51:19 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:34 2018
 % Command line follows encoding
 /AutoEnc_r3xgod5t3c7ttynyndipgkbmcg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r4azz6.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r4azz6.enc
index ba493d50116..ea7cf2e5a4f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r4azz6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r4azz6.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_r4azz6amdntt6lspyzh3otljpe
-% Encoding created by otftotfm on Mon Sep 17 18:51:19 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:35 2018
 % Command line follows encoding
 /AutoEnc_r4azz6amdntt6lspyzh3otljpe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r5kifa.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r5kifa.enc
index 711977a7562..d41cb1b49bb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r5kifa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r5kifa.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_r5kifak6soks474jf7igfqredd
-% Encoding created by otftotfm on Mon Sep 17 18:51:23 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:48 2018
 % Command line follows encoding
 /AutoEnc_r5kifak6soks474jf7igfqredd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_raqkat.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_raqkat.enc
index cb4926fc81e..918d734b0f7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_raqkat.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_raqkat.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_raqkati653noovxlrl4iw35cbe
-% Encoding created by otftotfm on Mon Sep 17 18:51:21 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:37 2018
 % Command line follows encoding
 /AutoEnc_raqkati653noovxlrl4iw35cbe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rkk6xv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rkk6xv.enc
index 206c7b92175..1e44aa204cc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rkk6xv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rkk6xv.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_rkk6xvvosilug47drzmm3ko7te
-% Encoding created by otftotfm on Mon Sep 17 18:51:29 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:47 2018
 % Command line follows encoding
 /AutoEnc_rkk6xvvosilug47drzmm3ko7te [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rqvs5r.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rqvs5r.enc
index 6dbc96b6d5c..6d2c778479e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rqvs5r.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rqvs5r.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_rqvs5rem3bjendrk6xuapcmrwd
-% Encoding created by otftotfm on Mon Sep 17 18:51:23 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:41 2018
 % Command line follows encoding
 /AutoEnc_rqvs5rem3bjendrk6xuapcmrwd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rt47uf.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rt47uf.enc
index 66afd9b0913..d8a90fa738c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rt47uf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rt47uf.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_rt47ufp67eamu2lpwwwilkt7bc
-% Encoding created by otftotfm on Mon Sep 17 18:50:38 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:04 2018
 % Command line follows encoding
 /AutoEnc_rt47ufp67eamu2lpwwwilkt7bc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sk33hx.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sk33hx.enc
index 7750ba8f63e..42fd136b67a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sk33hx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sk33hx.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_sk33hx2ctkkfhfdub4kls2f6yb
-% Encoding created by otftotfm on Mon Sep 17 18:51:27 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:45 2018
 % Command line follows encoding
 /AutoEnc_sk33hx2ctkkfhfdub4kls2f6yb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_avobnl.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sm4onp.enc
index 3c010650a00..48206454355 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_avobnl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sm4onp.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_avobnlxicnmtwub47b62mqsysd
-% Encoding created by otftotfm on Mon Sep 17 18:51:02 2018
+%%AutoEnc_sm4onpe2ynvowwuxdlbbjm746c
+% Encoding created by otftotfm on Mon Oct 15 11:35:11 2018
 % Command line follows encoding
-/AutoEnc_avobnlxicnmtwub47b62mqsysd [
+/AutoEnc_sm4onpe2ynvowwuxdlbbjm746c [
 %00
   /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /uni03A9 /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_szq67c.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_szq67c.enc
index 3ba79e20367..45bf9889fe8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_szq67c.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_szq67c.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_szq67c32xasehfpojpg3rdfsug
-% Encoding created by otftotfm on Mon Sep 17 18:50:43 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:01 2018
 % Command line follows encoding
 /AutoEnc_szq67c32xasehfpojpg3rdfsug [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t6bbzl.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t6bbzl.enc
index bfc95efaa7e..404ac5babd6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t6bbzl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t6bbzl.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_t6bbzldy32fumigptwyfjpktpf
-% Encoding created by otftotfm on Mon Sep 17 18:50:45 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:03 2018
 % Command line follows encoding
 /AutoEnc_t6bbzldy32fumigptwyfjpktpf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tdpwga.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tdpwga.enc
index 5e664f55148..9cd6878155c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tdpwga.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tdpwga.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_tdpwgaxkyu2hfkjmol3tzosnfa
-% Encoding created by otftotfm on Mon Sep 17 18:51:25 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:43 2018
 % Command line follows encoding
 /AutoEnc_tdpwgaxkyu2hfkjmol3tzosnfa [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tehpoo.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tehpoo.enc
index 26f645c34a3..232c9c78206 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tehpoo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tehpoo.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_tehpoo5xuuvqdkjgcfcyerw5jh
-% Encoding created by otftotfm on Mon Sep 17 18:51:28 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:46 2018
 % Command line follows encoding
 /AutoEnc_tehpoo5xuuvqdkjgcfcyerw5jh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tgg2bw.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tgg2bw.enc
index 30493fff61b..c40e98995da 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tgg2bw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tgg2bw.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_tgg2bwhyzokb5us5n6tk7sbvsb
-% Encoding created by otftotfm on Mon Sep 17 18:51:40 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:55 2018
 % Command line follows encoding
 /AutoEnc_tgg2bwhyzokb5us5n6tk7sbvsb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tpli6v.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tpli6v.enc
index 16a7b3c6819..e8cbf4671fb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tpli6v.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tpli6v.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_tpli6v2hu6noikpswpwqhuwcog
-% Encoding created by otftotfm on Mon Sep 17 18:51:17 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:25 2018
 % Command line follows encoding
 /AutoEnc_tpli6v2hu6noikpswpwqhuwcog [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tx56ne.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tx56ne.enc
index 5bfd8dc482a..4fd18f0c7a4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tx56ne.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tx56ne.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_tx56nexhp4egj56rj7sczo4kaf
-% Encoding created by otftotfm on Mon Sep 17 18:51:11 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:29 2018
 % Command line follows encoding
 /AutoEnc_tx56nexhp4egj56rj7sczo4kaf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_u523j7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_u523j7.enc
index a67d9bd580c..d734d07a329 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_u523j7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_u523j7.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_u523j7ljlmakgan3zz3dmoea4g
-% Encoding created by otftotfm on Mon Sep 17 18:51:30 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:48 2018
 % Command line follows encoding
 /AutoEnc_u523j7ljlmakgan3zz3dmoea4g [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uijgeh.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uijgeh.enc
index 525fb9a9afe..c853c959b93 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uijgeh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uijgeh.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_uijgehseingifcm6vqtlieytpg
-% Encoding created by otftotfm on Mon Sep 17 18:50:35 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:50 2018
 % Command line follows encoding
 /AutoEnc_uijgehseingifcm6vqtlieytpg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ulikgo.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ulikgo.enc
index ac43d86fb4b..9c62b4b8eb8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ulikgo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ulikgo.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ulikgonxp7foe5n72ilqcte4xa
-% Encoding created by otftotfm on Mon Sep 17 18:51:15 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:33 2018
 % Command line follows encoding
 /AutoEnc_ulikgonxp7foe5n72ilqcte4xa [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ume3xs.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ume3xs.enc
index 76b91ad2e19..900d034c940 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ume3xs.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ume3xs.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ume3xsuukmgrmq2xd5yhj3majc
-% Encoding created by otftotfm on Mon Sep 17 18:51:24 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:42 2018
 % Command line follows encoding
 /AutoEnc_ume3xsuukmgrmq2xd5yhj3majc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dx7yeo.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_v735at.enc
index 7ed15442121..65016fac653 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dx7yeo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_v735at.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_dx7yeogkra4k6jp5ssfpzhbdph
-% Encoding created by otftotfm on Mon Sep 17 18:51:32 2018
+%%AutoEnc_v735attflxm7f2lo3ftw7qcfoe
+% Encoding created by otftotfm on Mon Oct 15 11:35:39 2018
 % Command line follows encoding
-/AutoEnc_dx7yeogkra4k6jp5ssfpzhbdph [
+/AutoEnc_v735attflxm7f2lo3ftw7qcfoe [
 %00
   /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /Omega /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_v7xcot.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_v7xcot.enc
index 1f24bc2f370..f465dd287aa 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_v7xcot.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_v7xcot.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_v7xcotr4xxp5wcd7hnhhlx55vg
-% Encoding created by otftotfm on Mon Sep 17 18:51:31 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:38 2018
 % Command line follows encoding
 /AutoEnc_v7xcotr4xxp5wcd7hnhhlx55vg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vbr2z2.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vbr2z2.enc
index 43333a16667..36479e48964 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vbr2z2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vbr2z2.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_vbr2z2ywe5ctcbqigfobg4zzzf
-% Encoding created by otftotfm on Mon Sep 17 18:51:26 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:44 2018
 % Command line follows encoding
 /AutoEnc_vbr2z2ywe5ctcbqigfobg4zzzf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vrrrzn.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vrrrzn.enc
deleted file mode 100644
index 6341a31369b..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vrrrzn.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_vrrrznqlwbcw5dtu6h7v66ufnh
-% Encoding created by otftotfm on Mon Sep 17 18:51:07 2018
-% Command line follows encoding
-/AutoEnc_vrrrznqlwbcw5dtu6h7v66ufnh [
-%00
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
-%10
-  /question /bar /quotedblbase /exclamdown /questiondown /.notdef /.notdef /.notdef
-  /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /endash /.notdef
-%20
-  /.notdef /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
-  /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
-%30
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
-%40
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni03A9
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown
-%60
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
-  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
-  /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
-  /degree /plusminus /.notdef /.notdef /.notdef /mu /paragraph /periodcentered
-  /.notdef /.notdef /ordmasculine /radical /onequarter /onehalf /threequarters /.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 /multiply /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /.notdef /.notdef /.notdef /.notdef /l /.notdef /i /f
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
-% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --space-factor=1.06635 Cochineal-Italic.otf Cochineal-Italic-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wbw3s6.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wbw3s6.enc
index d7abafc673c..13a727c87a2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wbw3s6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wbw3s6.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_wbw3s6kt7a3nulrxt3rgostbla
-% Encoding created by otftotfm on Mon Sep 17 18:51:04 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:20 2018
 % Command line follows encoding
 /AutoEnc_wbw3s6kt7a3nulrxt3rgostbla [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wpajbj.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wpajbj.enc
index 2ff264b52f6..3eb3d777b33 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wpajbj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wpajbj.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_wpajbji3gu2bbpelldtbbtylte
-% Encoding created by otftotfm on Mon Sep 17 18:51:43 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:59 2018
 % Command line follows encoding
 /AutoEnc_wpajbji3gu2bbpelldtbbtylte [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wxpvz3.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wxpvz3.enc
index 9a63e02909d..4aa7d73105b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wxpvz3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wxpvz3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_wxpvz34f7sooyvb2qk33esqjib
-% Encoding created by otftotfm on Mon Sep 17 18:51:07 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:23 2018
 % Command line follows encoding
 /AutoEnc_wxpvz34f7sooyvb2qk33esqjib [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xaqz74.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xaqz74.enc
index f65a9ba4d44..b4e083c2eb3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xaqz74.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xaqz74.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_xaqz74ppfrzr3zyulmndubiqab
-% Encoding created by otftotfm on Mon Sep 17 18:50:42 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:00 2018
 % Command line follows encoding
 /AutoEnc_xaqz74ppfrzr3zyulmndubiqab [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xgopev.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xgopev.enc
index 8c8f7e7cfee..b8ff3cfac62 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xgopev.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xgopev.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_xgopeviywbdu6sxyp4puj2awke
-% Encoding created by otftotfm on Mon Sep 17 18:51:42 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:57 2018
 % Command line follows encoding
 /AutoEnc_xgopeviywbdu6sxyp4puj2awke [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_72apy2.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xo7mp7.enc
index 16e9c1d0aff..cf54fbf8633 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_72apy2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xo7mp7.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_72apy2krs65x6sfwplhei5hiad
-% Encoding created by otftotfm on Mon Sep 17 18:51:13 2018
+%%AutoEnc_xo7mp7fyjsp5uhupmjpregpfka
+% Encoding created by otftotfm on Mon Oct 15 11:35:31 2018
 % Command line follows encoding
-/AutoEnc_72apy2krs65x6sfwplhei5hiad [
+/AutoEnc_xo7mp7fyjsp5uhupmjpregpfka [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /uni03A9 /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xx26vs.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xx26vs.enc
index 87ff894dfe7..1afd599fdbf 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xx26vs.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xx26vs.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_xx26vs2xbht3ltk5dl2ifojy2e
-% Encoding created by otftotfm on Mon Sep 17 18:51:17 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:25 2018
 % Command line follows encoding
 /AutoEnc_xx26vs2xbht3ltk5dl2ifojy2e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ye47ub.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ye47ub.enc
index ce93e75472c..da6696e6251 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ye47ub.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ye47ub.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ye47ub6xzugrzdmict62cgq3fb
-% Encoding created by otftotfm on Mon Sep 17 18:50:35 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:49 2018
 % Command line follows encoding
 /AutoEnc_ye47ub6xzugrzdmict62cgq3fb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yfllcf.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yfllcf.enc
index a351f1b8546..684bc30000d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yfllcf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yfllcf.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yfllcfgb4lhxazxknesw4gaslf
-% Encoding created by otftotfm on Mon Sep 17 18:50:52 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:08 2018
 % Command line follows encoding
 /AutoEnc_yfllcfgb4lhxazxknesw4gaslf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ygzcii.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ygzcii.enc
index 71b33f4f689..f3b8dad0f7f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ygzcii.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ygzcii.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ygzcii43eqiw6k2asz2ejehvjg
-% Encoding created by otftotfm on Mon Sep 17 18:50:47 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:53 2018
 % Command line follows encoding
 /AutoEnc_ygzcii43eqiw6k2asz2ejehvjg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yidn7l.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yidn7l.enc
index 3d3698d6521..880bb4f4974 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yidn7l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yidn7l.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yidn7lfgcnx5w43k2nkmi2ukbg
-% Encoding created by otftotfm on Mon Sep 17 18:51:32 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:40 2018
 % Command line follows encoding
 /AutoEnc_yidn7lfgcnx5w43k2nkmi2ukbg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_462rls.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yk5hgq.enc
index b7fbd0dab2f..9910fbaefd0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_462rls.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yk5hgq.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_462rlsjeinugk6xjimpds2ycqa
-% Encoding created by otftotfm on Mon Sep 17 18:50:36 2018
+%%AutoEnc_yk5hgqv4vdtctrs4qzm3oi6ugd
+% Encoding created by otftotfm on Mon Oct 15 11:34:51 2018
 % Command line follows encoding
-/AutoEnc_462rlsjeinugk6xjimpds2ycqa [
+/AutoEnc_yk5hgqv4vdtctrs4qzm3oi6ugd [
 %00
   /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /uni03A9 /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yrma2d.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yrma2d.enc
index bea9441a608..eb14fd9c9e2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yrma2d.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yrma2d.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yrma2dtehmfob7exx2dpdhiwsa
-% Encoding created by otftotfm on Mon Sep 17 18:50:34 2018
+% Encoding created by otftotfm on Mon Oct 15 11:34:48 2018
 % Command line follows encoding
 /AutoEnc_yrma2dtehmfob7exx2dpdhiwsa [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yz65wh.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yz65wh.enc
index 0230424c327..b345661357e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yz65wh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yz65wh.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yz65whj6nmwootqn46uy5id3yg
-% Encoding created by otftotfm on Mon Sep 17 18:51:24 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:42 2018
 % Command line follows encoding
 /AutoEnc_yz65whj6nmwootqn46uy5id3yg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_z5w3bg.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_z5w3bg.enc
index 047282101af..83f20dcd2b5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_z5w3bg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_z5w3bg.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_z5w3bg7nzfmfekongww5rmwfvb
-% Encoding created by otftotfm on Mon Sep 17 18:50:44 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:03 2018
 % Command line follows encoding
 /AutoEnc_z5w3bg7nzfmfekongww5rmwfvb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zceo5t.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zceo5t.enc
index 84bc284012b..35e14781ee8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zceo5t.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zceo5t.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_zceo5tfblq7iby3q6lg555vocg
-% Encoding created by otftotfm on Mon Sep 17 18:51:29 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:47 2018
 % Command line follows encoding
 /AutoEnc_zceo5tfblq7iby3q6lg555vocg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zd4idy.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zd4idy.enc
index 70f9cf7608d..1b6cf4b643e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zd4idy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zd4idy.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_zd4idy26fkltx273purfquv3lc
-% Encoding created by otftotfm on Mon Sep 17 18:51:11 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:29 2018
 % Command line follows encoding
 /AutoEnc_zd4idy26fkltx273purfquv3lc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zi2reu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zi2reu.enc
index 4da9666131d..f7abc0b870b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zi2reu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zi2reu.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_zi2reucvqtgwgoqzrojvcpsqbe
-% Encoding created by otftotfm on Mon Sep 17 18:50:46 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:05 2018
 % Command line follows encoding
 /AutoEnc_zi2reucvqtgwgoqzrojvcpsqbe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zs6x3r.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zs6x3r.enc
index 75c1a3972f7..d3c7a6f4d2e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zs6x3r.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zs6x3r.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_zs6x3rg46l4kvjmvgwv2ahrevh
-% Encoding created by otftotfm on Mon Sep 17 18:51:12 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:30 2018
 % Command line follows encoding
 /AutoEnc_zs6x3rg46l4kvjmvgwv2ahrevh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zwlvmj.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zwlvmj.enc
index 9d38684267a..4e612c371f8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zwlvmj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zwlvmj.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_zwlvmjlsfprbhixyd7yelmczwg
-% Encoding created by otftotfm on Mon Sep 17 18:51:20 2018
+% Encoding created by otftotfm on Mon Oct 15 11:35:36 2018
 % Command line follows encoding
 /AutoEnc_zwlvmjlsfprbhixyd7yelmczwg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7iao2d.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zzhtpf.enc
index c2fca0597d3..4e8bd2e5e95 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7iao2d.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zzhtpf.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_7iao2dniakbyfe3c67e5nvit2h
-% Encoding created by otftotfm on Mon Sep 17 18:50:52 2018
+%%AutoEnc_zzhtpfwiy75x3od2a5shqbhhoh
+% Encoding created by otftotfm on Mon Oct 15 11:35:08 2018
 % Command line follows encoding
-/AutoEnc_7iao2dniakbyfe3c67e5nvit2h [
+/AutoEnc_zzhtpfwiy75x3od2a5shqbhhoh [
 %00
   /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Phi /Psi /uni03A9 /s.sc /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -29,7 +29,7 @@
   /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
-  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/map/dvips/cochineal/Cochineal.map b/Master/texmf-dist/fonts/map/dvips/cochineal/Cochineal.map
index 7577aabcd30..87435f5d6c8 100644
--- a/Master/texmf-dist/fonts/map/dvips/cochineal/Cochineal.map
+++ b/Master/texmf-dist/fonts/map/dvips/cochineal/Cochineal.map
@@ -7,48 +7,44 @@ Cochineal-Bold-tosf-ly1--base Cochineal-Bold "AutoEnc_ye47ub6xzugrzdmict62cgq3fb
 Cochineal-Bold-tosf-ot1 Cochineal-Bold "AutoEnc_kj462mzbm275orhz5jkw4b43kf ReEncodeFont" <[coch_kj462m.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tosf-t1--base Cochineal-Bold "AutoEnc_uijgehseingifcm6vqtlieytpg ReEncodeFont" <[coch_uijgeh.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tosf-sc-ly1--base Cochineal-Bold "AutoEnc_ehnbpvkehyccjs7svp6ot3oine ReEncodeFont" <[coch_ehnbpv.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tosf-sc-ot1--base Cochineal-Bold "AutoEnc_462rlsjeinugk6xjimpds2ycqa ReEncodeFont" <[coch_462rls.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tosf-sc-ot1--base Cochineal-Bold "AutoEnc_yk5hgqv4vdtctrs4qzm3oi6ugd ReEncodeFont" <[coch_yk5hgq.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tosf-sc-t1--base Cochineal-Bold "AutoEnc_6iuvswur6skc4icjipjt2tngtb ReEncodeFont" <[coch_6iuvsw.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tosf-swash-ly1--base Cochineal-Bold "AutoEnc_2bdexd3bheqplp2o6xukmhzera ReEncodeFont" <[coch_2bdexd.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tosf-swash-ot1 Cochineal-Bold "AutoEnc_alu2zhctgc6e2jtnsb2xah2s7d ReEncodeFont" <[coch_alu2zh.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tosf-swash-t1--base Cochineal-Bold "AutoEnc_7dsvymb2elp4lhhlisrdlapfng ReEncodeFont" <[coch_7dsvym.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tosf-ts1--base Cochineal-Bold "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-Bold.pfb
-Cochineal-Bold-dnom-ly1--base Cochineal-Bold "AutoEnc_rt47ufp67eamu2lpwwwilkt7bc ReEncodeFont" <[coch_rt47uf.enc <Cochineal-Bold.pfb
-Cochineal-Bold-dnom-ot1 Cochineal-Bold "AutoEnc_j5n6tqfmfcjogmntrdb6k7zwrc ReEncodeFont" <[coch_j5n6tq.enc <Cochineal-Bold.pfb
-Cochineal-Bold-dnom-t1--base Cochineal-Bold "AutoEnc_l35a4cqz5d6bagoehhtwfmasga ReEncodeFont" <[coch_l35a4c.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-ly1--base Cochineal-Bold "AutoEnc_kdbvpjkfbhagbkmjybnta65fib ReEncodeFont" <[coch_kdbvpj.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-ot1 Cochineal-Bold "AutoEnc_ygzcii43eqiw6k2asz2ejehvjg ReEncodeFont" <[coch_ygzcii.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-t1--base Cochineal-Bold "AutoEnc_mqh25steqi22gkdynmjpbb3jvd ReEncodeFont" <[coch_mqh25s.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-sc-ly1--base Cochineal-Bold "AutoEnc_pauxlorik63pb4y4uyiln5hklg ReEncodeFont" <[coch_pauxlo.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-sc-ot1--base Cochineal-Bold "AutoEnc_boduzws2hdfkr66mvcshvvri5e ReEncodeFont" <[coch_boduzw.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-sc-t1--base Cochineal-Bold "AutoEnc_c4bkpi3savowvqs5e673sjzvka ReEncodeFont" <[coch_c4bkpi.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-swash-ly1--base Cochineal-Bold "AutoEnc_bebzcdw5tofjbeemat4lxq42we ReEncodeFont" <[coch_bebzcd.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-swash-ot1 Cochineal-Bold "AutoEnc_e3g2vupqmfkvq73zoliw5gbd2g ReEncodeFont" <[coch_e3g2vu.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-swash-t1--base Cochineal-Bold "AutoEnc_aonoagx5km2dirxcekh7la3hwb ReEncodeFont" <[coch_aonoag.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tlf-ly1--base Cochineal-Bold "AutoEnc_pzuqaavtjtpeu6knd5tj2vapkd ReEncodeFont" <[coch_pzuqaa.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tlf-ot1 Cochineal-Bold "AutoEnc_3uwymqsd6ycnc2tcu2qfe5itkh ReEncodeFont" <[coch_3uwymq.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tlf-t1--base Cochineal-Bold "AutoEnc_5iuvneucbvorso2wvejyt7lv7b ReEncodeFont" <[coch_5iuvne.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tlf-sc-ly1--base Cochineal-Bold "AutoEnc_4w37pe64v3eq3yxyufs2ifskka ReEncodeFont" <[coch_4w37pe.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tlf-sc-ot1--base Cochineal-Bold "AutoEnc_nxryuqgiyzui7oedcyuyf2se5c ReEncodeFont" <[coch_nxryuq.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tlf-sc-ot1--base Cochineal-Bold "AutoEnc_njkfuiag3gs4afp47yvykk76lg ReEncodeFont" <[coch_njkfui.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tlf-sc-t1--base Cochineal-Bold "AutoEnc_l5f66w6zasibyyrcc7mimjdw4c ReEncodeFont" <[coch_l5f66w.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tlf-swash-ly1--base Cochineal-Bold "AutoEnc_jwtej46ikg63o2bjthb2ofxtxe ReEncodeFont" <[coch_jwtej4.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tlf-swash-ot1 Cochineal-Bold "AutoEnc_2gcnb2qqzo2t7amd4qeyt2gflf ReEncodeFont" <[coch_2gcnb2.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tlf-swash-t1--base Cochineal-Bold "AutoEnc_xaqz74ppfrzr3zyulmndubiqab ReEncodeFont" <[coch_xaqz74.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tlf-ts1--base Cochineal-Bold "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-Bold.pfb
 Cochineal-Bold-osf-ly1--base Cochineal-Bold "AutoEnc_7n5ozwifmjdqmta6eqqsurutme ReEncodeFont" <[coch_7n5ozw.enc <Cochineal-Bold.pfb
 Cochineal-Bold-osf-ot1 Cochineal-Bold "AutoEnc_szq67c32xasehfpojpg3rdfsug ReEncodeFont" <[coch_szq67c.enc <Cochineal-Bold.pfb
 Cochineal-Bold-osf-t1--base Cochineal-Bold "AutoEnc_aiszvioatmgagbut46lhbf6ebh ReEncodeFont" <[coch_aiszvi.enc <Cochineal-Bold.pfb
 Cochineal-Bold-osf-sc-ly1--base Cochineal-Bold "AutoEnc_7wf6546ucxuem4rfi6fq3qv6cg ReEncodeFont" <[coch_7wf654.enc <Cochineal-Bold.pfb
-Cochineal-Bold-osf-sc-ot1--base Cochineal-Bold "AutoEnc_irjahvsqtr56xb5ljosnqymrfb ReEncodeFont" <[coch_irjahv.enc <Cochineal-Bold.pfb
+Cochineal-Bold-osf-sc-ot1--base Cochineal-Bold "AutoEnc_52z6yf4a2bosnhm57gn33ncjtc ReEncodeFont" <[coch_52z6yf.enc <Cochineal-Bold.pfb
 Cochineal-Bold-osf-sc-t1--base Cochineal-Bold "AutoEnc_nwjjp7jze6vwsjvylr6ioz4cnd ReEncodeFont" <[coch_nwjjp7.enc <Cochineal-Bold.pfb
 Cochineal-Bold-osf-swash-ly1--base Cochineal-Bold "AutoEnc_z5w3bg7nzfmfekongww5rmwfvb ReEncodeFont" <[coch_z5w3bg.enc <Cochineal-Bold.pfb
 Cochineal-Bold-osf-swash-ot1 Cochineal-Bold "AutoEnc_t6bbzldy32fumigptwyfjpktpf ReEncodeFont" <[coch_t6bbzl.enc <Cochineal-Bold.pfb
 Cochineal-Bold-osf-swash-t1--base Cochineal-Bold "AutoEnc_fiecpaq43umhqpg7ygx2qunm5h ReEncodeFont" <[coch_fiecpa.enc <Cochineal-Bold.pfb
-Cochineal-Bold-osf-ts1--base Cochineal-Bold "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-Bold.pfb
+Cochineal-Bold-dnom-ly1--base Cochineal-Bold "AutoEnc_rt47ufp67eamu2lpwwwilkt7bc ReEncodeFont" <[coch_rt47uf.enc <Cochineal-Bold.pfb
+Cochineal-Bold-dnom-ot1 Cochineal-Bold "AutoEnc_j5n6tqfmfcjogmntrdb6k7zwrc ReEncodeFont" <[coch_j5n6tq.enc <Cochineal-Bold.pfb
+Cochineal-Bold-dnom-t1--base Cochineal-Bold "AutoEnc_l35a4cqz5d6bagoehhtwfmasga ReEncodeFont" <[coch_l35a4c.enc <Cochineal-Bold.pfb
 Cochineal-Bold-inf-ly1--base Cochineal-Bold "AutoEnc_zi2reucvqtgwgoqzrojvcpsqbe ReEncodeFont" <[coch_zi2reu.enc <Cochineal-Bold.pfb
 Cochineal-Bold-inf-ot1 Cochineal-Bold "AutoEnc_oxg6eqosr2a4bxceykpqbjm7jf ReEncodeFont" <[coch_oxg6eq.enc <Cochineal-Bold.pfb
 Cochineal-Bold-inf-t1--base Cochineal-Bold "AutoEnc_nxl6ldkbrawbju6gbw2dvb23hd ReEncodeFont" <[coch_nxl6ld.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-ly1--base Cochineal-Bold "AutoEnc_kdbvpjkfbhagbkmjybnta65fib ReEncodeFont" <[coch_kdbvpj.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-ot1 Cochineal-Bold "AutoEnc_ygzcii43eqiw6k2asz2ejehvjg ReEncodeFont" <[coch_ygzcii.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-t1--base Cochineal-Bold "AutoEnc_mqh25steqi22gkdynmjpbb3jvd ReEncodeFont" <[coch_mqh25s.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-sc-ly1--base Cochineal-Bold "AutoEnc_pauxlorik63pb4y4uyiln5hklg ReEncodeFont" <[coch_pauxlo.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-sc-ot1--base Cochineal-Bold "AutoEnc_un2dh6jhgg6fp4xrax3n6r2hsa ReEncodeFont" <[coch_un2dh6.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-sc-t1--base Cochineal-Bold "AutoEnc_c4bkpi3savowvqs5e673sjzvka ReEncodeFont" <[coch_c4bkpi.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-swash-ly1--base Cochineal-Bold "AutoEnc_bebzcdw5tofjbeemat4lxq42we ReEncodeFont" <[coch_bebzcd.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-swash-ot1 Cochineal-Bold "AutoEnc_e3g2vupqmfkvq73zoliw5gbd2g ReEncodeFont" <[coch_e3g2vu.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-swash-t1--base Cochineal-Bold "AutoEnc_aonoagx5km2dirxcekh7la3hwb ReEncodeFont" <[coch_aonoag.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-ts1--base Cochineal-Bold "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-Bold.pfb
 Cochineal-BoldItalic-sup-ly1--base Cochineal-BoldItalic "AutoEnc_2lm36bljrtfzfgm3j66m43i3nd ReEncodeFont" <[coch_2lm36b.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-sup-ot1 Cochineal-BoldItalic "AutoEnc_yrma2dtehmfob7exx2dpdhiwsa ReEncodeFont" <[coch_yrma2d.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-sup-t1--base Cochineal-BoldItalic "AutoEnc_f6gyh3en4btxeafjq2sk35t2de ReEncodeFont" <[coch_f6gyh3.enc <Cochineal-BoldItalic.pfb
@@ -56,48 +52,44 @@ Cochineal-BoldItalic-tosf-ly1--base Cochineal-BoldItalic "AutoEnc_ye47ub6xzugrzd
 Cochineal-BoldItalic-tosf-ot1 Cochineal-BoldItalic "AutoEnc_kj462mzbm275orhz5jkw4b43kf ReEncodeFont" <[coch_kj462m.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-tosf-t1--base Cochineal-BoldItalic "AutoEnc_uijgehseingifcm6vqtlieytpg ReEncodeFont" <[coch_uijgeh.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-tosf-sc-ly1--base Cochineal-BoldItalic "AutoEnc_yfllcfgb4lhxazxknesw4gaslf ReEncodeFont" <[coch_yfllcf.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tosf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_7iao2dniakbyfe3c67e5nvit2h ReEncodeFont" <[coch_7iao2d.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tosf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_zzhtpfwiy75x3od2a5shqbhhoh ReEncodeFont" <[coch_zzhtpf.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-tosf-sc-t1--base Cochineal-BoldItalic "AutoEnc_a2bs3vm2rjznnueklgt6o373sb ReEncodeFont" <[coch_a2bs3v.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-tosf-swash-ly1--base Cochineal-BoldItalic "AutoEnc_2bdexd3bheqplp2o6xukmhzera ReEncodeFont" <[coch_2bdexd.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-tosf-swash-ot1 Cochineal-BoldItalic "AutoEnc_alu2zhctgc6e2jtnsb2xah2s7d ReEncodeFont" <[coch_alu2zh.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-tosf-swash-t1--base Cochineal-BoldItalic "AutoEnc_7dsvymb2elp4lhhlisrdlapfng ReEncodeFont" <[coch_7dsvym.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tosf-ts1--base Cochineal-BoldItalic "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-dnom-ly1--base Cochineal-BoldItalic "AutoEnc_rt47ufp67eamu2lpwwwilkt7bc ReEncodeFont" <[coch_rt47uf.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-dnom-ot1 Cochineal-BoldItalic "AutoEnc_j5n6tqfmfcjogmntrdb6k7zwrc ReEncodeFont" <[coch_j5n6tq.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-dnom-t1--base Cochineal-BoldItalic "AutoEnc_l35a4cqz5d6bagoehhtwfmasga ReEncodeFont" <[coch_l35a4c.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-ly1--base Cochineal-BoldItalic "AutoEnc_kdbvpjkfbhagbkmjybnta65fib ReEncodeFont" <[coch_kdbvpj.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-ot1 Cochineal-BoldItalic "AutoEnc_ygzcii43eqiw6k2asz2ejehvjg ReEncodeFont" <[coch_ygzcii.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-t1--base Cochineal-BoldItalic "AutoEnc_mqh25steqi22gkdynmjpbb3jvd ReEncodeFont" <[coch_mqh25s.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-sc-ly1--base Cochineal-BoldItalic "AutoEnc_2hlaypvjknmdmdwlmdelewm4ph ReEncodeFont" <[coch_2hlayp.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_sm4onpe2ynvowwuxdlbbjm746c ReEncodeFont" <[coch_sm4onp.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-sc-t1--base Cochineal-BoldItalic "AutoEnc_mlajwisaovo3plx2ve7fuftjdg ReEncodeFont" <[coch_mlajwi.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-swash-ly1--base Cochineal-BoldItalic "AutoEnc_bebzcdw5tofjbeemat4lxq42we ReEncodeFont" <[coch_bebzcd.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-swash-ot1 Cochineal-BoldItalic "AutoEnc_e3g2vupqmfkvq73zoliw5gbd2g ReEncodeFont" <[coch_e3g2vu.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-swash-t1--base Cochineal-BoldItalic "AutoEnc_aonoagx5km2dirxcekh7la3hwb ReEncodeFont" <[coch_aonoag.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-tlf-ly1--base Cochineal-BoldItalic "AutoEnc_pzuqaavtjtpeu6knd5tj2vapkd ReEncodeFont" <[coch_pzuqaa.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-tlf-ot1 Cochineal-BoldItalic "AutoEnc_3uwymqsd6ycnc2tcu2qfe5itkh ReEncodeFont" <[coch_3uwymq.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-tlf-t1--base Cochineal-BoldItalic "AutoEnc_5iuvneucbvorso2wvejyt7lv7b ReEncodeFont" <[coch_5iuvne.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-tlf-sc-ly1--base Cochineal-BoldItalic "AutoEnc_3knxwxu4r25ng4o3o7xjzxfu5e ReEncodeFont" <[coch_3knxwx.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tlf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_5dxihil3gosz2b753ewpmuje6e ReEncodeFont" <[coch_5dxihi.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tlf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_iqe3vyx5o45deicpgjoyggboqd ReEncodeFont" <[coch_iqe3vy.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-tlf-sc-t1--base Cochineal-BoldItalic "AutoEnc_qxsaxpv7mkjqy44m7dytww4x4g ReEncodeFont" <[coch_qxsaxp.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-tlf-swash-ly1--base Cochineal-BoldItalic "AutoEnc_jwtej46ikg63o2bjthb2ofxtxe ReEncodeFont" <[coch_jwtej4.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-tlf-swash-ot1 Cochineal-BoldItalic "AutoEnc_2gcnb2qqzo2t7amd4qeyt2gflf ReEncodeFont" <[coch_2gcnb2.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-tlf-swash-t1--base Cochineal-BoldItalic "AutoEnc_xaqz74ppfrzr3zyulmndubiqab ReEncodeFont" <[coch_xaqz74.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tlf-ts1--base Cochineal-BoldItalic "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-osf-ly1--base Cochineal-BoldItalic "AutoEnc_7n5ozwifmjdqmta6eqqsurutme ReEncodeFont" <[coch_7n5ozw.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-osf-ot1 Cochineal-BoldItalic "AutoEnc_szq67c32xasehfpojpg3rdfsug ReEncodeFont" <[coch_szq67c.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-osf-t1--base Cochineal-BoldItalic "AutoEnc_aiszvioatmgagbut46lhbf6ebh ReEncodeFont" <[coch_aiszvi.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-osf-sc-ly1--base Cochineal-BoldItalic "AutoEnc_eyy6oetl7xvgw5z27q5rks4a5a ReEncodeFont" <[coch_eyy6oe.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-osf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_3ckcz6agums4m3r5kvdmiodwaa ReEncodeFont" <[coch_3ckcz6.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-osf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_kolx6rcy3u5md5z52cdfktgrzh ReEncodeFont" <[coch_kolx6r.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-osf-sc-t1--base Cochineal-BoldItalic "AutoEnc_bhawimte6yf2vqtvpcc2c27woa ReEncodeFont" <[coch_bhawim.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-osf-swash-ly1--base Cochineal-BoldItalic "AutoEnc_z5w3bg7nzfmfekongww5rmwfvb ReEncodeFont" <[coch_z5w3bg.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-osf-swash-ot1 Cochineal-BoldItalic "AutoEnc_t6bbzldy32fumigptwyfjpktpf ReEncodeFont" <[coch_t6bbzl.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-osf-swash-t1--base Cochineal-BoldItalic "AutoEnc_fiecpaq43umhqpg7ygx2qunm5h ReEncodeFont" <[coch_fiecpa.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-osf-ts1--base Cochineal-BoldItalic "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-dnom-ly1--base Cochineal-BoldItalic "AutoEnc_rt47ufp67eamu2lpwwwilkt7bc ReEncodeFont" <[coch_rt47uf.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-dnom-ot1 Cochineal-BoldItalic "AutoEnc_j5n6tqfmfcjogmntrdb6k7zwrc ReEncodeFont" <[coch_j5n6tq.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-dnom-t1--base Cochineal-BoldItalic "AutoEnc_l35a4cqz5d6bagoehhtwfmasga ReEncodeFont" <[coch_l35a4c.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-inf-ly1--base Cochineal-BoldItalic "AutoEnc_zi2reucvqtgwgoqzrojvcpsqbe ReEncodeFont" <[coch_zi2reu.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-inf-ot1 Cochineal-BoldItalic "AutoEnc_oxg6eqosr2a4bxceykpqbjm7jf ReEncodeFont" <[coch_oxg6eq.enc <Cochineal-BoldItalic.pfb
 Cochineal-BoldItalic-inf-t1--base Cochineal-BoldItalic "AutoEnc_nxl6ldkbrawbju6gbw2dvb23hd ReEncodeFont" <[coch_nxl6ld.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-ly1--base Cochineal-BoldItalic "AutoEnc_kdbvpjkfbhagbkmjybnta65fib ReEncodeFont" <[coch_kdbvpj.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-ot1 Cochineal-BoldItalic "AutoEnc_ygzcii43eqiw6k2asz2ejehvjg ReEncodeFont" <[coch_ygzcii.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-t1--base Cochineal-BoldItalic "AutoEnc_mqh25steqi22gkdynmjpbb3jvd ReEncodeFont" <[coch_mqh25s.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-sc-ly1--base Cochineal-BoldItalic "AutoEnc_2hlaypvjknmdmdwlmdelewm4ph ReEncodeFont" <[coch_2hlayp.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_avobnlxicnmtwub47b62mqsysd ReEncodeFont" <[coch_avobnl.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-sc-t1--base Cochineal-BoldItalic "AutoEnc_mlajwisaovo3plx2ve7fuftjdg ReEncodeFont" <[coch_mlajwi.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-swash-ly1--base Cochineal-BoldItalic "AutoEnc_bebzcdw5tofjbeemat4lxq42we ReEncodeFont" <[coch_bebzcd.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-swash-ot1 Cochineal-BoldItalic "AutoEnc_e3g2vupqmfkvq73zoliw5gbd2g ReEncodeFont" <[coch_e3g2vu.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-swash-t1--base Cochineal-BoldItalic "AutoEnc_aonoagx5km2dirxcekh7la3hwb ReEncodeFont" <[coch_aonoag.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-ts1--base Cochineal-BoldItalic "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-BoldItalic.pfb
 Cochineal-Italic-sup-ly1--base Cochineal-Italic "AutoEnc_oz3bqnjk6mmdxduv5yldlglrxe ReEncodeFont" <[coch_oz3bqn.enc <Cochineal-Italic.pfb
 Cochineal-Italic-sup-ot1 Cochineal-Italic "AutoEnc_wbw3s6kt7a3nulrxt3rgostbla ReEncodeFont" <[coch_wbw3s6.enc <Cochineal-Italic.pfb
 Cochineal-Italic-sup-t1--base Cochineal-Italic "AutoEnc_f6gyh3en4btxeafjq2sk35t2de ReEncodeFont" <[coch_f6gyh3.enc <Cochineal-Italic.pfb
@@ -105,48 +97,44 @@ Cochineal-Italic-tosf-ly1--base Cochineal-Italic "AutoEnc_ptok33kbty7wonypumq2sj
 Cochineal-Italic-tosf-ot1 Cochineal-Italic "AutoEnc_eecs2oia4uua7j7dwgorxlswef ReEncodeFont" <[coch_eecs2o.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tosf-t1--base Cochineal-Italic "AutoEnc_uijgehseingifcm6vqtlieytpg ReEncodeFont" <[coch_uijgeh.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tosf-sc-ly1--base Cochineal-Italic "AutoEnc_atrkq46e4ea7b6gr32p6d6wbpe ReEncodeFont" <[coch_atrkq4.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-sc-ot1--base Cochineal-Italic "AutoEnc_5g7rclcrr5zkeag2ydoawrqhqa ReEncodeFont" <[coch_5g7rcl.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tosf-sc-ot1--base Cochineal-Italic "AutoEnc_qdmrmjuakgjvktxdnmhmdsq2td ReEncodeFont" <[coch_qdmrmj.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tosf-sc-t1--base Cochineal-Italic "AutoEnc_dgjfknhqalenbw2pipatvxjn5b ReEncodeFont" <[coch_dgjfkn.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tosf-swash-ly1--base Cochineal-Italic "AutoEnc_6n7xb4k65uam6j32wkkxchqjke ReEncodeFont" <[coch_6n7xb4.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tosf-swash-ot1 Cochineal-Italic "AutoEnc_wxpvz34f7sooyvb2qk33esqjib ReEncodeFont" <[coch_wxpvz3.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tosf-swash-t1--base Cochineal-Italic "AutoEnc_7dsvymb2elp4lhhlisrdlapfng ReEncodeFont" <[coch_7dsvym.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-ts1--base Cochineal-Italic "AutoEnc_vrrrznqlwbcw5dtu6h7v66ufnh ReEncodeFont" <[coch_vrrrzn.enc <Cochineal-Italic.pfb
-Cochineal-Italic-dnom-ly1--base Cochineal-Italic "AutoEnc_iatrlrrvj2a7g6mmbulciuxg7g ReEncodeFont" <[coch_iatrlr.enc <Cochineal-Italic.pfb
-Cochineal-Italic-dnom-ot1 Cochineal-Italic "AutoEnc_lbfs4waeh3n3wb64wvmynmaede ReEncodeFont" <[coch_lbfs4w.enc <Cochineal-Italic.pfb
-Cochineal-Italic-dnom-t1--base Cochineal-Italic "AutoEnc_l35a4cqz5d6bagoehhtwfmasga ReEncodeFont" <[coch_l35a4c.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-ly1--base Cochineal-Italic "AutoEnc_gbdy7gnwiokzptgmeoou4ywn3a ReEncodeFont" <[coch_gbdy7g.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-ot1 Cochineal-Italic "AutoEnc_hd573sojpnzhshqzj7xo6j25ja ReEncodeFont" <[coch_hd573s.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-t1--base Cochineal-Italic "AutoEnc_mqh25steqi22gkdynmjpbb3jvd ReEncodeFont" <[coch_mqh25s.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-sc-ly1--base Cochineal-Italic "AutoEnc_4kirwgvpfcoydkjgxkwsln6hdb ReEncodeFont" <[coch_4kirwg.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-sc-ot1--base Cochineal-Italic "AutoEnc_lnpsyizi5ugmjjegxodsbkqhwd ReEncodeFont" <[coch_lnpsyi.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-sc-t1--base Cochineal-Italic "AutoEnc_xx26vs2xbht3ltk5dl2ifojy2e ReEncodeFont" <[coch_xx26vs.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-swash-ly1--base Cochineal-Italic "AutoEnc_tpli6v2hu6noikpswpwqhuwcog ReEncodeFont" <[coch_tpli6v.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-swash-ot1 Cochineal-Italic "AutoEnc_isal6ugo5yoko6jknukdppi4lg ReEncodeFont" <[coch_isal6u.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-swash-t1--base Cochineal-Italic "AutoEnc_aonoagx5km2dirxcekh7la3hwb ReEncodeFont" <[coch_aonoag.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tlf-ly1--base Cochineal-Italic "AutoEnc_3pp4wv2uj6mmdoq3sg7cdfphkf ReEncodeFont" <[coch_3pp4wv.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tlf-ot1 Cochineal-Italic "AutoEnc_6samag633x7qv5delozyb3m3nd ReEncodeFont" <[coch_6samag.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tlf-t1--base Cochineal-Italic "AutoEnc_5iuvneucbvorso2wvejyt7lv7b ReEncodeFont" <[coch_5iuvne.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tlf-sc-ly1--base Cochineal-Italic "AutoEnc_lmiqvaclzuykdqmvvs5b32qitd ReEncodeFont" <[coch_lmiqva.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-sc-ot1--base Cochineal-Italic "AutoEnc_auhtqrrsun2sgdw5eyoygubv5g ReEncodeFont" <[coch_auhtqr.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tlf-sc-ot1--base Cochineal-Italic "AutoEnc_jzhnnr2ozetsvfi6ebgmvbxcna ReEncodeFont" <[coch_jzhnnr.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tlf-sc-t1--base Cochineal-Italic "AutoEnc_ixgauzjoc5rxzvxhp5y75vym6e ReEncodeFont" <[coch_ixgauz.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tlf-swash-ly1--base Cochineal-Italic "AutoEnc_ayubbyqyvxmd7caho34ukudcqf ReEncodeFont" <[coch_ayubby.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tlf-swash-ot1 Cochineal-Italic "AutoEnc_tx56nexhp4egj56rj7sczo4kaf ReEncodeFont" <[coch_tx56ne.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tlf-swash-t1--base Cochineal-Italic "AutoEnc_xaqz74ppfrzr3zyulmndubiqab ReEncodeFont" <[coch_xaqz74.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-ts1--base Cochineal-Italic "AutoEnc_vrrrznqlwbcw5dtu6h7v66ufnh ReEncodeFont" <[coch_vrrrzn.enc <Cochineal-Italic.pfb
 Cochineal-Italic-osf-ly1--base Cochineal-Italic "AutoEnc_zd4idy26fkltx273purfquv3lc ReEncodeFont" <[coch_zd4idy.enc <Cochineal-Italic.pfb
 Cochineal-Italic-osf-ot1 Cochineal-Italic "AutoEnc_pyiqqvr6zjl5tgrvwyf3ahtrlf ReEncodeFont" <[coch_pyiqqv.enc <Cochineal-Italic.pfb
 Cochineal-Italic-osf-t1--base Cochineal-Italic "AutoEnc_aiszvioatmgagbut46lhbf6ebh ReEncodeFont" <[coch_aiszvi.enc <Cochineal-Italic.pfb
 Cochineal-Italic-osf-sc-ly1--base Cochineal-Italic "AutoEnc_zs6x3rg46l4kvjmvgwv2ahrevh ReEncodeFont" <[coch_zs6x3r.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-sc-ot1--base Cochineal-Italic "AutoEnc_72apy2krs65x6sfwplhei5hiad ReEncodeFont" <[coch_72apy2.enc <Cochineal-Italic.pfb
+Cochineal-Italic-osf-sc-ot1--base Cochineal-Italic "AutoEnc_xo7mp7fyjsp5uhupmjpregpfka ReEncodeFont" <[coch_xo7mp7.enc <Cochineal-Italic.pfb
 Cochineal-Italic-osf-sc-t1--base Cochineal-Italic "AutoEnc_arhfdyx6yjijj2nyyirhoswr2g ReEncodeFont" <[coch_arhfdy.enc <Cochineal-Italic.pfb
 Cochineal-Italic-osf-swash-ly1--base Cochineal-Italic "AutoEnc_ankljjoqw6lfcrqpceyasnkk5e ReEncodeFont" <[coch_ankljj.enc <Cochineal-Italic.pfb
 Cochineal-Italic-osf-swash-ot1 Cochineal-Italic "AutoEnc_7ylujtvhkdkummpgarkbptl2zf ReEncodeFont" <[coch_7ylujt.enc <Cochineal-Italic.pfb
 Cochineal-Italic-osf-swash-t1--base Cochineal-Italic "AutoEnc_fiecpaq43umhqpg7ygx2qunm5h ReEncodeFont" <[coch_fiecpa.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-ts1--base Cochineal-Italic "AutoEnc_vrrrznqlwbcw5dtu6h7v66ufnh ReEncodeFont" <[coch_vrrrzn.enc <Cochineal-Italic.pfb
+Cochineal-Italic-dnom-ly1--base Cochineal-Italic "AutoEnc_iatrlrrvj2a7g6mmbulciuxg7g ReEncodeFont" <[coch_iatrlr.enc <Cochineal-Italic.pfb
+Cochineal-Italic-dnom-ot1 Cochineal-Italic "AutoEnc_lbfs4waeh3n3wb64wvmynmaede ReEncodeFont" <[coch_lbfs4w.enc <Cochineal-Italic.pfb
+Cochineal-Italic-dnom-t1--base Cochineal-Italic "AutoEnc_l35a4cqz5d6bagoehhtwfmasga ReEncodeFont" <[coch_l35a4c.enc <Cochineal-Italic.pfb
 Cochineal-Italic-inf-ly1--base Cochineal-Italic "AutoEnc_ulikgonxp7foe5n72ilqcte4xa ReEncodeFont" <[coch_ulikgo.enc <Cochineal-Italic.pfb
 Cochineal-Italic-inf-ot1 Cochineal-Italic "AutoEnc_gujmrcyzp7e3vvbkcuesnl4gxb ReEncodeFont" <[coch_gujmrc.enc <Cochineal-Italic.pfb
 Cochineal-Italic-inf-t1--base Cochineal-Italic "AutoEnc_nxl6ldkbrawbju6gbw2dvb23hd ReEncodeFont" <[coch_nxl6ld.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-ly1--base Cochineal-Italic "AutoEnc_gbdy7gnwiokzptgmeoou4ywn3a ReEncodeFont" <[coch_gbdy7g.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-ot1 Cochineal-Italic "AutoEnc_hd573sojpnzhshqzj7xo6j25ja ReEncodeFont" <[coch_hd573s.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-t1--base Cochineal-Italic "AutoEnc_mqh25steqi22gkdynmjpbb3jvd ReEncodeFont" <[coch_mqh25s.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-sc-ly1--base Cochineal-Italic "AutoEnc_4kirwgvpfcoydkjgxkwsln6hdb ReEncodeFont" <[coch_4kirwg.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-sc-ot1--base Cochineal-Italic "AutoEnc_wtyigcd5mdigtin22wb6owbswh ReEncodeFont" <[coch_wtyigc.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-sc-t1--base Cochineal-Italic "AutoEnc_xx26vs2xbht3ltk5dl2ifojy2e ReEncodeFont" <[coch_xx26vs.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-swash-ly1--base Cochineal-Italic "AutoEnc_tpli6v2hu6noikpswpwqhuwcog ReEncodeFont" <[coch_tpli6v.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-swash-ot1 Cochineal-Italic "AutoEnc_isal6ugo5yoko6jknukdppi4lg ReEncodeFont" <[coch_isal6u.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-swash-t1--base Cochineal-Italic "AutoEnc_aonoagx5km2dirxcekh7la3hwb ReEncodeFont" <[coch_aonoag.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-ts1--base Cochineal-Italic "AutoEnc_vrrrznqlwbcw5dtu6h7v66ufnh ReEncodeFont" <[coch_vrrrzn.enc <Cochineal-Italic.pfb
 Cochineal-Roman-sup-ly1 Cochineal-Roman "AutoEnc_qv7cwznncg5q244orfktskrhhd ReEncodeFont" <[coch_qv7cwz.enc <Cochineal-Roman.pfb
 Cochineal-Roman-sup-ot1 Cochineal-Roman "AutoEnc_r3xgod5t3c7ttynyndipgkbmcg ReEncodeFont" <[coch_r3xgod.enc <Cochineal-Roman.pfb
 Cochineal-Roman-sup-t1--base Cochineal-Roman "AutoEnc_hskcu3xl333t3y34htyugj4dyg ReEncodeFont" <[coch_hskcu3.enc <Cochineal-Roman.pfb
@@ -154,48 +142,44 @@ Cochineal-Roman-tosf-ly1 Cochineal-Roman "AutoEnc_r4azz6amdntt6lspyzh3otljpe ReE
 Cochineal-Roman-tosf-ot1 Cochineal-Roman "AutoEnc_i4iossdmew24jyu7dmrvxalh3a ReEncodeFont" <[coch_i4ioss.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tosf-t1--base Cochineal-Roman "AutoEnc_zwlvmjlsfprbhixyd7yelmczwg ReEncodeFont" <[coch_zwlvmj.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tosf-sc-ly1--base Cochineal-Roman "AutoEnc_mxqklui2cz3uivj2jkxxoouk7c ReEncodeFont" <[coch_mxqklu.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tosf-sc-ot1--base Cochineal-Roman "AutoEnc_j7segjn7gjh4bgkgusrq3evpge ReEncodeFont" <[coch_j7segj.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tosf-sc-ot1--base Cochineal-Roman "AutoEnc_fld3r2fueuuouim2zjiemdqhyb ReEncodeFont" <[coch_fld3r2.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tosf-sc-t1--base Cochineal-Roman "AutoEnc_raqkati653noovxlrl4iw35cbe ReEncodeFont" <[coch_raqkat.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tosf-swash-ly1 Cochineal-Roman "AutoEnc_ksvfeytniyxjikxj54uvcpjp3a ReEncodeFont" <[coch_ksvfey.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tosf-swash-ot1 Cochineal-Roman "AutoEnc_cipscccaapzswuamqjr3qamnhd ReEncodeFont" <[coch_cipscc.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tosf-swash-t1--base Cochineal-Roman "AutoEnc_ernfwgkcnnskrvyw626vfei46g ReEncodeFont" <[coch_ernfwg.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tosf-ts1--base Cochineal-Roman "AutoEnc_7uj7iokoaokbvpxwp2bnnoqsbe ReEncodeFont" <[coch_7uj7io.enc <Cochineal-Roman.pfb
-Cochineal-Roman-dnom-ly1 Cochineal-Roman "AutoEnc_5v3q2ik7vctzjtjmp5wezb2t5c ReEncodeFont" <[coch_5v3q2i.enc <Cochineal-Roman.pfb
-Cochineal-Roman-dnom-ot1 Cochineal-Roman "AutoEnc_n2swpvb2gl2y7dzhwt7clphv2f ReEncodeFont" <[coch_n2swpv.enc <Cochineal-Roman.pfb
-Cochineal-Roman-dnom-t1--base Cochineal-Roman "AutoEnc_r5kifak6soks474jf7igfqredd ReEncodeFont" <[coch_r5kifa.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-ly1 Cochineal-Roman "AutoEnc_v7xcotr4xxp5wcd7hnhhlx55vg ReEncodeFont" <[coch_v7xcot.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-ot1 Cochineal-Roman "AutoEnc_4wsvu7vr6nqqjcfnf66hpqdaga ReEncodeFont" <[coch_4wsvu7.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-t1--base Cochineal-Roman "AutoEnc_327erotlfdchg5e3n2ycuhf4og ReEncodeFont" <[coch_327ero.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-sc-ly1--base Cochineal-Roman "AutoEnc_faomqbtlu355bhkduaafwwngfb ReEncodeFont" <[coch_faomqb.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-sc-ot1--base Cochineal-Roman "AutoEnc_v735attflxm7f2lo3ftw7qcfoe ReEncodeFont" <[coch_v735at.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-sc-t1--base Cochineal-Roman "AutoEnc_yidn7lfgcnx5w43k2nkmi2ukbg ReEncodeFont" <[coch_yidn7l.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-swash-ly1 Cochineal-Roman "AutoEnc_3uurxv4dydpgh6ogolzuygq4ug ReEncodeFont" <[coch_3uurxv.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-swash-ot1 Cochineal-Roman "AutoEnc_5rx6tx4apyvc3kpanj2g75rz5b ReEncodeFont" <[coch_5rx6tx.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-swash-t1--base Cochineal-Roman "AutoEnc_fuez2loyeq3otooi5bad5do6la ReEncodeFont" <[coch_fuez2l.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tlf-ly1 Cochineal-Roman "AutoEnc_rqvs5rem3bjendrk6xuapcmrwd ReEncodeFont" <[coch_rqvs5r.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tlf-ot1 Cochineal-Roman "AutoEnc_yz65whj6nmwootqn46uy5id3yg ReEncodeFont" <[coch_yz65wh.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tlf-t1--base Cochineal-Roman "AutoEnc_k3hebrtvx4pjtlknlwwhfg255f ReEncodeFont" <[coch_k3hebr.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tlf-sc-ly1--base Cochineal-Roman "AutoEnc_ume3xsuukmgrmq2xd5yhj3majc ReEncodeFont" <[coch_ume3xs.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tlf-sc-ot1--base Cochineal-Roman "AutoEnc_gcgtqoqyz6fclnkw6f4brrkasb ReEncodeFont" <[coch_gcgtqo.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tlf-sc-ot1--base Cochineal-Roman "AutoEnc_fh7c2n3ya2hzlbyqwuodrfjgte ReEncodeFont" <[coch_fh7c2n.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tlf-sc-t1--base Cochineal-Roman "AutoEnc_tdpwgaxkyu2hfkjmol3tzosnfa ReEncodeFont" <[coch_tdpwga.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tlf-swash-ly1 Cochineal-Roman "AutoEnc_gpocnfjk3xfuihw5b67t2ntt7e ReEncodeFont" <[coch_gpocnf.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tlf-swash-ot1 Cochineal-Roman "AutoEnc_vbr2z2ywe5ctcbqigfobg4zzzf ReEncodeFont" <[coch_vbr2z2.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tlf-swash-t1--base Cochineal-Roman "AutoEnc_4pifhx7b5j5uxjxeilzq6kgx2a ReEncodeFont" <[coch_4pifhx.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tlf-ts1--base Cochineal-Roman "AutoEnc_7uj7iokoaokbvpxwp2bnnoqsbe ReEncodeFont" <[coch_7uj7io.enc <Cochineal-Roman.pfb
 Cochineal-Roman-osf-ly1 Cochineal-Roman "AutoEnc_fhk6mzqd6yu4to5ncysyg2z7re ReEncodeFont" <[coch_fhk6mz.enc <Cochineal-Roman.pfb
 Cochineal-Roman-osf-ot1 Cochineal-Roman "AutoEnc_sk33hx2ctkkfhfdub4kls2f6yb ReEncodeFont" <[coch_sk33hx.enc <Cochineal-Roman.pfb
 Cochineal-Roman-osf-t1--base Cochineal-Roman "AutoEnc_5ye6emtshbvxfaac7ctanvfiwd ReEncodeFont" <[coch_5ye6em.enc <Cochineal-Roman.pfb
 Cochineal-Roman-osf-sc-ly1--base Cochineal-Roman "AutoEnc_nzj7ho6yuclyfo2xkkbajiyf3g ReEncodeFont" <[coch_nzj7ho.enc <Cochineal-Roman.pfb
-Cochineal-Roman-osf-sc-ot1--base Cochineal-Roman "AutoEnc_3lkmdqkeptmwde6bufkz6esege ReEncodeFont" <[coch_3lkmdq.enc <Cochineal-Roman.pfb
+Cochineal-Roman-osf-sc-ot1--base Cochineal-Roman "AutoEnc_kz2hmzcyyw5bxqce4y4yfznphd ReEncodeFont" <[coch_kz2hmz.enc <Cochineal-Roman.pfb
 Cochineal-Roman-osf-sc-t1--base Cochineal-Roman "AutoEnc_tehpoo5xuuvqdkjgcfcyerw5jh ReEncodeFont" <[coch_tehpoo.enc <Cochineal-Roman.pfb
 Cochineal-Roman-osf-swash-ly1 Cochineal-Roman "AutoEnc_jfgxgm56cq6ww72o3ladlxjwwa ReEncodeFont" <[coch_jfgxgm.enc <Cochineal-Roman.pfb
 Cochineal-Roman-osf-swash-ot1 Cochineal-Roman "AutoEnc_zceo5tfblq7iby3q6lg555vocg ReEncodeFont" <[coch_zceo5t.enc <Cochineal-Roman.pfb
 Cochineal-Roman-osf-swash-t1--base Cochineal-Roman "AutoEnc_rkk6xvvosilug47drzmm3ko7te ReEncodeFont" <[coch_rkk6xv.enc <Cochineal-Roman.pfb
-Cochineal-Roman-osf-ts1--base Cochineal-Roman "AutoEnc_7uj7iokoaokbvpxwp2bnnoqsbe ReEncodeFont" <[coch_7uj7io.enc <Cochineal-Roman.pfb
+Cochineal-Roman-dnom-ly1 Cochineal-Roman "AutoEnc_5v3q2ik7vctzjtjmp5wezb2t5c ReEncodeFont" <[coch_5v3q2i.enc <Cochineal-Roman.pfb
+Cochineal-Roman-dnom-ot1 Cochineal-Roman "AutoEnc_n2swpvb2gl2y7dzhwt7clphv2f ReEncodeFont" <[coch_n2swpv.enc <Cochineal-Roman.pfb
+Cochineal-Roman-dnom-t1--base Cochineal-Roman "AutoEnc_r5kifak6soks474jf7igfqredd ReEncodeFont" <[coch_r5kifa.enc <Cochineal-Roman.pfb
 Cochineal-Roman-inf-ly1 Cochineal-Roman "AutoEnc_u523j7ljlmakgan3zz3dmoea4g ReEncodeFont" <[coch_u523j7.enc <Cochineal-Roman.pfb
 Cochineal-Roman-inf-ot1 Cochineal-Roman "AutoEnc_dpslmojvuql3ou6lxoqbln6rka ReEncodeFont" <[coch_dpslmo.enc <Cochineal-Roman.pfb
 Cochineal-Roman-inf-t1--base Cochineal-Roman "AutoEnc_3ahcfywe37dany2hmtslgvhu6b ReEncodeFont" <[coch_3ahcfy.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-ly1 Cochineal-Roman "AutoEnc_v7xcotr4xxp5wcd7hnhhlx55vg ReEncodeFont" <[coch_v7xcot.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-ot1 Cochineal-Roman "AutoEnc_4wsvu7vr6nqqjcfnf66hpqdaga ReEncodeFont" <[coch_4wsvu7.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-t1--base Cochineal-Roman "AutoEnc_327erotlfdchg5e3n2ycuhf4og ReEncodeFont" <[coch_327ero.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-sc-ly1--base Cochineal-Roman "AutoEnc_faomqbtlu355bhkduaafwwngfb ReEncodeFont" <[coch_faomqb.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-sc-ot1--base Cochineal-Roman "AutoEnc_dx7yeogkra4k6jp5ssfpzhbdph ReEncodeFont" <[coch_dx7yeo.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-sc-t1--base Cochineal-Roman "AutoEnc_yidn7lfgcnx5w43k2nkmi2ukbg ReEncodeFont" <[coch_yidn7l.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-swash-ly1 Cochineal-Roman "AutoEnc_3uurxv4dydpgh6ogolzuygq4ug ReEncodeFont" <[coch_3uurxv.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-swash-ot1 Cochineal-Roman "AutoEnc_5rx6tx4apyvc3kpanj2g75rz5b ReEncodeFont" <[coch_5rx6tx.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-swash-t1--base Cochineal-Roman "AutoEnc_fuez2loyeq3otooi5bad5do6la ReEncodeFont" <[coch_fuez2l.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-ts1--base Cochineal-Roman "AutoEnc_7uj7iokoaokbvpxwp2bnnoqsbe ReEncodeFont" <[coch_7uj7io.enc <Cochineal-Roman.pfb
 
 Cochineal-Roman-tlf-t2a Cochineal-Roman " coch-t2aEncoding ReEncodeFont " <coch-t2a.enc <Cochineal-Roman.pfb
 Cochineal-Bold-tlf-t2a Cochineal-Bold " coch-t2aEncoding ReEncodeFont " <coch-t2a.enc <Cochineal-Bold.pfb
@@ -222,6 +206,7 @@ Cochineal-Bold-tlf-ot2 Cochineal-Bold " cochtlfOT2encoding ReEncodeFont " <cocht
 Cochineal-Bold-tlf-t2a Cochineal-Bold " coch-t2aEncoding ReEncodeFont " <coch-t2a.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tosf-lgr Cochineal-Bold " cochtosfLGRencoding ReEncodeFont " <cochtosf-lgr.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tosf-ot2 Cochineal-Bold " cochtosfOT2encoding ReEncodeFont " <cochtosf-ot2.enc <Cochineal-Bold.pfb
+Cochineal-Bold-ts1 Cochineal-Bold " cochTS1Encoding ReEncodeFont " <coch_ts1.enc <Cochineal-Bold.pfb
 Cochineal-Bolditalic-tlf-lgr Cochineal-BoldItalic " coch-lgrEncoding ReEncodeFont " <cochtlf-lgr.enc <Cochineal-Bolditalic.pfb
 Cochineal-BoldItalic-tlf-t2a Cochineal-BoldItalic " coch-t2aEncoding ReEncodeFont " <coch-t2a.enc <Cochineal-BoldItalic.pfb
 Cochineal-Bolditalic-lf-lgr Cochineal-BoldItalic " cochlfLGRencoding ReEncodeFont " <cochlf-lgr.enc <Cochineal-Bolditalic.pfb
@@ -231,6 +216,7 @@ Cochineal-Bolditalic-osf-ot2 Cochineal-BoldItalic " cochosfOT2encoding ReEncodeF
 Cochineal-Bolditalic-tlf-ot2 Cochineal-BoldItalic " cochtlfOT2encoding ReEncodeFont " <cochtlf-ot2.enc <Cochineal-Bolditalic.pfb
 Cochineal-Bolditalic-tosf-lgr Cochineal-BoldItalic " cochtosfLGRencoding ReEncodeFont " <cochtosf-lgr.enc <Cochineal-Bolditalic.pfb
 Cochineal-Bolditalic-tosf-ot2 Cochineal-BoldItalic " cochtosfOT2encoding ReEncodeFont " <cochtosf-ot2.enc <Cochineal-Bolditalic.pfb
+Cochineal-Bolditalic-ts1 Cochineal-BoldItalic " cochTS1Encoding ReEncodeFont " <coch_ts1.enc <Cochineal-Bolditalic.pfb
 Cochineal-Italic-lf-lgr Cochineal-Italic " cochlfLGRencoding ReEncodeFont " <cochlf-lgr.enc <Cochineal-Italic.pfb
 Cochineal-Italic-lf-ot2 Cochineal-Italic " cochlfOT2encoding ReEncodeFont " <cochlf-ot2.enc <Cochineal-Italic.pfb
 Cochineal-Italic-osf-lgr Cochineal-Italic " cochosfLGRencoding ReEncodeFont " <cochosf-lgr.enc <Cochineal-Italic.pfb
@@ -240,6 +226,7 @@ Cochineal-Italic-tlf-ot2 Cochineal-Italic " cochtlfOT2encoding ReEncodeFont " <c
 Cochineal-Italic-tlf-t2a Cochineal-Italic " coch-t2aEncoding ReEncodeFont " <coch-t2a.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tosf-lgr Cochineal-Italic " cochtosfLGRencoding ReEncodeFont " <cochtosf-lgr.enc <Cochineal-Italic.pfb
 Cochineal-Italic-tosf-ot2 Cochineal-Italic " cochtosfOT2encoding ReEncodeFont " <cochtosf-ot2.enc <Cochineal-Italic.pfb
+Cochineal-Italic-ts1 Cochineal-Italic " cochTS1Encoding ReEncodeFont " <coch_ts1.enc <Cochineal-Italic.pfb
 Cochineal-Roman-lf-lgr Cochineal-Roman " cochlfLGRencoding ReEncodeFont " <cochlf-lgr.enc <Cochineal-Roman.pfb
 Cochineal-Roman-lf-ot2 Cochineal-Roman " cochlfOT2encoding ReEncodeFont " <cochlf-ot2.enc <Cochineal-Roman.pfb
 Cochineal-Roman-osf-lgr Cochineal-Roman " cochosfLGRencoding ReEncodeFont " <cochosf-lgr.enc <Cochineal-Roman.pfb
@@ -249,6 +236,7 @@ Cochineal-Roman-tlf-ot2 Cochineal-Roman " cochtlfOT2encoding ReEncodeFont " <coc
 Cochineal-Roman-tlf-t2a Cochineal-Roman " coch-t2aEncoding ReEncodeFont " <coch-t2a.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tosf-lgr Cochineal-Roman " cochtosfLGRencoding ReEncodeFont " <cochtosf-lgr.enc <Cochineal-Roman.pfb
 Cochineal-Roman-tosf-ot2 Cochineal-Roman " cochtosfOT2encoding ReEncodeFont " <cochtosf-ot2.enc <Cochineal-Roman.pfb
+Cochineal-Roman-ts1 Cochineal-Roman " cochTS1Encoding ReEncodeFont " <coch_ts1.enc <Cochineal-Roman.pfb
 Cochineal-Bold-ot2--base Cochineal-Bold " cochOT2encoding ReEncodeFont " <coch-ot2.enc <Cochineal-Bold.pfb
 Cochineal-BoldItalic-ot2--base Cochineal-BoldItalic " cochOT2encoding ReEncodeFont " <coch-ot2.enc <Cochineal-BoldItalic.pfb
 Cochineal-Italic-ot2--base Cochineal-Italic " cochOT2encoding ReEncodeFont " <coch-ot2.enc <Cochineal-Italic.pfb
diff --git a/Master/texmf-dist/fonts/opentype/public/cochineal/Cochineal-Bold.otf b/Master/texmf-dist/fonts/opentype/public/cochineal/Cochineal-Bold.otf
index c98859d666c..47a6238ded4 100644
--- a/Master/texmf-dist/fonts/opentype/public/cochineal/Cochineal-Bold.otf
+++ b/Master/texmf-dist/fonts/opentype/public/cochineal/Cochineal-Bold.otf
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1--base.tfm
index ccbba26a98f..4b2d17dc491 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1.tfm
index 617c5348f9e..d7421022eba 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ot1.tfm
index ece430a92a4..4f26ed94884 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1--base.tfm
index d32341012a2..b15bdd32d5f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1.tfm
index 6408d53fe53..1d586081bd6 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1--base.tfm
index 0cf35350aa8..50f2f787cae 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1.tfm
index 8ee7054fe49..a10407b16ed 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ot1.tfm
index 0cf9fcaf2fb..bf7dd33cd76 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1--base.tfm
index 17dc20ceb53..41d8e2a83cc 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1.tfm
index 043168c19d4..b6ad322c292 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-lgr.tfm
index 2b795f6c5b0..826b145b2d1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1--base.tfm
index 2a14f0d83da..b39e0a7f819 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1.tfm
index d0eef098f3c..3f8ad37c619 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ot1.tfm
index 2a6c4727a12..2b056a504d7 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1--base.tfm
index 7cd07f91eb3..2acb13581c6 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1.tfm
index d83d89f0a26..f282d41fda0 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1--base.tfm
index 7024511a89b..3cfc1683de9 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1.tfm
index 17770333fe6..eac6bb60fcd 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1--base.tfm
index 70e8e40d6f3..2737b2c64c1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1.tfm
index c654155f3bb..8c2c267372b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1--base.tfm
index fc72fc14efa..02242d041e4 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1.tfm
index d295d2e16de..61449fda3c5 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ot1.tfm
index e5cdd257c9b..0345b07debf 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1--base.tfm
index 0f5394fe2b1..dfeec344b5d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1.tfm
index ed2b805bb79..92ed5d2f73b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1--base.tfm
index 2872bed5f57..02b519c3444 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1.tfm
index 6edc4587120..e83b411048e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ts1--base.tfm
deleted file mode 100644
index 703ec0882fd..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ts1.tfm
deleted file mode 100644
index fcc63cef923..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-lgr.tfm
index 05a09f2a756..1e2e2326393 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1--base.tfm
index 6bc37bea2f6..543006ad6aa 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1.tfm
index 86570d18f57..d892aed60d4 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ot1.tfm
index dd98f6bf7ec..153d6cc45c8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1--base.tfm
index 67c4a0405e5..33d013fc4fe 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1.tfm
index 3285c819717..1f47bc9e3d7 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1--base.tfm
index 69ec3f49a7a..ba396a0b61f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1.tfm
index e033da4eff6..bfc820b3975 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1--base.tfm
index bcb30402ade..5cd86c39e66 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1.tfm
index da81d33b928..2a8f59cb012 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1--base.tfm
index 78128030082..29ee63dc4db 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1.tfm
index eb82b4923c8..4230d46024e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ot1.tfm
index 13cc6050a27..558b68636e1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1--base.tfm
index 69cb75b16ac..c11107ddbb8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1.tfm
index 7a04b3f64fe..727be0267da 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1--base.tfm
index 12d230e6ce7..d4e704d0e76 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1.tfm
index 4212272ade7..14e1c524bf5 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ts1--base.tfm
deleted file mode 100644
index 703ec0882fd..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ts1.tfm
deleted file mode 100644
index fcc63cef923..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1--base.tfm
index 120cd73fa60..f20f74cd09f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1.tfm
index c899269da16..b0795245953 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ot1.tfm
index 589004c6306..1f5bdca5723 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1--base.tfm
index 8f5a67e8229..56bbf63e080 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1.tfm
index 247882da55f..1af4162022b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-lgr.tfm
index 7353025c9a6..3cc79c02a8d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1--base.tfm
index 797ec0474b6..27d125cb1d8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1.tfm
index 91b6c449361..c1a36d7bc68 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ot1.tfm
index 869376c7c78..3d16daca07b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1--base.tfm
index 74db99a6e19..2a0e59b51cd 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1.tfm
index 6ecd801f316..f6aa40afcd3 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1--base.tfm
index 744a0eb691e..b35eee664f4 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1.tfm
index 4cc05b11a8b..3781e358351 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1--base.tfm
index e87813f480d..b50989b4563 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1.tfm
index c35fecd3105..eb1965f01b7 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1--base.tfm
index 17703c59aa7..ec7478efc54 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1.tfm
index 7366c021edb..eda9bc41353 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ot1.tfm
index d9df0cae323..b788ca8c095 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1--base.tfm
index 9031ab15b70..1b624ece6d2 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1.tfm
index cee52b7c37e..2f853eb05fc 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1--base.tfm
index 56eeb0279e2..7124c90b5c8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1.tfm
index 2d95dd623ca..85c2e741ac8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ts1--base.tfm
deleted file mode 100644
index 703ec0882fd..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ts1.tfm
deleted file mode 100644
index fcc63cef923..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-lgr.tfm
index d4b3517e9d9..26c25759c52 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-lgr.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1--base.tfm
index 65e022ac4b8..5fd4a331f5f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1.tfm
index d0911f114cd..a9f3375e41c 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ot1.tfm
index 688c92e3bcd..9f4437183a2 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1--base.tfm
index f7efe0d16e0..62d9aedb5f0 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1.tfm
index 702af98a5d0..9476a2bfd1d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1--base.tfm
index 9d357cf231e..4adb9065109 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1.tfm
index b045e2c6354..41d9d1cd937 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1--base.tfm
index 27fe42bb985..15abb8acff5 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1.tfm
index fc53cb43c6d..806236b1dbd 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1--base.tfm
index c8d2072fee2..b7afc312024 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1.tfm
index 1dd1852563f..02a73d63e06 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ot1.tfm
index 843b32a1a6c..6a3f6433ed3 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1--base.tfm
index 27dde87adc3..379342b8c7a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1.tfm
index 66f9cec4c48..828f7c61633 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1--base.tfm
index cb72c4224e9..457723ac6e1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1.tfm
index 17f90ba4fed..ff07c24e599 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ts1--base.tfm
deleted file mode 100644
index 703ec0882fd..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ts1.tfm
deleted file mode 100644
index fcc63cef923..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-ts1.tfm
new file mode 100644
index 00000000000..92e6b7de9ae
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1--base.tfm
index e91066e0cd0..f98a1cf6924 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ts1--base.tfm
deleted file mode 100644
index fdb23e7e8e9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ts1.tfm
deleted file mode 100644
index 835ab7c2709..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1--base.tfm
index 2596cff4e2c..45fb816ee2d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ts1--base.tfm
deleted file mode 100644
index fdb23e7e8e9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ts1.tfm
deleted file mode 100644
index 835ab7c2709..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1--base.tfm
index 7e171f05907..39590cca421 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ts1--base.tfm
deleted file mode 100644
index fdb23e7e8e9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ts1.tfm
deleted file mode 100644
index 835ab7c2709..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1--base.tfm
index 3e147c7900e..f52d4ae0fb7 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ts1--base.tfm
deleted file mode 100644
index fdb23e7e8e9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ts1.tfm
deleted file mode 100644
index 835ab7c2709..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bolditalic-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bolditalic-ts1.tfm
new file mode 100644
index 00000000000..10f69d63e04
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bolditalic-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ot1--base.tfm
index eaf2a11efcb..9612ba14a9d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ot1.tfm
index f48c16b2fb8..82098057a2e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ts1--base.tfm
deleted file mode 100644
index 85f5450281a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ts1.tfm
deleted file mode 100644
index 98b62125c2a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ot1--base.tfm
index de9ae28f5a9..4a08ebfbcb9 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ot1.tfm
index b5f74382300..e02b1bc5552 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ts1--base.tfm
deleted file mode 100644
index 85f5450281a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ts1.tfm
deleted file mode 100644
index 98b62125c2a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ot1--base.tfm
index 3372db53ebe..495a1071374 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ot1.tfm
index 4ef0bc5759d..6a87c845ac1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ts1--base.tfm
deleted file mode 100644
index 85f5450281a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ts1.tfm
deleted file mode 100644
index 98b62125c2a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ot1--base.tfm
index e7ed76086c2..ef1e920b6dd 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ot1.tfm
index 4c112bd5b82..9150712aa15 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ts1--base.tfm
deleted file mode 100644
index 85f5450281a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ts1.tfm
deleted file mode 100644
index 98b62125c2a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-ts1.tfm
new file mode 100644
index 00000000000..1c863d7e216
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ot1--base.tfm
index 225e6ec2a9b..5c2372515a9 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ts1--base.tfm
deleted file mode 100644
index 53b756c331d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ts1.tfm
deleted file mode 100644
index bdfd55549f1..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ot1--base.tfm
index 76e1dac0883..f940545e430 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ts1--base.tfm
deleted file mode 100644
index 53b756c331d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ts1.tfm
deleted file mode 100644
index bdfd55549f1..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ot1--base.tfm
index bd3f962546e..03e058e2ac4 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ts1--base.tfm
deleted file mode 100644
index 53b756c331d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ts1.tfm
deleted file mode 100644
index bdfd55549f1..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ot1--base.tfm
index fa62e07725f..3c07ad1bebd 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ts1--base.tfm
deleted file mode 100644
index 53b756c331d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ts1.tfm
deleted file mode 100644
index bdfd55549f1..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-ts1.tfm
new file mode 100644
index 00000000000..800c6ceb1e7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-ts1.tfm
diff --git a/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Bold.pfb b/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Bold.pfb
index 807dd189875..81ad4f24f3f 100644
--- a/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Bold.pfb
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-ly1.vf
index 7b9ebf2adfb..99d49222e22 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-t1.vf
index 7b08fd072ab..ce629b9cc0a 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-ly1.vf
index 45658541a91..a180cbafce5 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-t1.vf
index 0404d0a3eb5..78f27708ed0 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ly1.vf
index 62409d184f9..9424e9e8733 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ly1.vf
index 888bca314e5..89de45442c1 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ot1.vf
index 29ba84a7902..eaaa67a7ab8 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-t1.vf
index c3231654d91..c205edc15f5 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-ly1.vf
index 997bf13e5f8..ab66890681c 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-t1.vf
index 51266aed90a..50fef2818a5 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-t1.vf
index 48d154eea11..7b2d4a9cd41 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ts1.vf
deleted file mode 100644
index 4c21451b751..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ly1.vf
index b3e531177a1..a17799a9d00 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ly1.vf
index f62b85bca2a..b8b7f16ede0 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ot1.vf
index 27a87c3f299..29a0472d183 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-t1.vf
index c493d290689..6fdbf85ac54 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-ly1.vf
index de8a59afca3..972274c484f 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-t1.vf
index 199d13551af..b087c962150 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-t1.vf
index fcfd4a3a0bf..85b1d6ca882 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ts1.vf
deleted file mode 100644
index 82629defca2..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-ly1.vf
index f4f23e1db79..f3b39566411 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-t1.vf
index 47252820b38..4e237dad832 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ly1.vf
index 883342b004e..5901063899f 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ly1.vf
index cc5af9acec1..3f05c4ad5ae 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ot1.vf
index fac828fb411..892ad331eb1 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-t1.vf
index 760fe39c7d4..651945b0930 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-ly1.vf
index ef77481cda6..b9ea038d43c 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-t1.vf
index 7228a6d84b4..161bf45380f 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-t1.vf
index 7b4d9bbae83..4a374c6fe18 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ts1.vf
deleted file mode 100644
index 1781e6948e2..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ly1.vf
index e5e7d1df948..52a7cd08d45 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ly1.vf
index 7d896b20104..c6a4f6e10e2 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ot1.vf
index adf55535aa0..cfa5f73b3a3 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-t1.vf
index 604243010bf..d0f3acb5110 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-ly1.vf
index f5b53db4633..0228f3bc0f0 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-t1.vf
index 2b09d4548ba..5c224dce2fb 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-t1.vf
index d77a3810a41..b16cf155553 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ts1.vf
deleted file mode 100644
index a2a917d3aa0..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1.vf
index 90e5f9b8ece..2ec26d8898f 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-ts1.vf
deleted file mode 100644
index 34da620c013..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1.vf
index 8ad11c538ee..f8e652c253c 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-ts1.vf
deleted file mode 100644
index f9c6e845256..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1.vf
index 2a7f718f81a..2ba699150e9 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-ts1.vf
deleted file mode 100644
index 64b7689d8a6..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1.vf
index 01fe9767e35..b180c789a72 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-ts1.vf
deleted file mode 100644
index 82c1419277f..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-ot1.vf
index efb72ca8203..519e4e4b34e 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-ts1.vf
deleted file mode 100644
index f9f5dc96f08..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-ot1.vf
index 3558cf77771..ff279000376 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-ts1.vf
deleted file mode 100644
index 7db8846c603..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-ot1.vf
index 5ee5ad3d2a1..31dd324129a 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-ts1.vf
deleted file mode 100644
index 8cc0e83e639..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-ot1.vf
index a64288ac1bc..850c5bd4275 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-ts1.vf
deleted file mode 100644
index 925ce62e390..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-ot1.vf
index 0e7219f7bb4..0c37a306453 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-ts1.vf
deleted file mode 100644
index 6762a944881..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-ot1.vf
index 616284d7656..51214b019e6 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-ts1.vf
deleted file mode 100644
index bbb1e027d73..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-ot1.vf
index 7bc869c7c52..311eff0975d 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-ts1.vf
deleted file mode 100644
index 799dd73d3b3..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-ot1.vf
index a47e6c51611..a4a5f75b885 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-ts1.vf
deleted file mode 100644
index 98ef797062c..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-LF.fd b/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-LF.fd
index 7bea08e4735..be8a88d5502 100644
--- a/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-LF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-LF.fd
@@ -12,11 +12,11 @@
 \DeclareFontFamily{TS1}{Cochineal-LF}{}
 
 \DeclareFontShape{TS1}{Cochineal-LF}{m}{n}{
-      <-> \Cochineal@@scale Cochineal-Roman-lf-ts1
+      <-> \Cochineal@@scale Cochineal-Roman-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-LF}{m}{it}{
-      <-> \Cochineal@@scale Cochineal-Italic-lf-ts1
+      <-> \Cochineal@@scale Cochineal-Italic-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-LF}{m}{sl}{
@@ -24,11 +24,11 @@
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-LF}{b}{n}{
-      <-> \Cochineal@@scale Cochineal-Bold-lf-ts1
+      <-> \Cochineal@@scale Cochineal-Bold-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-LF}{b}{it}{
-      <-> \Cochineal@@scale Cochineal-BoldItalic-lf-ts1
+      <-> \Cochineal@@scale Cochineal-BoldItalic-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-LF}{b}{sl}{
diff --git a/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-OsF.fd b/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-OsF.fd
index ecfe668d881..bec67c62f3d 100644
--- a/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-OsF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-OsF.fd
@@ -12,11 +12,11 @@
 \DeclareFontFamily{TS1}{Cochineal-OsF}{}
 
 \DeclareFontShape{TS1}{Cochineal-OsF}{m}{n}{
-      <-> \Cochineal@@scale Cochineal-Roman-osf-ts1
+      <-> \Cochineal@@scale Cochineal-Roman-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-OsF}{m}{it}{
-      <-> \Cochineal@@scale Cochineal-Italic-osf-ts1
+      <-> \Cochineal@@scale Cochineal-Italic-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-OsF}{m}{sl}{
@@ -24,11 +24,11 @@
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-OsF}{b}{it}{
-      <-> \Cochineal@@scale Cochineal-BoldItalic-osf-ts1
+      <-> \Cochineal@@scale Cochineal-BoldItalic-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-OsF}{b}{n}{
-      <-> \Cochineal@@scale Cochineal-Bold-osf-ts1
+      <-> \Cochineal@@scale Cochineal-Bold-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-OsF}{b}{sl}{
diff --git a/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-TLF.fd b/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-TLF.fd
index b36074cd935..cd59698dec6 100644
--- a/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-TLF.fd
@@ -12,11 +12,11 @@
 \DeclareFontFamily{TS1}{Cochineal-TLF}{}
 
 \DeclareFontShape{TS1}{Cochineal-TLF}{b}{it}{
-      <-> \Cochineal@@scale Cochineal-BoldItalic-tlf-ts1
+      <-> \Cochineal@@scale Cochineal-BoldItalic-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-TLF}{b}{n}{
-      <-> \Cochineal@@scale Cochineal-Bold-tlf-ts1
+      <-> \Cochineal@@scale Cochineal-Bold-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-TLF}{b}{sl}{
@@ -24,11 +24,11 @@
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-TLF}{m}{it}{
-      <-> \Cochineal@@scale Cochineal-Italic-tlf-ts1
+      <-> \Cochineal@@scale Cochineal-Italic-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-TLF}{m}{n}{
-      <-> \Cochineal@@scale Cochineal-Roman-tlf-ts1
+      <-> \Cochineal@@scale Cochineal-Roman-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-TLF}{m}{sl}{
diff --git a/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-TOsF.fd b/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-TOsF.fd
index b74f293d182..06515d22f58 100644
--- a/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/TS1Cochineal-TOsF.fd
@@ -12,11 +12,11 @@
 \DeclareFontFamily{TS1}{Cochineal-TOsF}{}
 
 \DeclareFontShape{TS1}{Cochineal-TOsF}{b}{n}{
-      <-> \Cochineal@@scale Cochineal-Bold-tosf-ts1
+      <-> \Cochineal@@scale Cochineal-Bold-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-TOsF}{b}{it}{
-      <-> \Cochineal@@scale Cochineal-BoldItalic-tosf-ts1
+      <-> \Cochineal@@scale Cochineal-BoldItalic-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-TOsF}{b}{sl}{
@@ -24,11 +24,11 @@
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-TOsF}{m}{it}{
-      <-> \Cochineal@@scale Cochineal-Italic-tosf-ts1
+      <-> \Cochineal@@scale Cochineal-Italic-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-TOsF}{m}{n}{
-      <-> \Cochineal@@scale Cochineal-Roman-tosf-ts1
+      <-> \Cochineal@@scale Cochineal-Roman-ts1
 }{}
 
 \DeclareFontShape{TS1}{Cochineal-TOsF}{m}{sl}{
author	Karl Berry <karl@freefriends.org>	2018-10-16 21:10:19 +0000
committer	Karl Berry <karl@freefriends.org>	2018-10-16 21:10:19 +0000
commit	b0acd0d7fcc352d9bc432e42ccc43792a9c28888 (patch)
tree	be5192e767efb856575279631f98d2362994f0a5
parent	9f437ce6a740b12e0822fbec90144e0793420454 (diff)