summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-12-23 23:45:40 +0000
committerKarl Berry <karl@freefriends.org>2015-12-23 23:45:40 +0000
commit46395f08db1fd908b63f6ca929f985ed12468dcc (patch)
tree26408d81693ab74a3f80dac383d06a4e49c56b8f /Master/tlpkg
parentb361149a3534bd565a40b031860524b7d7e56c76 (diff)
luaotfload (23dec15)
git-svn-id: svn://tug.org/texlive/trunk@39184 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo7
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds13
2 files changed, 15 insertions, 5 deletions
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index bdb529cfebf..bf949518d18 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -93,7 +93,7 @@ sub ctaninfo {
} elsif ($ARGV[0] eq "--prepare") {
my $output = &prepare ($ARGV[1]);
- print "$output\n";
+ print "$output\n" if $output; # if no $output, errors elsewhere
return $output ? 0 : 1;
} elsif ($ARGV[0] eq "--ctan-root") {
@@ -347,7 +347,8 @@ sub catalogue_find_ctan_path {
#
# Create a tmpdir with the tds-ready tree for PKG unpacked, if it exists,
-# else return the normal ctan dir for PKG.
+# else return the normal ctan dir for PKG. Return undef if no package
+# or can't find the ctan directory.
#
sub prepare {
my ($pkg) = @_;
@@ -359,7 +360,7 @@ sub prepare {
return $ctan_loc if $pkg =~ /^($erroneous_tds)$/;
# tds path is usually in ctan/install...
- my $tds_path = "$ctan_loc.tds.zip";
+ my $tds_path = $ctan_loc ? "$ctan_loc.tds.zip" : "";
$tds_path =~ s,^$CTAN,$CTAN/install,;
# ...except for heiko, when running on tug.org...
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 109041e1d31..e7f4147727c 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2750,7 +2750,6 @@ $standardttf = '\.ttf|\.TTC';
'pdfjam' => '\.1$',
'pkfix-helper' => 'pkfix-helper.1',
'pmx' => '\.1$',
-# 'prerex' => '\.5$',
'purifyeps' => 'purifyeps.1',
'splitindex' => '\.1$',
'srcredact' => '\.1$',
@@ -6026,7 +6025,10 @@ sub POST_otherformat {
&SYSTEM ("$MV $DEST/tex/$package/$package/* $DEST/tex/$package/");
}
-# has to be post instead of specialman because we use the tds.zip.
+# Move .1 and .5 files from source dir to man dir (if needed), and make
+# our pdfs from them.
+#
+# has to be post instead of specialman when we use the tds.zip.
# Optional argument is directory where the man pages are as distributed
# on CTAN, else doc/*/$package.
sub POST_do_man {
@@ -6052,6 +6054,13 @@ sub POST_do_man {
&SYSTEM ("$MV $src_mandir/*.1 $mandest") unless $src_mandir eq $mandest;
&tl_man_to_pdf ();
&xchdir ($origdir);
+
+ # this is for luaotfload, which already has the .5 in the right place.
+ # So we just have to rebuild.
+ if (<$DEST/doc/man/man5/*.5>) {
+ print "POST_do_man - found *.5 man pages in $DEST/doc/man/man5/\n";
+ &tl_man_to_pdf ("5");
+ }
}
sub POST_preserve_bin {