pdfx update (4may09)

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

4 files changed, 88 insertions, 1 deletions

diff --git a/Master/texmf-dist/source/latex/pdfx/pdfx.dtx b/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
index 4a7887dddf8..a888096aa3c 100644
--- a/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
+++ b/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
@@ -71,11 +71,12 @@
 % \changes{v1.00}{2008/12/01}{Initial commit to the CVS.}
 % \changes{v1.01}{2008/12/10}{glyphtounicode-cmr.tex included with the
 %   package.}
+% \changes{v1.3}{2008/12/01}{Fix copyright in xmp files.}
 %
 % \title{Generation of PDF/X-1a and PDF/A-1b compliant PDF's
 %  with PDF\TeX{} --- \texttt{pdfx.sty}}
 % \date{2008/12/10}
-% \version{1.2}
+% \version{1.3}
 % \keywords{\pdf, \pdfx, \pdfa, pdf\TeX, \LaTeX}
 % \author{C.\,V.\,Radhakrishnan {\upshape\small and} \thanh}
 % \contact{\texttt{[cvr,thanh]@river-valley.org}}
diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfa-1b.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfa-1b.xmp
new file mode 100644
index 00000000000..c30e022f766
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pdfx/pdfa-1b.xmp
@@ -0,0 +1,68 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                 
+%%  File: pdfa-1b.xmp                                         
+%% 
+%%  Copyright (c) 2008, CV Radhakrishnan <cvr@river-valley.org>,
+%%    Han The Thanh <thanh@river-valley.org>
+%% 
+%%  This file may be distributed and/or modified under the conditions
+%%  of the LaTeX Project Public License, either version 1.2 of this
+%%  license or (at your option) any later version.  The latest version
+%%  of this license is in:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%%  and version 1.2 or later is part of all distributions of LaTeX
+%%  version 1999/12/01 or later.
+%%
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.0-c316 44.253921, Sun Oct 01 2006 17:14:39">
+   <rdf:RDF xmlns:rdf       = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+            xmlns:pdfx      = "http://ns.adobe.com/pdfx/1.3/"
+            xmlns:pdfaid    = "http://www.aiim.org/pdfa/ns/id/"
+            xmlns:xap       = "http://ns.adobe.com/xap/1.0/"
+            xmlns:xapRights = "http://ns.adobe.com/xap/1.0/rights/"
+            xmlns:dc        = "http://purl.org/dc/elements/1.1/"
+            xmlns:dcterms   = "http://purl.org/dc/terms/"
+	    xmlns:prism     = "http://prismstandard.org/namespaces/basic/2.0/">
+      <rdf:Description rdf:about="" xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
+      <pdf:Producer>\xmpProducer</pdf:Producer>
+      </rdf:Description>
+      <rdf:Description rdf:about="doi:\xmpDoi">
+         <dc:format>application/pdf</dc:format>
+         <dc:title>\xmpTitle</dc:title>
+         <dc:creator><rdf:Seq><rdf:li>\xmpAuthor</rdf:li></rdf:Seq></dc:creator>
+\@ifundefined{xmpKeywords}{}{<dc:subject><rdf:Bag><rdf:li>\xmpKeywords</rdf:li></rdf:Bag></dc:subject>}
+         <prism:aggregationType>journal</prism:aggregationType>
+ 	 <prism:copyright>\xmpOrg</prism:copyright>
+         <dc:publisher>\xmpOrg</dc:publisher>
+	 \ifx\xmpJournalnumber\@empty\relax\else<prism:issn>\xmpJournalnumber</prism:issn>\fi
+	 \ifx\xmpVolume\@empty\relax\else<prism:volume>\xmpVolume</prism:volume>\fi
+	 \ifx\xmpIssue\@empty\relax\else<prism:number>\xmpIssue</prism:number>\fi
+	 \ifx\xmpCoverDisplayDate\@empty\relax\else<prism:coverDisplayDate>\xmpCoverDisplayDate</prism:coverDisplayDate>\fi
+	 \ifx\xmpCoverDate\@empty\relax\else<prism:coverDate>\xmpCoverDate</prism:coverDate>\fi
+	 \ifx\xmpJournaltitle\@empty\relax\else<prism:issueName>\xmpJournaltitle</prism:issueName>\fi
+	 \ifx\xmpFirstpage\@empty\relax\else<prism:pageRange>\xmpFirstpage-\xmpLastpage</prism:pageRange>\fi
+         \ifx\xmpFirstpage\@empty\relax\else<prism:startingPage>\xmpFirstpage</prism:startingPage>\fi
+         \ifx\xmpLastpage\@empty\relax\else<prism:endingPage>\xmpLastpage</prism:endingPage>\fi
+         \ifx\xmpDoi\@empty\relax\else<prism:doi>\xmpDoi</prism:doi>\fi
+         \ifx\xmpDoi\@empty\relax\else<prism:url>http://dx.doi.org/\xmpDoi</prism:url>\fi
+         \ifx\xmpDoi\@empty\relax\else<dc:identifier>doi:\xmpDoi</dc:identifier>\fi
+         \ifx\xmpAuthoritativeDomain\@empty\relax\else<pdfx:AuthoritativeDomain><rdf:Bag><rdf:li>\xmpAuthoritativeDomain</rdf:li></rdf:Bag></pdfx:AuthoritativeDomain>\fi
+         <pdfaid:part>1</pdfaid:part>
+         <pdfaid:conformance>B</pdfaid:conformance>
+         <xap:CreatorTool>\xmpCreatorTool</xap:CreatorTool>
+         <xapRights:Marked>True</xapRights:Marked>
+         <xap:ModifyDate>\convDate</xap:ModifyDate>
+         <xap:CreateDate>\convDate</xap:CreateDate>
+         <xap:MetadataDate>\convDate</xap:MetadataDate>
+      </rdf:Description>
+%      <rdf:Description rdf:about="" xmlns:xapMM="http://ns.adobe.com/xap/1.0/mm/">
+%         <xapMM:DocumentID>uuid:\xmpdocid</xapMM:DocumentID>
+%         <xapMM:InstanceID>uuid:\xmpinstid</xapMM:InstanceID>
+%      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+%%
+%% End of pdfa-1b.xmp
+%%
+%%
diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfx-1a.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfx-1a.xmp
index f99175e832f..f29e43ce123 100644
--- a/Master/texmf-dist/tex/latex/pdfx/pdfx-1a.xmp
+++ b/Master/texmf-dist/tex/latex/pdfx/pdfx-1a.xmp
@@ -1,3 +1,20 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                 
+%%  File: pdfx-1a.xmp                                         
+%% 
+%%  Copyright (c) 2008, CV Radhakrishnan <cvr@river-valley.org>,
+%%    Han The Thanh <thanh@river-valley.org>
+%% 
+%%  This file may be distributed and/or modified under the conditions
+%%  of the LaTeX Project Public License, either version 1.2 of this
+%%  license or (at your option) any later version.  The latest version
+%%  of this license is in:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%%  and version 1.2 or later is part of all distributions of LaTeX
+%%  version 1999/12/01 or later.
+%%
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
 <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.0-c316 44.253921, Sun Oct 01 2006 17:14:39">
    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 9b7766d9434..2cc001ffae1 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -489,6 +489,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'titlepage-uni-dortmund', "die 'needs graphics (too short names) in .'",
  'tksbrief',	"die 'skipping, LaTeX 2.09'",
  'tkz-tab',	"&MAKEflatten",
+ 'tolkienfonts',"die 'skipping, ttf fonts which are not packaged'",
  'tpcmfont',	"die 'skipping, ?'",
  'translator',	"&MAKEflatten",
  'turkishintro',"die 'skipping, nosource'",