hvoss says ps4pdf has been replaced by pst-pdf

git-svn-id: svn://tug.org/texlive/trunk@1821 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 25 insertions, 8 deletions

diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl
index e1146a58acb..5a261c5914c 100755
--- a/Build/cdbuild/ctan2tds.pl
+++ b/Build/cdbuild/ctan2tds.pl
@@ -228,6 +228,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";
  'pst-math',	"&MAKEpst",
  'pst-optic',	"&MAKEpst",
  'pst-osci',	"&MAKEpst",
+ 'pst-pdf',	"&MAKEpst",
  'pst-pdgr',	"&MAKEpst",
  'pst-poly',	"&MAKEpst",
  'pst-slpe',	"&MAKEpst",
@@ -2435,6 +2436,10 @@ sub MAKEpst {
    &SYSTEM("mkdir -p $DEST/tex/latex/$package");
    &SYSTEM("mv $DEST/tex/generic/$package/*sty $DEST/tex/latex/$package");
    &SYSTEM("mv $DEST/doc/generic/$package/*cfg $DEST/tex/latex/$package");
+   
+   if (-f "scripts/ps4pdf") {
+     print "\t YOU-MUST-DO copy scripts/ps4pdf to source/texk/tetex\n";
+   }
 }
 
 
diff --git a/Build/source/texk/tetex/ps4pdf b/Build/source/texk/tetex/ps4pdf
index 81f254a3735..626766791e7 100644
--- a/Build/source/texk/tetex/ps4pdf
+++ b/Build/source/texk/tetex/ps4pdf
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 # Copyright (C) 2004, Thomas Esser. Public domain.
+# New option "--crop", Rolf Niepraschk. 2005-03-08
+# dvips call only if the dvi file exist. 
+# ps2pdf call only if the ps file exist. Rolf Niepraschk. 2005-06-27
 
 # First, work around bugs/limitations in some shells on some systems:
 test -f /bin/sh5 && test -z "$RUNNING_SH5" \
@@ -22,7 +25,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 ###############################################################################
 cleanup()
 {
-  rc=$1
+  rc=$?
   $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
     && { rm -f "$tmpdir"/*; cd /; rmdir "$tmpdir"; }
 
@@ -38,7 +41,7 @@ setupTmpDir()
 {
   $needsCleanup && return
 
-  trap 'cleanup 1' 1 2 3 7 13 15
+  trap 'cleanup' 1 2 3 7 13 15
   needsCleanup=true
   (umask 077; mkdir "$tmpdir") \
     || abort "could not create directory \`$tmpdir'"
@@ -61,15 +64,17 @@ myexec()
   if test $rc != 0; then
     echo "$0: command $@ returned with code $rc"
     cat <$log
-    cleanup $rc
+    (exit $rc) # set return value
+    cleanup
   fi
 }
 
 # some initializations
 progname=pdflatexps
 silent=true # default setting; change if you like
+crop=false
 needsCleanup=false
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/.$progname$$
+tmpdir=${TMP-/tmp}/.$progname$$
 log=$tmpdir/log
 version="1.0"
 
@@ -80,6 +85,7 @@ while
               echo "Process LaTeX document containing PSforPDF macros."
 		                  exit 0;;
    --version) echo "$progname version $version"; exit 0;;
+   --crop|-c) crop=true;;
    -q) silent=true;;
    -v) silent=false;;
     -*) echo "$progname: unknown option $1 ignored";;
@@ -97,8 +103,14 @@ job=`echo "x$1" | sed 's@x@@; s@.*/@@; s@\.[^.]*$@@'`
 
 setupTmpDir
 myexec latex "$file"
-myexec dvips -Ppdf -o "$job-pics.ps" "$job.dvi"
-myexec ps2pdf -dAutoRotatePages=/None "$job-pics.ps" "$job-pics.pdf"
+test -f "$job.dvi" && myexec dvips -Ppdf -o "$job-pics.ps" "$job.dvi"
+test -f "$job-pics.ps" && myexec ps2pdf \
+  -dAutoRotatePages=/None "$job-pics.ps" "$job-pics.pdf"
+if $crop; then
+  myexec pdfcrop "$job-pics.pdf" "$job-pics-crop.pdf" 
+  mv "$job-pics-crop.pdf" "$job-pics.pdf"
+fi
 myexec pdflatex "$file"
 
-cleanup 0
+true
+cleanup
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check
index 83a88c0b50a..eb6ef2598ca 100755
--- a/Build/tools/tpm-ctan-check
+++ b/Build/tools/tpm-ctan-check
@@ -78,7 +78,7 @@ sub main
          "polynom", "poemscol", "powerdot", "powerdot-doc-vn",
          "ppr-prv", "preview", "proof", "pstricks", "pstricks-add",
          "pst-3d", "pst-barcode", "pst-blur", "pst-eucl", "pst-func",
-         "pst-labo", "pst-lens", "pst-osci", "pst-pdgr", "pst-slpe",
+         "pst-labo", "pst-lens", "pst-osci", "pst-pdf", "pst-pdgr", "pst-slpe",
        "randbild", "robustcommand",
        "sciposter", "sectionbox", "sectsty", "semantic",
          "seminar", "semioneside",