summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-12-25 23:23:11 +0000
committerKarl Berry <karl@freefriends.org>2011-12-25 23:23:11 +0000
commitf878cb7be63ae0713be946801280feeae15e7407 (patch)
tree77ef50af433f10a9ab387b8facc399b02f30d441
parentb341186658a035a1fcb51ec4f781ba0db31b1819 (diff)
libertine-legacy direct from texmf.zip
git-svn-id: svn://tug.org/texlive/trunk@24946 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/libertine-legacy/index.ist (renamed from Master/texmf-dist/makeindex/libertine-legacy/index.ist)0
-rw-r--r--Master/texmf-dist/doc/fonts/libertine-legacy/libertinedoku.cls (renamed from Master/texmf-dist/tex/latex/libertine-legacy/libertinedoku.cls)0
-rw-r--r--Master/texmf-dist/doc/fonts/libertine-legacy/samples/libertinetext.pdfbin2342788 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/libertine-legacy/samples/libertinetexte.pdfbin2312188 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/libertine-legacy/samples/libertinetextf.pdfbin2327838 -> 0 bytes
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check6
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo8
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
8 files changed, 9 insertions, 6 deletions
diff --git a/Master/texmf-dist/makeindex/libertine-legacy/index.ist b/Master/texmf-dist/doc/fonts/libertine-legacy/index.ist
index 1be4713f962..1be4713f962 100644
--- a/Master/texmf-dist/makeindex/libertine-legacy/index.ist
+++ b/Master/texmf-dist/doc/fonts/libertine-legacy/index.ist
diff --git a/Master/texmf-dist/tex/latex/libertine-legacy/libertinedoku.cls b/Master/texmf-dist/doc/fonts/libertine-legacy/libertinedoku.cls
index 7e15d99869c..7e15d99869c 100644
--- a/Master/texmf-dist/tex/latex/libertine-legacy/libertinedoku.cls
+++ b/Master/texmf-dist/doc/fonts/libertine-legacy/libertinedoku.cls
diff --git a/Master/texmf-dist/doc/fonts/libertine-legacy/samples/libertinetext.pdf b/Master/texmf-dist/doc/fonts/libertine-legacy/samples/libertinetext.pdf
deleted file mode 100644
index 435c84f2ec4..00000000000
--- a/Master/texmf-dist/doc/fonts/libertine-legacy/samples/libertinetext.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/libertine-legacy/samples/libertinetexte.pdf b/Master/texmf-dist/doc/fonts/libertine-legacy/samples/libertinetexte.pdf
deleted file mode 100644
index 4ebf1763f9f..00000000000
--- a/Master/texmf-dist/doc/fonts/libertine-legacy/samples/libertinetexte.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/libertine-legacy/samples/libertinetextf.pdf b/Master/texmf-dist/doc/fonts/libertine-legacy/samples/libertinetextf.pdf
deleted file mode 100644
index d04e530f239..00000000000
--- a/Master/texmf-dist/doc/fonts/libertine-legacy/samples/libertinetextf.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 06ae2c87974..2fe8f28bc6e 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -598,7 +598,7 @@ sub do_tlp {
# if file exists by multiple names in TL (e.g., README), only check
# the first one we come across, since we'll only find the first one
# on CTAN and we don't want to try to match subdir suffixes.
- next if grep { $_ eq "$basefile" } @tl_basefiles;
+ next if grep { $_ eq $basefile } @tl_basefiles;
#warn "checking tl file $file -> $basefile\n";
push (@tl_basefiles, $basefile);
@@ -607,6 +607,9 @@ sub do_tlp {
# all we have to compare.
next if $file =~ /\.pdf$/ && $file !~ /short|mathdesign/;
+ # Lowercase readme wrongly matched against uppercase README in musixtex.
+ next if $basefile eq "readme";
+
my $tl_file = "$Master/$file";
if (! -e $tl_file) {
warn "$tl_file: TL file missing\n";
@@ -624,6 +627,7 @@ sub do_tlp {
if (! -e $ctan_file) {
# maybe it'll be there with a case change in the name
chomp (@ctan_files = `find $ctan_dir/ -iname $basefile`);
+#warn "ctan ifind $basefile: @ctan_files\n";
next if @ctan_files > 1; # if more than one file by same name, skip
$ctan_file = $ctan_files[0];
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 551ed3aef44..ce4a27cc098 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -281,14 +281,14 @@ sub prepare {
$tds_path = "/home/ftp/tex/$pkg/$pkg.tds.zip";
# will be ignored below if it doesn't exist.
- # ...and except for amsfonts ...
+ # ...and except for amsfonts, and others ...
} elsif ($pkg eq "amsfonts") {
- # CTAN apparently doesn't want to put this in install:
$tds_path = "$CTAN/fonts/amsfonts/amsfonts.zip";
- # ...and except for koma-script ...
+ } elsif ($pkg eq "libertine-legacy") {
+ $tds_path = "$CTAN/fonts/libertine-legacy/libertine-legacy-texmf.zip";
+
} elsif ($pkg eq "koma-script") {
- # CTAN apparently doesn't want to put this in install:
$tds_path = "$CTAN/macros/latex/contrib/koma-script/komascript.tds.zip";
# ...and except for files in latex-tds...
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 9aeef1e0d37..e5a97155101 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -935,7 +935,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'cm-super' => '&PREHOOK_cm_super',
'fixme' => '&PREHOOK_fixme',
'ibygrk' => '&PREHOOK_ibygrk',
- 'libertine-legacy' => '&PREHOOK_unzip',
'mathspic' => '&PREHOOK_mathspic',
'musixtex' => '&PREHOOK_musixtex',
'musixtex-fonts' => '&PREHOOK_unzip',