hyperxmp (27nov18)

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

1 files changed, 16 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty b/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty
index 1afc3a185e7..462cb3758bb 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) 2017 by Scott Pakin <scott+hyxmp@pakin.org>
+%% Copyright (C) 2018 by Scott Pakin <scott+hyxmp@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,7 +22,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{hyperxmp}
-    [2017/11/26 v3.4 Store hyperref metadata in XMP format]
+    [2018/11/27 v3.5 Store hyperref metadata in XMP format]
 \edef\hyxmp@dq@code{\the\catcode`\"}
 \catcode`\"=12
 \def\hyxmp@driver{hpdftex}
@@ -86,6 +86,10 @@
 \define@key{Hyp}{pdfaconformance}{\hyxmp@pdfstringdef\@pdfaconformance{#1}}
 \edef\@pdfsource{\jobname.tex}
 \define@key{Hyp}{pdfsource}{\hyxmp@pdfstringdef\@pdfsource{#1}}
+\def\hyxmp@DocumentID{}
+\define@key{Hyp}{pdfdocumentid}{\hyxmp@pdfstringdef\hyxmp@DocumentID{#1}}
+\def\hyxmp@InstanceID{}
+\define@key{Hyp}{pdfinstanceid}{\hyxmp@pdfstringdef\hyxmp@InstanceID{#1}}
 \def\@pdfcontactaddress{}
 \define@key{Hyp}{pdfcontactaddress}{%
   \let\xmpcomma=\hyxmp@comma
@@ -722,7 +726,10 @@ disabled}%
   \hyxmp@create@uuid\hyxmp@DocumentID
 }
 \newcommand*{\hyxmp@def@InstanceID}{%
-  \edef\hyxmp@seed@string{\jobname:\@pdftitle:\@pdfauthor:\hyxmp@today}%
+  \hyxmp@today@define{\hyxmp@seed@string}%
+  \edef\hyxmp@seed@string{%
+    \jobname:\@pdftitle:\@pdfauthor:\hyxmp@today:\hyxmp@seed@string
+  }%
   \expandafter\hyxmp@seed@rng\expandafter{\hyxmp@seed@string}%
   \edef\hyxmp@rand@num{\the\@tempcnta}%
   \hyxmp@create@uuid\hyxmp@InstanceID
@@ -914,13 +921,15 @@ ______</rdf:Description>^^J%
   \fi
 }
 \gdef\hyxmp@mm@schema{%
-  \hyxmp@def@DocumentID
-  \hyxmp@def@InstanceID
+  \@ifmtargexp{\hyxmp@DocumentID}{\hyxmp@def@DocumentID}{}%
+  \@ifmtargexp{\hyxmp@InstanceID}{\hyxmp@def@InstanceID}{}%
   \hyxmp@add@to@xml{%
 ______<rdf:Description rdf:about=""^^J%
 ____________xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">^^J%
-_________<xmpMM:DocumentID>\hyxmp@DocumentID</xmpMM:DocumentID>^^J%
-_________<xmpMM:InstanceID>\hyxmp@InstanceID</xmpMM:InstanceID>^^J%
+  }%
+  \hyxmp@add@simple{xmpMM:DocumentID}{\hyxmp@DocumentID}%
+  \hyxmp@add@simple{xmpMM:InstanceID}{\hyxmp@InstanceID}%
+  \hyxmp@add@to@xml{%
 ______</rdf:Description>^^J%
   }%
 }