summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-11-30 23:36:10 +0000
committerKarl Berry <karl@freefriends.org>2012-11-30 23:36:10 +0000
commitee7a9006ef9ec56acb6929fdba0ccf452c2ba549 (patch)
tree3e58f1832cf819840acde774dfb47308237af893
parent7cce99f31304321137b574488897e28712ad2ddb (diff)
latexpand (28nov12)
git-svn-id: svn://tug.org/texlive/trunk@28402 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/latexpand/latexpand6
-rw-r--r--Master/texmf-dist/doc/support/latexpand/Makefile7
-rw-r--r--Master/texmf-dist/doc/support/latexpand/README30
-rw-r--r--Master/texmf-dist/doc/support/latexpand/version.txt3
-rwxr-xr-xMaster/texmf-dist/scripts/latexpand/latexpand6
5 files changed, 41 insertions, 11 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/latexpand/latexpand b/Build/source/texk/texlive/linked_scripts/latexpand/latexpand
index f024f1c1a1d..e66f8187ec7 100755
--- a/Build/source/texk/texlive/linked_scripts/latexpand/latexpand
+++ b/Build/source/texk/texlive/linked_scripts/latexpand/latexpand
@@ -112,8 +112,7 @@ sub process_line
$_ = "";
} elsif (my ($before, $ignored, $full_filename, $after)
= /^(([^%]|[^\\]%)*)\\input[{\s]+(.*?)[\s}](.*)$/) {
- $full_filename .= ".tex" unless $full_filename =~ m/\./;
- $full_filename = find_tex_file($full_filename);
+ $full_filename = find_tex_file($full_filename, ":.tex");
say $prefix . "Found input for file: $full_filename\n";
print $before . $nl;
print '\makeatletter{}' . $nl;
@@ -213,6 +212,9 @@ latexpand [options] FILE...
Expand \usepackage{...} directives if the
corresponding .sty file is found in
$TEXINPUTS
+ --expand-bbl FILE
+ Expand the bibliography by inlining FILE
+ (should be a *.bbl file)
--help this help message
--output <file>, -o <file>
generate output in <file>
diff --git a/Master/texmf-dist/doc/support/latexpand/Makefile b/Master/texmf-dist/doc/support/latexpand/Makefile
index 2f8651ddd06..b0715a74dfb 100644
--- a/Master/texmf-dist/doc/support/latexpand/Makefile
+++ b/Master/texmf-dist/doc/support/latexpand/Makefile
@@ -1,10 +1,11 @@
all: latexpand.zip
-README:
+README: latexpand
./latexpand --help > README
.PHONY: latexpand.zip
latexpand.zip: README
-$(RM) $@
- @echo "latexpand version $$(git rev-parse HEAD)" > version.txt
- zip $@ README version.txt $$(git ls-files)
+ @echo "latexpand version $$(git rev-parse HEAD).\n\
+Commited on $$(git show HEAD --pretty=format:'%cd')." > version.txt
+ zip $@ README version.txt $$(git ls-files | grep -v '\.gitignore')
diff --git a/Master/texmf-dist/doc/support/latexpand/README b/Master/texmf-dist/doc/support/latexpand/README
index 332b9854a8d..605466deb12 100644
--- a/Master/texmf-dist/doc/support/latexpand/README
+++ b/Master/texmf-dist/doc/support/latexpand/README
@@ -3,8 +3,8 @@ LATEXPAND(1) User Contributed Perl Documentation LATEXPAND(1)
NNAAMMEE
- latexpand - Flatten LaTeX file by expanding \include and \input
- directives
+ latexpand - Flatten LaTeX file by expanding \include and \input, remove
+ comments
SSYYNNOOPPSSIISS
latexpand [options] FILE...
@@ -14,6 +14,13 @@ SSYYNNOOPPSSIISS
--keep-comments don't strip comments
--empty-comments keep empty comments (i.e. % at end of lines) for clarity
--keep-includes don't expand \input and \include directives
+ --expand-usepackage
+ Expand \usepackage{...} directives if the
+ corresponding .sty file is found in
+ $TEXINPUTS
+ --expand-bbl FILE
+ Expand the bibliography by inlining FILE
+ (should be a *.bbl file)
--help this help message
--output <file>, -o <file>
generate output in <file>
@@ -23,6 +30,23 @@ SSYYNNOOPPSSIISS
colon-separated list of possible graphics extensions
(used by --show-graphics to find the actual graphics files)
+UUSSEESS
+ The most common use of latexpand is to simplify distribution of source
+ LaTeX files, typically to satisfy the requirement of editors and
+ archival sites (springer, arXiv.org, ...) who force the authors to
+ submit sources. One does not necessarily want to submit sources with
+ comments, and uploading a document made of several files including each
+ other is a bit painful. By default, latexpand answers both problems by
+ outputing a single LaTeX file that contain no comment.
+GGEETTTTIINNGG LLAATTEEXXPPAANNDD
+ The latest version of latexpand is available here:
-perl v5.10.1 2012-07-04 LATEXPAND(1)
+ https://gitorious.org/latexpand
+
+BBUUGGSS
+ Please, report bugs to Matthieu Moy <Matthieu.Moy@imag.fr>.
+
+
+
+perl v5.10.1 2012-11-07 LATEXPAND(1)
diff --git a/Master/texmf-dist/doc/support/latexpand/version.txt b/Master/texmf-dist/doc/support/latexpand/version.txt
index 8473dc583e0..75cbc53870a 100644
--- a/Master/texmf-dist/doc/support/latexpand/version.txt
+++ b/Master/texmf-dist/doc/support/latexpand/version.txt
@@ -1 +1,2 @@
-latexpand version a4a6bbc8086e31d95c9fb45faa85c40e12c77f23
+latexpand version b88cfb73604b8424c9cae5ea4acc6ff2f27d3c12.
+Commited on Wed Nov 7 10:55:26 2012 +0100.
diff --git a/Master/texmf-dist/scripts/latexpand/latexpand b/Master/texmf-dist/scripts/latexpand/latexpand
index f024f1c1a1d..e66f8187ec7 100755
--- a/Master/texmf-dist/scripts/latexpand/latexpand
+++ b/Master/texmf-dist/scripts/latexpand/latexpand
@@ -112,8 +112,7 @@ sub process_line
$_ = "";
} elsif (my ($before, $ignored, $full_filename, $after)
= /^(([^%]|[^\\]%)*)\\input[{\s]+(.*?)[\s}](.*)$/) {
- $full_filename .= ".tex" unless $full_filename =~ m/\./;
- $full_filename = find_tex_file($full_filename);
+ $full_filename = find_tex_file($full_filename, ":.tex");
say $prefix . "Found input for file: $full_filename\n";
print $before . $nl;
print '\makeatletter{}' . $nl;
@@ -213,6 +212,9 @@ latexpand [options] FILE...
Expand \usepackage{...} directives if the
corresponding .sty file is found in
$TEXINPUTS
+ --expand-bbl FILE
+ Expand the bibliography by inlining FILE
+ (should be a *.bbl file)
--help this help message
--output <file>, -o <file>
generate output in <file>