From 84d6304b14637b064102d3fc1ad0677a572d6dcc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 12 Jan 2013 00:07:10 +0000 Subject: hyperxmp (10jan13) git-svn-id: svn://tug.org/texlive/trunk@28809 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hyperxmp/README | 2 +- Master/texmf-dist/doc/latex/hyperxmp/hyperxmp.pdf | Bin 631149 -> 800240 bytes .../source/latex/hyperxmp/einstein-xmp.tex | 79 ++++++++------------ .../texmf-dist/source/latex/hyperxmp/einstein2.png | Bin 44680 -> 40564 bytes .../texmf-dist/source/latex/hyperxmp/hyperxmp.dtx | 80 +++++++++++++-------- .../texmf-dist/source/latex/hyperxmp/hyperxmp.ins | 4 +- Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty | 25 +++---- 7 files changed, 95 insertions(+), 95 deletions(-) diff --git a/Master/texmf-dist/doc/latex/hyperxmp/README b/Master/texmf-dist/doc/latex/hyperxmp/README index b4a9ed2ad91..ad3808c746c 100644 --- a/Master/texmf-dist/doc/latex/hyperxmp/README +++ b/Master/texmf-dist/doc/latex/hyperxmp/README @@ -42,7 +42,7 @@ general information about installing packages. Copyright and license ===================== -Copyright (C) 2012 Scott Pakin +Copyright (C) 2013 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 4d635ccdd30..1b93c109e07 100644 Binary files a/Master/texmf-dist/doc/latex/hyperxmp/hyperxmp.pdf and b/Master/texmf-dist/doc/latex/hyperxmp/hyperxmp.pdf differ diff --git a/Master/texmf-dist/source/latex/hyperxmp/einstein-xmp.tex b/Master/texmf-dist/source/latex/hyperxmp/einstein-xmp.tex index 7cb2bbe7f3c..c60d1e4f338 100644 --- a/Master/texmf-dist/source/latex/hyperxmp/einstein-xmp.tex +++ b/Master/texmf-dist/source/latex/hyperxmp/einstein-xmp.tex @@ -100,9 +100,7 @@ IPTC Core Schema - - http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/ - + http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/ Iptc4xmpCore @@ -110,9 +108,7 @@ CreatorContactInfo contactinfo external - - contact information for the document's creator - + contact information for the document's creator @@ -120,70 +116,50 @@ contactinfo - - http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/contactinfo/ - - Iptc4xmpCore - - contact information - + http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/contactinfo/ + IptcContInfo + contact information CiAdrExtadr Text - - contact address - + contact address CiAdrCity Text - - contact city - + contact city CiAdrRegion Text - - contact region - + contact region CiAdrPcode Text - - contact postal code - + contact postal code CiAdrCtry Text - - contact country - + contact country CiTelWork Text - - contact telephone number - + contact telephone number CiEmailWork Text - - contact email address - + contact email address CiUrlWork Text - - contact url - + contact url @@ -195,20 +171,21 @@ - - \metavalue{Kramgasse 49} - \metavalue{Bern} - \metavalue{3011} - \metavalue{Switzerland} - \metavalue{031 312 00 91} - \metavalue{aeinstein@ipi.ch} - - \metavalue{http://einstein.biz/ - https://www.facebook.com/AlbertEinstein} - - - + xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/" + xmlns:IptcContInfo="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/contactinfo/"> + + \metavalue{Kramgasse 49} + \metavalue{Bern} + \metavalue{3011} + \metavalue{Switzerland} + \metavalue{031 312 00 91} + \metavalue{aeinstein@ipi.ch} + + \metavalue{http://einstein.biz/, + https://www.facebook.com/AlbertEinstein} + + + \metavalue{\todayISO} diff --git a/Master/texmf-dist/source/latex/hyperxmp/einstein2.png b/Master/texmf-dist/source/latex/hyperxmp/einstein2.png index 243d4db15f9..6b42182c0d4 100644 Binary files a/Master/texmf-dist/source/latex/hyperxmp/einstein2.png and b/Master/texmf-dist/source/latex/hyperxmp/einstein2.png differ diff --git a/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx b/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx index 2189d6ab8a3..283bd1646ad 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) 2012 by Scott Pakin +% Copyright (C) 2013 by Scott Pakin % ------------------------------------------------------- % % This file may be distributed and/or modified under the @@ -22,7 +22,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{hyperxmp} %<*package> - [2012/12/13 v2.2 Store hyperref metadata in XMP format] + [2013/01/08 v2.3 Store hyperref metadata in XMP format] % % %<*driver> @@ -38,6 +38,7 @@ \usepackage{needspace} \usepackage{varioref} \usepackage{alltt} +\usepackage{needspace} \usepackage{hyperxmp} \usepackage[bookmarksopen,bookmarksopenlevel=2,bookmarksnumbered]{hyperref} \EnableCrossrefs @@ -55,6 +56,7 @@ \orig@index@prologue }% \makeatother + \Needspace{12\baselineskip} \PrintIndex \end{document} % @@ -97,9 +99,9 @@ % \DoNotIndex{\@tempcnta,\@tempcntb} % \DoNotIndex{\advance,\afterassignment,\aftergroup} % \DoNotIndex{\begingroup,\bgroup} -% \DoNotIndex{\catcode} +% \DoNotIndex{\catcode,\csname} % \DoNotIndex{\def,\divide} -% \DoNotIndex{\edef,\egroup,\else,\endgroup,\expandafter} +% \DoNotIndex{\edef,\egroup,\else,\endscname,\endgroup,\expandafter} % \DoNotIndex{\fi,\futurelet} % \DoNotIndex{\gdef,\global} % \DoNotIndex{\if,\ifcase,\ifnum,\ifx,\immediate} @@ -115,7 +117,18 @@ % ^^A Define a few logical styles. % \DeclareRobustCommand{\term}[1]{#1\SortIndex{#1}{#1}} % \DeclareRobustCommand{\pkgname}[1]{\mbox{\textsf{#1}}\SortIndex{#1}{\textsf{#1}}} -% \DeclareRobustCommand{\xmpterm}[1]{\mbox{\textsf{#1}}\SortIndex{#1}{\textsf{#1}}} +% \makeatletter +% \DeclareRobustCommand{\xmpterm}[2][]{^^A +% \def\xmptermopt{#1}^^A +% \ifx\xmptermopt\@empty +% \mbox{\textsf{#2}}^^A +% \else +% \mbox{\textsf{#2}}\slash\mbox{\textsf{#1}}^^A +% \SortIndex{#1}{\textsf{#1}}^^A +% \fi +% \SortIndex{#2}{\textsf{#2}}^^A +% } +% \makeatother % \DeclareRobustCommand{\pdfterm}[1]{\mbox{\textsf{#1}}\SortIndex{#1}{\textsf{#1}}} % \DeclareRobustCommand{\cmdname}[1]{\mbox{\texttt{#1}}\SortIndex{#1}{\texttt{#1}}} % \DeclareRobustCommand{\optname}[1]{\mbox{\texttt{#1}}\SortIndex{#1}{\textsf{#1} (option)}} @@ -173,7 +186,7 @@ % pdftitle={The hyperxmp package}, % pdfsubject={LaTeX2e support for XMP metadata}, % pdfkeywords={LaTeX, embedded metadata, XMP, PDF, copyright, license, comments}, -% pdfcopyright={Copyright (C) 2012, Scott Pakin}, +% pdfcopyright={Copyright (C) 2013, Scott Pakin}, % pdflicenseurl={http://www.latex-project.org/lppl/}, % pdfcaptionwriter={Scott Pakin}, % pdfcontactemail={scott+hyxmp@pakin.org}, @@ -267,14 +280,15 @@ % \item primary author's position/title (\xmpterm{photoshop:AuthorsPosition}) % \item summary (\xmpterm{dc:description}) % \item title (\xmpterm{dc:title}) -% \item contact address (\xmpterm{Iptc4xmpCore:CiAdrExtadr}, -% \xmpterm{Iptc4xmpCore:CiAdrCity}, -% \xmpterm{Iptc4xmpCore:CiAdrRegion}, -% \xmpterm{Iptc4xmpCore:CiAdrPcode}, and -% \xmpterm{Iptc4xmpCore:CiAdrCtry}) -% \item contact telephone number(s) (\xmpterm{Iptc4xmpCore:CiTelWork}) -% \item contact email address(es) (\xmpterm{Iptc4xmpCore:CiEmailWork}) -% \item contact \acro{URL}(s) (\xmpterm{Iptc4xmpCore:CiUrlWork}) +% \item contact address +% (\xmpterm[CiAdrExtadr]{Iptc4xmpCore:CreatorContactInfo}, +% \xmpterm[CiAdrCity]{Iptc4xmpCore:CreatorContactInfo}, +% \xmpterm[CiAdrRegion]{Iptc4xmpCore:CreatorContactInfo}, +% \xmpterm[CiAdrPcode]{Iptc4xmpCore:CreatorContactInfo}, and +% \xmpterm[CiAdrCtry]{Iptc4xmpCore:CreatorContactInfo}) +% \item contact telephone number(s) (\xmpterm[CiTelWork]{Iptc4xmpCore:CreatorContactInfo}) +% \item contact email address(es) (\xmpterm[CiEmailWork]{Iptc4xmpCore:CreatorContactInfo}) +% \item contact \acro{URL}(s) (\xmpterm[CiUrlWork]{Iptc4xmpCore:CreatorContactInfo}) % \end{itemize} % % \noindent @@ -2455,11 +2469,14 @@ _________<#1>% % Add properties defined by the \acro{IPTC} Photo Metadata % schema~\cite{IPTC2010:photo-meta} to the |\hyxmp@xml| macro. We % currently support only the contact-information details structure, -% viz.\ the \xmpterm{Iptc4xmpCore:CiAdrExtadr}, -% \xmpterm{Iptc4xmpCore:CiAdrCity}, \xmpterm{Iptc4xmpCore:CiAdrRegion}, -% \xmpterm{Iptc4xmpCore:CiAdrPcode}, \xmpterm{Iptc4xmpCore:CiAdrCtry}, -% \xmpterm{Iptc4xmpCore:CiTelWork}, \xmpterm{Iptc4xmpCore:CiEmailWork}, -% and \xmpterm{Iptc4xmpCore:CiUrlWork} properties. +% viz.\ the \xmpterm[CiAdrExtadr]{Iptc4xmpCore:CreatorContactInfo}, +% \xmpterm[CiAdrCity]{Iptc4xmpCore:CreatorContactInfo}, +% \xmpterm[CiAdrRegion]{Iptc4xmpCore:CreatorContactInfo}, +% \xmpterm[CiAdrPcode]{Iptc4xmpCore:CreatorContactInfo}, +% \xmpterm[CiAdrCtry]{Iptc4xmpCore:CreatorContactInfo}, +% \xmpterm[CiTelWork]{Iptc4xmpCore:CreatorContactInfo}, +% \xmpterm[CiEmailWork]{Iptc4xmpCore:CreatorContactInfo}, and +% \xmpterm[CiUrlWork]{Iptc4xmpCore:CreatorContactInfo} properties. % \begin{macrocode} \gdef\hyxmp@photometa@schema{% \edef\hyxmp@photometa@data{% @@ -2477,15 +2494,16 @@ _________<#1>% \hyxmp@iptc@extensions \hyxmp@add@to@xml{% ______^^J% +___________xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/"^^J% +___________xmlns:IptcContInfo="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/contactinfo/">^^J% _______^^J% }% \fi - \hyxmp@list@to@lines{Iptc4xmpCore:CiAdrExtadr}{\@pdfcontactaddress}% - \hyxmp@add@simple{Iptc4xmpCore:CiAdrCity}{\@pdfcontactcity}% - \hyxmp@add@simple{Iptc4xmpCore:CiAdrRegion}{\@pdfcontactregion}% - \hyxmp@add@simple{Iptc4xmpCore:CiAdrPcode}{\@pdfcontactpostcode}% - \hyxmp@add@simple{Iptc4xmpCore:CiAdrCtry}{\@pdfcontactcountry}% + \hyxmp@list@to@lines{IptcContInfo:CiAdrExtadr}{\@pdfcontactaddress}% + \hyxmp@add@simple{IptcContInfo:CiAdrCity}{\@pdfcontactcity}% + \hyxmp@add@simple{IptcContInfo:CiAdrRegion}{\@pdfcontactregion}% + \hyxmp@add@simple{IptcContInfo:CiAdrPcode}{\@pdfcontactpostcode}% + \hyxmp@add@simple{IptcContInfo:CiAdrCtry}{\@pdfcontactcountry}% % \end{macrocode} % \begin{macro}{\xmplinesep} % The \acro{IPTC} standard states that sets of telephone numbers, email @@ -2500,9 +2518,9 @@ _______^^J% % \begin{macrocode} \bgroup \def\xmplinesep{,}% - \hyxmp@list@to@lines{Iptc4xmpCore:CiTelWork}{\@pdfcontactphone}% - \hyxmp@list@to@lines{Iptc4xmpCore:CiEmailWork}{\@pdfcontactemail}% - \hyxmp@list@to@lines{Iptc4xmpCore:CiUrlWork}{\@pdfcontacturl}% + \hyxmp@list@to@lines{IptcContInfo:CiTelWork}{\@pdfcontactphone}% + \hyxmp@list@to@lines{IptcContInfo:CiEmailWork}{\@pdfcontactemail}% + \hyxmp@list@to@lines{IptcContInfo:CiUrlWork}{\@pdfcontacturl}% \egroup \ifx\hyxmp@photometa@data\@empty \else @@ -2520,6 +2538,10 @@ ______^^J% % \begin{macro}{\hyxmp@iptc@extensions} % \changes{v2.2}{2012/12/13}{Added this macro to support % \acro{PDF/A} generation} +% \changes{v2.3}{2013/01/08}{Gave the +% \xmpterm{Iptc4xmpCore:CreatorContactInfo} fields a unique +% \xmpterm{pdfaType:prefix} to better support conversion of the +% document to \acro{PDF/A}} % Because \acro{IPTC} metadata are not recognized by the \acro{PDF/A} % standard, \acro{PDF/A} conversion would normally fail for documents % that utilize |\pdfcontactaddress|, |\pdfcontactcity|, etc. However, @@ -2559,7 +2581,7 @@ ________________^^J% __________________^^J% ____________________contactinfo^^J% ____________________http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/contactinfo/^^J% -____________________Iptc4xmpCore^^J% +____________________IptcContInfo^^J% ____________________contact information^^J% ____________________^^J% ______________________^^J% diff --git a/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.ins b/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.ins index 91b1b6be876..b8a21b39829 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) 2012 by Scott Pakin +%% Copyright (C) 2013 by 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 @@ -21,7 +21,7 @@ This is a generated file. -Copyright (C) 2012 by Scott Pakin +Copyright (C) 2013 by 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/tex/latex/hyperxmp/hyperxmp.sty b/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty index 9c1a71148ee..13205a4c96b 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) 2012 by Scott Pakin +%% Copyright (C) 2013 by 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 @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{hyperxmp} - [2012/12/13 v2.2 Store hyperref metadata in XMP format] + [2013/01/08 v2.3 Store hyperref metadata in XMP format] \edef\hyxmp@dq@code{\the\catcode`\"} \catcode`\"=12 \def\hyxmp@driver{hpdftex} @@ -741,20 +741,21 @@ _________<#1>% \hyxmp@iptc@extensions \hyxmp@add@to@xml{% ______^^J% +___________xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/"^^J% +___________xmlns:IptcContInfo="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/contactinfo/">^^J% _______^^J% }% \fi - \hyxmp@list@to@lines{Iptc4xmpCore:CiAdrExtadr}{\@pdfcontactaddress}% - \hyxmp@add@simple{Iptc4xmpCore:CiAdrCity}{\@pdfcontactcity}% - \hyxmp@add@simple{Iptc4xmpCore:CiAdrRegion}{\@pdfcontactregion}% - \hyxmp@add@simple{Iptc4xmpCore:CiAdrPcode}{\@pdfcontactpostcode}% - \hyxmp@add@simple{Iptc4xmpCore:CiAdrCtry}{\@pdfcontactcountry}% + \hyxmp@list@to@lines{IptcContInfo:CiAdrExtadr}{\@pdfcontactaddress}% + \hyxmp@add@simple{IptcContInfo:CiAdrCity}{\@pdfcontactcity}% + \hyxmp@add@simple{IptcContInfo:CiAdrRegion}{\@pdfcontactregion}% + \hyxmp@add@simple{IptcContInfo:CiAdrPcode}{\@pdfcontactpostcode}% + \hyxmp@add@simple{IptcContInfo:CiAdrCtry}{\@pdfcontactcountry}% \bgroup \def\xmplinesep{,}% - \hyxmp@list@to@lines{Iptc4xmpCore:CiTelWork}{\@pdfcontactphone}% - \hyxmp@list@to@lines{Iptc4xmpCore:CiEmailWork}{\@pdfcontactemail}% - \hyxmp@list@to@lines{Iptc4xmpCore:CiUrlWork}{\@pdfcontacturl}% + \hyxmp@list@to@lines{IptcContInfo:CiTelWork}{\@pdfcontactphone}% + \hyxmp@list@to@lines{IptcContInfo:CiEmailWork}{\@pdfcontactemail}% + \hyxmp@list@to@lines{IptcContInfo:CiUrlWork}{\@pdfcontacturl}% \egroup \ifx\hyxmp@photometa@data\@empty \else @@ -793,7 +794,7 @@ ________________^^J% __________________^^J% ____________________contactinfo^^J% ____________________http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/contactinfo/^^J% -____________________Iptc4xmpCore^^J% +____________________IptcContInfo^^J% ____________________contact information^^J% ____________________^^J% ______________________^^J% -- cgit v1.2.3