add ctan link in doc.html

git-svn-id: svn://tug.org/texlive/trunk@50443 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 11 insertions, 8 deletions

diff --git a/Master/tlpkg/bin/tl-update-auto b/Master/tlpkg/bin/tl-update-auto
index 96beacf3282..166a2733d21 100755
--- a/Master/tlpkg/bin/tl-update-auto
+++ b/Master/tlpkg/bin/tl-update-auto
@@ -223,7 +223,7 @@ grep -v '<small>Generated' doc.html >$temp.doc.cur
 if $diff $temp.doc.cur $temp.doc.new >$temp.doc.diff; then
   $verbose "  doc.html ok."
 else
-  $chicken $cp $temp.doc.new doc.html
+  $chicken $cp $temp.doc doc.html
   update_list="$update_list doc.html"
 fi
 fi # !config_scripts_only
diff --git a/Master/tlpkg/bin/tl-update-docindex b/Master/tlpkg/bin/tl-update-docindex
index 8b943095c6e..102ba619227 100755
--- a/Master/tlpkg/bin/tl-update-docindex
+++ b/Master/tlpkg/bin/tl-update-docindex
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 # $Id$
 # Make index file of all HTML and PDF documentation (printed on stdout).
-# Originally written 2009, Manuel Pégourié-Gonnard. WTFPL v2.
+# Originally written 2009, Manuel P\'egouri\'e-Gonnard. WTFPL v2.
 
 BEGIN {
     $0 =~ m#(.*)/(.*)#; ($progdir, $progname) = ($1, $2);
@@ -32,7 +32,8 @@ sub main {
 <h1>TeX Live documentation</h1>
 
 <p>This document lists links to all HTML and PDF files for packages and guides
-contained in TeX Live, sorted by package name.</p>
+contained in <a href="https://tug.org/texlive/">TeX Live</a>, sorted by
+package name.</p>
 END_HEADER
 
     print_all_pkg($tlpdb);
@@ -76,7 +77,7 @@ sub push_pkg_list {
     my $name = $tlpkg->name;
     my @docfiles = $tlpkg->docfiles;
 
-    # if no adequate documentation is found, print nothing
+    # if no adequate documentation is found, print nothing
     @docfiles = grep { m/\.(html|pdf)/ } @docfiles;
     return if @docfiles == 0;
     $n++; # list counter
@@ -104,7 +105,8 @@ sub push_pkg_list {
 
     # print package name with shortdesc
     my $dir = dirname($docfiles[0]);
-    push @lines, qq#\n<li><b><a href="$dir">$name</a></b>:<small>\n#;
+    push @lines, qq#\n<li><b><a href="$dir">$name</a></b><small>\n#;
+    push @lines, qq#(<a href="https://ctan.org/pkg/$name">CTAN</a>):\n#;
     my $shortdesc = $tlpkg->shortdesc;
     push @lines, "$shortdesc\n" if defined $shortdesc;
     #warn "$name\n" if not defined $shortdesc;
@@ -115,10 +117,11 @@ sub push_pkg_list {
         my $name = basename($file);
         $list .= qq#<a href="$file">$name</a>#;
         my $dflanguage = $tlpkg->{'docfiledata'}{$file}{'language'};
-        $list .= " ($dflanguage)" if defined $dflanguage;
-        $list .= ",\n";
+        $list .= "&nbsp;($dflanguage)&nbsp;"
+                 if (defined $dflanguage && $dflanguage ne "en");
+        $list .= "\n";
     }
-    $list =~ s/,\n$/./;
+    $list =~ s/(&nbsp;)?\n$/./;
     push @lines, "$list\n</small></li>\n";
 }