summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check3
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds10
-rw-r--r--Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/knuth.tlpsrc11
4 files changed, 5 insertions, 21 deletions
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index b01fde8fe23..81f835f5994 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -415,7 +415,8 @@ my @TLP_working = qw(
kblocks kdgdocs kerkis kerntest ketcindy
keycommand keyfloat keyindex keyreader keystroke
keyval2e keyvaltable kix kixfont
- knitting knittingpattern knowledge knuth knuth-errata knuth-lib knuth-local
+ knitting knittingpattern knowledge
+ knuth-errata knuth-lib knuth-local knuth-pdf
koma-moderncvclassic koma-script koma-script-examples koma-script-sfs
komacv komacv-rg kotex-oblivoir kotex-plain kotex-utf kotex-utils
kpfonts kpfonts-otf ksfh_nat ksp-thesis
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 57b09f42783..c79f7fd2514 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -679,6 +679,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'keys3', "die 'skipping, merged into expl3'",
'knit', "die 'skipping, ancient program'",
'knitting', "&MAKEflatten",
+ 'knuth', "die 'skipping, use knuth-pdf, knuth-errata, etc.'",
'koi8', "die 'skipping, ca.1996, noinfo license'",
'koma-script-SFS', "die 'skipping, use koma-script-sfs'",
'koma-script-examples-3', "die 'skipping, just have koma-script-examples'",
@@ -1595,7 +1596,6 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'impatient-fr' => '&POSTimpatient_fr',
'interactiveworkbook' => '&POSTinteractiveworkbook',
'knitting' => '&POSTknitting',
- 'knuth' => '&POSTknuth',
'knuth-lib' => '&POSTknuth_lib',
'koma-script' => '&POSTkoma_script', #'&POST_rmsymlink',
'kotex-oblivoir' => '&POSTkotex_oblivoir',
@@ -2424,8 +2424,8 @@ $standardtex
'junicode', 'fonts',
'kixfont', 'fonts',
'knitting', 'fonts',
- 'knuth', 'generic',
'knuth-errata', 'generic',
+ 'knuth-pdf', 'generic',
'kotex-plain', 'plain',
'kpfonts', 'fonts',
'latexmk', 'support',
@@ -3586,7 +3586,6 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
'pas-tableur' => '\.pdf$', # no source
'piechartmp' => 'piechartmp.pdf', # no source
'ptptex' => '(overcite|cite|wrapfig).sty', # duplicated
- 'pwebmac' => 'knuth-lib.tar.gz', # -> package knuth
'sapthesis' => '.*-ML.*\.pdf', # univ logos
'scientific-thesis-cover' => 'demo.pdf', # no source
'sectionbox' => 'example/lenna.*.jpg', # nonfree
@@ -6637,11 +6636,6 @@ sub POSTknitting {
&SYSTEM ("$MV knitting.tex $dest/");
}
-sub POSTknuth {
- print "POST$package - extract pwebmac/knuth-lib.tar.gz\n";
- #&xsystem ("tar xf knuth-lib.tar.gz");
-}
-
sub POSTknuth_lib {
print "POST$package - removing some base files\n";
&SYSTEM ("rm -rf $DEST/doc/*/knuth-lib/*.mft");
diff --git a/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc
index 55eb18ecabe..3cf8166d2d1 100644
--- a/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc
@@ -26,8 +26,8 @@ depend guide-to-latex
depend happy4th
depend impatient
depend intro-scientific
-depend knuth
depend knuth-errata
+depend knuth-pdf
depend l2tabu-english
depend latex-brochure
depend latex-course
diff --git a/Master/tlpkg/tlpsrc/knuth.tlpsrc b/Master/tlpkg/tlpsrc/knuth.tlpsrc
deleted file mode 100644
index 1e9f1b73c48..00000000000
--- a/Master/tlpkg/tlpsrc/knuth.tlpsrc
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-category TLCore
-catalogue knuth
-shortdesc PDF form of (C)WEB programs and errata by Knuth and others
-#
-longdesc The (C)WEB programs and manuals by Donald Knuth and others, typeset
-longdesc as PDF. The changes used in Web2C are also typeset, as separate
-longdesc files. Knuth's errata are also included in typeset form.
-longdesc
-longdesc For the construction of these, see the pwebmac package. For the
-longdesc sources, see the knuth-errata package and the Web2C source tree.