summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-10-04 19:57:23 +0000
committerKarl Berry <karl@freefriends.org>2022-10-04 19:57:23 +0000
commit3cf77160cbc897a106406cf1b982b675867c6438 (patch)
tree62a095381fbadb6cd79987342c29e9a589c0fce5
parent8ccabc4d813ca9c92e85e0bf44d2cbbd04dadb64 (diff)
bundledoc (4oct22)
git-svn-id: svn://tug.org/texlive/trunk@64620 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/bundledoc/arlatex23
-rw-r--r--Master/texmf-dist/doc/man/man1/arlatex.120
-rw-r--r--Master/texmf-dist/doc/man/man1/arlatex.man1.pdfbin32743 -> 31898 bytes
-rw-r--r--Master/texmf-dist/doc/support/bundledoc/README18
-rwxr-xr-xMaster/texmf-dist/scripts/bundledoc/arlatex23
5 files changed, 41 insertions, 43 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/bundledoc/arlatex b/Build/source/texk/texlive/linked_scripts/bundledoc/arlatex
index 9a50f030486..f0031654e22 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) 2018 Scott Pakin #
+# Copyright (C) 2018-2022 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 #
@@ -27,7 +27,7 @@
########################################################################
use 5.006; # Fail gracefully if we're not using Perl v5.6.0.
-our $VERSION = "1.03"; # Specify the version of arlatex.
+our $VERSION = "1.1"; # Specify the version of arlatex.
use Getopt::Long;
use Pod::Usage;
use File::Basename;
@@ -50,7 +50,7 @@ sub includefile ($)
next if $basefilename eq $baseoutfile; # Don't let a file overwrite itself.
$basefilename = "\"$basefilename\"" if $basefilename =~ /\s/ && substr($basefilename, 0, 1) ne '"';
open (SOMEFILE, "<$filename") || die "${progname}: $! ($filename)\n";
- print OUTFILE "\\begin{filecontents*}{$basefilename}\n";
+ print OUTFILE "\\begin{filecontents*}[overwrite]{$basefilename}\n";
print OUTFILE <SOMEFILE>;
print OUTFILE "\\end{filecontents*}\n";
close SOMEFILE;
@@ -88,7 +88,6 @@ open (OUTFILE, ">$outfile") || die "${progname}: $! ($outfile)\n";
while ($entirefile[0] =~ /^\s*(\%.*)?$/) {
print OUTFILE (shift @entirefile);
}
-print OUTFILE "\\IfFileExists{filecontents.sty}{\\RequirePackage{filecontents}}{}\n";
my @expandedARGV;
foreach my $filename (@ARGV) {
if (-f $filename) {
@@ -268,14 +267,14 @@ See the B<bundledoc> documentation for more information.
=head1 CAVEATS
-B<arlatex> makes use of LaTeX2e's C<filecontents*> environment.
-C<filecontents*> refuses to overwrite an existing file. However, it
-also refuses to create a file that exists I<anywhere> that LaTeX can
-find it. That is, if the user running B<latex> on an
-B<arlatex>-generated F<.tex> file already has a
-F</usr/share/texmf/tex/latex/whatever/whatever.sty> file then
-C<filecontents*> will refuse to create a F<whatever.sty> file, even in
-a different directory.
+B<arlatex> makes use of LaTeX's C<filecontents*> environment. It
+passes C<filecontents*> the C<overwrite> option to indicate that
+existing files with the same name should be overwritten. Be
+forewarned that building the generated file will overwrite the files
+used to create it.
+
+It is best to avoid bundling binary files (e.g., included graphics)
+with B<arlatex>. These typically do not extract cleanly.
=head1 SEE ALSO
diff --git a/Master/texmf-dist/doc/man/man1/arlatex.1 b/Master/texmf-dist/doc/man/man1/arlatex.1
index 8ffce4fe1a2..17807b103ae 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 4.10 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "ARLATEX 1"
-.TH ARLATEX 1 "2018-05-23" "v1.03" "User Commands"
+.TH ARLATEX 1 "2022-10-04" "v1.1" "User Commands"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -272,14 +272,14 @@ might use in a \fBbundledoc\fR configuration file:
See the \fBbundledoc\fR documentation for more information.
.SH "CAVEATS"
.IX Header "CAVEATS"
-\&\fBarlatex\fR makes use of LaTeX2e's \f(CW\*(C`filecontents*\*(C'\fR environment.
-\&\f(CW\*(C`filecontents*\*(C'\fR refuses to overwrite an existing file. However, it
-also refuses to create a file that exists \fIanywhere\fR that LaTeX can
-find it. That is, if the user running \fBlatex\fR on an
-\&\fBarlatex\fR\-generated \fI.tex\fR file already has a
-\&\fI/usr/share/texmf/tex/latex/whatever/whatever.sty\fR file then
-\&\f(CW\*(C`filecontents*\*(C'\fR will refuse to create a \fIwhatever.sty\fR file, even in
-a different directory.
+\&\fBarlatex\fR makes use of LaTeX's \f(CW\*(C`filecontents*\*(C'\fR environment. It
+passes \f(CW\*(C`filecontents*\*(C'\fR the \f(CW\*(C`overwrite\*(C'\fR option to indicate that
+existing files with the same name should be overwritten. Be
+forewarned that building the generated file will overwrite the files
+used to create it.
+.PP
+It is best to avoid bundling binary files (e.g., included graphics)
+with \fBarlatex\fR. These typically do not extract cleanly.
.SH "SEE ALSO"
.IX Header "SEE ALSO"
\&\fBbundledoc\fR\|(1), \fBlatex\fR\|(1), \fBshar\fR\|(1), \fBtar\fR\|(1), \fBzip\fR\|(1)
diff --git a/Master/texmf-dist/doc/man/man1/arlatex.man1.pdf b/Master/texmf-dist/doc/man/man1/arlatex.man1.pdf
index 668dce95763..27e69f30d8f 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/support/bundledoc/README b/Master/texmf-dist/doc/support/bundledoc/README
index bf65ec4454e..4717a23f1c6 100644
--- a/Master/texmf-dist/doc/support/bundledoc/README
+++ b/Master/texmf-dist/doc/support/bundledoc/README
@@ -25,16 +25,16 @@ as its archiver in place of tar, zip, etc.
Files
-----
--rwxrwxr-x 1 pakin users 9978 May 22 2018 arlatex
--rw-r--r-- 1 pakin users 10262 Sep 6 22:21 arlatex.1
--rw-r--r-- 1 pakin users 33296 Sep 6 22:26 arlatex.pdf
--rwxrwxr-x 1 pakin users 31263 Sep 7 23:17 bundledoc
--rw-r--r-- 1 pakin users 23351 Sep 7 23:18 bundledoc.1
--rw-r--r-- 1 pakin users 49713 Sep 7 23:18 bundledoc.pdf
--rw-rw-r-- 1 pakin users 342 Jan 22 2014 miktex.cfg
--rw-r--r-- 1 pakin users 4435 Sep 7 23:18 README
+-rwxr-xr-x 1 pakin users 9850 Oct 3 21:24 arlatex
+-rw-r--r-- 1 pakin users 10187 Oct 3 21:24 arlatex.1
+-rw-r--r-- 1 pakin users 32073 Oct 3 21:24 arlatex.pdf
+-rwxr-xr-x 1 pakin users 31263 Sep 7 2019 bundledoc
+-rw-r--r-- 1 pakin users 23351 Sep 7 2019 bundledoc.1
+-rw-r--r-- 1 pakin users 49713 Sep 7 2019 bundledoc.pdf
+-rw-r--r-- 1 pakin users 342 Jan 22 2014 miktex.cfg
+-rw-r--r-- 1 pakin users 4435 Oct 3 21:27 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
+-rw-r--r-- 1 pakin users 230 Apr 9 2010 texlive-unix.cfg
Requirements
diff --git a/Master/texmf-dist/scripts/bundledoc/arlatex b/Master/texmf-dist/scripts/bundledoc/arlatex
index 9a50f030486..f0031654e22 100755
--- a/Master/texmf-dist/scripts/bundledoc/arlatex
+++ b/Master/texmf-dist/scripts/bundledoc/arlatex
@@ -9,7 +9,7 @@
########################################################################
# arlatex #
-# Copyright (C) 2018 Scott Pakin #
+# Copyright (C) 2018-2022 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 #
@@ -27,7 +27,7 @@
########################################################################
use 5.006; # Fail gracefully if we're not using Perl v5.6.0.
-our $VERSION = "1.03"; # Specify the version of arlatex.
+our $VERSION = "1.1"; # Specify the version of arlatex.
use Getopt::Long;
use Pod::Usage;
use File::Basename;
@@ -50,7 +50,7 @@ sub includefile ($)
next if $basefilename eq $baseoutfile; # Don't let a file overwrite itself.
$basefilename = "\"$basefilename\"" if $basefilename =~ /\s/ && substr($basefilename, 0, 1) ne '"';
open (SOMEFILE, "<$filename") || die "${progname}: $! ($filename)\n";
- print OUTFILE "\\begin{filecontents*}{$basefilename}\n";
+ print OUTFILE "\\begin{filecontents*}[overwrite]{$basefilename}\n";
print OUTFILE <SOMEFILE>;
print OUTFILE "\\end{filecontents*}\n";
close SOMEFILE;
@@ -88,7 +88,6 @@ open (OUTFILE, ">$outfile") || die "${progname}: $! ($outfile)\n";
while ($entirefile[0] =~ /^\s*(\%.*)?$/) {
print OUTFILE (shift @entirefile);
}
-print OUTFILE "\\IfFileExists{filecontents.sty}{\\RequirePackage{filecontents}}{}\n";
my @expandedARGV;
foreach my $filename (@ARGV) {
if (-f $filename) {
@@ -268,14 +267,14 @@ See the B<bundledoc> documentation for more information.
=head1 CAVEATS
-B<arlatex> makes use of LaTeX2e's C<filecontents*> environment.
-C<filecontents*> refuses to overwrite an existing file. However, it
-also refuses to create a file that exists I<anywhere> that LaTeX can
-find it. That is, if the user running B<latex> on an
-B<arlatex>-generated F<.tex> file already has a
-F</usr/share/texmf/tex/latex/whatever/whatever.sty> file then
-C<filecontents*> will refuse to create a F<whatever.sty> file, even in
-a different directory.
+B<arlatex> makes use of LaTeX's C<filecontents*> environment. It
+passes C<filecontents*> the C<overwrite> option to indicate that
+existing files with the same name should be overwritten. Be
+forewarned that building the generated file will overwrite the files
+used to create it.
+
+It is best to avoid bundling binary files (e.g., included graphics)
+with B<arlatex>. These typically do not extract cleanly.
=head1 SEE ALSO