summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-09-05 22:03:38 +0000
committerKarl Berry <karl@freefriends.org>2006-09-05 22:03:38 +0000
commitdf3d34383f9394122dbe42b06a13646e71f925a9 (patch)
tree58814a90cc06ed19f26626cc6cd13ea949b6dc06
parenta918ac801f047d8d252dfcdbde5eaa3e39a4fcb9 (diff)
find ams/etc. in amslatex in the catalogue and ctan
git-svn-id: svn://tug.org/texlive/trunk@2084 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/tools/ctan2tl13
-rwxr-xr-xBuild/tools/tlpkginfo7
-rwxr-xr-xBuild/tools/tpm-ctan-check3
3 files changed, 12 insertions, 11 deletions
diff --git a/Build/tools/ctan2tl b/Build/tools/ctan2tl
index a2b29ba4d0a..ef1c2281a99 100755
--- a/Build/tools/ctan2tl
+++ b/Build/tools/ctan2tl
@@ -41,17 +41,9 @@ if test -z "$pkg"; then
exit 1
fi
-# See comments below.
-amslatex_tds_pkglist="ams|amscls|amsltx2|amsmath|amsrefs"
-if echo "$pkg" | egrep "^($amslatex_tds_pkglist)\$" >/dev/null; then
- ctan_pkgname=amslatex
-else
- ctan_pkgname=$pkg
-fi
-
-ctan_dir1=`tlpkginfo --ctan-dir $ctan_pkgname`
+ctan_dir1=`tlpkginfo --ctan-dir $pkg`
if test -z "$ctan_dir1"; then
- echo "$0: can't find CTAN directory for $ctan_pkgname." >&2
+ echo "$0: can't find CTAN directory for $pkg." >&2
exit 1
fi
echo "$0: ctan dir for $pkg is $ctan_dir1"
@@ -65,6 +57,7 @@ rm -rf $pkg
# zip files for the base latex distribution and amslatex.
# We want to use them.
corelatex_tds_pkglist="babel|cyrillic|graphics|latex|psnfss|tools"
+amslatex_tds_pkglist="ams|amscls|amsltx2|amsmath|amsrefs" # dup in tlpkginfo
latex_tds_pkglist="latex-tds|$amslatex_tds_pkglist|$corelatex_tds_pkglist"
if echo "$pkg" | egrep "^($latex_tds_pkglist)\$" >/dev/null; then
diff --git a/Build/tools/tlpkginfo b/Build/tools/tlpkginfo
index e4c1d9c2a39..aba2bb9a00d 100755
--- a/Build/tools/tlpkginfo
+++ b/Build/tools/tlpkginfo
@@ -36,6 +36,13 @@ sub find_ctan_dir
my ($me) = @_;
return 1 unless $me;
+ # regrettably, this list of amslatex packages is duplicated in ctan2tl.
+ # unavoidable since ctan throws them all together, but we don't want
+ # to, to preserve the package-per-directory name.
+ if ($me =~ /^(ams|amscls|amsltx2|amsmath|amsrefs)$/) {
+ $me = "amslatex";
+ }
+
# The CTAN path to a package is sometimes stored in the TeX Catalogue,
# but old entries don't have it, etc. Still, we want to use it if present.
my $ctan_dir = &catalogue_find_ctan_path ($me);
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check
index df7412e280e..a51aef46cf7 100755
--- a/Build/tools/tpm-ctan-check
+++ b/Build/tools/tpm-ctan-check
@@ -20,6 +20,7 @@ sub main
$OPT{"verbose"} = 0;
# xx but for now, just check the few packages we have worked with.
+ # xx don't check babel, heiko patched it.
@ARGV = qw(
12many ESIEEcv GuIT HA-prosper IEEEconf IEEEtran
MemoirChapStyles SIstyle SIunits Tabbing Type1fonts
@@ -28,7 +29,7 @@ sub main
ams amscls amsldoc-it amsltx2 amsmath amsrefs amsthdoc-it
apacite arabtex
archaic arev armenian ascii aurical
- babel babelbib beamer-tut-pt beebe betababel
+ babelbib beamer-tut-pt beebe betababel
bezos bghyphen bibhtml
bibleref bigfoot blacklettert1 booklet boxhandler
breakurl bytefield