pdfx (13may15)

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

12 files changed, 244 insertions, 114 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/manifest.txt b/Master/texmf-dist/doc/latex/pdfx/manifest.txt
deleted file mode 100644
index 425fcf60821..00000000000
--- a/Master/texmf-dist/doc/latex/pdfx/manifest.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-% \iffalse meta-comment 
-%
-% Copyright 2008 CV Radhakrishnan and Han The Thanh
-%
-% This file is part of the 'pdfx' package.
-% ----------------------------------------
-%
-% It 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.
-%
-% The list of all files belonging to the LaTeX package, 'pdfx.sty' is
-% given in the file `manifest.txt'.
-%
-% \fi
-%
-% CONTENTS
-
-README
- Readme file
-
-glyphtounicode-cmr.tex
- maps glyphnames in cmr font to Unicode
-
-pdfa-1b.xmp
- xmp template for pdf/a-1b documents
-
-pdfx-1a.xmp
- xmp template for pdf/x-1a documents
-
-pdfx.sty
- the main package
-
-pdfx.pdf
- documentation in pdf format
-
-small2e.pdf
- example pdf document
-
-small2e.tex
- example TeX document
-
-small2e.xmpdata
- data file with meta information
-
-Directory: src
-
-Makefile
- make file for compiling documentation
-
-pdfx.dtx
- main package with driver
-
-pdfx.ins
- main installer batch file
-
-rvdtx.sty
- extra package needed to compile documentation
-
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
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
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
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
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