etoc (24nov12)

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

1 files changed, 21 insertions, 13 deletions

diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index f47f021017d..217326082c8 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -274,7 +274,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'cpssp',	"die 'skipping, requires python'",
  'croatian',	"die 'skipping, nonfree (nomodify) license'",
  'crosstex',	"die 'sorry, investigate self-locating?'",
- 'csplain',	"die 'skipping, too hard to automate'",
+ 'csplain',	"die 'skipping, not ready, sorry'",
  'csv2latex',	"die 'skipping, mac only?, ruby + applescript'",
  'csvtools',	"&MAKEflatten",
  'csvtolatex',	"die 'skipping, w32 only, visual basic'",
@@ -1261,6 +1261,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'colortab',	'colortab\.tex|' . $standardtex,
  'components-of-TeX',	'NULL',
  'contour',	'\.cfg|\.sty|\.cnt',
+ 'csplain',	'\.tex',
  'ctib',	'\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|ctib\.tex',
  'custbib',	'\.mbs|\.tex',
  'custom-bib',	'\.mbs|\.tex',
@@ -3296,6 +3297,18 @@ sub MAKEflatten {
   &setup;
   &xchdir ("$DEST/doc/$whichdocformat/$package");
 
+  &flatten_dirtree ($package);
+  
+  # do the usual.
+  &buildfilelist;
+  &donormal ("nosetup");
+}
+
+# Flatten the directory tree (for PACKAGE) under the cwd.
+# 
+sub flatten_dirtree {
+  my ($package) = @_;
+
   print "\t SPECIAL flatten $package\n";
 
   # cm-super et al. need to intervene at this point.
@@ -3320,24 +3333,19 @@ sub MAKEflatten {
 
   # remove newly empty directories.
   &SYSTEM ("find -depth -type d -print | xargs rmdir 2>/dev/null");
-
-  # do the usual.
-  &buildfilelist;
-  &donormal ("nosetup");
 }
 
 sub MAKEunzipandflatten {
  &setup;
  chdir("$DEST/doc/$whichdocformat/$package");
- &SYSTEM("unzip -q -o -a $package.zip; rm $package.zip");
- &SYSTEM("$MV */*/*/*/* .; rmdir */*/*/*");
- &SYSTEM("$MV */*/*/* .; rmdir */*/*");
- &SYSTEM("$MV */*/*/* .; rmdir */*/*");
- &SYSTEM("$MV */*/* .; rmdir */*");
- &SYSTEM("$MV */*/* .; rmdir */*");
- &SYSTEM("$MV */* .; rmdir *");
+ my $archive = -r "$package.zip" ? "$package.zip" : "$package.tar.gz";
+ my $unarchiver = &unarchiver ($archive);
+ &SYSTEM ("$unarchiver $archive; $RM $archive");
+ 
+ &flatten_dirtree ($package);
+ 
  &buildfilelist;
- &donormal;
+ &donormal ("nosetup");
 }
 
 sub MAKEnosymlinks {