diff options
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/ctanify/ctanify | 19 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/ctanify/README | 5 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/ctanify/ctanify.pdf | bin | 15878 -> 15921 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/ctanify.1 | 11 | ||||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/ctanify.man1.pdf | bin | 15840 -> 15887 bytes | |||
-rwxr-xr-x | Master/texmf-dist/scripts/ctanify/ctanify | 19 |
6 files changed, 33 insertions, 21 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/ctanify/ctanify b/Build/source/texk/texlive/linked_scripts/ctanify/ctanify index 8702f4ecb76..6d1f4420261 100755 --- a/Build/source/texk/texlive/linked_scripts/ctanify/ctanify +++ b/Build/source/texk/texlive/linked_scripts/ctanify/ctanify @@ -19,7 +19,7 @@ use warnings; use strict; # Define some global variables. -our $VERSION = "1.6"; # ctanify version number +our $VERSION = "1.7"; # ctanify version number my $progname = basename $0; # Name of this program my $pkgname; # Base name of the package to create my $miscify = 0; # 1=replace singletons with misc; 0=don't @@ -241,7 +241,11 @@ if ($skipdroppings) { foreach my $fname (@manifest) { next if defined $file2tds{$fname}; my $fext = ($fname =~ m|([^./]+)$| && $1); - if (defined $ext2tds{$fext}) { + if ($fname =~ /\.tex$/ && $pkgname eq basename $fname, ".tex") { + # <package>.tex -- treat as documentation. + $file2tds{$fname} = sprintf $ext2tds{"README"}, $pkgname; + } + elsif (defined $ext2tds{$fext}) { # Most files -- determine the directory based on the file extension. $file2tds{$fname} = sprintf $ext2tds{$fext}, $pkgname; } @@ -253,7 +257,7 @@ foreach my $fname (@manifest) { # Read the file to determine if it's a Unix script (starts with "#!"). open(SCRIPT, "<", $fname) || die "${progname}: Failed to open $fname ($!)\n"; my $shebang; - read(SCRIPT, $shebang, 2) || die "${progname}: Failed to read $fname ($!)\n"; + read(SCRIPT, $shebang, 2); close SCRIPT; if ($shebang eq "#!") { $file2tds{$fname} = "scripts/$pkgname"; @@ -662,9 +666,10 @@ tarball. In short, before running B<ctanify> you should manually process any F<.ins> files and otherwise generate any files that should be sent to CTAN. -B<ctanify> has been tested only on Linux. It may work on S<OS X>. It -probably does not work on Windows. Volunteers willing to help port -B<ctanify> to other platforms are extremely welcome. +B<ctanify> has been tested only on Linux. It may work on S<OS X>. +I've been told that it works on Windows when run using Cygwin. +Volunteers willing to help port B<ctanify> to other platforms are +extremely welcome. =head1 SEE ALSO @@ -673,7 +678,7 @@ tar(1), zip(1), latex(1), Guidelines for uploading TDS-Packaged materials to CTAN -(L<http://www.ctan.org/TDS-guidelines.html>), +(L<http://www.ctan.org/TDS-guidelines>), A Directory Structure for TeX Files (L<http://tug.org/tds/>), diff --git a/Master/texmf-dist/doc/latex/ctanify/README b/Master/texmf-dist/doc/latex/ctanify/README index f885a3f6399..e5188a9b3e1 100644 --- a/Master/texmf-dist/doc/latex/ctanify/README +++ b/Master/texmf-dist/doc/latex/ctanify/README @@ -20,8 +20,9 @@ facilitates inclusion of the package in the TeX Live distribution of TeX. ctanify has been tested primarily on Linux but with reports from users -that it also works on OS X. Volunteers willing to help port ctanify -to other platforms are especially welcome. +that it also works on OS X and can work on Windows under Cygwin. +Volunteers willing to help port ctanify to other platforms are +especially welcome. File manifest diff --git a/Master/texmf-dist/doc/latex/ctanify/ctanify.pdf b/Master/texmf-dist/doc/latex/ctanify/ctanify.pdf Binary files differindex 7b4cdf862ed..2d76227b912 100644 --- a/Master/texmf-dist/doc/latex/ctanify/ctanify.pdf +++ b/Master/texmf-dist/doc/latex/ctanify/ctanify.pdf diff --git a/Master/texmf-dist/doc/man/man1/ctanify.1 b/Master/texmf-dist/doc/man/man1/ctanify.1 index 1a16d54d180..26b7e8214c3 100644 --- a/Master/texmf-dist/doc/man/man1/ctanify.1 +++ b/Master/texmf-dist/doc/man/man1/ctanify.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "CTANIFY 1" -.TH CTANIFY 1 "2015-05-25" "v1.6" "" +.TH CTANIFY 1 "2015-09-10" "v1.7" "" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -362,16 +362,17 @@ tarball. In short, before running \fBctanify\fR you should manually process any \fI.ins\fR files and otherwise generate any files that should be sent to \s-1CTAN.\s0 .PP -\&\fBctanify\fR has been tested only on Linux. It may work on \s-1OS\s0\ X. It -probably does not work on Windows. Volunteers willing to help port -\&\fBctanify\fR to other platforms are extremely welcome. +\&\fBctanify\fR has been tested only on Linux. It may work on \s-1OS\s0\ X. +I've been told that it works on Windows when run using Cygwin. +Volunteers willing to help port \fBctanify\fR to other platforms are +extremely welcome. .SH "SEE ALSO" .IX Header "SEE ALSO" \&\fItar\fR\|(1), \&\fIzip\fR\|(1), \&\fIlatex\fR\|(1), Guidelines for uploading TDS-Packaged materials to \s-1CTAN -\&\s0(<http://www.ctan.org/TDS\-guidelines.html>), +\&\s0(<http://www.ctan.org/TDS\-guidelines>), A Directory Structure for TeX Files (<http://tug.org/tds/>), .SH "AUTHOR" .IX Header "AUTHOR" diff --git a/Master/texmf-dist/doc/man/man1/ctanify.man1.pdf b/Master/texmf-dist/doc/man/man1/ctanify.man1.pdf Binary files differindex 58bca04a03a..e81e2c0019c 100644 --- a/Master/texmf-dist/doc/man/man1/ctanify.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/ctanify.man1.pdf diff --git a/Master/texmf-dist/scripts/ctanify/ctanify b/Master/texmf-dist/scripts/ctanify/ctanify index 8702f4ecb76..6d1f4420261 100755 --- a/Master/texmf-dist/scripts/ctanify/ctanify +++ b/Master/texmf-dist/scripts/ctanify/ctanify @@ -19,7 +19,7 @@ use warnings; use strict; # Define some global variables. -our $VERSION = "1.6"; # ctanify version number +our $VERSION = "1.7"; # ctanify version number my $progname = basename $0; # Name of this program my $pkgname; # Base name of the package to create my $miscify = 0; # 1=replace singletons with misc; 0=don't @@ -241,7 +241,11 @@ if ($skipdroppings) { foreach my $fname (@manifest) { next if defined $file2tds{$fname}; my $fext = ($fname =~ m|([^./]+)$| && $1); - if (defined $ext2tds{$fext}) { + if ($fname =~ /\.tex$/ && $pkgname eq basename $fname, ".tex") { + # <package>.tex -- treat as documentation. + $file2tds{$fname} = sprintf $ext2tds{"README"}, $pkgname; + } + elsif (defined $ext2tds{$fext}) { # Most files -- determine the directory based on the file extension. $file2tds{$fname} = sprintf $ext2tds{$fext}, $pkgname; } @@ -253,7 +257,7 @@ foreach my $fname (@manifest) { # Read the file to determine if it's a Unix script (starts with "#!"). open(SCRIPT, "<", $fname) || die "${progname}: Failed to open $fname ($!)\n"; my $shebang; - read(SCRIPT, $shebang, 2) || die "${progname}: Failed to read $fname ($!)\n"; + read(SCRIPT, $shebang, 2); close SCRIPT; if ($shebang eq "#!") { $file2tds{$fname} = "scripts/$pkgname"; @@ -662,9 +666,10 @@ tarball. In short, before running B<ctanify> you should manually process any F<.ins> files and otherwise generate any files that should be sent to CTAN. -B<ctanify> has been tested only on Linux. It may work on S<OS X>. It -probably does not work on Windows. Volunteers willing to help port -B<ctanify> to other platforms are extremely welcome. +B<ctanify> has been tested only on Linux. It may work on S<OS X>. +I've been told that it works on Windows when run using Cygwin. +Volunteers willing to help port B<ctanify> to other platforms are +extremely welcome. =head1 SEE ALSO @@ -673,7 +678,7 @@ tar(1), zip(1), latex(1), Guidelines for uploading TDS-Packaged materials to CTAN -(L<http://www.ctan.org/TDS-guidelines.html>), +(L<http://www.ctan.org/TDS-guidelines>), A Directory Structure for TeX Files (L<http://tug.org/tds/>), |