From 4addff8ae8e11878d4556580b545393b80c15222 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 11 Jan 2007 22:08:41 +0000 Subject: i386-solaris from apostolos git-svn-id: svn://tug.org/texlive/trunk@3345 c570f23f-e606-0410-a88d-b1316a301751 --- Master/bin/i386-solaris/afm2pl | Bin 76428 -> 76652 bytes Master/bin/i386-solaris/afm2tfm | Bin 82936 -> 83128 bytes Master/bin/i386-solaris/aleph | Bin 477476 -> 477668 bytes Master/bin/i386-solaris/bbox | Bin 0 -> 7924 bytes Master/bin/i386-solaris/bg5conv | Bin 4216 -> 4204 bytes Master/bin/i386-solaris/bibtex | Bin 146012 -> 146236 bytes Master/bin/i386-solaris/bibtex8 | Bin 173280 -> 173504 bytes Master/bin/i386-solaris/cef5conv | Bin 5168 -> 5156 bytes Master/bin/i386-solaris/cefconv | Bin 5068 -> 5056 bytes Master/bin/i386-solaris/cefsconv | Bin 5168 -> 5156 bytes Master/bin/i386-solaris/cfftot1 | Bin 399384 -> 399352 bytes Master/bin/i386-solaris/ctangle | Bin 85820 -> 86044 bytes Master/bin/i386-solaris/ctie | Bin 63356 -> 63580 bytes Master/bin/i386-solaris/cweave | Bin 120476 -> 120700 bytes Master/bin/i386-solaris/detex | Bin 75480 -> 75696 bytes Master/bin/i386-solaris/devnag | Bin 27196 -> 27196 bytes Master/bin/i386-solaris/disdvi | Bin 11096 -> 11084 bytes Master/bin/i386-solaris/dmp | Bin 73588 -> 73804 bytes Master/bin/i386-solaris/dt2dv | Bin 31316 -> 31316 bytes Master/bin/i386-solaris/dv2dt | Bin 10788 -> 10788 bytes Master/bin/i386-solaris/dvi2tty | Bin 20708 -> 20696 bytes Master/bin/i386-solaris/dvibook | Bin 33616 -> 33616 bytes Master/bin/i386-solaris/dviconcat | Bin 30220 -> 30220 bytes Master/bin/i386-solaris/dvicopy | Bin 111316 -> 111508 bytes Master/bin/i386-solaris/dvidvi | Bin 18308 -> 18308 bytes Master/bin/i386-solaris/dvilj | Bin 93308 -> 93532 bytes Master/bin/i386-solaris/dvilj2p | Bin 93692 -> 93916 bytes Master/bin/i386-solaris/dvilj4 | Bin 99152 -> 99344 bytes Master/bin/i386-solaris/dvilj4l | Bin 99152 -> 99376 bytes Master/bin/i386-solaris/dvipdfm | Bin 374924 -> 375116 bytes Master/bin/i386-solaris/dvipdfmx | Bin 700740 -> 700932 bytes Master/bin/i386-solaris/dvipng | Bin 836888 -> 837048 bytes Master/bin/i386-solaris/dvipos | Bin 0 -> 90024 bytes Master/bin/i386-solaris/dvips | Bin 222508 -> 222732 bytes Master/bin/i386-solaris/dviselect | Bin 32524 -> 32524 bytes Master/bin/i386-solaris/dvitodvi | Bin 36976 -> 36944 bytes Master/bin/i386-solaris/dvitomp | Bin 88444 -> 88660 bytes Master/bin/i386-solaris/dvitype | Bin 90728 -> 90952 bytes Master/bin/i386-solaris/ebb | Bin 210884 -> 211076 bytes Master/bin/i386-solaris/epsffit | Bin 8764 -> 8752 bytes Master/bin/i386-solaris/extconv | Bin 4216 -> 4204 bytes Master/bin/i386-solaris/fmtutil | 70 ++- Master/bin/i386-solaris/gftodvi | Bin 96780 -> 97004 bytes Master/bin/i386-solaris/gftopk | Bin 78452 -> 78676 bytes Master/bin/i386-solaris/gftype | Bin 78052 -> 78244 bytes Master/bin/i386-solaris/gsftopk | Bin 73836 -> 74060 bytes Master/bin/i386-solaris/hbf2gf | Bin 83732 -> 83948 bytes Master/bin/i386-solaris/htcontext | 6 +- Master/bin/i386-solaris/htlatex | 4 +- Master/bin/i386-solaris/htmex | 4 +- Master/bin/i386-solaris/httex | 4 +- Master/bin/i386-solaris/httexi | 4 +- Master/bin/i386-solaris/info | Bin 141948 -> 141948 bytes Master/bin/i386-solaris/infokey | Bin 20644 -> 20644 bytes Master/bin/i386-solaris/install-info | Bin 23496 -> 23496 bytes Master/bin/i386-solaris/kpseaccess | Bin 5032 -> 5016 bytes Master/bin/i386-solaris/kpsereadlink | Bin 4952 -> 4940 bytes Master/bin/i386-solaris/kpsestat | Bin 5544 -> 5532 bytes Master/bin/i386-solaris/kpsewhich | Bin 66628 -> 66852 bytes Master/bin/i386-solaris/lacheck | Bin 52852 -> 52820 bytes Master/bin/i386-solaris/mag | Bin 5560 -> 5552 bytes Master/bin/i386-solaris/makeindex | Bin 125252 -> 125476 bytes Master/bin/i386-solaris/makeinfo | Bin 202908 -> 202876 bytes Master/bin/i386-solaris/makempx | Bin 63168 -> 63384 bytes Master/bin/i386-solaris/mf | Bin 279860 -> 280084 bytes Master/bin/i386-solaris/mf-nowin | Bin 276076 -> 276300 bytes Master/bin/i386-solaris/mft | Bin 100620 -> 100844 bytes Master/bin/i386-solaris/mk4ht | 10 +- Master/bin/i386-solaris/mmafm | Bin 246188 -> 246188 bytes Master/bin/i386-solaris/mmpfb | Bin 326600 -> 326568 bytes Master/bin/i386-solaris/mpost | Bin 372408 -> 372632 bytes Master/bin/i386-solaris/mpto | Bin 9344 -> 9332 bytes Master/bin/i386-solaris/musixflx | Bin 16396 -> 16380 bytes Master/bin/i386-solaris/newer | Bin 5924 -> 5912 bytes Master/bin/i386-solaris/odvicopy | Bin 116692 -> 116916 bytes Master/bin/i386-solaris/odvitype | Bin 91976 -> 92168 bytes Master/bin/i386-solaris/omega | Bin 487220 -> 487412 bytes Master/bin/i386-solaris/omfonts | Bin 164340 -> 164564 bytes Master/bin/i386-solaris/otangle | Bin 51532 -> 51500 bytes Master/bin/i386-solaris/otfinfo | Bin 470288 -> 470288 bytes Master/bin/i386-solaris/otftotfm | Bin 838504 -> 838728 bytes Master/bin/i386-solaris/otp2ocp | Bin 75632 -> 75848 bytes Master/bin/i386-solaris/outocp | Bin 57372 -> 57564 bytes Master/bin/i386-solaris/patgen | Bin 40696 -> 40684 bytes Master/bin/i386-solaris/pdfclose | Bin 7368 -> 7352 bytes Master/bin/i386-solaris/pdfopen | Bin 8060 -> 8048 bytes Master/bin/i386-solaris/pdftex | Bin 1441000 -> 1440816 bytes Master/bin/i386-solaris/pdftosrc | Bin 0 -> 571212 bytes Master/bin/i386-solaris/pfb2pfa | Bin 7808 -> 7792 bytes Master/bin/i386-solaris/pk2bm | Bin 10020 -> 9988 bytes Master/bin/i386-solaris/pktogf | Bin 75944 -> 76136 bytes Master/bin/i386-solaris/pktype | Bin 69120 -> 69336 bytes Master/bin/i386-solaris/pltotf | Bin 58428 -> 58428 bytes Master/bin/i386-solaris/pooltype | Bin 22764 -> 22752 bytes Master/bin/i386-solaris/ps2eps | 929 ++++++++++++++++++++++++++++++++ Master/bin/i386-solaris/ps2pk | Bin 164468 -> 164660 bytes Master/bin/i386-solaris/psbook | Bin 11864 -> 11864 bytes Master/bin/i386-solaris/psnup | Bin 19084 -> 19084 bytes Master/bin/i386-solaris/psresize | Bin 17420 -> 17420 bytes Master/bin/i386-solaris/psselect | Bin 12760 -> 12760 bytes Master/bin/i386-solaris/pstops | Bin 17876 -> 17844 bytes Master/bin/i386-solaris/sjisconv | Bin 4228 -> 4216 bytes Master/bin/i386-solaris/t1ascii | Bin 23592 -> 23592 bytes Master/bin/i386-solaris/t1asm | Bin 28012 -> 28012 bytes Master/bin/i386-solaris/t1binary | Bin 23044 -> 23044 bytes Master/bin/i386-solaris/t1disasm | Bin 27120 -> 27088 bytes Master/bin/i386-solaris/t1dotlessj | Bin 315800 -> 315800 bytes Master/bin/i386-solaris/t1lint | Bin 260732 -> 260700 bytes Master/bin/i386-solaris/t1mac | Bin 32128 -> 32128 bytes Master/bin/i386-solaris/t1reencode | Bin 297944 -> 297912 bytes Master/bin/i386-solaris/t1testpage | Bin 290464 -> 290464 bytes Master/bin/i386-solaris/t1unmac | Bin 29528 -> 29528 bytes Master/bin/i386-solaris/t4ht | Bin 74480 -> 75176 bytes Master/bin/i386-solaris/tangle | Bin 96360 -> 96552 bytes Master/bin/i386-solaris/tcdialog | Bin 132372 -> 132372 bytes Master/bin/i386-solaris/tex | Bin 307844 -> 308068 bytes Master/bin/i386-solaris/tex4ht | Bin 132944 -> 133168 bytes Master/bin/i386-solaris/texconfig | 15 +- Master/bin/i386-solaris/texindex | Bin 17368 -> 17368 bytes Master/bin/i386-solaris/tftopl | Bin 86504 -> 86728 bytes Master/bin/i386-solaris/tie | Bin 9892 -> 9880 bytes Master/bin/i386-solaris/ttf2afm | Bin 81488 -> 81616 bytes Master/bin/i386-solaris/ttf2pk | Bin 218756 -> 218916 bytes Master/bin/i386-solaris/ttf2tfm | Bin 235444 -> 235668 bytes Master/bin/i386-solaris/ttftotype42 | Bin 332272 -> 332240 bytes Master/bin/i386-solaris/vftovp | Bin 100920 -> 101144 bytes Master/bin/i386-solaris/vptovf | Bin 71776 -> 71776 bytes Master/bin/i386-solaris/weave | Bin 113796 -> 114020 bytes Master/bin/i386-solaris/xdvi-xaw.bin | Bin 765820 -> 766012 bytes Master/bin/i386-solaris/xdvipdfmx | Bin 1159928 -> 1160120 bytes Master/bin/i386-solaris/xetex | Bin 8294936 -> 8126244 bytes Master/support/i386-solaris-libs.pkg.gz | Bin 892195 -> 893146 bytes 132 files changed, 990 insertions(+), 56 deletions(-) create mode 100755 Master/bin/i386-solaris/bbox create mode 100755 Master/bin/i386-solaris/dvipos create mode 100755 Master/bin/i386-solaris/pdftosrc create mode 100755 Master/bin/i386-solaris/ps2eps (limited to 'Master') diff --git a/Master/bin/i386-solaris/afm2pl b/Master/bin/i386-solaris/afm2pl index 39d6c1be455..32858f5503e 100755 Binary files a/Master/bin/i386-solaris/afm2pl and b/Master/bin/i386-solaris/afm2pl differ diff --git a/Master/bin/i386-solaris/afm2tfm b/Master/bin/i386-solaris/afm2tfm index 68841114607..01b01b9bcac 100755 Binary files a/Master/bin/i386-solaris/afm2tfm and b/Master/bin/i386-solaris/afm2tfm differ diff --git a/Master/bin/i386-solaris/aleph b/Master/bin/i386-solaris/aleph index fb05c2d58af..fb1dfb9b488 100755 Binary files a/Master/bin/i386-solaris/aleph and b/Master/bin/i386-solaris/aleph differ diff --git a/Master/bin/i386-solaris/bbox b/Master/bin/i386-solaris/bbox new file mode 100755 index 00000000000..af194271ec0 Binary files /dev/null and b/Master/bin/i386-solaris/bbox differ diff --git a/Master/bin/i386-solaris/bg5conv b/Master/bin/i386-solaris/bg5conv index b746a3191e3..7e118e5ee4d 100755 Binary files a/Master/bin/i386-solaris/bg5conv and b/Master/bin/i386-solaris/bg5conv differ diff --git a/Master/bin/i386-solaris/bibtex b/Master/bin/i386-solaris/bibtex index 49cc284be8b..0d5df2df37b 100755 Binary files a/Master/bin/i386-solaris/bibtex and b/Master/bin/i386-solaris/bibtex differ diff --git a/Master/bin/i386-solaris/bibtex8 b/Master/bin/i386-solaris/bibtex8 index 321adf8aab2..216f6614ae8 100755 Binary files a/Master/bin/i386-solaris/bibtex8 and b/Master/bin/i386-solaris/bibtex8 differ diff --git a/Master/bin/i386-solaris/cef5conv b/Master/bin/i386-solaris/cef5conv index 1783148f58d..6e18387bd56 100755 Binary files a/Master/bin/i386-solaris/cef5conv and b/Master/bin/i386-solaris/cef5conv differ diff --git a/Master/bin/i386-solaris/cefconv b/Master/bin/i386-solaris/cefconv index cd4b790c58e..7554fe7ae9b 100755 Binary files a/Master/bin/i386-solaris/cefconv and b/Master/bin/i386-solaris/cefconv differ diff --git a/Master/bin/i386-solaris/cefsconv b/Master/bin/i386-solaris/cefsconv index c67ac611bbf..06e11dcd9c6 100755 Binary files a/Master/bin/i386-solaris/cefsconv and b/Master/bin/i386-solaris/cefsconv differ diff --git a/Master/bin/i386-solaris/cfftot1 b/Master/bin/i386-solaris/cfftot1 index aea6f156b53..e52f738758b 100755 Binary files a/Master/bin/i386-solaris/cfftot1 and b/Master/bin/i386-solaris/cfftot1 differ diff --git a/Master/bin/i386-solaris/ctangle b/Master/bin/i386-solaris/ctangle index d63615d258d..825e16e22e6 100755 Binary files a/Master/bin/i386-solaris/ctangle and b/Master/bin/i386-solaris/ctangle differ diff --git a/Master/bin/i386-solaris/ctie b/Master/bin/i386-solaris/ctie index 32b9465769f..fee669df188 100755 Binary files a/Master/bin/i386-solaris/ctie and b/Master/bin/i386-solaris/ctie differ diff --git a/Master/bin/i386-solaris/cweave b/Master/bin/i386-solaris/cweave index bce3f81ef7a..00cd70cf3a3 100755 Binary files a/Master/bin/i386-solaris/cweave and b/Master/bin/i386-solaris/cweave differ diff --git a/Master/bin/i386-solaris/detex b/Master/bin/i386-solaris/detex index 76949f79ddf..bc8da6d6b21 100755 Binary files a/Master/bin/i386-solaris/detex and b/Master/bin/i386-solaris/detex differ diff --git a/Master/bin/i386-solaris/devnag b/Master/bin/i386-solaris/devnag index 3a0ce92e1ce..5691c7ad12d 100755 Binary files a/Master/bin/i386-solaris/devnag and b/Master/bin/i386-solaris/devnag differ diff --git a/Master/bin/i386-solaris/disdvi b/Master/bin/i386-solaris/disdvi index a68ce779b06..b8c56013c98 100755 Binary files a/Master/bin/i386-solaris/disdvi and b/Master/bin/i386-solaris/disdvi differ diff --git a/Master/bin/i386-solaris/dmp b/Master/bin/i386-solaris/dmp index 641a9ec4f01..14cd26073b5 100755 Binary files a/Master/bin/i386-solaris/dmp and b/Master/bin/i386-solaris/dmp differ diff --git a/Master/bin/i386-solaris/dt2dv b/Master/bin/i386-solaris/dt2dv index 9a28def00e7..7988e8f0fdd 100755 Binary files a/Master/bin/i386-solaris/dt2dv and b/Master/bin/i386-solaris/dt2dv differ diff --git a/Master/bin/i386-solaris/dv2dt b/Master/bin/i386-solaris/dv2dt index 838e6ce7d71..5ac0d0ac063 100755 Binary files a/Master/bin/i386-solaris/dv2dt and b/Master/bin/i386-solaris/dv2dt differ diff --git a/Master/bin/i386-solaris/dvi2tty b/Master/bin/i386-solaris/dvi2tty index 1772c1dd7d6..71f63e4eba6 100755 Binary files a/Master/bin/i386-solaris/dvi2tty and b/Master/bin/i386-solaris/dvi2tty differ diff --git a/Master/bin/i386-solaris/dvibook b/Master/bin/i386-solaris/dvibook index 4e0e3c99a5a..eee13763c6e 100755 Binary files a/Master/bin/i386-solaris/dvibook and b/Master/bin/i386-solaris/dvibook differ diff --git a/Master/bin/i386-solaris/dviconcat b/Master/bin/i386-solaris/dviconcat index ea5c02c761d..c2c12496a54 100755 Binary files a/Master/bin/i386-solaris/dviconcat and b/Master/bin/i386-solaris/dviconcat differ diff --git a/Master/bin/i386-solaris/dvicopy b/Master/bin/i386-solaris/dvicopy index 1455812503d..93ea01282a5 100755 Binary files a/Master/bin/i386-solaris/dvicopy and b/Master/bin/i386-solaris/dvicopy differ diff --git a/Master/bin/i386-solaris/dvidvi b/Master/bin/i386-solaris/dvidvi index ccca472144e..104c80df080 100755 Binary files a/Master/bin/i386-solaris/dvidvi and b/Master/bin/i386-solaris/dvidvi differ diff --git a/Master/bin/i386-solaris/dvilj b/Master/bin/i386-solaris/dvilj index e0abab5608b..9d295964d9c 100755 Binary files a/Master/bin/i386-solaris/dvilj and b/Master/bin/i386-solaris/dvilj differ diff --git a/Master/bin/i386-solaris/dvilj2p b/Master/bin/i386-solaris/dvilj2p index d3ae32e8548..dcbf52bcd2d 100755 Binary files a/Master/bin/i386-solaris/dvilj2p and b/Master/bin/i386-solaris/dvilj2p differ diff --git a/Master/bin/i386-solaris/dvilj4 b/Master/bin/i386-solaris/dvilj4 index 48ecbf1a7ff..a53175059cb 100755 Binary files a/Master/bin/i386-solaris/dvilj4 and b/Master/bin/i386-solaris/dvilj4 differ diff --git a/Master/bin/i386-solaris/dvilj4l b/Master/bin/i386-solaris/dvilj4l index dab4a01d951..6817a860be4 100755 Binary files a/Master/bin/i386-solaris/dvilj4l and b/Master/bin/i386-solaris/dvilj4l differ diff --git a/Master/bin/i386-solaris/dvipdfm b/Master/bin/i386-solaris/dvipdfm index 8224f873172..8e08bb07fe9 100755 Binary files a/Master/bin/i386-solaris/dvipdfm and b/Master/bin/i386-solaris/dvipdfm differ diff --git a/Master/bin/i386-solaris/dvipdfmx b/Master/bin/i386-solaris/dvipdfmx index d134cddcc8a..95529988999 100755 Binary files a/Master/bin/i386-solaris/dvipdfmx and b/Master/bin/i386-solaris/dvipdfmx differ diff --git a/Master/bin/i386-solaris/dvipng b/Master/bin/i386-solaris/dvipng index af5ea6867a6..be0a449a7aa 100755 Binary files a/Master/bin/i386-solaris/dvipng and b/Master/bin/i386-solaris/dvipng differ diff --git a/Master/bin/i386-solaris/dvipos b/Master/bin/i386-solaris/dvipos new file mode 100755 index 00000000000..8f3128104ad Binary files /dev/null and b/Master/bin/i386-solaris/dvipos differ diff --git a/Master/bin/i386-solaris/dvips b/Master/bin/i386-solaris/dvips index 8915c387ab9..25a5f48707f 100755 Binary files a/Master/bin/i386-solaris/dvips and b/Master/bin/i386-solaris/dvips differ diff --git a/Master/bin/i386-solaris/dviselect b/Master/bin/i386-solaris/dviselect index d3f5fa7e3ae..31e35173c10 100755 Binary files a/Master/bin/i386-solaris/dviselect and b/Master/bin/i386-solaris/dviselect differ diff --git a/Master/bin/i386-solaris/dvitodvi b/Master/bin/i386-solaris/dvitodvi index 5bbd5826c3a..c86b9337b12 100755 Binary files a/Master/bin/i386-solaris/dvitodvi and b/Master/bin/i386-solaris/dvitodvi differ diff --git a/Master/bin/i386-solaris/dvitomp b/Master/bin/i386-solaris/dvitomp index 3ffca8bbc4a..a907a1b5160 100755 Binary files a/Master/bin/i386-solaris/dvitomp and b/Master/bin/i386-solaris/dvitomp differ diff --git a/Master/bin/i386-solaris/dvitype b/Master/bin/i386-solaris/dvitype index f7079749327..2ac3f7973f1 100755 Binary files a/Master/bin/i386-solaris/dvitype and b/Master/bin/i386-solaris/dvitype differ diff --git a/Master/bin/i386-solaris/ebb b/Master/bin/i386-solaris/ebb index 674f9870adc..6e336d768a2 100755 Binary files a/Master/bin/i386-solaris/ebb and b/Master/bin/i386-solaris/ebb differ diff --git a/Master/bin/i386-solaris/epsffit b/Master/bin/i386-solaris/epsffit index 51a33f78987..fbf695b341f 100755 Binary files a/Master/bin/i386-solaris/epsffit and b/Master/bin/i386-solaris/epsffit differ diff --git a/Master/bin/i386-solaris/extconv b/Master/bin/i386-solaris/extconv index 7437c215a77..a37afbd5592 100755 Binary files a/Master/bin/i386-solaris/extconv and b/Master/bin/i386-solaris/extconv differ diff --git a/Master/bin/i386-solaris/fmtutil b/Master/bin/i386-solaris/fmtutil index e061f4f20af..9342c679aaf 100755 --- a/Master/bin/i386-solaris/fmtutil +++ b/Master/bin/i386-solaris/fmtutil @@ -24,10 +24,12 @@ # Options: # --cnffile file set configfile for fmtutil # --fmtdir directory set destination directory for format files +# --no-engine-subdir don't use $engine subdirectory of the fmtdir ############################################################################### ############################################################################### # program history: +# 2007-01-04 patch by JK to support $engine subdir (enabled by default) # Fr Apr 8 19:15:05 CEST 2005 cleanup now has an argument for the return code # Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS # So Mär 27 18:52:06 CEST 2005 honor $TMPDIR, $TEMP and $TMP, not just $TMP @@ -198,6 +200,7 @@ Usage: fmtutil [option] ... cmd [argument] Valid options: --cnffile file --fmtdir directory + --no-engine-subdir don't use engine-specific subdir of the fmtdir --quiet (not implemented, just for compatibility) --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -383,6 +386,7 @@ main() ;; esac + use_engine_dir=true # whether to use web2c/$engine subdirs while case $1 in --cnffile) @@ -393,6 +397,8 @@ main() shift; destdir=$1;; --fmtdir=*) destdir=`echo "$1" | sed 's/--fmtdir=//'`; shift ;; + --no-engine-subdir) + use_engine_dir=false;; --all|-a) cmd=all;; --edit|-e) @@ -547,31 +553,11 @@ main() refresh) recreate_existing;; byfmt) - create_one_format "$arg";; + recreate_by_fmt "$arg";; byhyphen) recreate_by_hyphenfile "$arg";; esac - # install the log files and format files: - for i in *.log; do - test -f "$i" || continue - rm -f "$destdir/$i" - - # We don't want user-interaction for the following "mv" command: - mv "$i" "$destdir/$i" /dev/null 2>&1 && log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed." + rm -f "$fulldestdir/$format.log" + # We don't want user-interaction for the following "mv" commands: + mv "$format.log" "$fulldestdir/$format.log" /dev/null || { (exit 0); return 0; } ed $cnf_file >/dev/null 2>&1 <<-eof - /^$1[ ]/s/^/#! / + g/^$1[ ]/s/^/#! / w q eof @@ -877,7 +875,7 @@ enablefmt() { grep "^#![ ]*$1[ ]" $cnf_file >/dev/null || { (exit 0); return 0; } ed $cnf_file >/dev/null 2>&1 <<-eof - /^#![ ]*$1[ ]/s/..[ ]*// + g/^#![ ]*$1[ ]/s/..[ ]*// w q eof diff --git a/Master/bin/i386-solaris/gftodvi b/Master/bin/i386-solaris/gftodvi index 7869f6eaccc..9266d38c13b 100755 Binary files a/Master/bin/i386-solaris/gftodvi and b/Master/bin/i386-solaris/gftodvi differ diff --git a/Master/bin/i386-solaris/gftopk b/Master/bin/i386-solaris/gftopk index 4a80a84e64d..5fc7db81e97 100755 Binary files a/Master/bin/i386-solaris/gftopk and b/Master/bin/i386-solaris/gftopk differ diff --git a/Master/bin/i386-solaris/gftype b/Master/bin/i386-solaris/gftype index efb5e92fe76..00c1a4400e8 100755 Binary files a/Master/bin/i386-solaris/gftype and b/Master/bin/i386-solaris/gftype differ diff --git a/Master/bin/i386-solaris/gsftopk b/Master/bin/i386-solaris/gsftopk index f0556d02bda..79100d2678d 100755 Binary files a/Master/bin/i386-solaris/gsftopk and b/Master/bin/i386-solaris/gsftopk differ diff --git a/Master/bin/i386-solaris/hbf2gf b/Master/bin/i386-solaris/hbf2gf index 40340aa483f..3b684d3ddc7 100755 Binary files a/Master/bin/i386-solaris/hbf2gf and b/Master/bin/i386-solaris/hbf2gf differ diff --git a/Master/bin/i386-solaris/htcontext b/Master/bin/i386-solaris/htcontext index 9d6d4549574..9e01fa97f66 100755 --- a/Master/bin/i386-solaris/htcontext +++ b/Master/bin/i386-solaris/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-solaris/htlatex b/Master/bin/i386-solaris/htlatex index 1b8b7cea74a..ebab47dbaa6 100755 --- a/Master/bin/i386-solaris/htlatex +++ b/Master/bin/i386-solaris/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-solaris/htmex b/Master/bin/i386-solaris/htmex index b4aa3d9a06e..485a7594468 100755 --- a/Master/bin/i386-solaris/htmex +++ b/Master/bin/i386-solaris/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-solaris/httex b/Master/bin/i386-solaris/httex index 44920e72077..4c184897d13 100755 --- a/Master/bin/i386-solaris/httex +++ b/Master/bin/i386-solaris/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-solaris/httexi b/Master/bin/i386-solaris/httexi index 0ce3cb4a589..26427698991 100755 --- a/Master/bin/i386-solaris/httexi +++ b/Master/bin/i386-solaris/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-solaris/info b/Master/bin/i386-solaris/info index a758fe3179e..3306fce4519 100755 Binary files a/Master/bin/i386-solaris/info and b/Master/bin/i386-solaris/info differ diff --git a/Master/bin/i386-solaris/infokey b/Master/bin/i386-solaris/infokey index 8258506e0af..82e8b4e4f58 100755 Binary files a/Master/bin/i386-solaris/infokey and b/Master/bin/i386-solaris/infokey differ diff --git a/Master/bin/i386-solaris/install-info b/Master/bin/i386-solaris/install-info index 565887a5908..339ae9ecfcd 100755 Binary files a/Master/bin/i386-solaris/install-info and b/Master/bin/i386-solaris/install-info differ diff --git a/Master/bin/i386-solaris/kpseaccess b/Master/bin/i386-solaris/kpseaccess index b18c051f36f..a5b571855de 100755 Binary files a/Master/bin/i386-solaris/kpseaccess and b/Master/bin/i386-solaris/kpseaccess differ diff --git a/Master/bin/i386-solaris/kpsereadlink b/Master/bin/i386-solaris/kpsereadlink index ab5f58d0879..8499733a7fd 100755 Binary files a/Master/bin/i386-solaris/kpsereadlink and b/Master/bin/i386-solaris/kpsereadlink differ diff --git a/Master/bin/i386-solaris/kpsestat b/Master/bin/i386-solaris/kpsestat index a4b70d98621..d86c2fb497b 100755 Binary files a/Master/bin/i386-solaris/kpsestat and b/Master/bin/i386-solaris/kpsestat differ diff --git a/Master/bin/i386-solaris/kpsewhich b/Master/bin/i386-solaris/kpsewhich index 17745db8338..d1dfd73ff00 100755 Binary files a/Master/bin/i386-solaris/kpsewhich and b/Master/bin/i386-solaris/kpsewhich differ diff --git a/Master/bin/i386-solaris/lacheck b/Master/bin/i386-solaris/lacheck index a300becad95..53a362e406d 100755 Binary files a/Master/bin/i386-solaris/lacheck and b/Master/bin/i386-solaris/lacheck differ diff --git a/Master/bin/i386-solaris/mag b/Master/bin/i386-solaris/mag index b3a3c3a6c22..d969c729ece 100755 Binary files a/Master/bin/i386-solaris/mag and b/Master/bin/i386-solaris/mag differ diff --git a/Master/bin/i386-solaris/makeindex b/Master/bin/i386-solaris/makeindex index 34bba3eb734..be6967a0786 100755 Binary files a/Master/bin/i386-solaris/makeindex and b/Master/bin/i386-solaris/makeindex differ diff --git a/Master/bin/i386-solaris/makeinfo b/Master/bin/i386-solaris/makeinfo index 2a4d44f214f..0949a43c32d 100755 Binary files a/Master/bin/i386-solaris/makeinfo and b/Master/bin/i386-solaris/makeinfo differ diff --git a/Master/bin/i386-solaris/makempx b/Master/bin/i386-solaris/makempx index 5a534aac553..aeb452af3b0 100755 Binary files a/Master/bin/i386-solaris/makempx and b/Master/bin/i386-solaris/makempx differ diff --git a/Master/bin/i386-solaris/mf b/Master/bin/i386-solaris/mf index 38ffb8cefc5..77f22f71bee 100755 Binary files a/Master/bin/i386-solaris/mf and b/Master/bin/i386-solaris/mf differ diff --git a/Master/bin/i386-solaris/mf-nowin b/Master/bin/i386-solaris/mf-nowin index 1247f634316..6b7baa0e540 100755 Binary files a/Master/bin/i386-solaris/mf-nowin and b/Master/bin/i386-solaris/mf-nowin differ diff --git a/Master/bin/i386-solaris/mft b/Master/bin/i386-solaris/mft index 05f5a487594..7f3212d2d17 100755 Binary files a/Master/bin/i386-solaris/mft and b/Master/bin/i386-solaris/mft differ diff --git a/Master/bin/i386-solaris/mk4ht b/Master/bin/i386-solaris/mk4ht index 0f4b664506c..2bd1f7e2038 100755 --- a/Master/bin/i386-solaris/mk4ht +++ b/Master/bin/i386-solaris/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-solaris/mmafm b/Master/bin/i386-solaris/mmafm index ab49c53036b..5ab019de3b7 100755 Binary files a/Master/bin/i386-solaris/mmafm and b/Master/bin/i386-solaris/mmafm differ diff --git a/Master/bin/i386-solaris/mmpfb b/Master/bin/i386-solaris/mmpfb index 4e4f9727df9..9ee1bff147e 100755 Binary files a/Master/bin/i386-solaris/mmpfb and b/Master/bin/i386-solaris/mmpfb differ diff --git a/Master/bin/i386-solaris/mpost b/Master/bin/i386-solaris/mpost index ee514c864bc..4859023e11b 100755 Binary files a/Master/bin/i386-solaris/mpost and b/Master/bin/i386-solaris/mpost differ diff --git a/Master/bin/i386-solaris/mpto b/Master/bin/i386-solaris/mpto index 259ee77b182..2a87e3e9b34 100755 Binary files a/Master/bin/i386-solaris/mpto and b/Master/bin/i386-solaris/mpto differ diff --git a/Master/bin/i386-solaris/musixflx b/Master/bin/i386-solaris/musixflx index d058c523032..dc3daf6c756 100755 Binary files a/Master/bin/i386-solaris/musixflx and b/Master/bin/i386-solaris/musixflx differ diff --git a/Master/bin/i386-solaris/newer b/Master/bin/i386-solaris/newer index 82691459960..10989cc0505 100755 Binary files a/Master/bin/i386-solaris/newer and b/Master/bin/i386-solaris/newer differ diff --git a/Master/bin/i386-solaris/odvicopy b/Master/bin/i386-solaris/odvicopy index 6dddc2406ac..5c2b44a5508 100755 Binary files a/Master/bin/i386-solaris/odvicopy and b/Master/bin/i386-solaris/odvicopy differ diff --git a/Master/bin/i386-solaris/odvitype b/Master/bin/i386-solaris/odvitype index 996869e0256..42d52edc3b1 100755 Binary files a/Master/bin/i386-solaris/odvitype and b/Master/bin/i386-solaris/odvitype differ diff --git a/Master/bin/i386-solaris/omega b/Master/bin/i386-solaris/omega index 08903ef5558..bd08f5ffd2b 100755 Binary files a/Master/bin/i386-solaris/omega and b/Master/bin/i386-solaris/omega differ diff --git a/Master/bin/i386-solaris/omfonts b/Master/bin/i386-solaris/omfonts index 9d9558ae63f..e141c0e4eeb 100755 Binary files a/Master/bin/i386-solaris/omfonts and b/Master/bin/i386-solaris/omfonts differ diff --git a/Master/bin/i386-solaris/otangle b/Master/bin/i386-solaris/otangle index acaeda63191..ad6463a7f2d 100755 Binary files a/Master/bin/i386-solaris/otangle and b/Master/bin/i386-solaris/otangle differ diff --git a/Master/bin/i386-solaris/otfinfo b/Master/bin/i386-solaris/otfinfo index f82bcdb0107..083580475ee 100755 Binary files a/Master/bin/i386-solaris/otfinfo and b/Master/bin/i386-solaris/otfinfo differ diff --git a/Master/bin/i386-solaris/otftotfm b/Master/bin/i386-solaris/otftotfm index ac6b2f11522..40dce1c07ed 100755 Binary files a/Master/bin/i386-solaris/otftotfm and b/Master/bin/i386-solaris/otftotfm differ diff --git a/Master/bin/i386-solaris/otp2ocp b/Master/bin/i386-solaris/otp2ocp index 9f6dbaa9d8d..e49d5070d53 100755 Binary files a/Master/bin/i386-solaris/otp2ocp and b/Master/bin/i386-solaris/otp2ocp differ diff --git a/Master/bin/i386-solaris/outocp b/Master/bin/i386-solaris/outocp index e23e1d21196..9c410ae0855 100755 Binary files a/Master/bin/i386-solaris/outocp and b/Master/bin/i386-solaris/outocp differ diff --git a/Master/bin/i386-solaris/patgen b/Master/bin/i386-solaris/patgen index 45929d8d134..65246d2c72f 100755 Binary files a/Master/bin/i386-solaris/patgen and b/Master/bin/i386-solaris/patgen differ diff --git a/Master/bin/i386-solaris/pdfclose b/Master/bin/i386-solaris/pdfclose index 1ecb1332bc0..370f3d2d034 100755 Binary files a/Master/bin/i386-solaris/pdfclose and b/Master/bin/i386-solaris/pdfclose differ diff --git a/Master/bin/i386-solaris/pdfopen b/Master/bin/i386-solaris/pdfopen index 8a7f1ea4666..fce76edb911 100755 Binary files a/Master/bin/i386-solaris/pdfopen and b/Master/bin/i386-solaris/pdfopen differ diff --git a/Master/bin/i386-solaris/pdftex b/Master/bin/i386-solaris/pdftex index cac2ce2f3e8..4a48e84f3b7 100755 Binary files a/Master/bin/i386-solaris/pdftex and b/Master/bin/i386-solaris/pdftex differ diff --git a/Master/bin/i386-solaris/pdftosrc b/Master/bin/i386-solaris/pdftosrc new file mode 100755 index 00000000000..806834bfc3d Binary files /dev/null and b/Master/bin/i386-solaris/pdftosrc differ diff --git a/Master/bin/i386-solaris/pfb2pfa b/Master/bin/i386-solaris/pfb2pfa index fa3550e0720..b488222ddca 100755 Binary files a/Master/bin/i386-solaris/pfb2pfa and b/Master/bin/i386-solaris/pfb2pfa differ diff --git a/Master/bin/i386-solaris/pk2bm b/Master/bin/i386-solaris/pk2bm index 11a13f170ac..957798d0fa0 100755 Binary files a/Master/bin/i386-solaris/pk2bm and b/Master/bin/i386-solaris/pk2bm differ diff --git a/Master/bin/i386-solaris/pktogf b/Master/bin/i386-solaris/pktogf index cb6c7b82f05..213c2460cf4 100755 Binary files a/Master/bin/i386-solaris/pktogf and b/Master/bin/i386-solaris/pktogf differ diff --git a/Master/bin/i386-solaris/pktype b/Master/bin/i386-solaris/pktype index 81ee5cbc7ec..ca8a8e2c44f 100755 Binary files a/Master/bin/i386-solaris/pktype and b/Master/bin/i386-solaris/pktype differ diff --git a/Master/bin/i386-solaris/pltotf b/Master/bin/i386-solaris/pltotf index 13e4babc464..b3f8165f49d 100755 Binary files a/Master/bin/i386-solaris/pltotf and b/Master/bin/i386-solaris/pltotf differ diff --git a/Master/bin/i386-solaris/pooltype b/Master/bin/i386-solaris/pooltype index 7b72095a83b..65a9a7b23d4 100755 Binary files a/Master/bin/i386-solaris/pooltype and b/Master/bin/i386-solaris/pooltype differ diff --git a/Master/bin/i386-solaris/ps2eps b/Master/bin/i386-solaris/ps2eps new file mode 100755 index 00000000000..aeb0e9a8e43 --- /dev/null +++ b/Master/bin/i386-solaris/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-solaris/ps2pk b/Master/bin/i386-solaris/ps2pk index 62e94a580d8..04e67128ab4 100755 Binary files a/Master/bin/i386-solaris/ps2pk and b/Master/bin/i386-solaris/ps2pk differ diff --git a/Master/bin/i386-solaris/psbook b/Master/bin/i386-solaris/psbook index 63ee135f76e..fab75685c6b 100755 Binary files a/Master/bin/i386-solaris/psbook and b/Master/bin/i386-solaris/psbook differ diff --git a/Master/bin/i386-solaris/psnup b/Master/bin/i386-solaris/psnup index 8150054b276..2d4722a0d2e 100755 Binary files a/Master/bin/i386-solaris/psnup and b/Master/bin/i386-solaris/psnup differ diff --git a/Master/bin/i386-solaris/psresize b/Master/bin/i386-solaris/psresize index 7b3255a8a9a..580ef078643 100755 Binary files a/Master/bin/i386-solaris/psresize and b/Master/bin/i386-solaris/psresize differ diff --git a/Master/bin/i386-solaris/psselect b/Master/bin/i386-solaris/psselect index 9c0350ce9f1..d3fd96e247c 100755 Binary files a/Master/bin/i386-solaris/psselect and b/Master/bin/i386-solaris/psselect differ diff --git a/Master/bin/i386-solaris/pstops b/Master/bin/i386-solaris/pstops index 0eba7eb725c..f3097f00235 100755 Binary files a/Master/bin/i386-solaris/pstops and b/Master/bin/i386-solaris/pstops differ diff --git a/Master/bin/i386-solaris/sjisconv b/Master/bin/i386-solaris/sjisconv index 36bac29129a..95303a9a6b2 100755 Binary files a/Master/bin/i386-solaris/sjisconv and b/Master/bin/i386-solaris/sjisconv differ diff --git a/Master/bin/i386-solaris/t1ascii b/Master/bin/i386-solaris/t1ascii index 7ab92945ce7..6e1c1f38d20 100755 Binary files a/Master/bin/i386-solaris/t1ascii and b/Master/bin/i386-solaris/t1ascii differ diff --git a/Master/bin/i386-solaris/t1asm b/Master/bin/i386-solaris/t1asm index 71c50fb899e..d9893c78e7e 100755 Binary files a/Master/bin/i386-solaris/t1asm and b/Master/bin/i386-solaris/t1asm differ diff --git a/Master/bin/i386-solaris/t1binary b/Master/bin/i386-solaris/t1binary index 0162b2b691a..f20a6b129ea 100755 Binary files a/Master/bin/i386-solaris/t1binary and b/Master/bin/i386-solaris/t1binary differ diff --git a/Master/bin/i386-solaris/t1disasm b/Master/bin/i386-solaris/t1disasm index 8180698e66e..e5ba6b7efa0 100755 Binary files a/Master/bin/i386-solaris/t1disasm and b/Master/bin/i386-solaris/t1disasm differ diff --git a/Master/bin/i386-solaris/t1dotlessj b/Master/bin/i386-solaris/t1dotlessj index 967a022c2c8..ea342c6368d 100755 Binary files a/Master/bin/i386-solaris/t1dotlessj and b/Master/bin/i386-solaris/t1dotlessj differ diff --git a/Master/bin/i386-solaris/t1lint b/Master/bin/i386-solaris/t1lint index b31b622fa6e..0649b936b78 100755 Binary files a/Master/bin/i386-solaris/t1lint and b/Master/bin/i386-solaris/t1lint differ diff --git a/Master/bin/i386-solaris/t1mac b/Master/bin/i386-solaris/t1mac index ec774554b4f..605aaa1f845 100755 Binary files a/Master/bin/i386-solaris/t1mac and b/Master/bin/i386-solaris/t1mac differ diff --git a/Master/bin/i386-solaris/t1reencode b/Master/bin/i386-solaris/t1reencode index 383ec746b06..98c0dbaec0a 100755 Binary files a/Master/bin/i386-solaris/t1reencode and b/Master/bin/i386-solaris/t1reencode differ diff --git a/Master/bin/i386-solaris/t1testpage b/Master/bin/i386-solaris/t1testpage index 034ccf726bc..da7b5131697 100755 Binary files a/Master/bin/i386-solaris/t1testpage and b/Master/bin/i386-solaris/t1testpage differ diff --git a/Master/bin/i386-solaris/t1unmac b/Master/bin/i386-solaris/t1unmac index 5c023562f80..203ba13b32c 100755 Binary files a/Master/bin/i386-solaris/t1unmac and b/Master/bin/i386-solaris/t1unmac differ diff --git a/Master/bin/i386-solaris/t4ht b/Master/bin/i386-solaris/t4ht index 2706023da83..4423f86068d 100755 Binary files a/Master/bin/i386-solaris/t4ht and b/Master/bin/i386-solaris/t4ht differ diff --git a/Master/bin/i386-solaris/tangle b/Master/bin/i386-solaris/tangle index 0c361471abf..ef870a8c87b 100755 Binary files a/Master/bin/i386-solaris/tangle and b/Master/bin/i386-solaris/tangle differ diff --git a/Master/bin/i386-solaris/tcdialog b/Master/bin/i386-solaris/tcdialog index e655a1a2817..663d3d5c1ff 100755 Binary files a/Master/bin/i386-solaris/tcdialog and b/Master/bin/i386-solaris/tcdialog differ diff --git a/Master/bin/i386-solaris/tex b/Master/bin/i386-solaris/tex index 935bd527953..af6bf8f96c4 100755 Binary files a/Master/bin/i386-solaris/tex and b/Master/bin/i386-solaris/tex differ diff --git a/Master/bin/i386-solaris/tex4ht b/Master/bin/i386-solaris/tex4ht index 6f8da450c8f..14072339b41 100755 Binary files a/Master/bin/i386-solaris/tex4ht and b/Master/bin/i386-solaris/tex4ht differ diff --git a/Master/bin/i386-solaris/texconfig b/Master/bin/i386-solaris/texconfig index 976f4590ab5..3f02cebb312 100755 --- a/Master/bin/i386-solaris/texconfig +++ b/Master/bin/i386-solaris/texconfig @@ -24,7 +24,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=texconfig # the version string -version=1118467711 # 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 ;; @@ -1254,7 +1257,7 @@ Valid PAPER settings: set x `getRes "$tcBatchPdftexMode"`; shift fmgrConfigReplace pdftexconfig.tex 'pdfpkresolution' "\\pdfpkresolution=$1" if $fmgrConfigReplaceChanged; then - fmtutil --all + fmtutil --refresh fi else echo "$progname: unknown MODE \`$tcBatchPdftexMode' given as argument for \`$progname pdftex mode'" >&2 @@ -1273,7 +1276,7 @@ Valid PAPER settings: wChanged=$fmgrConfigReplaceChanged fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h" if $wChanged || $fmgrConfigReplaceChanged; then - fmtutil --all + fmtutil --refresh fi ;; a4) @@ -1282,7 +1285,7 @@ Valid PAPER settings: wChanged=$fmgrConfigReplaceChanged fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h" if $wChanged || $fmgrConfigReplaceChanged; then - fmtutil --all + fmtutil --refresh fi ;; "") echo "$help" >&2; rc=1;; diff --git a/Master/bin/i386-solaris/texindex b/Master/bin/i386-solaris/texindex index feb3c866a42..eeb0c1ecd32 100755 Binary files a/Master/bin/i386-solaris/texindex and b/Master/bin/i386-solaris/texindex differ diff --git a/Master/bin/i386-solaris/tftopl b/Master/bin/i386-solaris/tftopl index 268d6f8ea83..155ff91a317 100755 Binary files a/Master/bin/i386-solaris/tftopl and b/Master/bin/i386-solaris/tftopl differ diff --git a/Master/bin/i386-solaris/tie b/Master/bin/i386-solaris/tie index 7cc87d2522f..0cdea77f196 100755 Binary files a/Master/bin/i386-solaris/tie and b/Master/bin/i386-solaris/tie differ diff --git a/Master/bin/i386-solaris/ttf2afm b/Master/bin/i386-solaris/ttf2afm index 2a05104aa4c..a2899b0a576 100755 Binary files a/Master/bin/i386-solaris/ttf2afm and b/Master/bin/i386-solaris/ttf2afm differ diff --git a/Master/bin/i386-solaris/ttf2pk b/Master/bin/i386-solaris/ttf2pk index 9a667ed610e..b424ff217a1 100755 Binary files a/Master/bin/i386-solaris/ttf2pk and b/Master/bin/i386-solaris/ttf2pk differ diff --git a/Master/bin/i386-solaris/ttf2tfm b/Master/bin/i386-solaris/ttf2tfm index 83657801443..6ebf6f9d60a 100755 Binary files a/Master/bin/i386-solaris/ttf2tfm and b/Master/bin/i386-solaris/ttf2tfm differ diff --git a/Master/bin/i386-solaris/ttftotype42 b/Master/bin/i386-solaris/ttftotype42 index 6c0dbd5245e..71393e5ac17 100755 Binary files a/Master/bin/i386-solaris/ttftotype42 and b/Master/bin/i386-solaris/ttftotype42 differ diff --git a/Master/bin/i386-solaris/vftovp b/Master/bin/i386-solaris/vftovp index 823d0eb777f..7f9d8cffbe0 100755 Binary files a/Master/bin/i386-solaris/vftovp and b/Master/bin/i386-solaris/vftovp differ diff --git a/Master/bin/i386-solaris/vptovf b/Master/bin/i386-solaris/vptovf index 3433c0c99e2..c27fb2829b5 100755 Binary files a/Master/bin/i386-solaris/vptovf and b/Master/bin/i386-solaris/vptovf differ diff --git a/Master/bin/i386-solaris/weave b/Master/bin/i386-solaris/weave index 852745abf7b..b9eb57b8d65 100755 Binary files a/Master/bin/i386-solaris/weave and b/Master/bin/i386-solaris/weave differ diff --git a/Master/bin/i386-solaris/xdvi-xaw.bin b/Master/bin/i386-solaris/xdvi-xaw.bin index c328f61e4bf..b085ad2141c 100755 Binary files a/Master/bin/i386-solaris/xdvi-xaw.bin and b/Master/bin/i386-solaris/xdvi-xaw.bin differ diff --git a/Master/bin/i386-solaris/xdvipdfmx b/Master/bin/i386-solaris/xdvipdfmx index 40f22da3060..36c5ae74e27 100755 Binary files a/Master/bin/i386-solaris/xdvipdfmx and b/Master/bin/i386-solaris/xdvipdfmx differ diff --git a/Master/bin/i386-solaris/xetex b/Master/bin/i386-solaris/xetex index e0638cc3e74..b1208e6d6b7 100755 Binary files a/Master/bin/i386-solaris/xetex and b/Master/bin/i386-solaris/xetex differ diff --git a/Master/support/i386-solaris-libs.pkg.gz b/Master/support/i386-solaris-libs.pkg.gz index 6beae5ad5dc..c93328225a2 100644 Binary files a/Master/support/i386-solaris-libs.pkg.gz and b/Master/support/i386-solaris-libs.pkg.gz differ -- cgit v1.2.3