summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-02-20 22:43:45 +0000
committerKarl Berry <karl@freefriends.org>2019-02-20 22:43:45 +0000
commitaee0a4f46609c18cdffea290b5b688bc7fd5560f (patch)
tree3268d95f13e02d93eba0f8b440b1b73b70cdae2e /Master/texmf-dist
parent13e83447acffcbf8e5b5bdff88b9caefdf56174d (diff)
latexpand (20feb19)
git-svn-id: svn://tug.org/texlive/trunk@50079 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/support/latexpand/README8
-rw-r--r--Master/texmf-dist/doc/support/latexpand/version.txt4
-rwxr-xr-xMaster/texmf-dist/scripts/latexpand/latexpand83
3 files changed, 65 insertions, 30 deletions
diff --git a/Master/texmf-dist/doc/support/latexpand/README b/Master/texmf-dist/doc/support/latexpand/README
index 8a3aa4c538b..d8b0cbe8ef8 100644
--- a/Master/texmf-dist/doc/support/latexpand/README
+++ b/Master/texmf-dist/doc/support/latexpand/README
@@ -33,6 +33,12 @@ SYNOPSIS
rare cases it may break your document, but it
may help fixing bad interactions between
@-commands and inclusion (see BUGS section).
+ --in-encoding FMT, --out-encoding FMT
+ File encoding used by input and output files.
+ This uses the same syntax as PerlIO's layers.
+ Example:
+ --in-encoding 'encoding(UTF-8)'
+ The default is 'bytes' and should always work.
USES
The most common use of latexpand is to simplify distribution of source
@@ -111,5 +117,5 @@ SEE ALSO
https://lacl.fr/~caubert/notes/portabilite-du-tex.html#dependances
VERSION
- This is latexpand version v1.4-1-gb32a776.
+ This is latexpand version v1.5.
diff --git a/Master/texmf-dist/doc/support/latexpand/version.txt b/Master/texmf-dist/doc/support/latexpand/version.txt
index ee37fea5f37..c7660606cf9 100644
--- a/Master/texmf-dist/doc/support/latexpand/version.txt
+++ b/Master/texmf-dist/doc/support/latexpand/version.txt
@@ -1,2 +1,2 @@
-latexpand version v1.4-1-gb32a776 (b32a776232b22f2ece1ca41628273e16022129d9).
-Committed on Wed Apr 18 15:44:06 2018 +0200.
+latexpand version v1.5 (be890116022866564388af207e11f4b5b962d57d).
+Committed on Sat Feb 16 08:42:38 2019 +0100.
diff --git a/Master/texmf-dist/scripts/latexpand/latexpand b/Master/texmf-dist/scripts/latexpand/latexpand
index ea18e58cd42..1977c46356b 100755
--- a/Master/texmf-dist/scripts/latexpand/latexpand
+++ b/Master/texmf-dist/scripts/latexpand/latexpand
@@ -28,6 +28,8 @@ my $fatal;
my $version;
my $makeatletter;
my $inside_import;
+my $in_enc = "bytes";
+my $out_enc = "bytes";
GetOptions (
'h' => \$help,
@@ -45,6 +47,8 @@ GetOptions (
'fatal' => \$fatal,
'version' => \$version,
'makeatletter' => \$makeatletter,
+ 'in-encoding=s' => \$in_enc,
+ 'out-encoding=s' => \$out_enc,
) or pod2usage_wrapper(2);
version() if $version;
pod2usage_wrapper(0) if $help;
@@ -76,7 +80,7 @@ sub get_version
{
# $VERSION's value will be substituted by 'make dist', but the
# next line won't (the string has to be broken to avoid it).
- my $VERSION = 'v1.4-1-gb32a776';
+ my $VERSION = 'v1.5';
if ($VERSION eq '@LATEXPAND' . '_VERSION@') {
my($vol,$dir,$file) = File::Spec->splitpath($0);
chdir($dir);
@@ -115,6 +119,8 @@ sub say
my $makeatletter_found;
my $in_preamble;
+use open IN => ":$in_enc", OUT => ":$out_enc";
+
foreach my $file (@ARGV)
{
say "processing $file\n";
@@ -159,18 +165,26 @@ sub process_line
{
my ($line, $prefix, $commented_newline, $file) = @_;
$_ = $line;
- if ($$commented_newline && /^\s*$/) {
- # Deal with:
- #
- # Line 1 % comment
- #
- # Line 2
- #
- # The newline after Line 1 is commented, but we still
- # want a new paragraph. We strip the comment together
- # with its newline, but re-add a newline to chnge
- # paragraph here if needed:
- print "\n";
+ if ($$commented_newline) {
+ # Leading whitespaces after a comment is ignored.
+ # There's no space in:
+ # Line 1%
+ # Line 2.
+ # Match just space and tabs (\s would match \n)
+ s/^[ \t]*//;
+ if (/^$/) {
+ # Deal with:
+ #
+ # Line 1 % comment
+ #
+ # Line 2
+ #
+ # The newline after Line 1 is commented, but we still
+ # want a new paragraph. We strip the comment together
+ # with its newline, but re-add a newline to chnge
+ # paragraph here if needed:
+ print "\n";
+ }
}
$$commented_newline = 0;
# Consider \makeatletter only in preamble, because we do want
@@ -187,6 +201,12 @@ sub process_line
print STDERR "Warning: $file.\n";
print STDERR "Warning: consider using --makeatletter if the result is not compilable.\n";
}
+
+ # non-comment is a sequence of:
+ # - escaped character (\\.), including \% and \\
+ # - neither '%' nor '\'.
+ my $NON_COMMENT = '([^\\\\%]|\\\\.)*';
+
unless ($keep_comments) {
if (!$empty_comments) {
# Include \n in pattern to avoid matching
@@ -197,23 +217,26 @@ sub process_line
$$commented_newline = 1;
}
- # remove only the comment if the line has actual content
- if (s/([^\\])%.*\n/$1/) {
+ # Special-case commands at end of line. We
+ # don't want "\\foo%\nbar" to become
+ # "\\foobar"
+ if (s/^($NON_COMMENT\\[[:alpha:]@]+)%.*\n/$1 /) {
+ $$commented_newline = 1;
+ } elsif (s/^($NON_COMMENT)%.*\n/$1/) {
+ # remove only the comment if the line has actual content
$$commented_newline = 1;
}
}
# Apply the "empty comments" treatment unconditionally
- # for end-of-files comments not matched above (it
- # doesn't harm to keep an empty comment sometimes, but
- # it may harm to leave a real comment if the goal was
- # to strip them).
- s/^%.*$/%/;
- s/([^\\])%.*$/$1%/;
+ # for comments not matched above (it doesn't harm to
+ # keep an empty comment sometimes, but it may harm to
+ # leave a real comment if the goal was to strip them).
+ s/^(([^\\%]|\\.)*)%.*$/$1%/;
}
unless ($keep_includes) {
if (my ($before, $ignored, $full_filename, $after)
- = /^(([^%]|[^\\]%)*)\\include[{\s]+(.*?)[\s}](.*)$/) {
+ = /^($NON_COMMENT)\\include[{\s]+(.*?)[\s}](.*)$/) {
$full_filename = find_tex_file($full_filename . ".tex");
if ($full_filename) {
say $prefix . "Found include for file: $full_filename\n";
@@ -231,7 +254,7 @@ sub process_line
$_ = "";
}
} elsif (my ($before, $ignored, $full_filename, $after)
- = /^(([^%]|[^\\]%)*)\\input[{\s]+(.*?)[\s}](.*)$/) {
+ = /^($NON_COMMENT)\\input[{\s]+(.*?)[\s}](.*)$/) {
if ($inside_import) {
$full_filename = $inside_import . $full_filename;
}
@@ -255,7 +278,7 @@ sub process_line
$_ = "";
}
} elsif (my ($before, $ignored, $dir, $full_filename, $after)
- = /^(([^%]|[^\\]%)*)\\(?:sub)?import[{\s]+(.*?)[\s}][{\s]+(.*?)[\s}](.*)$/) {
+ = /^($NON_COMMENT)\\(?:sub)?import[{\s]+(.*?)[\s}][{\s]+(.*?)[\s}](.*)$/) {
if ($explain) {
print "% dir " . $dir ."\n";
print "% full_filename " . $full_filename ."\n";
@@ -290,7 +313,7 @@ sub process_line
$_ = "";
}
} elsif (my ($before, $ignored, $args, $full_filename, $after)
- = /^(([^%]|[^\\]%)*)\\includegraphics[\[\s]+(.*?)[\s\]][{\s]+(.*?)[\s}](.*)$/) {
+ = /^($NON_COMMENT)\\includegraphics[\[\s]+(.*?)[\s\]][{\s]+(.*?)[\s}](.*)$/) {
if ($explain) {
print "% inside_import " . $inside_import ."\n";
print "% before " . $before ."\n";
@@ -305,7 +328,7 @@ sub process_line
$_ = "";
}
} elsif (my ($before, $ignored, $args, $full_filename, $after)
- = /^(([^%]|[^\\]%)*)\\lstinputlisting[\[\s]+(.*?)[\s\]][{\s]+(.*?)[\s}](.*)$/) {
+ = /^($NON_COMMENT)\\lstinputlisting[\[\s]+(.*?)[\s\]][{\s]+(.*?)[\s}](.*)$/) {
if ($explain) {
print "% inside_import " . $inside_import ."\n";
print "% before " . $before ."\n";
@@ -461,6 +484,12 @@ latexpand [options] FILE...
rare cases it may break your document, but it
may help fixing bad interactions between
@-commands and inclusion (see BUGS section).
+ --in-encoding FMT, --out-encoding FMT
+ File encoding used by input and output files.
+ This uses the same syntax as PerlIO's layers.
+ Example:
+ --in-encoding 'encoding(UTF-8)'
+ The default is 'bytes' and should always work.
=head1 USES
@@ -548,4 +577,4 @@ https://lacl.fr/~caubert/notes/portabilite-du-tex.html#dependances
=head1 VERSION
-This is latexpand version v1.4-1-gb32a776.
+This is latexpand version v1.5.