diff options
| -rwxr-xr-x | Master/bin/i386-freebsd/afm2pl | bin | 70084 -> 70308 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/afm2tfm | bin | 76100 -> 78596 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/aleph | bin | 453780 -> 455604 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/bbox | bin | 0 -> 7188 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/bibtex | bin | 128240 -> 128496 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/bibtex8 | bin | 153412 -> 153668 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/ctangle | bin | 81884 -> 82140 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/ctie | bin | 60804 -> 60804 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/cweave | bin | 114396 -> 114396 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/detex | bin | 77088 -> 77088 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/dmp | bin | 69060 -> 69060 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/dt2dv | bin | 30356 -> 30356 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/dvicopy | bin | 105856 -> 106336 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/dvilj | bin | 86356 -> 86612 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/dvilj2p | bin | 86708 -> 86932 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/dvilj4 | bin | 91508 -> 91764 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/dvilj4l | bin | 91508 -> 91764 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/dvipdfm | bin | 341836 -> 341836 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/dvipdfmx | bin | 651992 -> 652280 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/dvipng | bin | 784152 -> 784152 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/dvipos | bin | 0 -> 85788 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/dvips | bin | 206500 -> 206756 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/dvitomp | bin | 83544 -> 83768 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/dvitype | bin | 85892 -> 85892 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/ebb | bin | 192992 -> 192992 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/gftodvi | bin | 87804 -> 88060 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/gftopk | bin | 75780 -> 76004 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/gftype | bin | 75064 -> 77560 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/gsftopk | bin | 70792 -> 71016 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/hbf2gf | bin | 77296 -> 77456 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/htcontext | 6 | ||||
| -rwxr-xr-x | Master/bin/i386-freebsd/htlatex | 4 | ||||
| -rwxr-xr-x | Master/bin/i386-freebsd/htmex | 4 | ||||
| -rwxr-xr-x | Master/bin/i386-freebsd/httex | 4 | ||||
| -rwxr-xr-x | Master/bin/i386-freebsd/httexi | 4 | ||||
| -rwxr-xr-x | Master/bin/i386-freebsd/kpsewhich | bin | 65400 -> 65400 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/makeindex | bin | 121528 -> 121784 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/makempx | bin | 60736 -> 60992 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/mf | bin | 258820 -> 258820 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/mf-nowin | bin | 254368 -> 254368 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/mft | bin | 96240 -> 96464 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/mk4ht | 10 | ||||
| -rwxr-xr-x | Master/bin/i386-freebsd/mpost | bin | 346280 -> 346280 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/odvicopy | bin | 112224 -> 112480 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/odvitype | bin | 86372 -> 89988 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/omega | bin | 463796 -> 463988 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/omfonts | bin | 136796 -> 136796 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/otftotfm | bin | 651192 -> 651448 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/otp2ocp | bin | 70196 -> 73140 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/outocp | bin | 56768 -> 56768 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/pdfopen | bin | 6984 -> 6984 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/pdftex | bin | 1203468 -> 1203052 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/pdftosrc | bin | 0 -> 424028 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/pktogf | bin | 72636 -> 73500 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/pktype | bin | 65240 -> 65240 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/ps2eps | 929 | ||||
| -rwxr-xr-x | Master/bin/i386-freebsd/ps2pk | bin | 154068 -> 154068 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/t4ht | bin | 73024 -> 73024 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/tangle | bin | 93936 -> 93936 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/tex | bin | 283236 -> 283236 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/tex4ht | bin | 134784 -> 134784 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/texconfig | 8 | ||||
| -rwxr-xr-x | Master/bin/i386-freebsd/texmfstart | 56 | ||||
| -rwxr-xr-x | Master/bin/i386-freebsd/tftopl | bin | 81616 -> 81776 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/ttf2afm | bin | 78288 -> 78288 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/ttf2pk | bin | 206200 -> 206200 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/ttf2tfm | bin | 220840 -> 221096 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/vftovp | bin | 98076 -> 98076 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/weave | bin | 110328 -> 110328 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/xdvi-xaw.bin | bin | 715588 -> 715812 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/xdvipdfmx | bin | 1108436 -> 1108820 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/xetex | bin | 7684212 -> 7637972 bytes |
72 files changed, 991 insertions, 34 deletions
diff --git a/Master/bin/i386-freebsd/afm2pl b/Master/bin/i386-freebsd/afm2pl Binary files differindex d511cd3bd36..6fc023fcadc 100755 --- a/Master/bin/i386-freebsd/afm2pl +++ b/Master/bin/i386-freebsd/afm2pl diff --git a/Master/bin/i386-freebsd/afm2tfm b/Master/bin/i386-freebsd/afm2tfm Binary files differindex 4b7a7136179..3a0316e2ef6 100755 --- a/Master/bin/i386-freebsd/afm2tfm +++ b/Master/bin/i386-freebsd/afm2tfm diff --git a/Master/bin/i386-freebsd/aleph b/Master/bin/i386-freebsd/aleph Binary files differindex 27291707331..2739681c4fb 100755 --- a/Master/bin/i386-freebsd/aleph +++ b/Master/bin/i386-freebsd/aleph diff --git a/Master/bin/i386-freebsd/bbox b/Master/bin/i386-freebsd/bbox Binary files differnew file mode 100755 index 00000000000..398cc5e4ac0 --- /dev/null +++ b/Master/bin/i386-freebsd/bbox diff --git a/Master/bin/i386-freebsd/bibtex b/Master/bin/i386-freebsd/bibtex Binary files differindex d1eb00cfdb6..c102495753c 100755 --- a/Master/bin/i386-freebsd/bibtex +++ b/Master/bin/i386-freebsd/bibtex diff --git a/Master/bin/i386-freebsd/bibtex8 b/Master/bin/i386-freebsd/bibtex8 Binary files differindex 96f25e9645c..0de6aa544b7 100755 --- a/Master/bin/i386-freebsd/bibtex8 +++ b/Master/bin/i386-freebsd/bibtex8 diff --git a/Master/bin/i386-freebsd/ctangle b/Master/bin/i386-freebsd/ctangle Binary files differindex 07f24134ea7..137a05c8ede 100755 --- a/Master/bin/i386-freebsd/ctangle +++ b/Master/bin/i386-freebsd/ctangle diff --git a/Master/bin/i386-freebsd/ctie b/Master/bin/i386-freebsd/ctie Binary files differindex d5fc368fb48..0b5fb8746ff 100755 --- a/Master/bin/i386-freebsd/ctie +++ b/Master/bin/i386-freebsd/ctie diff --git a/Master/bin/i386-freebsd/cweave b/Master/bin/i386-freebsd/cweave Binary files differindex 493c76d6586..1701e35ac7b 100755 --- a/Master/bin/i386-freebsd/cweave +++ b/Master/bin/i386-freebsd/cweave diff --git a/Master/bin/i386-freebsd/detex b/Master/bin/i386-freebsd/detex Binary files differindex 0ef709a013c..880d14123d8 100755 --- a/Master/bin/i386-freebsd/detex +++ b/Master/bin/i386-freebsd/detex diff --git a/Master/bin/i386-freebsd/dmp b/Master/bin/i386-freebsd/dmp Binary files differindex c738b5283b5..631b88f3856 100755 --- a/Master/bin/i386-freebsd/dmp +++ b/Master/bin/i386-freebsd/dmp diff --git a/Master/bin/i386-freebsd/dt2dv b/Master/bin/i386-freebsd/dt2dv Binary files differindex 3b43b1b3b65..40849d9be53 100755 --- a/Master/bin/i386-freebsd/dt2dv +++ b/Master/bin/i386-freebsd/dt2dv diff --git a/Master/bin/i386-freebsd/dvicopy b/Master/bin/i386-freebsd/dvicopy Binary files differindex 6a2952f45d4..a6a04b5f271 100755 --- a/Master/bin/i386-freebsd/dvicopy +++ b/Master/bin/i386-freebsd/dvicopy diff --git a/Master/bin/i386-freebsd/dvilj b/Master/bin/i386-freebsd/dvilj Binary files differindex a4e7635900b..61848884729 100755 --- a/Master/bin/i386-freebsd/dvilj +++ b/Master/bin/i386-freebsd/dvilj diff --git a/Master/bin/i386-freebsd/dvilj2p b/Master/bin/i386-freebsd/dvilj2p Binary files differindex 7ba417f477e..4cb677227cb 100755 --- a/Master/bin/i386-freebsd/dvilj2p +++ b/Master/bin/i386-freebsd/dvilj2p diff --git a/Master/bin/i386-freebsd/dvilj4 b/Master/bin/i386-freebsd/dvilj4 Binary files differindex fd423716816..b1d3ea33bf5 100755 --- a/Master/bin/i386-freebsd/dvilj4 +++ b/Master/bin/i386-freebsd/dvilj4 diff --git a/Master/bin/i386-freebsd/dvilj4l b/Master/bin/i386-freebsd/dvilj4l Binary files differindex 0dbf80edc3b..4532d0f06cf 100755 --- a/Master/bin/i386-freebsd/dvilj4l +++ b/Master/bin/i386-freebsd/dvilj4l diff --git a/Master/bin/i386-freebsd/dvipdfm b/Master/bin/i386-freebsd/dvipdfm Binary files differindex 3489b1f68dd..abb04cd85c6 100755 --- a/Master/bin/i386-freebsd/dvipdfm +++ b/Master/bin/i386-freebsd/dvipdfm diff --git a/Master/bin/i386-freebsd/dvipdfmx b/Master/bin/i386-freebsd/dvipdfmx Binary files differindex fb56a30dd99..f81598e3638 100755 --- a/Master/bin/i386-freebsd/dvipdfmx +++ b/Master/bin/i386-freebsd/dvipdfmx diff --git a/Master/bin/i386-freebsd/dvipng b/Master/bin/i386-freebsd/dvipng Binary files differindex b028d25fb4c..505b25c0cce 100755 --- a/Master/bin/i386-freebsd/dvipng +++ b/Master/bin/i386-freebsd/dvipng diff --git a/Master/bin/i386-freebsd/dvipos b/Master/bin/i386-freebsd/dvipos Binary files differnew file mode 100755 index 00000000000..07b1b7c0f21 --- /dev/null +++ b/Master/bin/i386-freebsd/dvipos diff --git a/Master/bin/i386-freebsd/dvips b/Master/bin/i386-freebsd/dvips Binary files differindex a3c0b8286ff..6c330a90d5b 100755 --- a/Master/bin/i386-freebsd/dvips +++ b/Master/bin/i386-freebsd/dvips diff --git a/Master/bin/i386-freebsd/dvitomp b/Master/bin/i386-freebsd/dvitomp Binary files differindex 78726b33961..0a8579f405c 100755 --- a/Master/bin/i386-freebsd/dvitomp +++ b/Master/bin/i386-freebsd/dvitomp diff --git a/Master/bin/i386-freebsd/dvitype b/Master/bin/i386-freebsd/dvitype Binary files differindex 356f0a8c1ac..f757e078a1a 100755 --- a/Master/bin/i386-freebsd/dvitype +++ b/Master/bin/i386-freebsd/dvitype diff --git a/Master/bin/i386-freebsd/ebb b/Master/bin/i386-freebsd/ebb Binary files differindex 1dd342c3de3..620d0d5fabc 100755 --- a/Master/bin/i386-freebsd/ebb +++ b/Master/bin/i386-freebsd/ebb diff --git a/Master/bin/i386-freebsd/gftodvi b/Master/bin/i386-freebsd/gftodvi Binary files differindex 479cf08ee8d..89955f991d0 100755 --- a/Master/bin/i386-freebsd/gftodvi +++ b/Master/bin/i386-freebsd/gftodvi diff --git a/Master/bin/i386-freebsd/gftopk b/Master/bin/i386-freebsd/gftopk Binary files differindex ea629ff12bc..d7c35310846 100755 --- a/Master/bin/i386-freebsd/gftopk +++ b/Master/bin/i386-freebsd/gftopk diff --git a/Master/bin/i386-freebsd/gftype b/Master/bin/i386-freebsd/gftype Binary files differindex 7709b86401c..40ba63dfd95 100755 --- a/Master/bin/i386-freebsd/gftype +++ b/Master/bin/i386-freebsd/gftype diff --git a/Master/bin/i386-freebsd/gsftopk b/Master/bin/i386-freebsd/gsftopk Binary files differindex 862df68ac58..c3713c481d4 100755 --- a/Master/bin/i386-freebsd/gsftopk +++ b/Master/bin/i386-freebsd/gsftopk diff --git a/Master/bin/i386-freebsd/hbf2gf b/Master/bin/i386-freebsd/hbf2gf Binary files differindex d9f3f2b10a6..5bf2cf4ff95 100755 --- a/Master/bin/i386-freebsd/hbf2gf +++ b/Master/bin/i386-freebsd/hbf2gf diff --git a/Master/bin/i386-freebsd/htcontext b/Master/bin/i386-freebsd/htcontext index 9d6d4549574..9e01fa97f66 100755 --- a/Master/bin/i386-freebsd/htcontext +++ b/Master/bin/i386-freebsd/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-freebsd/htlatex b/Master/bin/i386-freebsd/htlatex index 1b8b7cea74a..ebab47dbaa6 100755 --- a/Master/bin/i386-freebsd/htlatex +++ b/Master/bin/i386-freebsd/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-freebsd/htmex b/Master/bin/i386-freebsd/htmex index b4aa3d9a06e..485a7594468 100755 --- a/Master/bin/i386-freebsd/htmex +++ b/Master/bin/i386-freebsd/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-freebsd/httex b/Master/bin/i386-freebsd/httex index 44920e72077..4c184897d13 100755 --- a/Master/bin/i386-freebsd/httex +++ b/Master/bin/i386-freebsd/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-freebsd/httexi b/Master/bin/i386-freebsd/httexi index 0ce3cb4a589..26427698991 100755 --- a/Master/bin/i386-freebsd/httexi +++ b/Master/bin/i386-freebsd/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-freebsd/kpsewhich b/Master/bin/i386-freebsd/kpsewhich Binary files differindex 6badfe4d6f8..ab264207602 100755 --- a/Master/bin/i386-freebsd/kpsewhich +++ b/Master/bin/i386-freebsd/kpsewhich diff --git a/Master/bin/i386-freebsd/makeindex b/Master/bin/i386-freebsd/makeindex Binary files differindex 26c971b1273..e75d7e4d185 100755 --- a/Master/bin/i386-freebsd/makeindex +++ b/Master/bin/i386-freebsd/makeindex diff --git a/Master/bin/i386-freebsd/makempx b/Master/bin/i386-freebsd/makempx Binary files differindex 171eb280eb0..c28a138ac4b 100755 --- a/Master/bin/i386-freebsd/makempx +++ b/Master/bin/i386-freebsd/makempx diff --git a/Master/bin/i386-freebsd/mf b/Master/bin/i386-freebsd/mf Binary files differindex 44217d6b5e2..8cdc088f221 100755 --- a/Master/bin/i386-freebsd/mf +++ b/Master/bin/i386-freebsd/mf diff --git a/Master/bin/i386-freebsd/mf-nowin b/Master/bin/i386-freebsd/mf-nowin Binary files differindex efbfbb5f436..1794936d98e 100755 --- a/Master/bin/i386-freebsd/mf-nowin +++ b/Master/bin/i386-freebsd/mf-nowin diff --git a/Master/bin/i386-freebsd/mft b/Master/bin/i386-freebsd/mft Binary files differindex b9684bfdb3d..6da5cf5b876 100755 --- a/Master/bin/i386-freebsd/mft +++ b/Master/bin/i386-freebsd/mft diff --git a/Master/bin/i386-freebsd/mk4ht b/Master/bin/i386-freebsd/mk4ht index 0f4b664506c..2bd1f7e2038 100755 --- a/Master/bin/i386-freebsd/mk4ht +++ b/Master/bin/i386-freebsd/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-freebsd/mpost b/Master/bin/i386-freebsd/mpost Binary files differindex a25ae844dbd..8dd01770bb0 100755 --- a/Master/bin/i386-freebsd/mpost +++ b/Master/bin/i386-freebsd/mpost diff --git a/Master/bin/i386-freebsd/odvicopy b/Master/bin/i386-freebsd/odvicopy Binary files differindex e2b3de74d80..677a62f23cc 100755 --- a/Master/bin/i386-freebsd/odvicopy +++ b/Master/bin/i386-freebsd/odvicopy diff --git a/Master/bin/i386-freebsd/odvitype b/Master/bin/i386-freebsd/odvitype Binary files differindex a36bf37209e..2d3aee639bf 100755 --- a/Master/bin/i386-freebsd/odvitype +++ b/Master/bin/i386-freebsd/odvitype diff --git a/Master/bin/i386-freebsd/omega b/Master/bin/i386-freebsd/omega Binary files differindex 13ebe1c6d61..66d5e9124bb 100755 --- a/Master/bin/i386-freebsd/omega +++ b/Master/bin/i386-freebsd/omega diff --git a/Master/bin/i386-freebsd/omfonts b/Master/bin/i386-freebsd/omfonts Binary files differindex c167bfc7083..3edd09f151b 100755 --- a/Master/bin/i386-freebsd/omfonts +++ b/Master/bin/i386-freebsd/omfonts diff --git a/Master/bin/i386-freebsd/otftotfm b/Master/bin/i386-freebsd/otftotfm Binary files differindex cc9eac09d03..9606aae9b9d 100755 --- a/Master/bin/i386-freebsd/otftotfm +++ b/Master/bin/i386-freebsd/otftotfm diff --git a/Master/bin/i386-freebsd/otp2ocp b/Master/bin/i386-freebsd/otp2ocp Binary files differindex f1ff9050c20..9feb0f730e5 100755 --- a/Master/bin/i386-freebsd/otp2ocp +++ b/Master/bin/i386-freebsd/otp2ocp diff --git a/Master/bin/i386-freebsd/outocp b/Master/bin/i386-freebsd/outocp Binary files differindex ddbd8629973..90d6786541b 100755 --- a/Master/bin/i386-freebsd/outocp +++ b/Master/bin/i386-freebsd/outocp diff --git a/Master/bin/i386-freebsd/pdfopen b/Master/bin/i386-freebsd/pdfopen Binary files differindex fc23d646dba..d9fc575508d 100755 --- a/Master/bin/i386-freebsd/pdfopen +++ b/Master/bin/i386-freebsd/pdfopen diff --git a/Master/bin/i386-freebsd/pdftex b/Master/bin/i386-freebsd/pdftex Binary files differindex 7bf0163dcae..022c9821da2 100755 --- a/Master/bin/i386-freebsd/pdftex +++ b/Master/bin/i386-freebsd/pdftex diff --git a/Master/bin/i386-freebsd/pdftosrc b/Master/bin/i386-freebsd/pdftosrc Binary files differnew file mode 100755 index 00000000000..f55c8afa27e --- /dev/null +++ b/Master/bin/i386-freebsd/pdftosrc diff --git a/Master/bin/i386-freebsd/pktogf b/Master/bin/i386-freebsd/pktogf Binary files differindex 1905d203f33..5c50bc3d365 100755 --- a/Master/bin/i386-freebsd/pktogf +++ b/Master/bin/i386-freebsd/pktogf diff --git a/Master/bin/i386-freebsd/pktype b/Master/bin/i386-freebsd/pktype Binary files differindex cb648b1a9b2..f52c18b3390 100755 --- a/Master/bin/i386-freebsd/pktype +++ b/Master/bin/i386-freebsd/pktype diff --git a/Master/bin/i386-freebsd/ps2eps b/Master/bin/i386-freebsd/ps2eps new file mode 100755 index 00000000000..aeb0e9a8e43 --- /dev/null +++ b/Master/bin/i386-freebsd/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 <at> 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 <pagedim>] [-R +|-|^] [-t <x,y>] [-l] [-g] [-d] [-H] [-h|--help] [-g] [-W] [-L] [-V|--version] [--] [psfile1] [psfile2] [...]\n", + "Options:\n", + " -f, --force force overwriting existing files\n", + " -q, --quiet quiet operation (no output while processing files)\n", + " -N, --noinsert do not insert any postscript code\n", + " -O, --preserveorientation do not filter Orientation: header comment\n", + " -n, --nofix do not try to fix postscript code\n", + " -P, --removepreview remove preview image (smaller file, but no preview)\n", + " -F, --fixps fix postscript code unconditionally\n", + " -c, --comments preserve document structure comments\n", + " -C, --clip insert postscript code for clipping\n", + " -m, --mono use black/white bitmap as base for calculation\n", + " -s, --size=<pagedim> page size (a0-a10,letter,...) or in format XxY[cm|in] (default:cm), where X and Y are numbers\n", + " use --size=list to list pre-defined page sizes\n", + " -R, --rotate=<direction> rotate resulting EPS. <direction>: +=+90 (clockw.),-=-90 (counter-clockw.) ^=180 degrees\n", + " -t, --translate specify x,y offset (may be negative) in postscript points (1/72 dpi)\n", + " -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-freebsd/ps2pk b/Master/bin/i386-freebsd/ps2pk Binary files differindex bb3a1c221d9..c073d207d67 100755 --- a/Master/bin/i386-freebsd/ps2pk +++ b/Master/bin/i386-freebsd/ps2pk diff --git a/Master/bin/i386-freebsd/t4ht b/Master/bin/i386-freebsd/t4ht Binary files differindex a205ac321ec..4296f8fcdcc 100755 --- a/Master/bin/i386-freebsd/t4ht +++ b/Master/bin/i386-freebsd/t4ht diff --git a/Master/bin/i386-freebsd/tangle b/Master/bin/i386-freebsd/tangle Binary files differindex ed9ada7d5b8..22b09d6bc44 100755 --- a/Master/bin/i386-freebsd/tangle +++ b/Master/bin/i386-freebsd/tangle diff --git a/Master/bin/i386-freebsd/tex b/Master/bin/i386-freebsd/tex Binary files differindex ee32ee140d3..45ae69503e2 100755 --- a/Master/bin/i386-freebsd/tex +++ b/Master/bin/i386-freebsd/tex diff --git a/Master/bin/i386-freebsd/tex4ht b/Master/bin/i386-freebsd/tex4ht Binary files differindex 0995a9c930c..09229dab0bd 100755 --- a/Master/bin/i386-freebsd/tex4ht +++ b/Master/bin/i386-freebsd/tex4ht diff --git a/Master/bin/i386-freebsd/texconfig b/Master/bin/i386-freebsd/texconfig index 7c3ced61b53..3f02cebb312 100755 --- a/Master/bin/i386-freebsd/texconfig +++ b/Master/bin/i386-freebsd/texconfig @@ -24,7 +24,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=texconfig # the version string -version=1168796427 # 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=" @@ -629,7 +629,7 @@ Get more help with echo echo '==================== binaries found by searching $PATH ===================' echo "PATH=$PATH" - echoLocateBinary kpsewhich updmap fmtutil texconfig tex pdftex mktexpk dvips dvipdfm + echoLocateBinary kpsewhich updmap fmtutil texconfig tex pdfetex mktexpk dvips dvipdfm echo echo '=========================== active config files ==========================' echoLocateCfgfile texmf.cnf updmap.cfg fmtutil.cnf config.ps mktex.cnf XDvi pdftexconfig.tex config | sort -k 2 @@ -1187,7 +1187,7 @@ Valid MODE settings:" if checkForBinary dvips >/dev/null && tcfmgr --cmd find --file config.ps >/dev/null 2>&1; then tcBatch dvips mode "$tcBatchMode" fi - if checkForBinary pdftex >/dev/null && tcfmgr --cmd find --file pdftexconfig.tex >/dev/null 2>&1; then + if checkForBinary pdfetex >/dev/null && tcfmgr --cmd find --file pdftexconfig.tex >/dev/null 2>&1; then tcBatch pdftex mode "$tcBatchMode" fi else @@ -1231,7 +1231,7 @@ Valid PAPER settings: if checkForBinary xdvi >/dev/null && tcfmgr --cmd find --file XDvi >/dev/null 2>&1; then tcBatch xdvi paper $pXdvi fi - if checkForBinary pdftex >/dev/null && tcfmgr --cmd find --file pdftexconfig.tex >/dev/null 2>&1; then + if checkForBinary pdfetex >/dev/null && tcfmgr --cmd find --file pdftexconfig.tex >/dev/null 2>&1; then tcBatch pdftex paper $p fi ;; diff --git a/Master/bin/i386-freebsd/texmfstart b/Master/bin/i386-freebsd/texmfstart index a886b2aa142..4d1e2976145 100755 --- a/Master/bin/i386-freebsd/texmfstart +++ b/Master/bin/i386-freebsd/texmfstart @@ -425,7 +425,7 @@ class KpseFast @rootpath = '' @treepath = '' @progname = 'kpsewhich' - @engine = 'pdfetex' + @engine = 'pdftex' @variables = Hash.new @expansions = Hash.new @files = Hash.new @@ -1074,7 +1074,7 @@ end # puts k.expansion("$TEXMF") # puts k.expanded_path("TEXINPUTS","context") - # k.progname, k.engine, k.format = 'context', 'pdfetex', 'tfm' + # k.progname, k.engine, k.format = 'context', 'pdftex', 'tfm' # k.scandisk = false # == must_exist # k.expand_variables @@ -1429,7 +1429,7 @@ end $mswindows = Config::CONFIG['host_os'] =~ /mswin/ $separator = File::PATH_SEPARATOR -$version = "2.0.2" +$version = "2.0.3" $ownpath = File.dirname($0) if $mswindows then @@ -1520,7 +1520,7 @@ def set_applications(page=1) $applications['perl'] = $applications['pl'] = 'perl' $applications['ruby'] = $applications['rb'] = 'ruby' $applications['python'] = $applications['py'] = 'python' - $applications['lua'] = $applications['lua'] = 'lua' + $applications['lua'] = $applications['lua'] = 'luatex --luaonly' $applications['java'] = $applications['jar'] = 'java' if $mswindows then @@ -1804,14 +1804,16 @@ def changeddir?(path) if path.empty? then return true else + oldpath = File.expand_path(path) begin - Dir.chdir(path) if ! path.empty? + Dir.chdir(path) if not path.empty? rescue report("unable to change to directory: #{path}") else report("changed to directory: #{path}") end - return File.expand_path(Dir.getwd) == File.expand_path(path) + newpath = File.expand_path(Dir.getwd) + return oldpath == newpath end end @@ -1971,10 +1973,15 @@ def find(filename,program) end filename.sub!(/^.*[\\\/]/, '') # next we look at the current path and the callerpath - [ ['.','current'], - [$ownpath,'caller'], ["#{$ownpath}/../#{suffixlist[0]}",'caller'], - [registered("THREAD"),'thread'], ["#{registered("THREAD")}/../#{suffixlist[0]}",'thread'], - ].each do |p| + pathlist = [ ] + progpath = $applications[suffixlist[0]] + threadok = registered("THREAD") !~ /unknown/ + pathlist << ['.','current'] + pathlist << [$ownpath,'caller'] if $ownpath != '.' + pathlist << ["#{$ownpath}/../#{progpath}",'caller'] if progpath + pathlist << [registered("THREAD"),'thread'] if threadok + pathlist << ["#{registered("THREAD")}/../#{progpath}",'thread'] if progpath && threadok + pathlist.each do |p| if p && ! p.empty? && ! (p[0] == 'unknown') then suffixlist.each do |suffix| fname = "#{filename}.#{suffix}" @@ -2483,27 +2490,35 @@ def execute(arguments) if $selfmerge then output("ruby libraries are cleaned up") if SelfMerge::cleanup output("ruby libraries are merged") if SelfMerge::merge + return true elsif $selfcleanup then output("ruby libraries are cleaned up") if SelfMerge::cleanup + return true elsif $serve then if ENV['KPSEMETHOD'] && ENV['KPSEPORT'] then # # kpse_merge_done: require 'base/kpseremote' begin KpseRemote::start_server rescue + return false + else + return true end else usage puts("") puts("message : set 'KPSEMETHOD' and 'KPSEPORT' variables") + return false end elsif $help || ! $filename || $filename.empty? then usage loadtree($tree) loadenvironment($environment) show_environment() + return true elsif $batch && $filename && ! $filename.empty? then # todo, take commands from file and avoid multiple starts and checks + return false else report("texmfstart version #{$version}") loadtree($tree) @@ -2524,33 +2539,42 @@ def execute(arguments) make(filename,$mswindows,!$mswindows,$remove) end end + return true # guess elsif $browser && $filename =~ /^http\:\/\// then - launch($filename) + return launch($filename) else begin process do if $direct || $filename =~ /^bin\:/ then - direct($filename) + return direct($filename) elsif $edit && ! $editor.empty? then - edit($filename) + return edit($filename) else # script: or no prefix command = find(shortpathname($filename),$program) if command then register("THREAD",File.dirname(File.expand_path(command))) - run(command) + return run(command) else report('unable to locate program') + return false end end end rescue report('fatal error in starting process') + return false end end end end -execute(ARGV) +if execute(ARGV) then + report("\nexecution was successful") if $verbose + exit(0) +else + report("\nexecution failed") if $verbose + exit(1) +end -exit (if ($?.to_i rescue 0) > 0 then 1 else 0 end) +# exit (if ($?.to_i rescue 0) > 0 then 1 else 0 end) diff --git a/Master/bin/i386-freebsd/tftopl b/Master/bin/i386-freebsd/tftopl Binary files differindex 2838a37a63c..9cd1a6e317d 100755 --- a/Master/bin/i386-freebsd/tftopl +++ b/Master/bin/i386-freebsd/tftopl diff --git a/Master/bin/i386-freebsd/ttf2afm b/Master/bin/i386-freebsd/ttf2afm Binary files differindex 203b66a61de..7d592e787f0 100755 --- a/Master/bin/i386-freebsd/ttf2afm +++ b/Master/bin/i386-freebsd/ttf2afm diff --git a/Master/bin/i386-freebsd/ttf2pk b/Master/bin/i386-freebsd/ttf2pk Binary files differindex b77709489bc..5ef0b1cc44f 100755 --- a/Master/bin/i386-freebsd/ttf2pk +++ b/Master/bin/i386-freebsd/ttf2pk diff --git a/Master/bin/i386-freebsd/ttf2tfm b/Master/bin/i386-freebsd/ttf2tfm Binary files differindex 142b2376395..b784c8329bf 100755 --- a/Master/bin/i386-freebsd/ttf2tfm +++ b/Master/bin/i386-freebsd/ttf2tfm diff --git a/Master/bin/i386-freebsd/vftovp b/Master/bin/i386-freebsd/vftovp Binary files differindex 9ee684599e9..19a7b046432 100755 --- a/Master/bin/i386-freebsd/vftovp +++ b/Master/bin/i386-freebsd/vftovp diff --git a/Master/bin/i386-freebsd/weave b/Master/bin/i386-freebsd/weave Binary files differindex 633271748ef..b3a42484d4e 100755 --- a/Master/bin/i386-freebsd/weave +++ b/Master/bin/i386-freebsd/weave diff --git a/Master/bin/i386-freebsd/xdvi-xaw.bin b/Master/bin/i386-freebsd/xdvi-xaw.bin Binary files differindex 97b17cba497..da949e23f81 100755 --- a/Master/bin/i386-freebsd/xdvi-xaw.bin +++ b/Master/bin/i386-freebsd/xdvi-xaw.bin diff --git a/Master/bin/i386-freebsd/xdvipdfmx b/Master/bin/i386-freebsd/xdvipdfmx Binary files differindex efe7c1dd4cb..d38577739cc 100755 --- a/Master/bin/i386-freebsd/xdvipdfmx +++ b/Master/bin/i386-freebsd/xdvipdfmx diff --git a/Master/bin/i386-freebsd/xetex b/Master/bin/i386-freebsd/xetex Binary files differindex e7926b10209..4b460462663 100755 --- a/Master/bin/i386-freebsd/xetex +++ b/Master/bin/i386-freebsd/xetex |