summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-01-12 00:07:10 +0000
committerKarl Berry <karl@freefriends.org>2013-01-12 00:07:10 +0000
commit84d6304b14637b064102d3fc1ad0677a572d6dcc (patch)
treea3218a7e8ab246ab8152e4700dbad053203fdbed /Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx
parentdff5cf3b60e36d963345a8c4177b7745b627ccc9 (diff)
hyperxmp (10jan13)
git-svn-id: svn://tug.org/texlive/trunk@28809 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx')
-rw-r--r--Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx80
1 files changed, 51 insertions, 29 deletions
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 <scott+hyxmp@pakin.org>
+% Copyright (C) 2013 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>
- [2012/12/13 v2.2 Store hyperref metadata in XMP format]
+ [2013/01/08 v2.3 Store hyperref metadata in XMP format]
%</package>
%
%<*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}
%</driver>
@@ -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{%
______<rdf:Description rdf:about=""^^J%
-___________xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/">^^J%
+___________xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/"^^J%
+___________xmlns:IptcContInfo="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/contactinfo/">^^J%
_______<Iptc4xmpCore:CreatorContactInfo rdf:parseType="Resource">^^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 @@ _______<Iptc4xmpCore:CreatorContactInfo rdf:parseType="Resource">^^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 @@ ______</rdf:Description>^^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 @@ ________________<rdf:Seq>^^J%
__________________<rdf:li rdf:parseType="Resource">^^J%
____________________<pdfaType:type>contactinfo</pdfaType:type>^^J%
____________________<pdfaType:namespaceURI>http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/contactinfo/</pdfaType:namespaceURI>^^J%
-____________________<pdfaType:prefix>Iptc4xmpCore</pdfaType:prefix>^^J%
+____________________<pdfaType:prefix>IptcContInfo</pdfaType:prefix>^^J%
____________________<pdfaType:description>contact information</pdfaType:description>^^J%
____________________<pdfaType:field>^^J%
______________________<rdf:Seq>^^J%