texlive[51775] Master/tlpkg/libexec/ctan2tds: ctan2tds: support ctan

[commits+preining at tug.org]

Revision: 51775
          http://tug.org/svn/texlive?view=revision&revision=51775
Author:   preining
Date:     2019-07-30 02:11:43 +0200 (Tue, 30 Jul 2019)
Log Message:
-----------
ctan2tds: support ctan directory under CTAN in addition to tex-archive

Modified Paths:
--------------
    trunk/Master/tlpkg/libexec/ctan2tds

Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds	2019-07-29 23:53:38 UTC (rev 51774)
+++ trunk/Master/tlpkg/libexec/ctan2tds	2019-07-30 00:11:43 UTC (rev 51775)
@@ -3386,39 +3386,39 @@
   my ($ctan_dir) = @_;
   my $guess = "";
   
-  if ($ctan_dir =~ m!/tex-archive/biblio/bib!) {
+  if ($ctan_dir =~ m!/(CTAN|tex-archive)/biblio/bib!) {
     $standarddocfmt = $standardsourcefmt = "bibtex";
     $guess = "$standarddocfmt for docfmt/srcfmt";
 
-  } elsif ($ctan_dir =~ m!/tex-archive/fonts/!) {
+  } elsif ($ctan_dir =~ m!/(CTAN|tex-archive)/fonts/!) {
     $standarddocfmt = $standardsourcefmt = "fonts";
     $guess = "$standarddocfmt for docfmt/srcfmt";
 
-  } elsif ($ctan_dir =~ m!/tex-archive/(graphics|info)/metapost/!) {
+  } elsif ($ctan_dir =~ m!/(CTAN|tex-archive)/(graphics|info)/metapost/!) {
     $standarddocfmt = $standardsourcefmt = "metapost";
     $guess = "$standarddocfmt for docfmt/srcfmt";
 
-  } elsif ($ctan_dir =~ m!/tex-archive/macros/generic/!) {
+  } elsif ($ctan_dir =~ m!/(CTAN|tex-archive)/macros/generic/!) {
     $standarddocfmt = $standardsourcefmt = $standardfmt = "generic";
     $guess = "$standarddocfmt for fmt/docfmt/srcfmt";
 
-  } elsif ($ctan_dir =~ m!/tex-archive/macros/luatex/generic/!) {
+  } elsif ($ctan_dir =~ m!/(CTAN|tex-archive)/macros/luatex/generic/!) {
     $standarddocfmt = $standardsourcefmt = $standardfmt = "luatex";
     $guess = "$standarddocfmt for fmt/docfmt/srcfmt";
 
-  } elsif ($ctan_dir =~ m!/tex-archive/macros/luatex/latex/!) {
+  } elsif ($ctan_dir =~ m!/(CTAN|tex-archive)/macros/luatex/latex/!) {
     $standarddocfmt = $standardsourcefmt = $standardfmt = "lualatex";
     $guess = "$standarddocfmt for fmt/docfmt/srcfmt";
 
-  } elsif ($ctan_dir =~ m!/tex-archive/macros/plain/!) {
+  } elsif ($ctan_dir =~ m!/(CTAN|tex-archive)/macros/plain/!) {
     $standarddocfmt = $standardsourcefmt = $standardfmt = "plain";
     $guess = "$standarddocfmt for fmt/docfmt/srcfmt";
 
-  } elsif ($ctan_dir =~ m!/tex-archive/macros/xetex/latex/!) {
+  } elsif ($ctan_dir =~ m!/(CTAN|tex-archive)/macros/xetex/latex/!) {
     $standarddocfmt = $standardsourcefmt = $standardfmt = "xelatex";
     $guess = "$standarddocfmt for fmt/docfmt/srcfmt";
 
-  } elsif ($ctan_dir =~ m!/tex-archive/support/!) {
+  } elsif ($ctan_dir =~ m!/(CTAN|tex-archive)/support/!) {
     $standarddocfmt = $standardsourcefmt = "support";
     $guess = "$standarddocfmt for docfmt/srcfmt";