diff options
7 files changed, 56 insertions, 16 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/latexpand/latexpand b/Build/source/texk/texlive/linked_scripts/latexpand/latexpand index 23bf1d1db09..23ac416868f 100755 --- a/Build/source/texk/texlive/linked_scripts/latexpand/latexpand +++ b/Build/source/texk/texlive/linked_scripts/latexpand/latexpand @@ -1,6 +1,6 @@ #!/usr/bin/perl # Inspired by latexpand by D. Musliner, University of Michigan -# 2012 Matthieu Moy <Matthieu.Moy@imag.fr> +# 2012, 2013, 2014 Matthieu Moy <Matthieu.Moy@imag.fr> # BSD License use strict; @@ -158,8 +158,8 @@ sub process_line } } if ($show_graphics) { - if (/\\includegraphics{([^}]*)}/) { - my $full = find_tex_file($1, $graphics_extensions); + if (/\\includegraphics(\[[^\]]*\])?{([^}]*)}/) { + my $full = find_tex_file($2, $graphics_extensions); say $prefix . "needs graphics file: "; print STDERR "$full\n"; } @@ -266,3 +266,15 @@ appear within verbatim environments (while it shouldn't). 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/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 --- /dev/null +++ b/Master/texmf-dist/doc/support/latexpand/tests/toto.pdf 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. diff --git a/Master/texmf-dist/scripts/latexpand/latexpand b/Master/texmf-dist/scripts/latexpand/latexpand index 23bf1d1db09..23ac416868f 100755 --- a/Master/texmf-dist/scripts/latexpand/latexpand +++ b/Master/texmf-dist/scripts/latexpand/latexpand @@ -1,6 +1,6 @@ #!/usr/bin/perl # Inspired by latexpand by D. Musliner, University of Michigan -# 2012 Matthieu Moy <Matthieu.Moy@imag.fr> +# 2012, 2013, 2014 Matthieu Moy <Matthieu.Moy@imag.fr> # BSD License use strict; @@ -158,8 +158,8 @@ sub process_line } } if ($show_graphics) { - if (/\\includegraphics{([^}]*)}/) { - my $full = find_tex_file($1, $graphics_extensions); + if (/\\includegraphics(\[[^\]]*\])?{([^}]*)}/) { + my $full = find_tex_file($2, $graphics_extensions); say $prefix . "needs graphics file: "; print STDERR "$full\n"; } @@ -266,3 +266,15 @@ appear within verbatim environments (while it shouldn't). 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. |