summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/pdfx/README12
-rw-r--r--Master/texmf-dist/doc/latex/pdfx/pdfx.pdfbin134656 -> 231570 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfx/sample.pdfbin0 -> 26090 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfx/sample.tex6
-rw-r--r--Master/texmf-dist/doc/latex/pdfx/sample.xmpdata133
-rw-r--r--Master/texmf-dist/doc/latex/pdfx/small2e-pdfx.pdfbin0 -> 96204 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfx/small2e-pdfx.tex73
-rw-r--r--Master/texmf-dist/doc/latex/pdfx/small2e-pdfx.xmpdata25
-rw-r--r--Master/texmf-dist/doc/latex/pdfx/small2e.pdfbin55030 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfx/small2e.tex42
-rw-r--r--Master/texmf-dist/doc/latex/pdfx/small2e.xmpdata5
-rw-r--r--Master/texmf-dist/source/latex/pdfx/README40
-rw-r--r--Master/texmf-dist/source/latex/pdfx/manifest.txt (renamed from Master/texmf-dist/doc/latex/pdfx/manifest.txt)57
-rw-r--r--Master/texmf-dist/source/latex/pdfx/pdfx.dtx1559
-rw-r--r--Master/texmf-dist/source/latex/pdfx/pdfx.ins7
-rw-r--r--Master/texmf-dist/source/latex/pdfx/rvdtx.sty5
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/8bit.def170
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/ICC_LICENSE.txt51
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/coated_FOGRA39L_argl.iccbin0 -> 1047860 bytes
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/glyphtounicode-cmr.tex434
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/pdfa-1b.xmp68
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/pdfa.xmp316
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/pdfe.xmp369
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/pdfvt.xmp366
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/pdfx-1a.xmp72
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/pdfx.sty887
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/pdfx.xmp345
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/sRGB_IEC61966-2-1_black_scaled.iccbin0 -> 3048 bytes
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
29 files changed, 4180 insertions, 863 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfx/README b/Master/texmf-dist/doc/latex/pdfx/README
index 7b5d6bc7a6a..ae89c524149 100644
--- a/Master/texmf-dist/doc/latex/pdfx/README
+++ b/Master/texmf-dist/doc/latex/pdfx/README
@@ -1,13 +1,13 @@
Readme for pdfx package (pdfx.sty)
-pdfx.sty is a LaTeX package which helps to create PDF/X-1a and
-PFD/A-1b compliant pdf documents with pdfTeX.
+pdfx.sty is a LaTeX package which helps to create PDF/X and
+PFD/A compliant PDF documents with pdfTeX.
Installation:
Create a directory $TEXMF/tex/latex/pdfx and copy pdfx.sty, *.xmp,
-glyphtounicode-cmr.tex to this directory. Update the file database
-of your TeX system.
+*.icc, 8bit.def, and glyphtounicode-cmr.tex to this directory. Update
+the file database of your TeX system.
Documentation:
@@ -34,5 +34,7 @@ The package is released under LaTeX Project Public Licence.
Authors:
-CV Radhakrishnan <cvr@river-valley.org> and
+CV Radhakrishnan <cvr@river-valley.org>
Han The Thanh <thanh@river-valley.org>
+Ross Moore <ross.moore@mq.edu.au>
+Peter Selinger <selinger@mathstat.dal.ca>
diff --git a/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf b/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf
index eefbb0ed5c9..40d5d8e36f3 100644
--- a/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf
+++ b/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfx/sample.pdf b/Master/texmf-dist/doc/latex/pdfx/sample.pdf
new file mode 100644
index 00000000000..2162b4d4e32
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfx/sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfx/sample.tex b/Master/texmf-dist/doc/latex/pdfx/sample.tex
new file mode 100644
index 00000000000..0b07f4ed091
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfx/sample.tex
@@ -0,0 +1,6 @@
+\documentclass{article}
+\usepackage[a-1b]{pdfx}
+
+\begin{document}
+In this example, only the metadata matters.
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/pdfx/sample.xmpdata b/Master/texmf-dist/doc/latex/pdfx/sample.xmpdata
new file mode 100644
index 00000000000..5a93bc8b858
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfx/sample.xmpdata
@@ -0,0 +1,133 @@
+% Replace the following information with your document's actual
+% metadata. If you do not want to set a value for a certain parameter,
+% just omit it.
+%
+% Symbols permitted in metadata
+% =============================
+%
+% Within the metadata, all printable ASCII characters except
+% '\', '{', '}', and '%' represent themselves. Also, all printable
+% Unicode characters from the basic multilingual plane (i.e., up to
+% code point U+FFFF) can be used directly with the UTF-8 encoding.
+% (Please note: encodings other than UTF-8 are not currently supported
+% in the metadata). Consecutive whitespace characters are combined
+% into a single space. Whitespace after a macro such as \copyright,
+% \backslash, or \sep is ignored. Blank lines are not permitted.
+% Moreover, the following markup can be used:
+%
+% '\ ' - a literal space (for example after a macro)
+% \% - a literal '%'
+% \{ - a literal '{'
+% \} - a literal '}'
+% \backslash - a literal '\'
+% \copyright - the (c) copyright symbol
+%
+% The macro \sep is only permitted within \Author, \Keywords, and
+% \Publisher. It is used to separate multiple authors, keywords, etc.
+%
+% List of supported metadata fields
+% =================================
+%
+% Here is a complete list of user-definable metadata fields currently
+% supported, and their meanings. More may be added in the future.
+% These commands can only be used in the .xmpdata file.
+%
+% General information:
+%
+% \Author - the document's human author. Separate multiple
+% authors with \sep.
+% \Title - the document's title.
+% \Keywords - list of keywords, separated with \sep.
+% \Subject - the abstract.
+% \Publisher - the publisher.
+%
+% Copyright information:
+%
+% \Copyright - a copyright statement.
+% \CopyrightURL - location of a web page describing the owner
+% and/or rights statement for this document.
+% \Copyrighted - 'True' if the document is copyrighted, and
+% 'False' if it isn't. This is automatically set
+% to 'True' if either \Copyright or \CopyrightURL
+% is specified, but can be overridden. For
+% example, if the copyright statement is "Public
+% Domain", this should be set to 'False'.
+%
+% Publication information:
+%
+% \PublicationType - The type of publication. If defined, must be
+% one of book, catalog, feed, journal, magazine,
+% manual, newsletter, pamphlet. This is
+% automatically set to "journal" if \Journaltitle
+% is specified, but can be overridden.
+% \Journaltitle - The title of the journal in which the document
+% was published.
+% \Journalnumber - The ISSN for the publication in which the
+% document was published.
+% \Volume - Journal volume.
+% \Issue - Journal issue/number.
+% \Firstpage - First page number of the published version of
+% the document.
+% \Lastpage - Last page number of the published version of
+% the document.
+% \Doi - Digital Object Identifier (DOI) for the
+% document, without the leading "doi:".
+% \CoverDisplayDate - Date on the cover of the journal issue, as a
+% human-readable text string.
+% \CoverDate - Date on the cover of the journal issue, in a
+% format suitable for storing in a database field
+% with a 'date' data type.
+%
+% Color profiles
+% ==============
+%
+% PDF/A and PDF/E require an RGB color profile, and PDF/X and PDF/VT
+% require a CMYK color profile to be embedded. The pdfx package
+% includes freely distributable color profiles that will be used by
+% default. The following commands are available if you have a specific
+% color profile that you would like to include instead. These commands
+% can only be used in the .xmpdata file.
+%
+% To specify an RGB color profile:
+% \setRGBcolorprofile{<filename>}{<identifier>}{<info string>}{<registry URL>}
+%
+% To specify a CMYK color profile:
+% \setCMYKcolorprofile{<filename>}{<output intent>}{<identifier>}{<registry URL>}
+%
+% Within the arguments of these macros, the characters '<', '>', '&',
+% '^', '_', '#', '$', and '~' can be used as themselves, but
+% '%' must be escaped as '\%'.
+%
+% The default for these parameters are:
+%
+% \setRGBcolorprofile
+% {sRGB_IEC61966-2-1_black_scaled.icc}
+% {sRGB_IEC61966-2-1_black_scaled}
+% {sRGB IEC61966 v2.1 with black scaling}
+% {http://www.color.org}
+%
+% \setCMYKcolorprofile
+% {coated_FOGRA39L_argl.icc}
+% {Coated FOGRA39}
+% {FOGRA39 (ISO Coated v2 300\% (ECI))}
+% {http://www.argyllcms.com/}
+
+
+
+\Title {The Title Goes Here. In the metadata, you may use Unicode such
+ as U₄(ℤ[1/√2, i]). You may also use the ASCII characters
+ !'''()*+,-./:;<=>?@[]`|#$&~^_. The following four symbols
+ must be escaped: \% \backslash\ \{ \}.}
+
+\Author {K. Gödel\sep
+ M. C. Escher\sep
+ J. S. Bach\sep
+ The artist formerly known as Ƭ̵̬}
+
+\Copyright {Copyright \copyright\ 2015 "Author's Name Goes Here"}
+
+\Keywords {first keyword\sep
+ second keyword\sep
+ some more keywords}
+
+\Subject {This is where you put the abstract.}
diff --git a/Master/texmf-dist/doc/latex/pdfx/small2e-pdfx.pdf b/Master/texmf-dist/doc/latex/pdfx/small2e-pdfx.pdf
new file mode 100644
index 00000000000..ef8d8e11647
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfx/small2e-pdfx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfx/small2e-pdfx.tex b/Master/texmf-dist/doc/latex/pdfx/small2e-pdfx.tex
new file mode 100644
index 00000000000..1475d29abb4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfx/small2e-pdfx.tex
@@ -0,0 +1,73 @@
+% This is a small sample LaTeX input file (Version of 10 April 1994)
+%
+% Use this file as a model for making your own LaTeX input file.
+% Everything to the right of a % is a remark to you and is ignored by LaTeX.
+
+% The Local Guide tells how to run LaTeX.
+
+% WARNING! Do not type any of the following 10 characters except as directed:
+% & $ # % _ { } ^ ~ \
+%
+\documentclass{article} % Your input file must contain a \documentclass line and a package+option:
+%\usepackage[x-1]{pdfx}% for PDF/X-1a:2001
+%\usepackage[x-1a]{pdfx}% for PDF/X-1a:2003
+%\usepackage[x-3]{pdfx}% for PDF/X-3:2002
+%\usepackage[x-302]{pdfx}% for PDF/X-3:2002
+%\usepackage[x-303]{pdfx}% for PDF/X-3:2003
+%\usepackage[x-4]{pdfx}% for PDF/X-4
+%\usepackage[x-5g]{pdfx}% for PDF/X-5g
+%\usepackage[e-1]{pdfx}% for PDF/E-1
+\usepackage[a-1b]{pdfx}% for PDF/A-1b
+%\usepackage[a-2b]{pdfx}% for PDF/A-2b
+%\usepackage[a-2u]{pdfx}% for PDF/A-2u
+%\usepackage[a-3b]{pdfx}% for PDF/A-3b
+%\usepackage[a-3u]{pdfx}% for PDF/A-3u
+%% PDF/A-1a, -2a, -3a requires fully tagged PDFs
+%\usepackage[a-1a]{pdfx}% for PDF/A-1a
+%\usepackage[a-2a]{pdfx}% for PDF/A-2a
+%\usepackage[a-3a]{pdfx}% for PDF/A-3a
+%% These later versions are not fully implemented yet.
+%\usepackage[x-4p]{pdfx}
+%\usepackage[x-5n]{pdfx}
+%\usepackage[x-5pg]{pdfx}
+%% PDF/VT requires special document structure, using DParts
+%\usepackage[vt-1]{pdfx}
+%\usepackage[vt-2]{pdfx}
+%\usepackage[vt-2s]{pdfx}
+%\usepackage[x-2]{pdfx}% obsolete/withdrawn
+%%% or one of these, or similar: in a later version
+%%\usepackage[a-3b,e-1,x-4]{pdfxmult}
+%%\usepackage[a-3b,e-1,x-3,vt-1]{pdfxmult}
+%%\usepackage[none]{pdfxmult}
+
+\begin{document} % plus the \end{document} command at the end.
+
+\section{Simple Text}\label{sec1}% % This command makes a section title.
+%
+Words are separated by one or more spaces. Paragraphs are separated by
+one or more blank lines. The output is not affected by adding extra
+spaces or extra blank lines to the input file.
+
+Double quotes are typed like this: ``quoted text''.
+Single quotes are typed like this: `single-quoted text'.
+
+Long dashes are typed as three dash characters---like this.
+
+Emphasized text is typed like this: \emph{this is emphasized}.
+Bold text is typed like this: \textbf{this is bold}.
+
+\subsection{A Warning or Two} % This command makes a subsection title.
+
+If you get too much space after a mid-sentence period---abbreviations
+like etc.\ are the common culprits)---then type a backslash followed by
+a space after the period, as in this sentence.
+
+Remember, don't type the 10 special characters (such as dollar sign and
+backslash) except as directed! The following seven are printed by
+typing a backslash in front of them: \$ \& \# \% \_ \{ and \}.
+The manual tells how to make other symbols.
+
+\bigskip\vfil
+\rightline{\footnotesize Jump back to Section~\ref{sec1}.}
+
+\end{document} % The input file ends with this command.
diff --git a/Master/texmf-dist/doc/latex/pdfx/small2e-pdfx.xmpdata b/Master/texmf-dist/doc/latex/pdfx/small2e-pdfx.xmpdata
new file mode 100644
index 00000000000..8de1f790789
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfx/small2e-pdfx.xmpdata
@@ -0,0 +1,25 @@
+\Title{Sample LaTeX input file}% *not* set by LaTeX's \title
+\Author{LaTeX project team\sep River Valley Technologies\sep Ross & Peter}% *not* set by LaTeX's \author
+\Subject{Metadata for PDF/X, PDF/A and PDF/E conforming documents}
+\Keywords{pdfTeX\sep PDF/X-1a\sep PDF/A-1b\sep PDF/E-1}
+\Org{TeX Users Group}
+%\CreatorTool{pdfTeX} % generated automatically
+\Copyright{Thanh, CVR, Ross & Peter}
+\WebStatement{http://www.tug.org/}% should be URL to copyright statement on the web
+%\Producer{LaTeX} % generated automatically
+\Volume{latest in 2015}
+\Issue{???}
+\CoverDisplayDate{Special Issue, 2015}
+\CoverDate{2015-01-01}% must be in format YYYY-MM-DD
+\Doi{0.0.0.0}%
+\Lastpage{10}
+\Firstpage{1}%
+%\PublicationType{journal}% automatically set by \Journaltitle{…}
+\Journaltitle{TUGboat}%
+\Journalnumber{????--????}% ISSN
+\AuthoritativeDomain{http://ctan.tug.org/}%
+%
+% setting the color profile, these reproduce the defaults; use your own, if required
+% RGB is used with PDF/A, CMYK with PDF/X (4 parameters):
+\setRGBcolorprofile{sRGB_IEC61966-2-1_black_scaled.icc}{sRGB_IEC61966-2-1_black_scaled}{sRGB IEC61966 v2.1 with black scaling}{http://www.color.org}
+\setCMYKcolorprofile{coated_FOGRA39L_argl.icc}{Coated FOGRA39}{FOGRA39 (ISO Coated v2 300\% (ECI))}{http://www.color.org}
diff --git a/Master/texmf-dist/doc/latex/pdfx/small2e.pdf b/Master/texmf-dist/doc/latex/pdfx/small2e.pdf
deleted file mode 100644
index 61451d80da8..00000000000
--- a/Master/texmf-dist/doc/latex/pdfx/small2e.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfx/small2e.tex b/Master/texmf-dist/doc/latex/pdfx/small2e.tex
deleted file mode 100644
index 728ecb3b4cc..00000000000
--- a/Master/texmf-dist/doc/latex/pdfx/small2e.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-% This is a small sample LaTeX input file (Version of 10 April 1994)
-%
-% Use this file as a model for making your own LaTeX input file.
-% Everything to the right of a % is a remark to you and is ignored by LaTeX.
-
-% The Local Guide tells how to run LaTeX.
-
-% WARNING! Do not type any of the following 10 characters except as directed:
-% & $ # % _ { } ^ ~ \
-
-\documentclass{article} % Your input file must contain these two lines
-\usepackage[a-1b]{pdfx}
-
-\begin{document} % plus the \end{document} command at the end.
-
-
-\section{Simple Text} % This command makes a section title.
-
-Words are separated by one or more spaces. Paragraphs are separated by
-one or more blank lines. The output is not affected by adding extra
-spaces or extra blank lines to the input file.
-
-Double quotes are typed like this: ``quoted text''.
-Single quotes are typed like this: `single-quoted text'.
-
-dashes are typed as Long three dash characters---like this.
-
-Emphasized text is typed like this: \emph{this is emphasized}.
-Bold text is typed like this: \textbf{this is bold}.
-
-\subsection{A Warning or Two} % This command makes a subsection title.
-
-If you get too much space after a mid-sentence period---abbreviations
-like etc.\ are the common culprits)---then type a backslash followed by
-a space after the period, as in this sentence.
-
-Remember, don't $\left[\frac2a\right]H_n^1$ type the 10 special characters (such as dollar sign and
-backslash) except as directed! The following seven are printed by
-typing a backslash in front of them: \$ \& \# \% \_ \{ and \}.
-The manual tells how to make other symbols.
-
-\end{document} % The input file ends with this command.
diff --git a/Master/texmf-dist/doc/latex/pdfx/small2e.xmpdata b/Master/texmf-dist/doc/latex/pdfx/small2e.xmpdata
deleted file mode 100644
index 7b1302ad998..00000000000
--- a/Master/texmf-dist/doc/latex/pdfx/small2e.xmpdata
+++ /dev/null
@@ -1,5 +0,0 @@
-\Keywords{pdfTeX\sep PDF/X-1a\sep PDF/A-b}
-\Title{Sample LaTeX input file}
-\Author{LaTeX project team}
-\Org{TeX Users Group}
- \ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/pdfx/README b/Master/texmf-dist/source/latex/pdfx/README
new file mode 100644
index 00000000000..ae89c524149
--- /dev/null
+++ b/Master/texmf-dist/source/latex/pdfx/README
@@ -0,0 +1,40 @@
+Readme for pdfx package (pdfx.sty)
+
+pdfx.sty is a LaTeX package which helps to create PDF/X and
+PFD/A compliant PDF documents with pdfTeX.
+
+Installation:
+
+Create a directory $TEXMF/tex/latex/pdfx and copy pdfx.sty, *.xmp,
+*.icc, 8bit.def, and glyphtounicode-cmr.tex to this directory. Update
+the file database of your TeX system.
+
+Documentation:
+
+Composite documentation and code is available in src/pdfx.dtx. Run
+TeX/LaTeX on pdfx.ins to extract pdfx.sty from pdfx.dtx. If you
+[pdf]LaTeX pdfx.dtx, you will get pdfx.pdf which is the human readable
+documentation.
+
+A Makefile is provided in the src directory. Following steps will
+create the documentation GNU/Linux or similar operating system:
+
+ make pdf
+ make out
+ make index
+ make changes
+ make pdf
+
+'make out' is for manipulating the bookmarks file to create QUICK
+LINKS in the pdf document.
+
+Licence:
+
+The package is released under LaTeX Project Public Licence.
+
+Authors:
+
+CV Radhakrishnan <cvr@river-valley.org>
+Han The Thanh <thanh@river-valley.org>
+Ross Moore <ross.moore@mq.edu.au>
+Peter Selinger <selinger@mathstat.dal.ca>
diff --git a/Master/texmf-dist/doc/latex/pdfx/manifest.txt b/Master/texmf-dist/source/latex/pdfx/manifest.txt
index 425fcf60821..e18735a1928 100644
--- a/Master/texmf-dist/doc/latex/pdfx/manifest.txt
+++ b/Master/texmf-dist/source/latex/pdfx/manifest.txt
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
% Copyright 2008 CV Radhakrishnan and Han The Thanh
+% Copyright 2015 Ross Moore and Peter Selinger
%
% This file is part of the 'pdfx' package.
% ----------------------------------------
@@ -12,6 +13,10 @@
% or later is part of all distributions of LaTeX version 1999/12/01 or
% later.
%
+% The color profile sRGB_IEC61966-2-1_black_scaled.icc is
+% Copyright 2009 International Color Consortium.
+% It is distributed under the terms given in the file `ICC_LICENSE.txt'.
+%
% The list of all files belonging to the LaTeX package, 'pdfx.sty' is
% given in the file `manifest.txt'.
%
@@ -22,29 +27,56 @@
README
Readme file
+pdfx.sty
+ the main package
+
glyphtounicode-cmr.tex
maps glyphnames in cmr font to Unicode
-pdfa-1b.xmp
- xmp template for pdf/a-1b documents
+pdfa.xmp
+ XMP template for PDF/A documents
-pdfx-1a.xmp
- xmp template for pdf/x-1a documents
+pdfe.xmp
+ XMP template for PDF/E documents
-pdfx.sty
- the main package
+pdfvt.xmp
+ XMP template for PDF/VT documents
+
+pdfx.xmp
+ XMP template for PDF/X documents
+
+8bit.def
+ custom input encoding
+
+coated_FOGRA39L_argl.icc
+ CMYK color profile
+
+sRGB_IEC61966-2-1_black_scaled.icc
+ RGB color profile
+
+ICC_LICENSE.txt
+ the license for the color profiles
pdfx.pdf
- documentation in pdf format
+ documentation in PDF format
-small2e.pdf
- example pdf document
+sample.tex
+ example TeX document
+
+sample.xmpdata
+ example metadata file
-small2e.tex
+small2e-pdfx.tex
example TeX document
-small2e.xmpdata
- data file with meta information
+small2e-pdfx.xmpdata
+ example metadata file
+
+small2e-pdfx.pdf
+ example pdf document
+
+manifest.txt
+ file list
Directory: src
@@ -59,4 +91,3 @@ pdfx.ins
rvdtx.sty
extra package needed to compile documentation
-
diff --git a/Master/texmf-dist/source/latex/pdfx/pdfx.dtx b/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
index a888096aa3c..debb49866a1 100644
--- a/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
+++ b/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
@@ -2,8 +2,10 @@
%
% File: pdfx.dtx
%
-% Copyright (c) 2008, CV Radhakrishnan <cvr@river-valley.org>,
-% Han The Thanh <thanh@river-valley.org>
+% Copyright (c) 2015, CV Radhakrishnan <cvr@river-valley.org>,
+% Han The Thanh <thanh@river-valley.org>,
+% Ross Moore <ross.moore@mq.edu.au>,
+% Peter Selinger <selinger@mathstat.dal.ca>
%
% This file may be distributed and/or modified under the conditions
% of the LaTeX Project Public License, either version 1.2 of this
@@ -17,7 +19,7 @@
%
% \fi
%
-% \CheckSum{376}
+% \CheckSum{1844}
% \iffalse
%
%<*driver>
@@ -27,7 +29,7 @@
\CodelineIndex
\RecordChanges
\begin{document}
- \DocInput{pdfx.dtx}
+ \DocInput{\jobname.dtx}
\PrintChanges
\PrintIndex
\end{document}
@@ -67,19 +69,36 @@
% \DoNotIndex{\meaning,\newcounter,\next,\or,\par,\renewcommand}
% \DoNotIndex{\renewcommand,\renewenvironment,\stepcounter}
% \DoNotIndex{\Tg,\thepage,\unskip,\write,\advance,\{,\}}
+% \DoNotIndex{\@ifpackageloaded,\@pdfcreationdate,\@pdfcreator}
+% \DoNotIndex{\@pdfmoddate,\AtBeginDocument,\catcode,\DeclareOption}
+% \DoNotIndex{\endinput,\endlinechar,\errmessage,\everyeof,\futurelet}
+% \DoNotIndex{\Hy@DisableOption,\Hy@UseMaketitleInfos,\hypersetup}
+% \DoNotIndex{\inputencoding,\InputIfFileExists,\NeedsTeXFormat}
+% \DoNotIndex{\newif,\noexpand,\obeyspaces,\PackageError,\PDF@FinishDoc}
+% \DoNotIndex{\pdfcatalog,\pdfcreationdate,\pdfgeninterwordspace}
+% \DoNotIndex{\pdfinterwordspace,\pdfinterwordspaceoff,\pdfgentounicode}
+% \DoNotIndex{\pdfinfo,\pdfinterwordspaceon,\pdflastobj,\pdfmapline}
+% \DoNotIndex{\pdfmdfivesum,\pdfminorversion,\pdfobj,\pdfobjcompresslevel}
+% \DoNotIndex{\pdfpageattr,\pdfresetpageorigin,\pdfstringdef}
+% \DoNotIndex{\pdftexbanner,\ProcessOptions,\ProvidesPackage,\RequirePackage}
+% \DoNotIndex{\scantokens,\typeout}
%
% \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.}
+% \changes{v1.5.4}{2015/02/28}{Fixed timezone bug; Unicode support; more
+% PDF variants; added color profiles.}
%
-% \title{Generation of PDF/X-1a and PDF/A-1b compliant PDF's
+% \title{Generation of PDF/X and PDF/A compliant PDF's
% with PDF\TeX{} --- \texttt{pdfx.sty}}
-% \date{2008/12/10}
-% \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}}
+% \date{2015/02/28}
+% \version{1.5.4}
+% \keywords{PDF, PDF/A, PDF/X, pdf\TeX, \LaTeX}
+% \author{C.\,V.\,Radhakrishnan, \thanh, Ross~Moore {\upshape\small
+% and} Peter Selinger}
+% \contact{\texttt{[cvr,thanh]@river-valley.org},
+% \texttt{ross.moore@mq.edu.au}, \texttt{selinger@mathstat.dal.ca}}
%
% \maketitle
%
@@ -87,440 +106,1200 @@
%
% \section{Introduction}
%
-% \textsc{pdf/x} and \textsc{pdf/a} are umbrella terms used to denote
-% several \textsc{iso} standards that define different subsets of the
-% \pdf standard. The objective of \textsc{pdf/x} is to facilitate
-% graphics exchange between document creator and printer and
-% therefore, has all requirements related to printing. For instance,
-% in \pdfx, all fonts need to be embedded and all images need to be
-% \textsc{cmyk} or spot colors. \textsc{pdf/x-2} and \textsc{pdf/x-3}
-% accept calibrated \textsc{rgb} and \textsc{cielab} colors along with
-% all other specifications of \pdfx.
-%
-% \textsc{pdf/a} defines a profile for archiving \pdf documents which
-% ensures the documents can be reproduced the exact same way in years
-% to come, a key element to achieve this is that the \textsc{pdf/a}
-% documents shall be 100\% self contained. All the information needed
-% to display the document in the same manner every time is embedded
-% in the file. A \textsc{pdf/a} document is not permitted to be reliant
-% on information from external sources. Other restrictions include
-% avoidance of audio/video content, JavaScript and encryption.
-% Mandatory inclusion of fonts, color profile and standards based
-% metadata are absolutely essential for \textsc{pdf/a}.
-%
-% This package currently supports generation of \pdfx and \pdfa
-% compliant documents using \pdftex. More standards will be
-% included in future.
+% PDF/X and PDF/A are umbrella terms used to denote several ISO
+% standards that define different subsets of the PDF standard. The
+% objective of PDF/X is to facilitate graphics exchange between
+% document creator and printer and therefore, has all requirements
+% related to printing. For instance, in PDF/X, all fonts need to be
+% embedded and all images need to be CMYK or spot colors. PDF/X-2 and
+% PDF/X-3 accept calibrated RGB and CIELAB colors along with all other
+% specifications of PDF/X.
+%
+% PDF/A defines a profile for archiving PDF documents, which ensures
+% the documents can be reproduced the exact same way in years to
+% come. A key element to achieving this is that PDF/A documents shall
+% be 100\% self contained. All the information needed to display the
+% document in the same manner every time is embedded in the file. A
+% PDF/A document is not permitted to be reliant on information from
+% external sources. Other restrictions include avoidance of
+% audio/video content, JavaScript and encryption. Mandatory inclusion
+% of fonts, color profile and standards based metadata are absolutely
+% essential for PDF/A.
+%
+% This package currently supports generation of PDF/X and PDF/A
+% compliant documents using \pdftex. Support for additional standards
+% is also included; see the complete list in
+% Section~\ref{ssec-options} below.
%
% \section{Usage}
%
-% The file, namely |pdfx.dtx| is a composite document of
-% program code and documentation in \LaTeX{} format in the
-% tradition of \emph{literate programming}. You
-% can extract the program code alone by stripping off the
-% documentation part by running \LaTeX{} or \TeX{} over the installer
-% namely, |pdfx.ins| which is also provided with this file. To
-% get the documentation which you are reading now, you need to run
-% (\pdf)\LaTeX{} over the file, |pdfx.dtx|.
-%
-% \subsection{Data file for XMP metadata}
-%
-% As mentioned above, standards compliant \pdf documents need
-% \textsc{xmp} metadata to be included. In order to create
-% \textsc{xmp} in the prescribed \xml format, a simple data file
-% holding the meta information of the document needs to be created
-% either through a program or by hand. For our purposes, we name it as
-% |\jobname.xmpdata|, a simple example of which will look like the
-% following:
+% \subsection{Options}\label{ssec-options}
+%
+% The package can be loaded with the command:
+% \begin{decl}
+% \defmacro{usepackage}|[<option>]{pdfx}|
+% \end{decl}
+% where the options are as follows.
+%
+% \subsubsection{PDF/A options}
+%
+% PDF/A is an ISO standard intended for long-term archiving of
+% electronic documents. It therefore emphasizes self-containedness and
+% reproducibility, as well as machine readable metadata. The PDF/A
+% standard has three conformance levels ``a'', ``b'', and ``u''. Level
+% ``a'' is the strictest, but is not yet fully implemented by the
+% |pdfx| package. Conformance level ``u'' has the same requirements as
+% level ``b'', but with the additional requirement that all text in
+% the document must have a Unicode mapping. However, the |pdfx|
+% package produces such Unicode mappings even in level ``b'' files.
+% The standard also has three different versions 1, 2, and 3, which
+% were standardized in 2005, 2011, and 2012, respectively. Earlier
+% versions contain a subset of the features of later versions, so for
+% maximum portability, it is preferable to use a lower-numbered
+% version. There is no conformance level ``u'' in version 1 of the
+% standard. For many typical uses of PDF/A, it is sufficient to use
+% PDF/A-1b.
+%
+% \begin{itemize}
+% \item |a-1a|: generate PDF/A-1a. Experimental, not fully implemented.
+% \item |a-1b|: generate PDF/A-1b.
+% \item |a-2a|: generate PDF/A-2a. Experimental, not fully implemented.
+% \item |a-2b|: generate PDF/A-2b.
+% \item |a-2u|: generate PDF/A-2u.
+% \item |a-3a|: generate PDF/A-3a. Experimental, not fully implemented.
+% \item |a-3b|: generate PDF/A-3b.
+% \item |a-3u|: generate PDF/A-3u.
+% \end{itemize}
+%
+% \subsubsection{PDF/E options}
+%
+% PDF/E is an ISO standard intended for documents used in engineering
+% workflows. There is only one version of the PDF/E standard so far,
+% and it is called PDF/E-1.
+%
+% \begin{itemize}
+% \item |e-1|: generate PDF/E-1.
+% \end{itemize}
+%
+% \subsubsection{PDF/VT options}
+%
+% PDF/VT is an ISO standard intended as an exchange format for
+% variable and transactional printing, and is an extension of the
+% PDF/X-4 standard. The standard specifies three PDF/VT conformance
+% levels. Level 1 is for single-file exchange, level 2 is for
+% multi-file exchange, and level 2s is for streamed delivery.
+% Currently, none of the PDF/VT conformance levels are fully
+% implemented by the |pdfx| package.
+%
+% \begin{itemize}
+% \item |vt-1|: generate PDF/VT-1. Experimental, not fully implemented.
+% \item |vt-2|: generate PDF/VT-2. Experimental, not fully implemented.
+% \item |vt-2s|: generate PDF/VT-2s. Experimental, not fully implemented.
+% \end{itemize}
+%
+% \subsubsection{PDF/X options}
+%
+% PDF/X is an ISO standard intended for graphics interchange. It
+% emphasizes printing-related requirements, such as embedded fonts and
+% color profiles. The PDF/X standard has a large number of variants
+% and conformance levels. The basic variants are known as X-1, X-1a,
+% X-3, X-4, and X-5. (Note that there is no X-2 standard, because it
+% was either never published or withdrawn). The PDF/X-1a standard
+% exists in revisions of 2001 and 2003, the PDF/X-3 standard exists in
+% revisions of 2002 and 2003, and the PDF/X-4 and PDF/X-5 standards
+% exist in revisions of 2008 and 2010. Moreover, some of these
+% standards have a ``p'' version, which permits the use of an
+% externally supplied color profile (instead of an embedded one),
+% and/or a ``g'' version, which permits the use of external graphical
+% content. Moreover, PDF/X-5 has an ``n'' version, which extends
+% PDF/X-4p by permitting additional color spaces other than Grayscale,
+% RGB, and CMYK. For many typical uses of PDF/X, it is sufficient to
+% use PDF/X-1a.
+%
+% \begin{itemize}
+% \item |x-1|: generate PDF/X-1.
+% \item |x-1a|: generate PDF/X-1a. Options |x-1a1| and |x-1a3| are
+% also available to specify PDF/X-1a:2001 or PDF/X-1a:2003 explicitly.
+% \item |x-3|: generate PDF/X-3. Options |x-302| and |x-303| are
+% also available to specify PDF/X-3:2002 or PDF/X-3:2003 explicitly.
+% \item |x-4|: generate PDF/X-4. Options |x-408| and |x-410| are
+% also available to specify PDF/X-4:2008 or PDF/X-4:2010 explicitly.
+% \item |x-4p|: generate PDF/X-4p. Options |x-4p08| and |x-4p10| are
+% also available to specify PDF/X-4p:2008 or PDF/X-4p:2010 explicitly.
+% Experimental, not fully implemented.
+% \item |x-5g|: generate PDF/X-5g. Options |x-5g08| and |x-5g10| are
+% also available to specify PDF/X-5g:2008 or PDF/X-5g:2010 explicitly.
+% \item |x-5n|: generate PDF/X-5n. Options |x-5n08| and |x-5n10| are
+% also available to specify PDF/X-5n:2008 or PDF/X-5n:2010
+% explicitly. Experimental, not fully implemented.
+% \item |x-5pg|: generate PDF/X-5pg. Options |x-5pg08| and |x-5pg10| are
+% also available to specify PDF/X-5pg:2008 or PDF/X-5pg:2010 explicitly.
+% Experimental, not fully implemented.
+% \end{itemize}
+%
+% \subsubsection{Other options}
+%
+% These options are experimental and should not normally be used.
+%
+% \begin{itemize}
+% \item |noBOM|: do not generate the optional byte order marker in the
+% embedded XMP metadata. Try this option in case there is an
+% unexplained error involving the |xmpincl| package.
+% \item |pdf13|: use PDF 1.3, overriding the version specified by the
+% applicable standard. This may produce a non-standard-conforming PDF file.
+% \item |pdf14|: use PDF 1.4, overriding the version specified by the
+% applicable standard. This may produce a non-standard-conforming PDF file.
+% \item |pdf15|: use PDF 1.5, overriding the version specified by the
+% applicable standard. This may produce a non-standard-conforming PDF file.
+% \item |pdf16|: use PDF 1.6, overriding the version specified by the
+% applicable standard. This may produce a non-standard-conforming PDF file.
+% \item |pdf17|: use PDF 1.7, overriding the version specified by the
+% applicable standard. This may produce a non-standard-conforming PDF file.
+% \end{itemize}
+%
+% \subsection{Data file for metadata}
+%
+% As mentioned above, standards compliant PDF documents need metadata
+% to be included. The |pdfx| package expects the metadata to be
+% supplied in a special data file called |\jobname.xmpdata|. Here,
+% |\jobname| is usually the basename of the document's main |.tex|
+% file. For example, if your document source is in the file
+% |main.tex|, then the metadata must be in a file called
+% |main.xmpdata|. None of the individual metadata fields are
+% mandatory, but for most documents, it makes sense to define at least
+% the title and the author. Here is an example of a short |.xmpdata|
+% file:
% \begin{verbatim}
-% \Keywords{pdfTeX\sep PDF/X-1a\sep PDF/A-b}
-% \Title{Sample LaTeX input file}
-% \Author{LaTeX project team}
-% \Org{TeX Users Group}
+% \Title{Baking through the ages}
+% \Author{A. Baker\sep C. Kneader}
+% \Keywords{cookies\sep muffins\sep cakes}
+% \Publisher{Baking International}
% \end{verbatim}
-% You may note that the keywords are separated by |\sep| which will
-% expand to \xml elements |</rdf:li><rdf:li>| instead of comma
-% character. This is the correct format required by the \xmp metadata
-% which is in \xml format. Similarly, several other kinds of data can
-% be captured using the following commands:
-% \begin{enumerate}
-% \item |\Subject|
-% \item |\Creator|
-% \item |\Producer|
-% \item |\Volume|
-% \item |\Issue|
-% \item |\CoverDisplayDate|
-% \item |\CoverDate|
-% \item |\Copyright|
-% \item |\Doi|
-% \item |\Lastpage|
-% \item |\Firstpage|
-% \item |\Journaltitle|
-% \item |\Journalnumber|
-% \item |\CreatorTool|
-% \item |\AuthoritativeDomain|
-% \end{enumerate}
-% The above commands are self-explanatory. Users can resort to
-% alternate ways to create |xmp| file for inclusion in \pdf. However,
-% minimal |\jobname.xmpdata| shall be created with |\Title| and
-% |\Author| commands along with their corresponding values for |pdfx|
-% package to work correctly. You may check
-% \href{http://www.adobe.com/devnet/xmp/}{Adobe \textsc{xmp}
-% Development Center} for more exhaustive information about
-% Extensible Metadata Platform (\textsc{xmp}). An \textsc{xmp}
-% Toolkit \textsc{sdk} which supports \textsc{gnu}/Linux, Macintosh
-% and Windows operating systems is also provided under modified \textsc{bsd}
-% licence.
-%
-% |pdfx| makes use of |xmpincl| package to include |xmp| data into the
-% \pdf. A good look at the documentation of |xmpincl| package will
-% greatly help the users to understand the process of |xmp| data
-% inclusion.
+% You may note that multiple authors and keywords have been separated
+% by |\sep|. The |\sep| macro is only permitted in within the
+% |\Author|, |\Keywords|, and |\Publisher| fields.
+%
+% \subsection{List of supported metadata fields}
+%
+% Here is a complete list of user-definable metadata fields currently
+% supported, and their meanings. More may be added in the future.
+% These commands can only be used in the |.xmpdata| file.
+%
+% \subsubsection{General information:}
+%
+% \begin{itemize}
+% \item |\Author|: the document's human author. Separate multiple
+% authors with |\sep|.
+% \item |\Title|: the document's title.
+% \item |\Keywords|: list of keywords, separated with |\sep|.
+% \item |\Subject|: the abstract.
+% \item |\Publisher|: the publisher.
+% \end{itemize}
+%
+% \subsubsection{Copyright information:}
+%
+% \begin{itemize}
+% \item |\Copyright|: a copyright statement.
+% \item |\CopyrightURL|: location of a web page describing the owner
+% and/or rights statement for this document.
+% \item |\Copyrighted|: ``True'' if the document is copyrighted, and
+% ``False'' if it isn't. This is automatically set to ``True'' if either
+% |\Copyright| or |\CopyrightURL| is specified, but can be
+% overridden. For example, if the copyright statement is ``Public
+% Domain'', this should be set to ``False''.
+% \end{itemize}
+%
+% \subsubsection{Publication information:}
+%
+% \begin{itemize}
+% \item |\PublicationType|: The type of publication. If defined, must
+% be one of book, catalog, feed, journal, magazine, manual,
+% newsletter, pamphlet. This is automatically set to ``journal'' if
+% |\Journaltitle| is specified, but can be overridden.
+% \item |\Journaltitle|: The title of the journal in which the
+% document was published.
+% \item |\Journalnumber|: The ISSN for the publication in which the
+% document was published.
+% \item |\Volume|: Journal volume.
+% \item |\Issue|: Journal issue/number.
+% \item |\Firstpage|: First page number of the published version of
+% the document.
+% \item |\Lastpage|: Last page number of the published version of the
+% document.
+% \item |\Doi| : Digital Object Identifier (DOI) for the document,
+% without the leading ``doi:''.
+% \item |\CoverDisplayDate|: Date on the cover of the journal issue,
+% as a human-readable text string.
+% \item |\CoverDate|: Date on the cover of the journal issue, in a
+% format suitable for storing in a database field with a ``date'' data
+% type.
+% \end{itemize}
+%
+% \subsection{Symbols permitted in metadata}
+%
+% Within the metadata, all printable ASCII characters except
+% |\|, |{|, |}|, and |%| represent themselves. Also, all printable
+% Unicode characters from the basic multilingual plane (i.e., up to
+% code point U+FFFF) can be used directly with the UTF-8 encoding.
+% (Please note: encodings other than UTF-8 are not currently supported
+% in the metadata). Consecutive whitespace characters are combined
+% into a single space. Whitespace after a macro such as |\copyright|,
+% |\backslash|, or |\sep| is ignored. Blank lines are not permitted.
+% Moreover, the following markup can be used:
+%
+% \begin{itemize}
+% \item ``|\ |'': a literal space (for example after a macro)
+% \item |\%|: a literal |%|
+% \item |\{|: a literal |{|
+% \item |\}|: a literal |}|
+% \item |\backslash|: a literal backslash ``|\|''
+% \item |\copyright|: the \copyright\ copyright symbol
+% \end{itemize}
+% The macro |\sep| is only permitted within |\Author|, |\Keywords|,
+% and |\Publisher|. It is used to separate multiple authors,
+% keywords, etc.
+%
+% \subsection{Color profiles}
+%
+% Most standards compliant PDF documents require a \emph{color
+% profile} to be embedded in the file. In a nutshell, such a profile
+% determines precisely how the colors used in the document will be
+% rendered when printed to a physical medium. This can be used to
+% ensure that the document will look exactly the same, even when it is
+% printed on different printers, paper types, etc. The inclusion of a
+% color profile is necessary to make the document completely
+% self-contained.
+%
+% Since most \LaTeX\ users are not graphics professionals and are not
+% particularly picky about colors, the |pdfx| package includes default
+% profiles that will be included when nothing else is
+% specified. Therefore, the average user doesn't have to do anything
+% special about color.
+%
+% For users who have a specific color profile they wish to use, it is
+% possible to do so by including a |\setRGBcolorprofile| or
+% |\setCMYKcolorprofile| command in the |.xmpdata| file. Note that
+% PDF/A and PDF/E require an RGB color profile, and PDF/X and PDF/VT
+% require a CMYK color profile. Use the following commands to specify
+% an RGB or CMYK color profile, respectively:
+%
+% \begin{decl}
+% \defmacro{setRGBcolorprofile}\marg{filename}\marg{identifier}\marg{info
+% string}\marg{registry URL}
+% \\[1ex]
+% \defmacro{setCMYKcolorprofile}\marg{filename}\marg{output
+% intent}\marg{identifier}\marg{registry URL}
+% \end{decl}
+% Within the arguments of these macros, the characters |<|, |>|, |&|,
+% |^|, |_|, |#|, |$|, and |~| can be used as themselves, but
+% |%| must be escaped as |\%|. The defaults are:
+% \begin{verbatim}
+% \setRGBcolorprofile{sRGB_IEC61966-2-1_black_scaled.icc}
+% {sRGB_IEC61966-2-1_black_scaled}
+% {sRGB IEC61966 v2.1 with black scaling}
+% {http://www.color.org}
+%
+% \setCMYKcolorprofile{coated_FOGRA39L_argl.icc}
+% {Coated FOGRA39}
+% {FOGRA39 (ISO Coated v2 300\% (ECI))}
+% {http://www.argyllcms.com/}
+% \end{verbatim}
+%
+% Some color profile files may be obtained from the International
+% Color Consortium. Please take a look at
+% \url{http://www.color.org/iccprofile.xalter}.
+%
+% \subsection{Notes on the internal representation of metadata}
+%
+% Within the PDF file, metadata is deposited in two places: some data
+% goes into the native PDF |/Info| dictionary, and some data goes into
+% an XMP packet stored separately within the file. XMP is Adobe's
+% Extensible Metadata Platform, and is an XML-based format. See
+% \href{http://www.adobe.com/devnet/xmp/}{Adobe XMP Development
+% Center} for more exhaustive information about XMP. An XMP Toolkit
+% SDK which supports the GNU/Linux, Macintosh and Windows operating
+% systems is also provided under modified BSD licence.
+%
+% Some of the metadata, such as the author, title, and keywords, are
+% stored {\bf both} in the XMP packet and in the |/Info|
+% dictionary. For the resulting file to be standard compliant, the two
+% copies of the data must be identical. All of this is taken care of
+% automatically by the |pdfx| package.
+%
+% In principle, users can resort to alternate ways to create an XMP
+% file for inclusion in PDF. In this case, users should create a file
+% |pdfa.xmp| or |pdfx.xmp| (etc., depending on the PDF flavor)
+% containing the pre-defined data. However, this is an error prone
+% process and is not recommended for most users. If there is a
+% particular field of metadata that you need and that is not currently
+% supported, please contact the authors.
+%
+% |pdfx| makes use of the |xmpincl| package to include |xmp| data into
+% the PDF. The documentation of |xmpincl| package may help interested
+% users to understand the process of |xmp| data inclusion.
+%
+% \subsection{Tutorials and technical notes}
+%
+% A tutorial with step-by-step instructions for generating PDF/A files
+% can be found at:
+% \url{http://www.mathstat.dal.ca/~selinger/pdfa/}.
+%
+% Some technical notes about production problems the authors have
+% encountered while generating PDF/A compliant documents are available
+% here:
+% \url{http://support.river-valley.com/wiki/index.php?title=Generating_PDF/A_compliant_PDFs_from_pdftex}.
+%
+%
+%
+% \section{Installing}
+%
+% The file |pdfx.dtx| is a composite document of program code and
+% documentation in \LaTeX{} format in the tradition of \emph{literate
+% programming}. To get the documentation that you are reading now,
+% run (\textsc{pdf})\LaTeX{} on the file |pdfx.dtx|. Or better, use
+% the included |Makefile|, which will also regenerate the index.
+%
+% To install the package, first extract the program code, i.e., the
+% file |pdfx.sty|, by running \LaTeX{} or \TeX{} on the file
+% |pdfx.ins|. Create a directory named |pdfx| under |$TEXMF/tex/latex|
+% and copy the files |pdfx.sty|, |8bit.def|, |glyphtounicode-cmr.tex|,
+% as well as the |*.icc| and |*.xmp| files, to it. Then update \TeX's
+% file database using the appropriate command for your distribution and
+% operating system (such as |texhash| or |mktexlsr|, or similar).
%
% \subsection{Limitations and dependencies}
%
% |pdfx.sty| works only with \pdftex. It further depends on the following
% packages:
% \begin{enumerate}
-% \item |xmpincl| for insertion of metadata into \pdf.
+% \item |xmpincl| for insertion of metadata into PDF.
% \item |hyperref| for hyperlinking, bookmarks, etc.
% \item |glyphtounicode.tex| maps glyph names to corresponding Unicode.
-% \item |glyphtounicode-cmr.tex| does the same for |cmr| fonts.
% \end{enumerate}
-% Necessary color profile files may be obtained from the International
-% Color Consortium. Please take a look at
-% \url{http://www.color.org/iccprofile.xalter}.
%
% \subsection{Files included}
%
-% Following files are included in the archive:
-%
-% \begin{enumerate}
-% \item |pdfx.dtx| --- composite package and documentation.
-% \item |pdfx.ins| --- installer batch file.
-% \item |pdfx-1a.xmp| --- specimen |xmp| template for \pdfx.
-% \item |pdfa-1b.xmp| --- specimen |xmp| template for \pdfa.
-% \item |small2e.xmpdata| --- specimen data file to provide values
-% relating to the document to generate metadata.
-% \item |glyphtounicode-cmr.tex| --- glyph names in cmr font to
-% corresponding Unicode.
-% \end{enumerate}
-% A directory named |pdfx| may be created under |$TEXMF/tex/latex| and
-% all |*.sty|, |*.xmp| and |glyphtounicode-cmr.tex| may be moved to
-% the same. \TeX's file database should then be updated by a suitable
-% command depending on your distribution and operating system.
-%
-% \subsection{Options}
-%
-% The package can be loaded with the command:
-% \begin{decl}
-% \defmacro{usepackage}|[<option>]{pdfx}|
-% \end{decl}
-% where the options are:
-% \begin{description}
-% \item[|x-1a|] generates \pdfx compliant \pdf.
-% \item[|a-1b|] generates \pdfa compliant \pdf.
-% \end{description}
+% The following files are included in the archive:
%
-% \subsection{Useful production notes}
+% \subsubsection{Package files}
%
-% We have included some useful notes about production problems which
-% we have encountered while generating \pdfa compliant documents and
-% the fixes recommended at:
-% \url{http://support.river-valley.com/wiki/index.php?title=Generating_PDF/A_compliant_PDFs_from_pdftex}.
+% \begin{itemize}
+% \item |pdfx.sty| --- main package file generated from |pdfx.dtx|.
+% \item |pdfa.xmp| --- specimen |xmp| template for PDF/A.
+% \item |pdfe.xmp| --- specimen |xmp| template for PDF/E.
+% \item |pdfvt.xmp| --- specimen |xmp| template for PDF/VT.
+% \item |pdfx.xmp| --- specimen |xmp| template for PDF/X.
+% \item |8bit.def| --- custom input encoding.
+% \item |glyphtounicode-cmr.tex| --- maps glyph names to corresponding
+% Unicode for Computer Modern and other \TeX-specific fonts.
+% \item |coated_FOGRA39L_argl.icc| --- a freely distributable CMYK
+% color profile.
+% \item |sRGB_IEC61966-2-1_black_scaled.icc| --- a freely
+% distributable RGB color profile.
+% \item |ICC_LICENSE.txt| --- the license for the color profiles.
+% \end{itemize}
+%
+% \subsubsection{Documentation}
+%
+% \begin{itemize}
+% \item |README| --- Readme file.
+% \item |manifest.txt| --- file list.
+% \item |sample.tex|, |sample.xmpdata| --- a sample file with sample
+% metadata.
+% \item |small2e-pdfx.tex|, |small2e-pdfx.xmpdata| --- another sample
+% file with sample metadata.
+% \end{itemize}
+%
+% \subsubsection{Sources}
+%
+% \begin{itemize}
+% \item |src/pdfx.dtx| --- composite package and documentation.
+% \item |src/pdfx.ins| --- installer batch file.
+% \item |src/rvdtx.sty| --- used by |pdfx.dtx|.
+% \item |src/Makefile| --- a Makefile for building the documentation.
+% \end{itemize}
%
% \subsection{Miscellaneous information}
%
-% The package is released under the \LaTeX{} Project Public Licence. Bug
-% reports, suggestions, feature requests, etc., may be sent to the
-% authors at \href{mailto:cvr@river-valley.org}{\ttfamily
-% cvr@river-valley.org} and/or
-% \href{mailto:thanh@river-valley.org}{\ttfamily
-% thanh@river-valley.org}.
+% The package is released under the \LaTeX{} Project Public
+% Licence. Bug reports, suggestions, feature requests, etc., may be
+% sent to the original authors at
+% \href{mailto:cvr@river-valley.org}{\ttfamily cvr@river-valley.org}
+% and/or
+% \href{mailto:thanh@river-valley.org}{\ttfamily thanh@river-valley.org},
+% or to the more recent contributors at
+% \href{mailto:ross.moore@mq.edu.au}{\ttfamily ross.moore@mq.edu.au}
+% and/or
+% \href{mailto:selinger@mathstat.dal.ca}{\ttfamily selinger@mathstat.dal.ca}.
%
% \section{Implementation}
-% \subsection{Various auxiliary macros}
%
-% Two booleans are defined to switch between two options, |a-1b| and
-% |x-1a|. \pdfx further demands \pdf version 1.3 and properly placed
-% mediabox, bleedbox and trimbox (innermost) in that order. The
-% MediaBox defines the size of the entire document, either the
-% ArtBox or the TrimBox, defines the extent of the printable
-% area. If the file is to be printed with bleed, a BleedBox, which
-% must be larger than the TrimBox/ArtBox, but smaller than the
-% MediaBox, must be defined.
-%
-% \begin{macrocode}
+% \iffalse
%<*package>
-%
-% $Id: pdfx.dtx,v 1.2 2008/12/10 13:51:10 cvr Exp cvr $
-%
+% \fi
+% \begin{macrocode}
+ \@ifpackageloaded{pdfxmult}{%
+ \PackageError{pdfx}%
+ {^^JThis package may not be used in conjunction with the \space pdfxmult \space package}%
+ {Type \space x <return> \space to exit; or just \space <return> \space to continue without this package.}%
+ \expandafter\let\csname opt@pdfx.sty\endcsname\@empty\endinput
+ }{}%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfx}
- [2008/12/10 v1.2 PDF/X and PDF/A support (CVR/HTH)]
+ [2015/02/17 v1.5.3 PDF/X and PDF/A support (CVR/HTH/RRM/PS)]
+
+\newif\ifpdfx@noBOM \pdfx@noBOMfalse % use a BOM in the XMP packet
+\newif\ifpdfx@x \pdfx@xfalse % PDF/X mode
+\newif\ifpdfx@e \pdfx@efalse % PDF/E mode; not implemented yet
+\newif\ifpdfx@vt \pdfx@vtfalse % PDF/VT mode, extension of PDF/X
+\newif\ifno@iccprofile % used with PDF/X-4p and PDF/X-5pg
-\newif\ifpdfxonea \pdfxoneafalse
-\newif\ifpdfaoneb \pdfaonebfalse
+%% Not all combinations of the following parameters are meaningful.
+\def\xmp@Part{1} % PDF/A part: 1, 2, or 3
+\def\xmp@Conformance{B} % Conformance level: A, B, or U
+\def\xmp@ReleaseDate{2005} % 2001 for PDF/X-1, 2005 for PDF/A-1,
+ % 2010 for PDF/A-2, 2012 for PDF/A-3.
-\DeclareOption{a-1b}{\global\pdfaonebtrue}
-\DeclareOption{x-1a}{\global\pdfxoneatrue}
+%% default is to create PDF/A-1b
+%% options can change this for PDF/X or higher levels of PDF/A
+\DeclareOption{a-1a}{\global\pdfx@xfalse\def\xmp@Part{1}\def\xmp@Conformance{A}\def\xmp@ReleaseDate{2005}}
+\DeclareOption{a-1b}{\global\pdfx@xfalse\def\xmp@Part{1}\def\xmp@Conformance{B}\def\xmp@ReleaseDate{2005}}
+\DeclareOption{a-2a}{\global\pdfx@xfalse\def\xmp@Part{2}\def\xmp@Conformance{A}\def\xmp@ReleaseDate{2010}}
+\DeclareOption{a-2b}{\global\pdfx@xfalse\def\xmp@Part{2}\def\xmp@Conformance{B}\def\xmp@ReleaseDate{2010}}
+\DeclareOption{a-2u}{\global\pdfx@xfalse\def\xmp@Part{2}\def\xmp@Conformance{U}\def\xmp@ReleaseDate{2010}}
+\DeclareOption{a-3a}{\global\pdfx@xfalse\def\xmp@Part{3}\def\xmp@Conformance{A}\def\xmp@ReleaseDate{2012}}
+\DeclareOption{a-3b}{\global\pdfx@xfalse\def\xmp@Part{3}\def\xmp@Conformance{B}\def\xmp@ReleaseDate{2012}}
+\DeclareOption{a-3u}{\global\pdfx@xfalse\def\xmp@Part{3}\def\xmp@Conformance{U}\def\xmp@ReleaseDate{2012}}
+\DeclareOption{x-1}{\global\pdfx@xtrue\def\xmp@Part{1}\def\xmp@Conformance{a}\def\xmp@ReleaseDate{2001}\global\pdfminorversion=3 }
+\DeclareOption{x-1a}{\global\pdfx@xtrue\def\xmp@Part{1}\def\xmp@Conformance{a}\def\xmp@ReleaseDate{2003}\global\pdfminorversion=3 }
+\DeclareOption{x-1a1}{\global\pdfx@xtrue\def\xmp@Part{1}\def\xmp@Conformance{a}\def\xmp@ReleaseDate{2001}\global\pdfminorversion=3 }
+\DeclareOption{x-1a3}{\global\pdfx@xtrue\def\xmp@Part{1}\def\xmp@Conformance{a}\def\xmp@ReleaseDate{2003}\global\pdfminorversion=3 }
+\DeclareOption{x-2}{\global\pdfx@xtrue\def\xmp@Part{2}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2002}\global\pdfminorversion=4 }
+\DeclareOption{x-3}{\global\pdfx@xtrue\def\xmp@Part{3}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2002}\global\pdfminorversion=3 }
+\DeclareOption{x-302}{\global\pdfx@xtrue\def\xmp@Part{3}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2002}\global\pdfminorversion=3 }
+\DeclareOption{x-303}{\global\pdfx@xtrue\def\xmp@Part{3}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2003}\global\pdfminorversion=4 }
+%%% Later versions, yet to be fully implemented
+\DeclareOption{x-4}{\global\pdfx@xtrue\def\xmp@Part{4}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-4p}{\global\pdfx@xtrue\global\no@iccprofiletrue
+ \def\xmp@Part{4}\def\xmp@Conformance{p}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-408}{\global\pdfx@xtrue\def\xmp@Part{4}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-410}{\global\pdfx@xtrue\def\xmp@Part{4}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{x-4p08}{\global\pdfx@xtrue\global\no@iccprofiletrue
+ \def\xmp@Part{4}\def\xmp@Conformance{p}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-4p10}{\global\pdfx@xtrue\global\no@iccprofiletrue
+ \def\xmp@Part{4}\def\xmp@Conformance{p}\def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{x-5}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-5g}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{g}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-5n}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{n}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-5pg}{\global\pdfx@xtrue\global\no@iccprofiletrue
+ \def\xmp@Part{5}\def\xmp@Conformance{pg}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-508}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-5g08}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{g}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-5n08}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{n}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-5pg08}{\global\pdfx@xtrue\global\no@iccprofiletrue
+ \def\xmp@Part{5}\def\xmp@Conformance{pg}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-510}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{x-5g10}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{g}\def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{x-5n10}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{n}\def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{x-5pg10}{\global\pdfx@xtrue\global\no@iccprofiletrue
+ \def\xmp@Part{5}\def\xmp@Conformance{pg}\def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{e-1}{\global\pdfx@xfalse\global\pdfx@etrue
+ \def\xmp@Part{1}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{vt-1}{\global\pdfx@xtrue\global\pdfx@vttrue
+ \def\xmp@Part{4}\def\xmp@vtPart{1}\def\xmp@Conformance{}\def\xmp@vtConformance{}%
+ \def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{vt-2}{\global\pdfx@xtrue\global\pdfx@vttrue
+ \def\xmp@Part{4}\def\xmp@vtPart{2}\def\xmp@Conformance{}\def\xmp@vtConformance{}%
+ \def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{vt-2s}{\global\pdfx@xtrue\global\pdfx@vttrue
+ \def\xmp@Part{5}\def\xmp@vtPart{2}\def\xmp@Conformance{pg}\def\xmp@vtConformance{s}%
+ \def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+
+%% extra options to alter the PDF minor version, in case needed in special circumstances
+\DeclareOption{pdf13}{\global\pdfminorversion=3 }
+\DeclareOption{pdf14}{\global\pdfminorversion=4 }
+\DeclareOption{pdf15}{\global\pdfminorversion=5 }
+\DeclareOption{pdf16}{\global\pdfminorversion=6 }
+\DeclareOption{pdf17}{\global\pdfminorversion=7 }
+
+%% inhibits writing the XMP byte-order marker
+\DeclareOption{noBOM}{\pdfx@noBOMtrue}
+
+\pdfminorversion=4 % assumed for PDF/A ; options may change this for PDF/X
+\expandafter\ifx\csname pdfresetpageorigin\endcsname\relax\else
+ \pdfresetpageorigin=0
+\fi
\ProcessOptions
-\ifpdfxonea
- \pdfminorversion=3
+{\endlinechar=-1
+ \everyeof{\noexpand}%
+ \xdef\pdfx@bannerstring{\expandafter\scantokens\expandafter{\pdftexbanner}}
+}%
+\def\pdfx@testbannerstr{This is pdfTeX, Version 3.14159265-2.6-1.40.15 (TeX Live 2014/dev) kpathsea version 6.2.0dev}%
+\ifx\pdfx@bannerstring\pdfx@testbannerstr
+ \typeout{This version of pdfTeX cannot write out upper-range character bytes, 128-255.}%
+ \typeout{Any UTF-8 Unicode characters in the Metadata will not be written correctly.}%
+ \typeout{Please update to a more stable version of pdfTeX.^^J}%
+ \pdfx@noBOMtrue
+\fi
+
+\ifpdfx@x
+ \pdfobjcompresslevel=0 \relax
+ \expandafter\ifx\csname pdfinterwordspaceoff\endcsname\relax\else
+ \pdfinterwordspaceoff
+ \let\pdfinterwordspaceon\pdfinterwordspaceoff
+ \let\pdfinterwordspace\relax
+ \fi
+ \expandafter\ifx\csname pdfgeninterwordspace\endcsname\relax\else
+ \pdfgeninterwordspace=0 \relax
+ \fi
\pdfpageattr{/MediaBox[0 0 595 793]
/BleedBox[0 0 595 793]
/TrimBox[25 20 570 773]}
-\else
- \pdfminorversion=4
\fi
-% \end{macrocode}
-%
-% Several macros were defined to capture data for the \xmp metadata to
-% be inserted into the PDF during generation.
-% \begin{macrocode}
-\def\hash{\expandafter\@gobble\string\#}
-\def\amp{\expandafter\@gobble\string\&}
-\def\xmpAmp{\amp\hash x0026;}
-\def\sep{</rdf:li><rdf:li>}
-\def\TextCopyright{\amp\hash x00A9;}
-\def\Title#1{\gdef\xmpTitle{#1}}
- \let\xmpTitle\@empty
-\def\Author#1{\gdef\xmpAuthor{#1}}
- \let\xmpAuthor\@empty
-\def\Keywords#1{\gdef\xmpKeywords{#1}}
- \let\xmpKeywords\@empty
- \let\xmpSubject\xmpKeywords
-\def\Creator#1{\gdef\xmpCreator{#1}}
- \def\xmpCreator{\@pdfcreator}
-\def\Producer#1{\gdef\xmpProducer{#1}}
- \def\xmpProducer{pdfTeX}
-\def\Volume#1{\gdef\xmpVolume{#1}}
- \let\xmpVolume\@empty
-\def\Issue#1{\gdef\xmpIssue{#1}}
- \let\xmpIssue\@empty
-\def\CoverDisplayDate#1{\gdef\xmpCoverDisplayDate{#1}}
- \let\xmpCoverDisplayDate\@empty
-\def\CoverDate#1{\gdef\xmpCoverDate{#1}}
- \let\xmpCoverDate\@empty
-\def\Copyright#1{\gdef\xmpCopyright{#1}}
- \let\xmpCopyright\@empty
-\def\Doi#1{\gdef\xmpDoi{#1}}
- \let\xmpDoi\@empty
-\def\Lastpage#1{\gdef\xmpLastpage{#1}}
- \let\xmpLastpage\@empty
-\def\Firstpage#1{\gdef\xmpFirstpage{#1}}
- \let\xmpFirstpage\@empty
-\def\Journaltitle#1{\gdef\xmpJournaltitle{#1}}
- \let\xmpJournaltitle\@empty
-\def\Journalnumber#1{\gdef\xmpJournalnumber{#1}}
- \let\xmpJournalnumber\@empty
-\def\Org#1{\gdef\xmpOrg{#1}}
- \let\xmpOrg\@empty
-\def\CreatorTool#1{\gdef\xmpCreatorTool{#1}}
- \def\xmpCreatorTool{\xmpProducer}
-\def\AuthoritativeDomain#1{\gdef\xmpAuthoritativeDomain{#1}}
- \let\xmpAuthoritativeDomain\@empty
-% \end{macrocode}
-%
-% \subsection{Document and instance ID's}
-%
-% Document \textsc{id} and instance \textsc{id} are created from
-% values obtained from |\jobname.pdf| and |\pdfcreationdate| by making
-% \DescribeMacro{\findUUID}
-% \DescribeMacro{\uuid}
-% use of |\pdfmdfivesum| primitive of \pdftex.
-% \begin{macrocode}
-\def\findUUID#1{\edef\tmpstring{\pdfmdfivesum{#1}}
- \expandafter\eightofnine\tmpstring\end}
-\def\eightofnine#1#2#3#4#5#6#7#8#9\end{%
- \xdef\eightchars{#1#2#3#4#5#6#7#8}
- \fouroffive#9\end}
-\def\fouroffive#1#2#3#4#5\end{\xdef\ffourchars{#1#2#3#4}
- \sfouroffive#5\end}
-\def\sfouroffive#1#2#3#4#5\end{\xdef\sfourchars{#1#2#3#4}
- \tfouroffive#5\end}
-\def\tfouroffive#1#2#3#4#5\end{\xdef\tfourchars{#1#2#3#4}
- \xdef\laststring{#5}}
-
-\def\uuid{\eightchars-%
- \ffourchars-%
- \sfourchars-%
- \tfourchars-%
- \laststring}
-
-\findUUID{\jobname.pdf}
-\edef\xmpdocid{\uuid}
-\findUUID{\pdfcreationdate}
-\edef\xmpinstid{\uuid}
-% \end{macrocode}
-%
-% |\jobname.xmpdata| is read if available and the package, |xmpincl|
-% is also loaded which will take care of inserting metadata into the
-% \pdf document.
-%
-% \begin{macrocode}
-\InputIfFileExists{\jobname.xmpdata}{}{}
-\RequirePackage{xmpincl}
-% \end{macrocode}
-%
-% \DescribeMacro{\convDate}
-% \DescribeMacro{\convertDate}
-% The date format needed by metadata is different from the value
-% provided by the |\pdfcreationdate|. |\convertDate| macro generates
-% the required date format from |\pdfcreationdate|.
-%
-% \begin{macrocode}
-\def\convertDate{\getYear}
-{\catcode`\D=12
- \gdef\getYear D:#1#2#3#4{\edef\xYear{#1#2#3#4}\getMonth}
+\ifnum\pdfminorversion >3 \relax
+ \pdfmapline{+dummy-space <dummy-space.pfb}
+ \expandafter\ifx\csname pdfgeninterwordspace\endcsname\relax\else
+ \pdfgeninterwordspace=1 \relax
+ \fi
+\fi
+\ifpdfx@x
+ \@ifpackageloaded{hyperref}{%
+ \hypersetup{draft,pdftex,pdfpagemode=UseNone,bookmarks=false,pdfversion=1.\the\pdfminorversion]}
+ }{%
+ \RequirePackage[draft,pdftex,pdfpagemode=UseNone,bookmarks=false,pdfversion=1.\the\pdfminorversion]{hyperref}
+ }%
+\else
+ \ifpdfx@e
+ \@ifpackageloaded{hyperref}{%
+ \hypersetup{draft,pdftex,pdfpagemode=UseNone,bookmarks=false,pdfversion=1.\the\pdfminorversion]}
+ }{%
+ \RequirePackage[draft,pdftex,pdfpagemode=UseNone,bookmarks=false,pdfversion=1.\the\pdfminorversion]{hyperref}
+ }%
+ \else
+ \@ifpackageloaded{hyperref}{%
+ \hypersetup{pdftex,pdfa}%
+ }{%
+ \RequirePackage[pdftex,pdfa]{hyperref}
+ }%
+\fi\fi
+\hypersetup{pdfencoding=unicode}
+
+\RequirePackage{inputenc}
+
+%%----------------------------------------------------------------------
+%% Macros for reading XMP data with special catcodes. Usage:
+%%
+%% \xmp@parse{continuation}{data}
+%%
+%% The effect is to read the data with special catcodes: '<', '>', and
+%% '&' are "active", and '^', '_', '#', '$', '~' are "other". The data
+%% is then bound to the locally scoped name \@this, and the
+%% continuation is called.
+\def\xmp@parse#1{%
+ \begingroup
+ \catcode`\<=13\catcode`\>=13\catcode`\&=13\catcode`\^=12
+ \catcode`\_=12\catcode`\#=12\catcode`\$=12\catcode`\~=12
+ \xmp@doparse{#1}%
}
-\def\getMonth#1#2{\edef\xMonth{#1#2}\getDay}
-\def\getDay#1#2{\edef\xDay{#1#2}\getHour}
-\def\getHour#1#2{\edef\xHour{#1#2}\getMin}
-\def\getMin#1#2{\edef\xMin{#1#2}\getSec}
-\def\getSec#1#2{\edef\xSec{#1#2}\getTZh}
-\def\getTZh +#1#2{\edef\xTZh{#1#2}\getTZm}
-\def\getTZm '#1#2'{%
- \edef\xTZm{#1#2}%
- \edef\convDate{\xYear-\xMonth-\xDay
- T\xHour:\xMin:\xSec+\xTZh:\xTZm}}
-\expandafter\convertDate\pdfcreationdate
-% \end{macrocode}
-%
-% \subsection{Color profiles}
-% \DescribeMacro{/OutputIntents} For better color management, \pdfx
-% and \pdfa need an ICC profile included in the document. An ICC
-% profile is a set of data that characterizes a color input or output
-% device, or a color space, according to standards promulgated by the
-% International Color Consortium (ICC). Profiles describe the color
-% attributes of a particular device or viewing requirement by defining
-% a mapping between the device source or target color space and a
-% profile connection space. For \pdfx, we have included the ICC
-% profile namely, |FOGRA39L.icc| which is for \textsc{cmyk} data and
-% for \pdfa, we have used |sRGBIEC1966-2.1.icm| for \textsc{rgb}
-% data. You can change the value of the |file| attribute in the code
-% below to use different color profile files.
-%
-% \begin{macrocode}
-\ifpdfxonea
- \def\@pctchar{\expandafter\@gobble\string\%}
- \def\@bchar{\expandafter\@gobble\string\\}
- \immediate\pdfobj stream attr{/N 4} file{FOGRA39L.icc}
- \edef\OBJ@CVR{\the\pdflastobj}
- \pdfcatalog{/OutputIntents [ <<
+\def\xmp@doparse#1#2{%
+ \def\@this{#2}#1%
+ \endgroup%
+}
+
+%%----------------------------------------------------------------------
+%% Local commands. They are only brought into scope during the reading
+%% of xmpdata.
+\def\pdfx@localcommands{%
+ \def\Title{\xmp@parse{\global\let\xmp@Title\@this}}%
+ \def\Author{\xmp@parse{\global\let\xmp@Author\@this}}%
+ \def\Keywords{\xmp@parse{\global\let\xmp@Keywords\@this}}%
+ \def\Subject{\xmp@parse{\global\let\xmp@Subject\@this}}%
+ \def\CreatorTool{\xmp@parse{\global\let\xmp@CreatorTool\@this}}%
+ \def\Producer{\xmp@parse{\global\let\xmp@Producer\@this}}%
+ \def\Volume{\xmp@parse{\global\let\xmp@Volume\@this}}%
+ \def\Issue{\xmp@parse{\global\let\xmp@Issue\@this}}%
+ \def\CoverDisplayDate{\xmp@parse{\global\let\xmp@CoverDisplayDate\@this}}%
+ \def\CoverDate{\xmp@parse{\global\let\xmp@CoverDate\@this}}%
+ \def\Copyright{\xmp@parse{\global\let\xmp@Copyright\@this%
+ \ifx\xmp@Copyrighted\@empty\gdef\xmp@Copyrighted{True}\fi}}%
+ \def\CopyrightURL{\xmp@parse{\global\let\xmp@CopyrightURL\@this%
+ \ifx\xmp@Copyrighted\@empty\gdef\xmp@Copyrighted{True}\fi}}%
+ \def\Copyrighted{\xmp@parse{\global\let\xmp@Copyrighted\@this}}%
+ \def\Doi{\xmp@parse{\global\let\xmp@Doi\@this}}%
+ \def\Lastpage{\xmp@parse{\global\let\xmp@Lastpage\@this}}%
+ \def\Firstpage{\xmp@parse{\global\let\xmp@Firstpage\@this}}%
+ \def\PublicationType{\xmp@parse{\global\let\xmp@PublicationType\@this}}%
+ \def\Journaltitle{\xmp@parse{\global\let\xmp@Journaltitle\@this%
+ \ifx\xmp@PublicationType\@empty\gdef\xmp@PublicationType{journal}\fi}}%
+ \def\Journalnumber{\xmp@parse{\global\let\xmp@Journalnumber\@this}}%
+ \def\Publisher{\xmp@parse{\global\let\xmp@Publisher\@this}}%
+ \def\AuthoritativeDomain{\xmp@parse{\global\let\xmp@AuthoritativeDomain\@this}}%
+ % some aliases for backward compatibility:
+ \let\Creator\CreatorTool%
+ \let\Org\Publisher%
+ \let\WebStatement\CopyrightURL%
+ % user-level commands for color profiles:
+ \let\setRGBcolorprofile\pdfx@setRGBcolorprofile%
+ \let\setCMYKcolorprofile\pdfx@setCMYKcolorprofile%
+ \let\setGRAYcolorprofile\pdfx@setGRAYcolorprofile%
+}
+
+%%----------------------------------------------------------------------
+%% Defaults
+
+\def\xmp@Producer{pdfTeX}
+\edef\xmp@CreatorTool{\@pdfcreator}
+
+\global\let\xmp@Title\@empty
+\global\let\xmp@Author\@empty
+\global\let\xmp@Keywords\@empty
+\global\let\xmp@Subject\@empty
+\global\let\xmp@Volume\@empty
+\global\let\xmp@Issue\@empty
+\global\let\xmp@CoverDisplayDate\@empty
+\global\let\xmp@CoverDate\@empty
+\global\let\xmp@Copyright\@empty
+\global\let\xmp@CopyrightURL\@empty
+\global\let\xmp@Copyrighted\@empty
+\global\let\xmp@Doi\@empty
+\global\let\xmp@Lastpage\@empty
+\global\let\xmp@Firstpage\@empty
+\global\let\xmp@PublicationType\@empty
+\global\let\xmp@Journaltitle\@empty
+\global\let\xmp@Journalnumber\@empty
+\global\let\xmp@Publisher\@empty
+\global\let\xmp@AuthoritativeDomain\@empty
+
+%%----------------------------------------------------------------------
+%% The following characters and markup can be used within the XMP data
+%% defined by \Author, \Title, and so on.
+%%
+%% * All printable non-whitespace ASCII characters except
+%% '%', '{', '}', '\' can be used as themselves.
+%%
+%% * All printable non-whitespace UTF-8 encoded Unicode characters
+%% from the basic multilingual plane can be used as themselves.
+%%
+%% * As usual, consecutive whitespace characters are contracted to a
+%% single space. Whitespace after a macro such as \copyright is
+%% ignored. Blank lines are not permitted.
+%%
+%% * The following markup can be used:
+%% '\ ' - a literal space (for example after a macro)
+%% \% - a literal '%'
+%% \{ - a literal '{'
+%% \} - a literal '}'
+%% \backslash - a literal '\'
+%% \copyright - the (c) copyright symbol
+%%
+%% \sep - only permitted within \Author, \Keywords, \Publisher.
+%%
+%% * For backward compatibility, \& and \TextCopyright are also
+%% provided. Their use is deprecated.
+
+%%----------------------------------------------------------------------
+%% The macro \pdfx@actives binds the active characters
+%% '&', '<', and '>' to \pdfx@amp, \pdfx@lt, and \pdfx@gt,
+%% respectively, without actually making them active.
+\begingroup
+ \catcode`\<=13
+ \catcode`\>=13
+ \catcode`\&=13
+ \gdef\pdfx@actives{
+ \def&{\pdfx@amp}
+ \def<{\pdfx@lt}
+ \def>{\pdfx@gt}
+ }
+\endgroup
+
+%%----------------------------------------------------------------------
+%% Markup bindings to be used during XMP generation.
+
+{\obeyspaces\gdef\pdfx@sep{</rdf:li>^^J <rdf:li>}}
+
+\def\pdfx@xmpmarkup{%
+ \pdfx@actives%
+ \edef\@amp{\expandafter\@gobble\string\&}%
+ \edef\@hash{\expandafter\@gobble\string\#}%
+ \edef\ {\expandafter\@gobble\string\ }%
+ \edef\%{\expandafter\@gobble\string\%}%
+ \edef\{{\expandafter\@gobble\string\{}%
+ \edef\}{\expandafter\@gobble\string\}}%
+ \edef\backslash{\expandafter\@gobble\string\\}%
+ \def\@unicode##1{\@amp\@hash x##1;}%
+ \def\pdfx@amp{\@unicode{0026}}%
+ \def\pdfx@lt{\@unicode{003c}}%
+ \def\pdfx@gt{\@unicode{003e}}%
+ \def\copyright{\@unicode{00A9}}%
+ \let\&\pdfx@amp % for backward compatibility
+ \let\TextCopyright\copyright % for backward compatibility
+ \let\sep\pdfx@sep%
+}
+
+%%----------------------------------------------------------------------
+%% Markup bindings to be used during PDF string generation.
+
+\def\pdfx@pdfmarkup{%
+ \pdfx@actives%
+ \edef\%{\expandafter\@gobble\string\%}%
+ \edef\{{\expandafter\@gobble\string\{}%
+ \edef\}{\expandafter\@gobble\string\}}%
+ \edef\pdfx@backslash{\expandafter\@gobble\string\\}%
+ \def\backslash{\pdfx@backslash000\pdfx@backslash134}%
+ \edef\pdfx@amp{\expandafter\@gobble\string\&}%
+ \edef\pdfx@lt{\expandafter\@gobble\string\<}%
+ \edef\pdfx@gt{\expandafter\@gobble\string\>}%
+ \let\TextCopyright\copyright % for backward compatibility
+ \def\sep{, }%
+ % Note: '\ ', \&, \copyright are already predefined by hyperref.
+}
+
+%%----------------------------------------------------------------------
+\def\pdfx@findUUID#1{\edef\pdfx@tmpstring{\pdfmdfivesum{#1}}
+ \expandafter\pdfx@eightofnine\pdfx@tmpstring\end}
+\def\pdfx@eightofnine#1#2#3#4#5#6#7#8#9\end{%
+ \xdef\pdfx@eightchars{#1#2#3#4#5#6#7#8}
+ \pdfx@fouroffive#9\end}
+\def\pdfx@fouroffive#1#2#3#4#5\end{\xdef\pdfx@ffourchars{#1#2#3#4}
+ \pdfx@sfouroffive#5\end}
+\def\pdfx@sfouroffive#1#2#3#4#5\end{\xdef\pdfx@sfourchars{#1#2#3#4}
+ \pdfx@tfouroffive#5\end}
+\def\pdfx@tfouroffive#1#2#3#4#5\end{\xdef\pdfx@tfourchars{#1#2#3#4}
+ \xdef\pdfx@laststring{#5}}
+
+\def\pdfx@uuid{\pdfx@eightchars-%
+ \pdfx@ffourchars-%
+ \pdfx@sfourchars-%
+ \pdfx@tfourchars-%
+ \pdfx@laststring}
+
+\pdfx@findUUID{\jobname.pdf}
+\edef\xmp@docid{\pdfx@uuid}
+\pdfx@findUUID{\pdfcreationdate}
+\edef\xmp@instid{\pdfx@uuid}
+
+%%----------------------------------------------------------------------
+%% ----- Color Profiles -------
+%% Define how to specify the profile, so the default
+%% can be over-ridden in the .xmpdata file.
+
+%% The user-level macros are only brought into scope during the reading
+%% of xmpdata.
+%%
+%% Usage:
+%% \setRGBcolorprofile{<filename>}{<identifier>}{<info string>}{<registry URL>}
+%% \setCMYKcolorprofile{<filename>}{<output intent>}{<identifier>}{<registry URL>}
+%% \setGRAYcolorprofile{<filename>}{<output intent>}{<identifier>}{<registry URL>}
+%%
+%% Within the arguments of each macro, the characters '<', '>', '&',
+%% '^', '_', '#', '$', and '~' can be used as themselves, but
+%% '%' must be escaped as '\%'.
+%%
+%% Note:
+%% * RGB profile is used with PDF/A and PDF/E files.
+%% * CMYK profile is used with PDF/X and PDF/VT files.
+%% * GRAY profile is currently unused.
+\def\pdfx@profilecatcodes{%
+ \catcode`\<=12\catcode`\>=12\catcode`\&=12\catcode`\^=12
+ \catcode`\_=12\catcode`\#=12\catcode`\$=12\catcode`\~=12
+ \edef\%{\expandafter\@gobble\string\%}%
+}
+\def\pdfx@setRGBcolorprofile{%
+ \begingroup
+ \pdfx@profilecatcodes
+ \pdfx@dosetRGBcolorprofile}
+\def\pdfx@dosetRGBcolorprofile#1#2#3#4{%
+ \xdef\pdfx@rgb@profile{#1}% valid file name
+ \xdef\pdfx@rgb@identifier{#2}%
+ \xdef\pdfx@rgb@info{#3}%
+ \pdfstringdef\pdfx@rgb@registry{#4}% valid URL
+ \endgroup}% closes-off \pdfx@setRGBcolorprofile
+%%
+\def\pdfx@setCMYKcolorprofile{%
+ \begingroup
+ \pdfx@profilecatcodes
+ \pdfx@dosetCMYKcolorprofile}
+\def\pdfx@dosetCMYKcolorprofile#1#2#3#4{%
+ \xdef\pdfx@cmyk@profile{#1}% valid file name
+ \pdfstringdef\pdfx@cmyk@intent{#2}% color intent
+ \pdfstringdef\pdfx@cmyk@identifier{#3}% text string identifier
+ \pdfstringdef\pdfx@cmyk@registry{#4}% valid URL
+ \endgroup}% closes-off \pdfx@setCMYKcolorprofile
+%%
+\def\pdfx@setGRAYcolorprofile{%
+ \begingroup
+ \pdfx@profilecatcodes
+ \pdfx@dosetGRAYcolorprofile}
+\def\pdfx@dosetGRAYcolorprofile#1#2#3#4{%
+ \xdef\pdfx@gray@profile{#1}% valid file name
+ \xdef\pdfx@gray@intent{#2}%
+ \xdef\pdfx@gray@identifier{#3}%
+ \pdfstringdef\pdfx@gray@registry{#4}% valid URL
+ \endgroup}% closes-off \pdfx@setGRAYcolorprofile
+%%----------------------------------------------------------------------
+%% default color profiles
+\pdfx@setRGBcolorprofile{sRGB_IEC61966-2-1_black_scaled.icc}
+ {sRGB_IEC61966-2-1_black_scaled}
+ {sRGB IEC61966 v2.1 with black scaling}
+ {http://www.color.org}
+\pdfx@setCMYKcolorprofile{coated_FOGRA39L_argl.icc}
+ {Coated FOGRA39}
+ {FOGRA39 (ISO Coated v2 300\% (ECI))}
+ {http://www.argyllcms.com/}
+\pdfx@setGRAYcolorprofile{Gray_linear.icc}
+ {}
+ {Custom}
+ {http://www.freedesktop.org/wiki/OpenIcc}
+%%----------------------------------------------------------------------
+%% License for the file sRGB_IEC61966-2-1_black_scaled.icc :
+%%
+%% Copyright International Color Consortium, 2009 -- http://www.color.org/
+%%
+%% It is hereby acknowledged that the file "sRGB_IEC61966-2-1_black_scaled.icc"
+%% is provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY.
+%%
+%% Licensing
+%%
+%% This profile is made available by the International Color Consortium,
+%% and may be copied, distributed, embedded, made, used, and sold without
+%% restriction. Altered versions of this profile shall have the original
+%% identification and copyright information removed and shall not be
+%% misrepresented as the original profile.
+%%
+%% Terms of use
+%%
+%% To anyone who acknowledges that the file "sRGB_IEC61966-2-1_black_scaled.icc"
+%% is provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY, permission
+%% to use, copy and distribute these file for any purpose is hereby
+%% granted without fee, provided that the file is not changed including
+%% the ICC copyright notice tag, and that the name of ICC shall not be
+%% used in advertising or publicity pertaining to distribution of the
+%% software without specific, written prior permission. ICC makes no
+%% representations about the suitability of this software for any
+%% purpose.
+%%
+%%----------------------------------------------------------------------
+%% License for the file coated_FOGRA39L_argl.icc :
+%%
+%% The zlib/libpng License
+%%
+%% Copyright (c) 2008 Kai-Uwe Behrmann
+%%
+%% This software is provided 'as-is', without any express or implied
+%% warranty. In no event will the authors be held liable for any damages
+%% arising from the use of this software.
+%%
+%% Permission is granted to anyone to use this software for any purpose,
+%% including commercial applications, and to alter it and redistribute
+%% it freely, subject to the following restrictions:
+%%
+%% 1. The origin of this software must not be misrepresented; you
+%% must not claim that you wrote the original software. If you use
+%% this software in a product, an acknowledgment in the product
+%% documentation would be appreciated but is not required.
+%%
+%% 2. Altered source versions must be plainly marked as such, and
+%% must not be misrepresented as being the original software.
+%%
+%% 3. This notice may not be removed or altered from any source
+%% distribution.
+%%----------------------------------------------------------------------
+
+\begingroup
+ \inputencoding{8bit}%
+ \makeatletter
+ \pdfx@localcommands
+ \InputIfFileExists{\jobname.xmpdata}%
+ {\typeout{**pdfx: Metadata file \jobname.xmpdata read successfully.}}%
+ {\typeout{**pdfx: No file \jobname.xmpdata . Metadata will be incomplete!}}
+\endgroup
+%% ----------------------------------------------------------------------
+\begingroup
+\ifpdfx@x % PDF/X needs a CMYK color profile for printing
+ \def\0{\string\0}
+ \catcode`\_ 12
+ \ifno@iccprofile % PDF/X-4p and PDF/X-5pg
+ \immediate\pdfobj {<</FS /URL /F (http://www.color.org/registry/profiles/Coated_Fogra39L_VIGC_300.icc)>>}
+ \edef\OBJ@URLs{\the\pdflastobj}%
+ \xdef\pdfx@cmyk@intent{Coated_Fogra39L_VIGC_300}%
+ \xdef\pdfx@cmyk@identifier{Coated_Fogra39L_VIGC_300.icc}%
+ \immediate\pdfobj {<<%
+ /CheckSum <5449c505618a9b6c38634b4708ae9e37>^^J% d5f0714cd9d6092b6ac93b625f5d8a0c>%
+ /ICCVersion (\004\002\000\000)% 4.2.0.0
+ /ProfileCS (CMYK)^^J%
+ /ProfileName (\pdfx@cmyk@identifier)^^J%
+ /URLs [\OBJ@URLs\space 0 R ]
+ >>} %
+ \edef\OBJ@ICC{\the\pdflastobj}%
+ \pdfcatalog{%
+ /OutputIntents [ <<
/Type/OutputIntent
/S/GTS_PDFX
- /OutputCondition (FOGRA39)
- /OutputConditionIdentifier (FOGRA39 \@bchar(ISO Coated v2
- 300\@pctchar\space \@bchar(ECI\@bchar)\@bchar))
- /DestOutputProfile \OBJ@CVR\space 0 R
- /RegistryName(http://www.color.org)
- >> ]}
-\else
- \immediate\pdfobj stream attr{/N 4} file{sRGBIEC1966-2.1.icm}
- \edef\OBJ@RVT{\the\pdflastobj}
+ /OutputCondition (\pdfx@cmyk@intent)%
+ /OutputConditionIdentifier (\pdfx@cmyk@identifier)%
+ /RegistryName(\pdfx@cmyk@registry)
+ % extra dictionary required for PDF/X-4p and PDF/X-5pg
+ /DestOutputProfileRef \OBJ@ICC\space 0 R
+ >> ]}%
+ \else % PDF/X-1 , PDF/X-1a , PDF/X-3 , PDF/X-4 , PDF/X-5g
+ \IfFileExists{\pdfx@cmyk@profile}{%
+ % embedded CMYK color profile
+ \immediate\pdfobj stream attr{/N 4} file{\pdfx@cmyk@profile}%
+ \edef\OBJ@CMYK{\the\pdflastobj}%
+ \pdfcatalog{%
+ /OutputIntents [ <<
+ /Type/OutputIntent
+ /S/GTS_PDFX
+ /OutputCondition (\pdfx@cmyk@intent)%
+ /OutputConditionIdentifier (\pdfx@cmyk@identifier)%
+ /RegistryName(\pdfx@cmyk@registry)
+ /DestOutputProfile \OBJ@CMYK\space 0 R
+ >> ]}%
+ }{%
+ \errmessage{No color profile found to use for CMYK printing colors.}%
+ }%
+ \fi % end of \ifno@iccprofile
+\else
+%% PDF/A needs an RGB color profile for on-screen rendering
+ \IfFileExists{\pdfx@rgb@profile}{%
+ \immediate\pdfobj stream attr{/N 3^^J/Alternate/DeviceRGB} file{\pdfx@rgb@profile}%
+ \edef\OBJ@RGB{\the\pdflastobj}%
+ }{%
+ \errmessage{No color profile found to use for RGB screen colors.}%
+ }%
\pdfcatalog{%
+ /ViewerPreferences <</DisplayDocTitle true >>
/OutputIntents [ <<
/Type /OutputIntent
- /S/GTS_PDFA1
- /DestOutputProfile \OBJ@RVT\space 0 R
- /OutputConditionIdentifier (sRGB IEC61966-2.1)
- /Info(sRGB IEC61966-2.1)
- >> ]}
-\fi
-% \end{macrocode}
-%
-% One of the |xmp| files is selectively loaded based on the option
-% chosen.
-%
-% \begin{macrocode}
+ \ifpdfx@e
+ /S/ISO_PDFE1
+ \else
+ /S/GTS_PDFA1
+ \fi
+ /OutputConditionIdentifier (\pdfx@rgb@identifier)%
+ /DestOutputProfile \OBJ@RGB\space 0 R
+ /Info(\pdfx@rgb@info)
+ /RegistryName(\pdfx@rgb@registry)
+ >>
+ ]}%
+\fi % end of \ifpdfx@x
+\endgroup
+
+%% ----------------------------------------------------------------------
+%% Make a version of \xmp@Keywords and \xmp@Author where \sep has been
+%% replaced by a comma. The first is for the pdf:Keywords property,
+%% which accepts a comma-separated string of keywords, and seems to be
+%% mandatory for PDF/A-1 compliance. The second is for the dc:creator
+%% property. Although it is defined to be a sequence of authors, Adobe
+%% Acrobat will in fact ignore and delete all except the first author.
+%% Therefore, it's safer to always separate authors by commas.
+
\begingroup
-\let\&=\xmpAmp
-\ifpdfxonea
- \includexmp{pdfx-1a}
-\else
- \includexmp{pdfa-1b}
-\fi
+ \pdfx@xmpmarkup
+ \def\sep{, }%
+ \inputencoding{8bit}\makeatletter
+ \xdef\xmp@@Keywords{\xmp@Keywords}
+ \xdef\xmp@@Author{\xmp@Author}
\endgroup
-% \end{macrocode}
-%
-% |glyphtounicode.tex| and |glyphtounicode-cmr.tex| are read.
-% These files contain mapping from glyph names to corresponding unicode for
-% embedded fonts, which are required by \pdfa. |glyphtounicode.tex| covers
-% AGL (Adobe Glyph List), names from |texglyphlist.txt| (part of
-% lcdf-typetools) and |zapfdingbats.txt|, plus a few exceptions.
-% |glyphtounicode-cmr.tex| covers glyphs that are used in CM fonts but not
-% listed in |glyphtounicode.txt|; the mappings come from file |goadb998.nam|
-% (part of \TeX{} Gyre fonts).
+%% ----------------------------------------------------------------------
+\def\xmp@convertDate{\pdfx@getYear}
+{\catcode`\D=12 \catcode`\:=12
+ \gdef\pdfx@getYear D:#1#2#3#4{\edef\pdfx@xYear{#1#2#3#4}\pdfx@getMonth}
+}
+\def\pdfx@getMonth#1#2{\edef\pdfx@xMonth{#1#2}\pdfx@getDay}
+\def\pdfx@getDay#1#2{\edef\pdfx@xDay{#1#2}\pdfx@getHour}
+\def\pdfx@getHour#1#2{\edef\pdfx@xHour{#1#2}\pdfx@getMin}
+\def\pdfx@getMin#1#2{\edef\pdfx@xMin{#1#2}\pdfx@getSec}
+\def\pdfx@getSec#1#2{\edef\pdfx@xSec{#1#2}\pdfx@getTZh}
+\def\pdfx@getTZh{\futurelet\pdfx@next\pdfx@getTzh@branches}
+
+{\catcode`\@=11 \catcode`\Z=12 \catcode`\+=12 \catcode`\-=12
+\gdef\pdfx@getTzh@branches{%
+ \ifx\pdfx@next Z\let\pdfx@getTzbranch\pdfx@getTznozone
+ \else\ifx\pdfx@next +\let\pdfx@getTzbranch\pdfx@getTzplus
+ \else\ifx\pdfx@next -\let\pdfx@getTzbranch\pdfx@getTzminus
+ \else\let\pdfx@getTzbranch\pdfx@getTzerror
+ \fi\fi\fi \pdfx@getTzbranch }
+
+\catcode`\0=12
+\gdef\pdfx@getTznozone Z#1\pdfx@getTzend{%
+ \edef\pdfx@xTzh{+00}\edef\pdfx@xTzm{00}}
+\gdef\pdfx@getTzplus +#1'#2'#3\pdfx@getTzend{%
+ \edef\pdfx@xTzh{+#1}\edef\pdfx@xTzm{#2}%
+ \ifx\relax#2\relax\def\pdfx@xTzm{00}\fi}
+\gdef\pdfx@getTzminus -#1'#2'#3\pdfx@getTzend{%
+ \edef\pdfx@xTzh{-#1}\edef\pdfx@xTzm{#2}%
+ \ifx\relax#2\relax\def\pdfx@xTzm{00}\fi}
+\expandafter\xmp@convertDate\pdfcreationdate''\pdfx@getTzend
+\xdef\pdfx@convDate{\pdfx@xYear\pdfx@xMonth\pdfx@xDay\pdfx@xHour\pdfx@xMin\pdfx@xSec\pdfx@xTzh'\pdfx@xTzm'}%
+\xdef\xmp@convDate{\pdfx@xYear-\pdfx@xMonth-\pdfx@xDay T\pdfx@xHour:\pdfx@xMin:\pdfx@xSec\pdfx@xTzh:\pdfx@xTzm}%
+}% end of \catcode
+
+%% ----------------------------------------------------------------------
+%% \pdfx@topdfstring\toka\tokb: Convert the string in \tokb to a format
+%% appropriate for PDF /Info strings, i.e., PDFDoc encoding or UTF-16
+%% encoding, and store the result in \toka. As a special case, if \tokb
+%% is \@empty, set \toka to \@empty.
+
+\def\pdfx@topdfstring#1#2{%
+ \ifx#2\@empty
+ \global\let#1\@empty
+ \else
+ \begingroup
+ \inputencoding{utf8}%
+ \hypersetup{pdfencoding=unicode}%
+ \pdfstringdef#1{#2}%
+ \endgroup
+ \fi
+}
+
+%% Convert the relevant XMP properties to PDF strings, expanding markup
+%% (such as \sep, \&, \copyright, etc) in an appropriate way.
+\begingroup
+ \pdfx@pdfmarkup
+ \pdfx@topdfstring\pdfx@Title\xmp@Title
+ \pdfx@topdfstring\pdfx@Author\xmp@Author
+ \pdfx@topdfstring\pdfx@Subject\xmp@Subject
+ \pdfx@topdfstring\pdfx@Keywords\xmp@Keywords
+ \pdfx@topdfstring\pdfx@CreatorTool\xmp@CreatorTool
+ \pdfx@topdfstring\pdfx@Producer\xmp@Producer
+\endgroup
-%
-% \begin{macrocode}
\input glyphtounicode.tex
\input glyphtounicode-cmr.tex
\pdfgentounicode=1
-% \end{macrocode}
-%
-% Active content is not allowed in a \pdfx file. This means that
-% standard \pdf features like forms, signatures, comments and embedded
-% sounds and movies are not allowed in \pdfx. So |hyperref| is loaded
-% in |draft| mode and an |info| dictionary is defined with |\pdfinfo|
-% command.
-%
-% \begin{macrocode}
-\ifpdfxonea
- \RequirePackage[draft,pdftex,pdfpagemode=UseNone,bookmarks=false]{hyperref}
- \pdfinfo{
- /Title(\xmpTitle)%
- /Author(\xmpAuthor)%
- /Creator(\xmpProducer)%
- /CreationDate(\convDate)%
- /ModDate(\convDate)%
- /Producer(\xmpProducer)%
- /Trapped /False
- /GTS_PDFXVersion (PDF/X-1:2001)%
- /GTS_PDFXConformance (PDF/X-1a:2001)%
- }
+
+\ifpdfx@x
+ {\pdfinfo{% order of these dictionary keys should not matter
+ \ifx\pdfx@Author\@empty\else /Author(\pdfx@Author)\fi
+ /CreationDate(D:\pdfx@convDate)%
+ /Creator(\pdfx@CreatorTool)%
+ \ifnum\xmp@Part=1
+ /GTS_PDFXVersion(PDF/X-1\ifnum\xmp@ReleaseDate>2001\xmp@Conformance\fi:\xmp@ReleaseDate)%
+ \else
+ /GTS_PDFXVersion(PDF/X-\xmp@Part\xmp@Conformance\ifnum\xmp@Part< 4 :\xmp@ReleaseDate\fi)%
+ \fi
+ \ifnum\xmp@Part < 3
+ /GTS_PDFXConformance(PDF/X-\xmp@Part\xmp@Conformance:\xmp@ReleaseDate)%
+ \fi
+ \ifpdfx@vt % support for PDF/VT extensions of PDF/X-4 and PDF/X-5
+%% /GTS_PDFVTVersion(PDF/VT-\xmp@vtPart\xmp@vtConformance)%
+ \fi
+ \ifx\pdfx@Keywords\@empty\else /Keywords(\pdfx@Keywords)\fi
+ /ModDate(D:\pdfx@convDate)%
+ /Producer(\pdfx@Producer)%
+ \ifx\pdfx@Subject\@empty\else /Subject(\pdfx@Subject)\fi
+ \ifx\pdfx@Title\@empty\else /Title(\pdfx@Title)\fi
+ /Trapped/False%
+ }% end of PDF/X info
+ }%
\else
-% \end{macrocode}
-%
-% For \pdfa, load |hyperref| package with |pdfa| option, so that it
-% will take care of the link annotations correctly. We have slightly
-% modified the |\pdfinfo| by including |/GTS_PDFA1Version|
-% |(PDA/A-1b:2005)|. Take a look at the modified |\PDF@FinishDoc|
-% macro of |hyperref|.
-%
-% \begin{macrocode}
- \RequirePackage[pdftex,pdfa]{hyperref}
- \def\PDF@FinishDoc{%
- \Hy@UseMaketitleInfos
- \pdfinfo{%
- /Creator(\xmpProducer)%
+ \ifpdfx@e
+ {\pdfinfo{% order of these dictionary keys should not matter
+ \ifx\pdfx@Author\@empty\else /Author(\pdfx@Author)\fi
+ /CreationDate(D:\pdfx@convDate)%
+ /Creator(\pdfx@CreatorTool)%
+ /GTS_PDFEVersion(PDF/E-1\xmp@Conformance:\xmp@ReleaseDate)%
+ \ifx\pdfx@Keywords\@empty\else /Keywords(\pdfx@Keywords)\fi
+ /ModDate(D:\pdfx@convDate)%
+ /Producer(\pdfx@Producer)%
+ \ifx\pdfx@Subject\@empty\else /Subject(\pdfx@Subject)\fi
+ \ifx\pdfx@Title\@empty\else /Title(\pdfx@Title)\fi
+ /Trapped/False%
+ }% end of PDF/E info
+ }%
+ \else
+ \def\pdfx@confA{a}%
+ \def\pdfx@confB{b}%
+ \def\pdfx@confU{u}%
+ \edef\xmp@conformance{\csname pdfx@conf\xmp@Conformance\endcsname}%
+ \AtBeginDocument{%
+ \def\PDF@FinishDoc{%
+ \Hy@UseMaketitleInfos
+ \pdfinfo{%
+ \ifx\pdfx@Title\@empty\else /Title(\pdfx@Title)\fi
+ \ifx\pdfx@Author\@empty\else /Author(\pdfx@Author)\fi
+ \ifx\pdfx@Subject\@empty\else /Subject(\pdfx@Subject)\fi
+ \ifx\pdfx@Keywords\@empty\else /Keywords(\pdfx@Keywords)\fi
+ /Creator(\pdfx@CreatorTool)%
\ifx\@pdfcreationdate\@empty
- \else
+ /CreationDate(D:\pdfx@convDate)%
+ \else
/CreationDate(\@pdfcreationdate)%
- \fi
- \ifx\@pdfmoddate\@empty
- \else
+ \fi
+ \ifx\@pdfmoddate\@empty
+ /ModDate(D:\pdfx@convDate)%
+ \else
/ModDate(\@pdfmoddate)%
- \fi
- /Producer(\xmpProducer)%
- /Trapped /False
- /GTS_PDFA1Version (PDF/A-1b:2005)%
- }%
- \Hy@DisableOption{pdfauthor}%
- \Hy@DisableOption{pdftitle}%
- \Hy@DisableOption{pdfsubject}%
- \Hy@DisableOption{pdfcreator}%
- \Hy@DisableOption{pdfcreationdate}%
- \Hy@DisableOption{pdfmoddate}%
- \Hy@DisableOption{pdfproducer}%
- \Hy@DisableOption{pdfkeywords}}
-\fi
-%
-%</package>
+ \fi
+ /Producer(\pdfx@Producer)%
+ /Trapped/False
+ /GTS_PDFA1Version (PDF/A-\xmp@Part\xmp@conformance:\xmp@ReleaseDate)%
+ }% end of PDF/A info
+ }% end of \PDF@FinishDoc
+ }% end of \AtBeginDocument
+\fi\fi
+
+%%----------------------------------------------------------------------
+\RequirePackage{xmpincl}
+\begingroup
+ \ifpdfx@x
+ \ifpdfx@vt
+ \def\xmp@template{pdfvt}%
+ \else
+ \def\xmp@template{pdfx}% formerly pdfx-1a
+ \fi
+ \else
+ \ifpdfx@e
+ \def\xmp@template{pdfe}%
+ \else
+ \def\xmp@template{pdfa}%
+ \fi\fi
+ % patch commands from xmpincl.sty ...
+ \def\pdfx@xmpinclStart{% supply byte-order marker
+ <?xpacket begin='^^ef^^bb^^bf'? id='W5M0MpCehiHzreSzNTczkc9d' ?> %
+ }%
+ \def\pdfx@xmpinclStartAlt{% no byte-order marker
+ <?xpacket begin=''? id='W5M0MpCehiHzreSzNTczkc9d' ?> %
+ }%
+ \def\pdfx@xmpinclEnd{% allow XMP packet to be writable
+ <?xpacket end='w'?> %
+ }%
+ \let\mcs@xmpinclStart\pdfx@xmpinclStart
+ \let\mcs@xmpinclStartAlt\pdfx@xmpinclStartAlt
+ \ifpdfx@noBOM % don't use the byte-order marker
+ \let\mcs@xmpinclStart\pdfx@xmpinclStartAlt
+ \fi
+ \let\mcs@xmpinclEnd\pdfx@xmpinclEnd
+%% ... preventing their redefinition
+ \def\newcommand#1#2{}%
+ %
+ \pdfx@xmpmarkup
+ \catcode `\_ 12
+ \obeyspaces% beware of 128 space characters in the next line -- for padding end of XMP packet
+ \def\padding@line{ }%
+ \def\ifnot@empty#1#2{\ifx#1\@empty\else#2\fi}
+ \inputencoding{8bit}\makeatletter
+ \typeout{Using XMP template file: \xmp@template.xmp}%
+ \includexmp{\xmp@template}
+\endgroup
+
+%% disable hyperref options, to prevent changes that will cause an incompatibility
+ \Hy@DisableOption{pdfauthor}%
+ \Hy@DisableOption{pdftitle}%
+ \Hy@DisableOption{pdfsubject}%
+ \Hy@DisableOption{pdfcreator}%
+ \Hy@DisableOption{pdfcreationdate}%
+ \Hy@DisableOption{pdfmoddate}%
+ \Hy@DisableOption{pdfproducer}%
+ \Hy@DisableOption{pdfkeywords}%
+\endinput
% \end{macrocode}
+% \iffalse
+%</package>
+% \fi
% \Finale
% \PrintIndex
% \PrintChanges
diff --git a/Master/texmf-dist/source/latex/pdfx/pdfx.ins b/Master/texmf-dist/source/latex/pdfx/pdfx.ins
index 0d0f2e32499..e4a8eee433e 100644
--- a/Master/texmf-dist/source/latex/pdfx/pdfx.ins
+++ b/Master/texmf-dist/source/latex/pdfx/pdfx.ins
@@ -1,10 +1,13 @@
\input docstrip.tex
%\keepsilent
+\askforoverwritefalse
\preamble
- Copyright (c) 2008, CV Radhakrishnan <cvr@river-valley.org>,
- Han The Thanh <thanh@river-valley.org>
+ Copyright (c) 2015, CV Radhakrishnan <cvr@river-valley.org>,
+ Han The Thanh <thanh@river-valley.org>,
+ Ross Moore <ross.moore@mq.edu.au>,
+ Peter Selinger <selinger@mathstat.dal.ca>
This file may be distributed and/or modified under the conditions
of the LaTeX Project Public License, either version 1.2 of this
diff --git a/Master/texmf-dist/source/latex/pdfx/rvdtx.sty b/Master/texmf-dist/source/latex/pdfx/rvdtx.sty
index 6e7e9235d32..2160142cfa2 100644
--- a/Master/texmf-dist/source/latex/pdfx/rvdtx.sty
+++ b/Master/texmf-dist/source/latex/pdfx/rvdtx.sty
@@ -91,11 +91,6 @@
a4paper}
\RequirePackage{comment,xspace}
-\def\xml{\textsc{xml}\xspace}
-\def\pdf{\textsc{pdf}\xspace}
-\def\pdfa{\textsc{pdf/a-1}b\xspace}
-\def\pdfx{\textsc{pdf/x-1}a\xspace}
-\def\xmp{\textsc{xmp}\xspace}
\def\pdftex{\textsc{pdf\TeX}\xspace}
\def\defmacro#1{\texttt{\@bsl#1}}
\def\thanh{H\`an Th\^e Th\`anh\xspace}
diff --git a/Master/texmf-dist/tex/latex/pdfx/8bit.def b/Master/texmf-dist/tex/latex/pdfx/8bit.def
new file mode 100644
index 00000000000..a32c57d7348
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pdfx/8bit.def
@@ -0,0 +1,170 @@
+% In this input encoding, each non-ASCII character just maps to its
+% own byte value. This is intended for specialized uses where binary
+% data must be processed.
+%
+% Written in 2014 by Peter Selinger <selinger@mathstat.dal.ca>.
+% Public Domain.
+
+\ProvidesFile{8bit.def}
+ [2008/03/30 v1.1d Input encoding file]
+\makeatletter
+\DeclareInputText{1}{\string^^01}
+\DeclareInputText{2}{\string^^02}
+\DeclareInputText{3}{\string^^03}
+\DeclareInputText{4}{\string^^04}
+\DeclareInputText{5}{\string^^05}
+\DeclareInputText{6}{\string^^06}
+\DeclareInputText{7}{\string^^07}
+\DeclareInputText{8}{\string^^08}
+\DeclareInputText{11}{\string^^0b}
+\DeclareInputText{14}{\string^^0e}
+\DeclareInputText{15}{\string^^0f}
+\DeclareInputText{16}{\string^^10}
+\DeclareInputText{17}{\string^^11}
+\DeclareInputText{18}{\string^^12}
+\DeclareInputText{19}{\string^^13}
+\DeclareInputText{20}{\string^^14}
+\DeclareInputText{21}{\string^^15}
+\DeclareInputText{22}{\string^^16}
+\DeclareInputText{23}{\string^^17}
+\DeclareInputText{24}{\string^^18}
+\DeclareInputText{25}{\string^^19}
+\DeclareInputText{26}{\string^^1a}
+\DeclareInputText{27}{\string^^1b}
+\DeclareInputText{28}{\string^^1c}
+\DeclareInputText{29}{\string^^1d}
+\DeclareInputText{30}{\string^^1e}
+\DeclareInputText{31}{\string^^1f}
+\DeclareInputText{127}{\string^^7f}
+\DeclareInputText{128}{\string^^80}
+\DeclareInputText{129}{\string^^81}
+\DeclareInputText{130}{\string^^82}
+\DeclareInputText{131}{\string^^83}
+\DeclareInputText{132}{\string^^84}
+\DeclareInputText{133}{\string^^85}
+\DeclareInputText{134}{\string^^86}
+\DeclareInputText{135}{\string^^87}
+\DeclareInputText{136}{\string^^88}
+\DeclareInputText{137}{\string^^89}
+\DeclareInputText{138}{\string^^8a}
+\DeclareInputText{139}{\string^^8b}
+\DeclareInputText{140}{\string^^8c}
+\DeclareInputText{141}{\string^^8d}
+\DeclareInputText{142}{\string^^8e}
+\DeclareInputText{143}{\string^^8f}
+\DeclareInputText{144}{\string^^90}
+\DeclareInputText{145}{\string^^91}
+\DeclareInputText{146}{\string^^92}
+\DeclareInputText{147}{\string^^93}
+\DeclareInputText{148}{\string^^94}
+\DeclareInputText{149}{\string^^95}
+\DeclareInputText{150}{\string^^96}
+\DeclareInputText{151}{\string^^97}
+\DeclareInputText{152}{\string^^98}
+\DeclareInputText{153}{\string^^99}
+\DeclareInputText{154}{\string^^9a}
+\DeclareInputText{155}{\string^^9b}
+\DeclareInputText{156}{\string^^9c}
+\DeclareInputText{157}{\string^^9d}
+\DeclareInputText{158}{\string^^9e}
+\DeclareInputText{159}{\string^^9f}
+\DeclareInputText{160}{\string^^a0}
+\DeclareInputText{161}{\string^^a1}
+\DeclareInputText{162}{\string^^a2}
+\DeclareInputText{163}{\string^^a3}
+\DeclareInputText{164}{\string^^a4}
+\DeclareInputText{165}{\string^^a5}
+\DeclareInputText{166}{\string^^a6}
+\DeclareInputText{167}{\string^^a7}
+\DeclareInputText{168}{\string^^a8}
+\DeclareInputText{169}{\string^^a9}
+\DeclareInputText{170}{\string^^aa}
+\DeclareInputText{171}{\string^^ab}
+\DeclareInputText{172}{\string^^ac}
+\DeclareInputText{173}{\string^^ad}
+\DeclareInputText{174}{\string^^ae}
+\DeclareInputText{175}{\string^^af}
+\DeclareInputText{176}{\string^^b0}
+\DeclareInputText{177}{\string^^b1}
+\DeclareInputText{178}{\string^^b2}
+\DeclareInputText{179}{\string^^b3}
+\DeclareInputText{180}{\string^^b4}
+\DeclareInputText{181}{\string^^b5}
+\DeclareInputText{182}{\string^^b6}
+\DeclareInputText{183}{\string^^b7}
+\DeclareInputText{184}{\string^^b8}
+\DeclareInputText{185}{\string^^b9}
+\DeclareInputText{186}{\string^^ba}
+\DeclareInputText{187}{\string^^bb}
+\DeclareInputText{188}{\string^^bc}
+\DeclareInputText{189}{\string^^bd}
+\DeclareInputText{190}{\string^^be}
+\DeclareInputText{191}{\string^^bf}
+\DeclareInputText{192}{\string^^c0}
+\DeclareInputText{193}{\string^^c1}
+\DeclareInputText{194}{\string^^c2}
+\DeclareInputText{195}{\string^^c3}
+\DeclareInputText{196}{\string^^c4}
+\DeclareInputText{197}{\string^^c5}
+\DeclareInputText{198}{\string^^c6}
+\DeclareInputText{199}{\string^^c7}
+\DeclareInputText{200}{\string^^c8}
+\DeclareInputText{201}{\string^^c9}
+\DeclareInputText{202}{\string^^ca}
+\DeclareInputText{203}{\string^^cb}
+\DeclareInputText{204}{\string^^cc}
+\DeclareInputText{205}{\string^^cd}
+\DeclareInputText{206}{\string^^ce}
+\DeclareInputText{207}{\string^^cf}
+\DeclareInputText{208}{\string^^d0}
+\DeclareInputText{209}{\string^^d1}
+\DeclareInputText{210}{\string^^d2}
+\DeclareInputText{211}{\string^^d3}
+\DeclareInputText{212}{\string^^d4}
+\DeclareInputText{213}{\string^^d5}
+\DeclareInputText{214}{\string^^d6}
+\DeclareInputText{215}{\string^^d7}
+\DeclareInputText{216}{\string^^d8}
+\DeclareInputText{217}{\string^^d9}
+\DeclareInputText{218}{\string^^da}
+\DeclareInputText{219}{\string^^db}
+\DeclareInputText{220}{\string^^dc}
+\DeclareInputText{221}{\string^^dd}
+\DeclareInputText{222}{\string^^de}
+\DeclareInputText{223}{\string^^df}
+\DeclareInputText{224}{\string^^e0}
+\DeclareInputText{225}{\string^^e1}
+\DeclareInputText{226}{\string^^e2}
+\DeclareInputText{227}{\string^^e3}
+\DeclareInputText{228}{\string^^e4}
+\DeclareInputText{229}{\string^^e5}
+\DeclareInputText{230}{\string^^e6}
+\DeclareInputText{231}{\string^^e7}
+\DeclareInputText{232}{\string^^e8}
+\DeclareInputText{233}{\string^^e9}
+\DeclareInputText{234}{\string^^ea}
+\DeclareInputText{235}{\string^^eb}
+\DeclareInputText{236}{\string^^ec}
+\DeclareInputText{237}{\string^^ed}
+\DeclareInputText{238}{\string^^ee}
+\DeclareInputText{239}{\string^^ef}
+\DeclareInputText{240}{\string^^f0}
+\DeclareInputText{241}{\string^^f1}
+\DeclareInputText{242}{\string^^f2}
+\DeclareInputText{243}{\string^^f3}
+\DeclareInputText{244}{\string^^f4}
+\DeclareInputText{245}{\string^^f5}
+\DeclareInputText{246}{\string^^f6}
+\DeclareInputText{247}{\string^^f7}
+\DeclareInputText{248}{\string^^f8}
+\DeclareInputText{249}{\string^^f9}
+\DeclareInputText{250}{\string^^fa}
+\DeclareInputText{251}{\string^^fb}
+\DeclareInputText{252}{\string^^fc}
+\DeclareInputText{253}{\string^^fd}
+\DeclareInputText{254}{\string^^fe}
+\DeclareInputText{255}{\string^^ff}
+\makeatother
+\endinput
+%%
+%% End of file `8bit.def'.
diff --git a/Master/texmf-dist/tex/latex/pdfx/ICC_LICENSE.txt b/Master/texmf-dist/tex/latex/pdfx/ICC_LICENSE.txt
new file mode 100644
index 00000000000..a4591d973b8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pdfx/ICC_LICENSE.txt
@@ -0,0 +1,51 @@
+For the file sRGB_IEC61966-2-1_black_scaled.icc:
+
+ Copyright International Color Consortium, 2009
+
+ It is hereby acknowledged that the file "sRGB_IEC61966-2-1_black
+ scaled.icc" is provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY.
+
+ Licensing
+
+ This profile is made available by the International Color Consortium,
+ and may be copied, distributed, embedded, made, used, and sold without
+ restriction. Altered versions of this profile shall have the original
+ identification and copyright information removed and shall not be
+ misrepresented as the original profile.
+
+ Terms of use
+
+ To anyone who acknowledges that the file "sRGB_IEC61966-2-1_black
+ scaled.icc" is provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY,
+ permission to use, copy and distribute these file for any purpose is
+ hereby granted without fee, provided that the file is not changed
+ including the ICC copyright notice tag, and that the name of ICC shall
+ not be used in advertising or publicity pertaining to distribution of
+ the software without specific, written prior permission. ICC makes no
+ representations about the suitability of this software for any
+ purpose.
+
+For the file coated_FOGRA39L_argl.icc:
+
+ The zlib/libpng License
+
+ Copyright (c) 2008 Kai-Uwe Behrmann
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute
+ it freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you
+ must not claim that you wrote the original software. If you use
+ this software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and
+ must not be misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source
+ distribution.
diff --git a/Master/texmf-dist/tex/latex/pdfx/coated_FOGRA39L_argl.icc b/Master/texmf-dist/tex/latex/pdfx/coated_FOGRA39L_argl.icc
new file mode 100644
index 00000000000..449c5f922f9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pdfx/coated_FOGRA39L_argl.icc
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-cmr.tex b/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-cmr.tex
index 4c0a28507e0..731a8d07b69 100644
--- a/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-cmr.tex
+++ b/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-cmr.tex
@@ -1,5 +1,6 @@
%
% Copyright (c) 2008, Han The Thanh <thanh@river-valley.org>
+% Copyright (c) 2014, Peter Selinger <selinger@mathstat.dal.ca>
%
% This file may be distributed and/or modified under the conditions
% of the LaTeX Project Public License, either version 1.2 of this
@@ -11,125 +12,344 @@
% and version 1.2 or later is part of all distributions of LaTeX
% version 1999/12/01 or later.
%
-%
-\pdfglyphtounicode{angbracketleftBig}{ED01}
-\pdfglyphtounicode{angbracketleftBigg}{ED03}
-\pdfglyphtounicode{angbracketleftbig}{ED02}
-\pdfglyphtounicode{angbracketleftbigg}{ED04}
-\pdfglyphtounicode{angbracketrightBig}{ED06}
-\pdfglyphtounicode{angbracketrightBigg}{ED08}
-\pdfglyphtounicode{angbracketrightbig}{ED07}
-\pdfglyphtounicode{angbracketrightbigg}{ED09}
-\pdfglyphtounicode{arrowbt}{ED0A}
-\pdfglyphtounicode{arrowdblbt}{ED0B}
-\pdfglyphtounicode{arrowdbltp}{ED0E}
-\pdfglyphtounicode{arrowhookleft}{21A9}
-\pdfglyphtounicode{arrowhookright}{21AA}
-\pdfglyphtounicode{arrowtp}{ED11}
+% Changes:
+% 2014/08/11: PS1 - mapped most glyphs to existing Unicode code points.
+% 2014/08/11: PS1 - added mappings for the xyatip and xybtip fonts.
+
+%% Glyphs from the cmex fonts:
+
+\pdfglyphtounicode{angbracketleftBig}{27E8}
+\pdfglyphtounicode{angbracketleftBigg}{27E8}
+\pdfglyphtounicode{angbracketleftbig}{27E8}
+\pdfglyphtounicode{angbracketleftbigg}{27E8}
+\pdfglyphtounicode{angbracketrightBig}{27E9}
+\pdfglyphtounicode{angbracketrightBigg}{27E9}
+\pdfglyphtounicode{angbracketrightbig}{27E9}
+\pdfglyphtounicode{angbracketrightbigg}{27E9}
+\pdfglyphtounicode{arrowbt}{2193}
+\pdfglyphtounicode{arrowdblbt}{21D3}
+\pdfglyphtounicode{arrowdbltp}{21D1}
+\pdfglyphtounicode{arrowhookleft}{21AA}
+\pdfglyphtounicode{arrowhookright}{21A9}
+\pdfglyphtounicode{arrowtp}{2191}
+\pdfglyphtounicode{arrowvertex}{23D0}
\pdfglyphtounicode{arrowvertexdbl}{ED12}
-\pdfglyphtounicode{backslashBig}{ED13}
-\pdfglyphtounicode{backslashBigg}{ED15}
-\pdfglyphtounicode{backslashbig}{ED14}
-\pdfglyphtounicode{backslashbigg}{ED16}
+\pdfglyphtounicode{backslashBig}{005C}
+\pdfglyphtounicode{backslashBigg}{005C}
+\pdfglyphtounicode{backslashbig}{005C}
+\pdfglyphtounicode{backslashbigg}{005C}
+\pdfglyphtounicode{braceex}{23AA}
\pdfglyphtounicode{bracehtipdownleft}{ED17}
\pdfglyphtounicode{bracehtipdownright}{ED18}
\pdfglyphtounicode{bracehtipupleft}{ED19}
\pdfglyphtounicode{bracehtipupright}{ED1A}
-\pdfglyphtounicode{braceleftBig}{ED1B}
-\pdfglyphtounicode{braceleftBigg}{ED1D}
-\pdfglyphtounicode{braceleftbig}{ED1C}
-\pdfglyphtounicode{braceleftbigg}{ED1E}
-\pdfglyphtounicode{bracerightBig}{ED20}
-\pdfglyphtounicode{bracerightBigg}{ED22}
-\pdfglyphtounicode{bracerightbig}{ED21}
-\pdfglyphtounicode{bracerightbigg}{ED23}
-\pdfglyphtounicode{bracketleftBig}{ED24}
-\pdfglyphtounicode{bracketleftBigg}{ED26}
-\pdfglyphtounicode{bracketleftbig}{ED25}
-\pdfglyphtounicode{bracketleftbigg}{ED27}
-\pdfglyphtounicode{bracketrightBig}{ED28}
-\pdfglyphtounicode{bracketrightBigg}{ED2A}
-\pdfglyphtounicode{bracketrightbig}{ED29}
-\pdfglyphtounicode{bracketrightbigg}{ED2B}
-\pdfglyphtounicode{ceilingleftBig}{ED2C}
-\pdfglyphtounicode{ceilingleftBigg}{ED2E}
-\pdfglyphtounicode{ceilingleftbig}{ED2D}
-\pdfglyphtounicode{ceilingleftbigg}{ED2F}
-\pdfglyphtounicode{ceilingrightBig}{ED30}
-\pdfglyphtounicode{ceilingrightBigg}{ED32}
-\pdfglyphtounicode{ceilingrightbig}{ED31}
-\pdfglyphtounicode{ceilingrightbigg}{ED33}
-\pdfglyphtounicode{circledotdisplay}{ED34}
-\pdfglyphtounicode{circledottext}{ED35}
-\pdfglyphtounicode{circlemultiplydisplay}{ED36}
-\pdfglyphtounicode{circlemultiplytext}{ED37}
-\pdfglyphtounicode{circleplusdisplay}{ED38}
-\pdfglyphtounicode{circleplustext}{ED39}
-\pdfglyphtounicode{contintegraldisplay}{ED3B}
-\pdfglyphtounicode{contintegraltext}{ED3C}
-\pdfglyphtounicode{coproductdisplay}{ED3D}
-\pdfglyphtounicode{coproducttext}{ED3E}
-\pdfglyphtounicode{floorleftBig}{ED42}
-\pdfglyphtounicode{floorleftBigg}{ED44}
-\pdfglyphtounicode{floorleftbig}{ED43}
-\pdfglyphtounicode{floorleftbigg}{ED45}
-\pdfglyphtounicode{floorrightBig}{ED46}
-\pdfglyphtounicode{floorrightBigg}{ED48}
-\pdfglyphtounicode{floorrightbig}{ED47}
-\pdfglyphtounicode{floorrightbigg}{ED49}
-\pdfglyphtounicode{hatwide}{ED4A}
-\pdfglyphtounicode{hatwider}{ED4B}
-\pdfglyphtounicode{hatwidest}{ED4C}
-\pdfglyphtounicode{integraldisplay}{ED4D}
-\pdfglyphtounicode{integraltext}{ED4E}
-\pdfglyphtounicode{intersectiondisplay}{ED4F}
-\pdfglyphtounicode{intersectiontext}{ED50}
-\pdfglyphtounicode{logicalanddisplay}{ED51}
-\pdfglyphtounicode{logicalandtext}{ED52}
-\pdfglyphtounicode{logicalordisplay}{ED53}
-\pdfglyphtounicode{logicalortext}{ED54}
-%\pdfglyphtounicode{mapsto}{ED55}
-\pdfglyphtounicode{mapsto}{2192}
-\pdfglyphtounicode{parenleftBig}{ED5A}
-\pdfglyphtounicode{parenleftBigg}{ED5C}
-\pdfglyphtounicode{parenleftbig}{ED5B}
-\pdfglyphtounicode{parenleftbigg}{ED5D}
-\pdfglyphtounicode{parenrightBig}{ED5E}
-\pdfglyphtounicode{parenrightBigg}{ED60}
-\pdfglyphtounicode{parenrightbig}{ED5F}
-\pdfglyphtounicode{parenrightbigg}{ED61}
-\pdfglyphtounicode{productdisplay}{ED63}
-\pdfglyphtounicode{producttext}{ED64}
-\pdfglyphtounicode{radicalBig}{ED65}
-\pdfglyphtounicode{radicalBigg}{ED67}
-\pdfglyphtounicode{radicalbig}{ED66}
-\pdfglyphtounicode{radicalbigg}{ED68}
-\pdfglyphtounicode{radicalbt}{ED69}
+\pdfglyphtounicode{braceleftBig}{007B}
+\pdfglyphtounicode{braceleftBigg}{007B}
+\pdfglyphtounicode{braceleftbig}{007B}
+\pdfglyphtounicode{braceleftbigg}{007B}
+\pdfglyphtounicode{braceleftbt}{23A9}
+\pdfglyphtounicode{braceleftmid}{23A8}
+\pdfglyphtounicode{bracelefttp}{23A7}
+\pdfglyphtounicode{bracerightBig}{007D}
+\pdfglyphtounicode{bracerightBigg}{007D}
+\pdfglyphtounicode{bracerightbig}{007D}
+\pdfglyphtounicode{bracerightbigg}{007D}
+\pdfglyphtounicode{bracerightbt}{23AD}
+\pdfglyphtounicode{bracerightmid}{23AC}
+\pdfglyphtounicode{bracerighttp}{23AB}
+\pdfglyphtounicode{bracketleftBig}{005B}
+\pdfglyphtounicode{bracketleftBigg}{005B}
+\pdfglyphtounicode{bracketleftbig}{005B}
+\pdfglyphtounicode{bracketleftbigg}{005B}
+\pdfglyphtounicode{bracketleftbt}{23A3}
+\pdfglyphtounicode{bracketleftex}{23A2}
+\pdfglyphtounicode{bracketlefttp}{23A1}
+\pdfglyphtounicode{bracketrightBig}{005D}
+\pdfglyphtounicode{bracketrightBigg}{005D}
+\pdfglyphtounicode{bracketrightbig}{005D}
+\pdfglyphtounicode{bracketrightbigg}{005D}
+\pdfglyphtounicode{bracketrightbt}{23A6}
+\pdfglyphtounicode{bracketrightex}{23A5}
+\pdfglyphtounicode{bracketrighttp}{23A4}
+\pdfglyphtounicode{ceilingleftBig}{2308}
+\pdfglyphtounicode{ceilingleftBigg}{2308}
+\pdfglyphtounicode{ceilingleftbig}{2308}
+\pdfglyphtounicode{ceilingleftbigg}{2308}
+\pdfglyphtounicode{ceilingrightBig}{2309}
+\pdfglyphtounicode{ceilingrightBigg}{2309}
+\pdfglyphtounicode{ceilingrightbig}{2309}
+\pdfglyphtounicode{ceilingrightbigg}{2309}
+\pdfglyphtounicode{circledotdisplay}{2A00}
+\pdfglyphtounicode{circledottext}{2A00}
+\pdfglyphtounicode{circlemultiplydisplay}{2A02}
+\pdfglyphtounicode{circlemultiplytext}{2A02}
+\pdfglyphtounicode{circleplusdisplay}{2A01}
+\pdfglyphtounicode{circleplustext}{2A01}
+\pdfglyphtounicode{contintegraldisplay}{222E}
+\pdfglyphtounicode{contintegraltext}{222E}
+\pdfglyphtounicode{coproductdisplay}{2210}
+\pdfglyphtounicode{coproducttext}{2210}
+\pdfglyphtounicode{floorleftBig}{230A}
+\pdfglyphtounicode{floorleftBigg}{230A}
+\pdfglyphtounicode{floorleftbig}{230A}
+\pdfglyphtounicode{floorleftbigg}{230A}
+\pdfglyphtounicode{floorrightBig}{230B}
+\pdfglyphtounicode{floorrightBigg}{230B}
+\pdfglyphtounicode{floorrightbig}{230B}
+\pdfglyphtounicode{floorrightbigg}{230B}
+\pdfglyphtounicode{hatwide}{02C6}
+\pdfglyphtounicode{hatwider}{02C6}
+\pdfglyphtounicode{hatwidest}{02C6}
+\pdfglyphtounicode{integraldisplay}{222B}
+\pdfglyphtounicode{integraltext}{222B}
+\pdfglyphtounicode{intersectiondisplay}{22C2}
+\pdfglyphtounicode{intersectiontext}{22C2}
+\pdfglyphtounicode{logicalanddisplay}{22C0}
+\pdfglyphtounicode{logicalandtext}{22C0}
+\pdfglyphtounicode{logicalordisplay}{22C1}
+\pdfglyphtounicode{logicalortext}{22C1}
+\pdfglyphtounicode{mapsto}{21A6}
+\pdfglyphtounicode{parenleftBig}{0028}
+\pdfglyphtounicode{parenleftBigg}{0028}
+\pdfglyphtounicode{parenleftbig}{0028}
+\pdfglyphtounicode{parenleftbigg}{0028}
+\pdfglyphtounicode{parenleftbt}{239D}
+\pdfglyphtounicode{parenleftex}{239C}
+\pdfglyphtounicode{parenlefttp}{239B}
+\pdfglyphtounicode{parenrightBig}{0029}
+\pdfglyphtounicode{parenrightBigg}{0029}
+\pdfglyphtounicode{parenrightbig}{0029}
+\pdfglyphtounicode{parenrightbigg}{0029}
+\pdfglyphtounicode{parenrightbt}{23A0}
+\pdfglyphtounicode{parenrightex}{239F}
+\pdfglyphtounicode{parenrighttp}{239E}
+\pdfglyphtounicode{productdisplay}{220F}
+\pdfglyphtounicode{producttext}{220F}
+\pdfglyphtounicode{radicalBig}{221A}
+\pdfglyphtounicode{radicalBigg}{221A}
+\pdfglyphtounicode{radicalbig}{221A}
+\pdfglyphtounicode{radicalbigg}{221A}
+\pdfglyphtounicode{radicalbt}{221A}
\pdfglyphtounicode{radicaltp}{ED6A}
\pdfglyphtounicode{radicalvertex}{ED6B}
-\pdfglyphtounicode{slashBig}{ED6C}
-\pdfglyphtounicode{slashBigg}{ED6E}
-\pdfglyphtounicode{slashbig}{ED6D}
-\pdfglyphtounicode{slashbigg}{ED6F}
-\pdfglyphtounicode{summationdisplay}{ED70}
-\pdfglyphtounicode{summationtext}{ED71}
-\pdfglyphtounicode{suppress}{EB61}
+\pdfglyphtounicode{slashBig}{002F}
+\pdfglyphtounicode{slashBigg}{002F}
+\pdfglyphtounicode{slashbig}{002F}
+\pdfglyphtounicode{slashbigg}{002F}
+\pdfglyphtounicode{summationdisplay}{2211}
+\pdfglyphtounicode{summationtext}{2211}
\pdfglyphtounicode{tie}{2040}
-\pdfglyphtounicode{tildewide}{EB68}
-\pdfglyphtounicode{tildewider}{EB69}
-\pdfglyphtounicode{tildewidest}{EB6A}
-\pdfglyphtounicode{uniondisplay}{ED72}
-\pdfglyphtounicode{unionmultidisplay}{ED73}
-\pdfglyphtounicode{unionmultitext}{ED74}
-\pdfglyphtounicode{unionsqdisplay}{ED75}
-\pdfglyphtounicode{unionsqtext}{ED76}
-\pdfglyphtounicode{uniontext}{ED77}
+\pdfglyphtounicode{tildewide}{02DC}
+\pdfglyphtounicode{tildewider}{02DC}
+\pdfglyphtounicode{tildewidest}{02DC}
+\pdfglyphtounicode{uniondisplay}{22C3}
+\pdfglyphtounicode{unionmultidisplay}{2A04}
+\pdfglyphtounicode{unionmultitext}{2A04}
+\pdfglyphtounicode{unionsqdisplay}{2A06}
+\pdfglyphtounicode{unionsqtext}{2A06}
+\pdfglyphtounicode{uniontext}{22C3}
\pdfglyphtounicode{vextenddouble}{ED79}
-\pdfglyphtounicode{vextendsingle}{ED7A}
+\pdfglyphtounicode{vextendsingle}{23D0}
+
+%% Glyphs from the cmr fonts:
+
+\pdfglyphtounicode{suppress}{EB61}
+
+%% Glyphs from the lasy fonts:
+
+%% Note: unfortunately, some other fonts, such as line and xydash,
+%% also use glyphs names a0...a127, but for different glyphs.
+\pdfglyphtounicode{a1}{25C1}
+\pdfglyphtounicode{a2}{22B4}
+\pdfglyphtounicode{a3}{25B7}
+\pdfglyphtounicode{a4}{22B5}
+\pdfglyphtounicode{a40}{02C2}
+\pdfglyphtounicode{a41}{02C3}
+\pdfglyphtounicode{a42}{2303}
+\pdfglyphtounicode{a43}{2304}
+\pdfglyphtounicode{a48}{2127}
+\pdfglyphtounicode{a49}{22C8}
+\pdfglyphtounicode{a50}{25A1}
+\pdfglyphtounicode{a51}{25C7}
+\pdfglyphtounicode{a58}{2053}
+\pdfglyphtounicode{a59}{219D}
+\pdfglyphtounicode{a60}{228F}
+\pdfglyphtounicode{a61}{2290}
+
+%% Glyphs from the xyatip and xybtip fonts fonts of the XYPic package.
+%% They denote half arrow tips pointing in various directions. We map
+%% them to Unicode arrows pointing in approximately the same
+%% direction, in increments of 45 degrees.
+
+\pdfglyphtounicode{d0}{2199}
+\pdfglyphtounicode{d1}{2199}
+\pdfglyphtounicode{d2}{2199}
+\pdfglyphtounicode{d3}{2199}
+\pdfglyphtounicode{d4}{2199}
+\pdfglyphtounicode{d5}{2199}
+\pdfglyphtounicode{d6}{2199}
+\pdfglyphtounicode{d7}{2193}
+\pdfglyphtounicode{d8}{2193}
+\pdfglyphtounicode{d9}{2193}
+\pdfglyphtounicode{d10}{2193}
+\pdfglyphtounicode{d11}{2193}
+\pdfglyphtounicode{d12}{2193}
+\pdfglyphtounicode{d13}{2193}
+\pdfglyphtounicode{d14}{2193}
+\pdfglyphtounicode{d15}{2193}
+\pdfglyphtounicode{d16}{2193}
+\pdfglyphtounicode{d17}{2193}
+\pdfglyphtounicode{d18}{2193}
+\pdfglyphtounicode{d19}{2193}
+\pdfglyphtounicode{d20}{2193}
+\pdfglyphtounicode{d21}{2193}
+\pdfglyphtounicode{d22}{2193}
+\pdfglyphtounicode{d23}{2193}
+\pdfglyphtounicode{d24}{2198}
+\pdfglyphtounicode{d25}{2198}
+\pdfglyphtounicode{d26}{2198}
+\pdfglyphtounicode{d27}{2198}
+\pdfglyphtounicode{d28}{2198}
+\pdfglyphtounicode{d29}{2198}
+\pdfglyphtounicode{d30}{2198}
+\pdfglyphtounicode{d31}{2198}
+\pdfglyphtounicode{d32}{2198}
+\pdfglyphtounicode{d33}{2198}
+\pdfglyphtounicode{d34}{2198}
+\pdfglyphtounicode{d35}{2198}
+\pdfglyphtounicode{d36}{2198}
+\pdfglyphtounicode{d37}{2198}
+\pdfglyphtounicode{d38}{2198}
+\pdfglyphtounicode{d39}{2192}
+\pdfglyphtounicode{d40}{2192}
+\pdfglyphtounicode{d41}{2192}
+\pdfglyphtounicode{d42}{2192}
+\pdfglyphtounicode{d43}{2192}
+\pdfglyphtounicode{d44}{2192}
+\pdfglyphtounicode{d45}{2192}
+\pdfglyphtounicode{d46}{2192}
+\pdfglyphtounicode{d47}{2192}
+\pdfglyphtounicode{d48}{2192}
+\pdfglyphtounicode{d49}{2192}
+\pdfglyphtounicode{d50}{2192}
+\pdfglyphtounicode{d51}{2192}
+\pdfglyphtounicode{d52}{2192}
+\pdfglyphtounicode{d53}{2192}
+\pdfglyphtounicode{d54}{2192}
+\pdfglyphtounicode{d55}{2192}
+\pdfglyphtounicode{d56}{2197}
+\pdfglyphtounicode{d57}{2197}
+\pdfglyphtounicode{d58}{2197}
+\pdfglyphtounicode{d59}{2197}
+\pdfglyphtounicode{d60}{2197}
+\pdfglyphtounicode{d61}{2197}
+\pdfglyphtounicode{d62}{2197}
+\pdfglyphtounicode{d63}{2197}
+\pdfglyphtounicode{d64}{2197}
+\pdfglyphtounicode{d65}{2197}
+\pdfglyphtounicode{d66}{2197}
+\pdfglyphtounicode{d67}{2197}
+\pdfglyphtounicode{d68}{2197}
+\pdfglyphtounicode{d69}{2197}
+\pdfglyphtounicode{d70}{2197}
+\pdfglyphtounicode{d71}{2191}
+\pdfglyphtounicode{d72}{2191}
+\pdfglyphtounicode{d73}{2191}
+\pdfglyphtounicode{d74}{2191}
+\pdfglyphtounicode{d75}{2191}
+\pdfglyphtounicode{d76}{2191}
+\pdfglyphtounicode{d77}{2191}
+\pdfglyphtounicode{d78}{2191}
+\pdfglyphtounicode{d79}{2191}
+\pdfglyphtounicode{d80}{2191}
+\pdfglyphtounicode{d81}{2191}
+\pdfglyphtounicode{d82}{2191}
+\pdfglyphtounicode{d83}{2191}
+\pdfglyphtounicode{d84}{2191}
+\pdfglyphtounicode{d85}{2191}
+\pdfglyphtounicode{d86}{2191}
+\pdfglyphtounicode{d87}{2191}
+\pdfglyphtounicode{d88}{2196}
+\pdfglyphtounicode{d89}{2196}
+\pdfglyphtounicode{d90}{2196}
+\pdfglyphtounicode{d91}{2196}
+\pdfglyphtounicode{d92}{2196}
+\pdfglyphtounicode{d93}{2196}
+\pdfglyphtounicode{d94}{2196}
+\pdfglyphtounicode{d95}{2196}
+\pdfglyphtounicode{d96}{2196}
+\pdfglyphtounicode{d97}{2196}
+\pdfglyphtounicode{d98}{2196}
+\pdfglyphtounicode{d99}{2196}
+\pdfglyphtounicode{d100}{2196}
+\pdfglyphtounicode{d101}{2196}
+\pdfglyphtounicode{d102}{2196}
+\pdfglyphtounicode{d103}{2190}
+\pdfglyphtounicode{d104}{2190}
+\pdfglyphtounicode{d105}{2190}
+\pdfglyphtounicode{d106}{2190}
+\pdfglyphtounicode{d107}{2190}
+\pdfglyphtounicode{d108}{2190}
+\pdfglyphtounicode{d109}{2190}
+\pdfglyphtounicode{d110}{2190}
+\pdfglyphtounicode{d111}{2190}
+\pdfglyphtounicode{d112}{2190}
+\pdfglyphtounicode{d113}{2190}
+\pdfglyphtounicode{d114}{2190}
+\pdfglyphtounicode{d115}{2190}
+\pdfglyphtounicode{d116}{2190}
+\pdfglyphtounicode{d117}{2190}
+\pdfglyphtounicode{d118}{2190}
+\pdfglyphtounicode{d119}{2190}
+\pdfglyphtounicode{d120}{2199}
+\pdfglyphtounicode{d121}{2199}
+\pdfglyphtounicode{d122}{2199}
+\pdfglyphtounicode{d123}{2199}
+\pdfglyphtounicode{d124}{2199}
+\pdfglyphtounicode{d125}{2199}
+\pdfglyphtounicode{d126}{2199}
+\pdfglyphtounicode{d127}{2199}
\endinput
+% Reference:
+%
+% http://codepoints.net/basic_latin
+% 0028 0029 002F 005B 005C 005D 007B 007D
+%
+% http://codepoints.net/spacing_modifier_letters
+% 02C2 02C3 02C6 02DC
+%
+% http://codepoints.net/general_punctuation
+% 2040 2053
+%
+% http://codepoints.net/letterlike_symbols
+% 2127
+%
+% http://codepoints.net/arrows
+% 2190 2191 2192 2193 2196 2197 2198 2199 219D 21A6 21A9 21AA 21D1 21D3
+%
+% http://codepoints.net/mathematical_operators
+% 220F 2210 2211 221A 222B 222E 228F 2290 22B4 22B5 22C0 22C1 22C2 22C3
+% 22C8
+%
+% http://codepoints.net/miscellaneous_technical
+% 2303 2304 2308 2309 230A 230B 239B 239C 239D 239E 239F 23A0 23A1 23A2
+% 23A3 23A4 23A5 23A6 23A7 23A8 23A9 23AA 23AB 23AC 23AD 23D0
+%
+% http://codepoints.net/geometric_shapes
+% 25A1 25B7 25C1 25C7
+%
+% http://codepoints.net/miscellaneous_mathematical_symbols-a
+% 27E8 27E9
+%
+% http://codepoints.net/supplemental_mathematical_operators
+% 2A00 2A01 2A02 2A04 2A06
+%
+% Private Use Area:
+% EB61 ED12 ED17 ED18 ED19 ED1A ED6A ED6B ED79
+
%
%
% End of file 'glyphtounicode-cmr.tex
-% \ No newline at end of file
+%
diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfa-1b.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfa-1b.xmp
deleted file mode 100644
index c30e022f766..00000000000
--- a/Master/texmf-dist/tex/latex/pdfx/pdfa-1b.xmp
+++ /dev/null
@@ -1,68 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% 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/pdfa.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfa.xmp
new file mode 100644
index 00000000000..2f4b59e0cdb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pdfx/pdfa.xmp
@@ -0,0 +1,316 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% File: pdfa.xmp
+%%
+%% Copyright (c) 2015, CV Radhakrishnan <cvr@river-valley.org>,
+%% Han The Thanh <thanh@river-valley.org>,
+%% Ross Moore <ross.moore@mq.edu.au>,
+%% Peter Selinger <selinger@mathstat.dal.ca>
+%%
+%% 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:pdf = "http://ns.adobe.com/pdf/1.3/"
+% xmlns:pdfx = "http://ns.adobe.com/pdfx/1.3/"
+% xmlns:pdfaid = "http://www.aiim.org/pdfa/ns/id/"
+% xmlns:xmp = "http://ns.adobe.com/xap/1.0/"
+% xmlns:xmpRights = "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:pdfaExtension = "http://www.aiim.org/pdfa/ns/extension/"
+% xmlns:pdfaField = "http://www.aiim.org/pdfa/ns/field#"
+% xmlns:pdfaProperty = "http://www.aiim.org/pdfa/ns/property#"
+% xmlns:pdfaSchema = "http://www.aiim.org/pdfa/ns/schema#"
+% xmlns:pdfaType = "http://www.aiim.org/pdfa/ns/type#"
+% xmlns:prism = "http://prismstandard.org/namespaces/basic/2.2/"
+%% RRM: Other possible namespaces.
+%% If these are used, then appropriate tags need to be declared, using
+%% pdfaExtension:schemas similarly to below for prism:
+% xmlns:pim = "http://prismstandard.org/namespaces/pim/2.2/"
+% xmlns:prl = "http://prismstandard.org/namespaces/prl/2.1/"
+% xmlns:pur = "http://prismstandard.org/namespaces/primusagerights/2.1/"
+ <rdf:Description rdf:about="" xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/"
+ xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#"
+ xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#">
+ <pdfaExtension:schemas>
+ <rdf:Bag>
+%% RRM: this declares the namespace resource for PRISM metadata
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:schema>PRISM metadata</pdfaSchema:schema>
+ <pdfaSchema:namespaceURI>http://prismstandard.org/namespaces/basic/2.2/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>prism</pdfaSchema:prefix>
+ <pdfaSchema:property>
+ <rdf:Seq>
+%% RRM: Only need to define the tags that are actually used below.
+%% declare prism:aggregationType
+% need at least one field, for validation
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>aggregationType</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>
+ The type of publication. If defined, must be one
+ of book, catalog, feed, journal, magazine, manual,
+ newsletter, pamphlet.
+ </pdfaProperty:description>
+ </rdf:li>
+%% declare prism:issn
+\ifnot@empty\xmp@Journalnumber{%
+ <rdf:li rdf:parseType="Resource">^^J%
+ <pdfaProperty:name>issn</pdfaProperty:name>^^J%
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J%
+ <pdfaProperty:category>external</pdfaProperty:category>^^J%
+ <pdfaProperty:description>^^J%
+ The ISSN for the publication in which the resource^^J%
+ was published^^J%
+ </pdfaProperty:description>^^J%
+ </rdf:li>
+}%
+%% declare prism:volume
+\ifnot@empty\xmp@Volume{%
+ <rdf:li rdf:parseType="Resource">^^J%
+ <pdfaProperty:name>volume</pdfaProperty:name>^^J%
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J%
+ <pdfaProperty:category>external</pdfaProperty:category>^^J%
+ <pdfaProperty:description>^^J%
+ Additional identifier for the publication where^^J%
+ the resource appeared, providing the Volume^^J%
+ portion of the common Volume, Number^^J%
+ scheme^^J%
+ </pdfaProperty:description>^^J%
+ </rdf:li>
+}%
+%% declare prism:number
+\ifnot@empty\xmp@Issue{%
+ <rdf:li rdf:parseType="Resource">^^J%
+ <pdfaProperty:name>number</pdfaProperty:name>^^J%
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J%
+ <pdfaProperty:category>external</pdfaProperty:category>^^J%
+ <pdfaProperty:description>^^J%
+ Number of the Issue within the Volume^^J%
+ </pdfaProperty:description>^^J%
+ </rdf:li>
+}%
+%% declare prism:coverDisplayDate
+\ifnot@empty\xmp@CoverDisplayDate{%
+ <rdf:li rdf:parseType="Resource">^^J%
+ <pdfaProperty:name>coverDisplayDate</pdfaProperty:name>^^J%
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J%
+ <pdfaProperty:category>external</pdfaProperty:category>^^J%
+ <pdfaProperty:description>^^J%
+ Date on the cover of a magazine issue, as a^^J%
+ human-readable text^^J%
+ string^^J%
+ </pdfaProperty:description>^^J%
+ </rdf:li>
+}%
+%% declare prism:coverDate
+\ifnot@empty\xmp@CoverDate{%
+ <rdf:li rdf:parseType="Resource">^^J%
+ <pdfaProperty:name>coverDate</pdfaProperty:name>^^J%
+ <pdfaProperty:valueType>Date</pdfaProperty:valueType>^^J%
+ <pdfaProperty:category>external</pdfaProperty:category>^^J%
+ <pdfaProperty:description>^^J%
+ Date on the cover of a magazine issue, suitable^^J%
+ for storing in a database field with a 'date' data^^J%
+ type^^J%
+ </pdfaProperty:description>^^J%
+ </rdf:li>
+}%
+%% declare prism:issueName
+\ifnot@empty\xmp@Journaltitle{%
+ <rdf:li rdf:parseType="Resource">^^J%
+ <pdfaProperty:name>issueName</pdfaProperty:name>^^J%
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J%
+ <pdfaProperty:category>external</pdfaProperty:category>^^J%
+ <pdfaProperty:description>^^J%
+ Additional identifier, typically used for major^^J%
+ issues of a magazine or other^^J%
+ resource^^J%
+ </pdfaProperty:description>^^J%
+ </rdf:li>
+}%
+%% declare prism:pageRange
+\ifnot@empty\xmp@Firstpage{%
+ <rdf:li rdf:parseType="Resource">^^J%
+ <pdfaProperty:name>pageRange</pdfaProperty:name>^^J%
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J%
+ <pdfaProperty:category>external</pdfaProperty:category>^^J%
+ <pdfaProperty:description>^^J%
+ Page range for the published print version of the^^J%
+ resource^^J%
+ </pdfaProperty:description>^^J%
+ </rdf:li>
+}%
+%% declare prism:startingPage
+\ifnot@empty\xmp@Firstpage{%
+ <rdf:li rdf:parseType="Resource">^^J%
+ <pdfaProperty:name>startingPage</pdfaProperty:name>^^J%
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>^^J%
+ <pdfaProperty:category>external</pdfaProperty:category>^^J%
+ <pdfaProperty:description>^^J%
+ First page number for the published version of the^^J%
+ resource^^J%
+ </pdfaProperty:description>^^J%
+ </rdf:li>
+}%
+%% declare prism:endingPage
+\ifnot@empty\xmp@Lastpage{%
+ <rdf:li rdf:parseType="Resource">^^J%
+ <pdfaProperty:name>endingPage</pdfaProperty:name>^^J%
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>^^J%
+ <pdfaProperty:category>external</pdfaProperty:category>^^J%
+ <pdfaProperty:description>^^J%
+ The last page number for the printed resource^^J%
+ </pdfaProperty:description>^^J%
+ </rdf:li>
+}%
+%% declare prism:doi
+\ifnot@empty\xmp@Doi{%
+ <rdf:li rdf:parseType="Resource">^^J%
+ <pdfaProperty:name>doi</pdfaProperty:name>^^J%
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J%
+ <pdfaProperty:category>external</pdfaProperty:category>^^J%
+ <pdfaProperty:description>^^J%
+ Digital Object Identifier, DOI, for the article^^J%
+ </pdfaProperty:description>^^J%
+ </rdf:li>
+}%
+%% declare prism:url
+\ifnot@empty\xmp@Doi{%
+ <rdf:li rdf:parseType="Resource">^^J%
+ <pdfaProperty:name>url</pdfaProperty:name>^^J%
+ <pdfaProperty:valueType>URL</pdfaProperty:valueType>^^J%
+ <pdfaProperty:category>external</pdfaProperty:category>^^J%
+ <pdfaProperty:description>^^J%
+ URL for the article or unit of content^^J%
+ </pdfaProperty:description>^^J%
+ </rdf:li>
+}%
+%% RRM: more tags can be declared
+% <rdf:li rdf:parseType="Resource">
+% <pdfaProperty:name></pdfaProperty:name>
+% <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+% <pdfaProperty:category>external</pdfaProperty:category>
+% <pdfaProperty:description>
+% </pdfaProperty:description>
+% </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+ </rdf:Bag>
+ </pdfaExtension:schemas>
+ </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
+ <pdf:Producer>\xmp@Producer</pdf:Producer>
+\ifnot@empty\xmp@@Keywords{%
+ <pdf:Keywords>\xmp@@Keywords</pdf:Keywords>
+}%
+ </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <dc:format>application/pdf</dc:format>
+\ifnot@empty\xmp@Title{%
+ <dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title>
+}%
+\ifnot@empty\xmp@@Author{%
+ <dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>
+}%
+\ifnot@empty\xmp@Publisher{%
+ <dc:publisher><rdf:Bag><rdf:li>\xmp@Publisher</rdf:li></rdf:Bag></dc:publisher>
+}%
+\ifnot@empty\xmp@Doi{%
+ <dc:identifier>doi:\xmp@Doi</dc:identifier>
+}%
+\ifnot@empty\xmp@Copyright{%
+ <dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></dc:rights>
+}%
+\ifnot@empty\xmp@Subject{%
+ <dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description>
+}%
+\ifnot@empty\xmp@Keywords{%
+ <dc:subject><rdf:Bag><rdf:li>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>
+}%
+ </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/">
+\ifnot@empty\xmp@PublicationType{%
+ <prism:aggregationType>\xmp@PublicationType</prism:aggregationType>
+}%
+\ifnot@empty\xmp@Journalnumber{%
+ <prism:issn>\xmp@Journalnumber</prism:issn>
+}%
+\ifnot@empty\xmp@Volume{%
+ <prism:volume>\xmp@Volume</prism:volume>
+}%
+\ifnot@empty\xmp@Issue{%
+ <prism:number>\xmp@Issue</prism:number>
+}%
+\ifnot@empty\xmp@CoverDisplayDate{%
+ <prism:coverDisplayDate>\xmp@CoverDisplayDate</prism:coverDisplayDate>
+}%
+\ifnot@empty\xmp@CoverDate{%
+ <prism:coverDate>\xmp@CoverDate</prism:coverDate>
+}%
+\ifnot@empty\xmp@Journaltitle{%
+ <prism:issueName>\xmp@Journaltitle</prism:issueName>
+}%
+\ifnot@empty\xmp@Firstpage{%
+ <prism:pageRange>\xmp@Firstpage-\xmp@Lastpage</prism:pageRange>
+}%
+\ifnot@empty\xmp@Firstpage{%
+ <prism:startingPage>\xmp@Firstpage</prism:startingPage>
+}%
+\ifnot@empty\xmp@Lastpage{%
+ <prism:endingPage>\xmp@Lastpage</prism:endingPage>
+}%
+\ifnot@empty\xmp@Doi{%
+ <prism:doi>\xmp@Doi</prism:doi>
+}%
+\ifnot@empty\xmp@Doi{%
+ <prism:url>http://dx.doi.org/\xmp@Doi</prism:url>
+}%
+ </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/">
+ <pdfaid:part>\xmp@Part</pdfaid:part>
+ <pdfaid:conformance>\xmp@Conformance</pdfaid:conformance>
+ </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">
+ <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool>
+ <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate>
+ <xmp:CreateDate>\xmp@convDate</xmp:CreateDate>
+ <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate>
+ </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/">
+\ifnot@empty\xmp@Copyrighted{%
+ <xmpRights:Marked>\xmp@Copyrighted</xmpRights:Marked>
+}%
+\ifnot@empty\xmp@Copyright{%
+ <xmpRights:UsageTerms><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></xmpRights:UsageTerms>
+}%
+\ifnot@empty\xmp@CopyrightURL{%
+ <xmpRights:WebStatement>\xmp@CopyrightURL</xmpRights:WebStatement>
+}%
+ </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
+ <xmpMM:DocumentID>uuid:\xmp@docid</xmpMM:DocumentID>
+ <xmpMM:InstanceID>uuid:\xmp@instid</xmpMM:InstanceID>
+ </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+% padding with 512 space characters to allow easier editing within a PDF
+\padding@line
+\padding@line
+\padding@line
+\padding@line
+%%
+%% End of pdfa.xmp
+%%
+%%
diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfe.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfe.xmp
new file mode 100644
index 00000000000..252c1dd22bd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pdfx/pdfe.xmp
@@ -0,0 +1,369 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% File: pdfx.xmp
+%%
+%% Copyright (c) 2015, CV Radhakrishnan <cvr@river-valley.org>,
+%% Han The Thanh <thanh@river-valley.org>,
+%% Ross Moore <ross.moore@mq.edu.au>,
+%% Peter Selinger <selinger@mathstat.dal.ca>
+%%
+%% 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#">
+ <rdf:Description rdf:about=""
+ xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+ xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
+ xmlns:pdfe="http://www.aiim.org/pdfe/ns/id/"
+ xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/"
+ >
+% xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/">
+%% xmlns:pdf = "http://ns.adobe.com/pdf/1.3/"
+%% xmlns:pdfx = "http://ns.adobe.com/pdfx/1.3/"
+%% xmlns:pdfxid = "http://www.npes.org/pdfx/ns/id/"
+%% xmlns:xmp = "http://ns.adobe.com/xap/1.0/"
+%% xmlns:xmpRights = "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:pdfaExtension = "http://www.aiim.org/pdfa/ns/extension/"
+%% xmlns:pdfaField = "http://www.aiim.org/pdfa/ns/field#"
+%% xmlns:pdfaProperty = "http://www.aiim.org/pdfa/ns/property#"
+%% xmlns:pdfaSchema = "http://www.aiim.org/pdfa/ns/schema#"
+%% xmlns:pdfaType = "http://www.aiim.org/pdfa/ns/type#"
+%% xmlns:prism = "http://prismstandard.org/namespaces/basic/2.2/"
+%%% RRM: Other possible namespaces.
+%%% If these are used, then appropriate tags need to be declared, using
+%%% pdfaExtension:schemas similarly to below for prism:
+%% xmlns:pim = "http://prismstandard.org/namespaces/pim/2.2/"
+%% xmlns:prl = "http://prismstandard.org/namespaces/prl/2.1/"
+%% xmlns:pur = "http://prismstandard.org/namespaces/primusagerights/2.1/"
+%% >
+% <rdf:Description rdf:about="" xmlns:pdf="http://www.adobe.com/pdf/1.3/">
+ <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool>
+ <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate>
+ <xmp:CreateDate>\xmp@convDate</xmp:CreateDate>
+ <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate>
+ \ifnot@empty\xmp@@Keywords{<pdf:Keywords>\xmp@@Keywords</pdf:Keywords>}
+ <pdf:Producer>\xmp@Producer</pdf:Producer>
+ <pdf:Trapped>False</pdf:Trapped>
+ <pdfe:ISO_PDFEVersion>PDF/E-\xmp@Part</pdfe:ISO_PDFEVersion>
+%\ifnum\xmp@Part<4 <pdf:Version>PDF/X-\xmp@Part</pdf:Version>\fi
+% \ifnum\xmp@Part>3 <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part</pdfxid:GTS_PDFXVersion>\fi
+% <pdfx:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance\ifnum\xmp@Part<4:\xmp@ReleaseDate\fi</pdfx:GTS_PDFXVersion>
+% \ifnum\xmp@Part<3 <pdfx:GTS_PDFXConformance>PDF/X-\xmp@Part\xmp@Conformance:\xmp@ReleaseDate</pdfx:GTS_PDFXConformance>\fi
+ \ifnot@empty\xmp@AuthoritativeDomain{<pdfx:AuthoritativeDomain>\xmp@AuthoritativeDomain</pdfx:AuthoritativeDomain>}
+ </rdf:Description>
+% <rdf:Description rdf:about="" xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/">
+% \ifnum\xmp@Part>3 <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part</pdfxid:GTS_PDFXVersion>\fi
+% </rdf:Description>
+% <rdf:Description rdf:about="" xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/">
+% \ifnum\xmp@Part> 3<pdfaid:part>\xmp@Part</pdfaid:part>
+% <pdfaid:conformance>\xmp@Conformance</pdfaid:conformance>\fi
+% </rdf:Description>
+% <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">
+% <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool>
+% <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate>
+% <xmp:CreateDate>\xmp@convDate</xmp:CreateDate>
+% <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate>
+% </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/">
+ \ifnot@empty\xmp@Copyright{<xmpRights:Marked>True</xmpRights:Marked>
+ <xmpRights:UsageTerms>
+ <rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li>
+ </rdf:Alt>
+ </xmpRights:UsageTerms>}
+ \ifnot@empty\xmp@CopyrightURL{<xmpRights:WebStatement>\xmp@CopyrightURL</xmpRights:WebStatement>}
+%}
+ </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <dc:format>application/pdf</dc:format>
+ \ifnot@empty\xmp@Title{<dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title>}
+ \ifnot@empty\xmp@@Author{<dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>}
+ \ifnot@empty\xmp@Publisher{<dc:publisher><rdf:Bag><rdf:li>\xmp@Publisher</rdf:li></rdf:Bag></dc:publisher>}
+ \ifnot@empty\xmp@Doi{<dc:identifier>doi:\xmp@Doi</dc:identifier>}
+ \ifnot@empty\xmp@Copyright{<dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></dc:rights>}
+ \ifnot@empty\xmp@Subject{<dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description>}
+ \ifnot@empty\xmp@Keywords{<dc:subject><rdf:Bag><rdf:li>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>}
+ </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/"
+ xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#"
+ xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#"
+%% RRM: do we really need the following two declarations ?
+% xmlns:pdfaType="http://www.aiim.org/pdfa/ns/type#"
+% xmlns:pdfaField="http://www.aiim.org/pdfa/ns/field#"
+ >
+ <pdfaExtension:schemas>
+ <rdf:Bag>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://ns.adobe.com/pdf/1.3/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>pdf</pdfaSchema:prefix>
+ <pdfaSchema:schema>Adobe PDF Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>A name object indicating whether the document has been modified to include trapping information</pdfaProperty:description>
+ <pdfaProperty:name>Trapped</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://www.aiim.org/pdfe/ns/id/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>pdfeid</pdfaSchema:prefix>
+ <pdfaSchema:schema>PDF/E ID Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>ID of PDF/E standard</pdfaProperty:description>
+ <pdfaProperty:name>ISO_PDFEVersion</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://ns.adobe.com/pdfx/1.3/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>pdfx</pdfaSchema:prefix>
+ <pdfaSchema:schema>PDF/X Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description>
+ <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Conformance level of PDF/X standard</pdfaProperty:description>
+ <pdfaProperty:name>GTS_PDFXConformance</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>URL to an online version or preprint</pdfaProperty:description>
+ <pdfaProperty:name>AuthoritativeDomain</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Company creating the PDF</pdfaProperty:description>
+ <pdfaProperty:name>Company</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Date when document was last modified</pdfaProperty:description>
+ <pdfaProperty:name>SourceModified</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://ns.adobe.com/xap/1.0/mm/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>xmpMM</pdfaSchema:prefix>
+ <pdfaSchema:schema>XMP Media Management Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>UUID based identifier for specific incarnation of a document</pdfaProperty:description>
+ <pdfaProperty:name>InstanceID</pdfaProperty:name>
+ <pdfaProperty:valueType>URI</pdfaProperty:valueType>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>The common identifier for all versions and renditions of a document.</pdfaProperty:description>
+ <pdfaProperty:name>OriginalDocumentID</pdfaProperty:name>
+ <pdfaProperty:valueType>URI</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://www.npes.org/pdfx/ns/id/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>pdfxid</pdfaSchema:prefix>
+ <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description>
+ <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+%% RRM: this declares the namespace resource for PRISM metadata
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:schema>PRISM metadata</pdfaSchema:schema>
+ <pdfaSchema:namespaceURI>http://prismstandard.org/namespaces/basic/2.2/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>prism</pdfaSchema:prefix>
+ <pdfaSchema:property>
+ <rdf:Seq>
+%% RRM: Only need to define the tags that are actually used below.
+%% declare prism:aggregationType
+ \ifnot@empty\xmp@PublicationType{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>aggregationType</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>The type of publication. If defined, must be one of book, catalog, feed, journal, magazine, manual, newsletter, pamphlet.</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:issn
+ \ifnot@empty\xmp@Journalnumber{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>issn</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>The ISSN for the publication in which the resource was published</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:volume
+ \ifnot@empty\xmp@Volume{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>volume</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Additional identifier for the publication where the resource appeared, providing the Volume portion of the common Volume, Number scheme</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:number
+ \ifnot@empty\xmp@Issue{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>number</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Number of the Issue within the Volume</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:coverDisplayDate
+ \ifnot@empty\xmp@CoverDisplayDate{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>coverDisplayDate</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Date on the cover of a magazine issue, as a human-readable text string</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:coverDate
+ \ifnot@empty\xmp@CoverDate{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>coverDate</pdfaProperty:name>
+ <pdfaProperty:valueType>Date</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Date on the cover of a magazine issue, suitable for storing in a database field with a 'date' data type</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:issueName
+ \ifnot@empty\xmp@Journaltitle{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>issueName</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Additional identifier, typically used for major issues of a magazine or other resource</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:pageRange
+ \ifnot@empty\xmp@Firstpage{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>pageRange</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Page range for the published print version of the resource</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:startingPage
+ \ifnot@empty\xmp@Firstpage{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>startingPage</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>First page number for the published version of the resource</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:endingPage
+ \ifnot@empty\xmp@Lastpage{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>endingPage</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>The last page number for the printed resource</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:doi
+ \ifnot@empty\xmp@Doi{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>doi</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Digital Object Identifier, DOI, for the article</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:url
+ \ifnot@empty\xmp@Doi{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>url</pdfaProperty:name>
+ <pdfaProperty:valueType>URL</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>URL for the article or unit of content</pdfaProperty:description>
+ </rdf:li>}
+%% RRM: more tags can be declared
+% <rdf:li rdf:parseType="Resource">
+% <pdfaProperty:name></pdfaProperty:name>
+% <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+% <pdfaProperty:category>external</pdfaProperty:category>
+% <pdfaProperty:description></pdfaProperty:description>
+% </rdf:li>
+ </rdf:Seq></pdfaSchema:property>
+ </rdf:li>
+ </rdf:Bag>
+ </pdfaExtension:schemas>
+ </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/">
+ \ifnot@empty\xmp@PublicationType{<prism:aggregationType>\xmp@PublicationType</prism:aggregationType>}
+ \ifnot@empty\xmp@Journalnumber{<prism:issn>\xmp@Journalnumber</prism:issn>}
+ \ifnot@empty\xmp@Volume{<prism:volume>\xmp@Volume</prism:volume>}
+ \ifnot@empty\xmp@Issue{<prism:number>\xmp@Issue</prism:number>}
+ \ifnot@empty\xmp@CoverDisplayDate{<prism:coverDisplayDate>\xmp@CoverDisplayDate</prism:coverDisplayDate>}
+ \ifnot@empty\xmp@CoverDate{<prism:coverDate>\xmp@CoverDate</prism:coverDate>}
+ \ifnot@empty\xmp@Journaltitle{<prism:issueName>\xmp@Journaltitle</prism:issueName>}
+ \ifnot@empty\xmp@Firstpage{<prism:pageRange>\xmp@Firstpage-\xmp@Lastpage</prism:pageRange>}
+ \ifnot@empty\xmp@Firstpage{<prism:startingPage>\xmp@Firstpage</prism:startingPage>}
+ \ifnot@empty\xmp@Lastpage{<prism:endingPage>\xmp@Lastpage</prism:endingPage>}
+ \ifnot@empty\xmp@Doi{<prism:doi>\xmp@Doi</prism:doi>}
+ \ifnot@empty\xmp@Doi{<prism:url>http://dx.doi.org/\xmp@Doi</prism:url>}
+ </rdf:Description>
+% <rdf:Description rdf:about=""
+% xmlns:dc="http://purl.org/dc/elements/1.1/">
+% <dc:format>application/pdf</dc:format>
+% <dc:title>
+% <rdf:Alt>
+% <rdf:li xml:lang="x-default">\xmp@Title</rdf:li>
+% </rdf:Alt>
+% </dc:title>
+% <dc:description>
+% <rdf:Alt>
+% <rdf:li xml:lang="x-default">\xmp@Subject</rdf:li>
+% </rdf:Alt>
+% </dc:description>
+% <dc:creator>
+% <rdf:Bag>
+% <rdf:li>\xmp@@Author</rdf:li>
+% </rdf:Bag>
+% </dc:creator>
+% <dc:subject>
+% <rdf:Bag>
+% <rdf:li>\xmp@Keywords</rdf:li>
+% </rdf:Bag>
+% </dc:subject>
+% </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
+ <xmpMM:DocumentID>uuid:\xmp@docid</xmpMM:DocumentID>
+ <xmpMM:InstanceID>uuid:\xmp@instid</xmpMM:InstanceID>
+ </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+% padding with 512 space characters to allow easier editing within a PDF
+\padding@line
+\padding@line
+\padding@line
+\padding@line
+%%
+%% End of pdfx.xmp
+%%
+%%
+
+
diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfvt.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfvt.xmp
new file mode 100644
index 00000000000..da86e6fc2f9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pdfx/pdfvt.xmp
@@ -0,0 +1,366 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% File: pdfx.xmp
+%%
+%% Copyright (c) 2015, CV Radhakrishnan <cvr@river-valley.org>,
+%% Han The Thanh <thanh@river-valley.org>,
+%% Ross Moore <ross.moore@mq.edu.au>,
+%% Peter Selinger <selinger@mathstat.dal.ca>
+%%
+%% 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 5.6-c014 81.156655, 2014/07/22-00:39:16 ">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <rdf:Description rdf:about=""
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+ xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+ xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
+ xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/"
+ xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/"
+ xmlns:pdfvtid="http://www.npes.org/pdfvt/ns/id/"
+ xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/"
+ xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#"
+ xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#"
+ >
+%% xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/"
+%% xmlns:dcterms = "http://purl.org/dc/terms/"
+%% xmlns:pdfaField = "http://www.aiim.org/pdfa/ns/field#"
+%% xmlns:pdfaType = "http://www.aiim.org/pdfa/ns/type#"
+%% xmlns:prism = "http://prismstandard.org/namespaces/basic/2.2/"
+%%% RRM: Other possible namespaces.
+%%% If these are used, then appropriate tags need to be declared, using
+%%% pdfaExtension:schemas similarly to below for prism:
+%% xmlns:pim = "http://prismstandard.org/namespaces/pim/2.2/"
+%% xmlns:prl = "http://prismstandard.org/namespaces/prl/2.1/"
+%% xmlns:pur = "http://prismstandard.org/namespaces/primusagerights/2.1/"
+%% >
+% <rdf:Description rdf:about="" xmlns:pdf="http://www.adobe.com/pdf/1.3/">
+ <dc:format>application/pdf</dc:format>
+ <dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></dc:rights>
+ \ifnot@empty\xmp@@Author{<dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>}
+ \ifnot@empty\xmp@Subject{<dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description>}
+ \ifnot@empty\xmp@Title{<dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title>}
+ <xmp:CreateDate>\xmp@convDate</xmp:CreateDate>
+ <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool>
+ <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate>
+ <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate>
+ <xmpMM:VersionID>1</xmpMM:VersionID>
+ <xmpMM:DocumentID>uuid:\xmp@docid</xmpMM:DocumentID>
+ <xmpMM:InstanceID>uuid:\xmp@instid</xmpMM:InstanceID>
+ <xmpMM:RenditionClass>default</xmpMM:RenditionClass>
+ <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance</pdfxid:GTS_PDFXVersion>
+ <pdfvtid:GTS_PDFVTVersion>PDF/VT-\xmp@vtPart\xmp@vtConformance</pdfvtid:GTS_PDFVTVersion>
+ <pdfvtid:GTS_PDFVTModDate>\xmp@convDate</pdfvtid:GTS_PDFVTModDate>
+ \ifnot@empty\xmp@AuthoritativeDomain{ <pdfx:AuthoritativeDomain>
+ <rdf:Bag>
+ <rdf:li>\xmp@AuthoritativeDomain</rdf:li>
+ </rdf:Bag>
+ </pdfx:AuthoritativeDomain>}
+ \ifnot@empty\xmp@@Keywords{<pdf:Keywords>\xmp@@Keywords</pdf:Keywords>}
+ <pdf:Producer>\xmp@Producer</pdf:Producer>
+ <pdf:Trapped>False</pdf:Trapped>
+% <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance</pdfxid:GTS_PDFXVersion>
+ <pdfaExtension:schemas>
+ <rdf:Bag>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://ns.adobe.com/pdf/1.3/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>pdf</pdfaSchema:prefix>
+ <pdfaSchema:schema>Adobe PDF Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>A name object indicating whether the document has been modified to include trapping information</pdfaProperty:description>
+ <pdfaProperty:name>Trapped</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://ns.adobe.com/pdfx/1.3/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>pdfx</pdfaSchema:prefix>
+ <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+% <rdf:li rdf:parseType="Resource">
+% <pdfaProperty:category>internal</pdfaProperty:category>
+% <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description>
+% <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name>
+% <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+% </rdf:li>
+% <rdf:li rdf:parseType="Resource">
+% <pdfaProperty:category>internal</pdfaProperty:category>
+% <pdfaProperty:description>Conformance level of PDF/X standard</pdfaProperty:description>
+% <pdfaProperty:name>GTS_PDFXConformance</pdfaProperty:name>
+% <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+% </rdf:li>
+% <rdf:li rdf:parseType="Resource">
+% <pdfaProperty:category>internal</pdfaProperty:category>
+% <pdfaProperty:description>Company creating the PDF</pdfaProperty:description>
+% <pdfaProperty:name>Company</pdfaProperty:name>
+% <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+% </rdf:li>
+% <rdf:li rdf:parseType="Resource">
+% <pdfaProperty:category>internal</pdfaProperty:category>
+% <pdfaProperty:description>Date when document was last modified</pdfaProperty:description>
+% <pdfaProperty:name>SourceModified</pdfaProperty:name>
+% <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+% </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>URI to author's online version of the document</pdfaProperty:description>
+ <pdfaProperty:name>AuthoritativeDomain</pdfaProperty:name>
+ <pdfaProperty:valueType>URI</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+% <rdf:li rdf:parseType="Resource">
+% <pdfaSchema:namespaceURI>http://ns.adobe.com/xap/1.0/mm/</pdfaSchema:namespaceURI>
+% <pdfaSchema:prefix>xmpMM</pdfaSchema:prefix>
+% <pdfaSchema:schema>XMP Media Management Schema</pdfaSchema:schema>
+% <pdfaSchema:property>
+% <rdf:Seq>
+% <rdf:li rdf:parseType="Resource">
+% <pdfaProperty:category>internal</pdfaProperty:category>
+% <pdfaProperty:description>UUID based identifier for specific incarnation of a document</pdfaProperty:description>
+% <pdfaProperty:name>InstanceID</pdfaProperty:name>
+% <pdfaProperty:valueType>URI</pdfaProperty:valueType>
+% </rdf:li>
+% <rdf:li rdf:parseType="Resource">
+% <pdfaProperty:category>internal</pdfaProperty:category>
+% <pdfaProperty:description>The common identifier for all versions and renditions of a document.</pdfaProperty:description>
+% <pdfaProperty:name>OriginalDocumentID</pdfaProperty:name>
+% <pdfaProperty:valueType>URI</pdfaProperty:valueType>
+% </rdf:li>
+% </rdf:Seq>
+% </pdfaSchema:property>
+% </rdf:li>
+% <rdf:li rdf:parseType="Resource">
+% <pdfaSchema:namespaceURI>http://www.npes.org/pdfx/ns/id/</pdfaSchema:namespaceURI>
+% <pdfaSchema:prefix>pdfxid</pdfaSchema:prefix>
+% <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema>
+% <pdfaSchema:property>
+% <rdf:Seq>
+% <rdf:li rdf:parseType="Resource">
+% <pdfaProperty:category>internal</pdfaProperty:category>
+% <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description>
+% <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name>
+% <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+% </rdf:li>
+% </rdf:Seq>
+% </pdfaSchema:property>
+% </rdf:li>
+%% RRM: this declares the namespace resource for PRISM metadata
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:schema>PRISM metadata</pdfaSchema:schema>
+ <pdfaSchema:namespaceURI>http://prismstandard.org/namespaces/basic/2.2/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>prism</pdfaSchema:prefix>
+ <pdfaSchema:property>
+ <rdf:Seq>
+%% RRM: Only need to define the tags that are actually used below.
+%% declare prism:aggregationType
+ \ifnot@empty\xmp@PublicationType{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>aggregationType</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>The type of publication. If defined, must be one of book, catalog, feed, journal, magazine, manual, newsletter, pamphlet.</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:issn
+ \ifnot@empty\xmp@Journalnumber{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>issn</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>The ISSN for the publication in which the resource was published</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:volume
+ \ifnot@empty\xmp@Volume{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>volume</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Additional identifier for the publication where the resource appeared, providing the Volume portion of the common Volume, Number scheme</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:number
+ \ifnot@empty\xmp@Issue{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>number</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Number of the Issue within the Volume</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:coverDisplayDate
+ \ifnot@empty\xmp@CoverDisplayDate{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>coverDisplayDate</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Date on the cover of a magazine issue, as a human-readable text string</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:coverDate
+ \ifnot@empty\xmp@CoverDate{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>coverDate</pdfaProperty:name>
+ <pdfaProperty:valueType>Date</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Date on the cover of a magazine issue, suitable for storing in a database field with a 'date' data type</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:issueName
+ \ifnot@empty\xmp@Journaltitle{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>issueName</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Additional identifier, typically used for major issues of a magazine or other resource</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:pageRange
+ \ifnot@empty\xmp@Firstpage{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>pageRange</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Page range for the published print version of the resource</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:startingPage
+ \ifnot@empty\xmp@Firstpage{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>startingPage</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>First page number for the published version of the resource</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:endingPage
+ \ifnot@empty\xmp@Lastpage{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>endingPage</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>The last page number for the printed resource</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:doi
+ \ifnot@empty\xmp@Doi{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>doi</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Digital Object Identifier, DOI, for the article</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:url
+ \ifnot@empty\xmp@Doi{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>url</pdfaProperty:name>
+ <pdfaProperty:valueType>URL</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>URL for the article or unit of content</pdfaProperty:description>
+ </rdf:li>}
+%% RRM: more tags can be declared
+% <rdf:li rdf:parseType="Resource">
+% <pdfaProperty:name></pdfaProperty:name>
+% <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+% <pdfaProperty:category>external</pdfaProperty:category>
+% <pdfaProperty:description></pdfaProperty:description>
+% </rdf:li>
+ </rdf:Seq></pdfaSchema:property>
+ </rdf:li>
+ </rdf:Bag>
+ </pdfaExtension:schemas>
+% \ifnot@empty\xmp@AuthoritativeDomain{<pdfx:AuthoritativeDomain>
+% <rdf:Bag>
+% <rdf:li>\xmp@AuthoritativeDomain</rdf:li>
+% </rdf:Bag>
+% </pdfx:AuthoritativeDomain>}
+ </rdf:Description>
+% <rdf:Description rdf:about="" xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/">
+% <pdfx:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance\ifnum\xmp@Part<3:\xmp@ReleaseDate\fi</pdfx:GTS_PDFXVersion>
+% \ifnum\xmp@Part<3 <pdfx:GTS_PDFXConformance>PDF/X-\xmp@Part\xmp@Conformance:\xmp@ReleaseDate</pdfx:GTS_PDFXConformance>\fi
+% </rdf:Description>
+% <rdf:Description rdf:about="" xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/">
+% \ifnum\xmp@Part>3 <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part</pdfxid:GTS_PDFXVersion>\fi
+% </rdf:Description>
+% <rdf:Description rdf:about="" xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/">
+% \ifnum\xmp@Part> 3<pdfaid:part>\xmp@Part</pdfaid:part>
+% <pdfaid:conformance>\xmp@Conformance</pdfaid:conformance>\fi
+% </rdf:Description>
+% <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">
+% <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool>
+% <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate>
+% <xmp:CreateDate>\xmp@convDate</xmp:CreateDate>
+% <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate>
+% </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/">
+ \ifnot@empty\xmp@Copyright{<xmpRights:Marked>True</xmpRights:Marked>
+ <xmpRights:UsageTerms>
+ <rdf:Alt>
+ <rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li>
+ </rdf:Alt>
+ </xmpRights:UsageTerms>}
+ \ifnot@empty\xmp@CopyrightURL{<xmpRights:WebStatement>\xmp@CopyrightURL</xmpRights:WebStatement>}
+}
+ </rdf:Description>
+%%% extra <dc> fields not already covered above
+% <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/">
+%% <dc:format>application/pdf</dc:format>
+%% \ifnot@empty\xmp@Subject{<dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description>}
+%% \ifnot@empty\xmp@Title{<dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title>}
+%% \ifnot@empty\xmp@@Author{<dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>}
+% \ifnot@empty\xmp@Publisher{<dc:publisher><rdf:Bag><rdf:li>\xmp@Publisher</rdf:li></rdf:Bag></dc:publisher>}
+% \ifnot@empty\xmp@Doi{<dc:identifier>doi:\xmp@Doi</dc:identifier>}
+% \ifnot@empty\xmp@Copyright{<dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></dc:rights>}
+% \ifnot@empty\xmp@Keywords{<dc:subject><rdf:Bag><rdf:li>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>}
+% </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/">
+ \ifnot@empty\xmp@PublicationType{<prism:aggregationType>\xmp@PublicationType</prism:aggregationType>}
+ \ifnot@empty\xmp@Journalnumber{<prism:issn>\xmp@Journalnumber</prism:issn>}
+ \ifnot@empty\xmp@Volume{<prism:volume>\xmp@Volume</prism:volume>}
+ \ifnot@empty\xmp@Issue{<prism:number>\xmp@Issue</prism:number>}
+ \ifnot@empty\xmp@CoverDisplayDate{<prism:coverDisplayDate>\xmp@CoverDisplayDate</prism:coverDisplayDate>}
+ \ifnot@empty\xmp@CoverDate{<prism:coverDate>\xmp@CoverDate</prism:coverDate>}
+ \ifnot@empty\xmp@Journaltitle{<prism:issueName>\xmp@Journaltitle</prism:issueName>}
+ \ifnot@empty\xmp@Firstpage{<prism:pageRange>\xmp@Firstpage-\xmp@Lastpage</prism:pageRange>}
+ \ifnot@empty\xmp@Firstpage{<prism:startingPage>\xmp@Firstpage</prism:startingPage>}
+ \ifnot@empty\xmp@Lastpage{<prism:endingPage>\xmp@Lastpage</prism:endingPage>}
+ \ifnot@empty\xmp@Doi{<prism:doi>\xmp@Doi</prism:doi>}
+ \ifnot@empty\xmp@Doi{<prism:url>http://dx.doi.org/\xmp@Doi</prism:url>}
+ </rdf:Description>
+% <rdf:Description rdf:about=""
+% xmlns:dc="http://purl.org/dc/elements/1.1/">
+% <dc:format>application/pdf</dc:format>
+% <dc:title>
+% <rdf:Alt>
+% <rdf:li xml:lang="x-default">\xmp@Title</rdf:li>
+% </rdf:Alt>
+% </dc:title>
+% <dc:description>
+% <rdf:Alt>
+% <rdf:li xml:lang="x-default">\xmp@Subject</rdf:li>
+% </rdf:Alt>
+% </dc:description>
+% <dc:creator>
+% <rdf:Bag>
+% <rdf:li>\xmp@@Author</rdf:li>
+% </rdf:Bag>
+% </dc:creator>
+% <dc:subject>
+% <rdf:Bag>
+% <rdf:li>\xmp@Keywords</rdf:li>
+% </rdf:Bag>
+% </dc:subject>
+% </rdf:Description>
+% <rdf:Description rdf:about=""
+% xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
+% <xmpMM:DocumentID>uuid:\xmp@docid</xmpMM:DocumentID>
+% <xmpMM:InstanceID>uuid:\xmp@instid</xmpMM:InstanceID>
+% </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+% padding with 512 space characters to allow easier editing within a PDF
+\padding@line
+\padding@line
+\padding@line
+\padding@line
+%%
+%% End of pdfx.xmp
+%%
+%%
+
+
diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfx-1a.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfx-1a.xmp
deleted file mode 100644
index f29e43ce123..00000000000
--- a/Master/texmf-dist/tex/latex/pdfx/pdfx-1a.xmp
+++ /dev/null
@@ -1,72 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% 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#">
- <rdf:Description rdf:about=""
- xmlns:pdf="http://www.adobe.com/pdf/1.3/">
- <pdf:Trapped>False</pdf:Trapped>
- <pdf:GTS_PDFXVersion>PDF/X-1:2001</pdf:GTS_PDFXVersion>
- <pdf:GTS_PDFXConformance>PDF/X-1a:2001</pdf:GTS_PDFXConformance>
- </rdf:Description>
- <rdf:Description rdf:about=""
- xmlns:xap="http://ns.adobe.com/xap/1.0/">
- <xap:CreateDate>\convDate</xap:CreateDate>
- <xap:CreatorTool>pdfTeX</xap:CreatorTool>
- <xap:ModifyDate>\convDate</xap:ModifyDate>
- <xap:MetadataDate>\convDate</xap:MetadataDate>
- </rdf:Description>
- <rdf:Description rdf:about=""
- xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
- <pdf:Producer>pdfTeX</pdf:Producer>
- <pdf:Trapped>False</pdf:Trapped>
- <pdf:Keywords>\xmpKeywords</pdf:Keywords>
- </rdf:Description>
- <rdf:Description rdf:about=""
- xmlns:dc="http://purl.org/dc/elements/1.1/">
- <dc:format>application/pdf</dc:format>
- <dc:title>
- <rdf:Alt>
- <rdf:li xml:lang="x-default">\xmpTitle</rdf:li>
- </rdf:Alt>
- </dc:title>
- <dc:description>
- <rdf:Alt>
- <rdf:li xml:lang="x-default">\xmpSubject</rdf:li>
- </rdf:Alt>
- </dc:description>
- <dc:creator>
- <rdf:Bag>
- <rdf:li>\xmpAuthor</rdf:li>
- </rdf:Bag>
- </dc:creator>
- <dc:subject>
- <rdf:Bag>
- <rdf:li>\xmpKeywords</rdf:li>
- </rdf:Bag>
- </dc:subject>
- </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>
-
-
diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfx.sty b/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
index 35f1e6cf12e..cb3d7d74c0d 100644
--- a/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
+++ b/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
@@ -6,8 +6,10 @@
%%
%% pdfx.dtx (with options: `package')
%%
-%% Copyright (c) 2008, CV Radhakrishnan <cvr@river-valley.org>,
-%% Han The Thanh <thanh@river-valley.org>
+%% Copyright (c) 2015, CV Radhakrishnan <cvr@river-valley.org>,
+%% Han The Thanh <thanh@river-valley.org>,
+%% Ross Moore <ross.moore@mq.edu.au>,
+%% Peter Selinger <selinger@mathstat.dal.ca>
%%
%% This file may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.2 of this
@@ -19,184 +21,763 @@
%% and version 1.2 or later is part of all distributions of LaTeX
%% version 1999/12/01 or later.
%%
+ \@ifpackageloaded{pdfxmult}{%
+ \PackageError{pdfx}%
+ {^^JThis package may not be used in conjunction with the \space pdfxmult \space package}%
+ {Type \space x <return> \space to exit; or just \space <return> \space to continue without this package.}%
+ \expandafter\let\csname opt@pdfx.sty\endcsname\@empty\endinput
+ }{}%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfx}
- [2008/12/10 v1.2 PDF/X and PDF/A support (CVR/HTH)]
+ [2015/02/17 v1.5.3 PDF/X and PDF/A support (CVR/HTH/RRM/PS)]
-\newif\ifpdfxonea \pdfxoneafalse
-\newif\ifpdfaoneb \pdfaonebfalse
+\newif\ifpdfx@noBOM \pdfx@noBOMfalse % use a BOM in the XMP packet
+\newif\ifpdfx@x \pdfx@xfalse % PDF/X mode
+\newif\ifpdfx@e \pdfx@efalse % PDF/E mode; not implemented yet
+\newif\ifpdfx@vt \pdfx@vtfalse % PDF/VT mode, extension of PDF/X
+\newif\ifno@iccprofile % used with PDF/X-4p and PDF/X-5pg
-\DeclareOption{a-1b}{\global\pdfaonebtrue}
-\DeclareOption{x-1a}{\global\pdfxoneatrue}
+%% Not all combinations of the following parameters are meaningful.
+\def\xmp@Part{1} % PDF/A part: 1, 2, or 3
+\def\xmp@Conformance{B} % Conformance level: A, B, or U
+\def\xmp@ReleaseDate{2005} % 2001 for PDF/X-1, 2005 for PDF/A-1,
+ % 2010 for PDF/A-2, 2012 for PDF/A-3.
+
+%% default is to create PDF/A-1b
+%% options can change this for PDF/X or higher levels of PDF/A
+\DeclareOption{a-1a}{\global\pdfx@xfalse\def\xmp@Part{1}\def\xmp@Conformance{A}\def\xmp@ReleaseDate{2005}}
+\DeclareOption{a-1b}{\global\pdfx@xfalse\def\xmp@Part{1}\def\xmp@Conformance{B}\def\xmp@ReleaseDate{2005}}
+\DeclareOption{a-2a}{\global\pdfx@xfalse\def\xmp@Part{2}\def\xmp@Conformance{A}\def\xmp@ReleaseDate{2010}}
+\DeclareOption{a-2b}{\global\pdfx@xfalse\def\xmp@Part{2}\def\xmp@Conformance{B}\def\xmp@ReleaseDate{2010}}
+\DeclareOption{a-2u}{\global\pdfx@xfalse\def\xmp@Part{2}\def\xmp@Conformance{U}\def\xmp@ReleaseDate{2010}}
+\DeclareOption{a-3a}{\global\pdfx@xfalse\def\xmp@Part{3}\def\xmp@Conformance{A}\def\xmp@ReleaseDate{2012}}
+\DeclareOption{a-3b}{\global\pdfx@xfalse\def\xmp@Part{3}\def\xmp@Conformance{B}\def\xmp@ReleaseDate{2012}}
+\DeclareOption{a-3u}{\global\pdfx@xfalse\def\xmp@Part{3}\def\xmp@Conformance{U}\def\xmp@ReleaseDate{2012}}
+\DeclareOption{x-1}{\global\pdfx@xtrue\def\xmp@Part{1}\def\xmp@Conformance{a}\def\xmp@ReleaseDate{2001}\global\pdfminorversion=3 }
+\DeclareOption{x-1a}{\global\pdfx@xtrue\def\xmp@Part{1}\def\xmp@Conformance{a}\def\xmp@ReleaseDate{2003}\global\pdfminorversion=3 }
+\DeclareOption{x-1a1}{\global\pdfx@xtrue\def\xmp@Part{1}\def\xmp@Conformance{a}\def\xmp@ReleaseDate{2001}\global\pdfminorversion=3 }
+\DeclareOption{x-1a3}{\global\pdfx@xtrue\def\xmp@Part{1}\def\xmp@Conformance{a}\def\xmp@ReleaseDate{2003}\global\pdfminorversion=3 }
+\DeclareOption{x-2}{\global\pdfx@xtrue\def\xmp@Part{2}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2002}\global\pdfminorversion=4 }
+\DeclareOption{x-3}{\global\pdfx@xtrue\def\xmp@Part{3}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2002}\global\pdfminorversion=3 }
+\DeclareOption{x-302}{\global\pdfx@xtrue\def\xmp@Part{3}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2002}\global\pdfminorversion=3 }
+\DeclareOption{x-303}{\global\pdfx@xtrue\def\xmp@Part{3}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2003}\global\pdfminorversion=4 }
+%%% Later versions, yet to be fully implemented
+\DeclareOption{x-4}{\global\pdfx@xtrue\def\xmp@Part{4}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-4p}{\global\pdfx@xtrue\global\no@iccprofiletrue
+ \def\xmp@Part{4}\def\xmp@Conformance{p}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-408}{\global\pdfx@xtrue\def\xmp@Part{4}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-410}{\global\pdfx@xtrue\def\xmp@Part{4}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{x-4p08}{\global\pdfx@xtrue\global\no@iccprofiletrue
+ \def\xmp@Part{4}\def\xmp@Conformance{p}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-4p10}{\global\pdfx@xtrue\global\no@iccprofiletrue
+ \def\xmp@Part{4}\def\xmp@Conformance{p}\def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{x-5}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-5g}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{g}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-5n}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{n}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-5pg}{\global\pdfx@xtrue\global\no@iccprofiletrue
+ \def\xmp@Part{5}\def\xmp@Conformance{pg}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-508}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-5g08}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{g}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-5n08}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{n}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-5pg08}{\global\pdfx@xtrue\global\no@iccprofiletrue
+ \def\xmp@Part{5}\def\xmp@Conformance{pg}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{x-510}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{x-5g10}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{g}\def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{x-5n10}{\global\pdfx@xtrue\def\xmp@Part{5}\def\xmp@Conformance{n}\def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{x-5pg10}{\global\pdfx@xtrue\global\no@iccprofiletrue
+ \def\xmp@Part{5}\def\xmp@Conformance{pg}\def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{e-1}{\global\pdfx@xfalse\global\pdfx@etrue
+ \def\xmp@Part{1}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}\global\pdfminorversion=6 }
+\DeclareOption{vt-1}{\global\pdfx@xtrue\global\pdfx@vttrue
+ \def\xmp@Part{4}\def\xmp@vtPart{1}\def\xmp@Conformance{}\def\xmp@vtConformance{}%
+ \def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{vt-2}{\global\pdfx@xtrue\global\pdfx@vttrue
+ \def\xmp@Part{4}\def\xmp@vtPart{2}\def\xmp@Conformance{}\def\xmp@vtConformance{}%
+ \def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+\DeclareOption{vt-2s}{\global\pdfx@xtrue\global\pdfx@vttrue
+ \def\xmp@Part{5}\def\xmp@vtPart{2}\def\xmp@Conformance{pg}\def\xmp@vtConformance{s}%
+ \def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 }
+
+%% extra options to alter the PDF minor version, in case needed in special circumstances
+\DeclareOption{pdf13}{\global\pdfminorversion=3 }
+\DeclareOption{pdf14}{\global\pdfminorversion=4 }
+\DeclareOption{pdf15}{\global\pdfminorversion=5 }
+\DeclareOption{pdf16}{\global\pdfminorversion=6 }
+\DeclareOption{pdf17}{\global\pdfminorversion=7 }
+
+%% inhibits writing the XMP byte-order marker
+\DeclareOption{noBOM}{\pdfx@noBOMtrue}
+
+\pdfminorversion=4 % assumed for PDF/A ; options may change this for PDF/X
+\expandafter\ifx\csname pdfresetpageorigin\endcsname\relax\else
+ \pdfresetpageorigin=0
+\fi
\ProcessOptions
-\ifpdfxonea
- \pdfminorversion=3
+{\endlinechar=-1
+ \everyeof{\noexpand}%
+ \xdef\pdfx@bannerstring{\expandafter\scantokens\expandafter{\pdftexbanner}}
+}%
+\def\pdfx@testbannerstr{This is pdfTeX, Version 3.14159265-2.6-1.40.15 (TeX Live 2014/dev) kpathsea version 6.2.0dev}%
+\ifx\pdfx@bannerstring\pdfx@testbannerstr
+ \typeout{This version of pdfTeX cannot write out upper-range character bytes, 128-255.}%
+ \typeout{Any UTF-8 Unicode characters in the Metadata will not be written correctly.}%
+ \typeout{Please update to a more stable version of pdfTeX.^^J}%
+ \pdfx@noBOMtrue
+\fi
+
+\ifpdfx@x
+ \pdfobjcompresslevel=0 \relax
+ \expandafter\ifx\csname pdfinterwordspaceoff\endcsname\relax\else
+ \pdfinterwordspaceoff
+ \let\pdfinterwordspaceon\pdfinterwordspaceoff
+ \let\pdfinterwordspace\relax
+ \fi
+ \expandafter\ifx\csname pdfgeninterwordspace\endcsname\relax\else
+ \pdfgeninterwordspace=0 \relax
+ \fi
\pdfpageattr{/MediaBox[0 0 595 793]
/BleedBox[0 0 595 793]
/TrimBox[25 20 570 773]}
-\else
- \pdfminorversion=4
\fi
-\def\hash{\expandafter\@gobble\string\#}
-\def\amp{\expandafter\@gobble\string\&}
-\def\xmpAmp{\amp\hash x0026;}
-\def\sep{</rdf:li><rdf:li>}
-\def\TextCopyright{\amp\hash x00A9;}
-\def\Title#1{\gdef\xmpTitle{#1}}
- \let\xmpTitle\@empty
-\def\Author#1{\gdef\xmpAuthor{#1}}
- \let\xmpAuthor\@empty
-\def\Keywords#1{\gdef\xmpKeywords{#1}}
- \let\xmpKeywords\@empty
- \let\xmpSubject\xmpKeywords
-\def\Creator#1{\gdef\xmpCreator{#1}}
- \def\xmpCreator{\@pdfcreator}
-\def\Producer#1{\gdef\xmpProducer{#1}}
- \def\xmpProducer{pdfTeX}
-\def\Volume#1{\gdef\xmpVolume{#1}}
- \let\xmpVolume\@empty
-\def\Issue#1{\gdef\xmpIssue{#1}}
- \let\xmpIssue\@empty
-\def\CoverDisplayDate#1{\gdef\xmpCoverDisplayDate{#1}}
- \let\xmpCoverDisplayDate\@empty
-\def\CoverDate#1{\gdef\xmpCoverDate{#1}}
- \let\xmpCoverDate\@empty
-\def\Copyright#1{\gdef\xmpCopyright{#1}}
- \let\xmpCopyright\@empty
-\def\Doi#1{\gdef\xmpDoi{#1}}
- \let\xmpDoi\@empty
-\def\Lastpage#1{\gdef\xmpLastpage{#1}}
- \let\xmpLastpage\@empty
-\def\Firstpage#1{\gdef\xmpFirstpage{#1}}
- \let\xmpFirstpage\@empty
-\def\Journaltitle#1{\gdef\xmpJournaltitle{#1}}
- \let\xmpJournaltitle\@empty
-\def\Journalnumber#1{\gdef\xmpJournalnumber{#1}}
- \let\xmpJournalnumber\@empty
-\def\Org#1{\gdef\xmpOrg{#1}}
- \let\xmpOrg\@empty
-\def\CreatorTool#1{\gdef\xmpCreatorTool{#1}}
- \def\xmpCreatorTool{\xmpProducer}
-\def\AuthoritativeDomain#1{\gdef\xmpAuthoritativeDomain{#1}}
- \let\xmpAuthoritativeDomain\@empty
-\def\findUUID#1{\edef\tmpstring{\pdfmdfivesum{#1}}
- \expandafter\eightofnine\tmpstring\end}
-\def\eightofnine#1#2#3#4#5#6#7#8#9\end{%
- \xdef\eightchars{#1#2#3#4#5#6#7#8}
- \fouroffive#9\end}
-\def\fouroffive#1#2#3#4#5\end{\xdef\ffourchars{#1#2#3#4}
- \sfouroffive#5\end}
-\def\sfouroffive#1#2#3#4#5\end{\xdef\sfourchars{#1#2#3#4}
- \tfouroffive#5\end}
-\def\tfouroffive#1#2#3#4#5\end{\xdef\tfourchars{#1#2#3#4}
- \xdef\laststring{#5}}
-
-\def\uuid{\eightchars-%
- \ffourchars-%
- \sfourchars-%
- \tfourchars-%
- \laststring}
-
-\findUUID{\jobname.pdf}
-\edef\xmpdocid{\uuid}
-\findUUID{\pdfcreationdate}
-\edef\xmpinstid{\uuid}
-\InputIfFileExists{\jobname.xmpdata}{}{}
-\RequirePackage{xmpincl}
-\def\convertDate{\getYear}
-{\catcode`\D=12
- \gdef\getYear D:#1#2#3#4{\edef\xYear{#1#2#3#4}\getMonth}
+\ifnum\pdfminorversion >3 \relax
+ \pdfmapline{+dummy-space <dummy-space.pfb}
+ \expandafter\ifx\csname pdfgeninterwordspace\endcsname\relax\else
+ \pdfgeninterwordspace=1 \relax
+ \fi
+\fi
+\ifpdfx@x
+ \@ifpackageloaded{hyperref}{%
+ \hypersetup{draft,pdftex,pdfpagemode=UseNone,bookmarks=false,pdfversion=1.\the\pdfminorversion]}
+ }{%
+ \RequirePackage[draft,pdftex,pdfpagemode=UseNone,bookmarks=false,pdfversion=1.\the\pdfminorversion]{hyperref}
+ }%
+\else
+ \ifpdfx@e
+ \@ifpackageloaded{hyperref}{%
+ \hypersetup{draft,pdftex,pdfpagemode=UseNone,bookmarks=false,pdfversion=1.\the\pdfminorversion]}
+ }{%
+ \RequirePackage[draft,pdftex,pdfpagemode=UseNone,bookmarks=false,pdfversion=1.\the\pdfminorversion]{hyperref}
+ }%
+ \else
+ \@ifpackageloaded{hyperref}{%
+ \hypersetup{pdftex,pdfa}%
+ }{%
+ \RequirePackage[pdftex,pdfa]{hyperref}
+ }%
+\fi\fi
+\hypersetup{pdfencoding=unicode}
+
+\RequirePackage{inputenc}
+
+%%----------------------------------------------------------------------
+%% Macros for reading XMP data with special catcodes. Usage:
+%%
+%% \xmp@parse{continuation}{data}
+%%
+%% The effect is to read the data with special catcodes: '<', '>', and
+%% '&' are "active", and '^', '_', '#', '$', '~' are "other". The data
+%% is then bound to the locally scoped name \@this, and the
+%% continuation is called.
+\def\xmp@parse#1{%
+ \begingroup
+ \catcode`\<=13\catcode`\>=13\catcode`\&=13\catcode`\^=12
+ \catcode`\_=12\catcode`\#=12\catcode`\$=12\catcode`\~=12
+ \xmp@doparse{#1}%
+}
+\def\xmp@doparse#1#2{%
+ \def\@this{#2}#1%
+ \endgroup%
+}
+
+%%----------------------------------------------------------------------
+%% Local commands. They are only brought into scope during the reading
+%% of xmpdata.
+\def\pdfx@localcommands{%
+ \def\Title{\xmp@parse{\global\let\xmp@Title\@this}}%
+ \def\Author{\xmp@parse{\global\let\xmp@Author\@this}}%
+ \def\Keywords{\xmp@parse{\global\let\xmp@Keywords\@this}}%
+ \def\Subject{\xmp@parse{\global\let\xmp@Subject\@this}}%
+ \def\CreatorTool{\xmp@parse{\global\let\xmp@CreatorTool\@this}}%
+ \def\Producer{\xmp@parse{\global\let\xmp@Producer\@this}}%
+ \def\Volume{\xmp@parse{\global\let\xmp@Volume\@this}}%
+ \def\Issue{\xmp@parse{\global\let\xmp@Issue\@this}}%
+ \def\CoverDisplayDate{\xmp@parse{\global\let\xmp@CoverDisplayDate\@this}}%
+ \def\CoverDate{\xmp@parse{\global\let\xmp@CoverDate\@this}}%
+ \def\Copyright{\xmp@parse{\global\let\xmp@Copyright\@this%
+ \ifx\xmp@Copyrighted\@empty\gdef\xmp@Copyrighted{True}\fi}}%
+ \def\CopyrightURL{\xmp@parse{\global\let\xmp@CopyrightURL\@this%
+ \ifx\xmp@Copyrighted\@empty\gdef\xmp@Copyrighted{True}\fi}}%
+ \def\Copyrighted{\xmp@parse{\global\let\xmp@Copyrighted\@this}}%
+ \def\Doi{\xmp@parse{\global\let\xmp@Doi\@this}}%
+ \def\Lastpage{\xmp@parse{\global\let\xmp@Lastpage\@this}}%
+ \def\Firstpage{\xmp@parse{\global\let\xmp@Firstpage\@this}}%
+ \def\PublicationType{\xmp@parse{\global\let\xmp@PublicationType\@this}}%
+ \def\Journaltitle{\xmp@parse{\global\let\xmp@Journaltitle\@this%
+ \ifx\xmp@PublicationType\@empty\gdef\xmp@PublicationType{journal}\fi}}%
+ \def\Journalnumber{\xmp@parse{\global\let\xmp@Journalnumber\@this}}%
+ \def\Publisher{\xmp@parse{\global\let\xmp@Publisher\@this}}%
+ \def\AuthoritativeDomain{\xmp@parse{\global\let\xmp@AuthoritativeDomain\@this}}%
+ % some aliases for backward compatibility:
+ \let\Creator\CreatorTool%
+ \let\Org\Publisher%
+ \let\WebStatement\CopyrightURL%
+ % user-level commands for color profiles:
+ \let\setRGBcolorprofile\pdfx@setRGBcolorprofile%
+ \let\setCMYKcolorprofile\pdfx@setCMYKcolorprofile%
+ \let\setGRAYcolorprofile\pdfx@setGRAYcolorprofile%
+}
+
+%%----------------------------------------------------------------------
+%% Defaults
+
+\def\xmp@Producer{pdfTeX}
+\edef\xmp@CreatorTool{\@pdfcreator}
+
+\global\let\xmp@Title\@empty
+\global\let\xmp@Author\@empty
+\global\let\xmp@Keywords\@empty
+\global\let\xmp@Subject\@empty
+\global\let\xmp@Volume\@empty
+\global\let\xmp@Issue\@empty
+\global\let\xmp@CoverDisplayDate\@empty
+\global\let\xmp@CoverDate\@empty
+\global\let\xmp@Copyright\@empty
+\global\let\xmp@CopyrightURL\@empty
+\global\let\xmp@Copyrighted\@empty
+\global\let\xmp@Doi\@empty
+\global\let\xmp@Lastpage\@empty
+\global\let\xmp@Firstpage\@empty
+\global\let\xmp@PublicationType\@empty
+\global\let\xmp@Journaltitle\@empty
+\global\let\xmp@Journalnumber\@empty
+\global\let\xmp@Publisher\@empty
+\global\let\xmp@AuthoritativeDomain\@empty
+
+%%----------------------------------------------------------------------
+%% The following characters and markup can be used within the XMP data
+%% defined by \Author, \Title, and so on.
+%%
+%% * All printable non-whitespace ASCII characters except
+%% '%', '{', '}', '\' can be used as themselves.
+%%
+%% * All printable non-whitespace UTF-8 encoded Unicode characters
+%% from the basic multilingual plane can be used as themselves.
+%%
+%% * As usual, consecutive whitespace characters are contracted to a
+%% single space. Whitespace after a macro such as \copyright is
+%% ignored. Blank lines are not permitted.
+%%
+%% * The following markup can be used:
+%% '\ ' - a literal space (for example after a macro)
+%% \% - a literal '%'
+%% \{ - a literal '{'
+%% \} - a literal '}'
+%% \backslash - a literal '\'
+%% \copyright - the (c) copyright symbol
+%%
+%% \sep - only permitted within \Author, \Keywords, \Publisher.
+%%
+%% * For backward compatibility, \& and \TextCopyright are also
+%% provided. Their use is deprecated.
+
+%%----------------------------------------------------------------------
+%% The macro \pdfx@actives binds the active characters
+%% '&', '<', and '>' to \pdfx@amp, \pdfx@lt, and \pdfx@gt,
+%% respectively, without actually making them active.
+\begingroup
+ \catcode`\<=13
+ \catcode`\>=13
+ \catcode`\&=13
+ \gdef\pdfx@actives{
+ \def&{\pdfx@amp}
+ \def<{\pdfx@lt}
+ \def>{\pdfx@gt}
+ }
+\endgroup
+
+%%----------------------------------------------------------------------
+%% Markup bindings to be used during XMP generation.
+
+{\obeyspaces\gdef\pdfx@sep{</rdf:li>^^J <rdf:li>}}
+
+\def\pdfx@xmpmarkup{%
+ \pdfx@actives%
+ \edef\@amp{\expandafter\@gobble\string\&}%
+ \edef\@hash{\expandafter\@gobble\string\#}%
+ \edef\ {\expandafter\@gobble\string\ }%
+ \edef\%{\expandafter\@gobble\string\%}%
+ \edef\{{\expandafter\@gobble\string\{}%
+ \edef\}{\expandafter\@gobble\string\}}%
+ \edef\backslash{\expandafter\@gobble\string\\}%
+ \def\@unicode##1{\@amp\@hash x##1;}%
+ \def\pdfx@amp{\@unicode{0026}}%
+ \def\pdfx@lt{\@unicode{003c}}%
+ \def\pdfx@gt{\@unicode{003e}}%
+ \def\copyright{\@unicode{00A9}}%
+ \let\&\pdfx@amp % for backward compatibility
+ \let\TextCopyright\copyright % for backward compatibility
+ \let\sep\pdfx@sep%
+}
+
+%%----------------------------------------------------------------------
+%% Markup bindings to be used during PDF string generation.
+
+\def\pdfx@pdfmarkup{%
+ \pdfx@actives%
+ \edef\%{\expandafter\@gobble\string\%}%
+ \edef\{{\expandafter\@gobble\string\{}%
+ \edef\}{\expandafter\@gobble\string\}}%
+ \edef\pdfx@backslash{\expandafter\@gobble\string\\}%
+ \def\backslash{\pdfx@backslash000\pdfx@backslash134}%
+ \edef\pdfx@amp{\expandafter\@gobble\string\&}%
+ \edef\pdfx@lt{\expandafter\@gobble\string\<}%
+ \edef\pdfx@gt{\expandafter\@gobble\string\>}%
+ \let\TextCopyright\copyright % for backward compatibility
+ \def\sep{, }%
+ % Note: '\ ', \&, \copyright are already predefined by hyperref.
+}
+
+%%----------------------------------------------------------------------
+\def\pdfx@findUUID#1{\edef\pdfx@tmpstring{\pdfmdfivesum{#1}}
+ \expandafter\pdfx@eightofnine\pdfx@tmpstring\end}
+\def\pdfx@eightofnine#1#2#3#4#5#6#7#8#9\end{%
+ \xdef\pdfx@eightchars{#1#2#3#4#5#6#7#8}
+ \pdfx@fouroffive#9\end}
+\def\pdfx@fouroffive#1#2#3#4#5\end{\xdef\pdfx@ffourchars{#1#2#3#4}
+ \pdfx@sfouroffive#5\end}
+\def\pdfx@sfouroffive#1#2#3#4#5\end{\xdef\pdfx@sfourchars{#1#2#3#4}
+ \pdfx@tfouroffive#5\end}
+\def\pdfx@tfouroffive#1#2#3#4#5\end{\xdef\pdfx@tfourchars{#1#2#3#4}
+ \xdef\pdfx@laststring{#5}}
+
+\def\pdfx@uuid{\pdfx@eightchars-%
+ \pdfx@ffourchars-%
+ \pdfx@sfourchars-%
+ \pdfx@tfourchars-%
+ \pdfx@laststring}
+
+\pdfx@findUUID{\jobname.pdf}
+\edef\xmp@docid{\pdfx@uuid}
+\pdfx@findUUID{\pdfcreationdate}
+\edef\xmp@instid{\pdfx@uuid}
+
+%%----------------------------------------------------------------------
+%% ----- Color Profiles -------
+%% Define how to specify the profile, so the default
+%% can be over-ridden in the .xmpdata file.
+
+%% The user-level macros are only brought into scope during the reading
+%% of xmpdata.
+%%
+%% Usage:
+%% \setRGBcolorprofile{<filename>}{<identifier>}{<info string>}{<registry URL>}
+%% \setCMYKcolorprofile{<filename>}{<output intent>}{<identifier>}{<registry URL>}
+%% \setGRAYcolorprofile{<filename>}{<output intent>}{<identifier>}{<registry URL>}
+%%
+%% Within the arguments of each macro, the characters '<', '>', '&',
+%% '^', '_', '#', '$', and '~' can be used as themselves, but
+%% '%' must be escaped as '\%'.
+%%
+%% Note:
+%% * RGB profile is used with PDF/A and PDF/E files.
+%% * CMYK profile is used with PDF/X and PDF/VT files.
+%% * GRAY profile is currently unused.
+\def\pdfx@profilecatcodes{%
+ \catcode`\<=12\catcode`\>=12\catcode`\&=12\catcode`\^=12
+ \catcode`\_=12\catcode`\#=12\catcode`\$=12\catcode`\~=12
+ \edef\%{\expandafter\@gobble\string\%}%
}
-\def\getMonth#1#2{\edef\xMonth{#1#2}\getDay}
-\def\getDay#1#2{\edef\xDay{#1#2}\getHour}
-\def\getHour#1#2{\edef\xHour{#1#2}\getMin}
-\def\getMin#1#2{\edef\xMin{#1#2}\getSec}
-\def\getSec#1#2{\edef\xSec{#1#2}\getTZh}
-\def\getTZh +#1#2{\edef\xTZh{#1#2}\getTZm}
-\def\getTZm '#1#2'{%
- \edef\xTZm{#1#2}%
- \edef\convDate{\xYear-\xMonth-\xDay
- T\xHour:\xMin:\xSec+\xTZh:\xTZm}}
-\expandafter\convertDate\pdfcreationdate
-\ifpdfxonea
- \def\@pctchar{\expandafter\@gobble\string\%}
- \def\@bchar{\expandafter\@gobble\string\\}
- \immediate\pdfobj stream attr{/N 4} file{FOGRA39L.icc}
- \edef\OBJ@CVR{\the\pdflastobj}
- \pdfcatalog{/OutputIntents [ <<
+\def\pdfx@setRGBcolorprofile{%
+ \begingroup
+ \pdfx@profilecatcodes
+ \pdfx@dosetRGBcolorprofile}
+\def\pdfx@dosetRGBcolorprofile#1#2#3#4{%
+ \xdef\pdfx@rgb@profile{#1}% valid file name
+ \xdef\pdfx@rgb@identifier{#2}%
+ \xdef\pdfx@rgb@info{#3}%
+ \pdfstringdef\pdfx@rgb@registry{#4}% valid URL
+ \endgroup}% closes-off \pdfx@setRGBcolorprofile
+%%
+\def\pdfx@setCMYKcolorprofile{%
+ \begingroup
+ \pdfx@profilecatcodes
+ \pdfx@dosetCMYKcolorprofile}
+\def\pdfx@dosetCMYKcolorprofile#1#2#3#4{%
+ \xdef\pdfx@cmyk@profile{#1}% valid file name
+ \pdfstringdef\pdfx@cmyk@intent{#2}% color intent
+ \pdfstringdef\pdfx@cmyk@identifier{#3}% text string identifier
+ \pdfstringdef\pdfx@cmyk@registry{#4}% valid URL
+ \endgroup}% closes-off \pdfx@setCMYKcolorprofile
+%%
+\def\pdfx@setGRAYcolorprofile{%
+ \begingroup
+ \pdfx@profilecatcodes
+ \pdfx@dosetGRAYcolorprofile}
+\def\pdfx@dosetGRAYcolorprofile#1#2#3#4{%
+ \xdef\pdfx@gray@profile{#1}% valid file name
+ \xdef\pdfx@gray@intent{#2}%
+ \xdef\pdfx@gray@identifier{#3}%
+ \pdfstringdef\pdfx@gray@registry{#4}% valid URL
+ \endgroup}% closes-off \pdfx@setGRAYcolorprofile
+%%----------------------------------------------------------------------
+%% default color profiles
+\pdfx@setRGBcolorprofile{sRGB_IEC61966-2-1_black_scaled.icc}
+ {sRGB_IEC61966-2-1_black_scaled}
+ {sRGB IEC61966 v2.1 with black scaling}
+ {http://www.color.org}
+\pdfx@setCMYKcolorprofile{coated_FOGRA39L_argl.icc}
+ {Coated FOGRA39}
+ {FOGRA39 (ISO Coated v2 300\% (ECI))}
+ {http://www.argyllcms.com/}
+\pdfx@setGRAYcolorprofile{Gray_linear.icc}
+ {}
+ {Custom}
+ {http://www.freedesktop.org/wiki/OpenIcc}
+%%----------------------------------------------------------------------
+%% License for the file sRGB_IEC61966-2-1_black_scaled.icc :
+%%
+%% Copyright International Color Consortium, 2009 -- http://www.color.org/
+%%
+%% It is hereby acknowledged that the file "sRGB_IEC61966-2-1_black_scaled.icc"
+%% is provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY.
+%%
+%% Licensing
+%%
+%% This profile is made available by the International Color Consortium,
+%% and may be copied, distributed, embedded, made, used, and sold without
+%% restriction. Altered versions of this profile shall have the original
+%% identification and copyright information removed and shall not be
+%% misrepresented as the original profile.
+%%
+%% Terms of use
+%%
+%% To anyone who acknowledges that the file "sRGB_IEC61966-2-1_black_scaled.icc"
+%% is provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY, permission
+%% to use, copy and distribute these file for any purpose is hereby
+%% granted without fee, provided that the file is not changed including
+%% the ICC copyright notice tag, and that the name of ICC shall not be
+%% used in advertising or publicity pertaining to distribution of the
+%% software without specific, written prior permission. ICC makes no
+%% representations about the suitability of this software for any
+%% purpose.
+%%
+%%----------------------------------------------------------------------
+%% License for the file coated_FOGRA39L_argl.icc :
+%%
+%% The zlib/libpng License
+%%
+%% Copyright (c) 2008 Kai-Uwe Behrmann
+%%
+%% This software is provided 'as-is', without any express or implied
+%% warranty. In no event will the authors be held liable for any damages
+%% arising from the use of this software.
+%%
+%% Permission is granted to anyone to use this software for any purpose,
+%% including commercial applications, and to alter it and redistribute
+%% it freely, subject to the following restrictions:
+%%
+%% 1. The origin of this software must not be misrepresented; you
+%% must not claim that you wrote the original software. If you use
+%% this software in a product, an acknowledgment in the product
+%% documentation would be appreciated but is not required.
+%%
+%% 2. Altered source versions must be plainly marked as such, and
+%% must not be misrepresented as being the original software.
+%%
+%% 3. This notice may not be removed or altered from any source
+%% distribution.
+%%----------------------------------------------------------------------
+
+\begingroup
+ \inputencoding{8bit}%
+ \makeatletter
+ \pdfx@localcommands
+ \InputIfFileExists{\jobname.xmpdata}%
+ {\typeout{**pdfx: Metadata file \jobname.xmpdata read successfully.}}%
+ {\typeout{**pdfx: No file \jobname.xmpdata . Metadata will be incomplete!}}
+\endgroup
+%% ----------------------------------------------------------------------
+\begingroup
+\ifpdfx@x % PDF/X needs a CMYK color profile for printing
+ \def\0{\string\0}
+ \catcode`\_ 12
+ \ifno@iccprofile % PDF/X-4p and PDF/X-5pg
+ \immediate\pdfobj {<</FS /URL /F (http://www.color.org/registry/profiles/Coated_Fogra39L_VIGC_300.icc)>>}
+ \edef\OBJ@URLs{\the\pdflastobj}%
+ \xdef\pdfx@cmyk@intent{Coated_Fogra39L_VIGC_300}%
+ \xdef\pdfx@cmyk@identifier{Coated_Fogra39L_VIGC_300.icc}%
+ \immediate\pdfobj {<<%
+ /CheckSum <5449c505618a9b6c38634b4708ae9e37>^^J% d5f0714cd9d6092b6ac93b625f5d8a0c>%
+ /ICCVersion (\004\002\000\000)% 4.2.0.0
+ /ProfileCS (CMYK)^^J%
+ /ProfileName (\pdfx@cmyk@identifier)^^J%
+ /URLs [\OBJ@URLs\space 0 R ]
+ >>} %
+ \edef\OBJ@ICC{\the\pdflastobj}%
+ \pdfcatalog{%
+ /OutputIntents [ <<
+ /Type/OutputIntent
+ /S/GTS_PDFX
+ /OutputCondition (\pdfx@cmyk@intent)%
+ /OutputConditionIdentifier (\pdfx@cmyk@identifier)%
+ /RegistryName(\pdfx@cmyk@registry)
+ % extra dictionary required for PDF/X-4p and PDF/X-5pg
+ /DestOutputProfileRef \OBJ@ICC\space 0 R
+ >> ]}%
+ \else % PDF/X-1 , PDF/X-1a , PDF/X-3 , PDF/X-4 , PDF/X-5g
+ \IfFileExists{\pdfx@cmyk@profile}{%
+ % embedded CMYK color profile
+ \immediate\pdfobj stream attr{/N 4} file{\pdfx@cmyk@profile}%
+ \edef\OBJ@CMYK{\the\pdflastobj}%
+ \pdfcatalog{%
+ /OutputIntents [ <<
/Type/OutputIntent
/S/GTS_PDFX
- /OutputCondition (FOGRA39)
- /OutputConditionIdentifier (FOGRA39 \@bchar(ISO Coated v2
- 300\@pctchar\space \@bchar(ECI\@bchar)\@bchar))
- /DestOutputProfile \OBJ@CVR\space 0 R
- /RegistryName(http://www.color.org)
- >> ]}
+ /OutputCondition (\pdfx@cmyk@intent)%
+ /OutputConditionIdentifier (\pdfx@cmyk@identifier)%
+ /RegistryName(\pdfx@cmyk@registry)
+ /DestOutputProfile \OBJ@CMYK\space 0 R
+ >> ]}%
+ }{%
+ \errmessage{No color profile found to use for CMYK printing colors.}%
+ }%
+ \fi % end of \ifno@iccprofile
\else
- \immediate\pdfobj stream attr{/N 4} file{sRGBIEC1966-2.1.icm}
- \edef\OBJ@RVT{\the\pdflastobj}
+%% PDF/A needs an RGB color profile for on-screen rendering
+ \IfFileExists{\pdfx@rgb@profile}{%
+ \immediate\pdfobj stream attr{/N 3^^J/Alternate/DeviceRGB} file{\pdfx@rgb@profile}%
+ \edef\OBJ@RGB{\the\pdflastobj}%
+ }{%
+ \errmessage{No color profile found to use for RGB screen colors.}%
+ }%
\pdfcatalog{%
+ /ViewerPreferences <</DisplayDocTitle true >>
/OutputIntents [ <<
/Type /OutputIntent
- /S/GTS_PDFA1
- /DestOutputProfile \OBJ@RVT\space 0 R
- /OutputConditionIdentifier (sRGB IEC61966-2.1)
- /Info(sRGB IEC61966-2.1)
- >> ]}
-\fi
+ \ifpdfx@e
+ /S/ISO_PDFE1
+ \else
+ /S/GTS_PDFA1
+ \fi
+ /OutputConditionIdentifier (\pdfx@rgb@identifier)%
+ /DestOutputProfile \OBJ@RGB\space 0 R
+ /Info(\pdfx@rgb@info)
+ /RegistryName(\pdfx@rgb@registry)
+ >>
+ ]}%
+\fi % end of \ifpdfx@x
+\endgroup
+
+%% ----------------------------------------------------------------------
+%% Make a version of \xmp@Keywords and \xmp@Author where \sep has been
+%% replaced by a comma. The first is for the pdf:Keywords property,
+%% which accepts a comma-separated string of keywords, and seems to be
+%% mandatory for PDF/A-1 compliance. The second is for the dc:creator
+%% property. Although it is defined to be a sequence of authors, Adobe
+%% Acrobat will in fact ignore and delete all except the first author.
+%% Therefore, it's safer to always separate authors by commas.
+
\begingroup
-\let\&=\xmpAmp
-\ifpdfxonea
- \includexmp{pdfx-1a}
-\else
- \includexmp{pdfa-1b}
-\fi
+ \pdfx@xmpmarkup
+ \def\sep{, }%
+ \inputencoding{8bit}\makeatletter
+ \xdef\xmp@@Keywords{\xmp@Keywords}
+ \xdef\xmp@@Author{\xmp@Author}
+\endgroup
+
+%% ----------------------------------------------------------------------
+\def\xmp@convertDate{\pdfx@getYear}
+{\catcode`\D=12 \catcode`\:=12
+ \gdef\pdfx@getYear D:#1#2#3#4{\edef\pdfx@xYear{#1#2#3#4}\pdfx@getMonth}
+}
+\def\pdfx@getMonth#1#2{\edef\pdfx@xMonth{#1#2}\pdfx@getDay}
+\def\pdfx@getDay#1#2{\edef\pdfx@xDay{#1#2}\pdfx@getHour}
+\def\pdfx@getHour#1#2{\edef\pdfx@xHour{#1#2}\pdfx@getMin}
+\def\pdfx@getMin#1#2{\edef\pdfx@xMin{#1#2}\pdfx@getSec}
+\def\pdfx@getSec#1#2{\edef\pdfx@xSec{#1#2}\pdfx@getTZh}
+\def\pdfx@getTZh{\futurelet\pdfx@next\pdfx@getTzh@branches}
+
+{\catcode`\@=11 \catcode`\Z=12 \catcode`\+=12 \catcode`\-=12
+\gdef\pdfx@getTzh@branches{%
+ \ifx\pdfx@next Z\let\pdfx@getTzbranch\pdfx@getTznozone
+ \else\ifx\pdfx@next +\let\pdfx@getTzbranch\pdfx@getTzplus
+ \else\ifx\pdfx@next -\let\pdfx@getTzbranch\pdfx@getTzminus
+ \else\let\pdfx@getTzbranch\pdfx@getTzerror
+ \fi\fi\fi \pdfx@getTzbranch }
+
+\catcode`\0=12
+\gdef\pdfx@getTznozone Z#1\pdfx@getTzend{%
+ \edef\pdfx@xTzh{+00}\edef\pdfx@xTzm{00}}
+\gdef\pdfx@getTzplus +#1'#2'#3\pdfx@getTzend{%
+ \edef\pdfx@xTzh{+#1}\edef\pdfx@xTzm{#2}%
+ \ifx\relax#2\relax\def\pdfx@xTzm{00}\fi}
+\gdef\pdfx@getTzminus -#1'#2'#3\pdfx@getTzend{%
+ \edef\pdfx@xTzh{-#1}\edef\pdfx@xTzm{#2}%
+ \ifx\relax#2\relax\def\pdfx@xTzm{00}\fi}
+\expandafter\xmp@convertDate\pdfcreationdate''\pdfx@getTzend
+\xdef\pdfx@convDate{\pdfx@xYear\pdfx@xMonth\pdfx@xDay\pdfx@xHour\pdfx@xMin\pdfx@xSec\pdfx@xTzh'\pdfx@xTzm'}%
+\xdef\xmp@convDate{\pdfx@xYear-\pdfx@xMonth-\pdfx@xDay T\pdfx@xHour:\pdfx@xMin:\pdfx@xSec\pdfx@xTzh:\pdfx@xTzm}%
+}% end of \catcode
+
+%% ----------------------------------------------------------------------
+%% \pdfx@topdfstring\toka\tokb: Convert the string in \tokb to a format
+%% appropriate for PDF /Info strings, i.e., PDFDoc encoding or UTF-16
+%% encoding, and store the result in \toka. As a special case, if \tokb
+%% is \@empty, set \toka to \@empty.
+
+\def\pdfx@topdfstring#1#2{%
+ \ifx#2\@empty
+ \global\let#1\@empty
+ \else
+ \begingroup
+ \inputencoding{utf8}%
+ \hypersetup{pdfencoding=unicode}%
+ \pdfstringdef#1{#2}%
+ \endgroup
+ \fi
+}
+
+%% Convert the relevant XMP properties to PDF strings, expanding markup
+%% (such as \sep, \&, \copyright, etc) in an appropriate way.
+\begingroup
+ \pdfx@pdfmarkup
+ \pdfx@topdfstring\pdfx@Title\xmp@Title
+ \pdfx@topdfstring\pdfx@Author\xmp@Author
+ \pdfx@topdfstring\pdfx@Subject\xmp@Subject
+ \pdfx@topdfstring\pdfx@Keywords\xmp@Keywords
+ \pdfx@topdfstring\pdfx@CreatorTool\xmp@CreatorTool
+ \pdfx@topdfstring\pdfx@Producer\xmp@Producer
\endgroup
\input glyphtounicode.tex
\input glyphtounicode-cmr.tex
\pdfgentounicode=1
-\ifpdfxonea
- \RequirePackage[draft,pdftex,pdfpagemode=UseNone,bookmarks=false]{hyperref}
- \pdfinfo{
- /Title(\xmpTitle)%
- /Author(\xmpAuthor)%
- /Creator(\xmpProducer)%
- /CreationDate(\convDate)%
- /ModDate(\convDate)%
- /Producer(\xmpProducer)%
- /Trapped /False
- /GTS_PDFXVersion (PDF/X-1:2001)%
- /GTS_PDFXConformance (PDF/X-1a:2001)%
- }
+
+\ifpdfx@x
+ {\pdfinfo{% order of these dictionary keys should not matter
+ \ifx\pdfx@Author\@empty\else /Author(\pdfx@Author)\fi
+ /CreationDate(D:\pdfx@convDate)%
+ /Creator(\pdfx@CreatorTool)%
+ \ifnum\xmp@Part=1
+ /GTS_PDFXVersion(PDF/X-1\ifnum\xmp@ReleaseDate>2001\xmp@Conformance\fi:\xmp@ReleaseDate)%
+ \else
+ /GTS_PDFXVersion(PDF/X-\xmp@Part\xmp@Conformance\ifnum\xmp@Part< 4 :\xmp@ReleaseDate\fi)%
+ \fi
+ \ifnum\xmp@Part < 3
+ /GTS_PDFXConformance(PDF/X-\xmp@Part\xmp@Conformance:\xmp@ReleaseDate)%
+ \fi
+ \ifpdfx@vt % support for PDF/VT extensions of PDF/X-4 and PDF/X-5
+%% /GTS_PDFVTVersion(PDF/VT-\xmp@vtPart\xmp@vtConformance)%
+ \fi
+ \ifx\pdfx@Keywords\@empty\else /Keywords(\pdfx@Keywords)\fi
+ /ModDate(D:\pdfx@convDate)%
+ /Producer(\pdfx@Producer)%
+ \ifx\pdfx@Subject\@empty\else /Subject(\pdfx@Subject)\fi
+ \ifx\pdfx@Title\@empty\else /Title(\pdfx@Title)\fi
+ /Trapped/False%
+ }% end of PDF/X info
+ }%
\else
- \RequirePackage[pdftex,pdfa]{hyperref}
- \def\PDF@FinishDoc{%
- \Hy@UseMaketitleInfos
- \pdfinfo{%
- /Creator(\xmpProducer)%
+ \ifpdfx@e
+ {\pdfinfo{% order of these dictionary keys should not matter
+ \ifx\pdfx@Author\@empty\else /Author(\pdfx@Author)\fi
+ /CreationDate(D:\pdfx@convDate)%
+ /Creator(\pdfx@CreatorTool)%
+ /GTS_PDFEVersion(PDF/E-1\xmp@Conformance:\xmp@ReleaseDate)%
+ \ifx\pdfx@Keywords\@empty\else /Keywords(\pdfx@Keywords)\fi
+ /ModDate(D:\pdfx@convDate)%
+ /Producer(\pdfx@Producer)%
+ \ifx\pdfx@Subject\@empty\else /Subject(\pdfx@Subject)\fi
+ \ifx\pdfx@Title\@empty\else /Title(\pdfx@Title)\fi
+ /Trapped/False%
+ }% end of PDF/E info
+ }%
+ \else
+ \def\pdfx@confA{a}%
+ \def\pdfx@confB{b}%
+ \def\pdfx@confU{u}%
+ \edef\xmp@conformance{\csname pdfx@conf\xmp@Conformance\endcsname}%
+ \AtBeginDocument{%
+ \def\PDF@FinishDoc{%
+ \Hy@UseMaketitleInfos
+ \pdfinfo{%
+ \ifx\pdfx@Title\@empty\else /Title(\pdfx@Title)\fi
+ \ifx\pdfx@Author\@empty\else /Author(\pdfx@Author)\fi
+ \ifx\pdfx@Subject\@empty\else /Subject(\pdfx@Subject)\fi
+ \ifx\pdfx@Keywords\@empty\else /Keywords(\pdfx@Keywords)\fi
+ /Creator(\pdfx@CreatorTool)%
\ifx\@pdfcreationdate\@empty
- \else
+ /CreationDate(D:\pdfx@convDate)%
+ \else
/CreationDate(\@pdfcreationdate)%
- \fi
- \ifx\@pdfmoddate\@empty
- \else
+ \fi
+ \ifx\@pdfmoddate\@empty
+ /ModDate(D:\pdfx@convDate)%
+ \else
/ModDate(\@pdfmoddate)%
- \fi
- /Producer(\xmpProducer)%
- /Trapped /False
- /GTS_PDFA1Version (PDF/A-1b:2005)%
- }%
- \Hy@DisableOption{pdfauthor}%
- \Hy@DisableOption{pdftitle}%
- \Hy@DisableOption{pdfsubject}%
- \Hy@DisableOption{pdfcreator}%
- \Hy@DisableOption{pdfcreationdate}%
- \Hy@DisableOption{pdfmoddate}%
- \Hy@DisableOption{pdfproducer}%
- \Hy@DisableOption{pdfkeywords}}
-\fi
+ \fi
+ /Producer(\pdfx@Producer)%
+ /Trapped/False
+ /GTS_PDFA1Version (PDF/A-\xmp@Part\xmp@conformance:\xmp@ReleaseDate)%
+ }% end of PDF/A info
+ }% end of \PDF@FinishDoc
+ }% end of \AtBeginDocument
+\fi\fi
+
+%%----------------------------------------------------------------------
+\RequirePackage{xmpincl}
+\begingroup
+ \ifpdfx@x
+ \ifpdfx@vt
+ \def\xmp@template{pdfvt}%
+ \else
+ \def\xmp@template{pdfx}% formerly pdfx-1a
+ \fi
+ \else
+ \ifpdfx@e
+ \def\xmp@template{pdfe}%
+ \else
+ \def\xmp@template{pdfa}%
+ \fi\fi
+ % patch commands from xmpincl.sty ...
+ \def\pdfx@xmpinclStart{% supply byte-order marker
+ <?xpacket begin='^^ef^^bb^^bf'? id='W5M0MpCehiHzreSzNTczkc9d' ?> %
+ }%
+ \def\pdfx@xmpinclStartAlt{% no byte-order marker
+ <?xpacket begin=''? id='W5M0MpCehiHzreSzNTczkc9d' ?> %
+ }%
+ \def\pdfx@xmpinclEnd{% allow XMP packet to be writable
+ <?xpacket end='w'?> %
+ }%
+ \let\mcs@xmpinclStart\pdfx@xmpinclStart
+ \let\mcs@xmpinclStartAlt\pdfx@xmpinclStartAlt
+ \ifpdfx@noBOM % don't use the byte-order marker
+ \let\mcs@xmpinclStart\pdfx@xmpinclStartAlt
+ \fi
+ \let\mcs@xmpinclEnd\pdfx@xmpinclEnd
+%% ... preventing their redefinition
+ \def\newcommand#1#2{}%
+ %
+ \pdfx@xmpmarkup
+ \catcode `\_ 12
+ \obeyspaces% beware of 128 space characters in the next line -- for padding end of XMP packet
+ \def\padding@line{ }%
+ \def\ifnot@empty#1#2{\ifx#1\@empty\else#2\fi}
+ \inputencoding{8bit}\makeatletter
+ \typeout{Using XMP template file: \xmp@template.xmp}%
+ \includexmp{\xmp@template}
+\endgroup
+
+%% disable hyperref options, to prevent changes that will cause an incompatibility
+ \Hy@DisableOption{pdfauthor}%
+ \Hy@DisableOption{pdftitle}%
+ \Hy@DisableOption{pdfsubject}%
+ \Hy@DisableOption{pdfcreator}%
+ \Hy@DisableOption{pdfcreationdate}%
+ \Hy@DisableOption{pdfmoddate}%
+ \Hy@DisableOption{pdfproducer}%
+ \Hy@DisableOption{pdfkeywords}%
\endinput
%%
%% End of file `pdfx.sty'.
diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfx.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfx.xmp
new file mode 100644
index 00000000000..4342740c57e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pdfx/pdfx.xmp
@@ -0,0 +1,345 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% File: pdfx.xmp
+%%
+%% Copyright (c) 2015, CV Radhakrishnan <cvr@river-valley.org>,
+%% Han The Thanh <thanh@river-valley.org>,
+%% Ross Moore <ross.moore@mq.edu.au>,
+%% Peter Selinger <selinger@mathstat.dal.ca>
+%%
+%% 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#">
+ <rdf:Description rdf:about=""
+ xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+ xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
+ xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/"
+ xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/">
+%% xmlns:pdf = "http://ns.adobe.com/pdf/1.3/"
+%% xmlns:pdfx = "http://ns.adobe.com/pdfx/1.3/"
+%% xmlns:pdfxid = "http://www.npes.org/pdfx/ns/id/"
+%% xmlns:xmp = "http://ns.adobe.com/xap/1.0/"
+%% xmlns:xmpRights = "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:pdfaExtension = "http://www.aiim.org/pdfa/ns/extension/"
+%% xmlns:pdfaField = "http://www.aiim.org/pdfa/ns/field#"
+%% xmlns:pdfaProperty = "http://www.aiim.org/pdfa/ns/property#"
+%% xmlns:pdfaSchema = "http://www.aiim.org/pdfa/ns/schema#"
+%% xmlns:pdfaType = "http://www.aiim.org/pdfa/ns/type#"
+%% xmlns:prism = "http://prismstandard.org/namespaces/basic/2.2/"
+%%% RRM: Other possible namespaces.
+%%% If these are used, then appropriate tags need to be declared, using
+%%% pdfaExtension:schemas similarly to below for prism:
+%% xmlns:pim = "http://prismstandard.org/namespaces/pim/2.2/"
+%% xmlns:prl = "http://prismstandard.org/namespaces/prl/2.1/"
+%% xmlns:pur = "http://prismstandard.org/namespaces/primusagerights/2.1/"
+%% >
+ <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate>
+ <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool>
+ <xmp:CreateDate>\xmp@convDate</xmp:CreateDate>
+ <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate>
+ \ifnot@empty\xmp@@Keywords{<pdf:Keywords>\xmp@@Keywords</pdf:Keywords>}
+ <pdf:Producer>\xmp@Producer</pdf:Producer>
+ <pdf:Trapped>False</pdf:Trapped>
+\ifnum\xmp@Part<4 <pdf:Version>PDF/X-\xmp@Part</pdf:Version>\fi
+ \ifnum\xmp@Part>3 <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance</pdfxid:GTS_PDFXVersion>\fi
+ <pdfx:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance\ifnum\xmp@Part<4:\xmp@ReleaseDate\fi</pdfx:GTS_PDFXVersion>
+ \ifnum\xmp@Part<3 <pdfx:GTS_PDFXConformance>PDF/X-\xmp@Part\xmp@Conformance:\xmp@ReleaseDate</pdfx:GTS_PDFXConformance>\fi
+% \ifnot@empty\xmp@AuthoritativeDomain{<pdfx:AuthoritativeDomain><rdf:Bag><rdf:li>\xmp@AuthoritativeDomain</rdf:li></rdf:Bag></pdfx:AuthoritativeDomain>}
+ \ifnot@empty\xmp@AuthoritativeDomain{<pdfx:AuthoritativeDomain>\xmp@AuthoritativeDomain</pdfx:AuthoritativeDomain>}
+ </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/">
+ \ifnot@empty\xmp@Copyright{<xmpRights:Marked>True</xmpRights:Marked>
+ <xmpRights:UsageTerms>
+ <rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li>
+ </rdf:Alt>
+ </xmpRights:UsageTerms>}
+ \ifnot@empty\xmp@CopyrightURL{<xmpRights:WebStatement>\xmp@CopyrightURL</xmpRights:WebStatement>}
+ </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <dc:format>application/pdf</dc:format>
+ \ifnot@empty\xmp@Title{<dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title>}
+ \ifnot@empty\xmp@@Author{<dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>}
+ \ifnot@empty\xmp@Publisher{<dc:publisher><rdf:Bag><rdf:li>\xmp@Publisher</rdf:li></rdf:Bag></dc:publisher>}
+ \ifnot@empty\xmp@Doi{<dc:identifier>doi:\xmp@Doi</dc:identifier>}
+ \ifnot@empty\xmp@Copyright{<dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></dc:rights>}
+ \ifnot@empty\xmp@Subject{<dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description>}
+ \ifnot@empty\xmp@Keywords{<dc:subject><rdf:Bag><rdf:li>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>}
+ </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/"
+ xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#"
+ xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#"
+%% RRM: do we really need the following two declarations ?
+% xmlns:pdfaType="http://www.aiim.org/pdfa/ns/type#"
+% xmlns:pdfaField="http://www.aiim.org/pdfa/ns/field#"
+ >
+ <pdfaExtension:schemas>
+ <rdf:Bag>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://ns.adobe.com/pdf/1.3/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>pdf</pdfaSchema:prefix>
+ <pdfaSchema:schema>Adobe PDF Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>A name object indicating whether the document has been modified to include trapping information</pdfaProperty:description>
+ <pdfaProperty:name>Trapped</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>PDF/X Part Version</pdfaProperty:description>
+ <pdfaProperty:name>Version</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://ns.adobe.com/pdfx/1.3/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>pdfx</pdfaSchema:prefix>
+ <pdfaSchema:schema>PDF/X Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description>
+ <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Conformance level of PDF/X standard</pdfaProperty:description>
+ <pdfaProperty:name>GTS_PDFXConformance</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>URL to an online version or preprint</pdfaProperty:description>
+ <pdfaProperty:name>AuthoritativeDomain</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Company creating the PDF</pdfaProperty:description>
+ <pdfaProperty:name>Company</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Date when document was last modified</pdfaProperty:description>
+ <pdfaProperty:name>SourceModified</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://ns.adobe.com/xap/1.0/mm/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>xmpMM</pdfaSchema:prefix>
+ <pdfaSchema:schema>XMP Media Management Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>UUID based identifier for specific incarnation of a document</pdfaProperty:description>
+ <pdfaProperty:name>InstanceID</pdfaProperty:name>
+ <pdfaProperty:valueType>URI</pdfaProperty:valueType>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>The common identifier for all versions and renditions of a document.</pdfaProperty:description>
+ <pdfaProperty:name>OriginalDocumentID</pdfaProperty:name>
+ <pdfaProperty:valueType>URI</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://www.npes.org/pdfx/ns/id/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>pdfxid</pdfaSchema:prefix>
+ <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description>
+ <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+%% RRM: this declares the namespace resource for PRISM metadata
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:schema>PRISM metadata</pdfaSchema:schema>
+ <pdfaSchema:namespaceURI>http://prismstandard.org/namespaces/basic/2.2/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>prism</pdfaSchema:prefix>
+ <pdfaSchema:property>
+ <rdf:Seq>
+%% RRM: Only need to define the tags that are actually used below.
+%% declare prism:aggregationType
+ \ifnot@empty\xmp@PublicationType{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>aggregationType</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>The type of publication. If defined, must be one of book, catalog, feed, journal, magazine, manual, newsletter, pamphlet.</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:issn
+ \ifnot@empty\xmp@Journalnumber{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>issn</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>The ISSN for the publication in which the resource was published</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:volume
+ \ifnot@empty\xmp@Volume{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>volume</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Additional identifier for the publication where the resource appeared, providing the Volume portion of the common Volume, Number scheme</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:number
+ \ifnot@empty\xmp@Issue{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>number</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Number of the Issue within the Volume</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:coverDisplayDate
+ \ifnot@empty\xmp@CoverDisplayDate{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>coverDisplayDate</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Date on the cover of a magazine issue, as a human-readable text string</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:coverDate
+ \ifnot@empty\xmp@CoverDate{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>coverDate</pdfaProperty:name>
+ <pdfaProperty:valueType>Date</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Date on the cover of a magazine issue, suitable for storing in a database field with a 'date' data type</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:issueName
+ \ifnot@empty\xmp@Journaltitle{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>issueName</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Additional identifier, typically used for major issues of a magazine or other resource</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:pageRange
+ \ifnot@empty\xmp@Firstpage{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>pageRange</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Page range for the published print version of the resource</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:startingPage
+ \ifnot@empty\xmp@Firstpage{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>startingPage</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>First page number for the published version of the resource</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:endingPage
+ \ifnot@empty\xmp@Lastpage{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>endingPage</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>The last page number for the printed resource</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:doi
+ \ifnot@empty\xmp@Doi{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>doi</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>Digital Object Identifier, DOI, for the article</pdfaProperty:description>
+ </rdf:li>}
+%% declare prism:url
+ \ifnot@empty\xmp@Doi{<rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>url</pdfaProperty:name>
+ <pdfaProperty:valueType>URL</pdfaProperty:valueType>
+ <pdfaProperty:category>external</pdfaProperty:category>
+ <pdfaProperty:description>URL for the article or unit of content</pdfaProperty:description>
+ </rdf:li>}
+%% RRM: more tags can be declared
+% <rdf:li rdf:parseType="Resource">
+% <pdfaProperty:name></pdfaProperty:name>
+% <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+% <pdfaProperty:category>external</pdfaProperty:category>
+% <pdfaProperty:description></pdfaProperty:description>
+% </rdf:li>
+ </rdf:Seq></pdfaSchema:property>
+ </rdf:li>
+ </rdf:Bag>
+ </pdfaExtension:schemas>
+ </rdf:Description>
+ <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/">
+ \ifnot@empty\xmp@PublicationType{<prism:aggregationType>\xmp@PublicationType</prism:aggregationType>}
+ \ifnot@empty\xmp@Journalnumber{<prism:issn>\xmp@Journalnumber</prism:issn>}
+ \ifnot@empty\xmp@Volume{<prism:volume>\xmp@Volume</prism:volume>}
+ \ifnot@empty\xmp@Issue{<prism:number>\xmp@Issue</prism:number>}
+ \ifnot@empty\xmp@CoverDisplayDate{<prism:coverDisplayDate>\xmp@CoverDisplayDate</prism:coverDisplayDate>}
+ \ifnot@empty\xmp@CoverDate{<prism:coverDate>\xmp@CoverDate</prism:coverDate>}
+ \ifnot@empty\xmp@Journaltitle{<prism:issueName>\xmp@Journaltitle</prism:issueName>}
+ \ifnot@empty\xmp@Firstpage{<prism:pageRange>\xmp@Firstpage-\xmp@Lastpage</prism:pageRange>}
+ \ifnot@empty\xmp@Firstpage{<prism:startingPage>\xmp@Firstpage</prism:startingPage>}
+ \ifnot@empty\xmp@Lastpage{<prism:endingPage>\xmp@Lastpage</prism:endingPage>}
+ \ifnot@empty\xmp@Doi{<prism:doi>\xmp@Doi</prism:doi>}
+ \ifnot@empty\xmp@Doi{<prism:url>http://dx.doi.org/\xmp@Doi</prism:url>}
+ </rdf:Description>
+% <rdf:Description rdf:about=""
+% xmlns:dc="http://purl.org/dc/elements/1.1/">
+% <dc:format>application/pdf</dc:format>
+% <dc:title>
+% <rdf:Alt>
+% <rdf:li xml:lang="x-default">\xmp@Title</rdf:li>
+% </rdf:Alt>
+% </dc:title>
+% <dc:description>
+% <rdf:Alt>
+% <rdf:li xml:lang="x-default">\xmp@Subject</rdf:li>
+% </rdf:Alt>
+% </dc:description>
+% <dc:creator>
+% <rdf:Bag>
+% <rdf:li>\xmp@@Author</rdf:li>
+% </rdf:Bag>
+% </dc:creator>
+% <dc:subject>
+% <rdf:Bag>
+% <rdf:li>\xmp@Keywords</rdf:li>
+% </rdf:Bag>
+% </dc:subject>
+% </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
+ <xmpMM:DocumentID>uuid:\xmp@docid</xmpMM:DocumentID>
+ <xmpMM:InstanceID>uuid:\xmp@instid</xmpMM:InstanceID>
+\ifnum\xmp@Part>3 <xmpMM:RenditionClass>default</xmpMM:RenditionClass>\fi
+\ifnum\xmp@Part>3 <xmpMM:VersionID>1</xmpMM:VersionID>\fi
+ </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+% padding with 512 space characters to allow easier editing within a PDF
+\padding@line
+\padding@line
+\padding@line
+\padding@line
+%%
+%% End of pdfx.xmp
+%%
+%%
+
+
diff --git a/Master/texmf-dist/tex/latex/pdfx/sRGB_IEC61966-2-1_black_scaled.icc b/Master/texmf-dist/tex/latex/pdfx/sRGB_IEC61966-2-1_black_scaled.icc
new file mode 100644
index 00000000000..71e33830223
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pdfx/sRGB_IEC61966-2-1_black_scaled.icc
Binary files differ
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 95321c825d1..d34df995eac 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -782,7 +782,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'pdfjam', "&MAKEflatten",
'pdfmarginpar',"&MAKEflatten",
'pdfrack', "die 'skipping, until someone asks for it'",
- 'pdfx', "&MAKEflatten",
'pedigree', "die 'skipping, use pedigree-perl'",
'persian-bib', "&MAKEflatten",
'persian-hm-ftx',"die 'skipping, legality?'", #"&MAKEflatten",