summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-05-11 23:39:35 +0000
committerKarl Berry <karl@freefriends.org>2013-05-11 23:39:35 +0000
commitff23b767abc786ac5279f6e85f5a83a143c055f5 (patch)
treef2fd709712b6064ab7f95700c9ffb9e612d1cf6c
parent5af5e06dbed74dbf06e36afb02d3157d16342ddd (diff)
texmf-dist
git-svn-id: svn://tug.org/texlive/trunk@30411 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/readme-html.dir/readme.en.html12
-rw-r--r--Master/readme-txt.dir/README.EN22
-rwxr-xr-xMaster/tlpkg/bin/htmltext3
-rwxr-xr-xMaster/tlpkg/bin/tlpsizes2
4 files changed, 20 insertions, 19 deletions
diff --git a/Master/readme-html.dir/readme.en.html b/Master/readme-html.dir/readme.en.html
index 476d7a13925..ca70b5ad9ae 100644
--- a/Master/readme-html.dir/readme.en.html
+++ b/Master/readme-html.dir/readme.en.html
@@ -25,16 +25,16 @@ undertaking the installation. It includes step-by-step instructions, a
description of the top-level directories, and more.
<p>If you are installing from the DVD image, the Guide in English and
-all the translations are in the <a href="../texlive-doc">texlive-doc</a>
+all the translations are in the <a href="../../texlive-doc">texlive-doc</a>
subdirectory.
<p>After installation, English versions of the Guide are in the <a
-href="../texmf/doc/texlive/texlive-en">texmf/doc/texlive/</a> hierarchy,
-in both <a
-href="../texmf/doc/texlive/texlive-en/texlive-en.html">html</a> and <a
-href="../texmf/doc/texlive/texlive-en/texlive-en.pdf">pdf</a>
+href="../texmf-dist/doc/texlive/texlive-en">texmf-dist/doc/texlive/</a>
+hierarchy, in both <a
+href="../texmf-dist/doc/texlive/texlive-en/texlive-en.html">html</a> and <a
+href="../texmf-dist/doc/texlive/texlive-en/texlive-en.pdf">pdf</a>
formats. Translations to other languages are also available under <a
-href="../texmf/doc/texlive/">texmf/doc/texlive</a>.
+href="../texmf-dist/doc/texlive/">texmf-dist/doc/texlive</a>.
<p>We also provide a list of <a href="../doc.html">links to the
available PDF and HTML documentation</a> for the included packages and
diff --git a/Master/readme-txt.dir/README.EN b/Master/readme-txt.dir/README.EN
index 57df5113991..41b392fc1a5 100644
--- a/Master/readme-txt.dir/README.EN
+++ b/Master/readme-txt.dir/README.EN
@@ -23,9 +23,9 @@ Welcome to TeX Live
the translations are in the [3]texlive-doc subdirectory.
After installation, English versions of the Guide are in the
- [4]texmf/doc/texlive/ hierarchy, in both [5]html and [6]pdf formats.
- Translations to other languages are also available under
- [7]texmf/doc/texlive.
+ [4]texmf-dist/doc/texlive/ hierarchy, in both [5]html and [6]pdf
+ formats. Translations to other languages are also available under
+ [7]texmf-dist/doc/texlive.
We also provide a list of [8]links to the available PDF and HTML
documentation for the included packages and programs.
@@ -88,14 +88,14 @@ Welcome to TeX Live
References
- 1. file:tlua/LICENSE.TL
- 2. file:tlua/LICENSE.CTAN
- 3. file:tlua/texlive-doc
- 4. file:tlua/texmf/doc/texlive/texlive-en
- 5. file:tlua/texmf/doc/texlive/texlive-en/texlive-en.html
- 6. file:tlua/texmf/doc/texlive/texlive-en/texlive-en.pdf
- 7. file:tlua/texmf/doc/texlive/
- 8. file:tlua/doc.html
+ 1. file:../LICENSE.TL
+ 2. file:../LICENSE.CTAN
+ 3. file:../../texlive-doc
+ 4. file:../texmf-dist/doc/texlive/texlive-en
+ 5. file:../texmf-dist/doc/texlive/texlive-en/texlive-en.html
+ 6. file:../texmf-dist/doc/texlive/texlive-en/texlive-en.pdf
+ 7. file:../texmf-dist/doc/texlive/
+ 8. file:../doc.html
9. http://tug.org/texlive/doc.html
10. http://tug.org/texlive/doc/install-tl.html
11. http://tug.org/texlive/tlmgr.html
diff --git a/Master/tlpkg/bin/htmltext b/Master/tlpkg/bin/htmltext
index b03826a5d4c..99daca0ab37 100755
--- a/Master/tlpkg/bin/htmltext
+++ b/Master/tlpkg/bin/htmltext
@@ -19,5 +19,6 @@ for url in "$@"; do
# Since the reference list is useful, we fix it up by hand instead of
# using -nolist.
lynx -dump -nocolor -hiddenlinks=ignore "$url" \
- | sed 's,file://localhost/tmp/,file:,'
+ | sed -e 's,file://localhost/home/texlive/karl/Master/,file:../,' \
+ -e 's,file://localhost/home/texlive/karl/,file:../../,'
done
diff --git a/Master/tlpkg/bin/tlpsizes b/Master/tlpkg/bin/tlpsizes
index b198168c01d..795e935cdd0 100755
--- a/Master/tlpkg/bin/tlpsizes
+++ b/Master/tlpkg/bin/tlpsizes
@@ -60,7 +60,6 @@ sub main {
$c_size{$name} = $pkg_sizes->{__TOTAL__};
delete $pkg_sizes->{"__TOTAL__"}; # don't need that any more
delete $pkg_sizes->{"hyph-utf8"} if $name =~ m/^collection-lang/;
- delete $pkg_sizes->{$name}; # always includes itself, with zero size
$c_pkgs{$name} = &pkgs_by_size (%$pkg_sizes);
@@ -86,6 +85,7 @@ sub pkgs_by_size {
for my $p (sort { $pkg_sizes{$b} <=> $pkg_sizes{$a} }
keys %pkg_sizes) {
+ next if $pkg_sizes{$p} == 0;
$ret .= " ";
$ret .= $pkg_sizes{$p} / 1024;
$ret .= "/$p";