summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/bundledoc/arlatex2
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/bundledoc/bundledoc22
-rw-r--r--Master/texmf-dist/doc/man/man1/arlatex.124
-rw-r--r--Master/texmf-dist/doc/man/man1/arlatex.man1.pdfbin10173 -> 33308 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/bundledoc.128
-rw-r--r--Master/texmf-dist/doc/man/man1/bundledoc.man1.pdfbin23794 -> 50299 bytes
-rw-r--r--Master/texmf-dist/doc/support/bundledoc/README18
-rwxr-xr-xMaster/texmf-dist/scripts/bundledoc/arlatex2
-rwxr-xr-xMaster/texmf-dist/scripts/bundledoc/bundledoc22
9 files changed, 55 insertions, 63 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/bundledoc/arlatex b/Build/source/texk/texlive/linked_scripts/bundledoc/arlatex
index 32cdd45c90a..9a50f030486 100755
--- a/Build/source/texk/texlive/linked_scripts/bundledoc/arlatex
+++ b/Build/source/texk/texlive/linked_scripts/bundledoc/arlatex
@@ -9,7 +9,7 @@
########################################################################
# arlatex #
-# Copyright (C) 2014 Scott Pakin #
+# Copyright (C) 2018 Scott Pakin #
# #
# This program may be distributed and/or modified under the conditions #
# of the LaTeX Project Public License, either version 1.3c of this #
diff --git a/Build/source/texk/texlive/linked_scripts/bundledoc/bundledoc b/Build/source/texk/texlive/linked_scripts/bundledoc/bundledoc
index 7c5d489eb51..142f1aaac0d 100755
--- a/Build/source/texk/texlive/linked_scripts/bundledoc/bundledoc
+++ b/Build/source/texk/texlive/linked_scripts/bundledoc/bundledoc
@@ -7,7 +7,7 @@
########################################################################
# bundledoc #
-# Copyright (C) 2014 Scott Pakin #
+# Copyright (C) 2018 Scott Pakin #
# #
# This program may be distributed and/or modified under the conditions #
# of the LaTeX Project Public License, either version 1.3c of this #
@@ -25,14 +25,14 @@
########################################################################
use 5.006; # Fail gracefully if we're not using Perl v5.6.0.
-our $VERSION = "3.2"; # Specify the version of bundledoc.
+our $VERSION = "3.3"; # Specify the version of bundledoc.
use File::Basename;
use File::Copy;
use File::Spec::Functions qw(abs2rel catfile devnull rel2abs rootdir updir);
use File::Path;
+use File::Temp qw(tempdir);
use Getopt::Long;
use Pod::Usage;
-use POSIX;
use warnings;
use strict;
@@ -133,8 +133,8 @@ sub process_config_file ($)
sub find_dependencies ()
{
open (DEPFILE, "<$depfile") || die "${progname}: $! ($depfile)\n";
- my $braced = "{([^\}]*)}"; # Regular expression for a braced name
- my @dependencies; # List of fully-qualified filenames
+ my $braced = "\\{([^\\}]*)\\}"; # Regular expression for a braced name
+ my @dependencies; # List of fully-qualified filenames
@dependencies = qualifyname $texfile;
while (my $oneline=<DEPFILE>) {
# Parse an input line into its component fields.
@@ -255,6 +255,7 @@ my $showhelp = "";
$keepdirs = 0;
$verbose = 0;
$localonly = 0;
+Getopt::Long::Configure("bundling");
GetOptions ('texfile=s' => \$texfile,
'directory=s' => \$docdirname,
'manifest:s' => \$manifest,
@@ -263,9 +264,9 @@ GetOptions ('texfile=s' => \$texfile,
'exclude=s' => \@exclude_files,
'include=s' => \@include_files,
'config=s' => sub { process_config_file($_[1]) },
- 'verbose!' => \$verbose,
+ 'v|verbose!' => \$verbose,
'listdeps=s' => \@listdeps,
- 'version' => sub { print "bundledoc $VERSION\n"; exit -1 },
+ 'V|version' => sub { print "bundledoc $VERSION\n"; exit -1 },
'help' => \$showhelp) || pod2usage (-exitval => 1, -verbose => 0);
pod2usage (-exitval => 0,
-verbose => 1) if $showhelp && $verbose;
@@ -305,10 +306,9 @@ if ($keepdirs) {
}
else {
# Copy each of the dependencies to a temporary directory and tar it up.
- my $tempdir = tmpnam();
+ my $tempdir = tempdir("bundledoc-XXXXXX", TMPDIR => 1, CLEANUP => 1);
my $tempdir2 = catfile $tempdir, $docdirname;
- print "CREATING $tempdir\n" if $verbose;
- mkdir ($tempdir, 0777) || die "${progname}: $! ($tempdir)\n";
+ print "CREATING $tempdir\n" if $verbose; # White lie: already created
print "CREATING $tempdir2\n" if $verbose;
mkdir ($tempdir2, 0777) || die "${progname}: $! ($tempdir2)\n";
foreach my $dep (@dependencies) {
@@ -811,7 +811,7 @@ to run B<bundledoc> on a different system.
I'd like B<bundledoc> to work on as wide a variety of TeX
distributions as possible. If your platform is significantly
different from the ones listed in L<"Testing Status"> (e.g., if you're
-running Z<OS X>) and you need to create a substantially different
+running S<OS X>) and you need to create a substantially different
configuration file from F<texlive-unix.cfg> and F<miktex.cfg>, please
send it to me at the address listed in L<"AUTHOR"> so I can include it
in a future version of B<bundledoc>. (I make no promises, though).
diff --git a/Master/texmf-dist/doc/man/man1/arlatex.1 b/Master/texmf-dist/doc/man/man1/arlatex.1
index ab0c881a359..b485702d89d 100644
--- a/Master/texmf-dist/doc/man/man1/arlatex.1
+++ b/Master/texmf-dist/doc/man/man1/arlatex.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -46,7 +46,7 @@
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
@@ -54,20 +54,16 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-. if \nF \{
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{
-. nr % 0
-. nr F 2
-. \}
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
. \}
.\}
-.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -133,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "ARLATEX 1"
-.TH ARLATEX 1 "2014-08-24" "v1.03" "User Commands"
+.TH ARLATEX 1 "2018-05-23" "v1.03" "User Commands"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/Master/texmf-dist/doc/man/man1/arlatex.man1.pdf b/Master/texmf-dist/doc/man/man1/arlatex.man1.pdf
index 6ff47875a0a..676feee04e8 100644
--- a/Master/texmf-dist/doc/man/man1/arlatex.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/arlatex.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/bundledoc.1 b/Master/texmf-dist/doc/man/man1/bundledoc.1
index 03b082fb65f..7f0ee40a690 100644
--- a/Master/texmf-dist/doc/man/man1/bundledoc.1
+++ b/Master/texmf-dist/doc/man/man1/bundledoc.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -46,7 +46,7 @@
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
@@ -54,20 +54,16 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-. if \nF \{
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{
-. nr % 0
-. nr F 2
-. \}
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
. \}
.\}
-.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -133,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "BUNDLEDOC 1"
-.TH BUNDLEDOC 1 "2014-08-24" "v3.2" "User Commands"
+.TH BUNDLEDOC 1 "2018-05-23" "v3.3" "User Commands"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -346,7 +342,7 @@ The following configuration file parallels \fBbundledoc\fR's default
values of the various configuration-file variables, which represents a
kpathsea-based TeX distribution running on a generic Unix system,
which doesn't necessarily have any of the \s-1GNU\s0 tools, such as \fBgzip\fR
-or \s-1GNU \s0\fBtar\fR:
+or \s-1GNU\s0 \fBtar\fR:
.PP
.Vb 2
\& # "Default" configuration file
@@ -503,7 +499,7 @@ to run \fBbundledoc\fR on a different system.
I'd like \fBbundledoc\fR to work on as wide a variety of TeX
distributions as possible. If your platform is significantly
different from the ones listed in \*(L"Testing Status\*(R" (e.g., if you're
-running ) and you need to create a substantially different
+running \s-1OS\s0\ X) and you need to create a substantially different
configuration file from \fItexlive\-unix.cfg\fR and \fImiktex.cfg\fR, please
send it to me at the address listed in \*(L"\s-1AUTHOR\*(R"\s0 so I can include it
in a future version of \fBbundledoc\fR. (I make no promises, though).
diff --git a/Master/texmf-dist/doc/man/man1/bundledoc.man1.pdf b/Master/texmf-dist/doc/man/man1/bundledoc.man1.pdf
index 7ad9bf9baa5..39d7e9c8495 100644
--- a/Master/texmf-dist/doc/man/man1/bundledoc.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/bundledoc.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/bundledoc/README b/Master/texmf-dist/doc/support/bundledoc/README
index 2e96af6d782..30b66220219 100644
--- a/Master/texmf-dist/doc/support/bundledoc/README
+++ b/Master/texmf-dist/doc/support/bundledoc/README
@@ -25,15 +25,15 @@ as its archiver in place of tar, zip, etc.
Files
-----
--rwxrwxr-x 1 pakin users 9978 Aug 24 22:43 arlatex
--rw-r--r-- 1 pakin users 10266 Aug 24 22:52 arlatex.1
--rw-r--r-- 1 pakin users 10167 Aug 24 22:52 arlatex.pdf
--rwxrwxr-x 1 pakin users 29261 Aug 24 23:07 bundledoc
--rw-r--r-- 1 pakin users 23093 Aug 24 23:07 bundledoc.1
--rw-r--r-- 1 pakin users 22943 Aug 24 23:07 bundledoc.pdf
+-rwxrwxr-x 1 pakin users 9978 May 22 22:39 arlatex
+-rw-r--r-- 1 pakin users 10176 May 22 22:40 arlatex.1
+-rw-r--r-- 1 pakin users 16731 May 22 22:40 arlatex.pdf
+-rwxrwxr-x 1 pakin users 29338 May 22 22:37 bundledoc
+-rw-r--r-- 1 pakin users 23015 May 22 22:37 bundledoc.1
+-rw-r--r-- 1 pakin users 29217 May 22 22:37 bundledoc.pdf
-rw-rw-r-- 1 pakin users 342 Jan 22 2014 miktex.cfg
--rw-r--r-- 1 pakin users 4430 Aug 24 23:07 README
--rw-r--r-- 1 pakin users 248 Aug 24 22:17 texlive-unix-arlatex.cfg
+-rw-r--r-- 1 pakin users 4430 May 22 22:40 README
+-rw-r--r-- 1 pakin users 248 Aug 24 2014 texlive-unix-arlatex.cfg
-rw-rw-r-- 1 pakin users 230 Apr 9 2010 texlive-unix.cfg
@@ -84,7 +84,7 @@ Copyright and license
---------------------
bundledoc
- Copyright (C) 2014 Scott Pakin
+ Copyright (C) 2018 Scott Pakin
This program may be distributed and/or modified under the conditions
of the LaTeX Project Public License, either version 1.3c of this
diff --git a/Master/texmf-dist/scripts/bundledoc/arlatex b/Master/texmf-dist/scripts/bundledoc/arlatex
index 32cdd45c90a..9a50f030486 100755
--- a/Master/texmf-dist/scripts/bundledoc/arlatex
+++ b/Master/texmf-dist/scripts/bundledoc/arlatex
@@ -9,7 +9,7 @@
########################################################################
# arlatex #
-# Copyright (C) 2014 Scott Pakin #
+# Copyright (C) 2018 Scott Pakin #
# #
# This program may be distributed and/or modified under the conditions #
# of the LaTeX Project Public License, either version 1.3c of this #
diff --git a/Master/texmf-dist/scripts/bundledoc/bundledoc b/Master/texmf-dist/scripts/bundledoc/bundledoc
index 7c5d489eb51..142f1aaac0d 100755
--- a/Master/texmf-dist/scripts/bundledoc/bundledoc
+++ b/Master/texmf-dist/scripts/bundledoc/bundledoc
@@ -7,7 +7,7 @@
########################################################################
# bundledoc #
-# Copyright (C) 2014 Scott Pakin #
+# Copyright (C) 2018 Scott Pakin #
# #
# This program may be distributed and/or modified under the conditions #
# of the LaTeX Project Public License, either version 1.3c of this #
@@ -25,14 +25,14 @@
########################################################################
use 5.006; # Fail gracefully if we're not using Perl v5.6.0.
-our $VERSION = "3.2"; # Specify the version of bundledoc.
+our $VERSION = "3.3"; # Specify the version of bundledoc.
use File::Basename;
use File::Copy;
use File::Spec::Functions qw(abs2rel catfile devnull rel2abs rootdir updir);
use File::Path;
+use File::Temp qw(tempdir);
use Getopt::Long;
use Pod::Usage;
-use POSIX;
use warnings;
use strict;
@@ -133,8 +133,8 @@ sub process_config_file ($)
sub find_dependencies ()
{
open (DEPFILE, "<$depfile") || die "${progname}: $! ($depfile)\n";
- my $braced = "{([^\}]*)}"; # Regular expression for a braced name
- my @dependencies; # List of fully-qualified filenames
+ my $braced = "\\{([^\\}]*)\\}"; # Regular expression for a braced name
+ my @dependencies; # List of fully-qualified filenames
@dependencies = qualifyname $texfile;
while (my $oneline=<DEPFILE>) {
# Parse an input line into its component fields.
@@ -255,6 +255,7 @@ my $showhelp = "";
$keepdirs = 0;
$verbose = 0;
$localonly = 0;
+Getopt::Long::Configure("bundling");
GetOptions ('texfile=s' => \$texfile,
'directory=s' => \$docdirname,
'manifest:s' => \$manifest,
@@ -263,9 +264,9 @@ GetOptions ('texfile=s' => \$texfile,
'exclude=s' => \@exclude_files,
'include=s' => \@include_files,
'config=s' => sub { process_config_file($_[1]) },
- 'verbose!' => \$verbose,
+ 'v|verbose!' => \$verbose,
'listdeps=s' => \@listdeps,
- 'version' => sub { print "bundledoc $VERSION\n"; exit -1 },
+ 'V|version' => sub { print "bundledoc $VERSION\n"; exit -1 },
'help' => \$showhelp) || pod2usage (-exitval => 1, -verbose => 0);
pod2usage (-exitval => 0,
-verbose => 1) if $showhelp && $verbose;
@@ -305,10 +306,9 @@ if ($keepdirs) {
}
else {
# Copy each of the dependencies to a temporary directory and tar it up.
- my $tempdir = tmpnam();
+ my $tempdir = tempdir("bundledoc-XXXXXX", TMPDIR => 1, CLEANUP => 1);
my $tempdir2 = catfile $tempdir, $docdirname;
- print "CREATING $tempdir\n" if $verbose;
- mkdir ($tempdir, 0777) || die "${progname}: $! ($tempdir)\n";
+ print "CREATING $tempdir\n" if $verbose; # White lie: already created
print "CREATING $tempdir2\n" if $verbose;
mkdir ($tempdir2, 0777) || die "${progname}: $! ($tempdir2)\n";
foreach my $dep (@dependencies) {
@@ -811,7 +811,7 @@ to run B<bundledoc> on a different system.
I'd like B<bundledoc> to work on as wide a variety of TeX
distributions as possible. If your platform is significantly
different from the ones listed in L<"Testing Status"> (e.g., if you're
-running Z<OS X>) and you need to create a substantially different
+running S<OS X>) and you need to create a substantially different
configuration file from F<texlive-unix.cfg> and F<miktex.cfg>, please
send it to me at the address listed in L<"AUTHOR"> so I can include it
in a future version of B<bundledoc>. (I make no promises, though).