From 8e4cf9675184a7bb793e41afcc2ab434cd08852a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 28 May 2011 20:31:17 +0000 Subject: mac binaries git-svn-id: svn://tug.org/texlive/trunk@22651 c570f23f-e606-0410-a88d-b1316a301751 --- Master/bin/universal-darwin/T1Wrap | Bin 150192 -> 136724 bytes Master/bin/universal-darwin/afm2pl | Bin 195812 -> 190452 bytes Master/bin/universal-darwin/afm2tfm | Bin 204148 -> 202888 bytes Master/bin/universal-darwin/aleph | Bin 1140156 -> 1147128 bytes Master/bin/universal-darwin/asy | Bin 15901400 -> 13791972 bytes Master/bin/universal-darwin/bbox | Bin 38560 -> 37360 bytes Master/bin/universal-darwin/bg5conv | Bin 34216 -> 28904 bytes Master/bin/universal-darwin/bibtex | Bin 356512 -> 355268 bytes Master/bin/universal-darwin/bibtex8 | Bin 418004 -> 420856 bytes Master/bin/universal-darwin/bibtexu | Bin 32450292 -> 33037832 bytes Master/bin/universal-darwin/cef5conv | Bin 34324 -> 29008 bytes Master/bin/universal-darwin/cefconv | Bin 34324 -> 29008 bytes Master/bin/universal-darwin/cefsconv | Bin 34324 -> 29008 bytes Master/bin/universal-darwin/cfftot1 | Bin 785864 -> 801420 bytes Master/bin/universal-darwin/chktex | Bin 134052 -> 128700 bytes Master/bin/universal-darwin/ctangle | Bin 212320 -> 211068 bytes Master/bin/universal-darwin/ctie | Bin 171124 -> 165768 bytes Master/bin/universal-darwin/cweave | Bin 286196 -> 280848 bytes Master/bin/universal-darwin/detex | Bin 216340 -> 206856 bytes Master/bin/universal-darwin/devnag | Bin 75956 -> 74704 bytes Master/bin/universal-darwin/disdvi | Bin 46844 -> 45664 bytes Master/bin/universal-darwin/dt2dv | Bin 88080 -> 86852 bytes Master/bin/universal-darwin/dv2dt | Bin 42744 -> 37448 bytes Master/bin/universal-darwin/dvi2tty | Bin 63648 -> 186336 bytes Master/bin/universal-darwin/dvibook | Bin 72296 -> 71128 bytes Master/bin/universal-darwin/dviconcat | Bin 68044 -> 62772 bytes Master/bin/universal-darwin/dvicopy | Bin 253604 -> 252360 bytes Master/bin/universal-darwin/dvidvi | Bin 59276 -> 54004 bytes Master/bin/universal-darwin/dvilj | Bin 232900 -> 231648 bytes Master/bin/universal-darwin/dvilj2p | Bin 232900 -> 231648 bytes Master/bin/universal-darwin/dvilj4 | Bin 249324 -> 248072 bytes Master/bin/universal-darwin/dvilj4l | Bin 249324 -> 248072 bytes Master/bin/universal-darwin/dvipdfmx | Bin 1503364 -> 1563484 bytes Master/bin/universal-darwin/dvipng | Bin 1996356 -> 2101640 bytes Master/bin/universal-darwin/dvipos | Bin 228676 -> 223300 bytes Master/bin/universal-darwin/dvips | Bin 524940 -> 527796 bytes Master/bin/universal-darwin/dviselect | Bin 72184 -> 71004 bytes Master/bin/universal-darwin/dvisvgm | Bin 2686792 -> 2484352 bytes Master/bin/universal-darwin/dvitodvi | Bin 80516 -> 75252 bytes Master/bin/universal-darwin/dvitype | Bin 224728 -> 223456 bytes Master/bin/universal-darwin/epsffit | Bin 42700 -> 37412 bytes Master/bin/universal-darwin/eptex | Bin 0 -> 995496 bytes Master/bin/universal-darwin/extconv | Bin 34216 -> 28904 bytes Master/bin/universal-darwin/gftodvi | Bin 233088 -> 231852 bytes Master/bin/universal-darwin/gftopk | Bin 199872 -> 194516 bytes Master/bin/universal-darwin/gftype | Bin 195764 -> 190420 bytes Master/bin/universal-darwin/gsftopk | Bin 188052 -> 182744 bytes Master/bin/universal-darwin/hbf2gf | Bin 208620 -> 207328 bytes Master/bin/universal-darwin/inimf | 1 + Master/bin/universal-darwin/initex | 1 + Master/bin/universal-darwin/kpseaccess | Bin 34252 -> 28956 bytes Master/bin/universal-darwin/kpsereadlink | Bin 34256 -> 28956 bytes Master/bin/universal-darwin/kpsestat | Bin 34284 -> 28980 bytes Master/bin/universal-darwin/kpsewhich | Bin 183340 -> 178016 bytes Master/bin/universal-darwin/lacheck | Bin 141320 -> 135948 bytes Master/bin/universal-darwin/luatex | Bin 8415484 -> 9743160 bytes Master/bin/universal-darwin/mag | Bin 34348 -> 29004 bytes Master/bin/universal-darwin/makeindex | Bin 302592 -> 297264 bytes Master/bin/universal-darwin/makejvf | Bin 212204 -> 210924 bytes Master/bin/universal-darwin/mendex | Bin 421420 -> 420172 bytes Master/bin/universal-darwin/mf | Bin 693744 -> 708800 bytes Master/bin/universal-darwin/mf-nowin | Bin 684512 -> 695572 bytes Master/bin/universal-darwin/mft | Bin 236764 -> 231412 bytes Master/bin/universal-darwin/mkofm | 2 +- Master/bin/universal-darwin/mmafm | Bin 527784 -> 521576 bytes Master/bin/universal-darwin/mmpfb | Bin 675436 -> 675304 bytes Master/bin/universal-darwin/mpost | Bin 1044396 -> 1055452 bytes Master/bin/universal-darwin/odvicopy | Bin 261808 -> 260564 bytes Master/bin/universal-darwin/odvitype | Bin 228824 -> 227552 bytes Master/bin/universal-darwin/omfonts | Bin 360308 -> 363156 bytes Master/bin/universal-darwin/otangle | Bin 224524 -> 219196 bytes Master/bin/universal-darwin/otfinfo | Bin 1002948 -> 1009100 bytes Master/bin/universal-darwin/otftotfm | Bin 1774424 -> 1874528 bytes Master/bin/universal-darwin/otp2ocp | Bin 195784 -> 194512 bytes Master/bin/universal-darwin/outocp | Bin 158640 -> 153296 bytes Master/bin/universal-darwin/patgen | Bin 101052 -> 99868 bytes Master/bin/universal-darwin/pbibtex | Bin 405804 -> 412732 bytes Master/bin/universal-darwin/pdfclose | Bin 43124 -> 37748 bytes Master/bin/universal-darwin/pdfopen | Bin 43312 -> 37868 bytes Master/bin/universal-darwin/pdftex | Bin 2850996 -> 2926288 bytes Master/bin/universal-darwin/pdftosrc | Bin 875888 -> 869068 bytes Master/bin/universal-darwin/pdvitype | Bin 286348 -> 285060 bytes Master/bin/universal-darwin/pfb2pfa | Bin 38668 -> 37460 bytes Master/bin/universal-darwin/pk2bm | Bin 42672 -> 37380 bytes Master/bin/universal-darwin/pktogf | Bin 191720 -> 186376 bytes Master/bin/universal-darwin/pktype | Bin 179324 -> 178072 bytes Master/bin/universal-darwin/pltotf | Bin 137860 -> 136640 bytes Master/bin/universal-darwin/pooltype | Bin 67912 -> 62588 bytes Master/bin/universal-darwin/ppltotf | Bin 306704 -> 309536 bytes Master/bin/universal-darwin/ps2pk | Bin 376140 -> 378948 bytes Master/bin/universal-darwin/psbook | Bin 47180 -> 45940 bytes Master/bin/universal-darwin/psnup | Bin 63604 -> 54164 bytes Master/bin/universal-darwin/psresize | Bin 59508 -> 54164 bytes Master/bin/universal-darwin/psselect | Bin 51276 -> 45940 bytes Master/bin/universal-darwin/pstops | Bin 59508 -> 54164 bytes Master/bin/universal-darwin/ptex | Bin 861424 -> 876580 bytes Master/bin/universal-darwin/ptftopl | Bin 282048 -> 280784 bytes Master/bin/universal-darwin/sjisconv | Bin 34216 -> 28904 bytes Master/bin/universal-darwin/synctex | Bin 269048 -> 292340 bytes Master/bin/universal-darwin/t1ascii | Bin 76188 -> 74940 bytes Master/bin/universal-darwin/t1asm | Bin 84508 -> 83252 bytes Master/bin/universal-darwin/t1binary | Bin 76188 -> 74940 bytes Master/bin/universal-darwin/t1disasm | Bin 84504 -> 87372 bytes Master/bin/universal-darwin/t1dotlessj | Bin 650888 -> 650396 bytes Master/bin/universal-darwin/t1lint | Bin 568852 -> 577144 bytes Master/bin/universal-darwin/t1mac | Bin 92696 -> 95528 bytes Master/bin/universal-darwin/t1rawafm | Bin 568960 -> 564136 bytes Master/bin/universal-darwin/t1reencode | Bin 634472 -> 637528 bytes Master/bin/universal-darwin/t1testpage | Bin 593636 -> 598040 bytes Master/bin/universal-darwin/t1unmac | Bin 88604 -> 87368 bytes Master/bin/universal-darwin/t4ht | Bin 199792 -> 190312 bytes Master/bin/universal-darwin/tangle | Bin 228644 -> 227404 bytes Master/bin/universal-darwin/tcdialog | Bin 296512 -> 299192 bytes Master/bin/universal-darwin/teckit_compile | Bin 2241080 -> 1858364 bytes Master/bin/universal-darwin/tex | Bin 750728 -> 765896 bytes Master/bin/universal-darwin/tex2xindy | Bin 59436 -> 54096 bytes Master/bin/universal-darwin/tex4ht | Bin 326764 -> 321404 bytes Master/bin/universal-darwin/tftopl | Bin 216320 -> 215072 bytes Master/bin/universal-darwin/tie | Bin 162800 -> 157448 bytes Master/bin/universal-darwin/ttf2afm | Bin 203992 -> 198608 bytes Master/bin/universal-darwin/ttf2pk | Bin 474720 -> 469360 bytes Master/bin/universal-darwin/ttf2tfm | Bin 503400 -> 502140 bytes Master/bin/universal-darwin/ttfdump | Bin 129000 -> 123708 bytes Master/bin/universal-darwin/ttftotype42 | Bin 662968 -> 677884 bytes Master/bin/universal-darwin/updmap | 1436 +--------------------------- Master/bin/universal-darwin/updmap-sys | 31 +- Master/bin/universal-darwin/vftovp | Bin 245120 -> 243880 bytes Master/bin/universal-darwin/vlna | Bin 50984 -> 45660 bytes Master/bin/universal-darwin/vptovf | Bin 162552 -> 165436 bytes Master/bin/universal-darwin/weave | Bin 273748 -> 272512 bytes Master/bin/universal-darwin/xdv2pdf | Bin 439748 -> 366424 bytes Master/bin/universal-darwin/xdvi-xaw | Bin 1721448 -> 1752148 bytes Master/bin/universal-darwin/xdvipdfmx | Bin 2651816 -> 2744508 bytes Master/bin/universal-darwin/xetex | Bin 35163848 -> 35588708 bytes Master/bin/universal-darwin/xindy-i386.mem | Bin 981224 -> 943707 bytes Master/bin/universal-darwin/xindy-ppc.mem | Bin 1030062 -> 989901 bytes Master/bin/universal-darwin/xindy.run | Bin 4085560 -> 4017928 bytes Master/bin/x86_64-darwin/T1Wrap | Bin 71880 -> 67028 bytes Master/bin/x86_64-darwin/afm2pl | Bin 100664 -> 101512 bytes Master/bin/x86_64-darwin/afm2tfm | Bin 104800 -> 105840 bytes Master/bin/x86_64-darwin/aleph | Bin 592704 -> 610148 bytes Master/bin/x86_64-darwin/asy | Bin 7502544 -> 7548512 bytes Master/bin/x86_64-darwin/bbox | Bin 13168 -> 13484 bytes Master/bin/x86_64-darwin/bg5conv | Bin 8792 -> 8784 bytes Master/bin/x86_64-darwin/bibtex | Bin 178520 -> 191820 bytes Master/bin/x86_64-darwin/bibtex8 | Bin 207200 -> 220824 bytes Master/bin/x86_64-darwin/bibtexu | Bin 16357864 -> 16683248 bytes Master/bin/x86_64-darwin/cef5conv | Bin 8896 -> 9000 bytes Master/bin/x86_64-darwin/cefconv | Bin 8896 -> 9000 bytes Master/bin/x86_64-darwin/cefsconv | Bin 8896 -> 9000 bytes Master/bin/x86_64-darwin/cfftot1 | Bin 400000 -> 437696 bytes Master/bin/x86_64-darwin/chktex | Bin 67472 -> 70600 bytes Master/bin/x86_64-darwin/ctangle | Bin 108872 -> 110600 bytes Master/bin/x86_64-darwin/ctie | Bin 84256 -> 88448 bytes Master/bin/x86_64-darwin/cweave | Bin 141640 -> 143984 bytes Master/bin/x86_64-darwin/detex | Bin 108992 -> 109892 bytes Master/bin/x86_64-darwin/devnag | Bin 33952 -> 31776 bytes Master/bin/x86_64-darwin/disdvi | Bin 17312 -> 17948 bytes Master/bin/x86_64-darwin/dt2dv | Bin 42176 -> 39908 bytes Master/bin/x86_64-darwin/dv2dt | Bin 17344 -> 18028 bytes Master/bin/x86_64-darwin/dvi2tty | Bin 25776 -> 97640 bytes Master/bin/x86_64-darwin/dvibook | Bin 34600 -> 32536 bytes Master/bin/x86_64-darwin/dviconcat | Bin 30344 -> 32272 bytes Master/bin/x86_64-darwin/dvicopy | Bin 133432 -> 137532 bytes Master/bin/x86_64-darwin/dvidvi | Bin 21496 -> 22468 bytes Master/bin/x86_64-darwin/dvilj | Bin 121408 -> 123500 bytes Master/bin/x86_64-darwin/dvilj2p | Bin 121408 -> 123524 bytes Master/bin/x86_64-darwin/dvilj4 | Bin 125528 -> 132084 bytes Master/bin/x86_64-darwin/dvilj4l | Bin 125528 -> 132084 bytes Master/bin/x86_64-darwin/dvipdfmx | Bin 834800 -> 868156 bytes Master/bin/x86_64-darwin/dvipng | Bin 1125928 -> 1172400 bytes Master/bin/x86_64-darwin/dvipos | Bin 117208 -> 118200 bytes Master/bin/x86_64-darwin/dvips | Bin 273568 -> 284264 bytes Master/bin/x86_64-darwin/dviselect | Bin 30400 -> 32344 bytes Master/bin/x86_64-darwin/dvisvgm | Bin 1301128 -> 1455164 bytes Master/bin/x86_64-darwin/dvitodvi | Bin 34616 -> 36780 bytes Master/bin/x86_64-darwin/dvitype | Bin 112952 -> 119072 bytes Master/bin/x86_64-darwin/epsffit | Bin 13200 -> 13512 bytes Master/bin/x86_64-darwin/eptex | Bin 0 -> 531916 bytes Master/bin/x86_64-darwin/extconv | Bin 8792 -> 8784 bytes Master/bin/x86_64-darwin/gftodvi | Bin 116984 -> 124536 bytes Master/bin/x86_64-darwin/gftopk | Bin 100600 -> 101656 bytes Master/bin/x86_64-darwin/gftype | Bin 100536 -> 101656 bytes Master/bin/x86_64-darwin/gsftopk | Bin 97072 -> 98032 bytes Master/bin/x86_64-darwin/hbf2gf | Bin 109216 -> 111456 bytes Master/bin/x86_64-darwin/inimf | 1 + Master/bin/x86_64-darwin/initex | 1 + Master/bin/x86_64-darwin/kpseaccess | Bin 8832 -> 8840 bytes Master/bin/x86_64-darwin/kpsereadlink | Bin 8832 -> 8964 bytes Master/bin/x86_64-darwin/kpsestat | Bin 8856 -> 8888 bytes Master/bin/x86_64-darwin/kpsewhich | Bin 92416 -> 92788 bytes Master/bin/x86_64-darwin/lacheck | Bin 62608 -> 63900 bytes Master/bin/x86_64-darwin/luatex | Bin 4926128 -> 5690836 bytes Master/bin/x86_64-darwin/mag | Bin 8896 -> 9016 bytes Master/bin/x86_64-darwin/makeindex | Bin 149944 -> 155340 bytes Master/bin/x86_64-darwin/makejvf | Bin 112984 -> 114016 bytes Master/bin/x86_64-darwin/mendex | Bin 215456 -> 222172 bytes Master/bin/x86_64-darwin/mf | Bin 355936 -> 372760 bytes Master/bin/x86_64-darwin/mf-nowin | Bin 354896 -> 367000 bytes Master/bin/x86_64-darwin/mft | Bin 116920 -> 122448 bytes Master/bin/x86_64-darwin/mkofm | 2 +- Master/bin/x86_64-darwin/mmafm | Bin 264488 -> 286420 bytes Master/bin/x86_64-darwin/mmpfb | Bin 336416 -> 368560 bytes Master/bin/x86_64-darwin/mpost | Bin 564368 -> 571780 bytes Master/bin/x86_64-darwin/odvicopy | Bin 133432 -> 141700 bytes Master/bin/x86_64-darwin/odvitype | Bin 117048 -> 119072 bytes Master/bin/x86_64-darwin/omfonts | Bin 194968 -> 210792 bytes Master/bin/x86_64-darwin/otangle | Bin 112824 -> 118808 bytes Master/bin/x86_64-darwin/otfinfo | Bin 488720 -> 535792 bytes Master/bin/x86_64-darwin/otftotfm | Bin 906672 -> 992116 bytes Master/bin/x86_64-darwin/otp2ocp | Bin 100704 -> 106136 bytes Master/bin/x86_64-darwin/outocp | Bin 80000 -> 83776 bytes Master/bin/x86_64-darwin/patgen | Bin 46672 -> 50464 bytes Master/bin/x86_64-darwin/pbibtex | Bin 211424 -> 221468 bytes Master/bin/x86_64-darwin/pdfclose | Bin 13600 -> 14224 bytes Master/bin/x86_64-darwin/pdfopen | Bin 17824 -> 18520 bytes Master/bin/x86_64-darwin/pdftex | Bin 1572864 -> 1662700 bytes Master/bin/x86_64-darwin/pdftosrc | Bin 517976 -> 549512 bytes Master/bin/x86_64-darwin/pdvitype | Bin 149944 -> 153024 bytes Master/bin/x86_64-darwin/pfb2pfa | Bin 13264 -> 13716 bytes Master/bin/x86_64-darwin/pk2bm | Bin 17264 -> 17604 bytes Master/bin/x86_64-darwin/pktogf | Bin 96440 -> 101952 bytes Master/bin/x86_64-darwin/pktype | Bin 92344 -> 93272 bytes Master/bin/x86_64-darwin/pltotf | Bin 62968 -> 66892 bytes Master/bin/x86_64-darwin/pooltype | Bin 30200 -> 32212 bytes Master/bin/x86_64-darwin/ppltotf | Bin 158008 -> 165472 bytes Master/bin/x86_64-darwin/ps2pk | Bin 203072 -> 211632 bytes Master/bin/x86_64-darwin/psbook | Bin 17664 -> 18572 bytes Master/bin/x86_64-darwin/psnup | Bin 25888 -> 26948 bytes Master/bin/x86_64-darwin/psresize | Bin 25888 -> 22852 bytes Master/bin/x86_64-darwin/psselect | Bin 17664 -> 18572 bytes Master/bin/x86_64-darwin/pstops | Bin 25888 -> 26948 bytes Master/bin/x86_64-darwin/ptex | Bin 457536 -> 468852 bytes Master/bin/x86_64-darwin/ptftopl | Bin 145720 -> 152392 bytes Master/bin/x86_64-darwin/sjisconv | Bin 8792 -> 8784 bytes Master/bin/x86_64-darwin/synctex | Bin 145288 -> 157660 bytes Master/bin/x86_64-darwin/t1ascii | Bin 38512 -> 39812 bytes Master/bin/x86_64-darwin/t1asm | Bin 42736 -> 44156 bytes Master/bin/x86_64-darwin/t1binary | Bin 38512 -> 39812 bytes Master/bin/x86_64-darwin/t1disasm | Bin 42760 -> 44196 bytes Master/bin/x86_64-darwin/t1dotlessj | Bin 327944 -> 355272 bytes Master/bin/x86_64-darwin/t1lint | Bin 291592 -> 317392 bytes Master/bin/x86_64-darwin/t1mac | Bin 46792 -> 48204 bytes Master/bin/x86_64-darwin/t1rawafm | Bin 286736 -> 311992 bytes Master/bin/x86_64-darwin/t1reencode | Bin 315000 -> 338688 bytes Master/bin/x86_64-darwin/t1testpage | Bin 303320 -> 329080 bytes Master/bin/x86_64-darwin/t1unmac | Bin 42768 -> 44140 bytes Master/bin/x86_64-darwin/t4ht | Bin 100640 -> 100452 bytes Master/bin/x86_64-darwin/tangle | Bin 116920 -> 118920 bytes Master/bin/x86_64-darwin/tcdialog | Bin 160784 -> 170688 bytes Master/bin/x86_64-darwin/teckit_compile | Bin 955308 -> 919764 bytes Master/bin/x86_64-darwin/tex | Bin 395968 -> 410436 bytes Master/bin/x86_64-darwin/tex2xindy | Bin 26120 -> 22628 bytes Master/bin/x86_64-darwin/tex4ht | Bin 162104 -> 165992 bytes Master/bin/x86_64-darwin/tftopl | Bin 112824 -> 114264 bytes Master/bin/x86_64-darwin/tie | Bin 84152 -> 83848 bytes Master/bin/x86_64-darwin/ttf2afm | Bin 104800 -> 105652 bytes Master/bin/x86_64-darwin/ttf2pk | Bin 272984 -> 278328 bytes Master/bin/x86_64-darwin/ttf2tfm | Bin 293624 -> 302664 bytes Master/bin/x86_64-darwin/ttfdump | Bin 62672 -> 64936 bytes Master/bin/x86_64-darwin/ttftotype42 | Bin 337888 -> 372272 bytes Master/bin/x86_64-darwin/updmap | 1436 +--------------------------- Master/bin/x86_64-darwin/updmap-sys | 31 +- Master/bin/x86_64-darwin/vftovp | Bin 125120 -> 127196 bytes Master/bin/x86_64-darwin/vlna | Bin 17304 -> 18332 bytes Master/bin/x86_64-darwin/vptovf | Bin 75256 -> 79780 bytes Master/bin/x86_64-darwin/weave | Bin 137400 -> 144080 bytes Master/bin/x86_64-darwin/xdv2pdf | Bin 181412 -> 176684 bytes Master/bin/x86_64-darwin/xdvi-xaw | Bin 937504 -> 967120 bytes Master/bin/x86_64-darwin/xdvipdfmx | Bin 1344304 -> 1553688 bytes Master/bin/x86_64-darwin/xetex | Bin 17561852 -> 17777824 bytes Master/bin/x86_64-darwin/xindy.mem | Bin 981224 -> 1019780 bytes Master/bin/x86_64-darwin/xindy.run | Bin 1970600 -> 2284984 bytes 273 files changed, 10 insertions(+), 2932 deletions(-) create mode 100755 Master/bin/universal-darwin/eptex create mode 120000 Master/bin/universal-darwin/inimf create mode 120000 Master/bin/universal-darwin/initex mode change 100755 => 120000 Master/bin/universal-darwin/updmap mode change 100755 => 120000 Master/bin/universal-darwin/updmap-sys create mode 100755 Master/bin/x86_64-darwin/eptex create mode 120000 Master/bin/x86_64-darwin/inimf create mode 120000 Master/bin/x86_64-darwin/initex mode change 100755 => 120000 Master/bin/x86_64-darwin/updmap mode change 100755 => 120000 Master/bin/x86_64-darwin/updmap-sys (limited to 'Master/bin') diff --git a/Master/bin/universal-darwin/T1Wrap b/Master/bin/universal-darwin/T1Wrap index d5103dbf52e..42ef1e4283c 100755 Binary files a/Master/bin/universal-darwin/T1Wrap and b/Master/bin/universal-darwin/T1Wrap differ diff --git a/Master/bin/universal-darwin/afm2pl b/Master/bin/universal-darwin/afm2pl index 0878836f021..53d30f890c9 100755 Binary files a/Master/bin/universal-darwin/afm2pl and b/Master/bin/universal-darwin/afm2pl differ diff --git a/Master/bin/universal-darwin/afm2tfm b/Master/bin/universal-darwin/afm2tfm index da3dd06dd0e..fd5d1e45f91 100755 Binary files a/Master/bin/universal-darwin/afm2tfm and b/Master/bin/universal-darwin/afm2tfm differ diff --git a/Master/bin/universal-darwin/aleph b/Master/bin/universal-darwin/aleph index 1059eaf9d32..9fe3ab6e4af 100755 Binary files a/Master/bin/universal-darwin/aleph and b/Master/bin/universal-darwin/aleph differ diff --git a/Master/bin/universal-darwin/asy b/Master/bin/universal-darwin/asy index e4c0daf31e4..3fde5a91a7b 100755 Binary files a/Master/bin/universal-darwin/asy and b/Master/bin/universal-darwin/asy differ diff --git a/Master/bin/universal-darwin/bbox b/Master/bin/universal-darwin/bbox index a877896d8ff..4c59322774e 100755 Binary files a/Master/bin/universal-darwin/bbox and b/Master/bin/universal-darwin/bbox differ diff --git a/Master/bin/universal-darwin/bg5conv b/Master/bin/universal-darwin/bg5conv index 4be37fafc27..de445747b47 100755 Binary files a/Master/bin/universal-darwin/bg5conv and b/Master/bin/universal-darwin/bg5conv differ diff --git a/Master/bin/universal-darwin/bibtex b/Master/bin/universal-darwin/bibtex index 813760a1f75..3d340c2eb4c 100755 Binary files a/Master/bin/universal-darwin/bibtex and b/Master/bin/universal-darwin/bibtex differ diff --git a/Master/bin/universal-darwin/bibtex8 b/Master/bin/universal-darwin/bibtex8 index dda9090bc9c..b2612873391 100755 Binary files a/Master/bin/universal-darwin/bibtex8 and b/Master/bin/universal-darwin/bibtex8 differ diff --git a/Master/bin/universal-darwin/bibtexu b/Master/bin/universal-darwin/bibtexu index 2884472e04a..e39e3530516 100755 Binary files a/Master/bin/universal-darwin/bibtexu and b/Master/bin/universal-darwin/bibtexu differ diff --git a/Master/bin/universal-darwin/cef5conv b/Master/bin/universal-darwin/cef5conv index f4d7172423b..d94ce5117a5 100755 Binary files a/Master/bin/universal-darwin/cef5conv and b/Master/bin/universal-darwin/cef5conv differ diff --git a/Master/bin/universal-darwin/cefconv b/Master/bin/universal-darwin/cefconv index 64f179a44d7..45025c15ae2 100755 Binary files a/Master/bin/universal-darwin/cefconv and b/Master/bin/universal-darwin/cefconv differ diff --git a/Master/bin/universal-darwin/cefsconv b/Master/bin/universal-darwin/cefsconv index e24f13baf30..359fd514a35 100755 Binary files a/Master/bin/universal-darwin/cefsconv and b/Master/bin/universal-darwin/cefsconv differ diff --git a/Master/bin/universal-darwin/cfftot1 b/Master/bin/universal-darwin/cfftot1 index 0c8cc58cc89..f4443647575 100755 Binary files a/Master/bin/universal-darwin/cfftot1 and b/Master/bin/universal-darwin/cfftot1 differ diff --git a/Master/bin/universal-darwin/chktex b/Master/bin/universal-darwin/chktex index dd2e80908a0..4129d0a5776 100755 Binary files a/Master/bin/universal-darwin/chktex and b/Master/bin/universal-darwin/chktex differ diff --git a/Master/bin/universal-darwin/ctangle b/Master/bin/universal-darwin/ctangle index 2c19b9bab33..5bd27241750 100755 Binary files a/Master/bin/universal-darwin/ctangle and b/Master/bin/universal-darwin/ctangle differ diff --git a/Master/bin/universal-darwin/ctie b/Master/bin/universal-darwin/ctie index c9430696f06..0d4f2a67190 100755 Binary files a/Master/bin/universal-darwin/ctie and b/Master/bin/universal-darwin/ctie differ diff --git a/Master/bin/universal-darwin/cweave b/Master/bin/universal-darwin/cweave index 478fdb6b222..a2d8fe929f6 100755 Binary files a/Master/bin/universal-darwin/cweave and b/Master/bin/universal-darwin/cweave differ diff --git a/Master/bin/universal-darwin/detex b/Master/bin/universal-darwin/detex index e4793b45997..3c92e21de4f 100755 Binary files a/Master/bin/universal-darwin/detex and b/Master/bin/universal-darwin/detex differ diff --git a/Master/bin/universal-darwin/devnag b/Master/bin/universal-darwin/devnag index a859bed2cae..514a69b5520 100755 Binary files a/Master/bin/universal-darwin/devnag and b/Master/bin/universal-darwin/devnag differ diff --git a/Master/bin/universal-darwin/disdvi b/Master/bin/universal-darwin/disdvi index f6e5f92bb96..6a4c973d642 100755 Binary files a/Master/bin/universal-darwin/disdvi and b/Master/bin/universal-darwin/disdvi differ diff --git a/Master/bin/universal-darwin/dt2dv b/Master/bin/universal-darwin/dt2dv index 5f93ad4e842..a95f075c7b9 100755 Binary files a/Master/bin/universal-darwin/dt2dv and b/Master/bin/universal-darwin/dt2dv differ diff --git a/Master/bin/universal-darwin/dv2dt b/Master/bin/universal-darwin/dv2dt index 7da17e128ad..2725ad17bfd 100755 Binary files a/Master/bin/universal-darwin/dv2dt and b/Master/bin/universal-darwin/dv2dt differ diff --git a/Master/bin/universal-darwin/dvi2tty b/Master/bin/universal-darwin/dvi2tty index bf3b59078bc..86c9b2195cf 100755 Binary files a/Master/bin/universal-darwin/dvi2tty and b/Master/bin/universal-darwin/dvi2tty differ diff --git a/Master/bin/universal-darwin/dvibook b/Master/bin/universal-darwin/dvibook index bb3df3375ad..4a46b50eea9 100755 Binary files a/Master/bin/universal-darwin/dvibook and b/Master/bin/universal-darwin/dvibook differ diff --git a/Master/bin/universal-darwin/dviconcat b/Master/bin/universal-darwin/dviconcat index ad6f57cfd06..338c2ec63e2 100755 Binary files a/Master/bin/universal-darwin/dviconcat and b/Master/bin/universal-darwin/dviconcat differ diff --git a/Master/bin/universal-darwin/dvicopy b/Master/bin/universal-darwin/dvicopy index 85d263deecb..6ae6052d48f 100755 Binary files a/Master/bin/universal-darwin/dvicopy and b/Master/bin/universal-darwin/dvicopy differ diff --git a/Master/bin/universal-darwin/dvidvi b/Master/bin/universal-darwin/dvidvi index c4bfc98896a..467a4709750 100755 Binary files a/Master/bin/universal-darwin/dvidvi and b/Master/bin/universal-darwin/dvidvi differ diff --git a/Master/bin/universal-darwin/dvilj b/Master/bin/universal-darwin/dvilj index 87d1e2cd33b..37fd31f78ca 100755 Binary files a/Master/bin/universal-darwin/dvilj and b/Master/bin/universal-darwin/dvilj differ diff --git a/Master/bin/universal-darwin/dvilj2p b/Master/bin/universal-darwin/dvilj2p index f903315d420..fde434fd151 100755 Binary files a/Master/bin/universal-darwin/dvilj2p and b/Master/bin/universal-darwin/dvilj2p differ diff --git a/Master/bin/universal-darwin/dvilj4 b/Master/bin/universal-darwin/dvilj4 index ee35b1082a4..42c71d1c720 100755 Binary files a/Master/bin/universal-darwin/dvilj4 and b/Master/bin/universal-darwin/dvilj4 differ diff --git a/Master/bin/universal-darwin/dvilj4l b/Master/bin/universal-darwin/dvilj4l index 6a3482ceef7..d3f1d987044 100755 Binary files a/Master/bin/universal-darwin/dvilj4l and b/Master/bin/universal-darwin/dvilj4l differ diff --git a/Master/bin/universal-darwin/dvipdfmx b/Master/bin/universal-darwin/dvipdfmx index 708f6e54418..da7585680d1 100755 Binary files a/Master/bin/universal-darwin/dvipdfmx and b/Master/bin/universal-darwin/dvipdfmx differ diff --git a/Master/bin/universal-darwin/dvipng b/Master/bin/universal-darwin/dvipng index dc05337ffe4..5de573990c7 100755 Binary files a/Master/bin/universal-darwin/dvipng and b/Master/bin/universal-darwin/dvipng differ diff --git a/Master/bin/universal-darwin/dvipos b/Master/bin/universal-darwin/dvipos index 5c48401d94c..6abf583ebc1 100755 Binary files a/Master/bin/universal-darwin/dvipos and b/Master/bin/universal-darwin/dvipos differ diff --git a/Master/bin/universal-darwin/dvips b/Master/bin/universal-darwin/dvips index 8c24806b6d6..0079dfddd45 100755 Binary files a/Master/bin/universal-darwin/dvips and b/Master/bin/universal-darwin/dvips differ diff --git a/Master/bin/universal-darwin/dviselect b/Master/bin/universal-darwin/dviselect index 707e56e75f2..b6578bad0b6 100755 Binary files a/Master/bin/universal-darwin/dviselect and b/Master/bin/universal-darwin/dviselect differ diff --git a/Master/bin/universal-darwin/dvisvgm b/Master/bin/universal-darwin/dvisvgm index d9643b3be9e..e520a875372 100755 Binary files a/Master/bin/universal-darwin/dvisvgm and b/Master/bin/universal-darwin/dvisvgm differ diff --git a/Master/bin/universal-darwin/dvitodvi b/Master/bin/universal-darwin/dvitodvi index a1a3a159017..b993830f0b9 100755 Binary files a/Master/bin/universal-darwin/dvitodvi and b/Master/bin/universal-darwin/dvitodvi differ diff --git a/Master/bin/universal-darwin/dvitype b/Master/bin/universal-darwin/dvitype index 988acb81abc..5831a291fb0 100755 Binary files a/Master/bin/universal-darwin/dvitype and b/Master/bin/universal-darwin/dvitype differ diff --git a/Master/bin/universal-darwin/epsffit b/Master/bin/universal-darwin/epsffit index c35ecdbbfaf..4bf9118d7ff 100755 Binary files a/Master/bin/universal-darwin/epsffit and b/Master/bin/universal-darwin/epsffit differ diff --git a/Master/bin/universal-darwin/eptex b/Master/bin/universal-darwin/eptex new file mode 100755 index 00000000000..a3674cede71 Binary files /dev/null and b/Master/bin/universal-darwin/eptex differ diff --git a/Master/bin/universal-darwin/extconv b/Master/bin/universal-darwin/extconv index e98c7cf5011..9c3972d12ca 100755 Binary files a/Master/bin/universal-darwin/extconv and b/Master/bin/universal-darwin/extconv differ diff --git a/Master/bin/universal-darwin/gftodvi b/Master/bin/universal-darwin/gftodvi index 3ee974dad88..d5af5baffeb 100755 Binary files a/Master/bin/universal-darwin/gftodvi and b/Master/bin/universal-darwin/gftodvi differ diff --git a/Master/bin/universal-darwin/gftopk b/Master/bin/universal-darwin/gftopk index b3bd07f5561..4a246ca6229 100755 Binary files a/Master/bin/universal-darwin/gftopk and b/Master/bin/universal-darwin/gftopk differ diff --git a/Master/bin/universal-darwin/gftype b/Master/bin/universal-darwin/gftype index 53f4a3fe708..c095ef7ad99 100755 Binary files a/Master/bin/universal-darwin/gftype and b/Master/bin/universal-darwin/gftype differ diff --git a/Master/bin/universal-darwin/gsftopk b/Master/bin/universal-darwin/gsftopk index 3137f0e511e..439ae94f4d6 100755 Binary files a/Master/bin/universal-darwin/gsftopk and b/Master/bin/universal-darwin/gsftopk differ diff --git a/Master/bin/universal-darwin/hbf2gf b/Master/bin/universal-darwin/hbf2gf index 5e5ed764212..e9911c25cad 100755 Binary files a/Master/bin/universal-darwin/hbf2gf and b/Master/bin/universal-darwin/hbf2gf differ diff --git a/Master/bin/universal-darwin/inimf b/Master/bin/universal-darwin/inimf new file mode 120000 index 00000000000..64dafc4ff66 --- /dev/null +++ b/Master/bin/universal-darwin/inimf @@ -0,0 +1 @@ +mf \ No newline at end of file diff --git a/Master/bin/universal-darwin/initex b/Master/bin/universal-darwin/initex new file mode 120000 index 00000000000..5c8f2b2cc00 --- /dev/null +++ b/Master/bin/universal-darwin/initex @@ -0,0 +1 @@ +tex \ No newline at end of file diff --git a/Master/bin/universal-darwin/kpseaccess b/Master/bin/universal-darwin/kpseaccess index 7862a329f27..d3c2ae22af5 100755 Binary files a/Master/bin/universal-darwin/kpseaccess and b/Master/bin/universal-darwin/kpseaccess differ diff --git a/Master/bin/universal-darwin/kpsereadlink b/Master/bin/universal-darwin/kpsereadlink index e76ddcade63..169cc90e1a4 100755 Binary files a/Master/bin/universal-darwin/kpsereadlink and b/Master/bin/universal-darwin/kpsereadlink differ diff --git a/Master/bin/universal-darwin/kpsestat b/Master/bin/universal-darwin/kpsestat index 1a95c8e7741..f02b6408fa3 100755 Binary files a/Master/bin/universal-darwin/kpsestat and b/Master/bin/universal-darwin/kpsestat differ diff --git a/Master/bin/universal-darwin/kpsewhich b/Master/bin/universal-darwin/kpsewhich index 357745afaa5..34bc9da833a 100755 Binary files a/Master/bin/universal-darwin/kpsewhich and b/Master/bin/universal-darwin/kpsewhich differ diff --git a/Master/bin/universal-darwin/lacheck b/Master/bin/universal-darwin/lacheck index 25b4c757aec..471d34644d4 100755 Binary files a/Master/bin/universal-darwin/lacheck and b/Master/bin/universal-darwin/lacheck differ diff --git a/Master/bin/universal-darwin/luatex b/Master/bin/universal-darwin/luatex index 62e9b542c40..36931852ef3 100755 Binary files a/Master/bin/universal-darwin/luatex and b/Master/bin/universal-darwin/luatex differ diff --git a/Master/bin/universal-darwin/mag b/Master/bin/universal-darwin/mag index a8627114718..ecc93ab706a 100755 Binary files a/Master/bin/universal-darwin/mag and b/Master/bin/universal-darwin/mag differ diff --git a/Master/bin/universal-darwin/makeindex b/Master/bin/universal-darwin/makeindex index 3ba48c94b3b..85281c68d09 100755 Binary files a/Master/bin/universal-darwin/makeindex and b/Master/bin/universal-darwin/makeindex differ diff --git a/Master/bin/universal-darwin/makejvf b/Master/bin/universal-darwin/makejvf index 805934da882..6eb8eb08f80 100755 Binary files a/Master/bin/universal-darwin/makejvf and b/Master/bin/universal-darwin/makejvf differ diff --git a/Master/bin/universal-darwin/mendex b/Master/bin/universal-darwin/mendex index dd09e094e70..3a9c379018a 100755 Binary files a/Master/bin/universal-darwin/mendex and b/Master/bin/universal-darwin/mendex differ diff --git a/Master/bin/universal-darwin/mf b/Master/bin/universal-darwin/mf index c4aa70b3af9..ec938a6035a 100755 Binary files a/Master/bin/universal-darwin/mf and b/Master/bin/universal-darwin/mf differ diff --git a/Master/bin/universal-darwin/mf-nowin b/Master/bin/universal-darwin/mf-nowin index 2ae14fca7e5..4ee2a492495 100755 Binary files a/Master/bin/universal-darwin/mf-nowin and b/Master/bin/universal-darwin/mf-nowin differ diff --git a/Master/bin/universal-darwin/mft b/Master/bin/universal-darwin/mft index 1b40b938305..7882e6884bd 100755 Binary files a/Master/bin/universal-darwin/mft and b/Master/bin/universal-darwin/mft differ diff --git a/Master/bin/universal-darwin/mkofm b/Master/bin/universal-darwin/mkofm index ef820171f08..306575cfbe7 100755 --- a/Master/bin/universal-darwin/mkofm +++ b/Master/bin/universal-darwin/mkofm @@ -1,3 +1,3 @@ #!/bin/sh # Initial definition. For the moment only makes .tfm files. -mktextfm $* +mktextfm "$@" diff --git a/Master/bin/universal-darwin/mmafm b/Master/bin/universal-darwin/mmafm index d398eb7e588..659a2314fb5 100755 Binary files a/Master/bin/universal-darwin/mmafm and b/Master/bin/universal-darwin/mmafm differ diff --git a/Master/bin/universal-darwin/mmpfb b/Master/bin/universal-darwin/mmpfb index 0ceeba76702..9e80dbadce7 100755 Binary files a/Master/bin/universal-darwin/mmpfb and b/Master/bin/universal-darwin/mmpfb differ diff --git a/Master/bin/universal-darwin/mpost b/Master/bin/universal-darwin/mpost index 2560f75ddfa..90f0d485110 100755 Binary files a/Master/bin/universal-darwin/mpost and b/Master/bin/universal-darwin/mpost differ diff --git a/Master/bin/universal-darwin/odvicopy b/Master/bin/universal-darwin/odvicopy index 930c4b54290..3b92d8e6890 100755 Binary files a/Master/bin/universal-darwin/odvicopy and b/Master/bin/universal-darwin/odvicopy differ diff --git a/Master/bin/universal-darwin/odvitype b/Master/bin/universal-darwin/odvitype index eac455f6782..a058de1ac2f 100755 Binary files a/Master/bin/universal-darwin/odvitype and b/Master/bin/universal-darwin/odvitype differ diff --git a/Master/bin/universal-darwin/omfonts b/Master/bin/universal-darwin/omfonts index f193e6833c4..ce27004122d 100755 Binary files a/Master/bin/universal-darwin/omfonts and b/Master/bin/universal-darwin/omfonts differ diff --git a/Master/bin/universal-darwin/otangle b/Master/bin/universal-darwin/otangle index 01cf1ce5f2a..75d634362d3 100755 Binary files a/Master/bin/universal-darwin/otangle and b/Master/bin/universal-darwin/otangle differ diff --git a/Master/bin/universal-darwin/otfinfo b/Master/bin/universal-darwin/otfinfo index 728a798ca34..9168ab2deb4 100755 Binary files a/Master/bin/universal-darwin/otfinfo and b/Master/bin/universal-darwin/otfinfo differ diff --git a/Master/bin/universal-darwin/otftotfm b/Master/bin/universal-darwin/otftotfm index e991ebbfe2d..24c9e250b6d 100755 Binary files a/Master/bin/universal-darwin/otftotfm and b/Master/bin/universal-darwin/otftotfm differ diff --git a/Master/bin/universal-darwin/otp2ocp b/Master/bin/universal-darwin/otp2ocp index 23ef9bcbe6d..06af8cf8d55 100755 Binary files a/Master/bin/universal-darwin/otp2ocp and b/Master/bin/universal-darwin/otp2ocp differ diff --git a/Master/bin/universal-darwin/outocp b/Master/bin/universal-darwin/outocp index 69d2a28e008..406610fe89b 100755 Binary files a/Master/bin/universal-darwin/outocp and b/Master/bin/universal-darwin/outocp differ diff --git a/Master/bin/universal-darwin/patgen b/Master/bin/universal-darwin/patgen index 51e72282bf7..aa9265670db 100755 Binary files a/Master/bin/universal-darwin/patgen and b/Master/bin/universal-darwin/patgen differ diff --git a/Master/bin/universal-darwin/pbibtex b/Master/bin/universal-darwin/pbibtex index 8310e9b464b..f8c0be5b0bb 100755 Binary files a/Master/bin/universal-darwin/pbibtex and b/Master/bin/universal-darwin/pbibtex differ diff --git a/Master/bin/universal-darwin/pdfclose b/Master/bin/universal-darwin/pdfclose index cabf24c9690..0b8e87db2d9 100755 Binary files a/Master/bin/universal-darwin/pdfclose and b/Master/bin/universal-darwin/pdfclose differ diff --git a/Master/bin/universal-darwin/pdfopen b/Master/bin/universal-darwin/pdfopen index 967815d9457..a38715563dd 100755 Binary files a/Master/bin/universal-darwin/pdfopen and b/Master/bin/universal-darwin/pdfopen differ diff --git a/Master/bin/universal-darwin/pdftex b/Master/bin/universal-darwin/pdftex index 82ca0cd4e13..a553cba496e 100755 Binary files a/Master/bin/universal-darwin/pdftex and b/Master/bin/universal-darwin/pdftex differ diff --git a/Master/bin/universal-darwin/pdftosrc b/Master/bin/universal-darwin/pdftosrc index cbcc5721baf..820564af0db 100755 Binary files a/Master/bin/universal-darwin/pdftosrc and b/Master/bin/universal-darwin/pdftosrc differ diff --git a/Master/bin/universal-darwin/pdvitype b/Master/bin/universal-darwin/pdvitype index c6ee5e59721..2f9f6bf2246 100755 Binary files a/Master/bin/universal-darwin/pdvitype and b/Master/bin/universal-darwin/pdvitype differ diff --git a/Master/bin/universal-darwin/pfb2pfa b/Master/bin/universal-darwin/pfb2pfa index 7d54f0d1f43..59aee8cb128 100755 Binary files a/Master/bin/universal-darwin/pfb2pfa and b/Master/bin/universal-darwin/pfb2pfa differ diff --git a/Master/bin/universal-darwin/pk2bm b/Master/bin/universal-darwin/pk2bm index 1680639a12a..6de6ef9e9be 100755 Binary files a/Master/bin/universal-darwin/pk2bm and b/Master/bin/universal-darwin/pk2bm differ diff --git a/Master/bin/universal-darwin/pktogf b/Master/bin/universal-darwin/pktogf index d60dfee32b4..ddcaf1e9c77 100755 Binary files a/Master/bin/universal-darwin/pktogf and b/Master/bin/universal-darwin/pktogf differ diff --git a/Master/bin/universal-darwin/pktype b/Master/bin/universal-darwin/pktype index 37a4a9116b9..38bec98c4e8 100755 Binary files a/Master/bin/universal-darwin/pktype and b/Master/bin/universal-darwin/pktype differ diff --git a/Master/bin/universal-darwin/pltotf b/Master/bin/universal-darwin/pltotf index 320a1419ec1..8e9bd4ecbf2 100755 Binary files a/Master/bin/universal-darwin/pltotf and b/Master/bin/universal-darwin/pltotf differ diff --git a/Master/bin/universal-darwin/pooltype b/Master/bin/universal-darwin/pooltype index b90feb52cdf..6e2e6a9554f 100755 Binary files a/Master/bin/universal-darwin/pooltype and b/Master/bin/universal-darwin/pooltype differ diff --git a/Master/bin/universal-darwin/ppltotf b/Master/bin/universal-darwin/ppltotf index e6f97d018c9..772b343e7d4 100755 Binary files a/Master/bin/universal-darwin/ppltotf and b/Master/bin/universal-darwin/ppltotf differ diff --git a/Master/bin/universal-darwin/ps2pk b/Master/bin/universal-darwin/ps2pk index 3b45edf1660..55df2318cbf 100755 Binary files a/Master/bin/universal-darwin/ps2pk and b/Master/bin/universal-darwin/ps2pk differ diff --git a/Master/bin/universal-darwin/psbook b/Master/bin/universal-darwin/psbook index f579a69a40e..72824019a09 100755 Binary files a/Master/bin/universal-darwin/psbook and b/Master/bin/universal-darwin/psbook differ diff --git a/Master/bin/universal-darwin/psnup b/Master/bin/universal-darwin/psnup index 0346a5605d1..af6803ff444 100755 Binary files a/Master/bin/universal-darwin/psnup and b/Master/bin/universal-darwin/psnup differ diff --git a/Master/bin/universal-darwin/psresize b/Master/bin/universal-darwin/psresize index 979e1542444..279cfcc6f99 100755 Binary files a/Master/bin/universal-darwin/psresize and b/Master/bin/universal-darwin/psresize differ diff --git a/Master/bin/universal-darwin/psselect b/Master/bin/universal-darwin/psselect index 1ce28549f67..e08047710c1 100755 Binary files a/Master/bin/universal-darwin/psselect and b/Master/bin/universal-darwin/psselect differ diff --git a/Master/bin/universal-darwin/pstops b/Master/bin/universal-darwin/pstops index 227e53e3393..d5fbbc1390d 100755 Binary files a/Master/bin/universal-darwin/pstops and b/Master/bin/universal-darwin/pstops differ diff --git a/Master/bin/universal-darwin/ptex b/Master/bin/universal-darwin/ptex index 73f4e0559e2..ad8c948e2de 100755 Binary files a/Master/bin/universal-darwin/ptex and b/Master/bin/universal-darwin/ptex differ diff --git a/Master/bin/universal-darwin/ptftopl b/Master/bin/universal-darwin/ptftopl index ee5897b38b4..3f5c7963855 100755 Binary files a/Master/bin/universal-darwin/ptftopl and b/Master/bin/universal-darwin/ptftopl differ diff --git a/Master/bin/universal-darwin/sjisconv b/Master/bin/universal-darwin/sjisconv index 7a065c5bb6d..2c94edc94ae 100755 Binary files a/Master/bin/universal-darwin/sjisconv and b/Master/bin/universal-darwin/sjisconv differ diff --git a/Master/bin/universal-darwin/synctex b/Master/bin/universal-darwin/synctex index c90b1d9daf2..d33f955fac8 100755 Binary files a/Master/bin/universal-darwin/synctex and b/Master/bin/universal-darwin/synctex differ diff --git a/Master/bin/universal-darwin/t1ascii b/Master/bin/universal-darwin/t1ascii index 6213a9e1788..665ba458d8c 100755 Binary files a/Master/bin/universal-darwin/t1ascii and b/Master/bin/universal-darwin/t1ascii differ diff --git a/Master/bin/universal-darwin/t1asm b/Master/bin/universal-darwin/t1asm index a6b1082bef5..3864d40fca1 100755 Binary files a/Master/bin/universal-darwin/t1asm and b/Master/bin/universal-darwin/t1asm differ diff --git a/Master/bin/universal-darwin/t1binary b/Master/bin/universal-darwin/t1binary index 251592c135d..10be6026d08 100755 Binary files a/Master/bin/universal-darwin/t1binary and b/Master/bin/universal-darwin/t1binary differ diff --git a/Master/bin/universal-darwin/t1disasm b/Master/bin/universal-darwin/t1disasm index 7251801662e..9ddf22fd5cc 100755 Binary files a/Master/bin/universal-darwin/t1disasm and b/Master/bin/universal-darwin/t1disasm differ diff --git a/Master/bin/universal-darwin/t1dotlessj b/Master/bin/universal-darwin/t1dotlessj index 993bd861d92..8ce3b42b693 100755 Binary files a/Master/bin/universal-darwin/t1dotlessj and b/Master/bin/universal-darwin/t1dotlessj differ diff --git a/Master/bin/universal-darwin/t1lint b/Master/bin/universal-darwin/t1lint index 809dde6e783..49d9d48f1a9 100755 Binary files a/Master/bin/universal-darwin/t1lint and b/Master/bin/universal-darwin/t1lint differ diff --git a/Master/bin/universal-darwin/t1mac b/Master/bin/universal-darwin/t1mac index 81090474e5c..201abd919a9 100755 Binary files a/Master/bin/universal-darwin/t1mac and b/Master/bin/universal-darwin/t1mac differ diff --git a/Master/bin/universal-darwin/t1rawafm b/Master/bin/universal-darwin/t1rawafm index 7d75788f8d0..c230fdc3878 100755 Binary files a/Master/bin/universal-darwin/t1rawafm and b/Master/bin/universal-darwin/t1rawafm differ diff --git a/Master/bin/universal-darwin/t1reencode b/Master/bin/universal-darwin/t1reencode index 897c06a7a38..6e8e0c40062 100755 Binary files a/Master/bin/universal-darwin/t1reencode and b/Master/bin/universal-darwin/t1reencode differ diff --git a/Master/bin/universal-darwin/t1testpage b/Master/bin/universal-darwin/t1testpage index edda8415bac..99b4b5a231d 100755 Binary files a/Master/bin/universal-darwin/t1testpage and b/Master/bin/universal-darwin/t1testpage differ diff --git a/Master/bin/universal-darwin/t1unmac b/Master/bin/universal-darwin/t1unmac index 034dc3545da..3d24f49ca9c 100755 Binary files a/Master/bin/universal-darwin/t1unmac and b/Master/bin/universal-darwin/t1unmac differ diff --git a/Master/bin/universal-darwin/t4ht b/Master/bin/universal-darwin/t4ht index fb114d65a2f..ac788359419 100755 Binary files a/Master/bin/universal-darwin/t4ht and b/Master/bin/universal-darwin/t4ht differ diff --git a/Master/bin/universal-darwin/tangle b/Master/bin/universal-darwin/tangle index 1836d9d2019..aac006e31e2 100755 Binary files a/Master/bin/universal-darwin/tangle and b/Master/bin/universal-darwin/tangle differ diff --git a/Master/bin/universal-darwin/tcdialog b/Master/bin/universal-darwin/tcdialog index f0f7be13623..d50a7cc1ab5 100755 Binary files a/Master/bin/universal-darwin/tcdialog and b/Master/bin/universal-darwin/tcdialog differ diff --git a/Master/bin/universal-darwin/teckit_compile b/Master/bin/universal-darwin/teckit_compile index cf217971621..c12cc02a79b 100755 Binary files a/Master/bin/universal-darwin/teckit_compile and b/Master/bin/universal-darwin/teckit_compile differ diff --git a/Master/bin/universal-darwin/tex b/Master/bin/universal-darwin/tex index bb2186ae405..4eb58bc7ae2 100755 Binary files a/Master/bin/universal-darwin/tex and b/Master/bin/universal-darwin/tex differ diff --git a/Master/bin/universal-darwin/tex2xindy b/Master/bin/universal-darwin/tex2xindy index d5e694b8c82..95cd89c9ff3 100755 Binary files a/Master/bin/universal-darwin/tex2xindy and b/Master/bin/universal-darwin/tex2xindy differ diff --git a/Master/bin/universal-darwin/tex4ht b/Master/bin/universal-darwin/tex4ht index 1fdaeb8e1b0..b42a8748adc 100755 Binary files a/Master/bin/universal-darwin/tex4ht and b/Master/bin/universal-darwin/tex4ht differ diff --git a/Master/bin/universal-darwin/tftopl b/Master/bin/universal-darwin/tftopl index e113f23f862..c6a120b8c33 100755 Binary files a/Master/bin/universal-darwin/tftopl and b/Master/bin/universal-darwin/tftopl differ diff --git a/Master/bin/universal-darwin/tie b/Master/bin/universal-darwin/tie index dbf7edd30c7..7c5d31b607d 100755 Binary files a/Master/bin/universal-darwin/tie and b/Master/bin/universal-darwin/tie differ diff --git a/Master/bin/universal-darwin/ttf2afm b/Master/bin/universal-darwin/ttf2afm index ed852ec9652..1613302ae7d 100755 Binary files a/Master/bin/universal-darwin/ttf2afm and b/Master/bin/universal-darwin/ttf2afm differ diff --git a/Master/bin/universal-darwin/ttf2pk b/Master/bin/universal-darwin/ttf2pk index f0d1d4ac59c..1810aa59bb0 100755 Binary files a/Master/bin/universal-darwin/ttf2pk and b/Master/bin/universal-darwin/ttf2pk differ diff --git a/Master/bin/universal-darwin/ttf2tfm b/Master/bin/universal-darwin/ttf2tfm index f98e32682d9..0e33a394d7c 100755 Binary files a/Master/bin/universal-darwin/ttf2tfm and b/Master/bin/universal-darwin/ttf2tfm differ diff --git a/Master/bin/universal-darwin/ttfdump b/Master/bin/universal-darwin/ttfdump index 1a4f1ae2574..42560927e42 100755 Binary files a/Master/bin/universal-darwin/ttfdump and b/Master/bin/universal-darwin/ttfdump differ diff --git a/Master/bin/universal-darwin/ttftotype42 b/Master/bin/universal-darwin/ttftotype42 index c67ab903112..e1cae1ed638 100755 Binary files a/Master/bin/universal-darwin/ttftotype42 and b/Master/bin/universal-darwin/ttftotype42 differ diff --git a/Master/bin/universal-darwin/updmap b/Master/bin/universal-darwin/updmap deleted file mode 100755 index 2483052a7de..00000000000 --- a/Master/bin/universal-darwin/updmap +++ /dev/null @@ -1,1435 +0,0 @@ -#!/bin/sh -# updmap - utility to maintain map files for outline fonts. -# Public domain. Originally written by Thomas Esser. -# Run with --help for usage. - -############################################################################### -# program history: -# further changes in texk/tetex/ChangeLog. -# Sun May 25 21:05:32 CEST 2008 (Reinhard Kotucha) -# add function symlink_or_copy needed by tl-portable. -# Post-te retirement, now maintained in TeX Live; see -# Build/texk/tetex/ChangeLog for further changes. -# Fr Jul 22 07:22:38 CEST 2005 -# write hint about log file into output files -# Fr Apr 8 19:15:05 CEST 2005 -# cleanup now has an argument for the return code -# So Mär 27 18:52:06 CEST 2005 -# honor $TMPDIR, $TEMP and $TMP, not just $TMP -# Do Mär 10 19:31:39 CET 2005 -# add a few quotes for $cnfFile with whitespace -# Sa Jan 15 18:13:46 CET 2005 -# avoid multiple variable assignments in one statement -# Sa Dez 25 12:44:23 CET 2004 -# implementaion adopted for teTeX-3.0 (tcfmgr) -# Mi Nov 3 16:33:22 CET 2004 -# add "--setoption option=value" syntax -# Fr Okt 29 21:05:53 CEST 2004 -# add --enable Map=... / --enable MixedMap=... -# Mi Okt 20 19:17:19 CEST 2004 -# transcript added; even better warnings / error messages -# So Okt 17 19:07:17 CEST 2004 -# improved warnings / error messages -# added --syncwithtrees -# added --listavailablemaps -# Mi Okt 6 16:37:49 CEST 2004 -# commenty may start with any of *#;% -# Sun Aug 1 11:42:14 CEST 2004, te -# remove pdftex related hacks; pdftex no longer needs them! -# Thu May 13 22:04:23 CEST 2004, te -# support user with new map file locations -# Fri Mar 19 15:22:55 CET 2004, te -# output "xxx yyy" instead of " xxx yyy " (less blanks) -# Fri Jan 2 22:41:11 CET 2004, te: -# add version string -# Wed Aug 20 18:51:47 CEST 2003 -# store map files to fonts/map, add options for dvipsoutputdir, -# pdftexoutputdir, dvipdfmoutputdir -# Mon Mar 24 13:40:55 CET 2003 -# fix fmex[789] for dvipdfm (no -r option) -# Sun Mar 23 18:58:00 CET 2003 -# make the script robust against whitespace in filenames -# Mon Jan 27 22:38:44 CET 2003 -# don't call a function before processOptions; we may loose our -# argument list with some broken shells -# Mon Jan 27 06:55:28 CET 2003 -# fix unportable egrep / sed -# Sat Jan 18 10:10:26 CET 2003 -# use $tmp8 in dvips2dvipdfm() -# Thu Jan 2 23:14:34 CET 2003 -# add umask 022, so generated files are always world-readable -# Sun Oct 27 11:33:04 CET 2002 -# write output in normalized format -# add support for dvipdfm -# Mon Sep 22 19:18:57 CEST 2002 -# fix typo: buildin -> builtin -# Mon Sep 2 19:18:57 CEST 2002 -# fix condensed <-> narrow mapping -# Sun Sep 1 15:02:28 CEST 2002 -# add dvipsDownloadBase35 / pdftexDownloadBase14 options -# Wed May 22 20:00:13 CEST 2002 -# listmaps option added by Gerben Wierda -# Tue May 21 05:27:37 CEST 2002 -# now removing map files before rewriting them; fixes permission problems -# Tue May 21 05:05:34 CEST 2002: -# cli options added: showoptions, setoption, enable, disable, nomkmap -# now even more verbose; now reporting non-existing map files -# fixing trap for MAC OS/X compatibility -# Fri May 17 22:38:37 CEST 2002: -# rewritten from teTeX-1.0 version; Completely new designed. -############################################################################### - -test -f /bin/ksh && test -z "$RUNNING_KSH" \ - && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \ - && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; } -unset RUNNING_KSH - -test -f /bin/bsh && test -z "$RUNNING_BSH" \ - && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \ - && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; } -unset RUNNING_BSH - -export PATH - -# hack around a bug in zsh: -test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' - -# the version string -version='$Id: updmap 17423 2010-03-11 17:53:34Z karl $' - -# -############################################################################### -# help() -# display help message and exit -############################################################################### -help() -{ - cat < -eof - (exit 0); exit -} - -# -############################################################################### -# verboseMsg(msg) -# print `msg' to stderr is $verbose is true -############################################################################### -verboseMsg() { - test -n "$log" && echo ${1+"$@"} >> "$log" - $verbose && echo ${1+"$@"} >&2 -} - -############################################################################### -# verboseCat() -# cat to stderr is $verbose is true -############################################################################### -verboseCat() { - if $verbose; then - if test -n "$log"; then - cat ${1+"$@"} | tee -a "$log" >&2 - else - cat ${1+"$@"} >&2 - fi - else - test -n "$log" && cat ${1+"$@"} >> "$log" - fi -} - -############################################################################### -# warn(msg) -# print `msg' to stderr -############################################################################### -warn() -{ - test -n "$log" && echo ${1+"$@"} >> "$log" - echo ${1+"$@"} >&2 -} - -############################################################################### -# abort(errmsg) -# print `errmsg' to stderr and exit with error code 1 -############################################################################### -abort() -{ - warn "$progname: $1." - cleanup 1 -} - -############################################################################### -# cfgval(variable) -# read variable ($1) from config file, first match wins -############################################################################### -cfgval() -{ - cat "$cnfFile" | sed -n 's/^'"$1"'[ =][ =]*//p' | sed q -} - -############################################################################### -# symlink_or_copy() -# if --copy is not set, try to create a symlink. If this fails, write -# a message to stderr and copy the file instead. -############################################################################### -symlink_or_copy() -{ - if $copy; then - $copy_cmd "$1" "$2" - else - $link_cmd "$1" "$2" || - { - echo "Creating symbolic link failed, the file is copied instead." 1>&2 && - $copy_cmd "$1" "$2" - } - fi -} - -############################################################################### -# setupSymlinks() -# set symlink (or copy) -# for psfonts.map according to dvipsPreferOutline variable, -# and for pdftex.map and dvipdfm.map according to pdftexDownloadBase14. -############################################################################### -setupSymlinks() -{ - ( - cd "$dvipsoutputdir" || exit 1 - rm -f psfonts.map - if test "x$dvipsPreferOutline" = xtrue; then - symlink_or_copy psfonts_t1.map psfonts.map - else - symlink_or_copy psfonts_pk.map psfonts.map - fi - - cd "$pdftexoutputdir" || exit 1 - rm -f pdftex.map - if test "x$pdftexDownloadBase14" = xtrue; then - symlink_or_copy pdftex_dl14.map pdftex.map - else - symlink_or_copy pdftex_ndl14.map pdftex.map - fi - - cd "$dvipdfmoutputdir" || exit 1 - rm -f dvipdfm.map - if test "x$dvipdfmDownloadBase14" = xtrue; then - symlink_or_copy dvipdfm_dl14.map dvipdfm.map - else - symlink_or_copy dvipdfm_ndl14.map dvipdfm.map - fi - ) -} - -############################################################################### -# transLW35(args ...) -# transform fontname and filenames according to transformation specified -# by mode -############################################################################### -transLW35() -{ - case $mode in - ""|URWkb) - cat ${1+"$@"} - ;; - URW) - fileURW ${1+"$@"} - ;; - ADOBE|ADOBEkb) - psADOBE ${1+"$@"} | file$mode - ;; - esac -} - -############################################################################### -# catMaps(regex) -# filter config file by regex for map lines and extract the map filenames. -# These are then looked up (by kpsewhich in locateMap) and the content of -# all map files is send to stdout. -############################################################################### -catMaps() -{ - rm -f $catMapsFailed - egrep "$1" "$cnfFile" \ - | sed 's@#.*@@' \ - | awk '{print $2}' \ - | sort \ - | uniq \ - | grep . > $tmp4 - - while read map; do - file=`locateMap "$map"` || { touch $catMapsFailed; break; } - - # output the file; also output a newline, because the final newline - # might be missing in the map file; Empty lines are filtered out later, - # so it does not really hurt do do this here. - test -n "$file" && { cat "$file"; echo; } - done < $tmp4 - if test -f $catMapsFailed; then - false; return 1 - else - true; return 0 - fi -} - -############################################################################### -# configReplace(file, pattern, line) -# The first line in file that matches pattern gets replaced by line. -# line will be added at the end of the file if pattern does not match. -############################################################################### -configReplace() -{ - file=$1; pat=$2; line=$3 - - if grep "$pat" "$file" >/dev/null; then - ed "$file" >/dev/null 2>&1 <<-eof - /$pat/ - c - $line - . - w - q -eof - else - echo "$line" >> "$file" - fi -} - -############################################################################### -# setOption (option, value) -# sets option to value in the config file (replacing the existing setting -# or by adding a new line to the config file). -############################################################################### -setOption() -{ - opt=$1 - val=$2 - case "$opt" in - LW35) - case "$val" in - URWkb|URW|ADOBE|ADOBEkb) - ;; - *) - abort "invalid value $val for option $opt" - ;; - esac - ;; - dvipsPreferOutline|dvipsDownloadBase35|pdftexDownloadBase14|dvipdfmDownloadBase14) - case "$val" in - true|false) - ;; - *) - abort "invalid value $val for option $opt" - esac - ;; - *) - abort "unsupported option $opt" - ;; - esac - - configReplace "$cnfFile" "^$opt[ ]" "$opt $val" -} - -############################################################################### -# enableMap (type, map) -# enables an entry in the config file for map with a given type. -############################################################################### -enableMap() -{ - case $1 in - Map|MixedMap) - ;; - *) - abort "invalid mapType $1" - ;; - esac - - # a map can only have one type, so we carefully disable everything - # about map here: - disableMap "$2" - - # now enable with the right type: - configReplace "$cnfFile" "^#![ ]*$1[ ]*$2" "$1 $2" -} - -############################################################################### -# disableMap (map) -# disables map in config file (any type) -############################################################################### -disableMap() -{ - #mapType=`awk '($1 == "MixedMap" || $1 == "Map") && $2 == map { print $1 }' \ - # map=$1 <"$cnfFile" | sort | uniq` - map=$1 - mapType=`egrep "^(MixedMap|Map)[ ]*$map( | |$)" "$cnfFile" | awk '{print $1}' | sort | uniq` - for type in $mapType; do - configReplace "$cnfFile" "^$type[ ]*$1" "#! $type $1" - done -} - -############################################################################### -# psADOBE() -# transform fontnames from URW to Adobe -############################################################################### -psADOBE() -{ - sed \ - -e 's/ URWGothicL-Demi / AvantGarde-Demi /' \ - -e 's/ URWGothicL-DemiObli / AvantGarde-DemiOblique /' \ - -e 's/ URWGothicL-Book / AvantGarde-Book /' \ - -e 's/ URWGothicL-BookObli / AvantGarde-BookOblique /' \ - -e 's/ URWBookmanL-DemiBold / Bookman-Demi /' \ - -e 's/ URWBookmanL-DemiBoldItal / Bookman-DemiItalic /' \ - -e 's/ URWBookmanL-Ligh / Bookman-Light /' \ - -e 's/ URWBookmanL-LighItal / Bookman-LightItalic /' \ - -e 's/ NimbusMonL-Bold / Courier-Bold /' \ - -e 's/ NimbusMonL-BoldObli / Courier-BoldOblique /' \ - -e 's/ NimbusMonL-Regu / Courier /' \ - -e 's/ NimbusMonL-ReguObli / Courier-Oblique /' \ - -e 's/ NimbusSanL-Bold / Helvetica-Bold /' \ - -e 's/ NimbusSanL-BoldCond / Helvetica-Narrow-Bold /' \ - -e 's/ NimbusSanL-BoldItal / Helvetica-BoldOblique /' \ - -e 's/ NimbusSanL-BoldCondItal / Helvetica-Narrow-BoldOblique /' \ - -e 's/ NimbusSanL-Regu / Helvetica /' \ - -e 's/ NimbusSanL-ReguCond / Helvetica-Narrow /' \ - -e 's/ NimbusSanL-ReguItal / Helvetica-Oblique /' \ - -e 's/ NimbusSanL-ReguCondItal / Helvetica-Narrow-Oblique /' \ - -e 's/ CenturySchL-Bold / NewCenturySchlbk-Bold /' \ - -e 's/ CenturySchL-BoldItal / NewCenturySchlbk-BoldItalic /' \ - -e 's/ CenturySchL-Roma / NewCenturySchlbk-Roman /' \ - -e 's/ CenturySchL-Ital / NewCenturySchlbk-Italic /' \ - -e 's/ URWPalladioL-Bold / Palatino-Bold /' \ - -e 's/ URWPalladioL-BoldItal / Palatino-BoldItalic /' \ - -e 's/ URWPalladioL-Roma / Palatino-Roman /' \ - -e 's/ URWPalladioL-Ital / Palatino-Italic /' \ - -e 's/ StandardSymL / Symbol /' \ - -e 's/ NimbusRomNo9L-Medi / Times-Bold /' \ - -e 's/ NimbusRomNo9L-MediItal / Times-BoldItalic /' \ - -e 's/ NimbusRomNo9L-Regu / Times-Roman /' \ - -e 's/ NimbusRomNo9L-ReguItal / Times-Italic /' \ - -e 's/ URWChanceryL-MediItal / ZapfChancery-MediumItalic /' \ - -e 's/ Dingbats / ZapfDingbats /' \ - ${1+"$@"} -} - -############################################################################### -# fileADOBEkb() -# transform filenames from URW to ADOBE (both berry names) -############################################################################### -fileADOBEkb() -{ - sed \ - -e 's/\([^A-Za-z]\)uagd8a.pfb/\1pagd8a.pfb/' \ - -e 's/\([^A-Za-z]\)uagdo8a.pfb/\1pagdo8a.pfb/' \ - -e 's/\([^A-Za-z]\)uagk8a.pfb/\1pagk8a.pfb/' \ - -e 's/\([^A-Za-z]\)uagko8a.pfb/\1pagko8a.pfb/' \ - -e 's/\([^A-Za-z]\)ubkd8a.pfb/\1pbkd8a.pfb/' \ - -e 's/\([^A-Za-z]\)ubkdi8a.pfb/\1pbkdi8a.pfb/' \ - -e 's/\([^A-Za-z]\)ubkl8a.pfb/\1pbkl8a.pfb/' \ - -e 's/\([^A-Za-z]\)ubkli8a.pfb/\1pbkli8a.pfb/' \ - -e 's/\([^A-Za-z]\)ucrb8a.pfb/\1pcrb8a.pfb/' \ - -e 's/\([^A-Za-z]\)ucrbo8a.pfb/\1pcrbo8a.pfb/' \ - -e 's/\([^A-Za-z]\)ucrr8a.pfb/\1pcrr8a.pfb/' \ - -e 's/\([^A-Za-z]\)ucrro8a.pfb/\1pcrro8a.pfb/' \ - -e 's/\([^A-Za-z]\)uhvb8a.pfb/\1phvb8a.pfb/' \ - -e 's/\([^A-Za-z]\)uhvb8ac.pfb/\1phvb8an.pfb/' \ - -e 's/\([^A-Za-z]\)uhvbo8a.pfb/\1phvbo8a.pfb/' \ - -e 's/\([^A-Za-z]\)uhvbo8ac.pfb/\1phvbo8an.pfb/' \ - -e 's/\([^A-Za-z]\)uhvr8a.pfb/\1phvr8a.pfb/' \ - -e 's/\([^A-Za-z]\)uhvr8ac.pfb/\1phvr8an.pfb/' \ - -e 's/\([^A-Za-z]\)uhvro8a.pfb/\1phvro8a.pfb/' \ - -e 's/\([^A-Za-z]\)uhvro8ac.pfb/\1phvro8an.pfb/' \ - -e 's/\([^A-Za-z]\)uncb8a.pfb/\1pncb8a.pfb/' \ - -e 's/\([^A-Za-z]\)uncbi8a.pfb/\1pncbi8a.pfb/' \ - -e 's/\([^A-Za-z]\)uncr8a.pfb/\1pncr8a.pfb/' \ - -e 's/\([^A-Za-z]\)uncri8a.pfb/\1pncri8a.pfb/' \ - -e 's/\([^A-Za-z]\)uplb8a.pfb/\1pplb8a.pfb/' \ - -e 's/\([^A-Za-z]\)uplbi8a.pfb/\1pplbi8a.pfb/' \ - -e 's/\([^A-Za-z]\)uplr8a.pfb/\1pplr8a.pfb/' \ - -e 's/\([^A-Za-z]\)uplri8a.pfb/\1pplri8a.pfb/' \ - -e 's/\([^A-Za-z]\)usyr.pfb/\1psyr.pfb/' \ - -e 's/\([^A-Za-z]\)utmb8a.pfb/\1ptmb8a.pfb/' \ - -e 's/\([^A-Za-z]\)utmbi8a.pfb/\1ptmbi8a.pfb/' \ - -e 's/\([^A-Za-z]\)utmr8a.pfb/\1ptmr8a.pfb/' \ - -e 's/\([^A-Za-z]\)utmri8a.pfb/\1ptmri8a.pfb/' \ - -e 's/\([^A-Za-z]\)uzcmi8a.pfb/\1pzcmi8a.pfb/' \ - -e 's/\([^A-Za-z]\)uzdr.pfb/\1pzdr.pfb/' \ - ${1+"$@"} -} - -############################################################################### -# fileURW() -# transform filenames from URWkb (berry names) to URW (vendor names) -############################################################################### -fileURW() -{ - sed \ - -e 's/\([^A-Za-z]\)uagd8a.pfb/\1a010015l.pfb/' \ - -e 's/\([^A-Za-z]\)uagdo8a.pfb/\1a010035l.pfb/' \ - -e 's/\([^A-Za-z]\)uagk8a.pfb/\1a010013l.pfb/' \ - -e 's/\([^A-Za-z]\)uagko8a.pfb/\1a010033l.pfb/' \ - -e 's/\([^A-Za-z]\)ubkd8a.pfb/\1b018015l.pfb/' \ - -e 's/\([^A-Za-z]\)ubkdi8a.pfb/\1b018035l.pfb/' \ - -e 's/\([^A-Za-z]\)ubkl8a.pfb/\1b018012l.pfb/' \ - -e 's/\([^A-Za-z]\)ubkli8a.pfb/\1b018032l.pfb/' \ - -e 's/\([^A-Za-z]\)ucrb8a.pfb/\1n022004l.pfb/' \ - -e 's/\([^A-Za-z]\)ucrbo8a.pfb/\1n022024l.pfb/' \ - -e 's/\([^A-Za-z]\)ucrr8a.pfb/\1n022003l.pfb/' \ - -e 's/\([^A-Za-z]\)ucrro8a.pfb/\1n022023l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvb8a.pfb/\1n019004l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvb8ac.pfb/\1n019044l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvbo8a.pfb/\1n019024l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvbo8ac.pfb/\1n019064l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvr8a.pfb/\1n019003l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvr8ac.pfb/\1n019043l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvro8a.pfb/\1n019023l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvro8ac.pfb/\1n019063l.pfb/' \ - -e 's/\([^A-Za-z]\)uncb8a.pfb/\1c059016l.pfb/' \ - -e 's/\([^A-Za-z]\)uncbi8a.pfb/\1c059036l.pfb/' \ - -e 's/\([^A-Za-z]\)uncr8a.pfb/\1c059013l.pfb/' \ - -e 's/\([^A-Za-z]\)uncri8a.pfb/\1c059033l.pfb/' \ - -e 's/\([^A-Za-z]\)uplb8a.pfb/\1p052004l.pfb/' \ - -e 's/\([^A-Za-z]\)uplbi8a.pfb/\1p052024l.pfb/' \ - -e 's/\([^A-Za-z]\)uplr8a.pfb/\1p052003l.pfb/' \ - -e 's/\([^A-Za-z]\)uplri8a.pfb/\1p052023l.pfb/' \ - -e 's/\([^A-Za-z]\)usyr.pfb/\1s050000l.pfb/' \ - -e 's/\([^A-Za-z]\)utmb8a.pfb/\1n021004l.pfb/' \ - -e 's/\([^A-Za-z]\)utmbi8a.pfb/\1n021024l.pfb/' \ - -e 's/\([^A-Za-z]\)utmr8a.pfb/\1n021003l.pfb/' \ - -e 's/\([^A-Za-z]\)utmri8a.pfb/\1n021023l.pfb/' \ - -e 's/\([^A-Za-z]\)uzcmi8a.pfb/\1z003034l.pfb/' \ - -e 's/\([^A-Za-z]\)uzdr.pfb/\1d050000l.pfb/' \ - ${1+"$@"} -} - -############################################################################### -# fileADOBE() -# transform filenames from URWkb (berry names) to ADOBE (vendor names) -############################################################################### -fileADOBE() -{ - sed \ - -e 's/\([^A-Za-z]\)uagd8a.pfb/\1agd_____.pfb/' \ - -e 's/\([^A-Za-z]\)uagdo8a.pfb/\1agdo____.pfb/' \ - -e 's/\([^A-Za-z]\)uagk8a.pfb/\1agw_____.pfb/' \ - -e 's/\([^A-Za-z]\)uagko8a.pfb/\1agwo____.pfb/' \ - -e 's/\([^A-Za-z]\)ubkd8a.pfb/\1bkd_____.pfb/' \ - -e 's/\([^A-Za-z]\)ubkdi8a.pfb/\1bkdi____.pfb/' \ - -e 's/\([^A-Za-z]\)ubkl8a.pfb/\1bkl_____.pfb/' \ - -e 's/\([^A-Za-z]\)ubkli8a.pfb/\1bkli____.pfb/' \ - -e 's/\([^A-Za-z]\)ucrb8a.pfb/\1cob_____.pfb/' \ - -e 's/\([^A-Za-z]\)ucrbo8a.pfb/\1cobo____.pfb/' \ - -e 's/\([^A-Za-z]\)ucrr8a.pfb/\1com_____.pfb/' \ - -e 's/\([^A-Za-z]\)ucrro8a.pfb/\1coo_____.pfb/' \ - -e 's/\([^A-Za-z]\)uhvb8a.pfb/\1hvb_____.pfb/' \ - -e 's/\([^A-Za-z]\)uhvb8ac.pfb/\1hvnb____.pfb/' \ - -e 's/\([^A-Za-z]\)uhvbo8a.pfb/\1hvbo____.pfb/' \ - -e 's/\([^A-Za-z]\)uhvbo8ac.pfb/\1hvnbo___.pfb/' \ - -e 's/\([^A-Za-z]\)uhvr8a.pfb/\1hv______.pfb/' \ - -e 's/\([^A-Za-z]\)uhvr8ac.pfb/\1hvn_____.pfb/' \ - -e 's/\([^A-Za-z]\)uhvro8a.pfb/\1hvo_____.pfb/' \ - -e 's/\([^A-Za-z]\)uhvro8ac.pfb/\1hvno____.pfb/' \ - -e 's/\([^A-Za-z]\)uncb8a.pfb/\1ncb_____.pfb/' \ - -e 's/\([^A-Za-z]\)uncbi8a.pfb/\1ncbi____.pfb/' \ - -e 's/\([^A-Za-z]\)uncr8a.pfb/\1ncr_____.pfb/' \ - -e 's/\([^A-Za-z]\)uncri8a.pfb/\1nci_____.pfb/' \ - -e 's/\([^A-Za-z]\)uplb8a.pfb/\1pob_____.pfb/' \ - -e 's/\([^A-Za-z]\)uplbi8a.pfb/\1pobi____.pfb/' \ - -e 's/\([^A-Za-z]\)uplr8a.pfb/\1por_____.pfb/' \ - -e 's/\([^A-Za-z]\)uplri8a.pfb/\1poi_____.pfb/' \ - -e 's/\([^A-Za-z]\)usyr.pfb/\1sy______.pfb/' \ - -e 's/\([^A-Za-z]\)utmb8a.pfb/\1tib_____.pfb/' \ - -e 's/\([^A-Za-z]\)utmbi8a.pfb/\1tibi____.pfb/' \ - -e 's/\([^A-Za-z]\)utmr8a.pfb/\1tir_____.pfb/' \ - -e 's/\([^A-Za-z]\)utmri8a.pfb/\1tii_____.pfb/' \ - -e 's/\([^A-Za-z]\)uzcmi8a.pfb/\1zcmi____.pfb/' \ - -e 's/\([^A-Za-z]\)uzdr.pfb/\1zd______.pfb/' \ - ${1+"$@"} -} - -############################################################################### -# locateWeb2c (file ...) -# apply kpsewhich with format 'web2c files' -############################################################################### -locateWeb2c() -{ - kpsewhich --format='web2c files' ${1+"$@"} -} - -############################################################################### -# locateMap (file ...) -# apply kpsewhich with format 'map' -############################################################################### -locateMap() -{ - - # Always use the "migration checking version". This might become - # consigurable, but for now, we always want to check. - if :; then - locateMapMigrate "$@" - return $? - fi - - # The old version of the code; not used at the moment. - for map - do - file=`kpsewhich --format=map "$map"` - if test -f "$file"; then - verboseMsg "$progname: using map file \`$file'" - echo "$file" - else - warn "map file \`$map' not found." - fi - done -} - -############################################################################### -# locateMapMigrate (file ...) -# look for map file; assist user with possibly files in wrong locations; -# also watch out for possibly hidden conflicts -############################################################################### -locateMapMigrate() -{ - for map - do - # look up using the new search path - file=`kpsewhich --format=map "$map"` - - # look up using the old search path - file2=`kpsewhich --format='dvips config' "$map"` - - # Well, the search paths should not overlap. If they do, and if - # file1 = file2, we don't want to complain about file2, so: - test "x$file" = "x$file2" && file2= - - if test -f "$file"; then - - verboseMsg "$progname: using map file \`$file'" - echo "$file" - - # we have found the file where we should. If we have additional - # ones: complain! - if test -f "$file2"; then - mapCmp "$file" "$file2" \ - && mapWarn obsoleteCopy "$map" "$file2" \ - || mapWarn manualResolve "$map" "$file" "$file2" - fi - - else - if test -f "$file2"; then - # bad: map file exists in the wrong location only - mapWarn badLocation "$map" "$file2" - else - # bad: map file does not exist at all - mapWarn notFound "$map" - fi - false; return 1 - fi - done - true; return 0 -} - -############################################################################### -# mapCmp(file, file2) -# compare two map files like cmp; but less strict, so changes regarding -# whitespaces, comments etc. are tolerated. Important is only the -# return value here. -############################################################################### -mapCmp() -{ - file=$1; file2=$2 - - # For reasons of speed only. Avoid normalizeLines if files are 100% - # the same. - cmp "$file" "$file2" >/dev/null 2>&1 && return 0 - - normalizeLines <"$file" >"$tmpdir/mapCmp-1" - normalizeLines <"$file2" >"$tmpdir/mapCmp-2" - cmp "$tmpdir/mapCmp-1" "$tmpdir/mapCmp-2" >/dev/null 2>&1 -} - -############################################################################### -# mapWarn() -############################################################################### -mapWarn() -{ - - case $1 in - obsoleteCopy) - warn " -!!! WARNING: Identical copy of used file for \`$2' - exists in obsolete location - $3 - Please, consider removing this file. -" - touch $mapWarnCalled - ;; - manualResolve) - warn " -!!! WARNING: While searching for the right map file for \`$2', we have - found the file - $3 - in the right location and we are using this - file. However, a map file with different content has been found in - the obsolete location - $4 - Please, see which version you want to use and eventually update the - content of the used map file. Additionally, consider removing the - obsolete file. -" - touch $mapWarnCalled - ;; - badLocation) - map=$2 - location=$3 - - m=" -!!! ERROR: The right location for map files has been - changed for this release and the map file \`$map' has - not been found in the right location, but in the obsolete - location - $location - instead. - - To fix this, please move this file into an appropriate - subdirectory of fonts/map in one of your texmf trees. - - For more information about the changed search paths, see - the release notes section in the teTeX manual. You probably - can read this document by executing the command - texdoc TETEXDOC - else visit the web page - http://tug.org/texlive/mapenc.html -" - warn "$m" - false; return 1 - ;; - notFound) - warn " -!!! ERROR! The map file \`$2' has not been found at all. - - Either put this file into the right place or remove the - reference from the configuration file. An automatic way - to disable unavailable map files is to call - $progname --syncwithtrees - - For manual editing, call - $progname --edit -" - - false; return 1 - ;; - esac -} - -############################################################################### -# cleanup() -# clean up the temp area and exit with proper exit status -############################################################################### -cleanup() -{ - rc=$1 - $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \ - && { cd $orig_pwd && rm -rf "$tmpdir"; } - (exit $rc); exit $rc -} - -############################################################################### -# setupTmpDir() -# set up a temp directory and a trap to remove it -############################################################################### -setupTmpDir() -{ - $needsCleanup && return - - trap 'cleanup 1' 1 2 3 7 13 15 - needsCleanup=true - mkdir "$tmpdir" || abort "could not create directory \`$tmpdir'" -} - -############################################################################### -# showOptions(item) -# show Options for an item -############################################################################### -showOptions() -{ - item=$1 - - case "$item" in - LW35) - echo "URWkb URW ADOBE ADOBEkb" - ;; - dvipsPreferOutline|pdftexDownloadBase14|dvipdfmDownloadBase14|dvipsDownloadBase35) - echo "true false" - ;; - *) - abort "Unknown item \"$item\". Choose one of LW35, dvipsPreferOutline, dvipsDownloadBase35, pdftexDownloadBase14 or dvipdfmDownloadBase14" - ;; - esac - - (exit 0); exit 0 -} - -############################################################################### -# mktexdir(args) -# call mktexdir script, disable all features (to prevent sticky directories) -############################################################################### -mktexdir() -{ - MT_FEATURES=none "$TEXMFMAIN/web2c/mktexdir" "$@" >&2 -} - -############################################################################### -# setupDestDir() -# Assign output directories which are not yet assigned. Always use -# the TEXMFVAR for this. -############################################################################### -setupDestDir() -{ - vartexmf=`kpsewhich -var-value=TEXMFVAR` - - # dvips - if test -z "$dvipsoutputdir"; then - dvipsoutputdir=$vartexmf/fonts/map/dvips/updmap - fi - - # pdftex - if test -z "$pdftexoutputdir"; then - pdftexoutputdir=$vartexmf/fonts/map/pdftex/updmap - fi - - # dvipdfm - if test -z "$dvipdfmoutputdir"; then - dvipdfmoutputdir=$vartexmf/fonts/map/dvipdfm/updmap - fi - - mktexdir "$dvipsoutputdir" "$pdftexoutputdir" "$dvipdfmoutputdir" >/dev/null 2>&1 - for d in "$dvipsoutputdir" "$pdftexoutputdir" "$dvipdfmoutputdir"; do - test -d "$d" || abort "output directory \`$d' does not exist" - test -w "$d" || abort "output directory \`$d' is not writable" - done - -} - -############################################################################### -# setupLog(cfgFile) -# try to set up a log file in $TEXMFVAR/web2c -############################################################################### -setupLog() -{ - vartexmf=`kpsewhich -var-value=TEXMFVAR` - dir=$vartexmf/web2c - mktexdir "$dir" >/dev/null 2>&1 - log="$dir/$progname.log" - if test -d "$dir" && test -w "$dir"; then - rm -f "$log" - > "$log" - fi - if test -w "$log"; then - if $chicken_mode; then - log= - else - date > "$log" - verboseMsg "$progname: This is $progname, version $version" - verboseMsg "$progname: using transcript file \`$log'" - fi - else - log= - verboseMsg "$progname: This is $progname, version $version" - verboseMsg "$progname: no permissions for writing $dir/$progname.log', so no transcript" - fi -} - -############################################################################### -# setupCfgFile() -# find config file if none specified on cmd line. -############################################################################### -setupCfgFile() -{ - case "$cnfFile" in - "") cnfFile=`locateWeb2c $cnfFileShort` - case "$cnfFile" in - "") abort "config file $cnfFileShort not found (ls-R missing?)" - esac;; - esac - setupLog -} - -############################################################################### -# processOptions() -# process cmd line options -############################################################################### -processOptions() -{ - while - case $1 in - --quiet|-q) - verbose=false;; - --cnffile) - cfgparam=1; cnfFile=$2; shift;; - --cnffile=*) - cfgparam=1; cnfFile=`echo "$1" | sed 's/--cnffile=//'`;; - --copy) - copy=true;; - --dry-run|-n) - chicken_mode=true;; - --dvipsoutputdir) - dvipsoutputdirparam=1; dvipsoutputdir=$2; shift;; - --dvipsoutputdir=*) - dvipsoutputdirparam=1; dvipsoutputdir=`echo "$1" | sed 's/--dvipsoutputdir=//'`;; - --pdftexoutputdir) - pdftexoutputdirparam=1; pdftexoutputdir=$2; shift;; - --pdftexoutputdir=*) - pdftexoutputdirparam=1; pdftexoutputdir=`echo "$1" | sed 's/--pdftexoutputdir=//'`;; - --dvipdfmoutputdir) - dvipdfmoutputdirparam=1; dvipdfmoutputdir=$2; shift;; - --dvipdfmoutputdir=*) - dvipdfmoutputdirparam=1; dvipdfmoutputdir=`echo "$1" | sed 's/--dvipdfmoutputdir=//'`;; - --outputdir) - dvipsoutputdirparam=1; dvipsoutputdir=$2 - pdftexoutputdirparam=1; pdftexoutputdir=$2 - dvipdfmoutputdirparam=1; dvipdfmoutputdir=$2 - shift - ;; - --outputdir=*) - outputdir=`echo "$1" | sed 's/--outputdir=//'` - dvipsoutputdirparam=1; dvipsoutputdir=$outputdir - pdftexoutputdirparam=1; pdftexoutputdir=$outputdir - dvipdfmoutputdirparam=1; dvipdfmoutputdir=$outputdir - ;; - --setoption) - cfgmaint=1 - cmd=setoption - case $2 in - *=*) - setoptionOpt=`echo $2 | sed 's@=.*@@'` - setoptionVal=`echo $2 | sed 's@[^=]*=@@'` - shift - ;; - *) - test $# -ge 3 || { abort "--setoption needs two parameters: option value"; } - setoptionOpt=$2; setoptionVal=$3; shift; shift - ;; - esac - ;; - --enable) - cfgmaint=1 - cmd=enable - case $2 in - Map=*) - enableMapType=Map; enableMapFile=`echo "$2" | sed 's/Map=//'`; shift;; - MixedMap=*) - enableMapType=MixedMap; enableMapFile=`echo "$2" | sed 's/MixedMap=//'`; shift;; - Map|MixedMap) - test $# -ge 3 || { abort "--enable needs two parameters: mapType mapFile"; } - enableMapType=$2; enableMapFile=$3; shift; shift;; - *) - abort "--enable needs two parameters mapType mapFile";; - esac - ;; - --syncwithtrees) - cfgmaint=1 - cmd=syncwithtrees;; - --disable) - cfgmaint=1 - cmd=disable; disableMapFile=$2; shift - ;; - --disable=*) - cfgmaint=1 - disableMapFile=`echo "$1" | sed 's/--disable=//'` - cmd=disable - ;; - --edit|-e) - cfgmaint=1 - cmd=edit;; - --listmaps|-l) - cmd=listmaps;; - --listavailablemaps) - cmd=listavailablemaps;; - --showoptions) - cmd=showoptions; showoptionsItem=$2; shift;; - --showoptions=*) - cmd=showoptions; showoptionsItem=`echo "$1" | sed 's/--showoptions=//'`;; - - --nohash) - texhashEnabled=false;; - --nomkmap) - mkmapEnabled=false;; - --help|-help|-h) - help;; - --version) - echo "$progname version $version"; (exit 0); exit 0;; - "") break;; - *) abort "$progname: unknown option \`$1'. Try $progname --help for help";; - esac - do test $# -gt 0 && shift; done - - if test -n "$cfgparam"; then - if test -z "$cnfFile" || test ! -f "$cnfFile"; then - abort "config file \`$cnfFileShort' not found" - fi - fi - - if test -n "$dvipdoutputdirparam"; then - if test -z "$dvipdoutputdir" || test ! -d "$dvipdoutputdir"; then - abort "dvips output directory \`$1' not found" - fi - fi - if test -n "$pdftexoutputdirparam"; then - if test -z "$pdftexoutputdir" || test ! -d "$pdftexoutputdir"; then - abort "pdftex output directory \`$1' not found" - fi - fi - if test -n "$dvipdfmoutputdirparam"; then - if test -z "$dvipdfmoutputdir" || test ! -d "$dvipdfmoutputdir"; then - abort "dvipdfm output directory \`$1' not found" - fi - fi - -} - -############################################################################### -# listMaps() -# list all maps mentioned in the config file -############################################################################### -listMaps() -{ - egrep '^(#! *)?(Mixed)?Map' "$cnfFile" -} - -############################################################################### -# listAvailableMaps() -# list maps mentioned in the config file if they are available -############################################################################### -listAvailableMaps() -{ - # loop over each possible line in the config file (-> $line) - # extract the name of the map file (-> $m) - # check if the map file exists and in that case echo the line - OLDIFS=$IFS - IFS=' -' - for line in `egrep '^(#! *)?(Mixed)?Map' "$cnfFile"`; do - m=`echo "$line" | sed 's@[ ]*$@@; s@.*[ ]@@'` - kpsewhich --format=map "$m" >/dev/null && echo "$line" - done - IFS=$OLDIFS -} - -############################################################################### -# syncWithTrees() -# update the config file: uncomment all lines which refer to map files that -# are unavailabe in the texmf trees -############################################################################### -syncWithTrees() -{ - for i in `egrep '^(Mixed)?Map' "$cnfFile" | sed 's@.* @@'`; do - kpsewhich --format=map "$i" >/dev/null || echo "$i" - done > $tmp1 - { - sed 's@/@\\/@g; s@^@/^MixedMap[ ]*@; s@$@$/s/^/#! /@' <$tmp1 - sed 's@/@\\/@g; s@^@/^Map[ ]*@; s@$@$/s/^/#! /@' <$tmp1 - } > $tmp2 - sed -f $tmp2 "$cnfFile" > $tmp3 && cat $tmp3 > "$cnfFile" -} - -############################################################################### -# normalizeLines() -# remove comments, whitespace is exactly one space, no empty lines, -# no whitespace at end of line, one space before and after ", -# no CR's (as in skaknew). -############################################################################### -normalizeLines() -{ - sed \ - -e '/^[*#;%]/d' \ - -e 's@[ ][ ]*@ @g' \ - -e '/^ *$/d' \ - -e 's@ $@@' \ - -e 's@ *" *@ " @g' \ - -e 's@" \([^"]*\) "@"\1"@g' \ - | tr -d '\r' \ - | sort | uniq -} - -############################################################################### -# dvips2dvipdfm() -# reads from stdin, writes to stdout. It transforms "dvips"-like syntax into -# "dvipdfm"-like syntax. It is a very ugly hack. -############################################################################### -dvips2dvipdfm() -{ - sed -e 's@$@ %@' \ - -e 's@^\(\([^ ]*\).*\)@\1\2@' \ - -e 's@\(.*<\[* *\([^ ]*\)\.enc\(.*\)\)@\1 \2@' \ - -e '/%[^ ]*$/s@$@ default@' \ - -e 's@\(.*<<* *\([^ ]*\)\.pf[ab].*\)@\1 \2@' \ - -e '/%[^ ]* [^ ]*$/s@\( \([^ ]*\).*\)$@\1 \2@' \ - -e 's@\(.*[" ]\([.0-9-][.0-9-]*\) *ExtendFont.*\)@\1 -e \2@' \ - -e 's@\(.*[" ]\([.0-9-][.0-9-]*\) *SlantFont.*\)@\1 -s \2@' \ - -e 's@.*%@@' | - awk '$1 == $3 && $2 == "default" {$2=""; $3=""} {print}' > $tmp8 - - egrep '^(cm|eu|la|lc|line|msam|xy)' $tmp8 \ - | sed 's@$@ -r@; s@\(fmex[789]\) -r$@\1@' - egrep -v '^(cm|eu|la|lc|line|msam|xy)' $tmp8 -} - - -############################################################################### -# mkMaps() -# the main task of this script: create the output files -############################################################################### -mkMaps() -{ - newline=' -' - mode=`cfgval LW35` - dvipsPreferOutline=`cfgval dvipsPreferOutline` - dvipsDownloadBase35=`cfgval dvipsDownloadBase35` - pdftexDownloadBase14=`cfgval pdftexDownloadBase14` - dvipdfmDownloadBase14=`cfgval dvipdfmDownloadBase14` - - # defaults - test -z "$mode" && mode=URWkb - test -z "$dvipsPreferOutline" && dvipsPreferOutline=true - test -z "$dvipsDownloadBase35" && dvipsDownloadBase35=false - test -z "$pdftexDownloadBase14" && pdftexDownloadBase14=false - test -z "$dvipdfmDownloadBase14" && dvipdfmDownloadBase14=false - - outputFiles="$dvipsoutputdir/download35.map -$dvipsoutputdir/builtin35.map -$dvipsoutputdir/psfonts_t1.map -$dvipsoutputdir/psfonts_pk.map -$pdftexoutputdir/pdftex_dl14.map -$pdftexoutputdir/pdftex_ndl14.map -$dvipdfmoutputdir/dvipdfm_dl14.map -$dvipdfmoutputdir/dvipdfm_ndl14.map -$dvipsoutputdir/ps2pk.map" - - outputLinks="$dvipsoutputdir/psfonts.map -$pdftexoutputdir/pdftex.map -$dvipdfmoutputdir/dvipdfm.map" - - allOutput="$outputFiles -$outputLinks" - - notfound=false - OLDIFS=$IFS; IFS=$newline - for o in $allOutput; do - test -f "$o" || notfound=true - done - IFS=$OLDIFS - $notfound || texhashEnabled=false - - verboseCat <<-eof - updmap is creating new map files using the following configuration: - - config file: \`$cnfFile' - dvips output directory: \`$dvipsoutputdir' - pdftex output directory: \`$pdftexoutputdir' - dvipdfm output directory: \`$dvipdfmoutputdir' - - prefer outlines: \`$dvipsPreferOutline' - texhash enabled: \`$texhashEnabled' - download standard fonts (dvips): \`$dvipsDownloadBase35' - download standard fonts (pdftex): \`$pdftexDownloadBase14' - download standard fonts (dvipdfm): \`$dvipdfmDownloadBase14' -eof - - verboseMsg - verboseMsg "$progname: scanning for LW35 support files" - dvips35=`locateMap dvips35.map` || cleanup 1 - pdftex35=`locateMap pdftex35.map` || cleanup 1 - dvipdfm35=`locateMap dvipdfm35.map` || cleanup 1 - ps2pk35=`locateMap ps2pk35.map` || cleanup 1 - - if $chicken_mode; then - echo - echo "$progname: chicken mode, skipping all output generation, goodbye." - exit 0 - fi - - verboseMsg - verboseMsg "$progname: Scanning for MixedMap entries:" - catMaps '^MixedMap' > $tmp1 || cleanup 1 - - verboseMsg - verboseMsg "$progname: Scanning for Map entries:" - catMaps '^Map' > $tmp2 || cleanup 1 - verboseMsg - - # files should be world-readable - umask 022 - - OLDIFS=$IFS; IFS=$newline - for file in $allOutput; do - rm -f "$file" - cat > "$file" <<-eof - % $file: maintained by the script updmap. - % Don't change this file directly. Edit texmf/web2c/$cnfFileShort - % and run updmap to recreate this file. -eof - if test -n "$log"; then - cat >> "$file" <<-eof - % A log of the updmap run that has created this file is available here: - % $log -eof - fi - done - IFS=$OLDIFS - - verboseMsg "$progname: Generating output for ps2pk..." - { transLW35 "$ps2pk35"; cat $tmp1 $tmp2; } \ - | normalizeLines >> "$dvipsoutputdir/ps2pk.map" - - verboseMsg "$progname: Generating output for dvips..." - { transLW35 "$ps2pk35"; } \ - | normalizeLines >> "$dvipsoutputdir/download35.map" - { transLW35 "$dvips35"; } \ - | normalizeLines >> "$dvipsoutputdir/builtin35.map" - - if test "x$dvipsDownloadBase35" = xtrue; then - dftdvips=$ps2pk35 - else - dftdvips=$dvips35 - fi - { transLW35 "$dftdvips"; cat $tmp1 $tmp2; } \ - | normalizeLines >> "$dvipsoutputdir/psfonts_t1.map" - { transLW35 "$dftdvips"; cat $tmp2; } \ - | normalizeLines >> "$dvipsoutputdir/psfonts_pk.map" - - verboseMsg "$progname: Generating output for pdftex..." - # remove PaintType due to Sebastian's request - { transLW35 "$pdftex35"; cat $tmp1 $tmp2; } \ - | grep -v PaintType | grep . > $tmp3 - { transLW35 "$dvipdfm35"; cat $tmp1 $tmp2; } \ - | grep -v PaintType | grep . > $tmp6 - { transLW35 "$ps2pk35"; cat $tmp1 $tmp2; } \ - | grep -v PaintType | grep . > $tmp7 - - <$tmp3 normalizeLines >> "$pdftexoutputdir/pdftex_ndl14.map" - <$tmp7 normalizeLines >> "$pdftexoutputdir/pdftex_dl14.map" - - verboseMsg "$progname: Generating output for dvipdfm..." - <$tmp7 normalizeLines | dvips2dvipdfm | normalizeLines >> "$dvipdfmoutputdir/dvipdfm_dl14.map" - <$tmp6 normalizeLines | dvips2dvipdfm | normalizeLines >> "$dvipdfmoutputdir/dvipdfm_ndl14.map" - verboseMsg "$progname: All output generated." - verboseMsg - - setupSymlinks - $texhashEnabled && { $verbose && texhash || texhash >/dev/null 2>&1; } - - verboseMsg - verboseMsg "$progname: Files generated:" - OLDIFS=$IFS; IFS=$newline - ls -l $outputFiles | verboseCat - IFS=$OLDIFS - verboseMsg - - verboseMsg "$progname: Map file links or copies:" - ls -l "$dvipsoutputdir"/psfonts.map \ - "$pdftexoutputdir"/pdftex.map \ - "$dvipdfmoutputdir"/dvipdfm.map | verboseCat - - if test -f $mapWarnCalled; then - m=" - -!!! NOTICE: - - With this release, the search paths for map files have been changed - and we have found that some files exist in the new path as well as - in the obsolete path. - - This is not an error per se, but please consider removing duplicates - from the old location and search the above output" - - test -n "$log" && m="$m or the transcript file - $log - " - - m="$m for warnings. - - For more information about the changed search paths, see - the release notes section in the teTeX manual. You probably - can read this document by executing the command - texdoc TETEXDOC - else visit the web page - http://tug.org/texlive/mapenc.html -" - warn "$m" - fi - - verboseMsg - verboseMsg "$progname: Done." - return 0 -} - -############################################################################### -# main() -# execution starts here -############################################################################### -main() -{ - # initialize global variables - progname=updmap - cmd= - log= - chicken_mode=false - link_cmd="ln -s" - copy_cmd="cp" - copy=false - orig_pwd=`pwd` - - cfgparam= - outputdirparam= - cfgmaint= - texhashEnabled=true - mkmapEnabled=true - verbose=true - needsCleanup=false - - cnfFileShort=updmap.cfg - cnfFile= - dvipsoutputdir=; pdftexoutputdir=; dvipdfmoutputdir= - : ${TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`} - - tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ - tmp1=$tmpdir/a - tmp2=$tmpdir/b - tmp3=$tmpdir/c - tmp4=$tmpdir/d - tmp5=$tmpdir/e - tmp6=$tmpdir/f - tmp7=$tmpdir/g - tmp8=$tmpdir/h - mapWarnCalled=$tmpdir/mapWarnCalled - catMapsFailed=$tmpdir/catMapsFailed - - processOptions ${1+"$@"} - - case "$cmd" in - showoptions) showOptions "$showoptionsItem"; (exit 0); exit;; - help) help; (exit 0); exit;; - esac - - setupCfgFile - case "$cmd" in - listmaps) listMaps; (exit 0); exit;; - listavailablemaps) listAvailableMaps; (exit 0); exit;; - esac - - # keep a copy of config file, so that we can see if the file was modified - setupTmpDir - - if test -n "$cfgmaint"; then - if test -z "$cfgparam"; then - co=`"$TEXMFMAIN/texconfig/tcfmgr" --tmp $tmpdir --cmd co --file $cnfFileShort` - test $? = 0 || cleanup 1 - set x $co; shift - id=$1; cnfFile=$3; orig=$4 - verboseMsg "$progname: initial config file is \`$orig'" - else - verboseMsg "$progname: config file is \`$cnfFile'" - cp "$cnfFile" $tmp5 - fi - - case "$cmd" in - edit) - ${VISUAL-${EDITOR-vi}} "$cnfFile";; - setoption) - setOption "$setoptionOpt" "$setoptionVal";; - enable) - enableMap "$enableMapType" "$enableMapFile";; - disable) - disableMap "$disableMapFile";; - syncwithtrees) - syncWithTrees;; - esac - - unchanged=true - if test -z "$cfgparam"; then - ci=`"$TEXMFMAIN/texconfig/tcfmgr" --tmp $tmpdir --cmd ci --id $id` - test $? = 0 || cleanup 1 - case "$ci" in - "") : ;; - *) unchanged=false - cnfFile=$ci - ;; - esac - else - cmp "$cnfFile" $tmp5 >/dev/null 2>&1 || unchanged=false - fi - case $unchanged in - true) if $mkmapEnabled; then - verboseMsg "$progname: configuration (updmap.cfg) unchanged. Map files will not be recreated." - mkmapEnabled=false - else - verboseMsg "$progname: configuration (updmap.cfg) unchanged." - fi;; - *) - verboseMsg "$progname: configuration file updated: \`$cnfFile'";; - esac - fi - - $mkmapEnabled || return - setupDestDir - mkMaps -} - -main ${1+"$@"} -cleanup 0 diff --git a/Master/bin/universal-darwin/updmap b/Master/bin/universal-darwin/updmap new file mode 120000 index 00000000000..5eceaae6d41 --- /dev/null +++ b/Master/bin/universal-darwin/updmap @@ -0,0 +1 @@ +../../texmf/scripts/tetex/updmap.pl \ No newline at end of file diff --git a/Master/bin/universal-darwin/updmap-sys b/Master/bin/universal-darwin/updmap-sys deleted file mode 100755 index 6f3c8365658..00000000000 --- a/Master/bin/universal-darwin/updmap-sys +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# updmap-sys: Thomas Esser, public domain. - -# wrapper script for updmap with TEXMFVAR and TEXMFCONFIG set to -# TEXMFSYSVAR / TEXMFSYSCONFIG - -test -f /bin/ksh && test -z "$RUNNING_KSH" \ - && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \ - && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; } -unset RUNNING_KSH - -test -f /bin/bsh && test -z "$RUNNING_BSH" \ - && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \ - && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; } -unset RUNNING_BSH - -export PATH - -# hack around a bug in zsh: -test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' - -v=`kpsewhich -var-value TEXMFSYSVAR` -c=`kpsewhich -var-value TEXMFSYSCONFIG` - -TEXMFVAR="$v" -TEXMFCONFIG="$c" -export TEXMFVAR TEXMFCONFIG - -exec updmap ${1+"$@"} diff --git a/Master/bin/universal-darwin/updmap-sys b/Master/bin/universal-darwin/updmap-sys new file mode 120000 index 00000000000..87523fb08ed --- /dev/null +++ b/Master/bin/universal-darwin/updmap-sys @@ -0,0 +1 @@ +../../texmf/scripts/tetex/updmap-sys.sh \ No newline at end of file diff --git a/Master/bin/universal-darwin/vftovp b/Master/bin/universal-darwin/vftovp index 4c39792eabb..98d9d8f0fff 100755 Binary files a/Master/bin/universal-darwin/vftovp and b/Master/bin/universal-darwin/vftovp differ diff --git a/Master/bin/universal-darwin/vlna b/Master/bin/universal-darwin/vlna index 13d2ad2bf24..e0fb2390ab8 100755 Binary files a/Master/bin/universal-darwin/vlna and b/Master/bin/universal-darwin/vlna differ diff --git a/Master/bin/universal-darwin/vptovf b/Master/bin/universal-darwin/vptovf index 5cc0086e0f9..c91f2695b46 100755 Binary files a/Master/bin/universal-darwin/vptovf and b/Master/bin/universal-darwin/vptovf differ diff --git a/Master/bin/universal-darwin/weave b/Master/bin/universal-darwin/weave index 330430f2aea..6bff8699b55 100755 Binary files a/Master/bin/universal-darwin/weave and b/Master/bin/universal-darwin/weave differ diff --git a/Master/bin/universal-darwin/xdv2pdf b/Master/bin/universal-darwin/xdv2pdf index 335c5112084..8d0360a4d6e 100755 Binary files a/Master/bin/universal-darwin/xdv2pdf and b/Master/bin/universal-darwin/xdv2pdf differ diff --git a/Master/bin/universal-darwin/xdvi-xaw b/Master/bin/universal-darwin/xdvi-xaw index 7dee8d694e4..5e52cd5633a 100755 Binary files a/Master/bin/universal-darwin/xdvi-xaw and b/Master/bin/universal-darwin/xdvi-xaw differ diff --git a/Master/bin/universal-darwin/xdvipdfmx b/Master/bin/universal-darwin/xdvipdfmx index dad4de23452..5237312c1dd 100755 Binary files a/Master/bin/universal-darwin/xdvipdfmx and b/Master/bin/universal-darwin/xdvipdfmx differ diff --git a/Master/bin/universal-darwin/xetex b/Master/bin/universal-darwin/xetex index 40611037190..b9cd0af6f5d 100755 Binary files a/Master/bin/universal-darwin/xetex and b/Master/bin/universal-darwin/xetex differ diff --git a/Master/bin/universal-darwin/xindy-i386.mem b/Master/bin/universal-darwin/xindy-i386.mem index 270378b1c84..99f96b541ca 100644 Binary files a/Master/bin/universal-darwin/xindy-i386.mem and b/Master/bin/universal-darwin/xindy-i386.mem differ diff --git a/Master/bin/universal-darwin/xindy-ppc.mem b/Master/bin/universal-darwin/xindy-ppc.mem index 19320c36ba7..2513ab8c755 100644 Binary files a/Master/bin/universal-darwin/xindy-ppc.mem and b/Master/bin/universal-darwin/xindy-ppc.mem differ diff --git a/Master/bin/universal-darwin/xindy.run b/Master/bin/universal-darwin/xindy.run index 43c69a1ec70..699c7dab989 100755 Binary files a/Master/bin/universal-darwin/xindy.run and b/Master/bin/universal-darwin/xindy.run differ diff --git a/Master/bin/x86_64-darwin/T1Wrap b/Master/bin/x86_64-darwin/T1Wrap index 5dd61af762a..d512cde4fe5 100755 Binary files a/Master/bin/x86_64-darwin/T1Wrap and b/Master/bin/x86_64-darwin/T1Wrap differ diff --git a/Master/bin/x86_64-darwin/afm2pl b/Master/bin/x86_64-darwin/afm2pl index 411d0a4365d..973e607e4d8 100755 Binary files a/Master/bin/x86_64-darwin/afm2pl and b/Master/bin/x86_64-darwin/afm2pl differ diff --git a/Master/bin/x86_64-darwin/afm2tfm b/Master/bin/x86_64-darwin/afm2tfm index 9e6da1b5de2..aa88433922e 100755 Binary files a/Master/bin/x86_64-darwin/afm2tfm and b/Master/bin/x86_64-darwin/afm2tfm differ diff --git a/Master/bin/x86_64-darwin/aleph b/Master/bin/x86_64-darwin/aleph index fcd3a46ae3b..8c7c6558b07 100755 Binary files a/Master/bin/x86_64-darwin/aleph and b/Master/bin/x86_64-darwin/aleph differ diff --git a/Master/bin/x86_64-darwin/asy b/Master/bin/x86_64-darwin/asy index c1f7b68d635..5020e641af8 100755 Binary files a/Master/bin/x86_64-darwin/asy and b/Master/bin/x86_64-darwin/asy differ diff --git a/Master/bin/x86_64-darwin/bbox b/Master/bin/x86_64-darwin/bbox index 89518312fff..3e35f22925a 100755 Binary files a/Master/bin/x86_64-darwin/bbox and b/Master/bin/x86_64-darwin/bbox differ diff --git a/Master/bin/x86_64-darwin/bg5conv b/Master/bin/x86_64-darwin/bg5conv index ada6d72f0da..e90456aa2ba 100755 Binary files a/Master/bin/x86_64-darwin/bg5conv and b/Master/bin/x86_64-darwin/bg5conv differ diff --git a/Master/bin/x86_64-darwin/bibtex b/Master/bin/x86_64-darwin/bibtex index 75a1af5ca25..d0196264250 100755 Binary files a/Master/bin/x86_64-darwin/bibtex and b/Master/bin/x86_64-darwin/bibtex differ diff --git a/Master/bin/x86_64-darwin/bibtex8 b/Master/bin/x86_64-darwin/bibtex8 index c1f5eba7ae6..fd8a6c79bc6 100755 Binary files a/Master/bin/x86_64-darwin/bibtex8 and b/Master/bin/x86_64-darwin/bibtex8 differ diff --git a/Master/bin/x86_64-darwin/bibtexu b/Master/bin/x86_64-darwin/bibtexu index 88fb592df07..62449050d66 100755 Binary files a/Master/bin/x86_64-darwin/bibtexu and b/Master/bin/x86_64-darwin/bibtexu differ diff --git a/Master/bin/x86_64-darwin/cef5conv b/Master/bin/x86_64-darwin/cef5conv index 9be245b90d3..500ac044da5 100755 Binary files a/Master/bin/x86_64-darwin/cef5conv and b/Master/bin/x86_64-darwin/cef5conv differ diff --git a/Master/bin/x86_64-darwin/cefconv b/Master/bin/x86_64-darwin/cefconv index e6c6f304763..02151d8b5ac 100755 Binary files a/Master/bin/x86_64-darwin/cefconv and b/Master/bin/x86_64-darwin/cefconv differ diff --git a/Master/bin/x86_64-darwin/cefsconv b/Master/bin/x86_64-darwin/cefsconv index cb5cc3a535b..3d3e7e343f9 100755 Binary files a/Master/bin/x86_64-darwin/cefsconv and b/Master/bin/x86_64-darwin/cefsconv differ diff --git a/Master/bin/x86_64-darwin/cfftot1 b/Master/bin/x86_64-darwin/cfftot1 index 39408a1f47e..dd15db7e0fc 100755 Binary files a/Master/bin/x86_64-darwin/cfftot1 and b/Master/bin/x86_64-darwin/cfftot1 differ diff --git a/Master/bin/x86_64-darwin/chktex b/Master/bin/x86_64-darwin/chktex index a15b1219ee9..0dcdbfea5fc 100755 Binary files a/Master/bin/x86_64-darwin/chktex and b/Master/bin/x86_64-darwin/chktex differ diff --git a/Master/bin/x86_64-darwin/ctangle b/Master/bin/x86_64-darwin/ctangle index 0c4459f8f46..07dfb751b4c 100755 Binary files a/Master/bin/x86_64-darwin/ctangle and b/Master/bin/x86_64-darwin/ctangle differ diff --git a/Master/bin/x86_64-darwin/ctie b/Master/bin/x86_64-darwin/ctie index dc5b6f2fe43..188ec6ca633 100755 Binary files a/Master/bin/x86_64-darwin/ctie and b/Master/bin/x86_64-darwin/ctie differ diff --git a/Master/bin/x86_64-darwin/cweave b/Master/bin/x86_64-darwin/cweave index db3ff7606ae..944116265ac 100755 Binary files a/Master/bin/x86_64-darwin/cweave and b/Master/bin/x86_64-darwin/cweave differ diff --git a/Master/bin/x86_64-darwin/detex b/Master/bin/x86_64-darwin/detex index 9d3212939d0..6438130834c 100755 Binary files a/Master/bin/x86_64-darwin/detex and b/Master/bin/x86_64-darwin/detex differ diff --git a/Master/bin/x86_64-darwin/devnag b/Master/bin/x86_64-darwin/devnag index 416ed7eabce..71538a3882b 100755 Binary files a/Master/bin/x86_64-darwin/devnag and b/Master/bin/x86_64-darwin/devnag differ diff --git a/Master/bin/x86_64-darwin/disdvi b/Master/bin/x86_64-darwin/disdvi index ef060016e01..510985e4d99 100755 Binary files a/Master/bin/x86_64-darwin/disdvi and b/Master/bin/x86_64-darwin/disdvi differ diff --git a/Master/bin/x86_64-darwin/dt2dv b/Master/bin/x86_64-darwin/dt2dv index a4197ab0205..ef934df77e2 100755 Binary files a/Master/bin/x86_64-darwin/dt2dv and b/Master/bin/x86_64-darwin/dt2dv differ diff --git a/Master/bin/x86_64-darwin/dv2dt b/Master/bin/x86_64-darwin/dv2dt index 39c79df80ef..a115c9239bd 100755 Binary files a/Master/bin/x86_64-darwin/dv2dt and b/Master/bin/x86_64-darwin/dv2dt differ diff --git a/Master/bin/x86_64-darwin/dvi2tty b/Master/bin/x86_64-darwin/dvi2tty index 5b1667e1689..72ddfc4601f 100755 Binary files a/Master/bin/x86_64-darwin/dvi2tty and b/Master/bin/x86_64-darwin/dvi2tty differ diff --git a/Master/bin/x86_64-darwin/dvibook b/Master/bin/x86_64-darwin/dvibook index e172f407c4e..a1dff80bc67 100755 Binary files a/Master/bin/x86_64-darwin/dvibook and b/Master/bin/x86_64-darwin/dvibook differ diff --git a/Master/bin/x86_64-darwin/dviconcat b/Master/bin/x86_64-darwin/dviconcat index 6e35aafa3ee..4bf3948e192 100755 Binary files a/Master/bin/x86_64-darwin/dviconcat and b/Master/bin/x86_64-darwin/dviconcat differ diff --git a/Master/bin/x86_64-darwin/dvicopy b/Master/bin/x86_64-darwin/dvicopy index 5a32758aa90..f7c951d93c4 100755 Binary files a/Master/bin/x86_64-darwin/dvicopy and b/Master/bin/x86_64-darwin/dvicopy differ diff --git a/Master/bin/x86_64-darwin/dvidvi b/Master/bin/x86_64-darwin/dvidvi index 5e9614e283d..d92047c0486 100755 Binary files a/Master/bin/x86_64-darwin/dvidvi and b/Master/bin/x86_64-darwin/dvidvi differ diff --git a/Master/bin/x86_64-darwin/dvilj b/Master/bin/x86_64-darwin/dvilj index d88c5ed3e67..4439b321e1e 100755 Binary files a/Master/bin/x86_64-darwin/dvilj and b/Master/bin/x86_64-darwin/dvilj differ diff --git a/Master/bin/x86_64-darwin/dvilj2p b/Master/bin/x86_64-darwin/dvilj2p index 3686472c737..7949afbbdb5 100755 Binary files a/Master/bin/x86_64-darwin/dvilj2p and b/Master/bin/x86_64-darwin/dvilj2p differ diff --git a/Master/bin/x86_64-darwin/dvilj4 b/Master/bin/x86_64-darwin/dvilj4 index d96ffd10623..2a08e50da80 100755 Binary files a/Master/bin/x86_64-darwin/dvilj4 and b/Master/bin/x86_64-darwin/dvilj4 differ diff --git a/Master/bin/x86_64-darwin/dvilj4l b/Master/bin/x86_64-darwin/dvilj4l index 9fff2528887..6457b73971e 100755 Binary files a/Master/bin/x86_64-darwin/dvilj4l and b/Master/bin/x86_64-darwin/dvilj4l differ diff --git a/Master/bin/x86_64-darwin/dvipdfmx b/Master/bin/x86_64-darwin/dvipdfmx index 9c84a21f656..d53f8647eb3 100755 Binary files a/Master/bin/x86_64-darwin/dvipdfmx and b/Master/bin/x86_64-darwin/dvipdfmx differ diff --git a/Master/bin/x86_64-darwin/dvipng b/Master/bin/x86_64-darwin/dvipng index 97060a02b6b..255113b2122 100755 Binary files a/Master/bin/x86_64-darwin/dvipng and b/Master/bin/x86_64-darwin/dvipng differ diff --git a/Master/bin/x86_64-darwin/dvipos b/Master/bin/x86_64-darwin/dvipos index 3454e919aa9..5f949c7e881 100755 Binary files a/Master/bin/x86_64-darwin/dvipos and b/Master/bin/x86_64-darwin/dvipos differ diff --git a/Master/bin/x86_64-darwin/dvips b/Master/bin/x86_64-darwin/dvips index 02a9e18aaaf..6ba3b603f46 100755 Binary files a/Master/bin/x86_64-darwin/dvips and b/Master/bin/x86_64-darwin/dvips differ diff --git a/Master/bin/x86_64-darwin/dviselect b/Master/bin/x86_64-darwin/dviselect index ac58f43efe1..67b41ac4809 100755 Binary files a/Master/bin/x86_64-darwin/dviselect and b/Master/bin/x86_64-darwin/dviselect differ diff --git a/Master/bin/x86_64-darwin/dvisvgm b/Master/bin/x86_64-darwin/dvisvgm index dfabcde364c..57caa26aa12 100755 Binary files a/Master/bin/x86_64-darwin/dvisvgm and b/Master/bin/x86_64-darwin/dvisvgm differ diff --git a/Master/bin/x86_64-darwin/dvitodvi b/Master/bin/x86_64-darwin/dvitodvi index eb988997553..1a6b28c898e 100755 Binary files a/Master/bin/x86_64-darwin/dvitodvi and b/Master/bin/x86_64-darwin/dvitodvi differ diff --git a/Master/bin/x86_64-darwin/dvitype b/Master/bin/x86_64-darwin/dvitype index ade3dc51464..c3cdcd6f91a 100755 Binary files a/Master/bin/x86_64-darwin/dvitype and b/Master/bin/x86_64-darwin/dvitype differ diff --git a/Master/bin/x86_64-darwin/epsffit b/Master/bin/x86_64-darwin/epsffit index 9887f5a4a7c..183a3c0fb31 100755 Binary files a/Master/bin/x86_64-darwin/epsffit and b/Master/bin/x86_64-darwin/epsffit differ diff --git a/Master/bin/x86_64-darwin/eptex b/Master/bin/x86_64-darwin/eptex new file mode 100755 index 00000000000..051a3745e3d Binary files /dev/null and b/Master/bin/x86_64-darwin/eptex differ diff --git a/Master/bin/x86_64-darwin/extconv b/Master/bin/x86_64-darwin/extconv index 19215816f77..a5592812832 100755 Binary files a/Master/bin/x86_64-darwin/extconv and b/Master/bin/x86_64-darwin/extconv differ diff --git a/Master/bin/x86_64-darwin/gftodvi b/Master/bin/x86_64-darwin/gftodvi index 19d1a527a12..b550f19c14c 100755 Binary files a/Master/bin/x86_64-darwin/gftodvi and b/Master/bin/x86_64-darwin/gftodvi differ diff --git a/Master/bin/x86_64-darwin/gftopk b/Master/bin/x86_64-darwin/gftopk index 83850bffa05..a0a4ac33864 100755 Binary files a/Master/bin/x86_64-darwin/gftopk and b/Master/bin/x86_64-darwin/gftopk differ diff --git a/Master/bin/x86_64-darwin/gftype b/Master/bin/x86_64-darwin/gftype index 2de64e1ca92..9293c1d4153 100755 Binary files a/Master/bin/x86_64-darwin/gftype and b/Master/bin/x86_64-darwin/gftype differ diff --git a/Master/bin/x86_64-darwin/gsftopk b/Master/bin/x86_64-darwin/gsftopk index 435a3f43a26..0e98f887382 100755 Binary files a/Master/bin/x86_64-darwin/gsftopk and b/Master/bin/x86_64-darwin/gsftopk differ diff --git a/Master/bin/x86_64-darwin/hbf2gf b/Master/bin/x86_64-darwin/hbf2gf index 7403ac7d04b..53b4b6fa0f1 100755 Binary files a/Master/bin/x86_64-darwin/hbf2gf and b/Master/bin/x86_64-darwin/hbf2gf differ diff --git a/Master/bin/x86_64-darwin/inimf b/Master/bin/x86_64-darwin/inimf new file mode 120000 index 00000000000..64dafc4ff66 --- /dev/null +++ b/Master/bin/x86_64-darwin/inimf @@ -0,0 +1 @@ +mf \ No newline at end of file diff --git a/Master/bin/x86_64-darwin/initex b/Master/bin/x86_64-darwin/initex new file mode 120000 index 00000000000..5c8f2b2cc00 --- /dev/null +++ b/Master/bin/x86_64-darwin/initex @@ -0,0 +1 @@ +tex \ No newline at end of file diff --git a/Master/bin/x86_64-darwin/kpseaccess b/Master/bin/x86_64-darwin/kpseaccess index ff311b2148e..abd424135ec 100755 Binary files a/Master/bin/x86_64-darwin/kpseaccess and b/Master/bin/x86_64-darwin/kpseaccess differ diff --git a/Master/bin/x86_64-darwin/kpsereadlink b/Master/bin/x86_64-darwin/kpsereadlink index 8e1aac1f171..a42b0fd25ca 100755 Binary files a/Master/bin/x86_64-darwin/kpsereadlink and b/Master/bin/x86_64-darwin/kpsereadlink differ diff --git a/Master/bin/x86_64-darwin/kpsestat b/Master/bin/x86_64-darwin/kpsestat index 78d2542f5d0..e4d2652afb9 100755 Binary files a/Master/bin/x86_64-darwin/kpsestat and b/Master/bin/x86_64-darwin/kpsestat differ diff --git a/Master/bin/x86_64-darwin/kpsewhich b/Master/bin/x86_64-darwin/kpsewhich index c0b3a6fd4ba..5d1eea2c73c 100755 Binary files a/Master/bin/x86_64-darwin/kpsewhich and b/Master/bin/x86_64-darwin/kpsewhich differ diff --git a/Master/bin/x86_64-darwin/lacheck b/Master/bin/x86_64-darwin/lacheck index be723ec11df..e8d846c55eb 100755 Binary files a/Master/bin/x86_64-darwin/lacheck and b/Master/bin/x86_64-darwin/lacheck differ diff --git a/Master/bin/x86_64-darwin/luatex b/Master/bin/x86_64-darwin/luatex index 81eb33ef897..f218fb8dea8 100755 Binary files a/Master/bin/x86_64-darwin/luatex and b/Master/bin/x86_64-darwin/luatex differ diff --git a/Master/bin/x86_64-darwin/mag b/Master/bin/x86_64-darwin/mag index 2e8407af911..53447d73900 100755 Binary files a/Master/bin/x86_64-darwin/mag and b/Master/bin/x86_64-darwin/mag differ diff --git a/Master/bin/x86_64-darwin/makeindex b/Master/bin/x86_64-darwin/makeindex index ec3316602d2..42075636419 100755 Binary files a/Master/bin/x86_64-darwin/makeindex and b/Master/bin/x86_64-darwin/makeindex differ diff --git a/Master/bin/x86_64-darwin/makejvf b/Master/bin/x86_64-darwin/makejvf index 99891bea09e..5f79ad3744a 100755 Binary files a/Master/bin/x86_64-darwin/makejvf and b/Master/bin/x86_64-darwin/makejvf differ diff --git a/Master/bin/x86_64-darwin/mendex b/Master/bin/x86_64-darwin/mendex index 564f1385b25..dab98e039e3 100755 Binary files a/Master/bin/x86_64-darwin/mendex and b/Master/bin/x86_64-darwin/mendex differ diff --git a/Master/bin/x86_64-darwin/mf b/Master/bin/x86_64-darwin/mf index fe37f8e3a47..8e10cf50d0f 100755 Binary files a/Master/bin/x86_64-darwin/mf and b/Master/bin/x86_64-darwin/mf differ diff --git a/Master/bin/x86_64-darwin/mf-nowin b/Master/bin/x86_64-darwin/mf-nowin index f2595d18a26..4e4729d19ef 100755 Binary files a/Master/bin/x86_64-darwin/mf-nowin and b/Master/bin/x86_64-darwin/mf-nowin differ diff --git a/Master/bin/x86_64-darwin/mft b/Master/bin/x86_64-darwin/mft index ebd28ef600b..962d1db1ca6 100755 Binary files a/Master/bin/x86_64-darwin/mft and b/Master/bin/x86_64-darwin/mft differ diff --git a/Master/bin/x86_64-darwin/mkofm b/Master/bin/x86_64-darwin/mkofm index ef820171f08..306575cfbe7 100755 --- a/Master/bin/x86_64-darwin/mkofm +++ b/Master/bin/x86_64-darwin/mkofm @@ -1,3 +1,3 @@ #!/bin/sh # Initial definition. For the moment only makes .tfm files. -mktextfm $* +mktextfm "$@" diff --git a/Master/bin/x86_64-darwin/mmafm b/Master/bin/x86_64-darwin/mmafm index d16a4b3e8b6..ac4a5f30b4c 100755 Binary files a/Master/bin/x86_64-darwin/mmafm and b/Master/bin/x86_64-darwin/mmafm differ diff --git a/Master/bin/x86_64-darwin/mmpfb b/Master/bin/x86_64-darwin/mmpfb index c44fb3c2270..e04e8456207 100755 Binary files a/Master/bin/x86_64-darwin/mmpfb and b/Master/bin/x86_64-darwin/mmpfb differ diff --git a/Master/bin/x86_64-darwin/mpost b/Master/bin/x86_64-darwin/mpost index b47ee3f8353..7417fc12985 100755 Binary files a/Master/bin/x86_64-darwin/mpost and b/Master/bin/x86_64-darwin/mpost differ diff --git a/Master/bin/x86_64-darwin/odvicopy b/Master/bin/x86_64-darwin/odvicopy index bb1f51f09d8..e3032b81833 100755 Binary files a/Master/bin/x86_64-darwin/odvicopy and b/Master/bin/x86_64-darwin/odvicopy differ diff --git a/Master/bin/x86_64-darwin/odvitype b/Master/bin/x86_64-darwin/odvitype index 3c99aff7dac..88000c30a86 100755 Binary files a/Master/bin/x86_64-darwin/odvitype and b/Master/bin/x86_64-darwin/odvitype differ diff --git a/Master/bin/x86_64-darwin/omfonts b/Master/bin/x86_64-darwin/omfonts index 6c9e8c88835..44d77bcb673 100755 Binary files a/Master/bin/x86_64-darwin/omfonts and b/Master/bin/x86_64-darwin/omfonts differ diff --git a/Master/bin/x86_64-darwin/otangle b/Master/bin/x86_64-darwin/otangle index 8fd2162c07c..475daeff8e6 100755 Binary files a/Master/bin/x86_64-darwin/otangle and b/Master/bin/x86_64-darwin/otangle differ diff --git a/Master/bin/x86_64-darwin/otfinfo b/Master/bin/x86_64-darwin/otfinfo index 822b7d6eb83..f82e35195a2 100755 Binary files a/Master/bin/x86_64-darwin/otfinfo and b/Master/bin/x86_64-darwin/otfinfo differ diff --git a/Master/bin/x86_64-darwin/otftotfm b/Master/bin/x86_64-darwin/otftotfm index 25ef4a1e6de..4930d455857 100755 Binary files a/Master/bin/x86_64-darwin/otftotfm and b/Master/bin/x86_64-darwin/otftotfm differ diff --git a/Master/bin/x86_64-darwin/otp2ocp b/Master/bin/x86_64-darwin/otp2ocp index 81f74b6e931..8840b218c69 100755 Binary files a/Master/bin/x86_64-darwin/otp2ocp and b/Master/bin/x86_64-darwin/otp2ocp differ diff --git a/Master/bin/x86_64-darwin/outocp b/Master/bin/x86_64-darwin/outocp index de9a5a29b34..25070ee52f7 100755 Binary files a/Master/bin/x86_64-darwin/outocp and b/Master/bin/x86_64-darwin/outocp differ diff --git a/Master/bin/x86_64-darwin/patgen b/Master/bin/x86_64-darwin/patgen index d73e2f5ce04..75abc5418bb 100755 Binary files a/Master/bin/x86_64-darwin/patgen and b/Master/bin/x86_64-darwin/patgen differ diff --git a/Master/bin/x86_64-darwin/pbibtex b/Master/bin/x86_64-darwin/pbibtex index 1beeebf4ee1..a52133343d7 100755 Binary files a/Master/bin/x86_64-darwin/pbibtex and b/Master/bin/x86_64-darwin/pbibtex differ diff --git a/Master/bin/x86_64-darwin/pdfclose b/Master/bin/x86_64-darwin/pdfclose index 5038fbed057..c772e056296 100755 Binary files a/Master/bin/x86_64-darwin/pdfclose and b/Master/bin/x86_64-darwin/pdfclose differ diff --git a/Master/bin/x86_64-darwin/pdfopen b/Master/bin/x86_64-darwin/pdfopen index fd4a407e0ce..391687f0bcf 100755 Binary files a/Master/bin/x86_64-darwin/pdfopen and b/Master/bin/x86_64-darwin/pdfopen differ diff --git a/Master/bin/x86_64-darwin/pdftex b/Master/bin/x86_64-darwin/pdftex index 4680e145bfa..0dde1da83e9 100755 Binary files a/Master/bin/x86_64-darwin/pdftex and b/Master/bin/x86_64-darwin/pdftex differ diff --git a/Master/bin/x86_64-darwin/pdftosrc b/Master/bin/x86_64-darwin/pdftosrc index 840c33d8ba2..5c428531444 100755 Binary files a/Master/bin/x86_64-darwin/pdftosrc and b/Master/bin/x86_64-darwin/pdftosrc differ diff --git a/Master/bin/x86_64-darwin/pdvitype b/Master/bin/x86_64-darwin/pdvitype index 645af903e09..7ca5ea8e497 100755 Binary files a/Master/bin/x86_64-darwin/pdvitype and b/Master/bin/x86_64-darwin/pdvitype differ diff --git a/Master/bin/x86_64-darwin/pfb2pfa b/Master/bin/x86_64-darwin/pfb2pfa index 08a7f30e168..429bd2d552e 100755 Binary files a/Master/bin/x86_64-darwin/pfb2pfa and b/Master/bin/x86_64-darwin/pfb2pfa differ diff --git a/Master/bin/x86_64-darwin/pk2bm b/Master/bin/x86_64-darwin/pk2bm index 03ede8b2605..51ddc3574b1 100755 Binary files a/Master/bin/x86_64-darwin/pk2bm and b/Master/bin/x86_64-darwin/pk2bm differ diff --git a/Master/bin/x86_64-darwin/pktogf b/Master/bin/x86_64-darwin/pktogf index a700cc6a882..afdaf6b6581 100755 Binary files a/Master/bin/x86_64-darwin/pktogf and b/Master/bin/x86_64-darwin/pktogf differ diff --git a/Master/bin/x86_64-darwin/pktype b/Master/bin/x86_64-darwin/pktype index 6506263786d..41fdae76eb1 100755 Binary files a/Master/bin/x86_64-darwin/pktype and b/Master/bin/x86_64-darwin/pktype differ diff --git a/Master/bin/x86_64-darwin/pltotf b/Master/bin/x86_64-darwin/pltotf index fe601e3bd90..91e39f11706 100755 Binary files a/Master/bin/x86_64-darwin/pltotf and b/Master/bin/x86_64-darwin/pltotf differ diff --git a/Master/bin/x86_64-darwin/pooltype b/Master/bin/x86_64-darwin/pooltype index 6cd8840dad4..ef11f035fe4 100755 Binary files a/Master/bin/x86_64-darwin/pooltype and b/Master/bin/x86_64-darwin/pooltype differ diff --git a/Master/bin/x86_64-darwin/ppltotf b/Master/bin/x86_64-darwin/ppltotf index ec434bfcfb3..2a4eed96556 100755 Binary files a/Master/bin/x86_64-darwin/ppltotf and b/Master/bin/x86_64-darwin/ppltotf differ diff --git a/Master/bin/x86_64-darwin/ps2pk b/Master/bin/x86_64-darwin/ps2pk index 4a1d6bc011e..31e30d280c5 100755 Binary files a/Master/bin/x86_64-darwin/ps2pk and b/Master/bin/x86_64-darwin/ps2pk differ diff --git a/Master/bin/x86_64-darwin/psbook b/Master/bin/x86_64-darwin/psbook index bb6b0bb86a1..97971826fa6 100755 Binary files a/Master/bin/x86_64-darwin/psbook and b/Master/bin/x86_64-darwin/psbook differ diff --git a/Master/bin/x86_64-darwin/psnup b/Master/bin/x86_64-darwin/psnup index 6c4dc2c41ec..c456c718a27 100755 Binary files a/Master/bin/x86_64-darwin/psnup and b/Master/bin/x86_64-darwin/psnup differ diff --git a/Master/bin/x86_64-darwin/psresize b/Master/bin/x86_64-darwin/psresize index 15518521245..4426639bd2a 100755 Binary files a/Master/bin/x86_64-darwin/psresize and b/Master/bin/x86_64-darwin/psresize differ diff --git a/Master/bin/x86_64-darwin/psselect b/Master/bin/x86_64-darwin/psselect index 5d1e8cbe006..efa8d31ba51 100755 Binary files a/Master/bin/x86_64-darwin/psselect and b/Master/bin/x86_64-darwin/psselect differ diff --git a/Master/bin/x86_64-darwin/pstops b/Master/bin/x86_64-darwin/pstops index 3707d983a2f..eabd0660d98 100755 Binary files a/Master/bin/x86_64-darwin/pstops and b/Master/bin/x86_64-darwin/pstops differ diff --git a/Master/bin/x86_64-darwin/ptex b/Master/bin/x86_64-darwin/ptex index 4fe546bb048..48343c3f3ed 100755 Binary files a/Master/bin/x86_64-darwin/ptex and b/Master/bin/x86_64-darwin/ptex differ diff --git a/Master/bin/x86_64-darwin/ptftopl b/Master/bin/x86_64-darwin/ptftopl index 6e69eb9beae..3c112590484 100755 Binary files a/Master/bin/x86_64-darwin/ptftopl and b/Master/bin/x86_64-darwin/ptftopl differ diff --git a/Master/bin/x86_64-darwin/sjisconv b/Master/bin/x86_64-darwin/sjisconv index 452ea84774a..3ea8336ee04 100755 Binary files a/Master/bin/x86_64-darwin/sjisconv and b/Master/bin/x86_64-darwin/sjisconv differ diff --git a/Master/bin/x86_64-darwin/synctex b/Master/bin/x86_64-darwin/synctex index 93386e852a4..c730e9078f7 100755 Binary files a/Master/bin/x86_64-darwin/synctex and b/Master/bin/x86_64-darwin/synctex differ diff --git a/Master/bin/x86_64-darwin/t1ascii b/Master/bin/x86_64-darwin/t1ascii index 8d58d6bd639..0ab90c686a2 100755 Binary files a/Master/bin/x86_64-darwin/t1ascii and b/Master/bin/x86_64-darwin/t1ascii differ diff --git a/Master/bin/x86_64-darwin/t1asm b/Master/bin/x86_64-darwin/t1asm index aee9bffc106..1fc068a061e 100755 Binary files a/Master/bin/x86_64-darwin/t1asm and b/Master/bin/x86_64-darwin/t1asm differ diff --git a/Master/bin/x86_64-darwin/t1binary b/Master/bin/x86_64-darwin/t1binary index 3d4f7ed083b..d24c0940f9e 100755 Binary files a/Master/bin/x86_64-darwin/t1binary and b/Master/bin/x86_64-darwin/t1binary differ diff --git a/Master/bin/x86_64-darwin/t1disasm b/Master/bin/x86_64-darwin/t1disasm index 28f2f56f434..834a91e45ea 100755 Binary files a/Master/bin/x86_64-darwin/t1disasm and b/Master/bin/x86_64-darwin/t1disasm differ diff --git a/Master/bin/x86_64-darwin/t1dotlessj b/Master/bin/x86_64-darwin/t1dotlessj index c1e7b2084c4..3f3002eb552 100755 Binary files a/Master/bin/x86_64-darwin/t1dotlessj and b/Master/bin/x86_64-darwin/t1dotlessj differ diff --git a/Master/bin/x86_64-darwin/t1lint b/Master/bin/x86_64-darwin/t1lint index 6fa336f1d12..91a941f55bf 100755 Binary files a/Master/bin/x86_64-darwin/t1lint and b/Master/bin/x86_64-darwin/t1lint differ diff --git a/Master/bin/x86_64-darwin/t1mac b/Master/bin/x86_64-darwin/t1mac index 55d4143c781..2ff0d4ea7ce 100755 Binary files a/Master/bin/x86_64-darwin/t1mac and b/Master/bin/x86_64-darwin/t1mac differ diff --git a/Master/bin/x86_64-darwin/t1rawafm b/Master/bin/x86_64-darwin/t1rawafm index dba97f2e157..75a6b556a87 100755 Binary files a/Master/bin/x86_64-darwin/t1rawafm and b/Master/bin/x86_64-darwin/t1rawafm differ diff --git a/Master/bin/x86_64-darwin/t1reencode b/Master/bin/x86_64-darwin/t1reencode index 7d2346a6167..9e053ab3ba1 100755 Binary files a/Master/bin/x86_64-darwin/t1reencode and b/Master/bin/x86_64-darwin/t1reencode differ diff --git a/Master/bin/x86_64-darwin/t1testpage b/Master/bin/x86_64-darwin/t1testpage index 9cdf982ecf6..79c6e6c6747 100755 Binary files a/Master/bin/x86_64-darwin/t1testpage and b/Master/bin/x86_64-darwin/t1testpage differ diff --git a/Master/bin/x86_64-darwin/t1unmac b/Master/bin/x86_64-darwin/t1unmac index 27c27aacbcd..d11c9d84d2d 100755 Binary files a/Master/bin/x86_64-darwin/t1unmac and b/Master/bin/x86_64-darwin/t1unmac differ diff --git a/Master/bin/x86_64-darwin/t4ht b/Master/bin/x86_64-darwin/t4ht index d18a0a5fc51..f563c18d254 100755 Binary files a/Master/bin/x86_64-darwin/t4ht and b/Master/bin/x86_64-darwin/t4ht differ diff --git a/Master/bin/x86_64-darwin/tangle b/Master/bin/x86_64-darwin/tangle index d52a61b0bb5..c417848db61 100755 Binary files a/Master/bin/x86_64-darwin/tangle and b/Master/bin/x86_64-darwin/tangle differ diff --git a/Master/bin/x86_64-darwin/tcdialog b/Master/bin/x86_64-darwin/tcdialog index 5c9e886069b..8d202c479a9 100755 Binary files a/Master/bin/x86_64-darwin/tcdialog and b/Master/bin/x86_64-darwin/tcdialog differ diff --git a/Master/bin/x86_64-darwin/teckit_compile b/Master/bin/x86_64-darwin/teckit_compile index d95d9f8bca8..865da8e375c 100755 Binary files a/Master/bin/x86_64-darwin/teckit_compile and b/Master/bin/x86_64-darwin/teckit_compile differ diff --git a/Master/bin/x86_64-darwin/tex b/Master/bin/x86_64-darwin/tex index b17d01bdb72..5420f8a1c9c 100755 Binary files a/Master/bin/x86_64-darwin/tex and b/Master/bin/x86_64-darwin/tex differ diff --git a/Master/bin/x86_64-darwin/tex2xindy b/Master/bin/x86_64-darwin/tex2xindy index ca32684ea9d..2d0eecc0ded 100755 Binary files a/Master/bin/x86_64-darwin/tex2xindy and b/Master/bin/x86_64-darwin/tex2xindy differ diff --git a/Master/bin/x86_64-darwin/tex4ht b/Master/bin/x86_64-darwin/tex4ht index de222eeb1c8..d360f2634bd 100755 Binary files a/Master/bin/x86_64-darwin/tex4ht and b/Master/bin/x86_64-darwin/tex4ht differ diff --git a/Master/bin/x86_64-darwin/tftopl b/Master/bin/x86_64-darwin/tftopl index ddd4606b5f3..4f6e2df37bf 100755 Binary files a/Master/bin/x86_64-darwin/tftopl and b/Master/bin/x86_64-darwin/tftopl differ diff --git a/Master/bin/x86_64-darwin/tie b/Master/bin/x86_64-darwin/tie index 830ead96bd7..b5316624bec 100755 Binary files a/Master/bin/x86_64-darwin/tie and b/Master/bin/x86_64-darwin/tie differ diff --git a/Master/bin/x86_64-darwin/ttf2afm b/Master/bin/x86_64-darwin/ttf2afm index d6afe478f23..91eba16f0a0 100755 Binary files a/Master/bin/x86_64-darwin/ttf2afm and b/Master/bin/x86_64-darwin/ttf2afm differ diff --git a/Master/bin/x86_64-darwin/ttf2pk b/Master/bin/x86_64-darwin/ttf2pk index 7608ebb0665..08aeb1c0cad 100755 Binary files a/Master/bin/x86_64-darwin/ttf2pk and b/Master/bin/x86_64-darwin/ttf2pk differ diff --git a/Master/bin/x86_64-darwin/ttf2tfm b/Master/bin/x86_64-darwin/ttf2tfm index 88d28a54be1..397e4b1c792 100755 Binary files a/Master/bin/x86_64-darwin/ttf2tfm and b/Master/bin/x86_64-darwin/ttf2tfm differ diff --git a/Master/bin/x86_64-darwin/ttfdump b/Master/bin/x86_64-darwin/ttfdump index 090056ae6c3..effdebb809a 100755 Binary files a/Master/bin/x86_64-darwin/ttfdump and b/Master/bin/x86_64-darwin/ttfdump differ diff --git a/Master/bin/x86_64-darwin/ttftotype42 b/Master/bin/x86_64-darwin/ttftotype42 index fbcd54bd9e9..31656ea2277 100755 Binary files a/Master/bin/x86_64-darwin/ttftotype42 and b/Master/bin/x86_64-darwin/ttftotype42 differ diff --git a/Master/bin/x86_64-darwin/updmap b/Master/bin/x86_64-darwin/updmap deleted file mode 100755 index 2483052a7de..00000000000 --- a/Master/bin/x86_64-darwin/updmap +++ /dev/null @@ -1,1435 +0,0 @@ -#!/bin/sh -# updmap - utility to maintain map files for outline fonts. -# Public domain. Originally written by Thomas Esser. -# Run with --help for usage. - -############################################################################### -# program history: -# further changes in texk/tetex/ChangeLog. -# Sun May 25 21:05:32 CEST 2008 (Reinhard Kotucha) -# add function symlink_or_copy needed by tl-portable. -# Post-te retirement, now maintained in TeX Live; see -# Build/texk/tetex/ChangeLog for further changes. -# Fr Jul 22 07:22:38 CEST 2005 -# write hint about log file into output files -# Fr Apr 8 19:15:05 CEST 2005 -# cleanup now has an argument for the return code -# So Mär 27 18:52:06 CEST 2005 -# honor $TMPDIR, $TEMP and $TMP, not just $TMP -# Do Mär 10 19:31:39 CET 2005 -# add a few quotes for $cnfFile with whitespace -# Sa Jan 15 18:13:46 CET 2005 -# avoid multiple variable assignments in one statement -# Sa Dez 25 12:44:23 CET 2004 -# implementaion adopted for teTeX-3.0 (tcfmgr) -# Mi Nov 3 16:33:22 CET 2004 -# add "--setoption option=value" syntax -# Fr Okt 29 21:05:53 CEST 2004 -# add --enable Map=... / --enable MixedMap=... -# Mi Okt 20 19:17:19 CEST 2004 -# transcript added; even better warnings / error messages -# So Okt 17 19:07:17 CEST 2004 -# improved warnings / error messages -# added --syncwithtrees -# added --listavailablemaps -# Mi Okt 6 16:37:49 CEST 2004 -# commenty may start with any of *#;% -# Sun Aug 1 11:42:14 CEST 2004, te -# remove pdftex related hacks; pdftex no longer needs them! -# Thu May 13 22:04:23 CEST 2004, te -# support user with new map file locations -# Fri Mar 19 15:22:55 CET 2004, te -# output "xxx yyy" instead of " xxx yyy " (less blanks) -# Fri Jan 2 22:41:11 CET 2004, te: -# add version string -# Wed Aug 20 18:51:47 CEST 2003 -# store map files to fonts/map, add options for dvipsoutputdir, -# pdftexoutputdir, dvipdfmoutputdir -# Mon Mar 24 13:40:55 CET 2003 -# fix fmex[789] for dvipdfm (no -r option) -# Sun Mar 23 18:58:00 CET 2003 -# make the script robust against whitespace in filenames -# Mon Jan 27 22:38:44 CET 2003 -# don't call a function before processOptions; we may loose our -# argument list with some broken shells -# Mon Jan 27 06:55:28 CET 2003 -# fix unportable egrep / sed -# Sat Jan 18 10:10:26 CET 2003 -# use $tmp8 in dvips2dvipdfm() -# Thu Jan 2 23:14:34 CET 2003 -# add umask 022, so generated files are always world-readable -# Sun Oct 27 11:33:04 CET 2002 -# write output in normalized format -# add support for dvipdfm -# Mon Sep 22 19:18:57 CEST 2002 -# fix typo: buildin -> builtin -# Mon Sep 2 19:18:57 CEST 2002 -# fix condensed <-> narrow mapping -# Sun Sep 1 15:02:28 CEST 2002 -# add dvipsDownloadBase35 / pdftexDownloadBase14 options -# Wed May 22 20:00:13 CEST 2002 -# listmaps option added by Gerben Wierda -# Tue May 21 05:27:37 CEST 2002 -# now removing map files before rewriting them; fixes permission problems -# Tue May 21 05:05:34 CEST 2002: -# cli options added: showoptions, setoption, enable, disable, nomkmap -# now even more verbose; now reporting non-existing map files -# fixing trap for MAC OS/X compatibility -# Fri May 17 22:38:37 CEST 2002: -# rewritten from teTeX-1.0 version; Completely new designed. -############################################################################### - -test -f /bin/ksh && test -z "$RUNNING_KSH" \ - && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \ - && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; } -unset RUNNING_KSH - -test -f /bin/bsh && test -z "$RUNNING_BSH" \ - && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \ - && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; } -unset RUNNING_BSH - -export PATH - -# hack around a bug in zsh: -test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' - -# the version string -version='$Id: updmap 17423 2010-03-11 17:53:34Z karl $' - -# -############################################################################### -# help() -# display help message and exit -############################################################################### -help() -{ - cat < -eof - (exit 0); exit -} - -# -############################################################################### -# verboseMsg(msg) -# print `msg' to stderr is $verbose is true -############################################################################### -verboseMsg() { - test -n "$log" && echo ${1+"$@"} >> "$log" - $verbose && echo ${1+"$@"} >&2 -} - -############################################################################### -# verboseCat() -# cat to stderr is $verbose is true -############################################################################### -verboseCat() { - if $verbose; then - if test -n "$log"; then - cat ${1+"$@"} | tee -a "$log" >&2 - else - cat ${1+"$@"} >&2 - fi - else - test -n "$log" && cat ${1+"$@"} >> "$log" - fi -} - -############################################################################### -# warn(msg) -# print `msg' to stderr -############################################################################### -warn() -{ - test -n "$log" && echo ${1+"$@"} >> "$log" - echo ${1+"$@"} >&2 -} - -############################################################################### -# abort(errmsg) -# print `errmsg' to stderr and exit with error code 1 -############################################################################### -abort() -{ - warn "$progname: $1." - cleanup 1 -} - -############################################################################### -# cfgval(variable) -# read variable ($1) from config file, first match wins -############################################################################### -cfgval() -{ - cat "$cnfFile" | sed -n 's/^'"$1"'[ =][ =]*//p' | sed q -} - -############################################################################### -# symlink_or_copy() -# if --copy is not set, try to create a symlink. If this fails, write -# a message to stderr and copy the file instead. -############################################################################### -symlink_or_copy() -{ - if $copy; then - $copy_cmd "$1" "$2" - else - $link_cmd "$1" "$2" || - { - echo "Creating symbolic link failed, the file is copied instead." 1>&2 && - $copy_cmd "$1" "$2" - } - fi -} - -############################################################################### -# setupSymlinks() -# set symlink (or copy) -# for psfonts.map according to dvipsPreferOutline variable, -# and for pdftex.map and dvipdfm.map according to pdftexDownloadBase14. -############################################################################### -setupSymlinks() -{ - ( - cd "$dvipsoutputdir" || exit 1 - rm -f psfonts.map - if test "x$dvipsPreferOutline" = xtrue; then - symlink_or_copy psfonts_t1.map psfonts.map - else - symlink_or_copy psfonts_pk.map psfonts.map - fi - - cd "$pdftexoutputdir" || exit 1 - rm -f pdftex.map - if test "x$pdftexDownloadBase14" = xtrue; then - symlink_or_copy pdftex_dl14.map pdftex.map - else - symlink_or_copy pdftex_ndl14.map pdftex.map - fi - - cd "$dvipdfmoutputdir" || exit 1 - rm -f dvipdfm.map - if test "x$dvipdfmDownloadBase14" = xtrue; then - symlink_or_copy dvipdfm_dl14.map dvipdfm.map - else - symlink_or_copy dvipdfm_ndl14.map dvipdfm.map - fi - ) -} - -############################################################################### -# transLW35(args ...) -# transform fontname and filenames according to transformation specified -# by mode -############################################################################### -transLW35() -{ - case $mode in - ""|URWkb) - cat ${1+"$@"} - ;; - URW) - fileURW ${1+"$@"} - ;; - ADOBE|ADOBEkb) - psADOBE ${1+"$@"} | file$mode - ;; - esac -} - -############################################################################### -# catMaps(regex) -# filter config file by regex for map lines and extract the map filenames. -# These are then looked up (by kpsewhich in locateMap) and the content of -# all map files is send to stdout. -############################################################################### -catMaps() -{ - rm -f $catMapsFailed - egrep "$1" "$cnfFile" \ - | sed 's@#.*@@' \ - | awk '{print $2}' \ - | sort \ - | uniq \ - | grep . > $tmp4 - - while read map; do - file=`locateMap "$map"` || { touch $catMapsFailed; break; } - - # output the file; also output a newline, because the final newline - # might be missing in the map file; Empty lines are filtered out later, - # so it does not really hurt do do this here. - test -n "$file" && { cat "$file"; echo; } - done < $tmp4 - if test -f $catMapsFailed; then - false; return 1 - else - true; return 0 - fi -} - -############################################################################### -# configReplace(file, pattern, line) -# The first line in file that matches pattern gets replaced by line. -# line will be added at the end of the file if pattern does not match. -############################################################################### -configReplace() -{ - file=$1; pat=$2; line=$3 - - if grep "$pat" "$file" >/dev/null; then - ed "$file" >/dev/null 2>&1 <<-eof - /$pat/ - c - $line - . - w - q -eof - else - echo "$line" >> "$file" - fi -} - -############################################################################### -# setOption (option, value) -# sets option to value in the config file (replacing the existing setting -# or by adding a new line to the config file). -############################################################################### -setOption() -{ - opt=$1 - val=$2 - case "$opt" in - LW35) - case "$val" in - URWkb|URW|ADOBE|ADOBEkb) - ;; - *) - abort "invalid value $val for option $opt" - ;; - esac - ;; - dvipsPreferOutline|dvipsDownloadBase35|pdftexDownloadBase14|dvipdfmDownloadBase14) - case "$val" in - true|false) - ;; - *) - abort "invalid value $val for option $opt" - esac - ;; - *) - abort "unsupported option $opt" - ;; - esac - - configReplace "$cnfFile" "^$opt[ ]" "$opt $val" -} - -############################################################################### -# enableMap (type, map) -# enables an entry in the config file for map with a given type. -############################################################################### -enableMap() -{ - case $1 in - Map|MixedMap) - ;; - *) - abort "invalid mapType $1" - ;; - esac - - # a map can only have one type, so we carefully disable everything - # about map here: - disableMap "$2" - - # now enable with the right type: - configReplace "$cnfFile" "^#![ ]*$1[ ]*$2" "$1 $2" -} - -############################################################################### -# disableMap (map) -# disables map in config file (any type) -############################################################################### -disableMap() -{ - #mapType=`awk '($1 == "MixedMap" || $1 == "Map") && $2 == map { print $1 }' \ - # map=$1 <"$cnfFile" | sort | uniq` - map=$1 - mapType=`egrep "^(MixedMap|Map)[ ]*$map( | |$)" "$cnfFile" | awk '{print $1}' | sort | uniq` - for type in $mapType; do - configReplace "$cnfFile" "^$type[ ]*$1" "#! $type $1" - done -} - -############################################################################### -# psADOBE() -# transform fontnames from URW to Adobe -############################################################################### -psADOBE() -{ - sed \ - -e 's/ URWGothicL-Demi / AvantGarde-Demi /' \ - -e 's/ URWGothicL-DemiObli / AvantGarde-DemiOblique /' \ - -e 's/ URWGothicL-Book / AvantGarde-Book /' \ - -e 's/ URWGothicL-BookObli / AvantGarde-BookOblique /' \ - -e 's/ URWBookmanL-DemiBold / Bookman-Demi /' \ - -e 's/ URWBookmanL-DemiBoldItal / Bookman-DemiItalic /' \ - -e 's/ URWBookmanL-Ligh / Bookman-Light /' \ - -e 's/ URWBookmanL-LighItal / Bookman-LightItalic /' \ - -e 's/ NimbusMonL-Bold / Courier-Bold /' \ - -e 's/ NimbusMonL-BoldObli / Courier-BoldOblique /' \ - -e 's/ NimbusMonL-Regu / Courier /' \ - -e 's/ NimbusMonL-ReguObli / Courier-Oblique /' \ - -e 's/ NimbusSanL-Bold / Helvetica-Bold /' \ - -e 's/ NimbusSanL-BoldCond / Helvetica-Narrow-Bold /' \ - -e 's/ NimbusSanL-BoldItal / Helvetica-BoldOblique /' \ - -e 's/ NimbusSanL-BoldCondItal / Helvetica-Narrow-BoldOblique /' \ - -e 's/ NimbusSanL-Regu / Helvetica /' \ - -e 's/ NimbusSanL-ReguCond / Helvetica-Narrow /' \ - -e 's/ NimbusSanL-ReguItal / Helvetica-Oblique /' \ - -e 's/ NimbusSanL-ReguCondItal / Helvetica-Narrow-Oblique /' \ - -e 's/ CenturySchL-Bold / NewCenturySchlbk-Bold /' \ - -e 's/ CenturySchL-BoldItal / NewCenturySchlbk-BoldItalic /' \ - -e 's/ CenturySchL-Roma / NewCenturySchlbk-Roman /' \ - -e 's/ CenturySchL-Ital / NewCenturySchlbk-Italic /' \ - -e 's/ URWPalladioL-Bold / Palatino-Bold /' \ - -e 's/ URWPalladioL-BoldItal / Palatino-BoldItalic /' \ - -e 's/ URWPalladioL-Roma / Palatino-Roman /' \ - -e 's/ URWPalladioL-Ital / Palatino-Italic /' \ - -e 's/ StandardSymL / Symbol /' \ - -e 's/ NimbusRomNo9L-Medi / Times-Bold /' \ - -e 's/ NimbusRomNo9L-MediItal / Times-BoldItalic /' \ - -e 's/ NimbusRomNo9L-Regu / Times-Roman /' \ - -e 's/ NimbusRomNo9L-ReguItal / Times-Italic /' \ - -e 's/ URWChanceryL-MediItal / ZapfChancery-MediumItalic /' \ - -e 's/ Dingbats / ZapfDingbats /' \ - ${1+"$@"} -} - -############################################################################### -# fileADOBEkb() -# transform filenames from URW to ADOBE (both berry names) -############################################################################### -fileADOBEkb() -{ - sed \ - -e 's/\([^A-Za-z]\)uagd8a.pfb/\1pagd8a.pfb/' \ - -e 's/\([^A-Za-z]\)uagdo8a.pfb/\1pagdo8a.pfb/' \ - -e 's/\([^A-Za-z]\)uagk8a.pfb/\1pagk8a.pfb/' \ - -e 's/\([^A-Za-z]\)uagko8a.pfb/\1pagko8a.pfb/' \ - -e 's/\([^A-Za-z]\)ubkd8a.pfb/\1pbkd8a.pfb/' \ - -e 's/\([^A-Za-z]\)ubkdi8a.pfb/\1pbkdi8a.pfb/' \ - -e 's/\([^A-Za-z]\)ubkl8a.pfb/\1pbkl8a.pfb/' \ - -e 's/\([^A-Za-z]\)ubkli8a.pfb/\1pbkli8a.pfb/' \ - -e 's/\([^A-Za-z]\)ucrb8a.pfb/\1pcrb8a.pfb/' \ - -e 's/\([^A-Za-z]\)ucrbo8a.pfb/\1pcrbo8a.pfb/' \ - -e 's/\([^A-Za-z]\)ucrr8a.pfb/\1pcrr8a.pfb/' \ - -e 's/\([^A-Za-z]\)ucrro8a.pfb/\1pcrro8a.pfb/' \ - -e 's/\([^A-Za-z]\)uhvb8a.pfb/\1phvb8a.pfb/' \ - -e 's/\([^A-Za-z]\)uhvb8ac.pfb/\1phvb8an.pfb/' \ - -e 's/\([^A-Za-z]\)uhvbo8a.pfb/\1phvbo8a.pfb/' \ - -e 's/\([^A-Za-z]\)uhvbo8ac.pfb/\1phvbo8an.pfb/' \ - -e 's/\([^A-Za-z]\)uhvr8a.pfb/\1phvr8a.pfb/' \ - -e 's/\([^A-Za-z]\)uhvr8ac.pfb/\1phvr8an.pfb/' \ - -e 's/\([^A-Za-z]\)uhvro8a.pfb/\1phvro8a.pfb/' \ - -e 's/\([^A-Za-z]\)uhvro8ac.pfb/\1phvro8an.pfb/' \ - -e 's/\([^A-Za-z]\)uncb8a.pfb/\1pncb8a.pfb/' \ - -e 's/\([^A-Za-z]\)uncbi8a.pfb/\1pncbi8a.pfb/' \ - -e 's/\([^A-Za-z]\)uncr8a.pfb/\1pncr8a.pfb/' \ - -e 's/\([^A-Za-z]\)uncri8a.pfb/\1pncri8a.pfb/' \ - -e 's/\([^A-Za-z]\)uplb8a.pfb/\1pplb8a.pfb/' \ - -e 's/\([^A-Za-z]\)uplbi8a.pfb/\1pplbi8a.pfb/' \ - -e 's/\([^A-Za-z]\)uplr8a.pfb/\1pplr8a.pfb/' \ - -e 's/\([^A-Za-z]\)uplri8a.pfb/\1pplri8a.pfb/' \ - -e 's/\([^A-Za-z]\)usyr.pfb/\1psyr.pfb/' \ - -e 's/\([^A-Za-z]\)utmb8a.pfb/\1ptmb8a.pfb/' \ - -e 's/\([^A-Za-z]\)utmbi8a.pfb/\1ptmbi8a.pfb/' \ - -e 's/\([^A-Za-z]\)utmr8a.pfb/\1ptmr8a.pfb/' \ - -e 's/\([^A-Za-z]\)utmri8a.pfb/\1ptmri8a.pfb/' \ - -e 's/\([^A-Za-z]\)uzcmi8a.pfb/\1pzcmi8a.pfb/' \ - -e 's/\([^A-Za-z]\)uzdr.pfb/\1pzdr.pfb/' \ - ${1+"$@"} -} - -############################################################################### -# fileURW() -# transform filenames from URWkb (berry names) to URW (vendor names) -############################################################################### -fileURW() -{ - sed \ - -e 's/\([^A-Za-z]\)uagd8a.pfb/\1a010015l.pfb/' \ - -e 's/\([^A-Za-z]\)uagdo8a.pfb/\1a010035l.pfb/' \ - -e 's/\([^A-Za-z]\)uagk8a.pfb/\1a010013l.pfb/' \ - -e 's/\([^A-Za-z]\)uagko8a.pfb/\1a010033l.pfb/' \ - -e 's/\([^A-Za-z]\)ubkd8a.pfb/\1b018015l.pfb/' \ - -e 's/\([^A-Za-z]\)ubkdi8a.pfb/\1b018035l.pfb/' \ - -e 's/\([^A-Za-z]\)ubkl8a.pfb/\1b018012l.pfb/' \ - -e 's/\([^A-Za-z]\)ubkli8a.pfb/\1b018032l.pfb/' \ - -e 's/\([^A-Za-z]\)ucrb8a.pfb/\1n022004l.pfb/' \ - -e 's/\([^A-Za-z]\)ucrbo8a.pfb/\1n022024l.pfb/' \ - -e 's/\([^A-Za-z]\)ucrr8a.pfb/\1n022003l.pfb/' \ - -e 's/\([^A-Za-z]\)ucrro8a.pfb/\1n022023l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvb8a.pfb/\1n019004l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvb8ac.pfb/\1n019044l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvbo8a.pfb/\1n019024l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvbo8ac.pfb/\1n019064l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvr8a.pfb/\1n019003l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvr8ac.pfb/\1n019043l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvro8a.pfb/\1n019023l.pfb/' \ - -e 's/\([^A-Za-z]\)uhvro8ac.pfb/\1n019063l.pfb/' \ - -e 's/\([^A-Za-z]\)uncb8a.pfb/\1c059016l.pfb/' \ - -e 's/\([^A-Za-z]\)uncbi8a.pfb/\1c059036l.pfb/' \ - -e 's/\([^A-Za-z]\)uncr8a.pfb/\1c059013l.pfb/' \ - -e 's/\([^A-Za-z]\)uncri8a.pfb/\1c059033l.pfb/' \ - -e 's/\([^A-Za-z]\)uplb8a.pfb/\1p052004l.pfb/' \ - -e 's/\([^A-Za-z]\)uplbi8a.pfb/\1p052024l.pfb/' \ - -e 's/\([^A-Za-z]\)uplr8a.pfb/\1p052003l.pfb/' \ - -e 's/\([^A-Za-z]\)uplri8a.pfb/\1p052023l.pfb/' \ - -e 's/\([^A-Za-z]\)usyr.pfb/\1s050000l.pfb/' \ - -e 's/\([^A-Za-z]\)utmb8a.pfb/\1n021004l.pfb/' \ - -e 's/\([^A-Za-z]\)utmbi8a.pfb/\1n021024l.pfb/' \ - -e 's/\([^A-Za-z]\)utmr8a.pfb/\1n021003l.pfb/' \ - -e 's/\([^A-Za-z]\)utmri8a.pfb/\1n021023l.pfb/' \ - -e 's/\([^A-Za-z]\)uzcmi8a.pfb/\1z003034l.pfb/' \ - -e 's/\([^A-Za-z]\)uzdr.pfb/\1d050000l.pfb/' \ - ${1+"$@"} -} - -############################################################################### -# fileADOBE() -# transform filenames from URWkb (berry names) to ADOBE (vendor names) -############################################################################### -fileADOBE() -{ - sed \ - -e 's/\([^A-Za-z]\)uagd8a.pfb/\1agd_____.pfb/' \ - -e 's/\([^A-Za-z]\)uagdo8a.pfb/\1agdo____.pfb/' \ - -e 's/\([^A-Za-z]\)uagk8a.pfb/\1agw_____.pfb/' \ - -e 's/\([^A-Za-z]\)uagko8a.pfb/\1agwo____.pfb/' \ - -e 's/\([^A-Za-z]\)ubkd8a.pfb/\1bkd_____.pfb/' \ - -e 's/\([^A-Za-z]\)ubkdi8a.pfb/\1bkdi____.pfb/' \ - -e 's/\([^A-Za-z]\)ubkl8a.pfb/\1bkl_____.pfb/' \ - -e 's/\([^A-Za-z]\)ubkli8a.pfb/\1bkli____.pfb/' \ - -e 's/\([^A-Za-z]\)ucrb8a.pfb/\1cob_____.pfb/' \ - -e 's/\([^A-Za-z]\)ucrbo8a.pfb/\1cobo____.pfb/' \ - -e 's/\([^A-Za-z]\)ucrr8a.pfb/\1com_____.pfb/' \ - -e 's/\([^A-Za-z]\)ucrro8a.pfb/\1coo_____.pfb/' \ - -e 's/\([^A-Za-z]\)uhvb8a.pfb/\1hvb_____.pfb/' \ - -e 's/\([^A-Za-z]\)uhvb8ac.pfb/\1hvnb____.pfb/' \ - -e 's/\([^A-Za-z]\)uhvbo8a.pfb/\1hvbo____.pfb/' \ - -e 's/\([^A-Za-z]\)uhvbo8ac.pfb/\1hvnbo___.pfb/' \ - -e 's/\([^A-Za-z]\)uhvr8a.pfb/\1hv______.pfb/' \ - -e 's/\([^A-Za-z]\)uhvr8ac.pfb/\1hvn_____.pfb/' \ - -e 's/\([^A-Za-z]\)uhvro8a.pfb/\1hvo_____.pfb/' \ - -e 's/\([^A-Za-z]\)uhvro8ac.pfb/\1hvno____.pfb/' \ - -e 's/\([^A-Za-z]\)uncb8a.pfb/\1ncb_____.pfb/' \ - -e 's/\([^A-Za-z]\)uncbi8a.pfb/\1ncbi____.pfb/' \ - -e 's/\([^A-Za-z]\)uncr8a.pfb/\1ncr_____.pfb/' \ - -e 's/\([^A-Za-z]\)uncri8a.pfb/\1nci_____.pfb/' \ - -e 's/\([^A-Za-z]\)uplb8a.pfb/\1pob_____.pfb/' \ - -e 's/\([^A-Za-z]\)uplbi8a.pfb/\1pobi____.pfb/' \ - -e 's/\([^A-Za-z]\)uplr8a.pfb/\1por_____.pfb/' \ - -e 's/\([^A-Za-z]\)uplri8a.pfb/\1poi_____.pfb/' \ - -e 's/\([^A-Za-z]\)usyr.pfb/\1sy______.pfb/' \ - -e 's/\([^A-Za-z]\)utmb8a.pfb/\1tib_____.pfb/' \ - -e 's/\([^A-Za-z]\)utmbi8a.pfb/\1tibi____.pfb/' \ - -e 's/\([^A-Za-z]\)utmr8a.pfb/\1tir_____.pfb/' \ - -e 's/\([^A-Za-z]\)utmri8a.pfb/\1tii_____.pfb/' \ - -e 's/\([^A-Za-z]\)uzcmi8a.pfb/\1zcmi____.pfb/' \ - -e 's/\([^A-Za-z]\)uzdr.pfb/\1zd______.pfb/' \ - ${1+"$@"} -} - -############################################################################### -# locateWeb2c (file ...) -# apply kpsewhich with format 'web2c files' -############################################################################### -locateWeb2c() -{ - kpsewhich --format='web2c files' ${1+"$@"} -} - -############################################################################### -# locateMap (file ...) -# apply kpsewhich with format 'map' -############################################################################### -locateMap() -{ - - # Always use the "migration checking version". This might become - # consigurable, but for now, we always want to check. - if :; then - locateMapMigrate "$@" - return $? - fi - - # The old version of the code; not used at the moment. - for map - do - file=`kpsewhich --format=map "$map"` - if test -f "$file"; then - verboseMsg "$progname: using map file \`$file'" - echo "$file" - else - warn "map file \`$map' not found." - fi - done -} - -############################################################################### -# locateMapMigrate (file ...) -# look for map file; assist user with possibly files in wrong locations; -# also watch out for possibly hidden conflicts -############################################################################### -locateMapMigrate() -{ - for map - do - # look up using the new search path - file=`kpsewhich --format=map "$map"` - - # look up using the old search path - file2=`kpsewhich --format='dvips config' "$map"` - - # Well, the search paths should not overlap. If they do, and if - # file1 = file2, we don't want to complain about file2, so: - test "x$file" = "x$file2" && file2= - - if test -f "$file"; then - - verboseMsg "$progname: using map file \`$file'" - echo "$file" - - # we have found the file where we should. If we have additional - # ones: complain! - if test -f "$file2"; then - mapCmp "$file" "$file2" \ - && mapWarn obsoleteCopy "$map" "$file2" \ - || mapWarn manualResolve "$map" "$file" "$file2" - fi - - else - if test -f "$file2"; then - # bad: map file exists in the wrong location only - mapWarn badLocation "$map" "$file2" - else - # bad: map file does not exist at all - mapWarn notFound "$map" - fi - false; return 1 - fi - done - true; return 0 -} - -############################################################################### -# mapCmp(file, file2) -# compare two map files like cmp; but less strict, so changes regarding -# whitespaces, comments etc. are tolerated. Important is only the -# return value here. -############################################################################### -mapCmp() -{ - file=$1; file2=$2 - - # For reasons of speed only. Avoid normalizeLines if files are 100% - # the same. - cmp "$file" "$file2" >/dev/null 2>&1 && return 0 - - normalizeLines <"$file" >"$tmpdir/mapCmp-1" - normalizeLines <"$file2" >"$tmpdir/mapCmp-2" - cmp "$tmpdir/mapCmp-1" "$tmpdir/mapCmp-2" >/dev/null 2>&1 -} - -############################################################################### -# mapWarn() -############################################################################### -mapWarn() -{ - - case $1 in - obsoleteCopy) - warn " -!!! WARNING: Identical copy of used file for \`$2' - exists in obsolete location - $3 - Please, consider removing this file. -" - touch $mapWarnCalled - ;; - manualResolve) - warn " -!!! WARNING: While searching for the right map file for \`$2', we have - found the file - $3 - in the right location and we are using this - file. However, a map file with different content has been found in - the obsolete location - $4 - Please, see which version you want to use and eventually update the - content of the used map file. Additionally, consider removing the - obsolete file. -" - touch $mapWarnCalled - ;; - badLocation) - map=$2 - location=$3 - - m=" -!!! ERROR: The right location for map files has been - changed for this release and the map file \`$map' has - not been found in the right location, but in the obsolete - location - $location - instead. - - To fix this, please move this file into an appropriate - subdirectory of fonts/map in one of your texmf trees. - - For more information about the changed search paths, see - the release notes section in the teTeX manual. You probably - can read this document by executing the command - texdoc TETEXDOC - else visit the web page - http://tug.org/texlive/mapenc.html -" - warn "$m" - false; return 1 - ;; - notFound) - warn " -!!! ERROR! The map file \`$2' has not been found at all. - - Either put this file into the right place or remove the - reference from the configuration file. An automatic way - to disable unavailable map files is to call - $progname --syncwithtrees - - For manual editing, call - $progname --edit -" - - false; return 1 - ;; - esac -} - -############################################################################### -# cleanup() -# clean up the temp area and exit with proper exit status -############################################################################### -cleanup() -{ - rc=$1 - $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \ - && { cd $orig_pwd && rm -rf "$tmpdir"; } - (exit $rc); exit $rc -} - -############################################################################### -# setupTmpDir() -# set up a temp directory and a trap to remove it -############################################################################### -setupTmpDir() -{ - $needsCleanup && return - - trap 'cleanup 1' 1 2 3 7 13 15 - needsCleanup=true - mkdir "$tmpdir" || abort "could not create directory \`$tmpdir'" -} - -############################################################################### -# showOptions(item) -# show Options for an item -############################################################################### -showOptions() -{ - item=$1 - - case "$item" in - LW35) - echo "URWkb URW ADOBE ADOBEkb" - ;; - dvipsPreferOutline|pdftexDownloadBase14|dvipdfmDownloadBase14|dvipsDownloadBase35) - echo "true false" - ;; - *) - abort "Unknown item \"$item\". Choose one of LW35, dvipsPreferOutline, dvipsDownloadBase35, pdftexDownloadBase14 or dvipdfmDownloadBase14" - ;; - esac - - (exit 0); exit 0 -} - -############################################################################### -# mktexdir(args) -# call mktexdir script, disable all features (to prevent sticky directories) -############################################################################### -mktexdir() -{ - MT_FEATURES=none "$TEXMFMAIN/web2c/mktexdir" "$@" >&2 -} - -############################################################################### -# setupDestDir() -# Assign output directories which are not yet assigned. Always use -# the TEXMFVAR for this. -############################################################################### -setupDestDir() -{ - vartexmf=`kpsewhich -var-value=TEXMFVAR` - - # dvips - if test -z "$dvipsoutputdir"; then - dvipsoutputdir=$vartexmf/fonts/map/dvips/updmap - fi - - # pdftex - if test -z "$pdftexoutputdir"; then - pdftexoutputdir=$vartexmf/fonts/map/pdftex/updmap - fi - - # dvipdfm - if test -z "$dvipdfmoutputdir"; then - dvipdfmoutputdir=$vartexmf/fonts/map/dvipdfm/updmap - fi - - mktexdir "$dvipsoutputdir" "$pdftexoutputdir" "$dvipdfmoutputdir" >/dev/null 2>&1 - for d in "$dvipsoutputdir" "$pdftexoutputdir" "$dvipdfmoutputdir"; do - test -d "$d" || abort "output directory \`$d' does not exist" - test -w "$d" || abort "output directory \`$d' is not writable" - done - -} - -############################################################################### -# setupLog(cfgFile) -# try to set up a log file in $TEXMFVAR/web2c -############################################################################### -setupLog() -{ - vartexmf=`kpsewhich -var-value=TEXMFVAR` - dir=$vartexmf/web2c - mktexdir "$dir" >/dev/null 2>&1 - log="$dir/$progname.log" - if test -d "$dir" && test -w "$dir"; then - rm -f "$log" - > "$log" - fi - if test -w "$log"; then - if $chicken_mode; then - log= - else - date > "$log" - verboseMsg "$progname: This is $progname, version $version" - verboseMsg "$progname: using transcript file \`$log'" - fi - else - log= - verboseMsg "$progname: This is $progname, version $version" - verboseMsg "$progname: no permissions for writing $dir/$progname.log', so no transcript" - fi -} - -############################################################################### -# setupCfgFile() -# find config file if none specified on cmd line. -############################################################################### -setupCfgFile() -{ - case "$cnfFile" in - "") cnfFile=`locateWeb2c $cnfFileShort` - case "$cnfFile" in - "") abort "config file $cnfFileShort not found (ls-R missing?)" - esac;; - esac - setupLog -} - -############################################################################### -# processOptions() -# process cmd line options -############################################################################### -processOptions() -{ - while - case $1 in - --quiet|-q) - verbose=false;; - --cnffile) - cfgparam=1; cnfFile=$2; shift;; - --cnffile=*) - cfgparam=1; cnfFile=`echo "$1" | sed 's/--cnffile=//'`;; - --copy) - copy=true;; - --dry-run|-n) - chicken_mode=true;; - --dvipsoutputdir) - dvipsoutputdirparam=1; dvipsoutputdir=$2; shift;; - --dvipsoutputdir=*) - dvipsoutputdirparam=1; dvipsoutputdir=`echo "$1" | sed 's/--dvipsoutputdir=//'`;; - --pdftexoutputdir) - pdftexoutputdirparam=1; pdftexoutputdir=$2; shift;; - --pdftexoutputdir=*) - pdftexoutputdirparam=1; pdftexoutputdir=`echo "$1" | sed 's/--pdftexoutputdir=//'`;; - --dvipdfmoutputdir) - dvipdfmoutputdirparam=1; dvipdfmoutputdir=$2; shift;; - --dvipdfmoutputdir=*) - dvipdfmoutputdirparam=1; dvipdfmoutputdir=`echo "$1" | sed 's/--dvipdfmoutputdir=//'`;; - --outputdir) - dvipsoutputdirparam=1; dvipsoutputdir=$2 - pdftexoutputdirparam=1; pdftexoutputdir=$2 - dvipdfmoutputdirparam=1; dvipdfmoutputdir=$2 - shift - ;; - --outputdir=*) - outputdir=`echo "$1" | sed 's/--outputdir=//'` - dvipsoutputdirparam=1; dvipsoutputdir=$outputdir - pdftexoutputdirparam=1; pdftexoutputdir=$outputdir - dvipdfmoutputdirparam=1; dvipdfmoutputdir=$outputdir - ;; - --setoption) - cfgmaint=1 - cmd=setoption - case $2 in - *=*) - setoptionOpt=`echo $2 | sed 's@=.*@@'` - setoptionVal=`echo $2 | sed 's@[^=]*=@@'` - shift - ;; - *) - test $# -ge 3 || { abort "--setoption needs two parameters: option value"; } - setoptionOpt=$2; setoptionVal=$3; shift; shift - ;; - esac - ;; - --enable) - cfgmaint=1 - cmd=enable - case $2 in - Map=*) - enableMapType=Map; enableMapFile=`echo "$2" | sed 's/Map=//'`; shift;; - MixedMap=*) - enableMapType=MixedMap; enableMapFile=`echo "$2" | sed 's/MixedMap=//'`; shift;; - Map|MixedMap) - test $# -ge 3 || { abort "--enable needs two parameters: mapType mapFile"; } - enableMapType=$2; enableMapFile=$3; shift; shift;; - *) - abort "--enable needs two parameters mapType mapFile";; - esac - ;; - --syncwithtrees) - cfgmaint=1 - cmd=syncwithtrees;; - --disable) - cfgmaint=1 - cmd=disable; disableMapFile=$2; shift - ;; - --disable=*) - cfgmaint=1 - disableMapFile=`echo "$1" | sed 's/--disable=//'` - cmd=disable - ;; - --edit|-e) - cfgmaint=1 - cmd=edit;; - --listmaps|-l) - cmd=listmaps;; - --listavailablemaps) - cmd=listavailablemaps;; - --showoptions) - cmd=showoptions; showoptionsItem=$2; shift;; - --showoptions=*) - cmd=showoptions; showoptionsItem=`echo "$1" | sed 's/--showoptions=//'`;; - - --nohash) - texhashEnabled=false;; - --nomkmap) - mkmapEnabled=false;; - --help|-help|-h) - help;; - --version) - echo "$progname version $version"; (exit 0); exit 0;; - "") break;; - *) abort "$progname: unknown option \`$1'. Try $progname --help for help";; - esac - do test $# -gt 0 && shift; done - - if test -n "$cfgparam"; then - if test -z "$cnfFile" || test ! -f "$cnfFile"; then - abort "config file \`$cnfFileShort' not found" - fi - fi - - if test -n "$dvipdoutputdirparam"; then - if test -z "$dvipdoutputdir" || test ! -d "$dvipdoutputdir"; then - abort "dvips output directory \`$1' not found" - fi - fi - if test -n "$pdftexoutputdirparam"; then - if test -z "$pdftexoutputdir" || test ! -d "$pdftexoutputdir"; then - abort "pdftex output directory \`$1' not found" - fi - fi - if test -n "$dvipdfmoutputdirparam"; then - if test -z "$dvipdfmoutputdir" || test ! -d "$dvipdfmoutputdir"; then - abort "dvipdfm output directory \`$1' not found" - fi - fi - -} - -############################################################################### -# listMaps() -# list all maps mentioned in the config file -############################################################################### -listMaps() -{ - egrep '^(#! *)?(Mixed)?Map' "$cnfFile" -} - -############################################################################### -# listAvailableMaps() -# list maps mentioned in the config file if they are available -############################################################################### -listAvailableMaps() -{ - # loop over each possible line in the config file (-> $line) - # extract the name of the map file (-> $m) - # check if the map file exists and in that case echo the line - OLDIFS=$IFS - IFS=' -' - for line in `egrep '^(#! *)?(Mixed)?Map' "$cnfFile"`; do - m=`echo "$line" | sed 's@[ ]*$@@; s@.*[ ]@@'` - kpsewhich --format=map "$m" >/dev/null && echo "$line" - done - IFS=$OLDIFS -} - -############################################################################### -# syncWithTrees() -# update the config file: uncomment all lines which refer to map files that -# are unavailabe in the texmf trees -############################################################################### -syncWithTrees() -{ - for i in `egrep '^(Mixed)?Map' "$cnfFile" | sed 's@.* @@'`; do - kpsewhich --format=map "$i" >/dev/null || echo "$i" - done > $tmp1 - { - sed 's@/@\\/@g; s@^@/^MixedMap[ ]*@; s@$@$/s/^/#! /@' <$tmp1 - sed 's@/@\\/@g; s@^@/^Map[ ]*@; s@$@$/s/^/#! /@' <$tmp1 - } > $tmp2 - sed -f $tmp2 "$cnfFile" > $tmp3 && cat $tmp3 > "$cnfFile" -} - -############################################################################### -# normalizeLines() -# remove comments, whitespace is exactly one space, no empty lines, -# no whitespace at end of line, one space before and after ", -# no CR's (as in skaknew). -############################################################################### -normalizeLines() -{ - sed \ - -e '/^[*#;%]/d' \ - -e 's@[ ][ ]*@ @g' \ - -e '/^ *$/d' \ - -e 's@ $@@' \ - -e 's@ *" *@ " @g' \ - -e 's@" \([^"]*\) "@"\1"@g' \ - | tr -d '\r' \ - | sort | uniq -} - -############################################################################### -# dvips2dvipdfm() -# reads from stdin, writes to stdout. It transforms "dvips"-like syntax into -# "dvipdfm"-like syntax. It is a very ugly hack. -############################################################################### -dvips2dvipdfm() -{ - sed -e 's@$@ %@' \ - -e 's@^\(\([^ ]*\).*\)@\1\2@' \ - -e 's@\(.*<\[* *\([^ ]*\)\.enc\(.*\)\)@\1 \2@' \ - -e '/%[^ ]*$/s@$@ default@' \ - -e 's@\(.*<<* *\([^ ]*\)\.pf[ab].*\)@\1 \2@' \ - -e '/%[^ ]* [^ ]*$/s@\( \([^ ]*\).*\)$@\1 \2@' \ - -e 's@\(.*[" ]\([.0-9-][.0-9-]*\) *ExtendFont.*\)@\1 -e \2@' \ - -e 's@\(.*[" ]\([.0-9-][.0-9-]*\) *SlantFont.*\)@\1 -s \2@' \ - -e 's@.*%@@' | - awk '$1 == $3 && $2 == "default" {$2=""; $3=""} {print}' > $tmp8 - - egrep '^(cm|eu|la|lc|line|msam|xy)' $tmp8 \ - | sed 's@$@ -r@; s@\(fmex[789]\) -r$@\1@' - egrep -v '^(cm|eu|la|lc|line|msam|xy)' $tmp8 -} - - -############################################################################### -# mkMaps() -# the main task of this script: create the output files -############################################################################### -mkMaps() -{ - newline=' -' - mode=`cfgval LW35` - dvipsPreferOutline=`cfgval dvipsPreferOutline` - dvipsDownloadBase35=`cfgval dvipsDownloadBase35` - pdftexDownloadBase14=`cfgval pdftexDownloadBase14` - dvipdfmDownloadBase14=`cfgval dvipdfmDownloadBase14` - - # defaults - test -z "$mode" && mode=URWkb - test -z "$dvipsPreferOutline" && dvipsPreferOutline=true - test -z "$dvipsDownloadBase35" && dvipsDownloadBase35=false - test -z "$pdftexDownloadBase14" && pdftexDownloadBase14=false - test -z "$dvipdfmDownloadBase14" && dvipdfmDownloadBase14=false - - outputFiles="$dvipsoutputdir/download35.map -$dvipsoutputdir/builtin35.map -$dvipsoutputdir/psfonts_t1.map -$dvipsoutputdir/psfonts_pk.map -$pdftexoutputdir/pdftex_dl14.map -$pdftexoutputdir/pdftex_ndl14.map -$dvipdfmoutputdir/dvipdfm_dl14.map -$dvipdfmoutputdir/dvipdfm_ndl14.map -$dvipsoutputdir/ps2pk.map" - - outputLinks="$dvipsoutputdir/psfonts.map -$pdftexoutputdir/pdftex.map -$dvipdfmoutputdir/dvipdfm.map" - - allOutput="$outputFiles -$outputLinks" - - notfound=false - OLDIFS=$IFS; IFS=$newline - for o in $allOutput; do - test -f "$o" || notfound=true - done - IFS=$OLDIFS - $notfound || texhashEnabled=false - - verboseCat <<-eof - updmap is creating new map files using the following configuration: - - config file: \`$cnfFile' - dvips output directory: \`$dvipsoutputdir' - pdftex output directory: \`$pdftexoutputdir' - dvipdfm output directory: \`$dvipdfmoutputdir' - - prefer outlines: \`$dvipsPreferOutline' - texhash enabled: \`$texhashEnabled' - download standard fonts (dvips): \`$dvipsDownloadBase35' - download standard fonts (pdftex): \`$pdftexDownloadBase14' - download standard fonts (dvipdfm): \`$dvipdfmDownloadBase14' -eof - - verboseMsg - verboseMsg "$progname: scanning for LW35 support files" - dvips35=`locateMap dvips35.map` || cleanup 1 - pdftex35=`locateMap pdftex35.map` || cleanup 1 - dvipdfm35=`locateMap dvipdfm35.map` || cleanup 1 - ps2pk35=`locateMap ps2pk35.map` || cleanup 1 - - if $chicken_mode; then - echo - echo "$progname: chicken mode, skipping all output generation, goodbye." - exit 0 - fi - - verboseMsg - verboseMsg "$progname: Scanning for MixedMap entries:" - catMaps '^MixedMap' > $tmp1 || cleanup 1 - - verboseMsg - verboseMsg "$progname: Scanning for Map entries:" - catMaps '^Map' > $tmp2 || cleanup 1 - verboseMsg - - # files should be world-readable - umask 022 - - OLDIFS=$IFS; IFS=$newline - for file in $allOutput; do - rm -f "$file" - cat > "$file" <<-eof - % $file: maintained by the script updmap. - % Don't change this file directly. Edit texmf/web2c/$cnfFileShort - % and run updmap to recreate this file. -eof - if test -n "$log"; then - cat >> "$file" <<-eof - % A log of the updmap run that has created this file is available here: - % $log -eof - fi - done - IFS=$OLDIFS - - verboseMsg "$progname: Generating output for ps2pk..." - { transLW35 "$ps2pk35"; cat $tmp1 $tmp2; } \ - | normalizeLines >> "$dvipsoutputdir/ps2pk.map" - - verboseMsg "$progname: Generating output for dvips..." - { transLW35 "$ps2pk35"; } \ - | normalizeLines >> "$dvipsoutputdir/download35.map" - { transLW35 "$dvips35"; } \ - | normalizeLines >> "$dvipsoutputdir/builtin35.map" - - if test "x$dvipsDownloadBase35" = xtrue; then - dftdvips=$ps2pk35 - else - dftdvips=$dvips35 - fi - { transLW35 "$dftdvips"; cat $tmp1 $tmp2; } \ - | normalizeLines >> "$dvipsoutputdir/psfonts_t1.map" - { transLW35 "$dftdvips"; cat $tmp2; } \ - | normalizeLines >> "$dvipsoutputdir/psfonts_pk.map" - - verboseMsg "$progname: Generating output for pdftex..." - # remove PaintType due to Sebastian's request - { transLW35 "$pdftex35"; cat $tmp1 $tmp2; } \ - | grep -v PaintType | grep . > $tmp3 - { transLW35 "$dvipdfm35"; cat $tmp1 $tmp2; } \ - | grep -v PaintType | grep . > $tmp6 - { transLW35 "$ps2pk35"; cat $tmp1 $tmp2; } \ - | grep -v PaintType | grep . > $tmp7 - - <$tmp3 normalizeLines >> "$pdftexoutputdir/pdftex_ndl14.map" - <$tmp7 normalizeLines >> "$pdftexoutputdir/pdftex_dl14.map" - - verboseMsg "$progname: Generating output for dvipdfm..." - <$tmp7 normalizeLines | dvips2dvipdfm | normalizeLines >> "$dvipdfmoutputdir/dvipdfm_dl14.map" - <$tmp6 normalizeLines | dvips2dvipdfm | normalizeLines >> "$dvipdfmoutputdir/dvipdfm_ndl14.map" - verboseMsg "$progname: All output generated." - verboseMsg - - setupSymlinks - $texhashEnabled && { $verbose && texhash || texhash >/dev/null 2>&1; } - - verboseMsg - verboseMsg "$progname: Files generated:" - OLDIFS=$IFS; IFS=$newline - ls -l $outputFiles | verboseCat - IFS=$OLDIFS - verboseMsg - - verboseMsg "$progname: Map file links or copies:" - ls -l "$dvipsoutputdir"/psfonts.map \ - "$pdftexoutputdir"/pdftex.map \ - "$dvipdfmoutputdir"/dvipdfm.map | verboseCat - - if test -f $mapWarnCalled; then - m=" - -!!! NOTICE: - - With this release, the search paths for map files have been changed - and we have found that some files exist in the new path as well as - in the obsolete path. - - This is not an error per se, but please consider removing duplicates - from the old location and search the above output" - - test -n "$log" && m="$m or the transcript file - $log - " - - m="$m for warnings. - - For more information about the changed search paths, see - the release notes section in the teTeX manual. You probably - can read this document by executing the command - texdoc TETEXDOC - else visit the web page - http://tug.org/texlive/mapenc.html -" - warn "$m" - fi - - verboseMsg - verboseMsg "$progname: Done." - return 0 -} - -############################################################################### -# main() -# execution starts here -############################################################################### -main() -{ - # initialize global variables - progname=updmap - cmd= - log= - chicken_mode=false - link_cmd="ln -s" - copy_cmd="cp" - copy=false - orig_pwd=`pwd` - - cfgparam= - outputdirparam= - cfgmaint= - texhashEnabled=true - mkmapEnabled=true - verbose=true - needsCleanup=false - - cnfFileShort=updmap.cfg - cnfFile= - dvipsoutputdir=; pdftexoutputdir=; dvipdfmoutputdir= - : ${TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`} - - tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ - tmp1=$tmpdir/a - tmp2=$tmpdir/b - tmp3=$tmpdir/c - tmp4=$tmpdir/d - tmp5=$tmpdir/e - tmp6=$tmpdir/f - tmp7=$tmpdir/g - tmp8=$tmpdir/h - mapWarnCalled=$tmpdir/mapWarnCalled - catMapsFailed=$tmpdir/catMapsFailed - - processOptions ${1+"$@"} - - case "$cmd" in - showoptions) showOptions "$showoptionsItem"; (exit 0); exit;; - help) help; (exit 0); exit;; - esac - - setupCfgFile - case "$cmd" in - listmaps) listMaps; (exit 0); exit;; - listavailablemaps) listAvailableMaps; (exit 0); exit;; - esac - - # keep a copy of config file, so that we can see if the file was modified - setupTmpDir - - if test -n "$cfgmaint"; then - if test -z "$cfgparam"; then - co=`"$TEXMFMAIN/texconfig/tcfmgr" --tmp $tmpdir --cmd co --file $cnfFileShort` - test $? = 0 || cleanup 1 - set x $co; shift - id=$1; cnfFile=$3; orig=$4 - verboseMsg "$progname: initial config file is \`$orig'" - else - verboseMsg "$progname: config file is \`$cnfFile'" - cp "$cnfFile" $tmp5 - fi - - case "$cmd" in - edit) - ${VISUAL-${EDITOR-vi}} "$cnfFile";; - setoption) - setOption "$setoptionOpt" "$setoptionVal";; - enable) - enableMap "$enableMapType" "$enableMapFile";; - disable) - disableMap "$disableMapFile";; - syncwithtrees) - syncWithTrees;; - esac - - unchanged=true - if test -z "$cfgparam"; then - ci=`"$TEXMFMAIN/texconfig/tcfmgr" --tmp $tmpdir --cmd ci --id $id` - test $? = 0 || cleanup 1 - case "$ci" in - "") : ;; - *) unchanged=false - cnfFile=$ci - ;; - esac - else - cmp "$cnfFile" $tmp5 >/dev/null 2>&1 || unchanged=false - fi - case $unchanged in - true) if $mkmapEnabled; then - verboseMsg "$progname: configuration (updmap.cfg) unchanged. Map files will not be recreated." - mkmapEnabled=false - else - verboseMsg "$progname: configuration (updmap.cfg) unchanged." - fi;; - *) - verboseMsg "$progname: configuration file updated: \`$cnfFile'";; - esac - fi - - $mkmapEnabled || return - setupDestDir - mkMaps -} - -main ${1+"$@"} -cleanup 0 diff --git a/Master/bin/x86_64-darwin/updmap b/Master/bin/x86_64-darwin/updmap new file mode 120000 index 00000000000..5eceaae6d41 --- /dev/null +++ b/Master/bin/x86_64-darwin/updmap @@ -0,0 +1 @@ +../../texmf/scripts/tetex/updmap.pl \ No newline at end of file diff --git a/Master/bin/x86_64-darwin/updmap-sys b/Master/bin/x86_64-darwin/updmap-sys deleted file mode 100755 index 6f3c8365658..00000000000 --- a/Master/bin/x86_64-darwin/updmap-sys +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# updmap-sys: Thomas Esser, public domain. - -# wrapper script for updmap with TEXMFVAR and TEXMFCONFIG set to -# TEXMFSYSVAR / TEXMFSYSCONFIG - -test -f /bin/ksh && test -z "$RUNNING_KSH" \ - && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \ - && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; } -unset RUNNING_KSH - -test -f /bin/bsh && test -z "$RUNNING_BSH" \ - && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \ - && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; } -unset RUNNING_BSH - -export PATH - -# hack around a bug in zsh: -test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' - -v=`kpsewhich -var-value TEXMFSYSVAR` -c=`kpsewhich -var-value TEXMFSYSCONFIG` - -TEXMFVAR="$v" -TEXMFCONFIG="$c" -export TEXMFVAR TEXMFCONFIG - -exec updmap ${1+"$@"} diff --git a/Master/bin/x86_64-darwin/updmap-sys b/Master/bin/x86_64-darwin/updmap-sys new file mode 120000 index 00000000000..87523fb08ed --- /dev/null +++ b/Master/bin/x86_64-darwin/updmap-sys @@ -0,0 +1 @@ +../../texmf/scripts/tetex/updmap-sys.sh \ No newline at end of file diff --git a/Master/bin/x86_64-darwin/vftovp b/Master/bin/x86_64-darwin/vftovp index ebade35cc8f..77e9f3ebfe1 100755 Binary files a/Master/bin/x86_64-darwin/vftovp and b/Master/bin/x86_64-darwin/vftovp differ diff --git a/Master/bin/x86_64-darwin/vlna b/Master/bin/x86_64-darwin/vlna index 800a697d203..616890c8199 100755 Binary files a/Master/bin/x86_64-darwin/vlna and b/Master/bin/x86_64-darwin/vlna differ diff --git a/Master/bin/x86_64-darwin/vptovf b/Master/bin/x86_64-darwin/vptovf index 071d42abd18..8b298ad6375 100755 Binary files a/Master/bin/x86_64-darwin/vptovf and b/Master/bin/x86_64-darwin/vptovf differ diff --git a/Master/bin/x86_64-darwin/weave b/Master/bin/x86_64-darwin/weave index 2b252b5e492..77df0797ba3 100755 Binary files a/Master/bin/x86_64-darwin/weave and b/Master/bin/x86_64-darwin/weave differ diff --git a/Master/bin/x86_64-darwin/xdv2pdf b/Master/bin/x86_64-darwin/xdv2pdf index 24e64cafdd7..b578590049b 100755 Binary files a/Master/bin/x86_64-darwin/xdv2pdf and b/Master/bin/x86_64-darwin/xdv2pdf differ diff --git a/Master/bin/x86_64-darwin/xdvi-xaw b/Master/bin/x86_64-darwin/xdvi-xaw index 165e25d3513..dd217f268c6 100755 Binary files a/Master/bin/x86_64-darwin/xdvi-xaw and b/Master/bin/x86_64-darwin/xdvi-xaw differ diff --git a/Master/bin/x86_64-darwin/xdvipdfmx b/Master/bin/x86_64-darwin/xdvipdfmx index 983c2aa6ab3..0a44e6bb4cb 100755 Binary files a/Master/bin/x86_64-darwin/xdvipdfmx and b/Master/bin/x86_64-darwin/xdvipdfmx differ diff --git a/Master/bin/x86_64-darwin/xetex b/Master/bin/x86_64-darwin/xetex index 0715e730f44..2e08756573a 100755 Binary files a/Master/bin/x86_64-darwin/xetex and b/Master/bin/x86_64-darwin/xetex differ diff --git a/Master/bin/x86_64-darwin/xindy.mem b/Master/bin/x86_64-darwin/xindy.mem index 270378b1c84..8f66470c78e 100644 Binary files a/Master/bin/x86_64-darwin/xindy.mem and b/Master/bin/x86_64-darwin/xindy.mem differ diff --git a/Master/bin/x86_64-darwin/xindy.run b/Master/bin/x86_64-darwin/xindy.run index e5c263ad88a..5c294fe1817 100755 Binary files a/Master/bin/x86_64-darwin/xindy.run and b/Master/bin/x86_64-darwin/xindy.run differ -- cgit v1.2.3