create pdfcsplain for xetex and luatex, and check csplain and cslatex (zdenek.wagner mail of 29 May 2013 11:55:47)

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

3 files changed, 20 insertions, 12 deletions

diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index c417188eb4d..dc80db1b4f1 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -139,7 +139,7 @@ my @TLP_working = qw(
     coverpage covington
     cprotect
     crbox crop crossreference crossword crosswrd cryst
-    csbulletin csquotes csquotes-de csvsimple csvtools cstex
+    csbulletin cslatex csplain csquotes csquotes-de csvsimple csvtools cstex
     ctanify ctanupload ctable ctex ctex-faq
     cursolatex cuisine
     currfile currvita curve curve2e curves
@@ -525,9 +525,7 @@ my @TLP_no_check = (
   "cjkutils",		# binary
   "cns",		# part of cjk
   "context",		# binary+taco
-  "cs",			# distributed as .tar.gz, too painful to unpack
-  "cslatex",		# distributed as .tar.gz
-  "csplain",		# distributed as .tar.gz
+  "cs",			# multiple .tar.gz, too painful to unpack
   "ctib",		# binary
   "ctie",		# binary
   "cweb",		# binary
@@ -626,7 +624,7 @@ sub main {
   die "Cannot find tlpdb in $Master!" unless defined $tlpdb;
 
   $OPT{"verbose"} = 0;
-  if ($ARGV[0] eq "--verbose") {
+  if ($ARGV[0] eq "--verbose" || $ARGV[0] eq "-v") {
     $OPT{"verbose"} = 1;
     shift @ARGV;
   }
@@ -679,7 +677,7 @@ sub normal_tlps {
 }
 
 
-# Return 1 if package TLPN needs updating, 0 if ok.
+# Return 1 if package TLPN needs updating (or error), 0 if ok.
 # 
 sub do_tlp {
   my ($tlpn) = @_;
@@ -694,8 +692,17 @@ sub do_tlp {
   chomp (my $ctan_dir = `$mydir/tlpkginfo --prepare '$tlpn'`);
   if (! $ctan_dir) {
     warn "$0: oops, no CTAN directory for $tlpn, fix fix\n";
-    return ();
+    return 1;
+  }
+  # csplain and cslatex have .tar.gz's that need to be unpacked for
+  # comparison.  (perhaps this should be done in tlpkginfo.)  but don't
+  # do any unpacking inside the ctan hierarchy.
+  if ($ctan_dir !~ m,^$ctan_root,) {
+    for my $tgz (glob ("$ctan_dir/*.tar.gz")) {
+      system ("tar -C $ctan_dir -xf $tgz");
+    }
   }
+
   my @tl_files = ();
   push @tl_files, $tlp->runfiles;
   push @tl_files, $tlp->docfiles;
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 2e515959eb2..873afda4694 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -17,8 +17,8 @@ sub main {
   
   # erroneous or problematic tds files (when new, tell RobinF and author)
   $erroneous_tds = join ("|",
-    qw(countriesofeurope engpron gost hacm he-she imakeidx imtekda spanish
-    sttools titleps),
+    qw(countriesofeurope engpron gost hacm he-she imakeidx imtekda 
+       mathdesign spanish sttools titleps),
     );
   
   # Heiko's tds files (don't propagate through CTAN fast enough).
@@ -52,7 +52,8 @@ sub main {
   } else {
     die "Usage: $0 --ctan-dir PKGNAME\n" 
       . "   or:  --prepare PKGNAME\n"
-      . "   or:  --ctan-root  (not \"@ARGV\").\n";
+      . "   or:  --ctan-root\n"
+      . "(not \"@ARGV\").\n";
   }
 }
 
diff --git a/Master/tlpkg/tlpsrc/csplain.tlpsrc b/Master/tlpkg/tlpsrc/csplain.tlpsrc
index 78bd1f8de9e..43e11b65815 100644
--- a/Master/tlpkg/tlpsrc/csplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/csplain.tlpsrc
@@ -8,9 +8,9 @@ execute AddFormat name=pdfcsplain engine=pdftex \
 #
 # intentionally no user-level executables for these formats, also named
 # pdfcsplain (a la ConTeXt).
-execute AddFormat name=pdfcsplain mode=disabled engine=xetex \
+execute AddFormat name=pdfcsplain engine=xetex \
                   options="-etex csplain.ini"
-execute AddFormat name=pdfcsplain mode=disabled engine=luatex \
+execute AddFormat name=pdfcsplain engine=luatex \
                   options="-etex csplain.ini"
 #
 binpattern f bin/${ARCH}/csplain