From 4798e2b9e23049090bc67662a48f3baf71cb39d4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 24 Jun 2014 17:38:31 +0000 Subject: hyperxmp (24jun14) git-svn-id: svn://tug.org/texlive/trunk@34376 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty | 47 +++++++++++++++-------- 1 file changed, 30 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty b/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty index b92791d4308..fc1e808e8bb 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} - [2014/01/02 v2.4 Store hyperref metadata in XMP format] + [2014/06/19 v2.5 Store hyperref metadata in XMP format] \edef\hyxmp@dq@code{\the\catcode`\"} \catcode`\"=12 \def\hyxmp@driver{hpdftex} @@ -37,38 +37,44 @@ \RequirePackage{stringenc} \RequirePackage{intcalc} \RequirePackage{ifxetex} +\newcommand{\hyxmp@pdfstringdef}[2]{% + \let\hyxmp@textunderscore=\textunderscore + \let\textunderscore=\hyxmp@uscore + \pdfstringdef{#1}{#2}% + \let\textunderscore=\hyxmp@textunderscore +} \def\@pdfcopyright{} -\define@key{Hyp}{pdfcopyright}{\pdfstringdef\@pdfcopyright{#1}} +\define@key{Hyp}{pdfcopyright}{\hyxmp@pdfstringdef\@pdfcopyright{#1}} \def\@pdflicenseurl{} -\define@key{Hyp}{pdflicenseurl}{\pdfstringdef\@pdflicenseurl{#1}} +\define@key{Hyp}{pdflicenseurl}{\hyxmp@pdfstringdef\@pdflicenseurl{#1}} \def\@pdfauthortitle{} -\define@key{Hyp}{pdfauthortitle}{\pdfstringdef\@pdfauthortitle{#1}} +\define@key{Hyp}{pdfauthortitle}{\hyxmp@pdfstringdef\@pdfauthortitle{#1}} \def\@pdfcaptionwriter{} -\define@key{Hyp}{pdfcaptionwriter}{\pdfstringdef\@pdfcaptionwriter{#1}} +\define@key{Hyp}{pdfcaptionwriter}{\hyxmp@pdfstringdef\@pdfcaptionwriter{#1}} \def\@pdfmetalang{} -\define@key{Hyp}{pdfmetalang}{\pdfstringdef\@pdfmetalang{#1}} +\define@key{Hyp}{pdfmetalang}{\hyxmp@pdfstringdef\@pdfmetalang{#1}} \def\@pdfcontactaddress{} \define@key{Hyp}{pdfcontactaddress}{% \let\xmpcomma=\hyxmp@comma \def\xmpquote##1{##1}% - \pdfstringdef\@pdfcontactaddress{#1}% + \hyxmp@pdfstringdef\@pdfcontactaddress{#1}% \def\xmpcomma{,}% \let\xmpquote=\relax } \def\@pdfcontactcity{} -\define@key{Hyp}{pdfcontactcity}{\pdfstringdef\@pdfcontactcity{#1}} +\define@key{Hyp}{pdfcontactcity}{\hyxmp@pdfstringdef\@pdfcontactcity{#1}} \def\@pdfcontactregion{} -\define@key{Hyp}{pdfcontactregion}{\pdfstringdef\@pdfcontactregion{#1}} +\define@key{Hyp}{pdfcontactregion}{\hyxmp@pdfstringdef\@pdfcontactregion{#1}} \def\@pdfcontactpostcode{} -\define@key{Hyp}{pdfcontactpostcode}{\pdfstringdef\@pdfcontactpostcode{#1}} +\define@key{Hyp}{pdfcontactpostcode}{\hyxmp@pdfstringdef\@pdfcontactpostcode{#1}} \def\@pdfcontactcountry{} -\define@key{Hyp}{pdfcontactcountry}{\pdfstringdef\@pdfcontactcountry{#1}} +\define@key{Hyp}{pdfcontactcountry}{\hyxmp@pdfstringdef\@pdfcontactcountry{#1}} \def\@pdfcontactphone{} -\define@key{Hyp}{pdfcontactphone}{\pdfstringdef\@pdfcontactphone{#1}} +\define@key{Hyp}{pdfcontactphone}{\hyxmp@pdfstringdef\@pdfcontactphone{#1}} \def\@pdfcontactemail{} -\define@key{Hyp}{pdfcontactemail}{\pdfstringdef\@pdfcontactemail{#1}} +\define@key{Hyp}{pdfcontactemail}{\hyxmp@pdfstringdef\@pdfcontactemail{#1}} \def\@pdfcontacturl{} -\define@key{Hyp}{pdfcontacturl}{\pdfstringdef\@pdfcontacturl{#1}} +\define@key{Hyp}{pdfcontacturl}{\hyxmp@pdfstringdef\@pdfcontacturl{#1}} \def\hyxmp@pdfauthor{} \def\hyxmp@pdfkeywords{} @@ -188,8 +194,12 @@ disabled}% } \def\xmpcomma{,}% \bgroup -\catcode`\^^C=11 -\gdef\hyxmp@comma{^^C} + \catcode`\^^C=11 + \gdef\hyxmp@comma{^^C} +\egroup +\bgroup + \catcode`\^^U=11 + \gdef\hyxmp@uscore{^^U} \egroup \let\xmpquote=\relax \bgroup @@ -223,6 +233,7 @@ disabled}% \fi \newcommand*{\hyxmp@reencode}[1]{} \expandafter\def\csname SE->pdfdoc@03\endcsname{0003} +\expandafter\def\csname SE->pdfdoc@15\endcsname{0015} \newcommand*{\hyxmp@xmlify}[1]{% \gdef\hyxmp@xmlified{}% \EdefUnescapeString\hyxmp@text{#1}% @@ -518,7 +529,9 @@ disabled}% \repeat \lccode`\_=`\ \relax \lccode`\^^C=`\,\relax - \lowercase{\xdef\hyxmp@xml{\hyxmp@xml#1}}% + \lccode`\^^U=`\_\relax + \lowercase{\xdef\hyxmp@new@xml{#1}}% + \xdef\hyxmp@xml{\hyxmp@xml\hyxmp@new@xml}% \egroup } \bgroup -- cgit v1.2.3