ctanify (19jun13)

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

4 files changed, 16 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/latex/ctanify/ctanify.pdf b/Master/texmf-dist/doc/latex/ctanify/ctanify.pdf
index 94ca8a80615..51e54ce3d0e 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 9185aa942ea..feedc6799b9 100644
--- a/Master/texmf-dist/doc/man/man1/ctanify.1
+++ b/Master/texmf-dist/doc/man/man1/ctanify.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CTANIFY 1"
-.TH CTANIFY 1 "2013-05-17" "v1.3" ""
+.TH CTANIFY 1 "2013-06-18" "v1.4" ""
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -367,8 +367,10 @@ This work may be distributed and/or modified under the conditions of
 the LaTeX Project Public License, either version\ 1.3c of this
 license or (at your option) any later version.  The latest version of
 this license is in
-.PP
+.Sp
+.RS 4
 http://www.latex\-project.org/lppl.txt <http://www.latex-project.org/lppl.txt>
+.RE
 .PP
 and version\ 1.3c or later is part of all distributions of LaTeX
 version 2008/05/04 or later.
diff --git a/Master/texmf-dist/doc/man/man1/ctanify.man1.pdf b/Master/texmf-dist/doc/man/man1/ctanify.man1.pdf
index 3801316d4da..112d3ef1d9a 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 32dcee305ea..5fa852a8ca7 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.3";          # ctanify version number
+our $VERSION = "1.4";          # 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
@@ -186,14 +186,18 @@ if ($autoinclude) {
 
         # Add all source files (\from) to the manifest.
         while ($insfile =~ /\\from\{([^\}]+)\}/g) {
-            push @manifest, $1;
+            my $fname_exp = $1;
+            $fname_exp =~ s/\\jobname\b/$pkgname/g;
+            push @manifest, $fname_exp;
         }
 
         # Add all generated files (\file) to the manifest but also to
         # the list of TDS-only inclusions.
         while ($insfile =~ /\\file\{([^\}]+)\}/g) {
-            push @manifest, $1;
-            push @tdsonly, $1;
+            my $fname_exp = $1;
+            $fname_exp =~ s/\\jobname\b/$pkgname/g;
+            push @manifest, $fname_exp;
+            push @tdsonly, $fname_exp;
         }
     }
 }
@@ -663,7 +667,11 @@ the LaTeX Project Public License, either S<version 1.3c> of this
 license or (at your option) any later version.  The latest version of
 this license is in
 
+=over 4
+
 L<http://www.latex-project.org/lppl.txt>
 
+=back
+
 and S<version 1.3c> or later is part of all distributions of LaTeX
 version 2008/05/04 or later.