From 9ceb9aea8c6eade4843f93dba8720b9f005cf488 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 24 Mar 2014 20:42:27 +0000
Subject: latexpand (24mar14)

git-svn-id: svn://tug.org/texlive/trunk@33278 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/doc/support/latexpand/Makefile       | 18 ++++++++++--------
 Master/texmf-dist/doc/support/latexpand/README         | 12 ++++++++++++
 .../doc/support/latexpand/tests/includegraphic.tex     |  2 ++
 Master/texmf-dist/doc/support/latexpand/tests/toto.pdf |  0
 Master/texmf-dist/doc/support/latexpand/version.txt    |  4 ++--
 5 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 Master/texmf-dist/doc/support/latexpand/tests/includegraphic.tex
 create mode 100644 Master/texmf-dist/doc/support/latexpand/tests/toto.pdf

(limited to 'Master/texmf-dist/doc/support/latexpand')

diff --git a/Master/texmf-dist/doc/support/latexpand/Makefile b/Master/texmf-dist/doc/support/latexpand/Makefile
index 0b8b24c2914..08145b7b103 100644
--- a/Master/texmf-dist/doc/support/latexpand/Makefile
+++ b/Master/texmf-dist/doc/support/latexpand/Makefile
@@ -1,13 +1,15 @@
-all: latexpand.zip
+all: dist/latexpand.zip
 
-README: latexpand
-	pod2text latexpand > README
+dist/latexpand/README: latexpand
+	pod2text latexpand > $@
 
 .PHONY: all force
-latexpand.zip: README force
-	-$(RM) $@
+dist/latexpand.zip: force
+	-$(RM) -r dist/
+	mkdir -p dist/latexpand
+	@$(MAKE) dist/latexpand/README
 	@echo "latexpand version $$(git rev-parse HEAD).\n\
-Commited on $$(git show -s HEAD --pretty=format:'%cd')." > version.txt
-	zip $@ README version.txt $$(git ls-files | grep -v '\.gitignore')
-
+Commited on $$(git show -s HEAD --pretty=format:'%cd')." > dist/latexpand/version.txt
+	git ls-files | grep -v '\.gitignore' | tar -cf - -T - | (cd dist/latexpand/ && tar xf -)
+	cd dist && zip -r latexpand.zip latexpand/
 force:
diff --git a/Master/texmf-dist/doc/support/latexpand/README b/Master/texmf-dist/doc/support/latexpand/README
index 18ab86cce42..673177188bd 100644
--- a/Master/texmf-dist/doc/support/latexpand/README
+++ b/Master/texmf-dist/doc/support/latexpand/README
@@ -57,3 +57,15 @@ BUGS
     It would be nice to remove code between \begin{comment} and
     \end{comment} too if \usepackage{comment} is used.
 
+    Code like
+
+            foo%
+            \begin{comment}
+
+    will produce the incorrect
+
+            foo\begin{comment}
+
+    A workaround is to use --empty-comments when such tricky usage of the
+    comments package is done.
+
diff --git a/Master/texmf-dist/doc/support/latexpand/tests/includegraphic.tex b/Master/texmf-dist/doc/support/latexpand/tests/includegraphic.tex
new file mode 100644
index 00000000000..76a2eef6a7c
--- /dev/null
+++ b/Master/texmf-dist/doc/support/latexpand/tests/includegraphic.tex
@@ -0,0 +1,2 @@
+\includegraphics{toto.pdf}
+\includegraphics[scale=42]{toto.pdf}
diff --git a/Master/texmf-dist/doc/support/latexpand/tests/toto.pdf b/Master/texmf-dist/doc/support/latexpand/tests/toto.pdf
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Master/texmf-dist/doc/support/latexpand/version.txt b/Master/texmf-dist/doc/support/latexpand/version.txt
index 70838403e17..4bd734c00f7 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 349e09efc922330e4f158b5871f89f5f2e0900b9.
-Commited on Wed Aug 14 12:44:40 2013 +0200.
+latexpand version 0464aa0d8108286cfb92fd8c0692059ec09b8a8a.
+Commited on Sun Mar 23 21:57:16 2014 +0100.
-- 
cgit v1.2.3