summaryrefslogtreecommitdiff
path: root/Master/tlpkg/bin
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-03-08 19:16:10 +0000
committerKarl Berry <karl@freefriends.org>2021-03-08 19:16:10 +0000
commit9fbac07cfaf6f8c5db0aeeae66423e5fedff8adc (patch)
tree6217079ead86439226c9e72777d9017761d4656d /Master/tlpkg/bin
parentbc334c3dd9395017a3d0327cd0ef1d88da2c290a (diff)
knuth tuneup2021 update from pwebmac/knuth-lib.tar.gz
git-svn-id: svn://tug.org/texlive/trunk@58228 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/bin')
-rwxr-xr-xMaster/tlpkg/bin/c2lx2
-rwxr-xr-xMaster/tlpkg/bin/ctan2tl21
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo69
3 files changed, 46 insertions, 46 deletions
diff --git a/Master/tlpkg/bin/c2lx b/Master/tlpkg/bin/c2lx
index 8981b135cf8..90473675c8a 100755
--- a/Master/tlpkg/bin/c2lx
+++ b/Master/tlpkg/bin/c2lx
@@ -20,12 +20,10 @@ cp /dev/null /tmp/first
if test "x$1" = xe; then
shift; label=l2e
pkgs="amsmath cyrillic graphics tools latex"
- # latex-tds still has knuth psnfss; babel is separate
elif test "x$1" = xdev; then
shift; label=ldev
pkgs="latex-amsmath-dev latex-firstaid-dev latex-graphics-dev"
pkgs="$pkgs latex-tools-dev latex-base-dev"
- # latex-tds still has knuth psnfss; babel is separate
elif test "x$1" = x3; then
shift; label=l3
pkgs="l3kernel l3packages l3experimental l3build l3backend"
diff --git a/Master/tlpkg/bin/ctan2tl b/Master/tlpkg/bin/ctan2tl
index 0f366a6a08c..fa14e9279d5 100755
--- a/Master/tlpkg/bin/ctan2tl
+++ b/Master/tlpkg/bin/ctan2tl
@@ -25,6 +25,8 @@ if test "x$1" = x--help; then
echo
echo "--place, -p perform repository adds/removes."
echo "--no-ctan if already have files in Build/tmp.raw/PKG."
+ echo "--contrib for https://contrib.texlive.info"
+ echo "--git for git"
echo
echo "This never actually commits anything to the repository,"
echo "but it does svn update the potentially affected directories."
@@ -33,7 +35,7 @@ if test "x$1" = x--help; then
echo "With --place, it also does repository adds and removes,"
echo "but never commits."
echo
- echo "Read and understand http://tug.org/texlive/pkgupdate.html"
+ echo "Read and understand https://tug.org/texlive/pkgupdate.html"
echo "before running this."
exit 0
fi
@@ -47,14 +49,10 @@ while true; do
case "$1" in
'-p'|'--place')
place_chicken=
- shift
- continue
- ;;
+ shift;;
'--no-ctan')
copy_from_ctan=false
- shift
- continue
- ;;
+ shift;;
'--contrib')
do_contrib=true
shift
@@ -62,13 +60,10 @@ while true; do
shift
contrib_ctan2tds_arg=--contrib
contrib_place_arg="--contrib=$contrib_place --mode=git"
- continue
;;
'--git')
mode="git"
- shift
- continue
- ;;
+ shift;;
*)
break
;;
@@ -127,11 +122,11 @@ if test "$pkg" = genmisc; then # remove files after copying in ctan2tds
cp -p \
`find $ctan_dir/* '(' -type d -o -type l ')' -prune -o \
'(' -name '*.sty' -o -name *.tex ')' -print` \
- $pkg
+ $pkg || exit 1
else
# normal case (/. to deref symlinks, e.g., arabtex)
- cp -pr $ctan_dir/. $pkg
+ cp -pr $ctan_dir/. $pkg || exit 1
fi
# clean up the tmpdir possibly created by tlpkginfo --prepare.
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 15955427bf7..a260a9742b7 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -74,7 +74,8 @@ sub ctaninfo {
# erroneous or problematic tds files (when new, tell CTAN and author)
$erroneous_tds = join ("|",
- qw(alertmessage algolrevived amstex countriesofeurope dad ebproof endfloat engpron gost
+ qw(alertmessage algolrevived amstex countriesofeurope dad ebproof
+ endfloat engpron gost
hacm inriafonts imtekda mathdesign sdaps tufte-latex xassoccnt),
);
@@ -128,65 +129,65 @@ sub find_ctan_dir {
}
}
- # 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.
+ # The CTAN path to a package is stored in the TeX Catalogue;
+ # use it if present.
my $ctan_dir = &catalogue_find_ctan_path ($me, $do_copy);
-#warn "find_ctan_dir: got $ctan_dir\n";
+#warn "find_ctan_dir: got $ctan_dir from catalogue_find_ctan_path\n";
if (! $ctan_dir) {
- # fall back on many special cases
+ # fall back on many special cases, most probably no longer needed.
(my $me_wo_bin = $me) =~ s,^bin-,,;
(my $me_wo_powerdot = $me) =~ s,^powerdot-,,;
(my $me_wo_type1 = $me) =~ s,-type1$,,;
for my $dir (
- "macros/latex/contrib/$me", # most everything
- "macros/latex/contrib/biblatex/$me", # authoryear-icomp-tt
- "macros/latex/contrib/biblatex-contrib/$me", # biblatex-*
- "macros/latex/contrib/gene/$me", # eqname
- "macros/latex/contrib/\L$me", # HA-prosper
- "macros/latex/contrib/powerdot/contrib/$me_wo_powerdot", # powerdot-doc-vn
- "macros/latex/exptl/$me", # semioneside
- "macros/latex/required/$me", # babel
+ "support/$me_wo_bin", # bin-thumbpdf
+ "support/$me", # thumbpdf
"macros/xetex/latex/$me", # xetex
"macros/xetex/generic/$me", # harvardkyoto
- "macros/plain/$me", # plnfss
"macros/plain/contrib/$me", # timetable
+ "macros/plain/$me", # plnfss
+ "macros/pdftex/$me", # mptopdf
"macros/luatex/latex/$me", # luabidi
- "macros/generic/$me", # abbr
+ "macros/latex/required/$me", # babel
+ "macros/latex/exptl/$me", # semioneside
+ "macros/latex/contrib/powerdot/contrib/$me_wo_powerdot", # powerdot-doc-vn
+ "macros/latex/contrib/gene/$me", # eqname
+ "macros/latex/contrib/biblatex/$me", # authoryear-icomp-tt
+ "macros/latex/contrib/biblatex-contrib/$me", # biblatex-*
+ "macros/latex/contrib/\L$me", # HA-prosper
+ "macros/latex/contrib/$me", # most everything
"macros/generic/diagrams/$me", # circ
- "support/$me", # thumbpdf
- "support/$me_wo_bin", # bin-thumbpdf
+ "macros/generic/$me", # abbr
"language/vietnamese/$me/unpacked", # vntex
"language/polish/$me", # cc-pl
+ "language/japanese/$me", # e.g., jfontmaps
"language/hyphenation/$me", # bghyphen
"language/hebrew/$me", # cjhebrew
"language/greek/package-babel/$me", # ibycus-babel
"language/devanagari/$me", # velthuis
"language/croatian/$me", # hrlatex
"language/coptic/$me", # cbcoptic
- "language/japanese/$me", # e.g., jfontmaps
- "info/spanish/$me", # guia-bibtex
"info/symbols/$me", # comprehensive
+ "info/spanish/$me", # guia-bibtex
"info/math/voss/$me", # mathmode
"info/challenges/$me", # AroBend
"info/bibtex/$me", # tamethebeast
"info/$me", # Type1fonts
"help/$me", # es-tex-faq
- "graphics/$me", # sparklines
- "macros/pdftex/$me", # mptopdf
- "graphics/metapost/contrib/macros/$me", # mpattern
- "graphics/pgf/contrib/$me", # celtic
- "graphics/pictex/addon/$me", # autoarea
"graphics/pstricks/contrib/pedigree/$me", # pst-pdgr
"graphics/pstricks/contrib/$me", # pstricks-add
- "fonts/$me", # MnSymbol
+ "graphics/pictex/addon/$me", # autoarea
+ "graphics/pgf/contrib/$me", # celtic
+ "graphics/metapost/contrib/macros/$me", # mpattern
+ "graphics/$me", # sparklines
"fonts/utilities/$me", # accfonts
- "fonts/ps-type1/$me", # cm-super
"fonts/ps-type1/$me_wo_type1", # esint-type1
+ "fonts/ps-type1/$me", # cm-super
"fonts/greek/$me", # lfb
"fonts/gothic/$me", # blacklettert1
"fonts/cyrillic/$me/texmf", # lh
"fonts/chess/$me", # skaknew
+ "fonts/$me", # MnSymbol
"biblio/bibtex/contrib/$me", # dk-bib
) {
if (-d "$CTAN/$dir") {
@@ -374,13 +375,14 @@ sub prepare {
# find the real ctan dir and return it if our tds is erroneous
my $ctan_loc = &find_ctan_dir ($pkg, 1); # pass do_copy=1
-#warn "prepare: ctan_loc for $pkg = $ctan_loc\n";
+#warn "prepare: ctan_loc for $pkg = $ctan_loc (from find_ctan_dir)\n";
return $ctan_loc if $pkg =~ /^($erroneous_tds)$/;
# Ordinarily the Catalogue specifies the .tds.zip file location.
my $tds_path = "";
- my $catname = tlpsrc_find_catalogue ($pkg);
+ my $catname = &tlpsrc_find_catalogue ($pkg);
my $catfile = &catalogue_find_file ($catname || $pkg);
+#warn "prepare: catfile for $pkg = $catfile (from catalogue_find_file)\n";
if ($catfile) {
# redirect to stderr because we want the only stdout to be the
# directory name for ctan2tl to use. Intentionally do not use -q
@@ -423,6 +425,10 @@ sub prepare {
} elsif ($pkg eq "hfoldsty") {
$tds_path = glob ("$CTAN/fonts/hfoldsty/hfoldsty-v*.zip");
+ } elsif ($pkg eq "knuth") {
+ # not tds, as with enctex case
+ $tds_path = glob ("$CTAN/web/pwebmac/knuth-lib.tar.gz");
+
} elsif ($pkg eq "latex") {
$tds_path = "$CTAN/install/macros/latex/latex-base.tds.zip";
@@ -441,15 +447,16 @@ sub prepare {
system ($unpack) == 0 || die "unpack failed: $!\n($unpack)";
system ("chmod -R a+rX $tmpdir");
- # put a sentinel file for ctan2tds' donormal() to work.
+ # create a sentinel file for ctan2tds' donormal() to check.
system ("echo $tds_path >$tmpdir/TDS_READY")
- unless $pkg =~ /^(cmexb|enctex)$/; # not tds
+ unless $pkg =~ /^(cmexb|enctex|knuth)$/; # not tds
return $tmpdir;
}
-# copy file to temp dir and return that for ctan2tl to use.
+# copy file, or unpacked archive, to temp dir and return that dir for
+# ctan2tl to use.
#
sub copy_to_tmpdir {
my ($pkgname,$src) = @_;