From 1cb9d027e042c700bb8a9f4bc42adb8759d936bf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 10 Jan 2007 17:31:20 +0000 Subject: new i386-linux binaries from me (via michel g 2.4 machine) git-svn-id: svn://tug.org/texlive/trunk@3294 c570f23f-e606-0410-a88d-b1316a301751 --- Master/bin/i386-linux/afm2pl | Bin 84872 -> 68072 bytes Master/bin/i386-linux/afm2tfm | Bin 91132 -> 75400 bytes Master/bin/i386-linux/aleph | Bin 602032 -> 408352 bytes Master/bin/i386-linux/bbox | Bin 0 -> 6856 bytes Master/bin/i386-linux/bg5conv | Bin 3368 -> 3344 bytes Master/bin/i386-linux/bibtex | Bin 162632 -> 119444 bytes Master/bin/i386-linux/bibtex8 | Bin 196104 -> 144376 bytes Master/bin/i386-linux/cef5conv | Bin 4840 -> 4696 bytes Master/bin/i386-linux/cefconv | Bin 4720 -> 4592 bytes Master/bin/i386-linux/cefsconv | Bin 4856 -> 4708 bytes Master/bin/i386-linux/cfftot1 | Bin 318048 -> 291500 bytes Master/bin/i386-linux/ctangle | Bin 94612 -> 75948 bytes Master/bin/i386-linux/ctie | Bin 72588 -> 57608 bytes Master/bin/i386-linux/cweave | Bin 134388 -> 103500 bytes Master/bin/i386-linux/detex | Bin 84744 -> 65844 bytes Master/bin/i386-linux/devnag | Bin 27068 -> 23040 bytes Master/bin/i386-linux/disdvi | Bin 10184 -> 9352 bytes Master/bin/i386-linux/dmp | Bin 81424 -> 65832 bytes Master/bin/i386-linux/dt2dv | Bin 34552 -> 27552 bytes Master/bin/i386-linux/dv2dt | Bin 10852 -> 9120 bytes Master/bin/i386-linux/dvi2tty | Bin 20668 -> 16980 bytes Master/bin/i386-linux/dvibook | Bin 24084 -> 20372 bytes Master/bin/i386-linux/dviconcat | Bin 20196 -> 18112 bytes Master/bin/i386-linux/dvicopy | Bin 114340 -> 88272 bytes Master/bin/i386-linux/dvidvi | Bin 18808 -> 14816 bytes Master/bin/i386-linux/dvilj | Bin 106500 -> 84516 bytes Master/bin/i386-linux/dvilj2p | Bin 106884 -> 84836 bytes Master/bin/i386-linux/dvilj4 | Bin 113604 -> 90820 bytes Master/bin/i386-linux/dvilj4l | Bin 113604 -> 90820 bytes Master/bin/i386-linux/dvipdfm | Bin 473764 -> 348384 bytes Master/bin/i386-linux/dvipdfmx | Bin 867944 -> 662068 bytes Master/bin/i386-linux/dvipng | Bin 1085576 -> 787020 bytes Master/bin/i386-linux/dvipos | Bin 0 -> 79204 bytes Master/bin/i386-linux/dvips | Bin 241028 -> 197320 bytes Master/bin/i386-linux/dviselect | Bin 23940 -> 20224 bytes Master/bin/i386-linux/dvitodvi | Bin 25492 -> 24468 bytes Master/bin/i386-linux/dvitomp | Bin 91632 -> 74536 bytes Master/bin/i386-linux/dvitype | Bin 97220 -> 78660 bytes Master/bin/i386-linux/ebb | Bin 269664 -> 194332 bytes Master/bin/i386-linux/epsffit | Bin 8068 -> 7816 bytes Master/bin/i386-linux/extconv | Bin 3368 -> 3344 bytes Master/bin/i386-linux/gftodvi | Bin 101232 -> 80220 bytes Master/bin/i386-linux/gftopk | Bin 85296 -> 66340 bytes Master/bin/i386-linux/gftype | Bin 81500 -> 66184 bytes Master/bin/i386-linux/gsftopk | Bin 81940 -> 66044 bytes Master/bin/i386-linux/hbf2gf | Bin 92932 -> 74256 bytes Master/bin/i386-linux/htcontext | 6 +- Master/bin/i386-linux/htlatex | 4 +- Master/bin/i386-linux/htmex | 4 +- Master/bin/i386-linux/httex | 4 +- Master/bin/i386-linux/httexi | 4 +- Master/bin/i386-linux/info | Bin 150680 -> 122960 bytes Master/bin/i386-linux/infokey | Bin 23820 -> 19640 bytes Master/bin/i386-linux/install-info | Bin 25924 -> 21188 bytes Master/bin/i386-linux/kpseaccess | Bin 4324 -> 4072 bytes Master/bin/i386-linux/kpsereadlink | Bin 4256 -> 3992 bytes Master/bin/i386-linux/kpsestat | Bin 5060 -> 4556 bytes Master/bin/i386-linux/kpsewhich | Bin 72788 -> 58064 bytes Master/bin/i386-linux/lacheck | Bin 54316 -> 48128 bytes Master/bin/i386-linux/mag | Bin 4608 -> 4388 bytes Master/bin/i386-linux/makeindex | Bin 143172 -> 117848 bytes Master/bin/i386-linux/makeinfo | Bin 202764 -> 175928 bytes Master/bin/i386-linux/makempx | Bin 76416 -> 58132 bytes Master/bin/i386-linux/mf | Bin 360304 -> 239396 bytes Master/bin/i386-linux/mf-nowin | Bin 355844 -> 234864 bytes Master/bin/i386-linux/mft | Bin 107096 -> 87092 bytes Master/bin/i386-linux/mk4ht | 10 +- Master/bin/i386-linux/mmafm | Bin 195368 -> 178312 bytes Master/bin/i386-linux/mmpfb | Bin 259384 -> 236116 bytes Master/bin/i386-linux/mpost | Bin 464008 -> 331056 bytes Master/bin/i386-linux/mpto | Bin 7768 -> 7104 bytes Master/bin/i386-linux/musixflx | Bin 15540 -> 13888 bytes Master/bin/i386-linux/newer | Bin 5796 -> 4684 bytes Master/bin/i386-linux/odvicopy | Bin 121732 -> 92176 bytes Master/bin/i386-linux/odvitype | Bin 101316 -> 78660 bytes Master/bin/i386-linux/omega | Bin 630688 -> 419744 bytes Master/bin/i386-linux/omfonts | Bin 156076 -> 130080 bytes Master/bin/i386-linux/otangle | Bin 47380 -> 40128 bytes Master/bin/i386-linux/otfinfo | Bin 383980 -> 376096 bytes Master/bin/i386-linux/otftotfm | Bin 701560 -> 672604 bytes Master/bin/i386-linux/otp2ocp | Bin 85716 -> 70052 bytes Master/bin/i386-linux/outocp | Bin 68384 -> 53524 bytes Master/bin/i386-linux/patgen | Bin 35696 -> 29420 bytes Master/bin/i386-linux/pdfclose | Bin 6960 -> 6580 bytes Master/bin/i386-linux/pdfopen | Bin 7844 -> 7284 bytes Master/bin/i386-linux/pdftex | Bin 1453808 -> 1175876 bytes Master/bin/i386-linux/pfb2pfa | Bin 6532 -> 6200 bytes Master/bin/i386-linux/pk2bm | Bin 10076 -> 8840 bytes Master/bin/i386-linux/pktogf | Bin 81292 -> 62588 bytes Master/bin/i386-linux/pktype | Bin 73212 -> 58248 bytes Master/bin/i386-linux/pltotf | Bin 60276 -> 45384 bytes Master/bin/i386-linux/pooltype | Bin 18640 -> 15992 bytes Master/bin/i386-linux/ps2eps | 929 +++++++++++++++++++++++++++++++++++++ Master/bin/i386-linux/ps2pk | Bin 197964 -> 152768 bytes Master/bin/i386-linux/psbook | Bin 11696 -> 10440 bytes Master/bin/i386-linux/psnup | Bin 19656 -> 17020 bytes Master/bin/i386-linux/psresize | Bin 17352 -> 15484 bytes Master/bin/i386-linux/psselect | Bin 13040 -> 11240 bytes Master/bin/i386-linux/pstops | Bin 18672 -> 15804 bytes Master/bin/i386-linux/sjisconv | Bin 3384 -> 3360 bytes Master/bin/i386-linux/t1ascii | Bin 27112 -> 20232 bytes Master/bin/i386-linux/t1asm | Bin 32004 -> 24840 bytes Master/bin/i386-linux/t1binary | Bin 25372 -> 19720 bytes Master/bin/i386-linux/t1disasm | Bin 31252 -> 24040 bytes Master/bin/i386-linux/t1dotlessj | Bin 247652 -> 229576 bytes Master/bin/i386-linux/t1lint | Bin 204700 -> 186916 bytes Master/bin/i386-linux/t1mac | Bin 39468 -> 31464 bytes Master/bin/i386-linux/t1reencode | Bin 247064 -> 227960 bytes Master/bin/i386-linux/t1testpage | Bin 223820 -> 208372 bytes Master/bin/i386-linux/t1unmac | Bin 32328 -> 25832 bytes Master/bin/i386-linux/t4ht | Bin 92824 -> 70260 bytes Master/bin/i386-linux/tangle | Bin 101236 -> 79156 bytes Master/bin/i386-linux/tcdialog | Bin 148264 -> 118904 bytes Master/bin/i386-linux/tex | Bin 356012 -> 263748 bytes Master/bin/i386-linux/tex4ht | Bin 175048 -> 128820 bytes Master/bin/i386-linux/texconfig | 9 +- Master/bin/i386-linux/texi2html | 8 +- Master/bin/i386-linux/texindex | Bin 18472 -> 14664 bytes Master/bin/i386-linux/tftopl | Bin 98516 -> 74356 bytes Master/bin/i386-linux/tie | Bin 9964 -> 8648 bytes Master/bin/i386-linux/ttf2afm | Bin 89872 -> 71100 bytes Master/bin/i386-linux/ttf2pk | Bin 262528 -> 199388 bytes Master/bin/i386-linux/ttf2tfm | Bin 288340 -> 217400 bytes Master/bin/i386-linux/ttftotype42 | Bin 258920 -> 236416 bytes Master/bin/i386-linux/vftovp | Bin 113532 -> 86748 bytes Master/bin/i386-linux/vptovf | Bin 76568 -> 56616 bytes Master/bin/i386-linux/weave | Bin 126396 -> 94856 bytes Master/bin/i386-linux/xdvi-xaw.bin | Bin 930236 -> 706636 bytes Master/bin/i386-linux/xdvipdfmx | Bin 1437992 -> 1117544 bytes Master/bin/i386-linux/xetex | Bin 8067756 -> 7912028 bytes 130 files changed, 957 insertions(+), 21 deletions(-) create mode 100755 Master/bin/i386-linux/bbox create mode 100755 Master/bin/i386-linux/dvipos create mode 100755 Master/bin/i386-linux/ps2eps diff --git a/Master/bin/i386-linux/afm2pl b/Master/bin/i386-linux/afm2pl index da566da559f..8b97b316805 100755 Binary files a/Master/bin/i386-linux/afm2pl and b/Master/bin/i386-linux/afm2pl differ diff --git a/Master/bin/i386-linux/afm2tfm b/Master/bin/i386-linux/afm2tfm index ff7bb095ccd..bd62b6cb134 100755 Binary files a/Master/bin/i386-linux/afm2tfm and b/Master/bin/i386-linux/afm2tfm differ diff --git a/Master/bin/i386-linux/aleph b/Master/bin/i386-linux/aleph index 8b05732eac3..c202a997145 100755 Binary files a/Master/bin/i386-linux/aleph and b/Master/bin/i386-linux/aleph differ diff --git a/Master/bin/i386-linux/bbox b/Master/bin/i386-linux/bbox new file mode 100755 index 00000000000..ad5a55372c5 Binary files /dev/null and b/Master/bin/i386-linux/bbox differ diff --git a/Master/bin/i386-linux/bg5conv b/Master/bin/i386-linux/bg5conv index aaa7cd6d970..e03407182ee 100755 Binary files a/Master/bin/i386-linux/bg5conv and b/Master/bin/i386-linux/bg5conv differ diff --git a/Master/bin/i386-linux/bibtex b/Master/bin/i386-linux/bibtex index 336307ef830..5eb1e96ab61 100755 Binary files a/Master/bin/i386-linux/bibtex and b/Master/bin/i386-linux/bibtex differ diff --git a/Master/bin/i386-linux/bibtex8 b/Master/bin/i386-linux/bibtex8 index f300178a493..8fd13476bcb 100755 Binary files a/Master/bin/i386-linux/bibtex8 and b/Master/bin/i386-linux/bibtex8 differ diff --git a/Master/bin/i386-linux/cef5conv b/Master/bin/i386-linux/cef5conv index 5a4511b54b8..cf583062739 100755 Binary files a/Master/bin/i386-linux/cef5conv and b/Master/bin/i386-linux/cef5conv differ diff --git a/Master/bin/i386-linux/cefconv b/Master/bin/i386-linux/cefconv index 8fdf84f2175..772ebf6af74 100755 Binary files a/Master/bin/i386-linux/cefconv and b/Master/bin/i386-linux/cefconv differ diff --git a/Master/bin/i386-linux/cefsconv b/Master/bin/i386-linux/cefsconv index ef713431bbd..c5be844f3d0 100755 Binary files a/Master/bin/i386-linux/cefsconv and b/Master/bin/i386-linux/cefsconv differ diff --git a/Master/bin/i386-linux/cfftot1 b/Master/bin/i386-linux/cfftot1 index 1c75ca6c12f..4860793aadd 100755 Binary files a/Master/bin/i386-linux/cfftot1 and b/Master/bin/i386-linux/cfftot1 differ diff --git a/Master/bin/i386-linux/ctangle b/Master/bin/i386-linux/ctangle index 12f4f802e3b..272552ff8c7 100755 Binary files a/Master/bin/i386-linux/ctangle and b/Master/bin/i386-linux/ctangle differ diff --git a/Master/bin/i386-linux/ctie b/Master/bin/i386-linux/ctie index aac6e54afb4..a8c860c4ba1 100755 Binary files a/Master/bin/i386-linux/ctie and b/Master/bin/i386-linux/ctie differ diff --git a/Master/bin/i386-linux/cweave b/Master/bin/i386-linux/cweave index a50a8c0406a..035d320aee8 100755 Binary files a/Master/bin/i386-linux/cweave and b/Master/bin/i386-linux/cweave differ diff --git a/Master/bin/i386-linux/detex b/Master/bin/i386-linux/detex index 445a6db6595..07c506bf3d8 100755 Binary files a/Master/bin/i386-linux/detex and b/Master/bin/i386-linux/detex differ diff --git a/Master/bin/i386-linux/devnag b/Master/bin/i386-linux/devnag index 44ed322aa47..c5e5879b5ef 100755 Binary files a/Master/bin/i386-linux/devnag and b/Master/bin/i386-linux/devnag differ diff --git a/Master/bin/i386-linux/disdvi b/Master/bin/i386-linux/disdvi index d4d5260b117..d0205d7f493 100755 Binary files a/Master/bin/i386-linux/disdvi and b/Master/bin/i386-linux/disdvi differ diff --git a/Master/bin/i386-linux/dmp b/Master/bin/i386-linux/dmp index ed5372343f3..324b0aff109 100755 Binary files a/Master/bin/i386-linux/dmp and b/Master/bin/i386-linux/dmp differ diff --git a/Master/bin/i386-linux/dt2dv b/Master/bin/i386-linux/dt2dv index e51463a763a..c0e7ad493ab 100755 Binary files a/Master/bin/i386-linux/dt2dv and b/Master/bin/i386-linux/dt2dv differ diff --git a/Master/bin/i386-linux/dv2dt b/Master/bin/i386-linux/dv2dt index b962048c84e..218be7089dc 100755 Binary files a/Master/bin/i386-linux/dv2dt and b/Master/bin/i386-linux/dv2dt differ diff --git a/Master/bin/i386-linux/dvi2tty b/Master/bin/i386-linux/dvi2tty index 2cbc5b26556..fdc4a1991e8 100755 Binary files a/Master/bin/i386-linux/dvi2tty and b/Master/bin/i386-linux/dvi2tty differ diff --git a/Master/bin/i386-linux/dvibook b/Master/bin/i386-linux/dvibook index f7c4eb97256..20dc3050fff 100755 Binary files a/Master/bin/i386-linux/dvibook and b/Master/bin/i386-linux/dvibook differ diff --git a/Master/bin/i386-linux/dviconcat b/Master/bin/i386-linux/dviconcat index 8a08a925e91..d036272eed3 100755 Binary files a/Master/bin/i386-linux/dviconcat and b/Master/bin/i386-linux/dviconcat differ diff --git a/Master/bin/i386-linux/dvicopy b/Master/bin/i386-linux/dvicopy index 7d9c40b2816..d0b8c7d5431 100755 Binary files a/Master/bin/i386-linux/dvicopy and b/Master/bin/i386-linux/dvicopy differ diff --git a/Master/bin/i386-linux/dvidvi b/Master/bin/i386-linux/dvidvi index 7082d68be8e..26324b9be02 100755 Binary files a/Master/bin/i386-linux/dvidvi and b/Master/bin/i386-linux/dvidvi differ diff --git a/Master/bin/i386-linux/dvilj b/Master/bin/i386-linux/dvilj index 62d3f31f078..c4fccf8c633 100755 Binary files a/Master/bin/i386-linux/dvilj and b/Master/bin/i386-linux/dvilj differ diff --git a/Master/bin/i386-linux/dvilj2p b/Master/bin/i386-linux/dvilj2p index 56513b1abcf..e4bc70733e8 100755 Binary files a/Master/bin/i386-linux/dvilj2p and b/Master/bin/i386-linux/dvilj2p differ diff --git a/Master/bin/i386-linux/dvilj4 b/Master/bin/i386-linux/dvilj4 index 450f5e49527..58b79ab56ee 100755 Binary files a/Master/bin/i386-linux/dvilj4 and b/Master/bin/i386-linux/dvilj4 differ diff --git a/Master/bin/i386-linux/dvilj4l b/Master/bin/i386-linux/dvilj4l index fa8cb9834dc..2a90afda461 100755 Binary files a/Master/bin/i386-linux/dvilj4l and b/Master/bin/i386-linux/dvilj4l differ diff --git a/Master/bin/i386-linux/dvipdfm b/Master/bin/i386-linux/dvipdfm index b08bd1ca64d..e1abaa114de 100755 Binary files a/Master/bin/i386-linux/dvipdfm and b/Master/bin/i386-linux/dvipdfm differ diff --git a/Master/bin/i386-linux/dvipdfmx b/Master/bin/i386-linux/dvipdfmx index 52d4094f3d5..397c9740b0a 100755 Binary files a/Master/bin/i386-linux/dvipdfmx and b/Master/bin/i386-linux/dvipdfmx differ diff --git a/Master/bin/i386-linux/dvipng b/Master/bin/i386-linux/dvipng index eceff15a9e4..75c435d4a38 100755 Binary files a/Master/bin/i386-linux/dvipng and b/Master/bin/i386-linux/dvipng differ diff --git a/Master/bin/i386-linux/dvipos b/Master/bin/i386-linux/dvipos new file mode 100755 index 00000000000..1ef999091a4 Binary files /dev/null and b/Master/bin/i386-linux/dvipos differ diff --git a/Master/bin/i386-linux/dvips b/Master/bin/i386-linux/dvips index 6c794ca688c..f7d64504758 100755 Binary files a/Master/bin/i386-linux/dvips and b/Master/bin/i386-linux/dvips differ diff --git a/Master/bin/i386-linux/dviselect b/Master/bin/i386-linux/dviselect index 1de83ad9909..1394d447100 100755 Binary files a/Master/bin/i386-linux/dviselect and b/Master/bin/i386-linux/dviselect differ diff --git a/Master/bin/i386-linux/dvitodvi b/Master/bin/i386-linux/dvitodvi index ca0315ac58b..c7abf24c497 100755 Binary files a/Master/bin/i386-linux/dvitodvi and b/Master/bin/i386-linux/dvitodvi differ diff --git a/Master/bin/i386-linux/dvitomp b/Master/bin/i386-linux/dvitomp index f59676c0d2b..1c01e08a7f8 100755 Binary files a/Master/bin/i386-linux/dvitomp and b/Master/bin/i386-linux/dvitomp differ diff --git a/Master/bin/i386-linux/dvitype b/Master/bin/i386-linux/dvitype index 1f6a43a073b..713223383ee 100755 Binary files a/Master/bin/i386-linux/dvitype and b/Master/bin/i386-linux/dvitype differ diff --git a/Master/bin/i386-linux/ebb b/Master/bin/i386-linux/ebb index a162685f208..dc4a6c6538e 100755 Binary files a/Master/bin/i386-linux/ebb and b/Master/bin/i386-linux/ebb differ diff --git a/Master/bin/i386-linux/epsffit b/Master/bin/i386-linux/epsffit index a7d2d94c98f..53e1f60b3bf 100755 Binary files a/Master/bin/i386-linux/epsffit and b/Master/bin/i386-linux/epsffit differ diff --git a/Master/bin/i386-linux/extconv b/Master/bin/i386-linux/extconv index ed30f768825..d3e360c52e2 100755 Binary files a/Master/bin/i386-linux/extconv and b/Master/bin/i386-linux/extconv differ diff --git a/Master/bin/i386-linux/gftodvi b/Master/bin/i386-linux/gftodvi index 8ae84635ebc..75acd5cf6ee 100755 Binary files a/Master/bin/i386-linux/gftodvi and b/Master/bin/i386-linux/gftodvi differ diff --git a/Master/bin/i386-linux/gftopk b/Master/bin/i386-linux/gftopk index 7c12ed704c9..0c9b47c1771 100755 Binary files a/Master/bin/i386-linux/gftopk and b/Master/bin/i386-linux/gftopk differ diff --git a/Master/bin/i386-linux/gftype b/Master/bin/i386-linux/gftype index 7ff6434ada2..bab87e9189b 100755 Binary files a/Master/bin/i386-linux/gftype and b/Master/bin/i386-linux/gftype differ diff --git a/Master/bin/i386-linux/gsftopk b/Master/bin/i386-linux/gsftopk index 9f925ce68e0..f07ad03ff45 100755 Binary files a/Master/bin/i386-linux/gsftopk and b/Master/bin/i386-linux/gsftopk differ diff --git a/Master/bin/i386-linux/hbf2gf b/Master/bin/i386-linux/hbf2gf index b87b1a74a0a..0446b73fda4 100755 Binary files a/Master/bin/i386-linux/hbf2gf and b/Master/bin/i386-linux/hbf2gf differ diff --git a/Master/bin/i386-linux/htcontext b/Master/bin/i386-linux/htcontext index 9d6d4549574..9e01fa97f66 100755 --- a/Master/bin/i386-linux/htcontext +++ b/Master/bin/i386-linux/htcontext @@ -1,7 +1,7 @@ #!/bin/sh - texexec --arg="ht-1=$2" --use=tex4ht $5 $1 - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 - t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 + texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 + tex4ht \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 + t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 diff --git a/Master/bin/i386-linux/htlatex b/Master/bin/i386-linux/htlatex index 1b8b7cea74a..ebab47dbaa6 100755 --- a/Master/bin/i386-linux/htlatex +++ b/Master/bin/i386-linux/htlatex @@ -2,8 +2,8 @@ latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1 latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1 latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1 - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 - t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 + tex4ht \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 + t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 diff --git a/Master/bin/i386-linux/htmex b/Master/bin/i386-linux/htmex index b4aa3d9a06e..485a7594468 100755 --- a/Master/bin/i386-linux/htmex +++ b/Master/bin/i386-linux/htmex @@ -2,8 +2,8 @@ mex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1 mex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1 mex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1 - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 - t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 + tex4ht \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 + t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 diff --git a/Master/bin/i386-linux/httex b/Master/bin/i386-linux/httex index 44920e72077..4c184897d13 100755 --- a/Master/bin/i386-linux/httex +++ b/Master/bin/i386-linux/httex @@ -2,8 +2,8 @@ tex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1 tex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1 tex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1 - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 - t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 + tex4ht \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 + t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 diff --git a/Master/bin/i386-linux/httexi b/Master/bin/i386-linux/httexi index 0ce3cb4a589..26427698991 100755 --- a/Master/bin/i386-linux/httexi +++ b/Master/bin/i386-linux/httexi @@ -2,8 +2,8 @@ tex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode '$2'.a.b.c.\input ' $1 tex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode '$2'.a.b.c.\input ' $1 tex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode '$2'.a.b.c.\input ' $1 - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 - t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 + tex4ht \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 + t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 # texindex ? diff --git a/Master/bin/i386-linux/info b/Master/bin/i386-linux/info index e7cf45a1829..881679f49d7 100755 Binary files a/Master/bin/i386-linux/info and b/Master/bin/i386-linux/info differ diff --git a/Master/bin/i386-linux/infokey b/Master/bin/i386-linux/infokey index 9e8bd12f96e..625dbb8197f 100755 Binary files a/Master/bin/i386-linux/infokey and b/Master/bin/i386-linux/infokey differ diff --git a/Master/bin/i386-linux/install-info b/Master/bin/i386-linux/install-info index 79b73b3c4fb..2b7bf54ee61 100755 Binary files a/Master/bin/i386-linux/install-info and b/Master/bin/i386-linux/install-info differ diff --git a/Master/bin/i386-linux/kpseaccess b/Master/bin/i386-linux/kpseaccess index 8ebc8933d08..5741fb87a74 100755 Binary files a/Master/bin/i386-linux/kpseaccess and b/Master/bin/i386-linux/kpseaccess differ diff --git a/Master/bin/i386-linux/kpsereadlink b/Master/bin/i386-linux/kpsereadlink index 8da503e853f..49169a7a22c 100755 Binary files a/Master/bin/i386-linux/kpsereadlink and b/Master/bin/i386-linux/kpsereadlink differ diff --git a/Master/bin/i386-linux/kpsestat b/Master/bin/i386-linux/kpsestat index aff452645b3..342439bc3eb 100755 Binary files a/Master/bin/i386-linux/kpsestat and b/Master/bin/i386-linux/kpsestat differ diff --git a/Master/bin/i386-linux/kpsewhich b/Master/bin/i386-linux/kpsewhich index fb4259b6a2d..f26a8eec289 100755 Binary files a/Master/bin/i386-linux/kpsewhich and b/Master/bin/i386-linux/kpsewhich differ diff --git a/Master/bin/i386-linux/lacheck b/Master/bin/i386-linux/lacheck index d6b9c2eeb09..6903787749a 100755 Binary files a/Master/bin/i386-linux/lacheck and b/Master/bin/i386-linux/lacheck differ diff --git a/Master/bin/i386-linux/mag b/Master/bin/i386-linux/mag index 5cf71bb6d2e..95807d9059e 100755 Binary files a/Master/bin/i386-linux/mag and b/Master/bin/i386-linux/mag differ diff --git a/Master/bin/i386-linux/makeindex b/Master/bin/i386-linux/makeindex index 02010866d45..08ddad1422f 100755 Binary files a/Master/bin/i386-linux/makeindex and b/Master/bin/i386-linux/makeindex differ diff --git a/Master/bin/i386-linux/makeinfo b/Master/bin/i386-linux/makeinfo index af0f3d7f3d7..50b296ef8eb 100755 Binary files a/Master/bin/i386-linux/makeinfo and b/Master/bin/i386-linux/makeinfo differ diff --git a/Master/bin/i386-linux/makempx b/Master/bin/i386-linux/makempx index 167916f5bc8..7f5144ac7f9 100755 Binary files a/Master/bin/i386-linux/makempx and b/Master/bin/i386-linux/makempx differ diff --git a/Master/bin/i386-linux/mf b/Master/bin/i386-linux/mf index cc0b4745e0b..b1f551dd110 100755 Binary files a/Master/bin/i386-linux/mf and b/Master/bin/i386-linux/mf differ diff --git a/Master/bin/i386-linux/mf-nowin b/Master/bin/i386-linux/mf-nowin index a884361e5ea..45ff5ce3e3d 100755 Binary files a/Master/bin/i386-linux/mf-nowin and b/Master/bin/i386-linux/mf-nowin differ diff --git a/Master/bin/i386-linux/mft b/Master/bin/i386-linux/mft index 65b6f9adb1d..a679ff2e36b 100755 Binary files a/Master/bin/i386-linux/mft and b/Master/bin/i386-linux/mft differ diff --git a/Master/bin/i386-linux/mk4ht b/Master/bin/i386-linux/mk4ht index 0f4b664506c..2bd1f7e2038 100755 --- a/Master/bin/i386-linux/mk4ht +++ b/Master/bin/i386-linux/mk4ht @@ -1,7 +1,7 @@ #!/usr/bin/env perl #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -# mk4ht 2006-08-28-20:45 % -# Copyright (C) 2003--2006 Eitan M. Gurari % +# mk4ht 2007-01-04-01:34 % +# Copyright (C) 2003--2007 Eitan M. Gurari % # % # % # This work may be distributed and/or modified under the % @@ -58,6 +58,10 @@ my @options = ( "js", "jstex", "tex", "xhtml,jsml", " -cjsmlhtf", "-cjsml", "js", "jstexi", "texi", "xhtml,jsml", " -cjsmlhtf", "-cjsml", "js", "jscontext", "context", "xhtml,jsml", " -cjsmlhtf", "-cjsml", + "jm", "jmlatex", "latex", "xhtml,jsmath", " -cmozhtf", "", + "jm", "jmtex", "tex", "xhtml,jsmath", " -cmozhtf", "", + "jm", "jmtexi", "texi", "xhtml,jsmath", " -cmozhtf", "", + "jm", "jmcontext", "context", "xhtml,jsmath", " -cmozhtf", "", "tei", "teilatex", "latex", "xhtml,tei", " -cunihtf", "-cvalidate", "tei", "teitex", "tex", "xhtml,tei", " -cunihtf", "-cvalidate", "tei", "teitexi", "texi", "xhtml,tei", " -cunihtf", "-cvalidate", @@ -178,7 +182,7 @@ print " clean.htlatex lg tmp\n"; } -print "mk4ht (2006-08-28-20:45)\n"; +print "mk4ht (2007-01-04-01:34)\n"; if( !@ARGV ){ print "improper command\n"; showInstrucions(); exit(1); diff --git a/Master/bin/i386-linux/mmafm b/Master/bin/i386-linux/mmafm index a3e8ee9337b..d42697b8d4d 100755 Binary files a/Master/bin/i386-linux/mmafm and b/Master/bin/i386-linux/mmafm differ diff --git a/Master/bin/i386-linux/mmpfb b/Master/bin/i386-linux/mmpfb index cccb65d380a..4bfd23cd894 100755 Binary files a/Master/bin/i386-linux/mmpfb and b/Master/bin/i386-linux/mmpfb differ diff --git a/Master/bin/i386-linux/mpost b/Master/bin/i386-linux/mpost index 30d1b96f321..54fcbca8042 100755 Binary files a/Master/bin/i386-linux/mpost and b/Master/bin/i386-linux/mpost differ diff --git a/Master/bin/i386-linux/mpto b/Master/bin/i386-linux/mpto index c3cc10e226c..df3f1d4c0c4 100755 Binary files a/Master/bin/i386-linux/mpto and b/Master/bin/i386-linux/mpto differ diff --git a/Master/bin/i386-linux/musixflx b/Master/bin/i386-linux/musixflx index 563b3098664..8c22ec5b8b7 100755 Binary files a/Master/bin/i386-linux/musixflx and b/Master/bin/i386-linux/musixflx differ diff --git a/Master/bin/i386-linux/newer b/Master/bin/i386-linux/newer index 72e30fb078c..da7065662ab 100755 Binary files a/Master/bin/i386-linux/newer and b/Master/bin/i386-linux/newer differ diff --git a/Master/bin/i386-linux/odvicopy b/Master/bin/i386-linux/odvicopy index cf18b5838ee..2bd48dbf1c3 100755 Binary files a/Master/bin/i386-linux/odvicopy and b/Master/bin/i386-linux/odvicopy differ diff --git a/Master/bin/i386-linux/odvitype b/Master/bin/i386-linux/odvitype index 19536a3bb0a..17cf4bdc5c5 100755 Binary files a/Master/bin/i386-linux/odvitype and b/Master/bin/i386-linux/odvitype differ diff --git a/Master/bin/i386-linux/omega b/Master/bin/i386-linux/omega index 0a2442c3ad0..bf95807cb5d 100755 Binary files a/Master/bin/i386-linux/omega and b/Master/bin/i386-linux/omega differ diff --git a/Master/bin/i386-linux/omfonts b/Master/bin/i386-linux/omfonts index 6329fa66278..57428ae1a26 100755 Binary files a/Master/bin/i386-linux/omfonts and b/Master/bin/i386-linux/omfonts differ diff --git a/Master/bin/i386-linux/otangle b/Master/bin/i386-linux/otangle index 204d231138e..c9dfbd4bd94 100755 Binary files a/Master/bin/i386-linux/otangle and b/Master/bin/i386-linux/otangle differ diff --git a/Master/bin/i386-linux/otfinfo b/Master/bin/i386-linux/otfinfo index af015d2582b..c4a0cec525e 100755 Binary files a/Master/bin/i386-linux/otfinfo and b/Master/bin/i386-linux/otfinfo differ diff --git a/Master/bin/i386-linux/otftotfm b/Master/bin/i386-linux/otftotfm index b0a61d1999d..caceca71b5c 100755 Binary files a/Master/bin/i386-linux/otftotfm and b/Master/bin/i386-linux/otftotfm differ diff --git a/Master/bin/i386-linux/otp2ocp b/Master/bin/i386-linux/otp2ocp index 33f52cadd64..7cd5926fa98 100755 Binary files a/Master/bin/i386-linux/otp2ocp and b/Master/bin/i386-linux/otp2ocp differ diff --git a/Master/bin/i386-linux/outocp b/Master/bin/i386-linux/outocp index 3818e3f0708..3a16db5868e 100755 Binary files a/Master/bin/i386-linux/outocp and b/Master/bin/i386-linux/outocp differ diff --git a/Master/bin/i386-linux/patgen b/Master/bin/i386-linux/patgen index 1e6fa3bb7e1..65bef0d22fd 100755 Binary files a/Master/bin/i386-linux/patgen and b/Master/bin/i386-linux/patgen differ diff --git a/Master/bin/i386-linux/pdfclose b/Master/bin/i386-linux/pdfclose index 201db7d0cb4..f62a351e19b 100755 Binary files a/Master/bin/i386-linux/pdfclose and b/Master/bin/i386-linux/pdfclose differ diff --git a/Master/bin/i386-linux/pdfopen b/Master/bin/i386-linux/pdfopen index b32e8baeebd..b64f56cf45c 100755 Binary files a/Master/bin/i386-linux/pdfopen and b/Master/bin/i386-linux/pdfopen differ diff --git a/Master/bin/i386-linux/pdftex b/Master/bin/i386-linux/pdftex index 62b4ba979c4..94bc2a60cf8 100755 Binary files a/Master/bin/i386-linux/pdftex and b/Master/bin/i386-linux/pdftex differ diff --git a/Master/bin/i386-linux/pfb2pfa b/Master/bin/i386-linux/pfb2pfa index 24e32e8b0ad..00d15b9655b 100755 Binary files a/Master/bin/i386-linux/pfb2pfa and b/Master/bin/i386-linux/pfb2pfa differ diff --git a/Master/bin/i386-linux/pk2bm b/Master/bin/i386-linux/pk2bm index 86d92afdf26..173a896eb8a 100755 Binary files a/Master/bin/i386-linux/pk2bm and b/Master/bin/i386-linux/pk2bm differ diff --git a/Master/bin/i386-linux/pktogf b/Master/bin/i386-linux/pktogf index cbabb83b072..2df1a010cee 100755 Binary files a/Master/bin/i386-linux/pktogf and b/Master/bin/i386-linux/pktogf differ diff --git a/Master/bin/i386-linux/pktype b/Master/bin/i386-linux/pktype index 11750881d7d..b9de2f60cf6 100755 Binary files a/Master/bin/i386-linux/pktype and b/Master/bin/i386-linux/pktype differ diff --git a/Master/bin/i386-linux/pltotf b/Master/bin/i386-linux/pltotf index cbaa35f3107..1b1e58d77f8 100755 Binary files a/Master/bin/i386-linux/pltotf and b/Master/bin/i386-linux/pltotf differ diff --git a/Master/bin/i386-linux/pooltype b/Master/bin/i386-linux/pooltype index 660a06e74e9..b0fa2a13c9b 100755 Binary files a/Master/bin/i386-linux/pooltype and b/Master/bin/i386-linux/pooltype differ diff --git a/Master/bin/i386-linux/ps2eps b/Master/bin/i386-linux/ps2eps new file mode 100755 index 00000000000..aeb0e9a8e43 --- /dev/null +++ b/Master/bin/i386-linux/ps2eps @@ -0,0 +1,929 @@ +#!/usr/bin/env perl +# 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.61 2006/12/28 16:34:06 bless Exp $ +# ------------------------------------------------------- +# (C)opyright 1999-2006 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 (! -d "/usr/bin") +{ # we assume that we are running under native windows + $ghostscriptname = "gswin32c"; + $NULLDEV = "nul"; +} +else +{ # Unix or cygwin + $ghostscriptname = "gs"; + $NULLDEV = "/dev/null 2>&1"; +} + +$bboxver=`bbox >$NULLDEV -V`; +$bboxname= ($?== -1) ? "" : "bbox"; +$version= '$Id: ps2eps,v 1.61 2006/12/28 16:34:06 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-2006 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 ] [-R +|-|^] [-t ] [-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= 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= rotate resulting EPS. : +=+90 (clockw.),-=-90 (counter-clockw.) ^=180 degrees\n", + " -t, --translate specify x,y offset (may be negative) in postscript points (1/72 dpi)\n", + " -r, --resolution specify dpi resolution to render with ghostscript (default 144)", + " -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 +$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|resolution=s' => \$opt_r, + '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); + +if ($opt_r ne '') +{ + $resolution=$opt_r; +} + +# 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 + { + if (!$quiet) { + 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/m) + { + 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 ($cBBllx < 0 || $cBBlly < 0) + { + if (!$quiet) + { + 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-linux/ps2pk b/Master/bin/i386-linux/ps2pk index 7b72590e4ec..fdc3f5e9dae 100755 Binary files a/Master/bin/i386-linux/ps2pk and b/Master/bin/i386-linux/ps2pk differ diff --git a/Master/bin/i386-linux/psbook b/Master/bin/i386-linux/psbook index 2ff7192fb26..2af2a521333 100755 Binary files a/Master/bin/i386-linux/psbook and b/Master/bin/i386-linux/psbook differ diff --git a/Master/bin/i386-linux/psnup b/Master/bin/i386-linux/psnup index 9402eb77a91..06dba777819 100755 Binary files a/Master/bin/i386-linux/psnup and b/Master/bin/i386-linux/psnup differ diff --git a/Master/bin/i386-linux/psresize b/Master/bin/i386-linux/psresize index c7ddacef026..e6dd6f8bf32 100755 Binary files a/Master/bin/i386-linux/psresize and b/Master/bin/i386-linux/psresize differ diff --git a/Master/bin/i386-linux/psselect b/Master/bin/i386-linux/psselect index 0b3022790f6..9915eafb701 100755 Binary files a/Master/bin/i386-linux/psselect and b/Master/bin/i386-linux/psselect differ diff --git a/Master/bin/i386-linux/pstops b/Master/bin/i386-linux/pstops index 477ef26007e..03131eeae44 100755 Binary files a/Master/bin/i386-linux/pstops and b/Master/bin/i386-linux/pstops differ diff --git a/Master/bin/i386-linux/sjisconv b/Master/bin/i386-linux/sjisconv index 5c6cd41e856..2547889c666 100755 Binary files a/Master/bin/i386-linux/sjisconv and b/Master/bin/i386-linux/sjisconv differ diff --git a/Master/bin/i386-linux/t1ascii b/Master/bin/i386-linux/t1ascii index 5a880a4e037..997ce172c42 100755 Binary files a/Master/bin/i386-linux/t1ascii and b/Master/bin/i386-linux/t1ascii differ diff --git a/Master/bin/i386-linux/t1asm b/Master/bin/i386-linux/t1asm index eedf079b612..857b6be36a5 100755 Binary files a/Master/bin/i386-linux/t1asm and b/Master/bin/i386-linux/t1asm differ diff --git a/Master/bin/i386-linux/t1binary b/Master/bin/i386-linux/t1binary index 89c1b6ee83f..45a4e3e7aa3 100755 Binary files a/Master/bin/i386-linux/t1binary and b/Master/bin/i386-linux/t1binary differ diff --git a/Master/bin/i386-linux/t1disasm b/Master/bin/i386-linux/t1disasm index 1f16cb7ed18..2756629bb8c 100755 Binary files a/Master/bin/i386-linux/t1disasm and b/Master/bin/i386-linux/t1disasm differ diff --git a/Master/bin/i386-linux/t1dotlessj b/Master/bin/i386-linux/t1dotlessj index b0c54de6447..aae1ec83c1c 100755 Binary files a/Master/bin/i386-linux/t1dotlessj and b/Master/bin/i386-linux/t1dotlessj differ diff --git a/Master/bin/i386-linux/t1lint b/Master/bin/i386-linux/t1lint index cf802c4656b..89016ac0f6c 100755 Binary files a/Master/bin/i386-linux/t1lint and b/Master/bin/i386-linux/t1lint differ diff --git a/Master/bin/i386-linux/t1mac b/Master/bin/i386-linux/t1mac index 01000702ce0..1e84fa77447 100755 Binary files a/Master/bin/i386-linux/t1mac and b/Master/bin/i386-linux/t1mac differ diff --git a/Master/bin/i386-linux/t1reencode b/Master/bin/i386-linux/t1reencode index 29d43f30b51..7394b1dfd50 100755 Binary files a/Master/bin/i386-linux/t1reencode and b/Master/bin/i386-linux/t1reencode differ diff --git a/Master/bin/i386-linux/t1testpage b/Master/bin/i386-linux/t1testpage index 15ef2e10a62..394bfa68e13 100755 Binary files a/Master/bin/i386-linux/t1testpage and b/Master/bin/i386-linux/t1testpage differ diff --git a/Master/bin/i386-linux/t1unmac b/Master/bin/i386-linux/t1unmac index 9d4e22e79d2..056833e3d48 100755 Binary files a/Master/bin/i386-linux/t1unmac and b/Master/bin/i386-linux/t1unmac differ diff --git a/Master/bin/i386-linux/t4ht b/Master/bin/i386-linux/t4ht index c3bcdd2eb6b..106ad502ff5 100755 Binary files a/Master/bin/i386-linux/t4ht and b/Master/bin/i386-linux/t4ht differ diff --git a/Master/bin/i386-linux/tangle b/Master/bin/i386-linux/tangle index 255f252bb9b..dd20680937d 100755 Binary files a/Master/bin/i386-linux/tangle and b/Master/bin/i386-linux/tangle differ diff --git a/Master/bin/i386-linux/tcdialog b/Master/bin/i386-linux/tcdialog index 78bdad33884..81c272f44f4 100755 Binary files a/Master/bin/i386-linux/tcdialog and b/Master/bin/i386-linux/tcdialog differ diff --git a/Master/bin/i386-linux/tex b/Master/bin/i386-linux/tex index 2fb12ef2652..fc01473b9b3 100755 Binary files a/Master/bin/i386-linux/tex and b/Master/bin/i386-linux/tex differ diff --git a/Master/bin/i386-linux/tex4ht b/Master/bin/i386-linux/tex4ht index 8788593c2ee..ffb479d73f6 100755 Binary files a/Master/bin/i386-linux/tex4ht and b/Master/bin/i386-linux/tex4ht differ diff --git a/Master/bin/i386-linux/texconfig b/Master/bin/i386-linux/texconfig index 0dc3f753f0b..f5a85098e0d 100755 --- a/Master/bin/i386-linux/texconfig +++ b/Master/bin/i386-linux/texconfig @@ -24,7 +24,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=texconfig # the version string -version=1167506445 # seconds since `00:00:00 1970-01-01 UTC' +version=1168206389 # seconds since `00:00:00 1970-01-01 UTC' # date '+%s' (with GNU date) envVars=" @@ -593,7 +593,7 @@ tcBatch() $progname font rw $progname formats $progname hyphen FORMAT - $progname init [format] + $progname init [formats] $progname mode MODE $progname paper PAPER $progname pdftex [options] @@ -1149,7 +1149,10 @@ $formatsForHyphenFmt" updmap || rc=1 ;; *) - fmtutil --byfmt "$2" || rc=1 + shift 1 + for i in "$@"; do + fmtutil --byfmt "$i" || rc=1 + done ;; esac ;; diff --git a/Master/bin/i386-linux/texi2html b/Master/bin/i386-linux/texi2html index 870a68a4157..fece745987f 100755 --- a/Master/bin/i386-linux/texi2html +++ b/Master/bin/i386-linux/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 = '/home/texlive/karl/Build/source/inst'; +my $prefix = '/home/fmorel/Build/source/inst'; my $sysconfdir; my $pkgdatadir; my $datadir; @@ -92,10 +92,10 @@ else $sysconfdir = "/usr/local/etc"; } -if ('/home/texlive/karl/Build/source/inst' ne '@' . 'datadir@') +if ('/home/fmorel/Build/source/inst' ne '@' . 'datadir@') { - $pkgdatadir = eval '"/home/texlive/karl/Build/source/inst/texi2html"'; - $datadir = eval '"/home/texlive/karl/Build/source/inst"'; + $pkgdatadir = eval '"/home/fmorel/Build/source/inst/texi2html"'; + $datadir = eval '"/home/fmorel/Build/source/inst"'; } else { diff --git a/Master/bin/i386-linux/texindex b/Master/bin/i386-linux/texindex index d48c1e0593d..06fdbedb7ca 100755 Binary files a/Master/bin/i386-linux/texindex and b/Master/bin/i386-linux/texindex differ diff --git a/Master/bin/i386-linux/tftopl b/Master/bin/i386-linux/tftopl index eadd5b6188b..e2ac54060ca 100755 Binary files a/Master/bin/i386-linux/tftopl and b/Master/bin/i386-linux/tftopl differ diff --git a/Master/bin/i386-linux/tie b/Master/bin/i386-linux/tie index 0b494ab4c3e..669db278e6a 100755 Binary files a/Master/bin/i386-linux/tie and b/Master/bin/i386-linux/tie differ diff --git a/Master/bin/i386-linux/ttf2afm b/Master/bin/i386-linux/ttf2afm index d47a784b2fb..550baf96232 100755 Binary files a/Master/bin/i386-linux/ttf2afm and b/Master/bin/i386-linux/ttf2afm differ diff --git a/Master/bin/i386-linux/ttf2pk b/Master/bin/i386-linux/ttf2pk index 0899a34de43..12b14c1b455 100755 Binary files a/Master/bin/i386-linux/ttf2pk and b/Master/bin/i386-linux/ttf2pk differ diff --git a/Master/bin/i386-linux/ttf2tfm b/Master/bin/i386-linux/ttf2tfm index c4227a3cce3..15c4bd37838 100755 Binary files a/Master/bin/i386-linux/ttf2tfm and b/Master/bin/i386-linux/ttf2tfm differ diff --git a/Master/bin/i386-linux/ttftotype42 b/Master/bin/i386-linux/ttftotype42 index ca5101c7045..fa9f905dde2 100755 Binary files a/Master/bin/i386-linux/ttftotype42 and b/Master/bin/i386-linux/ttftotype42 differ diff --git a/Master/bin/i386-linux/vftovp b/Master/bin/i386-linux/vftovp index cd4d382c651..ec6b365dc7c 100755 Binary files a/Master/bin/i386-linux/vftovp and b/Master/bin/i386-linux/vftovp differ diff --git a/Master/bin/i386-linux/vptovf b/Master/bin/i386-linux/vptovf index 1ae9f38c8c6..c451bdd43f1 100755 Binary files a/Master/bin/i386-linux/vptovf and b/Master/bin/i386-linux/vptovf differ diff --git a/Master/bin/i386-linux/weave b/Master/bin/i386-linux/weave index d41d76e378f..7bdf9eaab97 100755 Binary files a/Master/bin/i386-linux/weave and b/Master/bin/i386-linux/weave differ diff --git a/Master/bin/i386-linux/xdvi-xaw.bin b/Master/bin/i386-linux/xdvi-xaw.bin index 55efb28a94b..baa9da14620 100755 Binary files a/Master/bin/i386-linux/xdvi-xaw.bin and b/Master/bin/i386-linux/xdvi-xaw.bin differ diff --git a/Master/bin/i386-linux/xdvipdfmx b/Master/bin/i386-linux/xdvipdfmx index ac737d47b18..06c8b577154 100755 Binary files a/Master/bin/i386-linux/xdvipdfmx and b/Master/bin/i386-linux/xdvipdfmx differ diff --git a/Master/bin/i386-linux/xetex b/Master/bin/i386-linux/xetex index 7467fcf1727..6e3fcc9dda0 100755 Binary files a/Master/bin/i386-linux/xetex and b/Master/bin/i386-linux/xetex differ -- cgit v1.2.3