hyperxmp (17apr13)

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

3 files changed, 31 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/latex/hyperxmp/hyperxmp.pdf b/Master/texmf-dist/doc/latex/hyperxmp/hyperxmp.pdf
index 1b93c109e07..7573ca43797 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 283bd1646ad..5bae88e57f6 100644
--- a/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx
+++ b/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx
@@ -22,7 +22,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{hyperxmp}
 %<*package>
-    [2013/01/08 v2.3 Store hyperref metadata in XMP format]
+    [2013/04/16 v2.3a Store hyperref metadata in XMP format]
 %</package>
 %
 %<*driver>
@@ -62,7 +62,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1370}
+% \CheckSum{1377}
 %
 % \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
@@ -260,7 +260,7 @@
 % \pkgname{hyperxmp} knows how to embed all of the following types of
 % metadata within a document:
 %
-% \begin{itemize}
+% \begin{itemize} \raggedright
 %   \item authors (\xmpterm{dc:creator})
 %   \item base \acro{URL} (\xmpterm{xmp:BaseURL})
 %   \item copyright (\xmpterm{dc:rights} and \xmpterm{xmpRights:Marked})
@@ -1110,9 +1110,9 @@
   \ifx\hyxmp@concated@metadata\@empty
     \PackageWarningNoLine{hyperxmp}{%
 \jobname.tex did not specify any metadata to\MessageBreak
-include in the XMP packet.\space\space Please see the hyperxmp\MessageBreak
-documentation for instructions on how to provide\MessageBreak
-metadata values to hyperxmp}%
+include in the XMP packet.\space\space Please see the\MessageBreak
+hyperxmp documentation for instructions on how to\MessageBreak
+provide metadata values to hyperxmp}%
   \fi
 }
 %    \end{macrocode}
@@ -1128,6 +1128,23 @@ metadata values to hyperxmp}%
 \AtBeginDocument{%
   \@ifpackageloaded{hyperref}{%
 %    \end{macrocode}
+% In older versions of \pkgname{hyperref}, |\@pdflang| is set to
+% |\@empty| if \optname{pdflang} is not specified.  In newer versions of
+% \pkgname{hyperref}, |\@pdflang| is set to |\relax| if
+% \optname{pdflang} is not specified.  The latter is a bit problematic
+% for \pkgname{hyperxmp} because it makes |\@pdflang| non-expandable,
+% which causes a literal ``|\@pdflang|'' to be written as \acro{XMP}
+% metadata.  To avoid that situation we redefine |\@pdflang| as
+% |\@empty| if we see it set to |\relax|.
+% \changes{v2.3a}{2013/04/16}{Bug fix: Redefine
+%   \texttt{\string\string\string\@pdflang} as
+%   \texttt{\string\string\string\@empty} when \pkgname{hyperref} has set
+%   it to \texttt{\string\string\string\relax}}
+%    \begin{macrocode}
+    \ifx\@pdflang\relax
+      \let\@pdflang=\@empty
+    \fi
+%    \end{macrocode}
 % If the user explicitly specified the language to use for the
 % document's metadata, we use that.  If not, we use the document
 % language, specified to \pkgname{hyperref} with the \optname{pdflang}
@@ -1547,7 +1564,7 @@ disabled}%
 % not-to-be-modified string.
 % \changes{v2.0}{2012/08/22}{Escaped parentheses written with
 %   \texttt{pdfmark}s to prevent \cmdname{dvips} from line-wrapping the
-%   \acro{xmp} packet}
+%   \protect\acro{XMP} packet}
 %    \begin{macrocode}
       \@ifundefined{pdfmark}{%
         #1#2%
diff --git a/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty b/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty
index 13205a4c96b..4a480aa9639 100644
--- a/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty
+++ b/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty
@@ -22,7 +22,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{hyperxmp}
-    [2013/01/08 v2.3 Store hyperref metadata in XMP format]
+    [2013/04/16 v2.3a Store hyperref metadata in XMP format]
 \edef\hyxmp@dq@code{\the\catcode`\"}
 \catcode`\"=12
 \def\hyxmp@driver{hpdftex}
@@ -142,13 +142,16 @@
   \ifx\hyxmp@concated@metadata\@empty
     \PackageWarningNoLine{hyperxmp}{%
 \jobname.tex did not specify any metadata to\MessageBreak
-include in the XMP packet.\space\space Please see the hyperxmp\MessageBreak
-documentation for instructions on how to provide\MessageBreak
-metadata values to hyperxmp}%
+include in the XMP packet.\space\space Please see the\MessageBreak
+hyperxmp documentation for instructions on how to\MessageBreak
+provide metadata values to hyperxmp}%
   \fi
 }
 \AtBeginDocument{%
   \@ifpackageloaded{hyperref}{%
+    \ifx\@pdflang\relax
+      \let\@pdflang=\@empty
+    \fi
     \ifx\@pdflang\@empty
       \let\@pdfmetalang=\hyxmp@x@default
     \else