diff options
author | Karl Berry <karl@freefriends.org> | 2006-12-30 01:31:43 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2006-12-30 01:31:43 +0000 |
commit | d9e215f62653044fbf987952e1af70ac31107993 (patch) | |
tree | 51b1391f8b917f6ccd459ddeb21323134d0fd593 | |
parent | 82906142ab7f773bc520b27754dc34379a217e06 (diff) |
update from gerben
git-svn-id: svn://tug.org/texlive/trunk@3014 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Master/bin/i386-darwin/T1Wrap | bin | 84140 -> 84140 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/afm2pl | bin | 88644 -> 88644 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/afm2tfm | bin | 96944 -> 96944 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/aleph | bin | 520896 -> 520896 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/bbox | bin | 0 -> 13952 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/bg5conv | bin | 13288 -> 13288 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/bibtex | bin | 163260 -> 163260 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/bibtex8 | bin | 200224 -> 200224 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/cef5conv | bin | 13388 -> 13388 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/cefconv | bin | 13388 -> 13388 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/cefsconv | bin | 13388 -> 13388 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/cfftot1 | bin | 359816 -> 359816 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/ctangle | bin | 101056 -> 101056 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/ctie | bin | 76244 -> 76244 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/cweave | bin | 138068 -> 138068 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/detex | bin | 88620 -> 88620 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/devnag | bin | 34420 -> 34420 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/disdvi | bin | 21756 -> 21756 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dmp | bin | 88820 -> 88820 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dt2dv | bin | 42456 -> 42456 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dv2dt | bin | 17688 -> 17688 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvi2tty | bin | 30300 -> 30300 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvibook | bin | 34808 -> 34808 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dviconcat | bin | 30552 -> 30552 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvicopy | bin | 121852 -> 121852 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvidvi | bin | 26044 -> 26044 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvilj | bin | 109312 -> 109312 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvilj2p | bin | 109312 -> 109312 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvilj4 | bin | 117516 -> 117516 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvilj4l | bin | 117516 -> 117516 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvipdfm | bin | 368020 -> 421100 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvipdfmx | bin | 708092 -> 761176 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvipng | bin | 853444 -> 902292 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvips | bin | 237344 -> 237344 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dviselect | bin | 34716 -> 34716 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvitodvi | bin | 38936 -> 34840 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvitomp | bin | 101060 -> 101060 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/dvitype | bin | 105268 -> 105268 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/ebb | bin | 183356 -> 236436 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/epsffit | bin | 17584 -> 17584 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/extconv | bin | 13288 -> 13288 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/gftodvi | bin | 109548 -> 109548 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/gftopk | bin | 92708 -> 92708 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/gftype | bin | 92696 -> 88600 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/gsftopk | bin | 84952 -> 84952 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/hbf2gf | bin | 97316 -> 97316 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/info | bin | 146896 -> 146896 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/infokey | bin | 30376 -> 30376 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/install-info | bin | 34536 -> 30440 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/kpseaccess | bin | 13292 -> 13292 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/kpsereadlink | bin | 13296 -> 13296 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/kpsestat | bin | 13320 -> 13320 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/kpsewhich | bin | 80280 -> 80280 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/lacheck | bin | 62860 -> 62860 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/mag | bin | 13408 -> 13408 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/makeindex | bin | 142164 -> 142164 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/makeinfo | bin | 212204 -> 212204 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/makempx | bin | 80408 -> 80408 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/mf | bin | 316084 -> 316084 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/mf-nowin | bin | 311040 -> 311040 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/mft | bin | 109132 -> 109132 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/mmafm | bin | 222000 -> 222000 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/mmpfb | bin | 296140 -> 296140 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/mpost | bin | 405484 -> 405484 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/mpto | bin | 17580 -> 17580 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/musixflx | bin | 26048 -> 26048 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/newer | bin | 13268 -> 13268 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/odvicopy | bin | 125960 -> 125960 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/odvitype | bin | 109364 -> 105268 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/omega | bin | 529056 -> 529056 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/omfonts | bin | 162992 -> 162992 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/otangle | bin | 59420 -> 59420 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/otfinfo | bin | 443668 -> 443668 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/otftotfm | bin | 805048 -> 805048 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/otp2ocp | bin | 88596 -> 88596 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/outocp | bin | 71976 -> 71976 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/patgen | bin | 47272 -> 47272 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/pdftex | bin | 1278168 -> 1327056 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/pfb2pfa | bin | 17664 -> 17664 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/pk2bm | bin | 17612 -> 17612 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/pktogf | bin | 88664 -> 88664 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/pktype | bin | 80368 -> 80368 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/pltotf | bin | 67704 -> 67704 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/pooltype | bin | 30524 -> 30524 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/ps2eps | 914 | ||||
-rwxr-xr-x | Master/bin/i386-darwin/ps2pk | bin | 178880 -> 178880 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/psbook | bin | 22024 -> 22024 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/psnup | bin | 30252 -> 30252 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/psresize | bin | 26156 -> 26156 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/psselect | bin | 22024 -> 22024 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/pstops | bin | 26156 -> 26156 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/sjisconv | bin | 13288 -> 13288 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/t1ascii | bin | 30448 -> 30448 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/t1asm | bin | 34712 -> 34712 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/t1binary | bin | 30448 -> 30448 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/t1disasm | bin | 34680 -> 34680 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/t1dotlessj | bin | 279628 -> 283724 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/t1lint | bin | 238368 -> 238368 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/t1mac | bin | 38724 -> 38724 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/t1reencode | bin | 279380 -> 279380 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/t1testpage | bin | 259120 -> 259120 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/t1unmac | bin | 38752 -> 38752 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/t4ht | bin | 92624 -> 92624 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/tangle | bin | 109204 -> 109204 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/tcdialog | bin | 142268 -> 142268 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/tex | bin | 332176 -> 332176 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/tex4ht | bin | 149964 -> 149964 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/texi2html | 8 | ||||
-rwxr-xr-x | Master/bin/i386-darwin/texindex | bin | 26620 -> 26620 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/tftopl | bin | 105076 -> 105076 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/tie | bin | 17556 -> 17556 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/ttf2afm | bin | 96824 -> 96824 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/ttf2pk | bin | 232380 -> 232380 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/ttf2tfm | bin | 248788 -> 248788 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/ttftotype42 | bin | 298648 -> 298648 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/vftovp | bin | 121588 -> 121588 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/vptovf | bin | 80108 -> 80108 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/weave | bin | 125636 -> 125636 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/xdv2pdf | bin | 173132 -> 173132 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/xdvi-xaw.bin | bin | 847064 -> 847092 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/xdvipdfmx | bin | 1193192 -> 1246240 bytes | |||
-rwxr-xr-x | Master/bin/i386-darwin/xetex | bin | 7407084 -> 7435600 bytes |
122 files changed, 918 insertions, 4 deletions
diff --git a/Master/bin/i386-darwin/T1Wrap b/Master/bin/i386-darwin/T1Wrap Binary files differindex 719f0079c3c..f826fd0f23f 100755 --- a/Master/bin/i386-darwin/T1Wrap +++ b/Master/bin/i386-darwin/T1Wrap diff --git a/Master/bin/i386-darwin/afm2pl b/Master/bin/i386-darwin/afm2pl Binary files differindex 7d0f461bbd1..630e13da129 100755 --- a/Master/bin/i386-darwin/afm2pl +++ b/Master/bin/i386-darwin/afm2pl diff --git a/Master/bin/i386-darwin/afm2tfm b/Master/bin/i386-darwin/afm2tfm Binary files differindex fd72fec28d2..95e1202b0f2 100755 --- a/Master/bin/i386-darwin/afm2tfm +++ b/Master/bin/i386-darwin/afm2tfm diff --git a/Master/bin/i386-darwin/aleph b/Master/bin/i386-darwin/aleph Binary files differindex 14417956c4d..95f88f62910 100755 --- a/Master/bin/i386-darwin/aleph +++ b/Master/bin/i386-darwin/aleph diff --git a/Master/bin/i386-darwin/bbox b/Master/bin/i386-darwin/bbox Binary files differnew file mode 100755 index 00000000000..1b4d8e9fad1 --- /dev/null +++ b/Master/bin/i386-darwin/bbox diff --git a/Master/bin/i386-darwin/bg5conv b/Master/bin/i386-darwin/bg5conv Binary files differindex 52e72f8f82a..04f1756ba44 100755 --- a/Master/bin/i386-darwin/bg5conv +++ b/Master/bin/i386-darwin/bg5conv diff --git a/Master/bin/i386-darwin/bibtex b/Master/bin/i386-darwin/bibtex Binary files differindex 8a9aa367a2c..7e52b73599c 100755 --- a/Master/bin/i386-darwin/bibtex +++ b/Master/bin/i386-darwin/bibtex diff --git a/Master/bin/i386-darwin/bibtex8 b/Master/bin/i386-darwin/bibtex8 Binary files differindex 591c05f87a0..54cb36237dd 100755 --- a/Master/bin/i386-darwin/bibtex8 +++ b/Master/bin/i386-darwin/bibtex8 diff --git a/Master/bin/i386-darwin/cef5conv b/Master/bin/i386-darwin/cef5conv Binary files differindex 8584791385b..66d58310df7 100755 --- a/Master/bin/i386-darwin/cef5conv +++ b/Master/bin/i386-darwin/cef5conv diff --git a/Master/bin/i386-darwin/cefconv b/Master/bin/i386-darwin/cefconv Binary files differindex f9a5198f36f..e788d4849e4 100755 --- a/Master/bin/i386-darwin/cefconv +++ b/Master/bin/i386-darwin/cefconv diff --git a/Master/bin/i386-darwin/cefsconv b/Master/bin/i386-darwin/cefsconv Binary files differindex 2a12034d454..d813e071327 100755 --- a/Master/bin/i386-darwin/cefsconv +++ b/Master/bin/i386-darwin/cefsconv diff --git a/Master/bin/i386-darwin/cfftot1 b/Master/bin/i386-darwin/cfftot1 Binary files differindex 58b19de7238..cde88b95758 100755 --- a/Master/bin/i386-darwin/cfftot1 +++ b/Master/bin/i386-darwin/cfftot1 diff --git a/Master/bin/i386-darwin/ctangle b/Master/bin/i386-darwin/ctangle Binary files differindex d88f68a66b3..3d76c1f7e33 100755 --- a/Master/bin/i386-darwin/ctangle +++ b/Master/bin/i386-darwin/ctangle diff --git a/Master/bin/i386-darwin/ctie b/Master/bin/i386-darwin/ctie Binary files differindex b2929908cbc..b60376e5752 100755 --- a/Master/bin/i386-darwin/ctie +++ b/Master/bin/i386-darwin/ctie diff --git a/Master/bin/i386-darwin/cweave b/Master/bin/i386-darwin/cweave Binary files differindex 493fbddfd86..0c2a57fe63d 100755 --- a/Master/bin/i386-darwin/cweave +++ b/Master/bin/i386-darwin/cweave diff --git a/Master/bin/i386-darwin/detex b/Master/bin/i386-darwin/detex Binary files differindex db096f760fe..c9332b16113 100755 --- a/Master/bin/i386-darwin/detex +++ b/Master/bin/i386-darwin/detex diff --git a/Master/bin/i386-darwin/devnag b/Master/bin/i386-darwin/devnag Binary files differindex ef5c298fbcb..5ed1a828c17 100755 --- a/Master/bin/i386-darwin/devnag +++ b/Master/bin/i386-darwin/devnag diff --git a/Master/bin/i386-darwin/disdvi b/Master/bin/i386-darwin/disdvi Binary files differindex b22e434e8ad..dad62b85482 100755 --- a/Master/bin/i386-darwin/disdvi +++ b/Master/bin/i386-darwin/disdvi diff --git a/Master/bin/i386-darwin/dmp b/Master/bin/i386-darwin/dmp Binary files differindex 3cfdf03b27c..22b9f50a362 100755 --- a/Master/bin/i386-darwin/dmp +++ b/Master/bin/i386-darwin/dmp diff --git a/Master/bin/i386-darwin/dt2dv b/Master/bin/i386-darwin/dt2dv Binary files differindex 5e29c47c90e..ac7c2c5cba5 100755 --- a/Master/bin/i386-darwin/dt2dv +++ b/Master/bin/i386-darwin/dt2dv diff --git a/Master/bin/i386-darwin/dv2dt b/Master/bin/i386-darwin/dv2dt Binary files differindex f282818fbfc..fa97165f4d0 100755 --- a/Master/bin/i386-darwin/dv2dt +++ b/Master/bin/i386-darwin/dv2dt diff --git a/Master/bin/i386-darwin/dvi2tty b/Master/bin/i386-darwin/dvi2tty Binary files differindex 90ffc1418e9..28b3c2fc5d7 100755 --- a/Master/bin/i386-darwin/dvi2tty +++ b/Master/bin/i386-darwin/dvi2tty diff --git a/Master/bin/i386-darwin/dvibook b/Master/bin/i386-darwin/dvibook Binary files differindex 3da37fa6571..10a9dbaeb76 100755 --- a/Master/bin/i386-darwin/dvibook +++ b/Master/bin/i386-darwin/dvibook diff --git a/Master/bin/i386-darwin/dviconcat b/Master/bin/i386-darwin/dviconcat Binary files differindex c2c0c04dca9..ea9084555ce 100755 --- a/Master/bin/i386-darwin/dviconcat +++ b/Master/bin/i386-darwin/dviconcat diff --git a/Master/bin/i386-darwin/dvicopy b/Master/bin/i386-darwin/dvicopy Binary files differindex 8cd94cf75f0..7b91b44c37b 100755 --- a/Master/bin/i386-darwin/dvicopy +++ b/Master/bin/i386-darwin/dvicopy diff --git a/Master/bin/i386-darwin/dvidvi b/Master/bin/i386-darwin/dvidvi Binary files differindex 53b7c75c47e..35fae39c9f7 100755 --- a/Master/bin/i386-darwin/dvidvi +++ b/Master/bin/i386-darwin/dvidvi diff --git a/Master/bin/i386-darwin/dvilj b/Master/bin/i386-darwin/dvilj Binary files differindex 251733d1089..066df5f958f 100755 --- a/Master/bin/i386-darwin/dvilj +++ b/Master/bin/i386-darwin/dvilj diff --git a/Master/bin/i386-darwin/dvilj2p b/Master/bin/i386-darwin/dvilj2p Binary files differindex f0af58fe067..923703f81ff 100755 --- a/Master/bin/i386-darwin/dvilj2p +++ b/Master/bin/i386-darwin/dvilj2p diff --git a/Master/bin/i386-darwin/dvilj4 b/Master/bin/i386-darwin/dvilj4 Binary files differindex ce1a55ab121..fee151463a3 100755 --- a/Master/bin/i386-darwin/dvilj4 +++ b/Master/bin/i386-darwin/dvilj4 diff --git a/Master/bin/i386-darwin/dvilj4l b/Master/bin/i386-darwin/dvilj4l Binary files differindex 25c1421e18d..b6e7dfa57a2 100755 --- a/Master/bin/i386-darwin/dvilj4l +++ b/Master/bin/i386-darwin/dvilj4l diff --git a/Master/bin/i386-darwin/dvipdfm b/Master/bin/i386-darwin/dvipdfm Binary files differindex 0f838658f32..5b596ab09c2 100755 --- a/Master/bin/i386-darwin/dvipdfm +++ b/Master/bin/i386-darwin/dvipdfm diff --git a/Master/bin/i386-darwin/dvipdfmx b/Master/bin/i386-darwin/dvipdfmx Binary files differindex 52f23b3289e..add1c63a8e6 100755 --- a/Master/bin/i386-darwin/dvipdfmx +++ b/Master/bin/i386-darwin/dvipdfmx diff --git a/Master/bin/i386-darwin/dvipng b/Master/bin/i386-darwin/dvipng Binary files differindex 0be58a01de0..37335625d47 100755 --- a/Master/bin/i386-darwin/dvipng +++ b/Master/bin/i386-darwin/dvipng diff --git a/Master/bin/i386-darwin/dvips b/Master/bin/i386-darwin/dvips Binary files differindex 1230d02c735..c57c0d8c1ee 100755 --- a/Master/bin/i386-darwin/dvips +++ b/Master/bin/i386-darwin/dvips diff --git a/Master/bin/i386-darwin/dviselect b/Master/bin/i386-darwin/dviselect Binary files differindex 8b911af34bc..6e72ff031ae 100755 --- a/Master/bin/i386-darwin/dviselect +++ b/Master/bin/i386-darwin/dviselect diff --git a/Master/bin/i386-darwin/dvitodvi b/Master/bin/i386-darwin/dvitodvi Binary files differindex f49e88f3ca3..dd589cff377 100755 --- a/Master/bin/i386-darwin/dvitodvi +++ b/Master/bin/i386-darwin/dvitodvi diff --git a/Master/bin/i386-darwin/dvitomp b/Master/bin/i386-darwin/dvitomp Binary files differindex 81f1f944f36..38a1e7094e1 100755 --- a/Master/bin/i386-darwin/dvitomp +++ b/Master/bin/i386-darwin/dvitomp diff --git a/Master/bin/i386-darwin/dvitype b/Master/bin/i386-darwin/dvitype Binary files differindex 375bc75ad56..10eaaa6ab02 100755 --- a/Master/bin/i386-darwin/dvitype +++ b/Master/bin/i386-darwin/dvitype diff --git a/Master/bin/i386-darwin/ebb b/Master/bin/i386-darwin/ebb Binary files differindex 2323cffb804..7076ecffa75 100755 --- a/Master/bin/i386-darwin/ebb +++ b/Master/bin/i386-darwin/ebb diff --git a/Master/bin/i386-darwin/epsffit b/Master/bin/i386-darwin/epsffit Binary files differindex ae315af3972..f38ff755c22 100755 --- a/Master/bin/i386-darwin/epsffit +++ b/Master/bin/i386-darwin/epsffit diff --git a/Master/bin/i386-darwin/extconv b/Master/bin/i386-darwin/extconv Binary files differindex 5ace4f11fc4..f530b34f4c8 100755 --- a/Master/bin/i386-darwin/extconv +++ b/Master/bin/i386-darwin/extconv diff --git a/Master/bin/i386-darwin/gftodvi b/Master/bin/i386-darwin/gftodvi Binary files differindex d4e174d550f..71ebf90a576 100755 --- a/Master/bin/i386-darwin/gftodvi +++ b/Master/bin/i386-darwin/gftodvi diff --git a/Master/bin/i386-darwin/gftopk b/Master/bin/i386-darwin/gftopk Binary files differindex c68fa12d5c1..ffb20284af8 100755 --- a/Master/bin/i386-darwin/gftopk +++ b/Master/bin/i386-darwin/gftopk diff --git a/Master/bin/i386-darwin/gftype b/Master/bin/i386-darwin/gftype Binary files differindex 8f3dbe6fb36..3a3d455f2d7 100755 --- a/Master/bin/i386-darwin/gftype +++ b/Master/bin/i386-darwin/gftype diff --git a/Master/bin/i386-darwin/gsftopk b/Master/bin/i386-darwin/gsftopk Binary files differindex f08ea5db47b..2c2d272f27b 100755 --- a/Master/bin/i386-darwin/gsftopk +++ b/Master/bin/i386-darwin/gsftopk diff --git a/Master/bin/i386-darwin/hbf2gf b/Master/bin/i386-darwin/hbf2gf Binary files differindex 7b3556c6122..9b1cc293415 100755 --- a/Master/bin/i386-darwin/hbf2gf +++ b/Master/bin/i386-darwin/hbf2gf diff --git a/Master/bin/i386-darwin/info b/Master/bin/i386-darwin/info Binary files differindex b307259ff03..b97223569b0 100755 --- a/Master/bin/i386-darwin/info +++ b/Master/bin/i386-darwin/info diff --git a/Master/bin/i386-darwin/infokey b/Master/bin/i386-darwin/infokey Binary files differindex 61b8b864333..bd1b7c40d8a 100755 --- a/Master/bin/i386-darwin/infokey +++ b/Master/bin/i386-darwin/infokey diff --git a/Master/bin/i386-darwin/install-info b/Master/bin/i386-darwin/install-info Binary files differindex e71bac61fcb..fdd8e7c8859 100755 --- a/Master/bin/i386-darwin/install-info +++ b/Master/bin/i386-darwin/install-info diff --git a/Master/bin/i386-darwin/kpseaccess b/Master/bin/i386-darwin/kpseaccess Binary files differindex e6d2ca85ac6..70ae9ef8470 100755 --- a/Master/bin/i386-darwin/kpseaccess +++ b/Master/bin/i386-darwin/kpseaccess diff --git a/Master/bin/i386-darwin/kpsereadlink b/Master/bin/i386-darwin/kpsereadlink Binary files differindex 3f061b91b66..1a20b272b60 100755 --- a/Master/bin/i386-darwin/kpsereadlink +++ b/Master/bin/i386-darwin/kpsereadlink diff --git a/Master/bin/i386-darwin/kpsestat b/Master/bin/i386-darwin/kpsestat Binary files differindex 020c0ac54ed..b12f7ebbc5a 100755 --- a/Master/bin/i386-darwin/kpsestat +++ b/Master/bin/i386-darwin/kpsestat diff --git a/Master/bin/i386-darwin/kpsewhich b/Master/bin/i386-darwin/kpsewhich Binary files differindex d651c822237..ca1fe3788a5 100755 --- a/Master/bin/i386-darwin/kpsewhich +++ b/Master/bin/i386-darwin/kpsewhich diff --git a/Master/bin/i386-darwin/lacheck b/Master/bin/i386-darwin/lacheck Binary files differindex 229f58c1cd2..f64b06bf62c 100755 --- a/Master/bin/i386-darwin/lacheck +++ b/Master/bin/i386-darwin/lacheck diff --git a/Master/bin/i386-darwin/mag b/Master/bin/i386-darwin/mag Binary files differindex 08207319003..a5a4a9c18c3 100755 --- a/Master/bin/i386-darwin/mag +++ b/Master/bin/i386-darwin/mag diff --git a/Master/bin/i386-darwin/makeindex b/Master/bin/i386-darwin/makeindex Binary files differindex a8120c0f9f0..8554ad1ffe2 100755 --- a/Master/bin/i386-darwin/makeindex +++ b/Master/bin/i386-darwin/makeindex diff --git a/Master/bin/i386-darwin/makeinfo b/Master/bin/i386-darwin/makeinfo Binary files differindex e4120355943..bf7e5dd3afb 100755 --- a/Master/bin/i386-darwin/makeinfo +++ b/Master/bin/i386-darwin/makeinfo diff --git a/Master/bin/i386-darwin/makempx b/Master/bin/i386-darwin/makempx Binary files differindex fa2ca92a036..72bc237a66d 100755 --- a/Master/bin/i386-darwin/makempx +++ b/Master/bin/i386-darwin/makempx diff --git a/Master/bin/i386-darwin/mf b/Master/bin/i386-darwin/mf Binary files differindex 50adefba908..83f6dc57223 100755 --- a/Master/bin/i386-darwin/mf +++ b/Master/bin/i386-darwin/mf diff --git a/Master/bin/i386-darwin/mf-nowin b/Master/bin/i386-darwin/mf-nowin Binary files differindex 7bd71916dae..a403b4e1632 100755 --- a/Master/bin/i386-darwin/mf-nowin +++ b/Master/bin/i386-darwin/mf-nowin diff --git a/Master/bin/i386-darwin/mft b/Master/bin/i386-darwin/mft Binary files differindex 8afd7bf499e..c2fe576a8e4 100755 --- a/Master/bin/i386-darwin/mft +++ b/Master/bin/i386-darwin/mft diff --git a/Master/bin/i386-darwin/mmafm b/Master/bin/i386-darwin/mmafm Binary files differindex 5510138adff..c1f946d163b 100755 --- a/Master/bin/i386-darwin/mmafm +++ b/Master/bin/i386-darwin/mmafm diff --git a/Master/bin/i386-darwin/mmpfb b/Master/bin/i386-darwin/mmpfb Binary files differindex 3cb01bf4eac..fb56776c9c9 100755 --- a/Master/bin/i386-darwin/mmpfb +++ b/Master/bin/i386-darwin/mmpfb diff --git a/Master/bin/i386-darwin/mpost b/Master/bin/i386-darwin/mpost Binary files differindex ad93b280567..cfe2ce2a85c 100755 --- a/Master/bin/i386-darwin/mpost +++ b/Master/bin/i386-darwin/mpost diff --git a/Master/bin/i386-darwin/mpto b/Master/bin/i386-darwin/mpto Binary files differindex 3583ccb3335..acc12b58c17 100755 --- a/Master/bin/i386-darwin/mpto +++ b/Master/bin/i386-darwin/mpto diff --git a/Master/bin/i386-darwin/musixflx b/Master/bin/i386-darwin/musixflx Binary files differindex 04f4a7fa2b8..55505db928f 100755 --- a/Master/bin/i386-darwin/musixflx +++ b/Master/bin/i386-darwin/musixflx diff --git a/Master/bin/i386-darwin/newer b/Master/bin/i386-darwin/newer Binary files differindex ccb5b9dbb92..321ed58ed8b 100755 --- a/Master/bin/i386-darwin/newer +++ b/Master/bin/i386-darwin/newer diff --git a/Master/bin/i386-darwin/odvicopy b/Master/bin/i386-darwin/odvicopy Binary files differindex 10828ee412a..b353398b41f 100755 --- a/Master/bin/i386-darwin/odvicopy +++ b/Master/bin/i386-darwin/odvicopy diff --git a/Master/bin/i386-darwin/odvitype b/Master/bin/i386-darwin/odvitype Binary files differindex 5c7ce1884d9..5727b714435 100755 --- a/Master/bin/i386-darwin/odvitype +++ b/Master/bin/i386-darwin/odvitype diff --git a/Master/bin/i386-darwin/omega b/Master/bin/i386-darwin/omega Binary files differindex e4adfc92ba2..1f8ed776723 100755 --- a/Master/bin/i386-darwin/omega +++ b/Master/bin/i386-darwin/omega diff --git a/Master/bin/i386-darwin/omfonts b/Master/bin/i386-darwin/omfonts Binary files differindex d12babd58c0..c5205394111 100755 --- a/Master/bin/i386-darwin/omfonts +++ b/Master/bin/i386-darwin/omfonts diff --git a/Master/bin/i386-darwin/otangle b/Master/bin/i386-darwin/otangle Binary files differindex 567bdf539fe..1b02d5b2815 100755 --- a/Master/bin/i386-darwin/otangle +++ b/Master/bin/i386-darwin/otangle diff --git a/Master/bin/i386-darwin/otfinfo b/Master/bin/i386-darwin/otfinfo Binary files differindex 9d0ee83b716..7c8f676c820 100755 --- a/Master/bin/i386-darwin/otfinfo +++ b/Master/bin/i386-darwin/otfinfo diff --git a/Master/bin/i386-darwin/otftotfm b/Master/bin/i386-darwin/otftotfm Binary files differindex e12abcd72ab..d53a12e3e87 100755 --- a/Master/bin/i386-darwin/otftotfm +++ b/Master/bin/i386-darwin/otftotfm diff --git a/Master/bin/i386-darwin/otp2ocp b/Master/bin/i386-darwin/otp2ocp Binary files differindex 7b84d0398f2..6d924f4cf93 100755 --- a/Master/bin/i386-darwin/otp2ocp +++ b/Master/bin/i386-darwin/otp2ocp diff --git a/Master/bin/i386-darwin/outocp b/Master/bin/i386-darwin/outocp Binary files differindex 1867f9bdb80..eed936be025 100755 --- a/Master/bin/i386-darwin/outocp +++ b/Master/bin/i386-darwin/outocp diff --git a/Master/bin/i386-darwin/patgen b/Master/bin/i386-darwin/patgen Binary files differindex 05c6a09b8b6..f67ce06fd6f 100755 --- a/Master/bin/i386-darwin/patgen +++ b/Master/bin/i386-darwin/patgen diff --git a/Master/bin/i386-darwin/pdftex b/Master/bin/i386-darwin/pdftex Binary files differindex 7b7d2a839e0..5fd1ca6361a 100755 --- a/Master/bin/i386-darwin/pdftex +++ b/Master/bin/i386-darwin/pdftex diff --git a/Master/bin/i386-darwin/pfb2pfa b/Master/bin/i386-darwin/pfb2pfa Binary files differindex f1654dcc535..c2e4b2f9a96 100755 --- a/Master/bin/i386-darwin/pfb2pfa +++ b/Master/bin/i386-darwin/pfb2pfa diff --git a/Master/bin/i386-darwin/pk2bm b/Master/bin/i386-darwin/pk2bm Binary files differindex b85523fb1c9..89fc065f14d 100755 --- a/Master/bin/i386-darwin/pk2bm +++ b/Master/bin/i386-darwin/pk2bm diff --git a/Master/bin/i386-darwin/pktogf b/Master/bin/i386-darwin/pktogf Binary files differindex 61d550c10cd..4d15e0adc74 100755 --- a/Master/bin/i386-darwin/pktogf +++ b/Master/bin/i386-darwin/pktogf diff --git a/Master/bin/i386-darwin/pktype b/Master/bin/i386-darwin/pktype Binary files differindex 3201bca000f..b16b9321c73 100755 --- a/Master/bin/i386-darwin/pktype +++ b/Master/bin/i386-darwin/pktype diff --git a/Master/bin/i386-darwin/pltotf b/Master/bin/i386-darwin/pltotf Binary files differindex 75cc6284010..f798cf13103 100755 --- a/Master/bin/i386-darwin/pltotf +++ b/Master/bin/i386-darwin/pltotf diff --git a/Master/bin/i386-darwin/pooltype b/Master/bin/i386-darwin/pooltype Binary files differindex 9b648c22780..45dfb776322 100755 --- a/Master/bin/i386-darwin/pooltype +++ b/Master/bin/i386-darwin/pooltype diff --git a/Master/bin/i386-darwin/ps2eps b/Master/bin/i386-darwin/ps2eps new file mode 100755 index 00000000000..920e7398dd3 --- /dev/null +++ b/Master/bin/i386-darwin/ps2eps @@ -0,0 +1,914 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q' # -*-perl-*- + if 0; +# The expression in the previous line replaces the unix specific line +# {#!/usr/bin/perl}. +# ps2eps - convert PostScript to EPS (Encapsulated PostScript) files +# ------------------------------------------------------------------- +# $Id: ps2eps,v 1.54 2004/04/23 07:56:54 bless Exp $ +# ------------------------------------------------------- +# (C)opyright 1999-2004 Roland Bless +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Roland Bless +# Send bug reports to roland@bless.de +# ------------------------------------------------------------------- +# Additional filtering is performed when Windows generated PostScript files +# are processed. Some instructions will otherwise lead to bad output +# if EPS-file gets embedded into other PostScript files. +# +# Requirements: +# + perl +# + gs (ghostscript supporting pbm output) +# + bbox (a little C program [ANSI-C - should work on every platform] +# for calculation of the actual BoundingBox) + +use POSIX; + +#use warnings; + +#use Getopt package +use Getopt::Long; +Getopt::Long::Configure("no_ignore_case"); + +$prgname= "ps2eps"; +if ($^O =~ /MSWin32/i or $^O =~ /cygwin/i) +{ + $ghostscriptname = "gswin32c"; +} +else +{ + $ghostscriptname = "gs"; +} + +$bboxver=`bbox >/dev/null 2>&1 -V`; +$bboxname= ($?== -1) ? "" : "bbox"; +$version= '$Id: ps2eps,v 1.54 2004/04/23 07:56:54 bless Exp $'; #' +$insertPScode= 1; # Insert surrounding Postscript code +$infhandle = STDIN; # Standard input is the default input file +$outfhandle = STDOUT; # Standard output is default output if STDIN is input +$infname= '-'; +$outfname= '-'; +$forceoverwrite=0; # do not overwrite existing files +$ignoreBB= 0; # ignore existing Bounding Box comment +$removeDSC= 1; # remove Adobe document structure comments +$removeADO= 1; # remove Adobe printer Driver console Output [Page: ...] +$ignoreEOFDSC= 0; # ignore %%EOF DSC hint +$removePreview= 0; # remove preview +$quiet= 0; # write progress to stdout +$resolution= 144; # resolution for bounding box calculation is 2x72 dpi +$trytofixps= 1; # try to fix postscript code +$forcefixps= 0; # fix postscript code unconditionally if eq 1 +$filterorientation= 1;# filter Orientation line +$looseBB=''; # default: tight bounding box +$clip=0; # do not clip +$warnings=0; # do not print warnings concerning postscript sanity +$debuggs=0; # no debugging of ghostscript call, turn this on if you want to see the gs call +$inch=2.54; # one inch is 2.54cm +$fullcolors= 1; # use ppm format (24-bit full color) +$trailerseen= 0; # Trailer comment seen? +$PSversion="2.0"; # default Postscript Version +$PSDSCversion="2.0"; # default Postscript DSC Version +$translate_x= 0; # translate by x postscript points +$translate_y= 0; # translate by y postscript points + +$defaultext = '(ps|prn)'; # default extension +$defaultoutext = '.eps'; # default output extension +$envname_size = 'PS2EPS_SIZE'; +$envname_gsbbox = 'PS2EPS_GSBBOX'; + +$gpar=""; +$known_papersizes="11x17|ledger|legal|letter(small)?|arch[A-E]|a([0-9]|10)|isob[0-6]|b[0-5]|c[0-6]|jisb[0-6]|fls(a|e)|halfletter"; +$papersize_help="11x17,ledger,legal,letter,lettersmall,archA,archB,archC,archD,archE\ +a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,isob0,isob1,isob2,isob3,isob4,isob5,isob6,\ +b0,b1,b2,b3,b4,b5,c0,c1,c2,c3,c4,c5,c6,\ +jisb0,jisb1,jisb2,jisb3,jisb4,jisb5,jisb6,flsa,flse,halfletter\n"; +$trigger= 0; +$notsane= 0; +$dummy=""; + +@ver= split(/ /,$version); + +# filename for temporary files +if ($^O =~ /MSWin32/i or $^O =~ /cygwin/i) +{ + # it is less trouble to use the current directory if working on + # cygwin and nevertheless using gswin32c. + $tmpfname= "$prgname.$$"; + $win=1; +} +elsif (defined($ENV{'TMP'})) +{ + $tmpdir= $ENV{'TMP'}; + $filesep= ($tmpdir =~ /^?\:\\/) ? '\\' : '/'; + if ($tmpdir =~ /$filesep$/) + { $tmpfname= $tmpdir . "$prgname.$$"; } + else + { $tmpfname= $tmpdir . "$filesep$prgname.$$"; } + $win=1; +} +else #assume we're on a UNIXBOX +{ + $tmpfname= "/tmp/" . "$prgname.$$"; + $win=0; +} + + +$licensetxt= "\ + This program is free software; you can redistribute it and/or modify\ + it under the terms of the GNU General Public License as published by\ + the Free Software Foundation; either version 2 of the License, or\ + (at your option) any later version.\ +\ + This program is distributed in the hope that it will be useful,\ + but WITHOUT ANY WARRANTY; without even the implied warranty of\ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\ + GNU General Public License for more details.\ +\ + You should have received a copy of the GNU General Public License\ + along with this program; if not, write to the Free Software\ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n"; + +@prgidtxt= ( "$prgname - convert PostScript to EPS (Encapsulated PostScript) files\n", + "(C)opyright 1998-2004 Roland Bless\n\n" ); + +@helptxt= ("Version: $ver[2]\n", + "Operation:\n", + " Without any argument, $prgname reads from standard input\n", + " and writes to standard output.\n", + " If filenames are given as arguments they are processed\n", + " one by one and output files are written to filenames\n", + " with extension '$defaultoutext'. If input filenames have the extension\n", + " '.ps' or '.prn', this extension is replaced with '$defaultoutext'.\n", + " In all other cases '$defaultoutext' is appended to the input filename.\n", + " Please note that PostScript files for input should contain\n", + " only one single page.\n\n", + " If BoundingBox in output seems to be wrong, please try options --size or --ignoreBB.\n\n" ); + +@usagetxt= ("Syntax:\n", + " $prgname [-f] [-q] [-N] [-O] [-n] [-P] [-c] [-C] [-m] [-B] [-E] [-s <pagedim>] [-R +|-|^] [-t <x,y>] [-l] [-g] [-d] [-H] [-h|--help] [-g] [-W] [-L] [-V|--version] [--] [psfile1] [psfile2] [...]\n", + "Options:\n", + " -f, --force force overwriting existing files\n", + " -q, --quiet quiet operation (no output while processing files)\n", + " -N, --noinsert do not insert any postscript code\n", + " -O, --preserveorientation do not filter Orientation: header comment\n", + " -n, --nofix do not try to fix postscript code\n", + " -P, --removepreview remove preview image (smaller file, but no preview)\n", + " -F, --fixps fix postscript code unconditionally\n", + " -c, --comments preserve document structure comments\n", + " -C, --clip insert postscript code for clipping\n", + " -m, --mono use black/white bitmap as base for calculation\n", + " -s, --size=<pagedim> page size (a0-a10,letter,...) or in format XxY[cm|in] (default:cm), where X and Y are numbers\n", + " use --size=list to list pre-defined page sizes\n", + " -R, --rotate=<direction> rotate resulting EPS. <direction>: +=+90 (clockw.),-=-90 (counter-clockw.) ^=180 degrees\n", + " -t, --translate specify x,y offset (may be negative) in postscript points (1/72 dpi)\n", + " -l, --loose expand the original bounding box by one point in each direction\n", + " -B, --ignoreBB do not use existing bounding box as page size for rendering\n", + " -E, --ignoreEOF do not use %%EOF as hint for end of file\n", + " -g, --gsbbox use internal bbox device of ghostscript\n", + " -H, --no-hires do not use a HiResBoundingBox\n", + " -h, --help help information\n", + " -L, --license show licensing information\n", + " -V, --version show version information\n", + " -d, --debuggs show ghostscript call\n", + " -W, --warnings show warnings about sanity of generated eps file\n", + " -- all following arguments are treated as files\n", + " (allows filenames starting with -)\n", + "\n", + "Arguments:\n", + " One or more names of PostScript files for input\n"); + +## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +## -- argument checking -- +## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +#environment variable for papersize +if (defined($ENV{"$envname_size"})) +{ + $opt_s= $ENV{"$envname_size"}; +} +else +{ + $opt_s = ''; # for s-option +} + +if (defined($ENV{"$envname_gsbbox"})) +{ + $bboxname=""; +} + +$opt_t = ''; # for t-option +$opt_R = ''; # for R-option +$stopnow = 0; +die "Wrong option(s), please check usage with $prgname --help\n" unless +GetOptions('f|force' => \$forceoverwrite, + 'q|quiet' => \$quiet, + 'm|mono' => sub { $fullcolors = 0 }, + 'n|nofix' => sub { $trytofixps = 0 }, + 'F|fixps' => \$forcefixps, + 'N|noinsert' => sub { $insertPScode = 0 }, + 'O|preserveorientation' => sub { $filterorientation= 0 }, + 'P|removepreview' => \$removePreview, + 'c|comments' => sub { $removeDSC = 0 }, + 'C|clip' => \$clip, + 'l|loose' => sub { $looseBB = '-l' }, + 'B|ignoreBB' => \$ignoreBB, + 'E|ignoreEOF'=> \$ignoreEOFDSC, + 's|size=s' => \$opt_s, + 't|translate=s' => \$opt_t, + 'R|rotate=s' => \$opt_R, + 'g|gsbbox' => sub { $bboxname=""; }, + 'H|nohires' => \$nohires, + 'h|help' => sub { $stopnow = 1; print @prgidtxt,@helptxt,@usagetxt,"\nAuthor: Roland Bless (roland\@bless.de)\n\n"; }, + 'L|license' => sub { $stopnow = 1; print @prgidtxt,$licensetxt,"\nAuthor: Roland Bless (roland\@bless.de)\n\n"; }, + 'd|debuggs' => \$debuggs, + 'W|warnings' => \$warnings, + 'V|version' => sub { $stopnow = 1; print @prgidtxt,"Version: $ver[2]\n"; });exit if ($stopnow); + +## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +## -- wildcard processing -- +## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +## internal wildcard processing for current directory, +## only used for non UNIX-based OSs (which may lack shell wildcard expansion) +@filenames = (); +foreach $object (@ARGV) { + if ($win && $object =~ m/\*/o) # asterisk is present in filename + { + $wildcard = $object; + $wildcard =~ s/\./\\\./g; # replace . in pattern with \. + $wildcard =~ s/\*/\(\.\*\)/g; # replace * in pattern with (.*) + opendir(DIR,'.') || die 'Unable to open current directory, stopped'; # open current directory + print STDERR $wildcard; + @fid = grep { /$wildcard(\.$defaultext)?/i } readdir(DIR); + foreach (@fid) { push @filenames, $_; } + closedir DIR; + } + else { push @filenames, $object; } +} # end foreach +$filenames[0]= '-' if (scalar(@filenames) == 0); # no file arguments, use STDIN as input + +print STDERR "Input files: @filenames\n" if (!$quiet); + +# papersize stuff +if ($opt_s ne '') +{ + # if explicit size is given, ignore existing BoundingBox always + $ignoreBB = 1; + $pagedimension = $opt_s; + if ($opt_s eq "list") + { + print STDERR "Available paper sizes: $papersize_help"; + exit 0; + } + + #explicit format XxY[cm|in] + if ($pagedimension =~ /(\d*\.?\d+)x(\d*\.?\d+)/) + { + ($x_dim, $dummy, $y_dim, $unit)= split(/(x|cm|in)/,$pagedimension); + if ( $x_dim !~ /^\d*\.?\d+$/ ) + { die "$x_dim in $arg is not a valid number, stopped"; } + if ( $y_dim !~ /^\d*\.?\d+$/ ) + { die "$y_dim in $arg is not a valid number, stopped"; } + + #print STDERR "xdim: $x_dim ydim: $y_dim unit:$unit\n" ; + if (!defined($unit) ) + { + $unit='cm'; + $opt_s=$opt_s . $unit; + } + if ( $unit ne 'in' ) # assume centimeters + { # calculate dimension in pixels (remember: resolution is in dpi) + $xpixels= int(($x_dim * $resolution) / $inch)+1; + $ypixels= int(($y_dim * $resolution) / $inch)+1; + $gpar= "-g${xpixels}x${ypixels}"; + } + else + { + $xpixels= int($x_dim * $resolution)+1; + $ypixels= int($y_dim * $resolution)+1; + $gpar= "-g${xpixels}x${ypixels}"; + } + } #endif XxY in opt_s + else + { + if ($opt_s =~ /$known_papersizes/) + { + $gpar="-sPAPERSIZE=$opt_s"; + } + else + { + print STDERR "Error: Unknown paper size: $opt_s\n Acceptable papersizes are:$papersize_help\n"; + exit 1; + } + } +} + +#translate option +if ($opt_t ne '') +{ + ($translate_x,$translate_y)= split(/\,/,$opt_t); +} + +#rotate +$rotright='-90 rotate'; +$rotleft='90 rotate'; +$rotupsidedown='180 rotate'; +$rotate=''; +if ($opt_R ne '') +{ + if ($opt_R eq '+') { $rotate=$rotright; } + elsif ($opt_R eq '-') { $rotate=$rotleft; } + elsif ($opt_R eq '^') { $rotate=$rotupsidedown; } + else { die "Wrong parameter for option -R: Valid are only +,-,^\n"; }; +} + +$device= $fullcolors ? "ppmraw" : "pbmraw"; + +## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +## -- iterate over different input files -- +## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +PROCESSFILE: +while ($infname= (shift @filenames)) +{ + # reset filter definitions for each file + undef $linefilter; + undef $rangefilter_begin; + undef $rangefilter_end; + $fixthisps= $trytofixps; + $fixmsgprinted= 0; + + if (!$quiet) { print STDERR "Processing: $infname\n"; } + unless (open($infhandle,"<$infname")) + { # skip over this file + print STDERR "$prgname: Can't open $infname: $!\n"; + next PROCESSFILE; + } + + # buffer input from stdin into temporary file, because it has to be read twice + # one time for ghostscript processing, the second time for generating output + if ($infname eq '-') # input is stdin + { + $tmpfhandle=''; + open($tmpfhandle,">$tmpfname") or + die "Cannot open temporary file $tmpfname for writing: $!\n"; + } + else # input is not stdin + { + undef $tmpfhandle; + #if filename ends with $defaultext usually .ps or .prn, replace the extension with $defaultoutext + if ($infname =~ /\.$defaultext$/i) + { + $outfname= $infname; $outfname =~ s/\.$defaultext$/$defaultoutext/i; + } + else # otherwise simply append the extension $defaultoutext + { + $outfname= $infname . "$defaultoutext"; + } + if (!$forceoverwrite and -s "$outfname") + { + die "$prgname: Sorry, file named $outfname already exists,", + " will not overwrite it.\n", + " You will have to use the -f option, delete it or rename it", + " before running $prgname again.\n"; + } + else + { + open($outfhandle,">$outfname") or die "Can't open file $outfname for writing: $!\n"; + } + } #end else input is not stdin + + ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + ## -- process input file -- + ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + $linefilter= '^$'; #'# filter empty lines by default + while (<$infhandle>) + { + # get postscript and DSC version + if (/%!PS-Adobe-(\S+).*EPSF-(\S+)/) + { + $PSversion=$1; + $PSDSCversion=$2; + if (! ($PSversion =~ /\d+\.\d+/)) + { + $PSDSCversion="2.0"; + } + if (! ($PSDSCversion =~ /\d+\.\d+/)) + { + $PSDSCversion="2.0"; + } + } + + # check for existing BoundingBox parameters + if ( /^%%\s*BoundingBox:\s*(.*)/ && !defined($eBBllx) ) + { + $BBarg= $1; + # accept even negative and fractional BBs + if ( $BBarg =~ /(\-?\d+\.?\d*\s+){3,}\d+/ ) # ignore %% BoundingBox: (atend) comments + { + ($eBBllx,$eBBlly,$eBBurx,$eBBury,$dummy)= split /\s/,$BBarg; + #print STDERR "Existing BB: $eBBllx,$eBBlly,$eBBurx,$eBBury\n"; + if (int($eBBllx) < 0) { $translate_x= - int($eBBllx-0.5); } + if (int($eBBlly) < 0) { $translate_y= - int($eBBlly-0.5); } + + $xpixels= int((($eBBurx-$eBBllx) * $resolution)/72)+1; + $ypixels= int((($eBBury-$eBBlly) * $resolution)/72)+1; + if (!$ignoreBB) + { + $gpar= "-g${xpixels}x${ypixels}"; + # check for meaningful values + if (($xpixels <= 1) || ($ypixels <= 1)) + { + $gpar=""; undef $eBBllx; undef $eBBlly; + } + else + { + if (!$quiet) + { + print STDERR "Rendering with existing $_"; + if (int($eBBllx) < 0 || int($eBBlly) < 0) + { + print STDERR "WARNING: existing Bounding Box shows negative values - shifting\n"; + } + } + } + } #endif !$ignoreBB + } #endif $BBarg =~ + } + + + if ($fixthisps) # try to fix bad postscript code + { + # check for Windows 3.x output + if ( /^Win.*Dict/ ) + { + if (!$quiet && !$fixmsgprinted) + { print STDERR "Windows 3.5 generated Postscript file detected, fixing\n"; } + $linefilter= '^(EJ|RS)'; + $rangefilter_begin= '^statusdict'; + $rangefilter_end= 'cvx\ settransfer$'; #' + $fixmsgprinted= 1; # stop printing message + } + else + { + if ( /^%%Creator:\s*Wind.U\s*Xprinter/ ) + { + if (!$quiet && !$fixmsgprinted) + { print STDERR "Star/OpenOffice generated Postscript file detected, fixing\n"; } + $linefilter= '^rs'; + $fixmsgprinted= 1; # stop printing message + } + else + { + if ( $forcefixps || + /^\/NTPS/ || + /Creator:\s*(AdobePS|Pscript|.*Windows)/i ) #check for NT generated output + { + if (!$quiet && !$fixmsgprinted) + { + if ($forcefixps) + { + print STDERR "Postscript filtering requested, fixing\n"; + } + else + { + print STDERR "Windows generated Postscript file detected, fixing\n"; + } + } + $rangefilter_begin= '^((\[\{)|(featurebegin\{))$'; #' + $rangefilter_end= '^(\} stopped cleartomark|\}featurecleanup)'; + $exclude_rangefilter_begin= '^(?i)%%BeginNonPPDFeature'; #' + $exclude_rangefilter_end= '^(?i)%%EndNonPPDFeature'; + #$triggered_rangefilter_begin= ''; #' + #$triggered_rangefilter_end= ''; #' + $fixsearchpat='(^|\s)(initmatrix|initclip|initgraphics)(\s|$)'; + $fixreplacepat=' '; + $fixmsgprinted= 1; # stop printing message + } # end if NTPS + } #end else + } + } #end if trytofixps + + if (defined($tmpfhandle)) + { + print $tmpfhandle $_ or die "$prgname: Failure during writing to temporary file $tmpfname"; + } + + if (/^%%EOF\s*$/) + { + $totalEOFDSC++ + } + } #end while <$infhandle> + + if (defined($tmpfhandle)) + { + close($tmpfhandle); + } + else + { + $tmpfhandle= $infhandle; + $tmpfname= $infname; + } + + ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + ## -- calculate the bounding box -- + ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + if ($translate_x>0 || $translate_y>0) + { + $translation="$translate_x $translate_y translate"; + $translatecmd="-c \'$translation\'"; + } + else + { + $translation=""; + $translatecmd=""; + } + + if (!$quiet) + { + print STDERR "Calculating Bounding Box..."; + if ($opt_s) + { + print STDERR "using page size $opt_s..."; + } + } + + $rotatecmd=''; + if ($rotate ne '') + { + $rotatecmd="-c \"$rotate\"" + } + if ($bboxname ne '') + { + $cmdline="$ghostscriptname -dSAFER -dNOPAUSE -q $gpar -r$resolution -sDEVICE=$device -sOutputFile=- $translatecmd -f $tmpfname -c showpage -c quit | $bboxname -r $resolution"; + } + else + { + print STDERR "...using bbox device of $ghostscriptname..."; + $cmdline = "$ghostscriptname -dSAFER -dBATCH -dNOPAUSE -q $gpar -r$resolution -sDEVICE=bbox -sOutputFile=- -c \"/setpagedevice {pop} def\" $translatecmd -f $tmpfname -c quit 2>&1"; + } + + if ($debuggs) { print STDERR "\nCalling: $cmdline\n"; } + + # actual ghostscript call + $boundingbox=`$cmdline`; + if ($debuggs) { print STDERR "Call result: $boundingbox"; } + + # check result of gs call + if ($boundingbox !~ /^%%BoundingBox/) + { + print STDERR "Error: Could not determine bounding box!\n", + "I suppose $ghostscriptname had some trouble interpreting the postscript-file\n"; + } + + $boundingbox =~ /^%%HiResBoundingBox:\s*(.*)/m; + if (defined($1)) # HiResBoundingBox given + { + ($hcBBllx,$hcBBlly,$hcBBurx,$hcBBury,$dummy)= split(/\s/,$1); + $hiresboundingbox="%%HiResBoundingBox: $hcBBllx $hcBBlly $hcBBurx $hcBBury\n"; + $cBBllx = floor($hcBBllx); + $cBBlly = floor($hcBBlly); + $cBBurx = ceil($hcBBurx); + $cBBury = ceil($hcBBury); + } + else + { #use normal BoundingBox + $boundingbox =~ /^%%.*BoundingBox:\s*(.*)/; + ($cBBllx,$cBBlly,$cBBurx,$cBBury,$dummy)= split(/\s/,$1); + } + # if loose BB should be performed by ps2eps + # apply changes to resulting bounding box if needed + if ($looseBB ne '') + { + if ($cBBllx > 0) { $cBBllx--; } + if ($cBBlly > 0) { $cBBlly--; } + $cBBurx++; $cBBury++; + } + # extend clipping box by 1 point + if ($clip) + { + if ($cBBllx > 0) { $cBBllx--; } + if ($cBBlly > 0) { $cBBlly--; } + $cBBurx++; $cBBury++; + } + if (!$quiet && ($cBBllx < 0 || $cBBlly < 0 )) + { + print STDERR "WARNING! Your drawing had a negative Bounding Box which is deprecated and may cause problems!. I'll shift it.\n"; + $translate_x= -int($cBBllx); + $translate_y= -int($cBBlly); + $cBBllx=0; + $cBBurx= $cBBurx + $translate_x; + $cBBlly=0; + $cBBury= $cBBury + $translate_y; + + $hcBBurx= $hcBBurx + $hcBBllx; + $hcBBury= $hcBBury + $hcBBlly; + $hcBBllx= 0; + $hcBBlly= 0; + + $hiresboundingbox="%%HiResBoundingBox: $hcBBllx $hcBBlly $hcBBurx $hcBBury\n"; + + $translation="$translate_x $translate_y translate"; + $translatecmd="-c \'$translation\'"; + } + $boundingbox = "%%BoundingBox: $cBBllx $cBBlly $cBBurx $cBBury\n"; + + if (!$quiet) { print STDERR "ready. $boundingbox" }; + + $before_startps= 1; + $inserted_prolog= 0; + $prolog_passed= 0; + + ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + ## -- Create output file -- + ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + if (!$quiet) { print STDERR "Creating output file $outfname..."; } + + open($tmpfhandle,"<$tmpfname") or die "Cannot open file $tmpfname for reading"; + CREATEOUTPUT: + while (<$tmpfhandle>) + { + # check whether we are in a binary section + + $binarysection=(/^(%%BeginBinary)|(beginimage)\r?\n?$/ ... /^(%%EndBinary)|^(endimage)/) || + (/^(doNimage)|(doclutimage)\r?\n?$/ ... /(^|~> )Z\r?\n?$/) || # Pscript_Win_Dib_L2 5.0 0 + (/^beginjpeg / ... /~> endjpeg\r?\n?$/) || # Pscript_Win_Dib_L2 5.0 0 + (/^pdfIm/ ... /^%-EOD-/); + + if ( !$binarysection ) + { + s/\r?\n?$//; # remove CR and/or LF at end of line if not in binary section + } + + # check where magic Postscript header starts - skip leading binary stuff, e.g., HP PCL/PJL code + if ($before_startps) + { + if ( /%!/ ) # This is usually the smallest magic sequence + { # Note: Adobe Photoshop generated a binary heading, so ^ is not applicable + if (! /%!PS-Adobe.*/i) # some strange programs use other magics + { + print STDERR "** Warning **: Weird heading line -- ",$_," -- "; + } + $before_startps= 0; + } + next CREATEOUTPUT; + } + else # we are hopefully in regular postscript code now + { + # count %%EOFs as we want to know when we got the last EOF + if ( /^%%EOF\s*$/ ) + { + $seenEOF++; + } + + # We should insert our own prologue including the newly calculated BoundingBox + if (! $inserted_prolog) + { + print $outfhandle "%!PS-Adobe-$PSversion EPSF-$PSDSCversion\n"; + # check if we need to rotate + $transrotcmd=''; + if ($rotatecmd) + { + if ($rotate eq $rotright) + { + $transrotcmd="-$cBBlly $cBBurx translate"; + $boundingbox='%%BoundingBox: 0 0 ' . ($cBBury-$cBBlly) . ' ' . ($cBBurx-$cBBllx) . "\n"; + if ($hiresboundingbox ne "") + { + $hiresboundingbox='%%HiResBoundingBox: 0 0 ' . ($hcBBury-$hcBBlly) . ' ' . ($hcBBurx-$hcBBllx) . "\n"; + } + + } + elsif ($rotate eq $rotleft) + { + $transrotcmd="$cBBury -$cBBllx translate"; + $boundingbox='%%BoundingBox: 0 0 ' . ($cBBury-$cBBlly) . ' ' . ($cBBurx-$cBBllx) . "\n"; + if ($hiresboundingbox ne "") + { + $hiresboundingbox= '%%HiResBoundingBox: 0 0 ' . ($hcBBury-$hcBBlly) . ' ' . ($hcBBurx-$hcBBllx) . "\n"; + } + } + elsif ($rotate eq $rotupsidedown) + { + $transrotcmd="$cBBurx $cBBury translate"; + $boundingbox='%%BoundingBox: 0 0 ' . ($cBBurx-$cBBllx) . ' ' . ($cBBury-$cBBlly) . "\n"; + if ($hiresboundingbox ne "") + { + $hiresboundingbox='%%HiResBoundingBox: 0 0 ' . ($hcBBurx-$hcBBllx) . ' ' . ($hcBBury-$hcBBlly) . "\n"; + } + } + } + print $outfhandle $boundingbox; + if (!defined($hiresboundingbox)) + { + $nohires=1; + } + if (defined($hiresboundingbox) && !defined($nohires)) { print $outfhandle $hiresboundingbox; } + $inserted_prolog= 1; + redo CREATEOUTPUT; + } + else # already inserted_prolog + { + if (! $prolog_passed) + { + #ignore the following lines in the prologue + if ( /^%%(HiRes)?BoundingBox/ || + /^%%Pages/ || + /^%%BeginProlog/ || + /^%%EndProlog/ || + ($filterorientation && /^%%Orientation/) || + ($removeDSC && /^%%.*: \(atend\)/) || + ($removePreview && (/^%%BeginPreview/ ... /^%%EndPreview/)) ) + { + next CREATEOUTPUT; + } + else + { + if ( /^[^%].*/ || + /^%%EndComments/ ) # line is not a comment + { + #output postscript code for proper EPS file + if ($insertPScode) + { + print $outfhandle "%%EndComments\n", + "% EPSF created by ps2eps $ver[2]\n", + "%%BeginProlog\n"; + } + # Insert own postscript code for clipping + if ($clip) + { + if (!defined($nohires)) + { + printf $outfhandle "newpath %f %f moveto %f %f lineto %f %f lineto %f %f lineto closepath clip\n",$hcBBllx-0.1,$hcBBlly-0.1,$hcBBurx+0.1,$hcBBlly-0.1,$hcBBurx+0.1,$hcBBury+0.1,$hcBBllx-0.1,$hcBBury+0.1; + } + else + { + printf $outfhandle "newpath %d %d moveto %d %d lineto %d %d lineto %d %d lineto closepath clip\n",$cBBllx,$cBBlly,$cBBurx,$cBBlly,$cBBurx,$cBBury,$cBBllx,$cBBury; + } + } #endif clip + + if ($rotate ne '') + { + print $outfhandle "$transrotcmd\n"; + print $outfhandle "$rotate\n"; + } + if ($translation ne '') + { + print $outfhandle "$translation\n"; + } + + #insert surrounding postscript code + if ($insertPScode) + { + print $outfhandle "save\n", + "countdictstack\n", + "mark\n", + "newpath\n", + "/showpage {} def\n", + "/setpagedevice {pop} def\n", + "%%EndProlog\n", + "%%Page 1 1\n"; + } + $prolog_passed= 1; + if (/^%%EndComments/) { next CREATEOUTPUT; } + } #endif line is not a comment + } #end else + } #endif (we are in the prologue section) + else #we are in the main part of postscript file + { + #end of postscript file reached? + #Usually the DSC %%EOF signifies the end + if ( eof($tmpfhandle) || + ($ignoreEOFDSC == 0 && /^%%EOF\s*$/ && $seenEOF == $totalEOFDSC) + || ( $trailerseen && /^II\*\000.*/ ) + ) + { + #do not forget to print last line if not terminated by LF + if ( eof($tmpfhandle) && !/^$/ && !/^%%EOF\s*$/ ) # do not insert %%EOF twice + { + print $outfhandle $_,"\n"; + } + #add appropriate trailer + if ($insertPScode) + { + print $outfhandle "%%Trailer\n", + "cleartomark\n", + "countdictstack\n", + "exch sub { end } repeat\n", + "restore\n", + "%%EOF\n"; + } + last CREATEOUTPUT; + } # stop output + + # Trailer comment seen? + if ( /^%%Trailer\s*$/ ) + { + $trailerseen=1; + } + else + { + if (!/^\s*$/) #non empty lines follow + { + $trailerseen=0; + } + } + + # check for trigger + if (defined($triggerstring) && /^$triggerstring$/) + { + $trigger= 1; + }; + + # remove complete lines if one of the expression matches + if ( !$binarysection # only when not in binary section + && + ( + ($removePreview && (/^%%BeginPreview/ ... /^%%EndPreview/)) + || # no preview + (defined($rangefilter_begin) && + (/$rangefilter_begin/ ... /$rangefilter_end/) && + (!(/$exclude_rangefilter_begin/ ... /$exclude_rangefilter_end/)) + ) + || + (defined($triggered_rangefilter_begin) && defined($triggered_rangefilter_end) && + $trigger && + (/$triggered_rangefilter_begin/ ... /$triggered_rangefilter_end/) + ) + || + /$linefilter/ # lines by linefilter + || + ($removeDSC && (/^%( |!)(\w )+/ || /^%%/)) # any type of structured comment + || + ($removeADO && + (/^statusdict begin.*ProductName.*print product print.*flush end\r?\n?$/ || + /^\(%%\[\s*(Page:.*|LastPage)\s*\]%%\)\s*=\s*\w*\s*\r?\n?/ )) + || + /^$/ # empty lines + ) + ) + { + next CREATEOUTPUT; + } + + # replacement + if ( defined($fixsearchpat) ) + { + #if (/$fixsearchpat/) { print STDERR "**filter** before:",$_,"\n"; } + #if (s/$fixsearchpat/$fixreplacepat/) { print STDERR "**filter** after:",$_,"\n";} + s/$fixsearchpat/$fixreplacepat/; + } + + # sanity check for potential dangerous commands + if ( /(^|\s)(clear|erasepage|initmatrix|initclip|initgraphics|startjob|cleardictstack|setmatrix|setpagedevice|copypage|grestoreall|exitserver|quit)(\s|$)/ ) + { + $notsane= 1; + #print STDERR "Warning: dangerous command in line: ",$_,"\n"; + } + } # end else (this is main part) + + # Output the postscript line to result file + print $outfhandle $_; + + if (!$binarysection) + { + print $outfhandle "\n"; # terminate line with LF + } + } # end else prolog_passed + } # end else inserted_prolog + } # end while CREATEOUTPUT + + close($tmpfhandle); + + if ($tmpfname ne $infname) { unlink "$tmpfname"; } #remove temporary file + + close ($outfhandle); + + # print warning if magic sequence not found + if ( $before_startps ) + { + print STDERR "\n ** Error!! **: could not identify begin of postscript code in file $infname, please check header line!\n First line should start with %!. No output generated.\n"; + } + + if (!$quiet) { print STDERR "ready.\n"; } + if ($warnings and $notsane and !$quiet) + { + print STDERR "** Warning **: EPS-output for $infname is not sane, at least one\n", + "of the following commands was still present:\n", + "clear erasepage initmatrix initclip initgraphics startjob\n", + "cleardictstack setmatrix setpagedevice copypage grestoreall\n", + "exitserver quit\n"; + } +} #end while PROCESSFILE + +# ---- end of perl-script ------- diff --git a/Master/bin/i386-darwin/ps2pk b/Master/bin/i386-darwin/ps2pk Binary files differindex 8070e965710..b1ff442d789 100755 --- a/Master/bin/i386-darwin/ps2pk +++ b/Master/bin/i386-darwin/ps2pk diff --git a/Master/bin/i386-darwin/psbook b/Master/bin/i386-darwin/psbook Binary files differindex 662fb7b456b..5a01a49a553 100755 --- a/Master/bin/i386-darwin/psbook +++ b/Master/bin/i386-darwin/psbook diff --git a/Master/bin/i386-darwin/psnup b/Master/bin/i386-darwin/psnup Binary files differindex 26c9b9e5fdf..50add4f8cdc 100755 --- a/Master/bin/i386-darwin/psnup +++ b/Master/bin/i386-darwin/psnup diff --git a/Master/bin/i386-darwin/psresize b/Master/bin/i386-darwin/psresize Binary files differindex 5f00ba10450..d2de5bca974 100755 --- a/Master/bin/i386-darwin/psresize +++ b/Master/bin/i386-darwin/psresize diff --git a/Master/bin/i386-darwin/psselect b/Master/bin/i386-darwin/psselect Binary files differindex dbeefb08905..c3fd638a1ce 100755 --- a/Master/bin/i386-darwin/psselect +++ b/Master/bin/i386-darwin/psselect diff --git a/Master/bin/i386-darwin/pstops b/Master/bin/i386-darwin/pstops Binary files differindex fc097e7f50a..96b036ce1ad 100755 --- a/Master/bin/i386-darwin/pstops +++ b/Master/bin/i386-darwin/pstops diff --git a/Master/bin/i386-darwin/sjisconv b/Master/bin/i386-darwin/sjisconv Binary files differindex 50592865275..66bc6a38808 100755 --- a/Master/bin/i386-darwin/sjisconv +++ b/Master/bin/i386-darwin/sjisconv diff --git a/Master/bin/i386-darwin/t1ascii b/Master/bin/i386-darwin/t1ascii Binary files differindex 09380bb2d2d..5f797ac7e77 100755 --- a/Master/bin/i386-darwin/t1ascii +++ b/Master/bin/i386-darwin/t1ascii diff --git a/Master/bin/i386-darwin/t1asm b/Master/bin/i386-darwin/t1asm Binary files differindex 68129e5fcff..87855c440d7 100755 --- a/Master/bin/i386-darwin/t1asm +++ b/Master/bin/i386-darwin/t1asm diff --git a/Master/bin/i386-darwin/t1binary b/Master/bin/i386-darwin/t1binary Binary files differindex 2fef456dfa1..33efbea1b20 100755 --- a/Master/bin/i386-darwin/t1binary +++ b/Master/bin/i386-darwin/t1binary diff --git a/Master/bin/i386-darwin/t1disasm b/Master/bin/i386-darwin/t1disasm Binary files differindex 3fa0f680fdc..cb9681343d5 100755 --- a/Master/bin/i386-darwin/t1disasm +++ b/Master/bin/i386-darwin/t1disasm diff --git a/Master/bin/i386-darwin/t1dotlessj b/Master/bin/i386-darwin/t1dotlessj Binary files differindex e9fa1c4c3dd..2f3a059129d 100755 --- a/Master/bin/i386-darwin/t1dotlessj +++ b/Master/bin/i386-darwin/t1dotlessj diff --git a/Master/bin/i386-darwin/t1lint b/Master/bin/i386-darwin/t1lint Binary files differindex 5864db667da..400fba3477a 100755 --- a/Master/bin/i386-darwin/t1lint +++ b/Master/bin/i386-darwin/t1lint diff --git a/Master/bin/i386-darwin/t1mac b/Master/bin/i386-darwin/t1mac Binary files differindex bf644f89ea5..c483f3b9cea 100755 --- a/Master/bin/i386-darwin/t1mac +++ b/Master/bin/i386-darwin/t1mac diff --git a/Master/bin/i386-darwin/t1reencode b/Master/bin/i386-darwin/t1reencode Binary files differindex c3c22d8ca2c..02996c706b4 100755 --- a/Master/bin/i386-darwin/t1reencode +++ b/Master/bin/i386-darwin/t1reencode diff --git a/Master/bin/i386-darwin/t1testpage b/Master/bin/i386-darwin/t1testpage Binary files differindex faee32b4ba7..478accce211 100755 --- a/Master/bin/i386-darwin/t1testpage +++ b/Master/bin/i386-darwin/t1testpage diff --git a/Master/bin/i386-darwin/t1unmac b/Master/bin/i386-darwin/t1unmac Binary files differindex 54ee90d6f02..69d369cdf86 100755 --- a/Master/bin/i386-darwin/t1unmac +++ b/Master/bin/i386-darwin/t1unmac diff --git a/Master/bin/i386-darwin/t4ht b/Master/bin/i386-darwin/t4ht Binary files differindex 3979cadc869..15911653ab8 100755 --- a/Master/bin/i386-darwin/t4ht +++ b/Master/bin/i386-darwin/t4ht diff --git a/Master/bin/i386-darwin/tangle b/Master/bin/i386-darwin/tangle Binary files differindex 96f37620e94..38eade47ad9 100755 --- a/Master/bin/i386-darwin/tangle +++ b/Master/bin/i386-darwin/tangle diff --git a/Master/bin/i386-darwin/tcdialog b/Master/bin/i386-darwin/tcdialog Binary files differindex f719d1cfae7..b06881a9f42 100755 --- a/Master/bin/i386-darwin/tcdialog +++ b/Master/bin/i386-darwin/tcdialog diff --git a/Master/bin/i386-darwin/tex b/Master/bin/i386-darwin/tex Binary files differindex fec61c09574..ff3448c61ea 100755 --- a/Master/bin/i386-darwin/tex +++ b/Master/bin/i386-darwin/tex diff --git a/Master/bin/i386-darwin/tex4ht b/Master/bin/i386-darwin/tex4ht Binary files differindex 885b0325c48..d29806bb46f 100755 --- a/Master/bin/i386-darwin/tex4ht +++ b/Master/bin/i386-darwin/tex4ht diff --git a/Master/bin/i386-darwin/texi2html b/Master/bin/i386-darwin/texi2html index 9b45e2044e3..40ff46094d8 100755 --- a/Master/bin/i386-darwin/texi2html +++ b/Master/bin/i386-darwin/texi2html @@ -75,7 +75,7 @@ my $THISVERSION = '1.76'; my $THISPROG = "texi2html $THISVERSION"; # program name and version # set by configure, prefix for the sysconfdir and so on -my $prefix = '/Users/jonathan/texlive/Build/source/inst'; +my $prefix = '/usr/local/Build/i386/TeXLive.2006'; my $sysconfdir; my $pkgdatadir; my $datadir; @@ -92,10 +92,10 @@ else $sysconfdir = "/usr/local/etc"; } -if ('/Users/jonathan/texlive/Build/source/inst' ne '@' . 'datadir@') +if ('/usr/local/Build/i386/TeXLive.2006' ne '@' . 'datadir@') { - $pkgdatadir = eval '"/Users/jonathan/texlive/Build/source/inst/texi2html"'; - $datadir = eval '"/Users/jonathan/texlive/Build/source/inst"'; + $pkgdatadir = eval '"/usr/local/Build/i386/TeXLive.2006/texi2html"'; + $datadir = eval '"/usr/local/Build/i386/TeXLive.2006"'; } else { diff --git a/Master/bin/i386-darwin/texindex b/Master/bin/i386-darwin/texindex Binary files differindex 444a9c93f65..5fb82887196 100755 --- a/Master/bin/i386-darwin/texindex +++ b/Master/bin/i386-darwin/texindex diff --git a/Master/bin/i386-darwin/tftopl b/Master/bin/i386-darwin/tftopl Binary files differindex 28c7a6f0f68..c25340685b1 100755 --- a/Master/bin/i386-darwin/tftopl +++ b/Master/bin/i386-darwin/tftopl diff --git a/Master/bin/i386-darwin/tie b/Master/bin/i386-darwin/tie Binary files differindex 56c93e2c9cd..2fa8855c4ef 100755 --- a/Master/bin/i386-darwin/tie +++ b/Master/bin/i386-darwin/tie diff --git a/Master/bin/i386-darwin/ttf2afm b/Master/bin/i386-darwin/ttf2afm Binary files differindex bca87086a73..1c6cfc293fc 100755 --- a/Master/bin/i386-darwin/ttf2afm +++ b/Master/bin/i386-darwin/ttf2afm diff --git a/Master/bin/i386-darwin/ttf2pk b/Master/bin/i386-darwin/ttf2pk Binary files differindex 379765c75fe..f95a3df1325 100755 --- a/Master/bin/i386-darwin/ttf2pk +++ b/Master/bin/i386-darwin/ttf2pk diff --git a/Master/bin/i386-darwin/ttf2tfm b/Master/bin/i386-darwin/ttf2tfm Binary files differindex ad194a5d7df..d8b66655574 100755 --- a/Master/bin/i386-darwin/ttf2tfm +++ b/Master/bin/i386-darwin/ttf2tfm diff --git a/Master/bin/i386-darwin/ttftotype42 b/Master/bin/i386-darwin/ttftotype42 Binary files differindex 1a806932e33..b44ea47f2eb 100755 --- a/Master/bin/i386-darwin/ttftotype42 +++ b/Master/bin/i386-darwin/ttftotype42 diff --git a/Master/bin/i386-darwin/vftovp b/Master/bin/i386-darwin/vftovp Binary files differindex fcf0da2efc2..60d03525756 100755 --- a/Master/bin/i386-darwin/vftovp +++ b/Master/bin/i386-darwin/vftovp diff --git a/Master/bin/i386-darwin/vptovf b/Master/bin/i386-darwin/vptovf Binary files differindex 97b892d92a4..2801e120672 100755 --- a/Master/bin/i386-darwin/vptovf +++ b/Master/bin/i386-darwin/vptovf diff --git a/Master/bin/i386-darwin/weave b/Master/bin/i386-darwin/weave Binary files differindex b5583682f21..a37d6122bec 100755 --- a/Master/bin/i386-darwin/weave +++ b/Master/bin/i386-darwin/weave diff --git a/Master/bin/i386-darwin/xdv2pdf b/Master/bin/i386-darwin/xdv2pdf Binary files differindex a69abcc1196..9593a2905f1 100755 --- a/Master/bin/i386-darwin/xdv2pdf +++ b/Master/bin/i386-darwin/xdv2pdf diff --git a/Master/bin/i386-darwin/xdvi-xaw.bin b/Master/bin/i386-darwin/xdvi-xaw.bin Binary files differindex d243b9371a6..9888ad47e20 100755 --- a/Master/bin/i386-darwin/xdvi-xaw.bin +++ b/Master/bin/i386-darwin/xdvi-xaw.bin diff --git a/Master/bin/i386-darwin/xdvipdfmx b/Master/bin/i386-darwin/xdvipdfmx Binary files differindex 188677113cd..12d3e3f330e 100755 --- a/Master/bin/i386-darwin/xdvipdfmx +++ b/Master/bin/i386-darwin/xdvipdfmx diff --git a/Master/bin/i386-darwin/xetex b/Master/bin/i386-darwin/xetex Binary files differindex d796ad99ad3..546b599a12d 100755 --- a/Master/bin/i386-darwin/xetex +++ b/Master/bin/i386-darwin/xetex |