hyperxmp (12mar12)

git-svn-id: svn://tug.org/texlive/trunk@25621 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 40 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/hyperxmp/README b/Master/texmf-dist/doc/latex/hyperxmp/README
index 3164feef1b9..92bc1422811 100644
--- a/Master/texmf-dist/doc/latex/hyperxmp/README
+++ b/Master/texmf-dist/doc/latex/hyperxmp/README
@@ -32,7 +32,7 @@ Installation
 
 There's nothing special about building hyperxmp.  To create
 hyperxmp.sty simply run "tex hyperxmp.ins".  Install hyperxmp.sty
-somewhere where pdfLaTeX can find it.  See
+somewhere where LaTeX can find it.  See
 http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages for
 general information about installing packages.
 
@@ -40,7 +40,7 @@ general information about installing packages.
 Copyright and license
 =====================
 
-Copyright (C) 2011 Scott Pakin
+Copyright (C) 2012 Scott Pakin
 
 This file may be distributed and/or modified under the conditions of
 the LaTeX Project Public License, either version 1.3c of this license
diff --git a/Master/texmf-dist/doc/latex/hyperxmp/hyperxmp.pdf b/Master/texmf-dist/doc/latex/hyperxmp/hyperxmp.pdf
index 3af3045155a..2e3aa7c848e 100644
--- a/Master/texmf-dist/doc/latex/hyperxmp/hyperxmp.pdf
+++ b/Master/texmf-dist/doc/latex/hyperxmp/hyperxmp.pdf
diff --git a/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx b/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx
index 4bfa8d7b474..78dedace992 100644
--- a/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx
+++ b/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2011 by Scott Pakin <scott+hyxmp@pakin.org>
+% Copyright (C) 2012 by Scott Pakin <scott+hyxmp@pakin.org>
 % -------------------------------------------------------
 %
 % This file may be distributed and/or modified under the
@@ -22,7 +22,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{hyperxmp}
 %<*package>
-    [2011/06/12 v1.4 Store hyperref metadata in XMP format]
+    [2012/03/10 v1.5 Store hyperref metadata in XMP format]
 %</package>
 %
 %<*driver>
@@ -42,7 +42,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{884}
+% \CheckSum{898}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -120,7 +120,7 @@
 %   pdftitle={The hyperxmp package},
 %   pdfsubject={LaTeX2e support for XMP metadata},
 %   pdfkeywords={LaTeX, embedded metadata, XMP, PDF, copyright, license, comments},
-%   pdfcopyright={Copyright (C) 2011, Scott Pakin},
+%   pdfcopyright={Copyright (C) 2012, Scott Pakin},
 %   pdflicenseurl={http://www.latex-project.org/lppl/},
 %   pdfcaptionwriter={Scott Pakin}
 % }
@@ -544,6 +544,27 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \changes{v1.5}{2012/03/10}{Made the XMP inclusion more robust.  Thanks to
+%   Heiko Oberdiek for the bug report and suggested modifications.}
+%
+% \begin{macro}{\hyxmp@at@end}
+% \begin{macro}{\hyxmp@driver}
+% The |\hyxmp@at@end| macro includes code at the end of the document.
+% For pdf\TeX, the standard |\AtEndDocument| works well enough.  For all
+% the other backends we use |\AtEndDvi| from the \pkgname{atenddvi}
+% package, which is more robust but requires an addition \LaTeX\ run.
+%    \begin{macrocode}
+\def\hyxmp@driver{hpdftex}
+\ifx\hyxmp@driver\Hy@driver
+  \let\hyxmp@at@end=\AtEndDocument
+\else
+  \RequirePackage{atenddvi}
+  \let\hyxmp@at@end=\AtEndDvi
+\fi
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
 %
 % \subsection{Integration with \textsf{hyperref}}
 %
@@ -680,7 +701,7 @@ metadata values to hyperxmp}%
 % the author ample opportunity to provide metadata to \pkgname{hyperref}
 % and thereby \pkgname{hyperxmp}.
 %    \begin{macrocode}
-      \AtEndDocument{%
+      \hyxmp@at@end{%
         \hyxmp@find@metadata
         \hyxmp@embed@packet
       }%
diff --git a/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.ins b/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.ins
index 4a3f70a3ffc..91b1b6be876 100644
--- a/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.ins
+++ b/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.ins
@@ -1,5 +1,5 @@
 %%
-%% Copyright (C) 2011 by Scott Pakin <scott+dtx@pakin.org>
+%% Copyright (C) 2012 by Scott Pakin <scott+dtx@pakin.org>
 %%
 %% This file may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3c of this license
@@ -21,7 +21,7 @@
 
 This is a generated file.
 
-Copyright (C) 2011 by Scott Pakin <scott+dtx@pakin.org>
+Copyright (C) 2012 by Scott Pakin <scott+dtx@pakin.org>
 
 This file may be distributed and/or modified under the conditions of
 the LaTeX Project Public License, either version 1.3c of this license
diff --git a/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty b/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty
index ba39d4a3e94..a7dec0caeeb 100644
--- a/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty
+++ b/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2011 by Scott Pakin <scott+dtx@pakin.org>
+%% Copyright (C) 2012 by Scott Pakin <scott+dtx@pakin.org>
 %% 
 %% This file may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3c of this license
@@ -22,9 +22,16 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{hyperxmp}
-    [2011/06/12 v1.4 Store hyperref metadata in XMP format]
+    [2012/03/10 v1.5 Store hyperref metadata in XMP format]
 \edef\hyxmp@dq@code{\the\catcode`\"}
 \catcode`\"=12
+\def\hyxmp@driver{hpdftex}
+\ifx\hyxmp@driver\Hy@driver
+  \let\hyxmp@at@end=\AtEndDocument
+\else
+  \RequirePackage{atenddvi}
+  \let\hyxmp@at@end=\AtEndDvi
+\fi
 \RequirePackage{keyval}
 \RequirePackage{pdfescape}
 \RequirePackage{stringenc}
@@ -70,7 +77,7 @@ metadata values to hyperxmp}%
       \ifHy@unicode
         \hyxmp@reencode\@pdfmetalang
       \fi
-      \AtEndDocument{%
+      \hyxmp@at@end{%
         \hyxmp@find@metadata
         \hyxmp@embed@packet
       }%