From cc092956f5bc52f3152f18ae399dbd7ad172a0e4 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 30 Jul 2019 00:11:43 +0000 Subject: ctan2tds: support ctan directory under CTAN in addition to tex-archive git-svn-id: svn://tug.org/texlive/trunk@51775 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/libexec/ctan2tds | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 3c3e77d6bfc..6188fc81738 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -3386,39 +3386,39 @@ sub set_dir_defaults { 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"; -- cgit v1.2.3