pdfx (11mar19)

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

8 files changed, 642 insertions, 3421 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfx/pdfx-16.sty b/Master/texmf-dist/doc/latex/pdfx/pdfx-16.sty
deleted file mode 100644
index 7c2d4209761..00000000000
--- a/Master/texmf-dist/doc/latex/pdfx/pdfx-16.sty
+++ /dev/null
@@ -1,2978 +0,0 @@
-%%
-%% This is file `pdfx.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% pdfx.dtx  (with options: `package')
-%% 
-%%  Copyright (c) 2018, 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.
-%% 
-\@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}
-  [2018/11/29 v1.6 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 fully implemented yet
-\newif\ifpdfx@ua\pdfx@uafalse   % PDF/UA mode; not fully 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\ifpdfx@noerr   % error messages become just warnings
-
-\DeclareOption{noerr}{\pdfx@noerrtrue}
-
-%% 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.
-
-\newcount\pdfx@minorversion
-\expandafter\ifx\csname pdfminorversion\endcsname\relax
-\else
- \global\pdfx@minorversion=\the\pdfminorversion
-\fi
-
-\def\pdfx@ErrorWarning#1#2#3#4{%
- \ifpdfx@noerr \PackageWarning{pdfx}{#1.^^J  #2#3.^^J}%
- \else \PackageError{pdfx}{#1}{#2#4.^^J
-    Use option 'noerr' to avoid this message.^^J}%
- \fi}
-
-\def\pdfx@Xvn@message{%
- \pdfx@ErrorWarning{PDF/X-5n has no default profile}%
-   {Provide your own}{; continuing to build a non-valid document}%
-   {, else continue to build a non-valid document}%
-}
-
-%% PDF/A options
-%%  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}}
-%%
-%% PDF/X options
-%% comments added, using
-%% https://www.eci.org/_media/downloads/pdfx/pdfx_faq_english_nov05.pdf
-%% https://en.wikipedia.org/wiki/PDF/X#List_of_the_PDF.2FX_standards
-%%
-\DeclareOption{x-1}{\global\pdfx@xtrue\def\xmp@Part{1}%  obsolete
- \def\xmp@Conformance{a}\def\xmp@ReleaseDate{1999}% CMYK only
- \global\pdfx@minorversion=2\relax
- \pdfx@ErrorWarning{PDF/X-1:1999 is no longer an accepted standard}%
-    {Use option  x-1a1 or  x-1a3 }{; continuing to build a non-valid document}%
-    {, else continue to build a non-valid document.}%
- }%  effectively same as  x-1a1
-\DeclareOption{x-1a}{\global\pdfx@xtrue\def\xmp@Part{1}% CMYK only
- \def\xmp@Conformance{a}\def\xmp@ReleaseDate{2003}%
- \global\pdfx@minorversion=3 }%  same as  x-1a3
-\DeclareOption{x-1a1}{\global\pdfx@xtrue\def\xmp@Part{1}%
- \def\xmp@Conformance{a}\def\xmp@ReleaseDate{2001}%  ISO 15930-1:2001
- \global\pdfx@minorversion=3 }
-\DeclareOption{x-1a3}{\global\pdfx@xtrue\def\xmp@Part{1}%
- \def\xmp@Conformance{a}\def\xmp@ReleaseDate{2003}%  ISO 15930-4:2003
- \global\pdfx@minorversion=3 }
-\DeclareOption{x-2}{\global\pdfx@xtrue\def\xmp@Part{2}%  XMP Metadata
-%% \def\xmp@Conformance{}\def\xmp@ReleaseDate{2002}%  ISO 15930-2:2003
- \def\xmp@Conformance{}\def\xmp@ReleaseDate{2003}%   ISO 15930-5, withdrawn 2011
- \global\pdfx@minorversion=4\relax
- \pdfx@ErrorWarning{PDF/X-2:2003 was never published as a standard}%
-   {Use option  x-1a or  x-3 }{; continuing to build a non-valid document}%
-   {, else continue to build a non-valid document}%
- }%  external OPI workflow, i.e. multiple files involved
-\DeclareOption{x-3}{\global\pdfx@xtrue\def\xmp@Part{3}% RGB allowed, but rare!
- \def\xmp@Conformance{}\def\xmp@ReleaseDate{2003}%
- \global\pdfminorversion=4 }%  same as x-303
-\DeclareOption{x-302}{\global\pdfx@xtrue\def\xmp@Part{3}%
- \def\xmp@Conformance{}\def\xmp@ReleaseDate{2002}%   ISO 15930-3:2002
- \global\pdfx@minorversion=3 }
-\DeclareOption{x-303}{\global\pdfx@xtrue\def\xmp@Part{3}%
- \def\xmp@Conformance{}\def\xmp@ReleaseDate{2003}%  ISO 15930-6:2003
- \global\pdfx@minorversion=4 }
-%%%  Later versions, yet to be fully implemented
-\DeclareOption{x-4}{\global\pdfx@xtrue\def\xmp@Part{4}%
- \def\xmp@Conformance{}\def\xmp@ReleaseDate{2010}%  ISO 15930-7:2010
- \global\pdfx@minorversion=6 }%  same as  x-410
-\DeclareOption{x-4p}{\global\pdfx@xtrue\global\no@iccprofiletrue
-  \def\xmp@Part{4}\def\xmp@Conformance{p}\def\xmp@ReleaseDate{2010}%
-  \global\pdfx@minorversion=6 }%  same as  x-4p10
-\DeclareOption{x-408}{\global\pdfx@xtrue\def\xmp@Part{4}%
- \def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}%  ISO 15930-7:2008
- \global\pdfx@minorversion=6 }
-\DeclareOption{x-410}{\global\pdfx@xtrue\def\xmp@Part{4}%
- \def\xmp@Conformance{}\def\xmp@ReleaseDate{2010}%  ISO 15930-7:2010
- \global\pdfx@minorversion=6 }
-\DeclareOption{x-4p08}{\global\pdfx@xtrue\global\no@iccprofiletrue
-  \def\xmp@Part{4}\def\xmp@Conformance{p}\def\xmp@ReleaseDate{2008}%
-  \global\pdfx@minorversion=6 }%   ISO 15930-7:2010
-\DeclareOption{x-4p10}{\global\pdfx@xtrue\global\no@iccprofiletrue
-  \def\xmp@Part{4}\def\xmp@Conformance{p}\def\xmp@ReleaseDate{2010}%
-  \global\pdfx@minorversion=6 }%   ISO 15930-7:2010
-\DeclareOption{x-5}{\global\pdfx@xtrue\def\xmp@Part{5}%
- \def\xmp@Conformance{g}\def\xmp@ReleaseDate{2008}%
- \global\pdfx@minorversion=6 }%   ISO 15930-8:2010
-\DeclareOption{x-5g}{\global\pdfx@xtrue\def\xmp@Part{5}%
- \def\xmp@Conformance{g}\def\xmp@ReleaseDate{2008}%
- \global\pdfx@minorversion=6 }%   ISO 15930-8:2010
-\DeclareOption{x-5n}{\global\pdfx@xtrue %\global\no@iccprofiletrue
- \def\xmp@Part{5}\def\xmp@Conformance{n}\def\xmp@ReleaseDate{2010}%
- \global\pdfx@minorversion=6 \pdfx@Xvn@message}%   ISO 15930-8:2010
-\DeclareOption{x-5pg}{\global\pdfx@xtrue\global\no@iccprofiletrue
-  \def\xmp@Part{5}\def\xmp@Conformance{pg}\def\xmp@ReleaseDate{2010}%
-  \global\pdfx@minorversion=6 }%  ISO 15930-8:2010
-\DeclareOption{x-508}{\global\pdfx@xtrue\def\xmp@Part{5}%
- \def\xmp@Conformance{g}\def\xmp@ReleaseDate{2008}%
- \global\pdfx@minorversion=6 }%   ISO 15930-8:2008
-\DeclareOption{x-5g08}{\global\pdfx@xtrue\def\xmp@Part{5}%
- \def\xmp@Conformance{g}\def\xmp@ReleaseDate{2008}%
- \global\pdfx@minorversion=6 }%   ISO 15930-8:2008
-\DeclareOption{x-5n08}{\global\pdfx@xtrue %\global\no@iccprofiletrue
- \def\xmp@Part{5}\def\xmp@Conformance{n}\def\xmp@ReleaseDate{2008}%
- \global\pdfx@minorversion=6 \pdfx@Xvn@message}%   ISO 15930-8:2008
-\DeclareOption{x-5pg08}{\global\pdfx@xtrue\global\no@iccprofiletrue
-  \def\xmp@Part{5}\def\xmp@Conformance{pg}\def\xmp@ReleaseDate{2008}%
-  \global\pdfx@minorversion=6 }%  ISO 15930-8:2008
-\DeclareOption{x-510}{\global\pdfx@xtrue\def\xmp@Part{5}%
- \def\xmp@Conformance{g}\def\xmp@ReleaseDate{2010}%
- \global\pdfx@minorversion=6 }%  ISO 15930-8:2010
-\DeclareOption{x-5g10}{\global\pdfx@xtrue\def\xmp@Part{5}%
- \def\xmp@Conformance{g}\def\xmp@ReleaseDate{2010}%
- \global\pdfx@minorversion=6 }%  ISO 15930-8:2010
-\DeclareOption{x-5n10}{\global\pdfx@xtrue %\global\no@iccprofiletrue
- \def\xmp@Part{5}\def\xmp@Conformance{n}\def\xmp@ReleaseDate{2010}%
- \global\pdfx@minorversion=6 \pdfx@Xvn@message}%  ISO 15930-8:2010
-\DeclareOption{x-5pg10}{\global\pdfx@xtrue\global\no@iccprofiletrue
-  \def\xmp@Part{5}\def\xmp@Conformance{pg}\def\xmp@ReleaseDate{2010}%
-  \global\pdfx@minorversion=6 }%  ISO 15930-8:2010
-%%
-%% PDF/E options
-%%
-\DeclareOption{e}{\global\pdfx@xfalse\global\pdfx@etrue
-  \def\xmp@Part{1}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}%
-  \gdef\thepdfminorversion{6}%   same as  e-1
-  }
-\DeclareOption{e-1}{\global\pdfx@xfalse\global\pdfx@etrue
-  \def\xmp@Part{1}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}%
-  \gdef\thepdfminorversion{6}%  ISO 24517-1:2008
-  }
-%% PDF/UA options
-%%
-\let\xmp@PDFUA\@empty
-\DeclareOption{ua}{\global\pdfx@uatrue % ISO 14289-1:2012, 2014
-  \def\xmp@UAlevel{1}\let\xmp@PDFUA\relax}%   same as  ua-1
-\DeclareOption{ua-1}{\global\pdfx@uatrue % ISO 14289-1:2012, 2014
-  \def\xmp@UAlevel{1}\let\xmp@PDFUA\relax}
-%%
-%% PDF/VT options
-%%
-\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}%
-  \gdef\xmpMM@VersionID{1}%
-  \global\pdfx@minorversion=6 }
-\DeclareOption{vt-2}{\global\pdfx@xtrue\global\pdfx@vttrue
-  \global\no@iccprofiletrue   \gdef\xmpMM@VersionID{1}%
-  \def\xmp@Part{5}\def\xmp@vtPart{2}\def\xmp@Conformance{pg}%
-  \def\xmp@vtConformance{}\def\xmp@ReleaseDate{2010}%
-  \global\pdfx@minorversion=6 }
-\DeclareOption{vt-2s}{\global\pdfx@xtrue\global\pdfx@vttrue
-  \global\no@iccprofiletrue   \gdef\xmpMM@VersionID{1}%
-  \def\xmp@Part{5}\def\xmp@vtPart{2}\def\xmp@Conformance{pg}%
-  \def\xmp@vtConformance{s}\def\xmp@ReleaseDate{2010}%
-  \global\pdfx@minorversion=6 }
-
-%% options to alter PDF minor version, in case needed in special circumstances
-\DeclareOption{pdf12}{\global\pdfx@minorversion=2 }%  1999
-\DeclareOption{pdf13}{\global\pdfx@minorversion=3 }%  2001  Acrobat 4 (ISBN 0-201-61588-6)
-\DeclareOption{pdf14}{\global\pdfx@minorversion=4 }%  2003  Acrobat 5 (ISBN 0-201-75839-3)
-\DeclareOption{pdf15}{\global\pdfx@minorversion=5 }%  2005  Acrobat 6
-\DeclareOption{pdf16}{\global\pdfx@minorversion=6 }%  2006  Acrobat 7 (ISBN 0-321-30474-8)
-\DeclareOption{pdf17}{\global\pdfx@minorversion=7 }%  2008  ISO 32000-1:2008
-
-%% inhibits writing the XMP byte-order marker
-\DeclareOption{noBOM}{\pdfx@noBOMtrue}
-\DeclareOption{useBOM}{\pdfx@noBOMfalse}
-
-%% options for language character macros in XMP metadata
-\newif\ifcyrxmp
-\newif\ifcyrKOIxmp
-\newif\ifgrkxmp
-\newif\ifgrkLGRxmp
-\newif\ifhebxmp
-\newif\ifhebHEBxmp
-\newif\ifarbxmp
-\newif\ifarmxmp
-\newif\ifarmSCIxmp
-\newif\ifdevxmp
-\newif\ifvnmxmp
-\newif\iflatEXTxmp
-\newif\iflatLATxmp
-\newif\ifipaxmp
-\newif\ifmathxmp
-
-\DeclareOption{latxmp}{\global\latEXTxmptrue}
-\DeclareOption{LATxmp}{\global\latLATxmptrue\global\latEXTxmptrue}
-\DeclareOption{cyrxmp}{\global\cyrxmptrue}
-\DeclareOption{KOIxmp}{\global\cyrKOIxmptrue\global\cyrxmptrue}
-\DeclareOption{grkxmp}{\global\grkxmptrue}
-\DeclareOption{LGRxmp}{\global\grkLGRxmptrue\global\grkxmptrue}
-\DeclareOption{hebxmp}{\global\hebxmptrue}
-\DeclareOption{HEBxmp}{\global\hebHEBxmptrue\global\hebxmptrue}
-\DeclareOption{arbxmp}{\global\arbxmptrue}
-\DeclareOption{armxmp}{\global\armxmptrue}
-\DeclareOption{AR8xmp}{\global\armSCIxmptrue\global\armxmptrue}
-\DeclareOption{devxmp}{\global\devxmptrue}
-\DeclareOption{vnmxmp}{\global\vnmxmptrue}
-\DeclareOption{ipaxmp}{\global\ipaxmptrue\global\latEXTxmptrue}
-\DeclareOption{mathxmp}{\global\mathxmptrue\global\grkxmptrue}
-
-%% all the above
-\DeclareOption{allxmp}{%
- \global\cyrxmptrue
- \global\cyrKOIxmptrue
- \global\grkxmptrue
- \global\grkLGRxmptrue
- \global\hebxmptrue
- \global\hebHEBxmptrue
- \global\arbxmptrue
- \global\armxmptrue
- \global\armSCIxmptrue
- \global\devxmptrue
- \global\vnmxmptrue
- \global\latEXTxmptrue
- \global\latLATxmptrue
- \global\vnmxmptrue
- \global\ipaxmptrue
- \global\mathxmptrue
- \global\let\pdfx@useactivespacestrue\pdfx@useactivespacesfalse
-}
-
-\newif\ifpdfx@useactivespaces
-
-\ExecuteOptions{noBOM,a-1b}
-\ProcessOptions
-
-\ifpdfx@ua\ifpdfx@x\else
- \expandafter\if\xmp@Conformance A\else
- \pdfx@ErrorWarning{PDF/UA requires 'Tagged PDF' for any structure.^^J
-  Then PDF/A Conformance must be 'a'}%
-  {Use option 'a-\xmp@Part a'}%
-  {; continuing with a likely invalid document}%
-  {, or continue for a likely invalid document}%
-%%%  \gdef\xmp@Conformance{A}%   do we want this?
-\fi\fi\fi
-
-\expandafter\ifx\csname pdflastobj\endcsname\relax
-\else
- \ifnum\pdflastobj >\z@ % pdftex  has already written objects
-  \ifnum\pdfx@minorversion=\pdfminorversion\else
-   \PackageError{pdfx}%
-    {^^J(pdfx)    Cannot change the \string\pdfminorversion^^J%
-     (pdfx)   PDF version remains at 1.\the\pdfminorversion.^^J%
-     (pdfx)   Use \string\pdfminorversion=\the\pdfx@minorversion\space
-      before \string\documentclass}%
-    {(pdfx)   Another package or document-class has written objects into the PDF.^^J%
-     (pdfx)   Hit return to continue with PDF version 1.\the\pdfminorversion.%
-    }%
-   \global\pdfx@minorversion=\the\pdfminorversion
-  \fi
- \else
-  \global\pdfminorversion\pdfx@minorversion
- \fi
-\fi
-
-\expandafter\ifx\csname thepdfminorversion\endcsname\relax
- \expandafter\ifx\csname pdfminorversion\endcsname\relax
- \else
-  \xdef\thepdfminorversion{\the\pdfminorversion}
-\fi\fi
-
-\expandafter\ifx\csname pdfminorversion\endcsname\relax
- \gdef\thepdfminorversion{4}% assumed with XeTeX
- \def\pdf@minorversion@xetex=#1{\gdef\thepdfminorversion{#1}}%
- \let\pdfminorversion\pdf@minorversion@xetex
-\else
- \ifnum\pdfminorversion < 4\relax
-  \ifpdfx@x
-    % more testing needed with PDF/X
-  \else
-   \pdfminorversion=4\relax %  assumed for PDF/A ;  options may change this for  PDF/X
-   \gdef\thepdfminorversion{4}%
-  \fi
- \else
-  \ifnum\pdfminorversion<\thepdfminorversion\relax
-   \global\pdfminorversion=\thepdfminorversion\relax
-  \fi
- \fi
-\fi
-\expandafter\ifx\csname pdfresetpageorigin\endcsname\relax\else
- \pdfresetpageorigin=0
-\fi
-
-\newif\ifpdfx@nopdfinfo
-\ifmathxmp\pdfx@nopdfinfotrue
-\else
- \iflatLATxmp\pdfx@nopdfinfotrue
-\else
- \ifgrkLGRxmp\pdfx@nopdfinfotrue
-\else
- \ifhebHEBxmp\pdfx@nopdfinfotrue
-\else
- \ifcyrKOIxmp\pdfx@nopdfinfotrue
-\else
- \ifarmSCIxmp\pdfx@nopdfinfotrue
-\fi\fi\fi\fi\fi\fi
-
-\iflatLATxmp\pdfx@useactivespacestrue\fi
-\ifgrkLGRxmp\pdfx@useactivespacestrue\fi
-\ifhebHEBxmp\pdfx@useactivespacestrue\fi
-\ifcyrKOIxmp\pdfx@useactivespacestrue\fi
-\ifarmSCIxmp\pdfx@useactivespacestrue\fi
-
-\newif\ifpdfx@transliterated
-\ifgrkLGRxmp\pdfx@transliteratedtrue\fi
-\ifhebHEBxmp\pdfx@transliteratedtrue\fi
-\ifarmSCIxmp\pdfx@transliteratedtrue\fi
-
-\RequirePackage{iftex}
-\RequirePackage{ifpdf}
-%% Support for pdfTeX primitives when using XeTeX:
-\RequirePackage{ifxetex}
-\ifxetex
- \def\pdfx@pages@xetex#1{\special{pdf:put @pages <<#1>>}}
- \def\pdfx@docinfo@xetex#1{\special{pdf:put @docinfo <<#1>>}}
- \def\pdfx@catalog@xetex#1{\special{pdf:put @catalog <<#1>>}}
- \def\pdfx@mapline@xetex#1{}
- \def\pdf@compress@xetex=#1{}
-%%
- \let\pdfpageattr\pdfx@pages@xetex
- \let\pdfinfo\pdfx@docinfo@xetex
- \let\pdfcatalog\pdfx@catalog@xetex
- \let\pdfmapline\pdfx@mapline@xetex
- \let\pdfcompresslevel\pdf@compress@xetex
- \let\pdfobjcompresslevel\pdf@compress@xetex
-\fi
-
-%%\newif\ifpdfx@pdfmark  %  control future support for  dvips
-
-\RequirePackage{ifluatex}
-\ifluatex
- \IfFileExists{luatex85.sty}{% 2016+
-  \RequirePackage{luatex85}%
-  \edef\pdfcreationdate{\pdfcreationdate}%
- }{%  earlier versions
- }%
- \RequirePackage{pdftexcmds}%
- \let\pdfx@mdfivesum\pdf@mdfivesum
- \let\pdfescapestring\pdf@escapestring
-\else
- \ifxetex
-  \usepackage{everyshi}%
-  \expandafter\ifx\csname mdfivesum\endcsname\relax
-   %  too early a version of  XeTeX
-   \let\pdfx@mdfivesum\relax
-  \else
-   %  since mid-2015
-   \let\pdfx@mdfivesum\mdfivesum
-  \fi
- \else
-  \let\pdfx@mdfivesum\pdfmdfivesum
- \fi
-\fi
-\def\pdfx@encodingfile{l8u-penc.def}
-
-\expandafter\ifx\csname pdftexbanner\endcsname\relax
- \expandafter\ifx\csname luatexbanner\endcsname\relax
- \else %  luatex85
-  \let\pdftexbanner\luatexbanner
- \fi
-\else %  pdfTeX, but which version ???
- {\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}%
- \fi
-\fi
-
-%% How to support XeTeX here ?
-\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
- \begingroup
-  \dimen0=0.996264009963\paperwidth\relax
-  \edef\pdfx@mwidth{\strip@pt\dimen0}%
-  \advance\dimen0 -25\p@
-  \edef\pdfx@twidth{\strip@pt\dimen0}%
-  \dimen0=0.996264009963\paperheight\relax
-  \edef\pdfx@mheight{\strip@pt\dimen0}%
-  \advance\dimen0 -20\p@
-  \edef\pdfx@theight{\strip@pt\dimen0}%
-  \ifxetex
-   \xdef\pdfx@everypage@xetex{%
-    /MediaBox[0 0 \pdfx@mwidth\space \pdfx@mheight]^^J
-    /TrimBox[25 20 \pdfx@twidth\space \pdfx@theight]%
-   }%
-  \fi
-  \edef\next{\endgroup\global\pdfpagesattr{%
-    /MediaBox[0 0 \pdfx@mwidth\space \pdfx@mheight]^^J
-%%    /ArtBox[0 0 \pdfx@mwidth\space \pdfx@mheight]^^J
-    /BleedBox[0 0 \pdfx@mwidth\space \pdfx@mheight]^^J
-    /CropBox[0 0 \pdfx@mwidth\space \pdfx@mheight]^^J
-    /TrimBox[25 20 \pdfx@twidth\space \pdfx@theight]}
-  }\next \relax
- \ifxetex
-  \AtBeginDvi{%
-   \immediate\special{pdf:put @thispage <<\pdfx@everypage@xetex>>}}%
-  \EveryShipout{%
-   \immediate\special{pdf:put @thispage <<\pdfx@everypage@xetex>>}}%
- \else
-  \expandafter\pdfpageattr\expandafter{\the\pdfpagesattr}%
- \fi
-\else
-%%  PDF/A-1b  doesn't allow object compression
- \ifnum\xmp@ReleaseDate=2005\relax
-  \expandafter\ifx\csname pdfobjcompresslevel\endcsname\relax
-  \else
-   \pdfobjcompresslevel=0\relax
- \fi \fi
-\fi
-\ifxetex
-%% How to support XeTeX here ?
-\else
- \ifnum\thepdfminorversion >3 \relax
-  \expandafter\ifx\csname pdfsuppresswarningdupmap\endcsname\relax
-   \expandafter\ifx\csname pdfmapline\endcsname\relax\else
-    \pdfmapline{+dummy-space <dummy-space.pfb}
-   \fi
-  \else
-   \advance\pdfsuppresswarningdupmap 1
-   \pdfmapline{+dummy-space <dummy-space.pfb}
-   \advance\pdfsuppresswarningdupmap -1
-  \fi
-  \expandafter\ifx\csname pdfgeninterwordspace\endcsname\relax\else
-   \pdfgeninterwordspace=1 \relax
-  \fi
- \fi
-\fi
-
-\ifluatex\else\ifxetex\else
- \@ifpackageloaded{inputenc}{%
- }{%
-  \RequirePackage{inputenc}
- % allow this to be loaded again cleanly
- \expandafter\let\csname ver@inputenc.sty\endcsname\relax
- }
-\fi\fi
-
-%% pseudo-declare the L8U encoding
-\expandafter\let\csname L8U-cmd\expandafter\endcsname\csname OT1-cmd\endcsname
-\@namedef{T@L8U}{}%
-\@namedef{D@L8U}{}%
-\@namedef{M@L8U}{}%
-
-%% adjust to LaTeX's 2018 change to the default encoding
-\expandafter\ifx\csname inputencodingname\endcsname\relax
-\else
- \def\pdfx@restoreencoding#1{%
-  \@tempcnta=128
-  \loop
-   \catcode\@tempcnta=13
-   \advance\@tempcnta\@ne
-  \ifnum\@tempcnta<256
-  \repeat
-  \inputencoding{#1}%
-  }%
-  \AtEndOfPackage{\pdfx@restoreencoding\pdfx@inputencodingname}%
-  \let\pdfx@inputencodingname\inputencodingname
-  \let\pdfx@DeclareUnicodeCharacter\DeclareUnicodeCharacter
-  \UseRawInputEncoding
-\fi
-\InputIfFileExists{\pdfx@encodingfile}{}{}
-\expandafter\ifx\csname pdfx@inputencodingname\endcsname\relax
-\else
-  \let\inputencodingname\pdfx@inputencodingname
-  \let\DeclareUnicodeCharacter\pdfx@DeclareUnicodeCharacter
-  \let\DeclareFontEncoding@\DeclareFontEncoding@saved
-  \inputencoding{\inputencodingname}%
-\fi
-
-%%----------------------------------------------------------------------
-%% 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
- \ifpdfx@useactivespaces\obeyspaces\fi % capture spaces as active characters
- \xmp@doparse{#1}%
-}
-\def\afterxmp@parse{}% methods may change this
-\def\xmp@doparse#1#2{%
- \def\@this{#2}#1
- \endgroup
- % do any post-processing
- \afterxmp@parse
- \def\afterxmp@parse{}%
-}
-
-%%----------------------------------------------------------------------
-%% Local commands. They are only brought into scope during the reading
-%% of xmpdata. Some fields can have a 'xml:lang' attribute; others must have.
-%%  LANG values as in:  (BCP 47)  https://tools.ietf.org/html/rfc5646#appendix-A
-%%
-\def\xmp@lang@Default{x-default}
-\let\xmp@lang@Title\xmp@lang@Default
-\let\xmp@lang@Author\xmp@lang@Default
-\let\xmp@lang@Keywords\xmp@lang@Default
-\let\xmp@lang@Subject\xmp@lang@Default
-%%\def\xmp@lang@CreatorTool{\xmp@lang@Default}
-\let\xmp@lang@Producer\xmp@lang@Default
-%%\def\xmp@lang@Volume{\xmp@lang@Default}
-%%\def\xmp@lang@Issue{\xmp@lang@Default}
-\let\xmp@lang@Copyright\xmp@lang@Default
-\let\xmp@lang@PublicationType\xmp@lang@Default
-\let\xmp@lang@Publisher\xmp@lang@Default
-\let\xmp@lang@Coverage\xmp@lang@Default
-\let\xmp@lang@Contributor\xmp@lang@Default
-\let\xmp@lang@Relation\xmp@lang@Default
-%%%  PRISM fields
-\let\xmp@lang@CoverDisplayDate\xmp@lang@Default
-\let\xmp@lang@JournalTitle\xmp@lang@Default
-%%\def\xmp@lang@JournalNumber{\xmp@lang@Default}
-%%%  xmp:  &  xmpRights:  fields
-\let\xmp@lang@Advisory\xmp@lang@Default
-\let\xmp@lang@Identifier\xmp@lang@Default
-\let\xmp@lang@Nickname\xmp@lang@Default
-\let\xmp@lang@Owner\xmp@lang@Default
-
-%% some validators require a language attribute for
-%%   dc:title                 set via  \Title
-%%   dc:description   set via  \Subject
-%%   dc:rights              set via  \Copyright
-%%   xmpRights:UsageTerms   set via \Copyright
-%%
-{\catcode `\" 12 \catcode`\: 12 \catcode`\= 12
- \gdef\pdfx@xmp@checklang#1{%
-  \ifx #1\xmp@lang@Default\else\space xml:lang="#1"\fi}
- \gdef\pdfx@xmp@strictlang#1{\space xml:lang="#1"}
-}%  end of  \catcodes
-\let\xmp@checklang\pdfx@xmp@checklang
-\let\xmp@strictlang\pdfx@xmp@strictlang
-
-\newcommand{\pdfx@Title}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@Title{#1}\fi
- \xmp@parse{\global\let\xmp@Title\@this}}
-
-%% allow for multiple authors, keywords and languages
-%%  also:  contributor, date, relation, type, thumbnails
-%%  and  AuthoritativeDomain, Advisory, Identifier, Owner
-\newcommand{\pdfx@Author}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@Author{#1}\fi
- \def\afterxmp@parse{\let\Author\pdfx@extraAuthor}%
- \xmp@parse{\global\let\xmp@Author\@this}}
-\newcommand{\pdfx@Keywords}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@Keywords{#1}\fi
- \def\afterxmp@parse{\let\Keywords\pdfx@extraKeywords}%
- \xmp@parse{\global\let\xmp@Keywords\@this}}
-\newcommand{\pdfx@Language}{%
- \def\afterxmp@parse{\let\Language\pdfx@extraLanguages}%
- \xmp@parse{\global\let\xmp@Language\@this}}
-
-\newcommand{\pdfx@AuthoritativeDomain}{%
- \def\afterxmp@parse{\let\AuthoritativeDomain\pdfx@extraAuthoritativeDomain}%
- \xmp@parse{\global\let\xmp@AuthoritativeDomain\@this}}
-\newcommand{\pdfx@Date}{%
- \def\afterxmp@parse{\let\Date\pdfx@extraDate}%
- \xmp@parse{\global\let\xmp@Date\@this}}
-\newcommand{\pdfx@Contributor}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@Contributor{#1}\fi
- \def\afterxmp@parse{\let\Contributor\pdfx@extraContributor}%
- \xmp@parse{\global\let\xmp@Contributor\@this}}
-\newcommand{\pdfx@Relation}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@Relation{#1}\fi
- \def\afterxmp@parse{\let\Relation\pdfx@extraRelation}%
- \xmp@parse{\global\let\xmp@Relation\@this}}
-%%\newcommand{\pdfx@Type}[1][]{%
-%% \ifx\relax#1\relax\else\gdef\xmp@lang@Type{#1}\fi
-%% \def\afterxmp@parse{\let\Type\pdfx@extraType}%
-%% \xmp@parse{\global\let\xmp@Type\@this}}
-
-\newcommand{\pdfx@Advisory}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@Advisory{#1}\fi
- \def\afterxmp@parse{\let\Advisory\pdfx@extraAdvisory}%
- \xmp@parse{\global\let\xmp@Advisory\@this}}
-\newcommand{\pdfx@Identifier}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@Identifier{#1}\fi
- \def\afterxmp@parse{\let\Identifier\pdfx@extraIdentifier}%
- \xmp@parse{\global\let\xmp@Identifier\@this}}
-\newcommand{\pdfx@Thumbnails}{%
- \def\afterxmp@parse{\let\Thumbnails\pdfx@extraThumbnails}%
- \xmp@parse{\global\let\xmp@Thumbnails\@this}}
-
-\newcommand{\pdfx@Owner}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@Owner{#1}\fi
- \def\afterxmp@parse{\let\Owner\pdfx@extraOwner}%
- \xmp@parse{\global\let\xmp@Owner\@this}}
-
-{\obeyspaces%
- \ifpdfx@useactivespaces\gdef\pdfx@insert@sep{\sep }%
- \else\gdef\pdfx@insert@sep{\sep}\fi%
-}
-\newcommand{\pdfx@extraAuthor}[1][]{%
- \ifx\relax#1\relax
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Author
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Author\pdfx@insert@sep}%
- \else
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Author
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Author\pdfx@insert@sep[#1]}%
- \fi
- \def\afterxmp@parse{%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Author
-   \expandafter\expandafter\expandafter{%
-    \expandafter\xmp@Author\xmp@extraAuthor}%
-   }%
- \xmp@parse{\global\let\xmp@extraAuthor\@this}%
- }%
-\newcommand{\pdfx@extraKeywords}[1][]{%
- \ifx\relax#1\relax
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Keywords
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Keywords\pdfx@insert@sep}%
- \else%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Keywords
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Keywords\pdfx@insert@sep[#1]}%
- \fi%
- \def\afterxmp@parse{%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Keywords
-   \expandafter\expandafter\expandafter{%
-    \expandafter\xmp@Keywords\xmp@extraKeywords}}%
- \xmp@parse{\global\let\xmp@extraKeywords\@this}%
- }%
-\newcommand{\pdfx@extraLanguages}{%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Language
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Language\pdfx@insert@sep}%
- \def\afterxmp@parse{%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Language
-   \expandafter\expandafter\expandafter{%
-    \expandafter\xmp@Language\xmp@extraLanguages}}%
- \xmp@parse{\global\let\xmp@extraLanguages\@this}%
- }%
-
-\newcommand{\pdfx@extraContributor}[1][]{%
- \ifx\relax#1\relax
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Contributor
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Contributor\pdfx@insert@sep}%
- \else
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Contributor
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Contributor\pdfx@insert@sep[#1]}%
- \fi
- \def\afterxmp@parse{%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Contributor
-   \expandafter\expandafter\expandafter{%
-    \expandafter\xmp@Contributor\xmp@extraContributor}%
-   }%
- \xmp@parse{\global\let\xmp@extraContributor\@this}%
- }%
-
-\newcommand{\pdfx@extraAuthoritativeDomain}{%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@AuthoritativeDomain
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@AuthoritativeDomain\pdfx@insert@sep}%
- \def\afterxmp@parse{%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@AuthoritativeDomain
-   \expandafter\expandafter\expandafter{%
-    \expandafter\xmp@AuthoritativeDomain\xmp@extraAuthoritativeDomain}%
-   }%
- \xmp@parse{\global\let\xmp@extraAuthoritativeDomain\@this}%
- }%
-
-\newcommand{\pdfx@extraDate}{%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Date
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Date\pdfx@insert@sep}%
- \def\afterxmp@parse{%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Date
-   \expandafter\expandafter\expandafter{%
-    \expandafter\xmp@Date\xmp@extraDate}%
-   }%
- \xmp@parse{\global\let\xmp@extraDate\@this}%
- }%
-
-\newcommand{\pdfx@extraRelation}[1][]{%
- \ifx\relax#1\relax
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Relation
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Relation\pdfx@insert@sep}%
- \else
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Relation
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Relation\pdfx@insert@sep[#1]}%
- \fi
- \def\afterxmp@parse{%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Relation
-   \expandafter\expandafter\expandafter{%
-    \expandafter\xmp@Relation\xmp@extraRelation}%
-   }%
- \xmp@parse{\global\let\xmp@extraRelation\@this}%
- }%
-
-%%\newcommand{\pdfx@extraType}[1][]{%
-%%% \show\xmp@Type
-%% \ifx\relax#1\relax
-%%  \expandafter\expandafter\expandafter\gdef
-%%   \expandafter\expandafter\expandafter\xmp@Type
-%%    \expandafter\expandafter\expandafter{%
-%%     \expandafter\xmp@Type\pdfx@insert@sep}%
-%% \else
-%%  \expandafter\expandafter\expandafter\gdef
-%%   \expandafter\expandafter\expandafter\xmp@Type
-%%    \expandafter\expandafter\expandafter{%
-%%     \expandafter\xmp@Type\pdfx@insert@sep[#1]}%
-%% \fi
-%% \def\afterxmp@parse{%
-%%  \expandafter\expandafter\expandafter\gdef
-%%   \expandafter\expandafter\expandafter\xmp@Type
-%%   \expandafter\expandafter\expandafter{%
-%%    \expandafter\xmp@Type\xmp@extraType}%
-%%   %\show\xmp@Type
-%%   }%
-%% \xmp@parse{\global\let\xmp@extraType\@this}%
-%% }%
-
-\newcommand{\pdfx@extraAdvisory}[1][]{%
- \ifx\relax#1\relax
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Advisory
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Advisory\pdfx@insert@sep}%
- \else
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Advisory
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Advisory\pdfx@insert@sep[#1]}%
- \fi
- \def\afterxmp@parse{%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Advisory
-   \expandafter\expandafter\expandafter{%
-    \expandafter\xmp@Advisory\xmp@extraAdvisory}%
-   }%
- \xmp@parse{\global\let\xmp@extraAdvisory\@this}%
- }%
-
-\newcommand{\pdfx@extraIdentifier}[1][]{%
- \ifx\relax#1\relax
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Identifier
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Identifier\pdfx@insert@sep}%
- \else
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Identifier
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Identifier\pdfx@insert@sep[#1]}%
- \fi
- \def\afterxmp@parse{%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Identifier
-   \expandafter\expandafter\expandafter{%
-    \expandafter\xmp@Identifier\xmp@extraIdentifier}%
-   }%
- \xmp@parse{\global\let\xmp@extraIdentifier\@this}%
- }%
-
-\newcommand{\pdfx@extraThumbnails}[1][]{%
- \ifx\relax#1\relax
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Thumbnails
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Thumbnails\pdfx@insert@sep}%
- \else
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Thumbnails
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Thumbnails\pdfx@insert@sep[#1]}%
- \fi
- \def\afterxmp@parse{%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Thumbnails
-   \expandafter\expandafter\expandafter{%
-    \expandafter\xmp@Thumbnails\xmp@extraThumbnails}%
-   }%
- \xmp@parse{\global\let\xmp@extraThumbnails\@this}%
- }%
-
-\newcommand{\pdfx@extraOwner}[1][]{%
- \ifx\relax#1\relax
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Owner
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Owner\pdfx@insert@sep}%
- \else
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Owner
-    \expandafter\expandafter\expandafter{%
-     \expandafter\xmp@Owner\pdfx@insert@sep[#1]}%
- \fi
- \def\afterxmp@parse{%
-  \expandafter\expandafter\expandafter\gdef
-   \expandafter\expandafter\expandafter\xmp@Owner
-   \expandafter\expandafter\expandafter{%
-    \expandafter\xmp@Owner\xmp@extraOwner}%
-   }%
- \xmp@parse{\global\let\xmp@extraOwner\@this}%
- }%
-
-\newcommand{\pdfx@Subject}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@Subject{#1}\fi
- \xmp@parse{\global\let\xmp@Subject\@this}}
-\newcommand{\pdfx@Producer}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@Producer{#1}\fi
- \xmp@parse{\global\let\xmp@Producer\@this}}
-\newcommand{\pdfx@Publisher}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@Publisher{#1}\fi
- \xmp@parse{\global\let\xmp@Publisher\@this}}
-\newcommand{\pdfx@Copyright}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@Copyright{#1}\fi
- \xmp@parse{\global\let\xmp@Copyright\@this%
-  \ifx\xmp@Copyrighted\@empty\gdef\xmp@Copyrighted{True}\fi}}
-
-\newcommand{\pdfx@Coverage}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@Coverage{#1}\fi
- \xmp@parse{\global\let\xmp@Coverage\@this}}
-
-%%  PRISM Text fields
-\newcommand{\pdfx@CoverDisplayDate}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@CoverDisplayDate{#1}\fi
- \xmp@parse{\global\let\xmp@CoverDisplayDate\@this}}
-\newcommand{\pdfx@JournalTitle}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@JournalTitle{#1}\fi
- \ifx\xmp@PublicationType\@empty\gdef\xmp@PublicationType{journal}\fi
- \xmp@parse{\global\let\xmp@JournalTitle\@this}}
-
-%%  Uses PRISM Controlled Vocabulary:
-%%    http://prismstandard.org/vocabularies/3.0/aggregationtype.xml
-%%  blog, book, bookazine, catalog, feed, journal, magazine, manual
-%%  newsletter, newspaper, other, report, pamphlet, vook, whitepaper
-%%
-\newcommand{\pdfx@PublicationType}[1][]{%
- \ifx\relax#1\relax\else\gdef\xmp@lang@PublicationType{#1}\fi
- \xmp@parse{\global\let\xmp@PublicationType\@this}}
-
-\def\pdfx@localcommands{
- \let\Title\pdfx@Title
- \let\Author\pdfx@Author
- \let\Keywords\pdfx@Keywords
- \let\Subject\pdfx@Subject
- \let\Language\pdfx@Language
- \def\CreatorTool{\xmp@parse{\global\let\xmp@CreatorTool\@this}}
- \let\Producer\pdfx@Producer
- \def\Volume{\xmp@parse{\global\let\xmp@Volume\@this}}
- \def\Issue{\xmp@parse{\global\let\xmp@Issue\@this}}
- \let\CoverDisplayDate\pdfx@CoverDisplayDate
- \def\CoverDate{\xmp@parse{\global\let\xmp@CoverDate\@this}}
- \let\Copyright\pdfx@Copyright
- \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\ISBN{\xmp@parse{\global\let\xmp@ISBN\@this}}
- \def\URLlink{\xmp@parse{\global\let\xmp@URL\@this}}
- \def\Lastpage{\xmp@parse{\global\let\xmp@Lastpage\@this}}
- \def\Firstpage{\xmp@parse{\global\let\xmp@Firstpage\@this}}
- \let\PublicationType\pdfx@PublicationType
- \let\Journaltitle\pdfx@JournalTitle
- \def\Journalnumber{\xmp@parse{\global\let\xmp@Journalnumber\@this}}
- \let\Publisher\pdfx@Publisher
- \let\Coverage\pdfx@Coverage
- \def\Source{\xmp@parse{\global\let\xmp@Source\@this}}
- \let\Contributor\pdfx@Contributor
- \let\Date\pdfx@Date
- \let\Relation\pdfx@Relation
- \let\Advisory\pdfx@Advisory
- \def\BaseURL{\xmp@parse{\global\let\xmp@BaseURL\@this}}
- \let\Identifier\pdfx@Identifier
- \let\Nickname\pdfx@Nickname
- \let\Thumbnails\pdfx@Thumbnails
- \let\Owner\pdfx@Owner
- \def\CertificateURL{\xmp@parse{\global\let\xmp@CertificateURL\@this}}
- \def\MMversionID{\xmp@parse{\global\let\xmpMM@versionID\@this}}
-%% \let\Type\pdfx@Type
-%%
-%% currently unused; for backward compatibility only
- \let\AuthoritativeDomain\pdfx@AuthoritativeDomain
- \let\Creator\CreatorTool  % for backward compatibility
- \let\Org\Publisher        % for backward compatibility
- \let\WebStatement\CopyrightURL  % for backward compatibility
-}
-
-%%----------------------------------------------------------------------
-%% 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.
-
-{%
- \catcode`\<=12 \catcode`\>=12 \catcode`\/=12 \catcode`\:=12 \catcode`\"=12
-\obeyspaces\ifpdfx@useactivespaces%
- \gdef\pdfx@sep {\pdfx@check@lang}%
-\else%
- \gdef\pdfx@sep{\pdfx@check@lang}%
-\fi%
- \xdef\pdfx@sep@nolang{</rdf:li>^^J     <rdf:li>}%
- \xdef\pdfx@sep@lang[#1]{</rdf:li>^^J     <rdf:li xml:lang="#1">}%
-}% end of \obeyspaces and \catcode ....
-
-\def\pdfx@check@lang#1{%
- \ifx[#1\expandafter\@firstoftwo
- \else\expandafter\@secondoftwo\fi
- {\pdfx@sep@lang#1}{\pdfx@sep@nolang#1}}
-
-\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
- \pdfx@xmpunimarkup   % only need this when writing XMP
- \the\pdfxsafeforxmp@toks
-}
-
-%% cope with active spaces with LGR encoding
-%% and the spaces written out with \IeC in KOI8-r
-%% It's possible to have both together.
-\def\liixu@IeC#1#{\liixu@IeCi}
-\def\liixu@IeCi#1{\liixu@IeCii#1}
-\def\liixu@IeCii#1#2{#1}
-\def\liixu@enableIeC{\ifpdfx@useactivespaces
- \let\IeC\liixu@IeC\else\def\IeC##1{##1}\fi}
-\def\liixu@numberline#1#{\liixu@numberlinei}
-\def\liixu@numberlinei#1{\liixu@numberlineii#1}
-\def\liixu@numberlineii#1{\textLF #1. }
-\def\liixu@enablenumberline{\ifpdfx@useactivespaces
- \let\numberline\liixu@numberline
- \else\def\numberline##1{\textLF ##1. }\fi}
-
-\def\pdfx@xmpunimarkup{%
- \liixu@enableIeC
- \liixu@enablenumberline
- \def\empty{}% used in LICR patterns
- \LIIXUscriptcommands
- \LIIXUtipacommands
- \LIIXUmapTeXnames
-%%  from Hyperref's  psdextra.def
- \csname psdmapshortnames\endcsname
- \csname psdaliasnames\endcsname
-%% from  lu8enc.def
- \csname LIIXUmapmathletterlikes\endcsname
- \csname LIIXUmapmathspaces\endcsname
- \iflatLATxmp
-  \LIIXUmaplatinchars
-  \LIIXUcancelfontswitches
- \fi
- \ifmathxmp
-  \let\(\textinlinemath
-  \let\[\textdisplaymath
-  \LIIXUmapmathaccents
-  \LIIXUmapisomathgreek
-  \LIIXUmapmatharrowsA
-  \LIIXUmapmathoperatorsA
-  \LIIXUmapmathoperatorsB
-  \LIIXUmapmiscmathsymbolsA
-  \LIIXUmapsupparrowsA
-  \LIIXUmapsupparrowsB
-  \LIIXUmapmiscmathsymbolsB
-  \LIIXUmapsuppmathoperators
-  \LIIXUmapunimathgreek
-  \LIIXUmapmathalphabets
- \fi
- \ifarbxmp \LIIXUmaparabicletters\fi
- \ifarmxmp \LIIXUmaparmenianletters\fi
- \ifdevxmp\LIIXUmapdevaccents\fi
- \ifgrkxmp \LIIXUmapgreekletters\fi
- \ifhebxmp \LIIXUmaphebrewletters\fi
-}
-
-%% In case macros are used in XMP Metadata, need a way to map these
-%% to simple text, rather than specific font characters, or whatever:
-\newtoks\pdfxsafeforxmp@toks
-\def\pdfxEnableCommands{%   user command
- \begingroup
-  \ifpdfx@useactivespaces\obeyspaces\fi
-  \pdfx@EnableCommands
-}
-\def\pdfx@EnableCommands#1{%   internal command
- \expandafter\global\expandafter\pdfxsafeforxmp@toks
-  \expandafter{\the\pdfxsafeforxmp@toks#1}%
- \endgroup
-}
-
-%%----------------------------------------------------------------------
-%% 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{; }%
- %\let\sep\pdfx@sep
-%% Note: '\ ', \&, \copyright are already predefined by hyperref.
-%% allow LICRs to expand into PDF strings
- \def\cf@encoding{PU}%
- \def\9##1{\ifcase##1\string\0\or\string\1\or\string\2\or\string\3\fi}%
- \def\8{\string\00}%
- \def\0{\string\0}\def\1{\string\1}\def\2{\string\2}\def\3{\string\3}%
- \pdfx@xmpunimarkup
- \the\pdfxsafeforxmp@toks
-}
-
-%%----------------------------------------------------------------------
-%% Defaults
-\ifxetex
- \def\xmp@Producer{XeTeX}
-\else\ifluatex
- \def\xmp@Producer{LuaTeX}
-\else
- \def\xmp@Producer{pdfTeX}
-\fi\fi
-\global\let\pdfxProducer\xmp@Producer
-
-\global\let\xmp@CreatorTool\@empty
-\global\let\xmp@Title\@empty
-\global\let\xmp@Author\@empty
-\global\let\xmp@Keywords\@empty
-\global\let\xmp@Subject\@empty
-\global\let\xmp@Language\@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@Copyrighted\@empty
-\global\let\xmp@CopyrightURL\@empty
-\gdef\xmp@WebStatement{\xmp@CopyrightURL}
-\global\let\xmp@Doi\@empty
-\global\let\xmp@ISBN\@empty
-\global\let\xmp@URL\@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@Type\@empty
-\global\let\xmp@Contributor\@empty
-\global\let\xmp@Coverage\@empty
-\global\let\xmp@Date\@empty
-\global\let\xmp@Relation\@empty
-\global\let\xmp@Source\@empty
-\global\let\xmp@Publisher\@empty
-\gdef\xmp@Org{\xmp@Publisher}
-\global\let\xmp@AuthoritativeDomain\@empty
-\global\let\xmp@Advisory\@empty
-\global\let\xmp@BaseURL\@empty
-\global\let\xmp@Identifier\@empty
-\global\let\xmp@Nickname\@empty
-\global\let\xmp@Thumbnails\@empty
-\global\let\xmp@Owner\@empty
-\global\let\xmp@CertificateURL\@empty
-
-%%----------------------------------------------------------------------
-%%  Alternative way to get the CreationDate using Lua  for XeTeX
-\ifdefined\pdfcreationdate\else
- \begingroup  %% ensure correct catcodes, not done by \dospecials
- \catcode`\:=12 \catcode`\.=12
-\begin{filecontents*}{creationdate.lua}
- os.remove("creationdate.timestamp")
- io.output("creationdate.timestamp"):write(os.date("\\edef\\tempa{\\string D:%Y%m%d%H%M%S}\n\\def\\tempb{%z}"))
-\end{filecontents*}
- \endgroup
- \ifnum\shellescape=1
-  \begingroup  %% ensure correct catcodes when file is read in
-   \catcode`\'=12 \catcode`\.=12 \catcode`\:=12 \catcode`\+=12
-   \immediate\write18{texlua creationdate.lua}
-   \input{creationdate.timestamp}
-   \def\tempc#1#2#3#4#5{#1#2#3'#4#5'}
-   \edef\tempb{\expandafter\tempc\tempb}
-   \edef\x{\endgroup\def\noexpand\pdfcreationdate{\tempa\tempb}}\x
- \else
-  \begingroup  %% ensure correct catcodes in the error/warning messages
-  \catcode`\<=12 \catcode`\>=12 \catcode`\"=12 \catcode`\-=12
-  \catcode`\: 12 \catcode`\' 12 \catcode`\= 12
-  \ifpdfx@noerr
-   \PackageWarning{pdfx}{%
-    CreationDate is not properly supported;^^J
-    PDF validation may fail. To avoid this problem use:^^J
-     xelatex -shell-escape  -output-driver="xdvipdfmx -z 0" <filename>^^J}
-  \else
-   \PackageError{pdfx}{%
-    CreationDate is not properly supported;^^J
-    PDF validation may fail.}{To avoid this problem use:^^J
-     xelatex -shell-escape  -output-driver="xdvipdfmx -z 0" <filename> }
-  \fi
-  %% Using a constant date, to allow processing to finish smoothly.
-  \edef\x{\endgroup
-   \def\noexpand\pdfcreationdate{\string D:20181028075445+10'00'}}%
-   \x
- \fi
-\fi
-
-%%----------------------------------------------------------------------
-\def\pdfx@findUUID#1{\edef\pdfx@tmpstring{\pdfx@mdfivesum{#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}
-
-\expandafter\ifx\csname pdfx@mdfivesum\endcsname\relax
-  \PackageError{pdfx}{%
-    No implementation for \string\pdfx@mdfivesum.^^J
-    \ifxetex XeTeX needs to be 2015 or later\fi
-   }{%
-    Continue without, but the PDF will not validate.
-   }%
- \def\xmp@docid{}%
- \def\pdfx@findUUID#1{}%
- \def\pdfx@uuid{}%
-\else
- \pdfx@findUUID{\jobname.pdf}
- \edef\xmp@docid{\pdfx@uuid}
-\fi
-
-\expandafter\ifx\csname pdfcreationdate\endcsname\relax\relax
-  \PackageWarning{pdfx}{%
-   No implementation for \string\pdfxcreation .
-  }%
- \def\xmp@instid{}%
-%%
-\else   %% use the MD5 sum methods
-%%
- \pdfx@findUUID{\pdfcreationdate}%
- \edef\xmp@instid{\pdfx@uuid}
-\fi
-
-%%----------------------------------------------------------------------
-%% load  xcolor  before  hyperref  to get the link colors correct
-%%
-\PassOptionsToPackage{nosetpagesize}{color}
-\PassOptionsToPackage{nosetpagesize}{graphics}
-\@ifpackageloaded{xcolor}{%
- % Beamer will have already loaded  xcolor
- % need to understand what options it used
-}{
-\ifpdfx@x
- \RequirePackage[cmyk,hyperref]{xcolor}
-\else
- \RequirePackage[rgb,hyperref]{xcolor}
-\fi
-}%
-
-%%  loading  puenc.def  will kill a lot of what  mathtext.sty  established
-\@ifpackageloaded{mathtext}{%
- \PackageWarningNoLine{pdfx}{pdfx.sty  and hyperref.sty should be loaded^^J
-  before mathtext.sty , otherwise text symbols may not show in math mode.}%
-}{}
-
-\newif\ifpdfx@hluatex
-\IfFileExists{hluatex.def}{\pdfx@hluatextrue}{\pdfx@hluatexfalse}
-
-%% the "pdftex" option seems to work fine with LuaTeX
-\def\pdfx@luatest{\ifpdfx@hluatex luatex\else pdftex \fi}
-
-%% Hyperref options for PDF/X
-\edef\pdfx@pdfX@opts@pdftex{%
-   draft,pdftex,pdfpagemode=UseNone,bookmarks=false,%
-   pdfversion=1.\thepdfminorversion,pdfstartview=}
-\edef\pdfx@pdfX@opts@xetex{%
-   draft,xetex,pdfpagemode=UseNone,bookmarks=false,%
-   pdfversion=1.\thepdfminorversion,pdfstartview=}
- \edef\pdfx@pdfX@opts@luatex{%
-   draft,\pdfx@luatest,pdfpagemode=UseNone,bookmarks=false,%
-   pdfversion=1.\thepdfminorversion,pdfstartview=}%
-
-\newif\ifpdfx@hyperrefloaded
-\expandafter\ifx\csname ifHy@pdfa\endcsname\relax\else\pdfx@hyperrefloadedtrue\fi
-
-%% Hyperref options for PDF/A and PDF/E
-\newtoks\pdfx@tmptoks
-\pdfx@tmptoks{%
-\ifHy@pdfa
-   \edef\pdfx@pdfAE@opts@pdftex{pdftex}%
-   \edef\pdfx@pdfAE@opts@xetex{xetex,pdfversion=1.\thepdfminorversion}%
-   \edef\pdfx@pdfAE@opts@luatex{\pdfx@luatest,pdfversion=1.\thepdfminorversion}%
-   \edef\pdfx@pdfAE@opts@pdfmark{pdfmark,pdfversion=1.\thepdfminorversion}%
-  \else
-   \edef\pdfx@pdfAE@opts@pdftex{pdftex,pdfa}%
-   \edef\pdfx@pdfAE@opts@xetex{xetex,pdfa,pdfversion=1.\thepdfminorversion}%
-   \edef\pdfx@pdfAE@opts@luatex{\pdfx@luatest,pdfa,pdfversion=1.\thepdfminorversion}%
-   \edef\pdfx@pdfAE@opts@pdfmark{pdfmark,pdfa,pdfversion=1.\thepdfminorversion}%
-  \fi
-}
-\ifpdfx@hyperrefloaded
- \the\pdfx@tmptoks\relax
-\else
- \edef\pdfx@pdfAE@opts@pdftex{pdftex,pdfa}%
- \edef\pdfx@pdfAE@opts@xetex{xetex,pdfa,pdfversion=1.\thepdfminorversion}%
- \edef\pdfx@pdfAE@opts@luatex{\pdfx@luatest,pdfa,pdfversion=1.\thepdfminorversion}%
- \edef\pdfx@pdfAE@opts@pdfmark{pdfmark,pdfa,pdfversion=1.\thepdfminorversion}%
-\fi
-\pdfx@tmptoks{}%
-
-\ifpdfx@x
- \@ifpackageloaded{hyperref}{%
-  \ifxetex
-   \expandafter\hypersetup\expandafter{\pdfx@pdfX@opts@xetex}
-  \else\ifluatex
-   \expandafter\hypersetup\expandafter{\pdfx@pdfX@opts@luatex}
-  \else
-   \expandafter\hypersetup\expandafter{\pdfx@pdfX@opts@pdftex}
-  \fi\fi
- }{%
-  \ifxetex
-   \expandafter\RequirePackage\expandafter[\pdfx@pdfX@opts@xetex]{hyperref}
-  \else\ifluatex
-   \expandafter\RequirePackage\expandafter[\pdfx@pdfX@opts@luatex]{hyperref}
-  \else
-   \expandafter\RequirePackage\expandafter[\pdfx@pdfX@opts@pdftex]{hyperref}
-  \fi\fi
- }%
-\else
- \ifpdfx@e
-  \@ifpackageloaded{hyperref}{%
-   \ifxetex
-    \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@xetex}
-   \else\ifluatex
-    \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@luatex}
-   \else
-    \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@pdftex}
-   \fi\fi
-  }{%
-   \ifxetex
-    \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@xetex]{hyperref}
-   \else\ifluatex
-    \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@luatex]{hyperref}
-   \else
-    \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@pdftex]{hyperref}
-   \fi\fi
-  }%
- \else % generating PDF/A or ...
-  \@ifpackageloaded{hyperref}{%
-   \ifxetex
-    \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@xetex}%
-   \else\ifluatex
-    \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@luatex}%
-   \else
-    \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@pdftex}%
-   \fi\fi
-  }{%
-   \ifxetex
-    \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@xetex]{hyperref}
-   \else\ifluatex
-    \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@luatex]{hyperref}
-   \else
-    \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@pdftex]{hyperref}
-   \fi\fi
- }%
-\fi\fi
-\hypersetup{pdfencoding=auto}%  unicode
-\expandafter\ifx\csname KV@Hyp@psdextra\endcsname\relax\else
- \hypersetup{psdextra}
-\fi
-
-%% hyperref doesn't set the minor version for XeTeX
-\ifxetex
- \special{pdf:minorversion \thepdfminorversion}
-\fi
-
-\ifx\xmp@CreatorTool\@empty
- \edef\xmp@CreatorTool{\@pdfcreator}
-\fi
-
-\newif\ifpdfx@cmyk
-\newif\ifpdfx@custom
-\ifpdfx@x   %  PDF/X  normally needs a CMYK color profile for printing
- \global\pdfx@cmyktrue
-\fi
-%%----------------------------------------------------------------------
-%% -----   Color Profiles  -------
-%% Define how to specify the profile, so the default
-%% can be over-ridden in the  .xmpdata  file.
-%%
-%%   --- user-command ---   RGB profile needed with  PDF/A-??
-%% \setRGBcolorprofile{<filename>}{<identifier>}
-%%    {<info string>}{<registry URL>}
-\def\setRGBcolorprofile{%
- \begingroup
-  \catcode`\_ 11\relax\catcode`\& 11\relax\catcode`\~ 11\relax
-  \catcode`\% 11\relax
-  \edef\({\string\(}\edef\){\string\)}%
-  \pdfx@setrgbprofile}
-%%
-%%  --- user-command ---   CMYK profile needed with  PDF/X-??
-%% \setCMYKcolorprofile{<filename>}{<output intent>}
-%%    {<identifier>}{<registry URL>}
-\def\setCMYKcolorprofile{%
- \begingroup
-  \catcode`\_ 11\relax\catcode`\& 11\relax\catcode`\~ 11\relax
-  \catcode`\% 11\relax
-  \edef\({\string\(}\edef\){\string\)}%
-  \pdfx@setcmykprofile}
-%%
-%%  --- user-command ---   DeviceGray profile needed with  PDF/E-1
-%% \setGRAYcolorprofile{<filename>}{<output intent>}
-%%    {<identifier>}{<registry URL>}
-\def\setGRAYcolorprofile{%
- \begingroup
-  \catcode`\_ 11\relax\catcode`\& 11\relax\catcode`\~ 11\relax
-  \catcode`\% 11\relax
-  \edef\({\string\(}\edef\){\string\)}%
-  \pdfx@setgrayprofile}
-%%
-%%  --- user-command ---  External profile with  PDF/X-4p and PDF/X-5pg
-%% \setEXTERNALprofile{<profilename>}{<output intent>}
-%%    {<identifier>}{<registry URL>}{<color-space>}%
-%%    {<ICC Version>}{<provider URL>}{<extra info>}{<Check Sum>}
-\def\setEXTERNALprofile{%
- \begingroup
-  \catcode`\_ 11\relax\catcode`\& 11\relax\catcode`\~ 11\relax
-  \catcode`\% 11\relax
-  \edef\({\string\(}\edef\){\string\)}%
-  \ifno@iccprofile
-   \expandafter\pdfx@externalprofile
-   \else
-    \expandafter\pdfx@externalprofile@gobble
-   \fi
-  }
-%%
-%%
-\def\pdfx@setRGBcolorprofiledir#1{%
- \xdef\pdfx@RGBcolorprofiledir{#1}%
-}
-\def\pdfx@setCMYKcolorprofiledir#1{%
- \xdef\pdfx@CMYKcolorprofiledir{#1}%
-}
-\pdfx@setRGBcolorprofiledir{}
-\pdfx@setCMYKcolorprofiledir{}
-
-%% This does indeed work!  Use it in  .xmpdata  files
-\providecommand{\MacOSColordir}{/System/Library/ColorSync/Profiles/}
-\providecommand{\MacOSLibraryColordir}{/Library/ColorSync/Profiles/}
-\providecommand{\AdobeMacOSdir}%
-  {/Library/Application Support/Adobe/Color/Profiles/Recommended/}
-\edef\pdfx@tmp{C:\string\Windows\string\System32\string\Spool%
-  \string\Drivers\string\Color\string/}
-\expandafter\providecommand\expandafter
-  {\expandafter\WindowsColordir\expandafter}\expandafter{\pdfx@tmp}
-%%\pdfx@setcolorprofiledir{\AdobeMacOSdir}
-
-%% overide that value using the following commands:
-\let\pdfxSetCMYKcolorProfileDir\pdfx@setCMYKcolorprofiledir
-\let\pdfxSetRGBcolorProfileDir\pdfx@setRGBcolorprofiledir
-%%  for back-compatibility
-\let\pdfxSetColorProfileDir\pdfxSetCMYKcolorProfileDir
-%%
-\def\pdfx@setrgbprofile#1#2#3#4{%
- \xdef\pdfx@rgb@profile{\pdfx@RGBcolorprofiledir#1}%  valid file path/name
- \xdef\pdfx@rgb@profilename{#1}%  valid file name
- \gdef\pdfx@rgb@identifier{#2}%
- \gdef\pdfx@rgb@info{#3}%
- \pdfstringdef\pdfx@rgb@registry{#4}%  valid URL
- \endgroup
- \global\pdfx@cmykfalse
- }%  closes-off  \setRGBcolorprofile
-%%
-\def\pdfx@setcmykprofile#1#2#3#4{%
- \xdef\pdfx@cmyk@profile{\pdfx@CMYKcolorprofiledir#1}%  valid file path/name
- \xdef\pdfx@cmyk@profilename{#1}%  valid file name
-%% \expandafter\gdef\expandafter\pdfx@cmyk@profile\expandafter
-%%    {\pdfx@colorprofiledir#1}%  valid file name
- \gdef\pdfx@cmyk@intent{#2}%
-%% \pdfstringdef\pdfx@cmyk@intent{#2}%  color intent
- \gdef\pdfx@cmyk@identifier{#3}%
-%% \pdfstringdef\pdfx@cmyk@identifier{#3}%  text string identifier
- \gdef\pdfx@cmyk@registry{#4}%
-%% \pdfstringdef\pdfx@cmyk@registry{#4}%  valid URL
- \endgroup
- \global\pdfx@cmyktrue
- }%  closes-off  \setcmykcolorprofile
-%%
-\def\setCUSTOMcolorprofile{%
- \begingroup
-  \catcode`\_ 11\relax\catcode`\& 11\relax\catcode`\~ 11\relax
-  \catcode`\% 11\relax
-  \edef\({\string\(}\edef\){\string\)}%
-  \pdfx@setcustomprofile
-}
-\def\pdfx@setcustomprofile#1#2#3#4#5#6#7#8{%
- \xdef\pdfx@customcolorprofiledir{#2}% valid directory location
- \xdef\pdfx@custom@profile{#1}%  valid file name
- \gdef\pdfx@custom@identifier{#3}%
- \gdef\pdfx@custom@registry{#4}%
- \gdef\pdfx@custom@numcolors{#5}% num-colors specifier
- \gdef\pdfx@iccversion{#6}%  Hex string for /ICCVersion < ... >
- \gdef\pdfx@custom@colornames{#7}%
- \gdef\pdfx@profile@checksum{#8}%  Hex string for /CheckSum < ... >
-\endgroup
- \global\pdfx@cmykfalse
- \global\pdfx@customtrue
- }%  closes-off  \pdfx@setcustomprofile
-%%
-\def\pdfx@setgrayprofile#1#2#3#4{%
- \gdef\pdfx@gray@profile{#1}%  valid file name
- \gdef\pdfx@gray@intent{#2}%
- \gdef\pdfx@gray@identifier{#3}%
- \pdfstringdef\pdfx@gray@registry{#4}%  valid URL
- \endgroup}%  closes-off  \setGRAYcolorprofile
-%%
-\def\pdfx@externalprofile#1#2#3#4#5#6#7#8#9{%
- \gdef\pdfx@extprofile{#1}% PDF string for /ProfileName
- \gdef\pdfx@cmyk@intent{#2}% PDF string for /OutputCondition
- \gdef\pdfx@cmyk@identifier{#3}% PDF string for /OutputConditionIdentifier
- \gdef\pdfx@cmyk@registry{#4}% {http://www.color.org}%
- \gdef\pdfx@profileCS{#5}%  4 bytes for /ProfileCS
- \gdef\pdfx@iccversion{#6}%  Hex string for /ICCVersion < ... >
- \gdef\pdfx@colorURL{#7}%  URL
- \gdef\pdfx@cmyk@info{#8}%  for /Info
- \gdef\pdfx@profile@checksum{#9}%  Hex string for /CheckSum < ... >
- \endgroup}%  closes-off  \setEXTERNALprofile
-\def\pdfx@externalprofile@gobble#1#2#3#4#5#6#7#8#9{%
-  \PackageError{pdfx}{Wrong option for using an External Color profile}%
-   {Use one of the options: x-4p , x-4p08 , x-4p10 or  x-5pg .}%
- \endgroup}
-%%
-%% default color profiles
-
-{\catcode`\_ 12 \catcode`\& 12 \catcode`\~ 12
- \gdef\pdfx@xprofile@cmykdefault{coated_FOGRA39L_argl.icc}
- \gdef\pdfx@aprofile@rgbdefault{sRGB_IEC61966-2-1_black_scaled.icc}
- \gdef\pdfx@eprofile@graydefault{Gray_linear.icc}
- \gdef\pdfx@pprofile@externaldefault{FOGRA39}
-}% end of \catcode
-\xdef\pdfx@rgb@profile{\pdfx@aprofile@rgbdefault}
-\xdef\pdfx@cmyk@profile{\pdfx@xprofile@cmykdefault}
-\xdef\pdfx@gray@profile{\pdfx@eprofile@graydefault}
-\xdef\pdfx@external@profile{\pdfx@pprofile@externaldefault}
-
-%%----------------------------------------------------------------------
-%% 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.
-%%
-%%----------------------------------------------------------------------
-
-\newif\ifpdfx@tryoldprofiles
-
-%%  The  colorprofiles package was added to  TeXLive  in October 2018.
-%%  It allows the default Color Profiles to be maintained independent
-%%  of the  pdfx  package.
-%%  In particular  sRGB_IEC61966-2-1_black_scaled.icc  is no longer
-%%  distributed with TeXLive 2018 and later.
-%%  Older versions still have this file.
-%%
-\IfFileExists{colorprofiles.tex}{%
-  \RequirePackage{colorprofiles}[2018/11/01]%
-  \ifx\colorpro@rgb@profile\relax
-    \expandafter\pdfx@tryoldprofilestrue
-   \else
-    \begingroup %%  \endgroup occurs within the macro expansion
-     \pdfx@setrgbprofile{\colorpro@rgb@profile
-     }{\colorpro@rgb@identifier
-     }{\colorpro@rgb@info
-     }{\colorpro@rgb@registry
-     }%
-    \begingroup %%  \endgroup occurs within the macro expansion
-    \pdfx@setcmykprofile{\colorpro@cmyk@profile
-     }{\colorpro@cmyk@intent
-     }{\colorpro@cmyk@identifier
-     }{\colorpro@cmyk@registry
-     }%
-    \expandafter\pdfx@tryoldprofilesfalse
-   \fi
-}{\pdfx@tryoldprofilestrue}
-
-{\catcode`\| 14 \catcode`\% 12 \catcode`\_ 12 \catcode`\: 12
- \catcode`\. 12 \catcode`\- 12 \catcode`\/ 12
- \edef\@bchar{\expandafter\@gobble\string\\}|
- \edef\({\string\(}\edef\){\string\)}|
-\ifpdfx@tryoldprofiles
- || this will be used by TeXLive installations up to 2017.
- \begingroup | \endgroup occurs within the macro expansion
-\expandafter\pdfx@setrgbprofile\expandafter
- {sRGB_IEC61966-2-1_black_scaled.icc}|
- {sRGB_IEC61966-2-1_black_scaled}|
- {sRGB IEC61966 v2.1 with black scaling}|
- {http://www.color.org}|
- \begingroup | \endgroup occurs within the macro expansion
-\pdfx@setcmykprofile{coated_FOGRA39L_argl.icc}| coated_FOGRA39L_argl.icc
- {Coated FOGRA39}|
- {FOGRA39 \string\(ISO Coated v2 300%\space \string\(ECI\string\)\string\)}|
- {http://www.argyllcms.com/}|{http://www.color.org}|
-\fi  ||  end of   \ifpdfx@tryoldprofiles
- \begingroup | \endgroup occurs within the macro expansion
-\pdfx@setgrayprofile{Gray_linear.icc}|
- {}|
- {Custom}|
- {http://www.freedesktop.org/wiki/OpenIcc}|
-\ifno@iccprofile
- \begingroup | \endgroup occurs within the macro expansion
-  \pdfx@externalprofile{Coated FOGRA39 \(ISO 12647-2:2004\)}|
-   {Offset commercial and specialty printing according to ISO 12647-2:2004 |
-    / Amd 1, paper type 1 or 2 \(gloss or matte coated offset, 115 g/m2\), |
-    screen frequency 60/cm.}|
-   {FOGRA39}{http://www.color.org}{CMYK}{02100000}{http://www.adobe.com}|
-   {Coated FOGRA39 \(ISO 12647-2:2004\)}{74FF62F330BF0DBE4495B5720542D511}|
-\fi
-}% end of \catcode
-
-%%
-%%----------------------------------------------------------------------
-%% 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.
-%%----------------------------------------------------------------------
-
-\newif\ifexternalICCprofiles
-\newif\ifpdfx@noXMPdata
-
-\begingroup
-%% override unneeded color-profile specifier
- \ifpdfx@x
-  \ifno@iccprofile %  PDF/X-4p and PDF/X-5pg  PDF/VT-2
-   \begingroup
-    \def\pdfx@extprofiles@store{AdobeExternalProfiles.tex}%
-    \InputIfFileExists{\pdfx@extprofiles@store}%
-     {\global\externalICCprofilestrue \catcode `\# 12\relax}%
-     {\typeout{** pdfx: No file \pdfx@extprofiles@store\space
-       found for PDF/X-4p or PDF/X-5pg}}%
-   \endgroup
-  \else
-   \begingroup
-    \def\pdfx@profiles@store{AdobeColorProfiles.tex}%
-    \InputIfFileExists{\pdfx@profiles@store}%
-     {\global\externalICCprofilesfalse \catcode `\# 12\relax}%
-     {\typeout{** pdfx: No file \pdfx@profiles@store\space
-       found for PDF/X variants}}%
-   \endgroup
-%%   \def\setRGBcolorprofile#1#2#3#4{%
-%%    \PackageError{pdfx}{PDF/X requires a CMYK color profile}%
-%%     {Just continue using the default CMYK profile.^^J}}%
-  \fi
- \else
-%% load it, in case the macros are used in .xmpdata
-  \InputIfFileExists{AdobeColorProfiles.tex}{}{}%
-  \ifpdfx@e
-  \else
-   \def\setCMYKcolorprofile#1#2#3#4{}%
-   \def\setGRAYcolorprofile#1#2#3#4{}%
- \fi\fi
-%%
- \ifluatex\else\ifxetex\else
-  \inputencoding{8bit}%
- \fi\fi
- \makeatletter
- \pdfx@localcommands
-%% Do this in a box, so any stray characters don't get into TeX's lists.
-\setbox0\hbox{%
- \InputIfFileExists{\jobname.xmpdata}%
-  {\typeout{** pdfx: Metadata file \jobname.xmpdata  read successfully.}}%
-  {\typeout{** pdfx: No file  \jobname.xmpdata .
-    Metadata will be incomplete!}\aftergroup\pdfx@noXMPdatatrue}}
-\endgroup
-%% ----------------------------------------------------------------------
-
-\def\pdfx@LanguageSpec{}
-\def\pdfx@mainLanguage{en-US}%  absolute default
-\def\pdfx@checkfor@sep#1#2\sep#3\pdfx@endparse{\def#1{#2}}
-\ifx\@empty\xmp@Language\else
- \expandafter\pdfx@checkfor@sep\expandafter\pdfx@mainLanguage\xmp@Language
-  \sep\pdfx@endparse
-\fi
-\edef\pdfx@LanguageSpec{/Lang (\pdfx@mainLanguage)}
-
-%% ----------------------------------------------------------------------
-\begingroup
- \catcode`\_ 12 \catcode`\" 12 \catcode`\' 12
- \catcode`\< 12 \catcode`\> 12 \catcode`\/ 12 \catcode`\[ 12 \catcode`\] 12
- \edef\@pctchar{\expandafter\@gobble\string\%}
- \edef\@bchar{\expandafter\@gobble\string\\}
- \edef\0{\string\0}
- \edef\({\string\(}
- \edef\){\string\)}
-%%
- \def\pdfx@outcatalog@dict{%
-  \pdfx@LanguageSpec
-  /ViewerPreferences <</DisplayDocTitle true >>
-  /OutputIntents \pdfx@outintents % needs appropriate expansion
- }%
-\ifpdfx@x   %  PDF/X  needs a CMYK or RGB color profile for printing
- \ifno@iccprofile %  PDF/X-4p and PDF/X-5pg
-%%
-%% URL and metadata for the desired external Color Profile
-%%
-  \edef\pdfx@colorURL@dict{<</FS/URL/F(\pdfx@colorURL)>>}
-  \def\pdfx@colorprofile@dict{<< %
-     /CheckSum <\pdfx@profile@checksum>^^J%
-     /ICCVersion <\pdfx@iccversion>%
-     /ProfileCS (\pdfx@profileCS)^^J%
-     /ProfileName (\pdfx@extprofile)^^J%
-     /URLs [\OBJ@URLs] >>
-  }
-%% How to specify the PDF objects with different drivers
-  \ifxetex
-   \def\OBJ@URLs{ @colorURL }%
-   \def\OBJ@ICC{ @colorprofile }%
-   \immediate\special{pdf:obj \OBJ@URLs \pdfx@colorURL@dict }%
-   \immediate\special{pdf:obj \OBJ@ICC \pdfx@colorprofile@dict }%
-  \else %  pdfTeX & LuaTeX
-   \immediate\pdfobj{\pdfx@colorURL@dict}%
-   \edef\OBJ@URLs{\the\pdflastobj\space 0 R}%
-   \immediate\pdfobj{\pdfx@colorprofile@dict}%
-   \edef\OBJ@ICC{\the\pdflastobj\space 0 R}%
-  \fi
-%%  Output Intent dictionary, with object reference
-  \edef\pdfx@outintent@dict{%
-    /Type/OutputIntent
-    /S/GTS_PDFX^^J
-    /OutputCondition (\pdfx@cmyk@intent)^^J
-    /OutputConditionIdentifier (\pdfx@cmyk@identifier)^^J
-    /Info(\pdfx@cmyk@intent)^^J
-    /RegistryName(\pdfx@cmyk@registry)^^J
-%% extra dictionary required for  PDF/X-4p and PDF/X-5pg
-    /DestOutputProfileRef \OBJ@ICC
-  }%
-%%
- \else  %  PDF/X-1 , PDF/X-1a , PDF/X-3 , PDF/X-4 , PDF/X-5g
-%%
-  \ifpdfx@cmyk
-   \IfFileExists{"\pdfx@cmyk@profile"}{%
-  %  embedded CMYK color profile
-  %%
-  %%  Output Intent dictionary, with object reference
-  \def\pdfx@outintent@dict{%
-    /Type/OutputIntent
-    /S/GTS_PDFX^^J
-    /OutputCondition (\pdfx@cmyk@intent)^^J
-    /OutputConditionIdentifier (\pdfx@cmyk@identifier)^^J
-    /Info(\pdfx@cmyk@intent)^^J
-    /RegistryName(\pdfx@cmyk@registry)
-    /DestOutputProfile \OBJ@CMYK
-   }%
-  \def\pdfx@numcoords{/N 4}%
-%%
-  \ifxetex
-   \def\OBJ@CMYK{@colorprofile}%
-   \immediate\special{%
-     pdf:fstream \OBJ@CMYK (\pdfx@cmyk@profile) <<\pdfx@numcoords >>}%
-  \else % pdfTeX
-   \immediate\pdfobj stream attr{\pdfx@numcoords} file {\pdfx@cmyk@profile}%
-   \edef\OBJ@CMYK{\the\pdflastobj\space 0 R}%
-  \fi
-  \pdfcatalog{%
-   \pdfx@LanguageSpec
-   /OutputIntents [ <<
-   /Type/OutputIntent
-   /S/GTS_PDFX
-   /OutputCondition (\pdfx@cmyk@intent)%
-   /OutputConditionIdentifier (\pdfx@cmyk@identifier)%
-   /Info(\pdfx@cmyk@intent)%
-   /RegistryName(\pdfx@cmyk@registry)
-   /DestOutputProfile \OBJ@CMYK
-   >> ]}%
-  }{%
-   \PackageError{pdfx}{No color profile \pdfx@cmyk@profilename\space found
-     to use for CMYK printing colors.}%
-     {Is this the correct directory: \pdfx@CMYKcolorprofiledir\space  ?}%
-  }% end of \IfFileExists for CMYK
-  \else\ifpdfx@custom
-%%  allow Custom profile with PDF/X-5n
-   \IfFileExists{"\pdfx@customcolorprofiledir\pdfx@custom@profile"}{%
-%%  embedded Custom color profile
-%%
-  %%  Output Intent dictionary, with object reference
-  \def\pdfx@outintent@dict{%
-    /Type/OutputIntent
-    /S/GTS_PDFX^^J
-    /OutputConditionIdentifier (Custom)^^J
-    /OutputCondition (\pdfx@custom@identifier)^^J
-    /Info(\pdfx@custom@profile)^^J
-    /RegistryName(\pdfx@custom@registry)
-    /Registry(\pdfx@custom@registry)
-    /DestOutputProfileRef \OBJ@CustomDir
-   }%
- \def\OBJ@CustomDir{<<
-   \pdfx@numcoords^^J
-    /URLs [ << /Type /Filespec ^^J/EF \OBJ@CustomFile^^J
-     /F (\pdfx@custom@profile) /UF (\pdfx@custom@profile)  >>]^^J
-    >>}
-%% need more attributes:
-  \def\pdfx@numcoords{%
-    /CheckSum <\pdfx@profile@checksum>^^J%
-    /ICCVersion <\pdfx@iccversion>%
-    /ProfileName (\pdfx@custom@profile)^^J%
-    /ProfileCS (\pdfx@custom@numcolors)^^J%
-    /ColorantTable [\pdfx@custom@colornames]
-   }%
-  \def\pdfx@custom@filespec{%
-      /Type /EmbeddedFile >>^^J
-      /Subtype (application/vnd.iccprofile )
-  }%
-%%
-  \ifxetex
-   \def\OBJ@CustomFile{@colorprofile}%
-   \immediate\special{pdf:fstream \OBJ@CustomFile
-     (\pdfx@customcolorprofiledir\pdfx@custom@profile) <<\pdfx@custom@filespec >>}%
-  \else % pdfTeX
-   \immediate\pdfobj stream attr{\pdfx@custom@filespec} file %
-     {\pdfx@customcolorprofiledir\pdfx@custom@profile}%
-   \edef\OBJ@CustomFile{\the\pdflastobj\space 0 R}%
-  \fi
-  \pdfcatalog{%
-   \pdfx@LanguageSpec
-   /OutputIntents [ << \pdfx@outintent@dict >>]}%
-  }{%
-    \PackageError{pdfx}%
-     {No color profile \pdfx@custom@profile\space found to use for Custom printing colors.}%
-     {Is this the correct directory: \pdfx@customcolorprofiledir\space  ?}%
-  }% end of \IfFileExists for Custom
-  \global\pdfx@cmyktrue  % for TeX coloring
-%%
-  \else  % allow RGB profile with PDF/X   ???
-   \ifpdfx@noerr
-    \PackageWarning{pdfx}{PDF/X normally requires a CMYK color profile.^^J
-      Assuming RGB profile is of type 'prtr' not 'mntr'.^^J^^J}%
-   \else
-    \PackageError{pdfx}{PDF/X normally requires a CMYK color profile.}%
-      {To use RGB ensure profile is of type 'prtr' not 'mntr'.^^J^^J}%
-   \fi
-   %  embedded RGB color profile
-   %%
-   %%  Output Intent dictionary, with object reference
-   \def\pdfx@outintent@dict{%
-     /Type /OutputIntent
-     /S/GTS_PDFX^^J
-     /OutputConditionIdentifier (\pdfx@rgb@identifier)^^J
-     /DestOutputProfile \OBJ@RGB^^J
-     /Info(\pdfx@rgb@info)^^J
-     /RegistryName(\pdfx@rgb@registry)
-   }%
-   \IfFileExists{"\pdfx@rgb@profile"}{%
-    \def\pdfx@numcoords{/N 3 /Alternate/DeviceRGB}
-    \ifxetex
-     \immediate\special{%
-      pdf:fstream @colorprofile (\pdfx@rgb@profile) << \pdfx@numcoords >>}
-     \def\OBJ@RGB{@colorprofile}%
-    \else
-     \immediate\pdfobj stream attr{\pdfx@numcoords} file{\pdfx@rgb@profile}%
-     \edef\OBJ@RGB{\the\pdflastobj\space 0 R}%
-    \fi
-    \edef\pdfx@outintent@dict{%
-      /Type /OutputIntent
-      /S/GTS_PDFX
-      /OutputConditionIdentifier (\pdfx@rgb@identifier)%
-      /DestOutputProfile \OBJ@RGB
-      /Info(\pdfx@rgb@info)
-      /RegistryName(\pdfx@rgb@registry)
-    }%
-    \ifxetex
-     \def\OBJ@RGB{ @colorprofile }%
-     \immediate\special{%
-       pdf:fstream @colorprofile (\pdfx@rgb@profile) <<\pdfx@numcoords >>}
-    \else  %%     pdfTeX or LuaTeX
-      \immediate\pdfobj stream attr{\pdfx@numcoords} file{\pdfx@rgb@profile}%
-      \edef\OBJ@RGB{\the\pdflastobj\space 0 R}%
-     \fi
-   }{%
-    \PackageError{pdfx}%
-     {No color profile \pdfx@rgb@profilename\space found to use for RGB screen colors.}%
-     {Is this the correct directory: \pdfx@RGBcolorprofiledir\space  ?}%
-   }% end of \IfFileExists for RGB
-   \fi % end of \ifpdfx@custom
-  \fi % end of \ifpdfx@cmyk
- \fi % end of  \ifno@iccprofile
-%%  end of PDF/X
-\else
-%%  PDF/A and PDF/E  can specify a CMYK profile
- \expandafter\ifx\expandafter\relax\pdfx@rgb@profile\relax
-  \global\pdfx@cmyktrue
-  \IfFileExists{"\pdfx@cmyk@profile"}{%
-   \def\pdfx@numcoords{/N 4}
-  %  embedded CMYK color profile
-   \ifxetex
-    \def\OBJ@CMYK{@colorprofile}%
-    \special{pdf:fstream @colorprofile (\pdfx@cmyk@profile) <<\pdfx@numcoords >>}
-   \else  %% pdfTeX or LuaTeX
-    \immediate\pdfobj stream attr{\pdfx@numcoords} file{\pdfx@cmyk@profile}%
-    \edef\OBJ@CMYK{\the\pdflastobj\space 0 R}%
-   \fi
-   \edef\pdfx@outintent@dict{%
-     /Type /OutputIntent
-    \ifpdfx@e
-     /S/ISO_PDFE1
-    \else
-     /S/GTS_PDFA1
-    \fi
-    /OutputCondition (\pdfx@cmyk@intent)%  use this or  /Info ?
-    /OutputConditionIdentifier (\pdfx@cmyk@identifier)%
-    /DestOutputProfile \OBJ@CMYK
-    /Info(\pdfx@cmyk@intent)%
-    /RegistryName(\pdfx@cmyk@registry)
-  }%
- }{%
-   \PackageError{pdfx}{No color profile \pdfx@cmyk@profilename\space found
-     to use for CMYK printing colors.}%
-     {Is this the correct directory: \pdfx@CMYKcolorprofiledir\space  ?}%
- }% end of \IfFileExists for CMYK
- \else
-%%  PDF/A and PDF/E  usually need an RGB color profile for on-screen rendering
- \global\pdfx@cmykfalse
-  \expandafter\IfFileExists\expandafter{\pdfx@rgb@profile}{%
-   \def\pdfx@numcoords{/N 3 /Alternate/DeviceRGB}
-  \ifxetex
-    \def\OBJ@RGB{ @colorprofile }%
-    \immediate\special{pdf:fstream @colorprofile (\pdfx@rgb@profile) <<\pdfx@numcoords >>}
-  \else
-    \immediate\pdfobj stream attr{\pdfx@numcoords} file{\pdfx@rgb@profile}%
-    \edef\OBJ@RGB{\the\pdflastobj\space 0 R}%
-  \fi
-  \edef\pdfx@outintent@dict{%
-    /Type /OutputIntent
-   \ifpdfx@e
-    /S/ISO_PDFE1
-   \else
-    /S/GTS_PDFA1
-   \fi
-    /OutputConditionIdentifier (\pdfx@rgb@identifier)%
-    /DestOutputProfile \OBJ@RGB
-    /Info(\pdfx@rgb@info)
-    /RegistryName(\pdfx@rgb@registry)
-  }%
- }{%
-   \PackageError{pdfx}%
-    {No color profile \pdfx@rgb@profilename\space found to use for RGB screen colors.}%
-    {Is this the correct directory: \pdfx@RGBcolorprofiledir\space  ?}%
- }% end of \IfFileExists for RGB
- \fi % end of ifx  for PDF/A or PDF/E
-\fi % end of  ifpdfx@x
-%%
- \expandafter\ifx\csname pdfx@outintent@dict\endcsname\relax
- \else
-%%
-%% build the OutputIntent array
-%%
-  \ifxetex
-   \def\pdfx@outintents{ @outintentsarray }%
-   \def\pdfx@outintentref{ @outintent@dict }%
-   \immediate\special{pdf:obj \pdfx@outintentref << \pdfx@outintent@dict >>}
-   \immediate\special{pdf:obj \pdfx@outintents [ ]}%
-   \immediate\special{pdf:put \pdfx@outintents \pdfx@outintentref }%
-  \else
-   \immediate\pdfobj{<<\pdfx@outintent@dict>>}%
-   \edef\pdfx@outintents{[\the\pdflastobj\space 0 R]}%
-  \fi
-%%
-%% make the Catalog entry, if not already done
-%%
-  \ifx\pdfx@outcatalog@dict\relax
-  \else
-   \pdfcatalog{\pdfx@outcatalog@dict}%
-  \fi
-\fi  % end of  OutputIntent array and Catalog entry
-\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\pdfx@xmpunimarkup\relax
- \pdfx@xmpmarkup
- \ifluatex\else\ifxetex\else
-  \inputencoding{8bit}%
- \fi\fi
- \makeatletter
- \IfFileExists{\pdfx@encodingfile}{%
-  \def\cf@encoding{L8U}\fontencoding{L8U}%
- }{}%
- \let\protect\@typeset@protect
- \pdfx@xmpmarkup %%  !!!!! no longer needed
-%% \xdef\xmp@@Author{\xmp@Author}% no need to expand
- \global\let\xmp@@Author\xmp@Author
- \def\sep{; }%  expand to replace \sep   !!!  no longer needed
-%% \xdef\xmp@@Copyright{\xmp@Copyright}%
- \global\let\xmp@@Copyright\xmp@Copyright
-%% \xdef\xmp@@Keywords{\xmp@Keywords}%
-%% \global\let\xmp@@Keywords\xmp@Keywords
-%% \global\let\xmp@Keywords\@empty %
- \global\let\xmp@@Keywords\@empty % don't use  pdf:Keywords
-\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}
-%%
-%% How to support XeTeX here ?
-\expandafter\ifx\csname pdfcreationdate\endcsname\relax
-%% \xdef\pdfx@convDate{2016-04-01}%  April fool!
-%% \xdef\xmp@convDate{2016-04-01}%  April fool!
-\else
- \expandafter\expandafter\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}%
-\fi
-}% 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
-   \ifluatex\else\ifxetex\else
-    \inputencoding{utf8}%
-   \fi\fi
-   \hypersetup{pdfencoding=auto}%
-   \pdfstringdef#1{#2}%
-  \endgroup
- \fi
-}
-
-%% ----------------------------------------------------------------------
-%% if high-bit characters are already encoded as active
-%% then  \pdfstringdef  probably changes their meaning
-%% so save these for later reversion.
-%%
-\newif\ifpdf@activechars
-{\ifnum\catcode`^^c0 = 13\relax \aftergroup\pdf@activecharstrue\fi}%
-%%
-%% normally not used with XeTeX or LuaTeX
-%%
-
-\ifpdf@activechars
- \global\let\pdfx@save@co ^^c0\relax
- \global\let\pdfx@save@ci ^^c1\relax
- \global\let\pdfx@save@cii ^^c2\relax
- \global\let\pdfx@save@ciii ^^c3\relax
- \global\let\pdfx@save@civ ^^c4\relax
- \global\let\pdfx@save@cv ^^c5\relax
- \global\let\pdfx@save@cvi ^^c6\relax
- \global\let\pdfx@save@cvii ^^c7\relax
- \global\let\pdfx@save@cviii ^^c8\relax
- \global\let\pdfx@save@cix ^^c9\relax
- \global\let\pdfx@save@ca ^^ca\relax
- \global\let\pdfx@save@cb ^^cb\relax
- \global\let\pdfx@save@cc ^^cc\relax
- \global\let\pdfx@save@cd ^^cd\relax
- \global\let\pdfx@save@ce ^^ce\relax
- \global\let\pdfx@save@cf ^^cf\relax
- \global\let\pdfx@save@do ^^d0\relax
- \global\let\pdfx@save@di ^^d1\relax
- \global\let\pdfx@save@dii ^^d2\relax
- \global\let\pdfx@save@diii ^^d3\relax
- \global\let\pdfx@save@div ^^d4\relax
- \global\let\pdfx@save@dv ^^d5\relax
- \global\let\pdfx@save@dvi ^^d6\relax
- \global\let\pdfx@save@dvii ^^d7\relax
- \global\let\pdfx@save@dviii ^^d8\relax
- \global\let\pdfx@save@dix ^^d9\relax
- \global\let\pdfx@save@da ^^da\relax
- \global\let\pdfx@save@db ^^db\relax
- \global\let\pdfx@save@dc ^^dc\relax
- \global\let\pdfx@save@dd ^^dd\relax
- \global\let\pdfx@save@de ^^de\relax
- \global\let\pdfx@save@df ^^df\relax
- \global\let\pdfx@save@eo ^^e0\relax
- \global\let\pdfx@save@ei ^^e1\relax
- \global\let\pdfx@save@eii ^^e2\relax
- \global\let\pdfx@save@eiii ^^e3\relax
- \global\let\pdfx@save@eiv ^^e4\relax
- \global\let\pdfx@save@ev ^^e5\relax
- \global\let\pdfx@save@evi ^^e6\relax
- \global\let\pdfx@save@evii ^^e7\relax
- \global\let\pdfx@save@eviii ^^e8\relax
- \global\let\pdfx@save@eix ^^e9\relax
- \global\let\pdfx@save@ea ^^ea\relax
- \global\let\pdfx@save@eb ^^eb\relax
- \global\let\pdfx@save@ec ^^ec\relax
- \global\let\pdfx@save@ed ^^ed\relax
- \global\let\pdfx@save@ee ^^ee\relax
- \global\let\pdfx@save@ef ^^ef\relax
- \global\let\pdfx@save@fo ^^f0\relax
- \global\let\pdfx@save@fi ^^f1\relax
- \global\let\pdfx@save@fii ^^f2\relax
- \global\let\pdfx@save@fiii ^^f3\relax
-\fi
-
-%% ----------------------------------------------------------------------
-%% detect when \sep is used for multiple authors
-%% then suppress the /Author field in PDF /Info
-\newif\ifpdfx@sep@infield@
-\let\pdfx@endparse\relax
-\def\pdfx@parseforsep#1\sep#2\pdfx@endparse{%
- \pdfx@sep@infield@false
- \ifx\relax#2\relax\else\pdfx@sep@infield@true\fi
-}
-
-\begingroup
- \let\CATCODE\catcode
- \let\ENDGROUP\endgroup
- \let\GDEF\gdef
- \CATCODE`\m 12 \CATCODE`\a 12 \CATCODE`\c 12 \CATCODE`\r 12 \CATCODE`\o 12
- \CATCODE`\: 12 \CATCODE`\- 12 \CATCODE`\> 12
- \GDEF\pdfx@DOSTRIP@MACRO macro:->#1\@{#1}%
-\ENDGROUP
-\def\pdfx@strip@macro#1{%
-  \expandafter\edef\expandafter#1\expandafter{%
-    \expandafter\pdfx@DOSTRIP@MACRO\meaning#1\@}%
-}
-
-%% Convert the relevant XMP properties to PDF strings, expanding markup
-%% (such as \sep, \&, \copyright, etc) in an appropriate way.
-%% These PDF strings are actually not always necessary, but if supplied they
-%% must match exactly what is in the XMP version. This may be impossible
-%% if math symbols are used; e.g. Plane-1 alphanumerics.
-%% Generally, it is better to *not* provide PDF-info strings;
-%% instead just providing metadata through XMP.
-%% This is not always enough — a driver may add it by default!
-%%
-%% But some PDF readers don't support XMP, so it is nice to have
-%%  /Info fields, when this can be done reliably.
-%%
-\begingroup
- \RequirePackage{stringenc}%
- \expandafter\ifx\csname pdf@escapehex\endcsname\relax
-  \PackageWarning{pdfx}{%
-   Missing an implementation of \string\pdf@escapehex ^^J
-   Translated Metadata cannot be generated as PDF strings.^^J}%
-  \def\pdfx@GeneratePdfString#1#2{}%
-  \def\pdfx@ConvertUTFtoBE#1#2{}%
- \else
-  \def\pdfx@GeneratePdfString#1#2{%
-   % converts a UTF-8 string to UTF-16be
-   \StringEncodingConvert{#1}{#2}{utf8}{utf16be}%
-   \xdef#1{\string\376\string\377\pdfescapestring{#1}}%
-  }%
-  \def\pdfx@ConvertUTFtoBE#1#2{%
-   \setbox0=\hbox{% catch any rubbish escaping to the MVL
-    \def\cf@encoding{L8U}\fontencoding{L8U}%
-    \ifluatex
-     \let\pdfescapestring\luaescapestring
-    \else\ifxetex\else
-     \inputencoding{8bit}%
-    \fi\fi
-%%    \pdfx@xmpmarkup %% don't want some things
-    \pdfx@xmpunimarkup
-    \let\backslash\textbackslash
-    \edef\pdfx@temp{#2}% ensure XMP expands to UTF8
-    \pdfx@GeneratePdfString{#1}{\pdfx@temp}%
-   }%
-  }%
- \fi
- \pdfx@pdfmarkup
- \global\let\pdfx@pdfAuthor\@empty
- \global\let\pdfx@pdfTitle\@empty
- \global\let\pdfx@pdfSubject\@empty
- \global\let\pdfx@pdfKeywords\@empty
- \ifpdfx@nopdfinfo  %  transliterated strings present
-%% RRM: this may still work with parser macros   ???
- \ifluatex
-  %%  \pdf@escapehex   gets it wrong!!
-  %%   Is there a better way ?
- \else
-  \pdfx@ConvertUTFtoBE\pdfx@pdfTitle\xmp@Title
-  \pdfx@ConvertUTFtoBE\pdfx@pdfSubject\xmp@Subject
- \fi
-\else
-  \pdfx@topdfstring\pdfx@pdfTitle\xmp@Title
-  \ifpdfx@e\else\ifpdfx@x\else
-   \pdfx@topdfstring\pdfx@pdfSubject\xmp@Subject
-  \fi\fi
- \fi
- \pdfx@topdfstring\pdfx@CreatorTool\xmp@CreatorTool
- \pdfx@topdfstring\pdfx@Producer\xmp@Producer
-%%  \pdfescapestring  needed
- \expandafter\ifx\csname pdfescapestring\endcsname\relax
-  \else
-    \expandafter\ifx\expandafter\relax\xmp@Author\relax
-    \else
-%%  check for multiple authors with parser macro
-     \expandafter\pdfx@parseforsep\xmp@Author\sep\pdfx@endparse
-     \ifpdfx@sep@infield@
-     \else
-      \pdfx@ConvertUTFtoBE{\pdfx@pdfAuthor}{\xmp@Author}%
-     \fi %% end of  \ifpdfx@sep@infield@
-    \fi  %%  end of  \xmp@Author  test
-    \expandafter\ifx\expandafter\relax\xmp@Keywords\relax
-    \else
-%%  check for multiple keywords with parser macro
-     \expandafter\pdfx@parseforsep\xmp@Keywords\sep\pdfx@endparse
-     \ifpdfx@sep@infield@\else
-      \ifluatex\else
-      \pdfx@ConvertUTFtoBE{\pdfx@pdfKeywords}{\xmp@Keywords}%
-     \fi
-     \fi %% end of  \ifpdfx@sep@infield@
-    \fi  %%  end of  \xmp@Keywords  test
-%%
-  \fi  %%  end of \pdfescapestring  test
-\endgroup
-
-%% Affects CMap creation for certain fonts, according to glyph names
-%%  How to support XeTeX here ?
-%%  Maybe it's best to be using an updated  mmap.sty  ?
-\ifxetex
-\else
- \input glyphtounicode.tex
- \input glyphtounicode-cmr.tex
- \input glyphtounicode-ntx.tex
- \pdfgentounicode=1
-\fi
-\ifgrkLGRxmp
- \ifxetex\else
-  \pdfglyphtounicode{internalchar2}{200D}%
-\fi \fi
-
-%% patch to place accents *after* the base character, rather than before
-%%  based on coding from  mmap.sty  by RRM
-\newif\ifPDFX@inaccent
-\let\LTX@add@accent\add@accent
-\def\PDFX@add@accent#1#2{%
- \hmode@bgroup
-  \let \hmode@start@before@group \@firstofone
-  \setbox\@tempboxa\hbox{\PDFX@inaccenttrue
-   #2\global\mathchardef\accent@spacefactor\spacefactor}%
-  #2\kern-\wd\@tempboxa
-%%  \ifdim\ht\@tempboxa>1ex\relax
-   \dimen@=\ht\@tempboxa\advance\dimen@-1ex\relax
-%%% reduce how much a nested accent is raised
-   \ifPDFX@inaccent\advance\dimen@-.2ex\relax\fi
-   \raise\dimen@\hbox to\wd\@tempboxa{\hss
-    \accent#1{\vphantom{#2}}\hss}%
-%%  \else
-%%  \accent#1{%\vphantom{#2}
-%%   \vrule width\z@ height\ht\@tempboxa depth\dp\@tempboxa}%
-%% \fi
- \egroup
- \spacefactor\accent@spacefactor
-}
-
-%% How to support XeTeX here ?
-%%%%%  adjust accent characters to the Unicode Combining variant  %%%%
-\def\PDFX@combiningchars@unicode{%
- \pdfglyphtounicode{grave}{0300}%
- \pdfglyphtounicode{acute}{0301}%
- \pdfglyphtounicode{circumflex}{0302}%
- \pdfglyphtounicode{tilde}{0303}%
- \pdfglyphtounicode{macron}{0304}%
- \pdfglyphtounicode{Macronsmall}{0304}%
- \pdfglyphtounicode{breve}{0306}%
- \pdfglyphtounicode{dotaccent}{0307}%
- \pdfglyphtounicode{Dotaccent}{0307}%
- \pdfglyphtounicode{Dotaccentsmall}{0307}%
- \pdfglyphtounicode{dieresis}{0308}%
- \pdfglyphtounicode{ogonek}{0309}%
- \pdfglyphtounicode{ring}{030A}%
- \pdfglyphtounicode{hungarumlaut}{030B}%
- \pdfglyphtounicode{caron}{030C}%
- \pdfglyphtounicode{cedilla}{0327}%
- \pdfglyphtounicode{commaaccent}{0326}%   droid
- %  tie accents in  berenisadf  lm  stix  and others
- \pdfglyphtounicode{tieaccentlowercase}{0311}%
- \pdfglyphtounicode{tieaccentcapital}{0361}%
- \pdfglyphtounicode{newtieaccentlowercase}{0311}%
- \pdfglyphtounicode{newtieaccentcapital}{0361}%
- % cm-unicode
- \pdfglyphtounicode{space_uni030D}{030D}%
- \pdfglyphtounicode{space_uni030E}{030E}%
- \pdfglyphtounicode{space_uni030F}{030F}%
- \pdfglyphtounicode{space_uni0311}{0311}%
- \pdfglyphtounicode{space_uni0321}{0321}%
- \pdfglyphtounicode{space_uni0322}{0322}%
- \pdfglyphtounicode{space_uni032A}{032A}%
- \pdfglyphtounicode{space_uni032B}{032B}%
- \pdfglyphtounicode{space_uni0335}{0335}%
- \pdfglyphtounicode{space_uni0337}{0337}%
- \pdfglyphtounicode{space_uni033A}{033A}%
- \pdfglyphtounicode{space_uni033B}{033B}%
- \pdfglyphtounicode{space_uni033C}{033C}%
- \pdfglyphtounicode{space_uni034D}{034D}%
-}
-
-\AtBeginDocument{%
- \ifx\add@accent\LTX@add@accent
-  \let\add@accent\PDFX@add@accent
- \else
-  \expandafter\ifx\csname MT@orig@add@accent\endcsname\relax
-  \TPDF@error{another package has already patched \string\add@accent }%
-  \else
-   \expandafter\let\csname MT@orig@add@accent\endcsname\PDFX@add@accent
- \fi\fi
- \ifxetex
- \else
-  \PDFX@combiningchars@unicode
-  \@ifpackageloaded{newtxmath}{%
-    \pdfglyphtounicode{vec}{20D7}%
-    \pdfglyphtounicode{rvec}{20D6}%
-    \pdfglyphtounicode{lrvec}{20E1}%
-   }{}%
-  \fi %  end of   \ifxetex
-}
-
-%%  suppress hyperlinks when generating  PDF/X
-\def\pdfx@linkfile@pdfX#1#2#3{%
- \Hy@colorlink\@filecolor#1\Hy@xspace@end}
-\def\pdfx@linkstart@pdfX#1#2#3{%
- \Hy@colorlink\@linkcolor#3\endgroup\Hy@xspace@end}
-\def\pdfx@linkurl@pdfX#1#2{%
- \Hy@colorlink\@urlcolor#1\endgroup\Hy@xspace@end}
-\def\pdfx@StartlinkName@pdfX#1#2{}
-\def\pdfx@close@pdflink{\Hy@VerboseLinkStop\Hy@endcolorlink}%
-\def\pdfx@Acrobatmenu@noaction#1#2{#2}
-
-\ifpdfx@x
- \let\hyper@linkfile\pdfx@linkfile@pdfX
- \let\hyper@linkurl\pdfx@linkurl@pdfX
- \let\hyper@linkstart\pdfx@linkstart@pdfX
- \let\hyper@linkend\relax
- \let\Hy@StartlinkName\pdfx@StartlinkName@pdfX
- \let\close@pdflink\pdfx@close@pdflink
- \let\AcrobatMenu\pdfx@Acrobatmenu@noaction
- \Hy@bookmarksfalse
-%% {\def\sep{;}% should not be needed, but just in case
-  \AtBeginDocument{%
-   % cancel annotations and links
-   %
-   \def\PDF@FinishDoc{%  ??? What uses this ???
-    \begingroup
-     \def\sep{; }% should not be needed, but just in case
-     \pdfinfo{%
-      \ifx\pdfx@pdfTitle\@empty\else /Title(\pdfx@pdfTitle)\fi
-      \ifx\pdfx@pdfAuthor\@empty\else /Author(\pdfx@pdfAuthor)\fi
-      \ifx\pdfx@pdfSubject\@empty\else /Subject(\pdfx@pdfSubject)\fi
-      \ifx\pdfx@pdfKeywords\@empty\else /Keywords(\pdfx@pdfKeywords)\fi
-       /Creator(\pdfx@CreatorTool)%
-      \ifx\@pdfcreationdate\@empty
-       /CreationDate(D:\pdfx@convDate)%
-      \else
-       \ifxetex\else
-        /CreationDate(\@pdfcreationdate)%
-      \fi\fi
-      \ifx\@pdfmoddate\@empty
-       /ModDate(D:\pdfx@convDate)%
-      \else
-       /ModDate(\@pdfmoddate)%
-      \fi
-      /Producer(\pdfx@Producer)%
-      /Trapped/False
-      \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
-     }%%  end of  PDF/X  info
-    \endgroup   %%  end of scope for  \sep
-   }%% end of  \PDF@FinishDoc
-  }% end of  \AtBeginDocument
-%%  \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
-%% }% end of scope for  \sep
-\else
- \ifpdfx@e   %% PDF/E
-  \AtBeginDocument{%
-   \def\PDF@FinishDoc{%  ??? What uses this ???
-    \begingroup
-     \def\sep{; }% should not be needed, but just in case
-     \pdfinfo{%
-      \ifx\pdfx@pdfTitle\@empty\else /Title(\pdfx@pdfTitle)\fi
-      \ifx\pdfx@pdfAuthor\@empty\else /Author(\pdfx@pdfAuthor)\fi
-      \ifx\pdfx@pdfSubject\@empty\else /Subject(\pdfx@pdfSubject)\fi
-      \ifx\pdfx@pdfKeywords\@empty\else /Keywords(\pdfx@pdfKeywords)\fi
-       /Creator(\pdfx@CreatorTool)%
-      \ifx\@pdfcreationdate\@empty
-       /CreationDate(D:\pdfx@convDate)%
-      \else
-       \ifxetex\else
-        /CreationDate(\@pdfcreationdate)%
-      \fi\fi
-      \ifx\@pdfmoddate\@empty
-       /ModDate(D:\pdfx@convDate)%
-      \else
-       /ModDate(\@pdfmoddate)%
-      \fi
-      /Producer(\pdfx@Producer)%
-      /Trapped/False
-      /GTS_PDFEVersion(PDF/E-1\xmp@Conformance:\xmp@ReleaseDate)%
-     }%  end of  PDF/E  info
-    \endgroup  %% end of scope for  \sep
-   }% end of  \PDF@FinishDoc
-  }% end of  \AtBeginDocument
-%% {\def\sep{;}% should not be needed, but just in case
-%%  \pdfinfo{%   order of these dictionary keys should not matter
-%%     \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
-%%   \ifx\pdfx@Author\@empty\else /Author(\pdfx@Author)\fi
-%%   /CreationDate(\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
-%% }% end of scope for  \sep
- \else  %%  PDF/A
-  \def\pdfx@confA{a}%
-  \def\pdfx@confB{b}%
-  \def\pdfx@confU{u}%
-  \expandafter\def\expandafter\xmp@conf\expandafter
-   {\csname pdfx@conf\xmp@Conformance\endcsname}%
-  \AtBeginDocument{%
-   \def\PDF@FinishDoc{%  ??? What uses this ???
-   \begingroup
-    \def\sep{; }% should not be needed, but just in case
-    \pdfinfo{%
-     \ifx\pdfx@pdfTitle\@empty\else /Title(\pdfx@pdfTitle)\fi
-     \ifx\pdfx@pdfAuthor\@empty\else /Author(\pdfx@pdfAuthor)\fi
-     \ifx\pdfx@pdfSubject\@empty\else /Subject(\pdfx@pdfSubject)\fi
-     \ifx\pdfx@pdfKeywords\@empty\else /Keywords(\pdfx@pdfKeywords)\fi
-      /Creator(\pdfx@CreatorTool)%
-     \ifx\@pdfcreationdate\@empty
-      /CreationDate(D:\pdfx@convDate)%
-     \else
-      \ifxetex\else
-       /CreationDate(\@pdfcreationdate)%
-     \fi\fi
-     \ifx\@pdfmoddate\@empty
-      /ModDate(D:\pdfx@convDate)%
-     \else
-      /ModDate(\@pdfmoddate)%
-     \fi
-     /Producer(\pdfx@Producer)%
-     /Trapped/False
-     /GTS_PDFA1Version (PDF/A-\xmp@Part\xmp@conf:\xmp@ReleaseDate)%
-    }%  end of  PDF/A  info
-   \endgroup  %%  end of scope for  \sep
-  }% end of  \PDF@FinishDoc
- }% end of  \AtBeginDocument
-\fi\fi
-
-%%----------------------------------------------------------------------
-\begingroup
-%% override the \ifpdf  check of  xmpincl  package
-\ifxetex
- \pdftrue
-\else\ifluatex
- \pdftrue
-\fi\fi
-\RequirePackage{xmpincl}
-\ifxetex
- % revert \ifpdf
- \pdffalse
-\else\ifluatex
- \pdffalse
-\fi\fi
-
-%% combine coding from  xmpincl  and  hyperxml to support XeTeX
-\def\pdfx@xmpincl@xetex#1{%
- \IfFileExists{#1.xmp}{%
-  \mcs@xmpincl@patchFile{#1}%
-  \begingroup
-   \special{pdf:fstream @pdfx@Metadata (#1.xmpi)
-    <<
-      /Type /Metadata
-      /Subtype /XML
-    >>
-   }%
-   \special{pdf:put @catalog
-    <<
-      /Metadata @pdfx@Metadata
-    >>
-   }%
-  \endgroup
- }{%
-  \newcommand{\mcs@xmpincl@filename}{#1.xmp}%
-    \PackageError{xmpincl}%
-    {The file \mcs@xmpincl@filename\space was not found}%
-    {The file \mcs@xmpincl@filename\space The metadata file
-     wasn't found.\MessageBreak Oops.}%
- }
-}
-\ifxetex
- \let\includexmp\pdfx@xmpincl@xetex
-\fi
-
-%% macro provided by Leonardo E. Segovia on 2017-05-15
-%% <leonardo.segovia@cs.uns.edu.ar>
-\def\pdfx@xmpincl@luatex#1{%
- \IfFileExists{#1.xmp}{%
-   \mcs@xmpincl@patchFile{#1}%
-   \begingroup
-   \pdfcompresslevel=0
-   \immediate\pdfobj uncompressed stream attr {/Type /Metadata /Subtype /XML}
-   file{#1.xmpi}%
-   \pdfcatalog{%\pdfx@LanguageSpec
-    /Metadata \the\pdflastobj\space 0 R}%
-   \endgroup
- }{%
-  \newcommand{\mcs@xmpincl@filename}{#1.xmp}%
-   \PackageError{xmpincl}%
-   {The file \mcs@xmpincl@filename\space was not found}%
-   {The file \mcs@xmpincl@filename\space The metadata file
-     wasn't found.\MessageBreak Oops.}%
- }
-}
-\ifluatex
- \let\includexmp\pdfx@xmpincl@luatex
-\fi
-
-%%----------------------------------------------------------------------
-\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
- \catcode`\'=12 \catcode`\<=12 \catcode`\>=12 \catcode`\?=12
- \catcode`\"=12 \catcode`\= 12 %% used within the template file
-%% patch commands from  xmpincl.sty  ...
- \def\pdfx@xmpinclStart{% supply byte-order marker
-  <?xpacket begin='^^ef^^bb^^be' 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{}%
-%%
-%% \def\pdfx@endeval{%
-%%  \noexpand \TE@setvaltrue \noexpand \else
-%%  \noexpand \TE@setvalfalse \noexpand \fi
-%%   \noexpand \TE@negatefalse \noexpand \fi}%
-%% \let\TE@endeval\pdfx@endeval
- \ifluatex\else\ifxetex\else
-  \inputencoding{8bit}%
- \fi\fi
- \makeatletter
- \def\cf@encoding{L8U}\fontencoding{L8U}%
- \providecommand{\ifnot@empty}[2]{\ifx#1\@empty\relax\else#2\fi}%
- \pdfx@xmpmarkup
-\expandafter\global\expandafter
-  \let\csname L8U-cmd\expandafter\endcsname\csname U-cmd\endcsname
- \def\cf@encoding{L8U}\fontencoding{L8U}%
- \providecommand{\ifnot@empty}[2]{\ifx#1\@empty\relax\else#2\fi}%
- \obeyspaces%
-%% beware 128 space characters -- for padding end of XMP packet
- \gdef\paddingline{                                                                                                                                }%
- \typeout{Using XMP template file: \xmp@template.xmp}%
- \includexmp{\xmp@template}%
-\endgroup
-
-%%
-%% revert active characters to previous encoding
-%%
-\ifpdf@activechars
- \global\let ^^c0\pdfx@save@co
- \global\let ^^c1\pdfx@save@ci
- \global\let ^^c2\pdfx@save@cii
- \global\let ^^c3\pdfx@save@ciii
- \global\let ^^c4\pdfx@save@civ
- \global\let ^^c5\pdfx@save@cv
- \global\let ^^c6\pdfx@save@cvi
- \global\let ^^c7\pdfx@save@cvii
- \global\let ^^c8\pdfx@save@cviii
- \global\let ^^c9\pdfx@save@cix
- \global\let ^^ca\pdfx@save@ca
- \global\let ^^cb\pdfx@save@cb
- \global\let ^^cc\pdfx@save@cc
- \global\let ^^cd\pdfx@save@cd
- \global\let ^^ce\pdfx@save@ce
- \global\let ^^cf\pdfx@save@cf
- \global\let ^^d0\pdfx@save@do
- \global\let ^^d1\pdfx@save@di
- \global\let ^^d2\pdfx@save@dii
- \global\let ^^d3\pdfx@save@diii
- \global\let ^^d4\pdfx@save@div
- \global\let ^^d5\pdfx@save@dv
- \global\let ^^d6\pdfx@save@dvi
- \global\let ^^d7\pdfx@save@dvii
- \global\let ^^d8\pdfx@save@dviii
- \global\let ^^d9\pdfx@save@dix
- \global\let ^^da\pdfx@save@da
- \global\let ^^db\pdfx@save@db
- \global\let ^^dc\pdfx@save@dc
- \global\let ^^dd\pdfx@save@dd
- \global\let ^^de\pdfx@save@de
- \global\let ^^df\pdfx@save@df
- \global\let ^^e0\pdfx@save@eo
- \global\let ^^e1\pdfx@save@ei
- \global\let ^^e2\pdfx@save@eii
- \global\let ^^e3\pdfx@save@eiii
- \global\let ^^e4\pdfx@save@eiv
- \global\let ^^e5\pdfx@save@ev
- \global\let ^^e6\pdfx@save@evi
- \global\let ^^e7\pdfx@save@evii
- \global\let ^^e8\pdfx@save@eviii
- \global\let ^^e9\pdfx@save@eix
- \global\let ^^ea\pdfx@save@ea
- \global\let ^^eb\pdfx@save@eb
- \global\let ^^ec\pdfx@save@ec
- \global\let ^^ed\pdfx@save@ed
- \global\let ^^ee\pdfx@save@ee
- \global\let ^^ef\pdfx@save@ef
- \global\let ^^f0\pdfx@save@fo
- \global\let ^^f1\pdfx@save@fi
- \global\let ^^f2\pdfx@save@fii
- \global\let ^^f3\pdfx@save@fiii
-\fi
-
-\endgroup
-
-%%
-%% controls the color model and conversions with  xcolor  package
-%%
-\ifpdfx@cmyk
- %
- % this will have been done already for PDF/X
- %
- \PassOptionsToPackage{xcolor}{cmyk,hyperref}
- \def\pdfx@handlexcolor{\def\@@mod{cmyk}\selectcolormodel{cmyk}%
-   \convertcolorsUtrue\convertcolorsDtrue}
- \ifpdfx@x
- \else
-%%  \AtBeginDocument{%
-%%   \def\@linkcolor{0 1 1 0}%
-%%   \def\@anchorcolor{0 0 0 1}%
-%%   \def\@citecolor{1 0 1 0}%
-%%   \def\@filecolor{.5 0 0 .5}%
-%%   \def\@urlcolor{0 1 0 0}%
-%%   \def\@menucolor{0 1 1 0}%
-%%   \def\@runcolor{.5 0 0 .5}%
-%%   \def\@linkbordercolor{0 1 1 0}%
-%%   \def\@citebordercolor{1 0 1 0}%
-%%   \def\@filebordercolor{.5 0 0 .5}%
-%%   \def\@urlbordercolor{1 0 0 0}%
-%%   \def\@menubordercolor{0 1 1 0}%
-%%   \def\@runbordercolor{.7 0 0 .3}%
-%%   \def\Fld@bcolor{0 0 0 0}%
-%%   \def\Fld@bordercolor{0 1 1 0}%
-%%  }
- \fi
-\else
- \PassOptionsToPackage{xcolor}{rgb,hyperref}
- \def\pdfx@handlexcolor{\def\@@mod{rgb}\selectcolormodel{rgb}%
-   \convertcolorsUtrue\convertcolorsDtrue}
-\fi
-\@ifpackageloaded{xcolor}{\pdfx@handlexcolor
- \ifpdfx@cmyk\else\color{black}\fi}{%
- \AtBeginDocument{\@ifpackageloaded{xcolor}{\pdfx@handlexcolor}{}}
-}
-
-%%----------------------------------------------------------------------
-%%  Disable some actions in Beamer navigation
-\@ifclassloaded{beamer}{%
- \let\real@insertslidenavigationsymbol
-   \insertslidenavigationsymbol
- \let\real@insertbackfindforwardnavigationsymbol
-   \insertbackfindforwardnavigationsymbol
- \def\pdfx@insertslidenavigationsymbol{{%
-  \let\Acrobatmenu\pdfx@Acrobatmenu@noaction
-  \real@insertslidenavigationsymbol
- }}%
- \def\pdfx@insertbackfindforwardnavigationsymbol{{%
-  \let\Acrobatmenu\pdfx@Acrobatmenu@noaction
-  \real@insertbackfindforwardnavigationsymbol
- }}%
- \AtBeginDocument{%
-  \ifHy@pdfa
-   \let\insertslidenavigationsymbol
-     \pdfx@insertslidenavigationsymbol
-   \let\insertbackfindforwardnavigationsymbol
-     \pdfx@insertbackfindforwardnavigationsymbol
-  \fi}%
-}{}
-
-%%----------------------------------------------------------------------
-\ifpdfx@transliterated
-%% support for bookmarks with transliterated input
- \RequirePackage{stringenc}
- \ifxetex\let\pdf@escapehex\empty\fi  % don't need it
- \expandafter\ifx\csname pdf@escapehex\endcsname\relax
-  \PackageWarning{pdfx}{%
-   Missing an implementation of \string\pdf@escapehex ^^J
-   Translated Bookmarks cannot be generated.^^J}%
-  \newcommand{\pdfxBookmark}[4][]{#2[#1]{#4}}%
- \else
-  \def\pdfx@GeneratePdfString#1#2{%
-   % converts a UTF-8 string to UTF-16be
-   \StringEncodingConvert{#1}{#2}{utf8}{utf16be}%
-   \edef#1{\string\376\string\377\pdfescapestring{#1}}%
-  }
-  \newtoks\pdfx@DisabledCommands
-  \def\pdfxDisableCommands#1{%
-  \expandafter\pdfx@DisabledCommands
-   \expandafter{\the\pdfx@DisabledCommands#1}}
-  \pdfxDisableCommands{%
-   \def\80{}%    else   \000\( --> \000\80\050   \000\000\050
-   \aftergroup\let\aftergroup\HyPsd@ConvertToUnicode\aftergroup\@gobble}
-  \let\Hy@@writetorep\@@writetorep
-  \def\pdfx@@writetorep#1#2#3#4#5{%
-   \begingroup
-    \pdfx@xmpunimarkup
-    \pdfx@prebookmark
-    \edef\pdfstringdefPreHook{%\pdfstringdefPreHook
-     \the\pdfx@DisabledCommands}%
-    \Hy@@writetorep{#1}{#2}{#3}{#4}{#5}%
-   \endgroup
-  }
-  \newcommand{\pdfxBookmark}[4][]{%
-   \ifx\relax#3\relax
-    \PackageError{pdfx}{Unknown macro \string#3.
-      A proper bookmark cannot be created}%
-     {Proceed to process the \string#1 as usual.}%
-    #2{#4}%
-   \else
-    \ifluatex  % use the utf8 directly
-     \let\pdfx@temp#3\relax
-     \def\pdfx@prebookmark{%
-      \pdfx@DisabledCommands{}%
-      \let#3\pdfx@temp
-     }%
-    \else\ifxetex  % use the utf8 directly
-     \let\pdfx@temp#3\relax
-     \def\pdfx@prebookmark{%
-      \pdfx@DisabledCommands{}%
-      \let#3\pdfx@temp
-     }%
-    \else
-     % convert the utf8 to utf16be
-     \pdfxBookmarkString\pdfx@temp{#3}%
-    \fi\fi
-    \let\@@writetorep\pdfx@@writetorep
-    \ifx\empty#1\empty
-     \def#3{#4}%
-     #2{#3}%
-    \else
-     \def#3{#1}%
-     #2[#3]{#4}%
-    \fi
-    \let\@@writetorep\Hy@@writetorep
-   \fi
-   \ignorespaces
-  }
-%%  use as:  \pdfxBookmark{\section}{\sectAtitle}{...}
-%%  use as:  \pdfxBookmark[<opt-title>]{\section}{\sectAtitle}{...}
-%%  only needed by pdfTeX --- Lua-/XeTeX use the utf8 directly
-  \def\pdfxBookmarkString#1#2{%
-   \pdfx@GeneratePdfString#1{#2}%
-   \def\pdfx@prebookmark{%
-    \pdfxDisableCommands{\let#2#1}%
-   }%
-  }
-%% use as:  \pdfxBookmarkString\PdfSectA\sectAtitle
-%%  where \sectAtitle has been defined by e.g.
-%%  \pdfxEnableCommands{\xdef\sectAtitle{\textLGR{...}}}
-
- \fi % end of \ifx\pdf@escapehex\relax
-\fi % end of \ifpdfx@transliterated
-
-%%----------------------------------------------------------------------
-
-%% 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}%
-%% once set correctly, don't let this change
- \Hy@DisableOption{pdfa}\let\Hy@pdfafalse\relax\let\Hy@pdfatrue\relax
-\endinput
-%%
-%% End of file `pdfx.sty'.
diff --git a/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf b/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf
index 746b352b02c..86e447b2830 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/pdfx.xmpdata b/Master/texmf-dist/doc/latex/pdfx/pdfx.xmpdata
index edd031fb246..66eb6446350 100644
--- a/Master/texmf-dist/doc/latex/pdfx/pdfx.xmpdata
+++ b/Master/texmf-dist/doc/latex/pdfx/pdfx.xmpdata
@@ -1,24 +1,33 @@
 \Title{Generation of PDF/X- and PDF/A-compliant PDFs with pdfTeX \textemdash\ pdfx.sty}
 \Author{\CVR\sep \Thanh\sep Ross Moore\sep Peter Selinger}
 \Subject{This package supports generation of PDF/X-, PDF/A- and PDF/E-compliant documents, in most of their variants, using pdfLaTeX, LuaLaTeX and XeLaTeX.}
-\Keywords{PDF/X-, PDF/A- and PDF/E-compliance\sep Multilingual Metadata\sep installation\sep \TeX Live \lastyear}
+\Keywords{PDF/X-, PDF/A- and PDF/E-compliance\sep Multilingual Metadata\sep installation\sep \TeX Live \thisyear}
 \PublicationType{manual}
 \Contributor{Norbert Preining: 'colorprofiles' package}
 \Copyright{Public domain.}
 \Copyrighted{False}
 \CopyrightURL{http://tug.org/texlive/}
-\CoverDisplayDate{November \thisyear}
-\CoverDate{\thisyear-11-29}
-\CreatorTool{pdfTeX + pdfx.sty with option \pdfxopt, from TeX Live \lastyear}
-\Date{2017-05-18\sep 2017-06-23\sep 2018-11-29}
+\CoverDisplayDate{March \thisyear}
+\CoverDate{\thisyear-03-10}
+\CreatorTool{LaTeX + pdfx.sty with option \pdfxopt, from TeX Live \thisyear}
+\Date{2017-05-18\sep 2017-06-23\sep 2018-11-29\sep 2018-12-22\sep 2019-02-08\sep 2019-03-10}
 \Advisory{An earlier version of this documentation was published as: TUGboat 36, No.2, pp.136\textendash 142 (2015)}
 \Advisory{v1.6: Added XMP support for PDF/UA-1. Added more Metadata fields and Language support.}
 \Advisory{v1.6: Default RGB and CMYK profiles now require the  colorprofiles.sty  package.}
 \Relation{Requires the  colorprofiles  package for RGB and CMYK default profiles.}
 \Advisory{v1.6: Access more profiles, incl. to  pdfaPilot's color profile folders.}
-\Advisory{v1.6: Revised  glyphtounicode.sty  to use variation selectors, altered maps to PUA codepoints; added more glyphs via glyphtounicode-ntx.tex }
+\Advisory{v1.6: Revised  glyphtounicode.sty  to use variation selectors.}
+\Advisory{v1.6: altered maps to PUA codepoints.}
+\Advisory{v1.6: added more glyphs via glyphtounicode-ntx.tex }
 \Advisory{v1.6: Support for 8-bit Hebrew encodings, some Arabic and Devanagari.}
 \Advisory{v1.6: Updated documentation, incl. for LaTeX changes.}
+\Advisory{v1.6.1: Fixed issue with ifthen package; improved Metadata with LuaTeX and XeTeX.}
+\Advisory{v.1.6.1: Flexibility with page boxes for PDF/X.}
+\Advisory{v.1.6.2: Fixed passing of options to xcolor, and some glyphtounicode values.}
+\Advisory{v.1.6.2: Fixed encoding issue. Extra warning when colorprofiles.tex is missing.}
+\Advisory{v.1.6.3: Properly fixed encoding issue; supports \string\pdfomitcharset\  primitive.}
+\Advisory{v.1.6.3: Reference to veraPDF validation software; additions to glyphtounicode-ntx.tex.}
+\Advisory{v.1.6.3: Patched \string\mathaccentV\ to output accents after the base character.}
 \pdfxEnableCommands{%
  \def\CVR{C.V. Radhakrishnan}\def\Thanh{H\`an Th\eee Thanh}%
  \def\eee{^^c3^^aa^^cc^^81 }}
diff --git a/Master/texmf-dist/source/latex/pdfx/Makefile.src b/Master/texmf-dist/source/latex/pdfx/Makefile.src
index 80d102c327e..7681e190128 100644
--- a/Master/texmf-dist/source/latex/pdfx/Makefile.src
+++ b/Master/texmf-dist/source/latex/pdfx/Makefile.src
@@ -17,7 +17,7 @@ out:
 #	sed 's/BOOKMARK/fxmark/g;' tmp.out > x.out; mv x.out tmp.out ;
 
 pdf:
-	pdflatex $(file).dtx 
+	pdflatex -recorder $(file).dtx 
 
 index:
 	makeindex -s gind.ist -o $(file).ind $(file).idx 
diff --git a/Master/texmf-dist/source/latex/pdfx/pdfx.dtx b/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
index 99fce07c5c8..ffdb92ee01b 100644
--- a/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
+++ b/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
@@ -2,7 +2,7 @@
 %                                                                
 %  File: pdfx.dtx
 %
-%  Copyright (c) 2018, CV Radhakrishnan <cvr@river-valley.org>,
+%  Copyright (c) 2019, 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>
@@ -19,38 +19,45 @@
 %
 % \fi
 %
-% \CheckSum{6202}
+% \CheckSum{6309}
 % \iffalse
 %
 %<*driver>
 \pdfcompresslevel 9
 \providecommand{\pdfxopt}{a-2u}
 \providecommand{\lastyear}{2018}
-\providecommand{\thisyear}{2018}
+\providecommand{\thisyear}{2019}
 \begin{filecontents*}{./\jobname.xmpdata}
 \Title{Generation of PDF/X- and PDF/A-compliant PDFs with pdfTeX \textemdash\ pdfx.sty}
 \Author{\CVR\sep \Thanh\sep Ross Moore\sep Peter Selinger}
 \Subject{This package supports generation of PDF/X-, PDF/A- and PDF/E-compliant documents, in most of their variants, using pdfLaTeX, LuaLaTeX and XeLaTeX.}
-\Keywords{PDF/X-, PDF/A- and PDF/E-compliance\sep Multilingual Metadata\sep installation\sep \TeX Live \lastyear}
+\Keywords{PDF/X-, PDF/A- and PDF/E-compliance\sep Multilingual Metadata\sep installation\sep \TeX Live \thisyear}
 \PublicationType{manual}
 \Contributor{Norbert Preining: 'colorprofiles' package}
 \Copyright{Public domain.}
 \Copyrighted{False}
 \CopyrightURL{http://tug.org/texlive/}
-\CoverDisplayDate{November \thisyear}
-\CoverDate{\thisyear-12-22}
-\CreatorTool{LaTeX + pdfx.sty with option \pdfxopt, from TeX Live \lastyear}
-\Date{2017-05-18\sep 2017-06-23\sep 2018-11-29\sep 2018-12-22}
+\CoverDisplayDate{March \thisyear}
+\CoverDate{\thisyear-03-10}
+\CreatorTool{LaTeX + pdfx.sty with option \pdfxopt, from TeX Live \thisyear}
+\Date{2017-05-18\sep 2017-06-23\sep 2018-11-29\sep 2018-12-22\sep 2019-02-08\sep 2019-03-10}
 \Advisory{An earlier version of this documentation was published as: TUGboat 36, No.2, pp.136\textendash 142 (2015)}
 \Advisory{v1.6: Added XMP support for PDF/UA-1. Added more Metadata fields and Language support.}
 \Advisory{v1.6: Default RGB and CMYK profiles now require the  colorprofiles.sty  package.}
 \Relation{Requires the  colorprofiles  package for RGB and CMYK default profiles.}
 \Advisory{v1.6: Access more profiles, incl. to  pdfaPilot's color profile folders.}
-\Advisory{v1.6: Revised  glyphtounicode.sty  to use variation selectors, altered maps to PUA codepoints; added more glyphs via glyphtounicode-ntx.tex }
+\Advisory{v1.6: Revised  glyphtounicode.sty  to use variation selectors.}
+\Advisory{v1.6: altered maps to PUA codepoints.}
+\Advisory{v1.6: added more glyphs via glyphtounicode-ntx.tex }
 \Advisory{v1.6: Support for 8-bit Hebrew encodings, some Arabic and Devanagari.}
 \Advisory{v1.6: Updated documentation, incl. for LaTeX changes.}
 \Advisory{v1.6.1: Fixed issue with ifthen package; improved Metadata with LuaTeX and XeTeX.}
 \Advisory{v.1.6.1: Flexibility with page boxes for PDF/X.}
+\Advisory{v.1.6.2: Fixed passing of options to xcolor, and some glyphtounicode values.}
+\Advisory{v.1.6.2: Fixed encoding issue. Extra warning when colorprofiles.tex is missing.}
+\Advisory{v.1.6.3: Properly fixed encoding issue; supports \string\pdfomitcharset\  primitive.}
+\Advisory{v.1.6.3: Reference to veraPDF validation software; additions to glyphtounicode-ntx.tex.}
+\Advisory{v.1.6.3: Patched \string\mathaccentV\ to output accents after the base character.}
 \pdfxEnableCommands{%
  \def\CVR{C.V. Radhakrishnan}\def\Thanh{H\`an Th\eee Thanh}%
  \def\eee{^^c3^^aa^^cc^^81 }}
@@ -64,6 +71,7 @@
 \input text89.def
 \usepackage[T1]{fontenc}
 \hypersetup{citecolor=blue}
+\pdfstringdefDisableCommands{\def\thinspace{}}
 \newcommand{\fixmd}{${}^{\mathrm f}$}
 \newcommand{\starmd}{${}^{\ast}$}
 \EnableCrossrefs
@@ -126,8 +134,7 @@
 % \DoNotIndex{\scantokens,\typeout,\vrule,\wd}
 %
 % \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.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.}
@@ -166,10 +173,13 @@
 % Updated documentation, incl. for LaTeX changes.
 %  }%
 % \changes{v1.6.1}{2018/12/22}{Fixed issue with ifthen package;
-%  improved Metadata with LuaTeX and XeTeX. Flexibility with page boxes for PDF/X.}
+%  improved Metadata with LuaTeX and XeTeX. Flexibility with page boxes for PDF/X.}%
+% \changes{v1.6.2}{2019/01/04}{Fixed passing of options to xcolor, and some glyphtounicode values.}%
+% \changes{v1.6.3}{2019/02/27}{Fixed encoding issues; support for new  pdfomitcharset  primitive;
+%   reference to veraPDF validation software; additions to glyphtounicode-ntx.tex.}%
 % \title{Generation of PDF/X- and PDF/A-\penalty-200 compliant PDFs with \pdftex --- \texttt{pdfx.sty}}
-% \date{2018/12/22}
-% \version{1.6.1}
+% \date{2019/02/27}
+% \version{1.6.3}
 % \keywords{PDF, PDF/A, PDF/X, pdf\TeX, \LaTeX, Multilingual Metadata}
 % \author{C.\,V.\,Radhakrishnan, \Thanh, Ross Moore {\upshape\small
 % and} Peter Selinger}
@@ -431,7 +441,13 @@
 % 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.
+% \item |nocharset|: do not generate the Charset entry for fonts (\pdftex\ only).
+% \item |usecharset|: generate the Charset entry for fonts (\pdftex\ only).
 % \end{itemize} 
+% The latter two options affect the value of the |\pdfomitcharset| primitive,
+% added to \pdftex\ in 2019, due to differing requirements for PDF/A-1
+% and other PDF/A versions. Indeed use of the |/Charset| entry for a font
+% is deprecated entirely for PDF 2.0~\cite{PDF20} and later.
 %
 % \subsubsection{XMP language options}\label{ssec-xmplang}
 %
@@ -551,6 +567,8 @@
 % This file is the complete XMP Metadata packet. 
 % It can be checked for validity, using an online validator,  such as at 
 % \href{http://www.pdflib.com/knowledge-base/xmp-metadata/free-xmp-validator/}{www.pdflib.com}.
+% \textsf{veraPDF}~\cite{veraPDF} is Open Source software providing validation for PDF/A, 
+% and other checkers useful in a PDF/A production setting.
 % 
 % \textbf{Warning}: The |\jobname.xmpdata| file may be included in the
 % main document source, within a |{filecontents*}| environment, 
@@ -2174,10 +2192,10 @@
 % to allow macro usage within the metadata. 
 % Suggestions for such additions should be sent to the |pdfx| package authors, along
 % with example documents. Similarly support for more languages can be requested.
-% 
+%
 % \subsection[Nested Parsing\,\textemdash\,Mathematics in Metadata]%
 %  {Nested Parsing\,\textemdash\,Mathematics in Metadata}\label{ssec-math}
-% 
+%
 % Macro commands for many mathematical symbols can be used directly in metadata without extra
 % support; e.g., basic arithmetic operations, letter-like symbols, spacing commands.
 % Super- and subscripted letters and numerals can use |\textsuperscript| and |\textsubscript|
@@ -2367,8 +2385,8 @@
 % \end{itemize}
 %
 %
-% \clearpage
-% \section[Bibliography]{Bibliography}
+% \section[Bibliography]{Bibliography}%
+% {\let\newpage\relax
 % \begin{thebibliography}{999}
 %
 % \bibitem{PDF17}Adobe Systems Inc.;
@@ -2514,6 +2532,7 @@
 % \texttt{colorprofiles} \textemdash\ Collection of free ICC profiles.
 %  \TeX\ and \LaTeX\ package (by R.\,Moore), distributed with \TeX{}Live. (November 2018)\\
 %  \url{https://ctan.org/pkg/colorprofiles}.
+%
 % \bibitem{PRISM}PRISM; Publishing Requirements for Industry Standard Metadata. 
 %  PRISM Metadata Initiative; Idealliance Working Group.
 % \url{http://www.idealliance.org/specifications/prism-metadata-initiative/prism}
@@ -2522,6 +2541,11 @@
 % Generation of PDF/X- and PDF/A-compliant PDFs with \pdftex --- \texttt{pdfx.sty}.
 % TUGboat Vol.\,36, No.\,2; TUG 2015 Conference Proceedings. \TeX\ Users Group, 2015; pp.\,136--142.
 %
+% \bibitem{veraPDF} veraPDF. Industry Supported PDF/A Validation. 
+% Software, dual-licensed under the GNU General Public License v3 or later (GPLv3+) 
+% and Mozilla Public License v2 or later (MPLv2+). \url{https://verapdf.org}.
+% Wiki: \url{https://github.com/veraPDF/veraPDF-validation-profiles/wiki}
+%
 % \bibitem{RDF} World Wide Web Consortium (W3C); 
 % Resource Description Format: RDF 1.1 XML Syntax. W3C Recommendation. (February 2014)
 % \url{https://www.w3.org/TR/rdf-syntax-grammar/}.
@@ -2534,7 +2558,7 @@
 % PDF/X: \url{https://en.wikipedia.org/wiki/PDF/X}
 %
 % \end{thebibliography}
-% \goodbreak
+% }\goodbreak
 % \section[Implementation]{Implementation}
 % 
 % \iffalse
@@ -2551,7 +2575,7 @@
 }{}%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfx}
-  [2018/12/22 v1.6.1 PDF/X and PDF/A support (CVR/HTH/RRM/PS)]
+  [2019/02/27 v1.6.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
@@ -2560,6 +2584,7 @@
 \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\ifpdfx@noerr   % error messages become just warnings
+\newif\ifpdfx@omitcharset % used with  pdfomitcharset  primitive
 
 \DeclareOption{noerr}{\pdfx@noerrtrue}
 
@@ -2587,25 +2612,37 @@
    {, else continue to build a non-valid document}%
 }
 
+%%  support  pdfomitcharset  primitive, added to pdfTeX in 2019
+\DeclareOption{nocharset}{\pdfx@omitcharsettrue}
+\DeclareOption{usecharset}{\pdfx@omitcharsetfalse}
+
 %% PDF/A options
 %%  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}}
+ \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2005}%
+ \pdfx@omitcharsetfalse}
 \DeclareOption{a-1b}{\global\pdfx@xfalse\def\xmp@Part{1}%
- \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2005}}
+ \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2005}%
+ \pdfx@omitcharsetfalse}
 \DeclareOption{a-2a}{\global\pdfx@xfalse\def\xmp@Part{2}%
- \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2010}}
+ \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2010}%
+ \pdfx@omitcharsettrue}
 \DeclareOption{a-2b}{\global\pdfx@xfalse\def\xmp@Part{2}%
- \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2010}}
+ \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2010}%
+ \pdfx@omitcharsettrue}
 \DeclareOption{a-2u}{\global\pdfx@xfalse\def\xmp@Part{2}%
- \def\xmp@Conformance{U}\def\xmp@ReleaseDate{2010}}
+ \def\xmp@Conformance{U}\def\xmp@ReleaseDate{2010}%
+ \pdfx@omitcharsettrue}
 \DeclareOption{a-3a}{\global\pdfx@xfalse\def\xmp@Part{3}%
- \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2012}}
+ \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2012}%
+ \pdfx@omitcharsettrue}
 \DeclareOption{a-3b}{\global\pdfx@xfalse\def\xmp@Part{3}%
- \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2012}}
+ \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2012}%
+ \pdfx@omitcharsettrue}
 \DeclareOption{a-3u}{\global\pdfx@xfalse\def\xmp@Part{3}%
- \def\xmp@Conformance{U}\def\xmp@ReleaseDate{2012}}
+ \def\xmp@Conformance{U}\def\xmp@ReleaseDate{2012}%
+ \pdfx@omitcharsettrue}
 %%
 %% PDF/X options
 %% comments added, using
@@ -2865,6 +2902,16 @@
  \pdfresetpageorigin=0
 \fi
 
+\expandafter\ifx\csname pdfomitcharset\endcsname\relax\else
+ \ifpdfx@omitcharset
+  \pdfomitcharset = 1 %
+  %%  do not create /Charset listings of font glyphs;
+  %%  optional for PDF/A-2,3 and PDF 2.x
+ \else
+  \pdfomitcharset = 0 %
+  %%  create the /Charset listings of font glyphs, required with PDF/A-1
+ \fi
+\fi
 
 \newif\ifpdfx@nopdfinfo
 \ifmathxmp\pdfx@nopdfinfotrue
@@ -3054,26 +3101,31 @@
 \expandafter\ifx\csname inputencodingname\endcsname\relax
 \else
  \def\pdfx@restoreencoding#1{%
-  \@tempcnta=128
-  \loop
-   \catcode\@tempcnta=13
-   \advance\@tempcnta\@ne
-  \ifnum\@tempcnta<256
-  \repeat
+   \@tempcnta=128
+   \loop
+    \catcode\@tempcnta=13
+    \advance\@tempcnta\@ne
+   \ifnum\@tempcnta<256
+   \repeat
   \inputencoding{#1}%
+  \let\LastDeclaredEncoding\pdfx@LastDeclaredEncoding
+  \let\DeclareFontEncoding@\pdfx@DeclareFontEncoding@
+  \let\DeclareUnicodeCharacter\pdfx@DeclareUnicodeCharacter
   }%
   \AtEndOfPackage{\pdfx@restoreencoding\pdfx@inputencodingname}%
   \let\pdfx@inputencodingname\inputencodingname
-  \let\pdfx@DeclareUnicodeCharacter\DeclareUnicodeCharacter
+  \global\let\pdfx@DeclareUnicodeCharacter\DeclareUnicodeCharacter
+  \global\let\pdfx@DeclareFontEncoding@\DeclareFontEncoding@
   \UseRawInputEncoding
 \fi
 \InputIfFileExists{\pdfx@encodingfile}{}{}
 \expandafter\ifx\csname pdfx@inputencodingname\endcsname\relax
 \else
   \let\inputencodingname\pdfx@inputencodingname
-  \let\DeclareUnicodeCharacter\pdfx@DeclareUnicodeCharacter
-  \let\DeclareFontEncoding@\DeclareFontEncoding@saved
-  \inputencoding{\inputencodingname}%
+%%  \global\let\DeclareUnicodeCharacter\pdfx@DeclareUnicodeCharacter
+%%  \global\let\DeclareFontEncoding@\DeclareFontEncoding@saved
+  \global\let\pdfx@LastDeclaredEncoding\LastDeclaredEncoding
+  \expandafter\inputencoding\expandafter{\inputencodingname}%
 \fi
 
 %%----------------------------------------------------------------------
@@ -4188,7 +4240,13 @@
      }%
     \expandafter\pdfx@tryoldprofilesfalse
    \fi
-}{\pdfx@tryoldprofilestrue}
+}{%
+ \PackageWarning{pdfx}{%
+   The 'colorprofiles' package is not installed correctly.^^J
+   File  'colorprofiles.tex'  is missing. Proceeding without it.
+ }%
+ \pdfx@tryoldprofilestrue
+}
 
 {\catcode`\| 14 \catcode`\% 12 \catcode`\_ 12 \catcode`\: 12
  \catcode`\. 12 \catcode`\- 12 \catcode`\/ 12
@@ -4872,14 +4930,15 @@
   \expandafter\ifx\expandafter\relax\xmp@Subject\relax\else
    \pdfx@ConvertUTFtoBE{\pdfx@pdfSubject}{\xmp@Subject}%
   \fi
-\else %%  pdfx@nopdfinfotrue
+\else %%  pdfx@nopdfinfofalse
   \expandafter\ifx\expandafter\relax\xmp@Title\relax\else
    \ifluatex
     \pdfx@ConvertUTFtoBE\pdfx@pdfTitle\xmp@Title
    \else\ifxetex
     \pdfx@ConvertUTFtoBE\pdfx@pdfTitle\xmp@Title
    \else
-     \pdfx@GeneratePdfString\pdfx@pdfTitle\xmp@Title
+%%     \pdfx@GeneratePdfString\pdfx@pdfTitle\xmp@Title %  why does this fail ???
+    \pdfx@ConvertUTFtoBE{\pdfx@pdfTitle}{\xmp@Title}%  ???  RRM 2019-02-17
    \fi\fi
   \fi
   \expandafter\ifx\expandafter\relax\xmp@Subject\relax\else
@@ -4888,7 +4947,8 @@
    \else\ifxetex
     \pdfx@ConvertUTFtoBE\pdfx@pdfSubject\xmp@Subject
    \else
-    \pdfx@GeneratePdfString\pdfx@pdfSubject\xmp@Subject
+%%    \pdfx@GeneratePdfString\pdfx@pdfSubject\xmp@Subject %  why does this fail ???
+    \pdfx@ConvertUTFtoBE{\pdfx@pdfSubject}{\xmp@Subject}% 2019-02-17
    \fi\fi
   \fi
  \fi  % end of  \ifpdfx@nopdfinfo
@@ -4957,6 +5017,23 @@
  \egroup
  \spacefactor\accent@spacefactor
 }
+%% same for named accents in math-mode
+\def\pdfx@mathaccentV#1#2#3#4#5{%
+ #5{\mathsurround=\z@\relax
+  \everymath{}%
+  \mathchoice
+   {\setbox\z@\hbox{$\displaystyle #5$}\kern-\wd\z@}%
+   {\setbox\z@\hbox{$\textstyle #5$}\kern-\wd\z@}%
+   {\setbox\z@\hbox{$\scriptstyle #5$}\kern-\wd\z@}%
+   {\setbox\z@\hbox{$\scriptscriptstyle #5$}\kern-\wd\z@}%
+ }%
+ \AMS@mathaccentV{#1}{#2}{#3}{#4}{\phantom{#5}}%
+}
+\AtBeginDocument{%
+ \@ifpackageloaded{amsmath}{%
+  \let\AMS@mathaccentV\mathaccentV
+  \let\mathaccentV\pdfx@mathaccentV}%
+}%
 
 %% How to support XeTeX here ?
 %%%%%  adjust accent characters to the Unicode Combining variant  %%%%
@@ -5000,25 +5077,30 @@
  \pdfglyphtounicode{space_uni034D}{034D}%
 }
 
-\AtBeginDocument{%
+\def\pdfx@check@accents{%
  \ifx\add@accent\LTX@add@accent
   \let\add@accent\PDFX@add@accent
  \else
   \expandafter\ifx\csname MT@orig@add@accent\endcsname\relax
-  \TPDF@error{another package has already patched \string\add@accent }%
-  \else
+  \@ifpackageloaded{mmap}{}{%
+  \pdfx@ErrorWarning{another package has patched \string\add@accent }%
+   {Hit <return> to continue}{}{}}%
+   \else
    \expandafter\let\csname MT@orig@add@accent\endcsname\PDFX@add@accent
  \fi\fi
  \ifxetex
  \else
   \PDFX@combiningchars@unicode
-  \@ifpackageloaded{newtxmath}{%
-    \pdfglyphtounicode{vec}{20D7}%
-    \pdfglyphtounicode{rvec}{20D6}%
-    \pdfglyphtounicode{lrvec}{20E1}%
-   }{}%
+%%  this is now handled by  glyphtounicode-ntx.tex
+%%  \@ifpackageloaded{newtxmath}{%
+%%   \pdfglyphtounicode{vec}{20D7}%
+%%    \pdfglyphtounicode{rvec}{20D6}%
+%%    \pdfglyphtounicode{lrvec}{20E1}%
+%%   }{}%
   \fi %  end of   \ifxetex
+  \let\pdfx@check@accents\unDefiNeD
 }
+\AtBeginDocument{\pdfx@check@accents}
 
 %%  suppress hyperlinks when generating  PDF/X
 \def\pdfx@linkfile@pdfX#1#2#3{%
@@ -5384,7 +5466,7 @@
  %
  % this will have been done already for PDF/X
  %
- \PassOptionsToPackage{xcolor}{cmyk,hyperref}
+ \PassOptionsToPackage{cmyk,hyperref}{xcolor}
  \def\pdfx@handlexcolor{\def\@@mod{cmyk}\selectcolormodel{cmyk}%
    \convertcolorsUtrue\convertcolorsDtrue}
  \ifpdfx@x
@@ -5408,7 +5490,7 @@
 %%  }
  \fi
 \else
- \PassOptionsToPackage{xcolor}{rgb,hyperref}
+ \PassOptionsToPackage{rgb,hyperref}{xcolor}
  \def\pdfx@handlexcolor{\def\@@mod{rgb}\selectcolormodel{rgb}%
    \convertcolorsUtrue\convertcolorsDtrue}
 \fi
@@ -5546,6 +5628,7 @@
 %</package>
 % \fi
 % \Finale
-% \newpage\PrintIndex
+% \let\newpage\relax
+% \PrintIndex
 % \PrintChanges
 % \endinput
diff --git a/Master/texmf-dist/source/latex/pdfx/pdfx.ins b/Master/texmf-dist/source/latex/pdfx/pdfx.ins
index 62abff20e06..afd943fbb59 100644
--- a/Master/texmf-dist/source/latex/pdfx/pdfx.ins
+++ b/Master/texmf-dist/source/latex/pdfx/pdfx.ins
@@ -4,7 +4,7 @@
 
 \preamble
                                                                
- Copyright (c) 2018, CV Radhakrishnan <cvr@river-valley.org>,
+ Copyright (c) 2019, 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>
@@ -32,7 +32,7 @@
 \Msg{ *                                                           *}
 \Msg{ * To produce the documentation run the relevant file.dtx    *}
 \Msg{ * through pdfLaTeX or use the Makefile which is far         *} 
-\Msg{ * more easier.                                              *} 
+\Msg{ * more convenient.                                          *} 
 \Msg{ *                                                           *}
 \Msg{ * Happy TeXing!                                             *}
 \Msg{ *                                                           *}
diff --git a/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-ntx.tex b/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-ntx.tex
index 71d85435fce..73651ce0a1e 100644
--- a/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-ntx.tex
+++ b/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-ntx.tex
@@ -1,371 +1,419 @@
+%%
+%%   file:  glyphtounicode-ntx.tex
+%%    version 1.02     date:  2019-02-11
 %
 % Unicode mappings for ntx text/math glyph names
-% (c) 2018  Ross Moore   <ross.moore@mq.edu.au>
+% (c) 2018, 2019  Ross Moore   <ross.moore@mq.edu.au>
 %  
 % These should be loaded along with the files:
 %    glyphtounicode.tex
 %    glyphtounicode-cmr.tex
 %  when generating files to validate for  PDF/A  and/or Accessibiity (PDF/UA)
 %  using  newtxmath.sty   and/or  newtxtext.sty .
-
+%
 %% possible corrections - - depends upon usage ???
-\pdfglyphtounicode{slurabove}{2312}%   was  2322 'frown'
+\begingroup
+\let\p\pdfglyphtounicode
+\p{slurabove}{2312}%   was  2322 'frown'
 
 %% from TeXGyre fonts
-\pdfglyphtounicode{cwm}{200B}%  0-width space
-\pdfglyphtounicode{diameter}{2300}%
-\pdfglyphtounicode{anglearc}{2222}%
-\pdfglyphtounicode{ell}{2113}%
-\pdfglyphtounicode{dotbelow}{0323}%
-\pdfglyphtounicode{hookabove}{0309}%
+\p{cwm}{200B}%  0-width space
+\p{diameter}{2300}%
+\p{anglearc}{2222}%
+\p{ell}{2113}%
+\p{dotbelow}{0323}%
+\p{hookabove}{0309}%
 %% Private Use  characters
-\pdfglyphtounicode{threequartersemdash}{2014}%  was  F6DE
+\p{threequartersemdash}{2014}%  was  F6DE
 %% from txmia  (and also  txmbia )
-\pdfglyphtounicode{g1}{D835 DC54}% 0067
-\pdfglyphtounicode{y1}{D835 DC66}% 0079
-\pdfglyphtounicode{v1}{D835 DC63}% 0076
-\pdfglyphtounicode{w1}{D835 DC64}% 0077
-\pdfglyphtounicode{bbA}{D835 DD38}% 
-\pdfglyphtounicode{bbB}{D835 DD39}% 
-\pdfglyphtounicode{bbC}{2102}% *
-\pdfglyphtounicode{bbD}{D835 DD3B}% 
-\pdfglyphtounicode{bbE}{D835 DD3C}% 
-\pdfglyphtounicode{bbF}{D835 DD3D}% 
-\pdfglyphtounicode{bbG}{D835 DD3E}% 
-\pdfglyphtounicode{bbH}{210D}% *
-\pdfglyphtounicode{bbI}{D835 DD40}% 
-\pdfglyphtounicode{bbJ}{D835 DD41}% 
-\pdfglyphtounicode{bbK}{D835 DD42}% 
-\pdfglyphtounicode{bbL}{D835 DD43}% 
-\pdfglyphtounicode{bbM}{D835 DD44}% 
-\pdfglyphtounicode{bbN}{2115}% * 
-\pdfglyphtounicode{bbO}{D835 DD46}% 
-\pdfglyphtounicode{bbP}{2119}% 
-\pdfglyphtounicode{bbQ}{211A}% *
-\pdfglyphtounicode{bbR}{211D}% *
-\pdfglyphtounicode{bbS}{D835 DD4A}% 
-\pdfglyphtounicode{bbT}{D835 DD4B}% 
-\pdfglyphtounicode{bbU}{D835 DD4C}% 
-\pdfglyphtounicode{bbV}{D835 DD4D}% 
-\pdfglyphtounicode{bbW}{D835 DD4E}% 
-\pdfglyphtounicode{bbX}{D835 DD4F}% 
-\pdfglyphtounicode{bbY}{D835 DD50}% 
-\pdfglyphtounicode{bbZ}{2124}%  * 
-\pdfglyphtounicode{bbk}{D835 DD5C}% 
+\p{g1}{D835 DC54}% 0067
+\p{y1}{D835 DC66}% 0079
+\p{v1}{D835 DC63}% 0076
+\p{w1}{D835 DC64}% 0077
+\p{bbA}{D835 DD38}% 
+\p{bbB}{D835 DD39}% 
+\p{bbC}{2102}% *
+\p{bbD}{D835 DD3B}% 
+\p{bbE}{D835 DD3C}% 
+\p{bbF}{D835 DD3D}% 
+\p{bbG}{D835 DD3E}% 
+\p{bbH}{210D}% *
+\p{bbI}{D835 DD40}% 
+\p{bbJ}{D835 DD41}% 
+\p{bbK}{D835 DD42}% 
+\p{bbL}{D835 DD43}% 
+\p{bbM}{D835 DD44}% 
+\p{bbN}{2115}% * 
+\p{bbO}{D835 DD46}% 
+\p{bbP}{2119}% 
+\p{bbQ}{211A}% *
+\p{bbR}{211D}% *
+\p{bbS}{D835 DD4A}% 
+\p{bbT}{D835 DD4B}% 
+\p{bbU}{D835 DD4C}% 
+\p{bbV}{D835 DD4D}% 
+\p{bbW}{D835 DD4E}% 
+\p{bbX}{D835 DD4F}% 
+\p{bbY}{D835 DD50}% 
+\p{bbZ}{2124}%  * 
+\p{bbk}{D835 DD5C}% 
 %% from txsyc  (and also  txbsyc)
-\pdfglyphtounicode{nequal}{2260}
-\pdfglyphtounicode{npropersubset}{2284}
-\pdfglyphtounicode{npropersuperset}{2285}
-\pdfglyphtounicode{nelement}{2209}
-\pdfglyphtounicode{nowner}{220C}
-\pdfglyphtounicode{colonequal}{2254}
-\pdfglyphtounicode{equalcolon}{2255}
+\p{nequal}{2260}
+\p{npropersubset}{2284}
+\p{npropersuperset}{2285}
+\p{nelement}{2209}
+\p{nowner}{220C}
+\p{colonequal}{2254}
+\p{equalcolon}{2255}
 %% from txbsya
-\pdfglyphtounicode{squaresmallsolid}{25A0}
-\pdfglyphtounicode{axisshort}{2027}% hyphenation point
-\pdfglyphtounicode{arrowaxisright}{27A1}% Dingbat
-\pdfglyphtounicode{arrowaxisleft}{2B05}% black arrow
+\p{squaresmallsolid}{25A0}
+\p{axisshort}{2027}% hyphenation point
+\p{arrowaxisright}{27A1}% Dingbat
+\p{arrowaxisleft}{2B05}% black arrow
 %% from txbsyb
-\pdfglyphtounicode{lessornotsimilar}{22E6}
-\pdfglyphtounicode{greaterornotsimilar}{22E7}
-\pdfglyphtounicode{notsimequal}{2247}
-\pdfglyphtounicode{subsetornoteql}{2ACB}
-\pdfglyphtounicode{supersetornoteql}{2ACC}
-\pdfglyphtounicode{notshortbar}{2016 0337}
-\pdfglyphtounicode{notshortparallel}{2AF2}%  ?
-\pdfglyphtounicode{barshort}{2758}% ?
-\pdfglyphtounicode{parallelshort}{2016}% ?
+\p{lessornotsimilar}{22E6}
+\p{greaterornotsimilar}{22E7}
+\p{notsimequal}{2247}
+\p{subsetornoteql}{2ACB}
+\p{supersetornoteql}{2ACC}
+\p{notshortbar}{2016 0337}
+\p{notshortparallel}{2AF2}%  ?
+\p{barshort}{2758}% ?
+\p{parallelshort}{2016}% ?
 %% from  txsyc  and  txbsyc 
-\pdfglyphtounicode{mapsfrom}{2ADE}% turnstile ?
-\pdfglyphtounicode{Mapsto}{27FE}% double arrow
-\pdfglyphtounicode{Mapsfrom}{2AE4}% turnstile ?
-\pdfglyphtounicode{mmapsto}{2AE6}% turnstile ?
-\pdfglyphtounicode{mmapsfrom}{2AE3}% turnstile  ?
-\pdfglyphtounicode{Mmapsto}{255E}% turnstile ?
-\pdfglyphtounicode{Mmapsfrom}{2AE5}% turnstile ?
-\pdfglyphtounicode{medcircle}{25CB}
-\pdfglyphtounicode{medbullet}{25CF}
-\pdfglyphtounicode{parallel1}{2225}
-\pdfglyphtounicode{nparallel}{2226}
-\pdfglyphtounicode{nparallel1}{2226 FE01}
-\pdfglyphtounicode{colonapprox}{003A 2248}
-\pdfglyphtounicode{colonsim}{003A 223C}
-\pdfglyphtounicode{coloncolonapprox}{003A 2248}
-\pdfglyphtounicode{coloncolonsim}{003A 003A 223C}
-\pdfglyphtounicode{doteq}{2250}
-\pdfglyphtounicode{multimapinv}{27DC}
-\pdfglyphtounicode{multimapboth}{29DF}
-\pdfglyphtounicode{solidmultimap}{22B8 FE01}
-\pdfglyphtounicode{solidmultimapinv}{27DC FE01}
-\pdfglyphtounicode{solidmultimapboth}{29DF FE01}
-\pdfglyphtounicode{rsolidmultimapboth}{22B6}
-\pdfglyphtounicode{lsolidmultimapboth}{22B7}
-\pdfglyphtounicode{forcesextra}{22AB}% turnstile ?
-\pdfglyphtounicode{Forcesbar}{22AA}%  turnstile ???
-\pdfglyphtounicode{simequal}{2245}
-\pdfglyphtounicode{precedesordblequal}{2AB3}
-\pdfglyphtounicode{followsordblequal}{2AB4}
-\pdfglyphtounicode{notprecedesorsimilar}{22E0}
-\pdfglyphtounicode{notfollowsorsimilar}{22E1}
-\pdfglyphtounicode{notlessorsimilar}{2274}
-\pdfglyphtounicode{notgreaterorsimilar}{2275}
-\pdfglyphtounicode{notlessorapproxeql}{2A85 0338}
-\pdfglyphtounicode{notgreaterorapproxeql}{2A86 0338}
-\pdfglyphtounicode{notprecedesorcurly}{22E0}
-\pdfglyphtounicode{notfollowsorcurly}{22E1}
-\pdfglyphtounicode{notgreaterorless}{2279}
-\pdfglyphtounicode{notlessorgreater}{2278}
-\pdfglyphtounicode{notdifference}{224F 0338}
-\pdfglyphtounicode{notgeomequivalent}{224E 0338}
-\pdfglyphtounicode{notrevsimilar}{223D 0338}
-\pdfglyphtounicode{notrevasymptequal}{22CD 0338}
-\pdfglyphtounicode{nequal}{2260}
-\pdfglyphtounicode{nequivasymptotic}{226D}
-\pdfglyphtounicode{nequivalence}{2262}
-\pdfglyphtounicode{nsimilar}{2241}
-\pdfglyphtounicode{napproxequal}{2249}
-\pdfglyphtounicode{npropersubset}{2284}
-\pdfglyphtounicode{npropersuperset}{2285}
-\pdfglyphtounicode{nlessmuch}{226A 0338}
-\pdfglyphtounicode{ngreatermuch}{226B 0338}
-\pdfglyphtounicode{notapproxequal}{2249}
-\pdfglyphtounicode{notapproxorequal}{224A 0338}
-\pdfglyphtounicode{notfollowsorequal}{2AB7 0338}
-\pdfglyphtounicode{notprecedesorequal}{2AB8 0338}
-\pdfglyphtounicode{notprecedesordblequal}{2AB3 0338}
-\pdfglyphtounicode{notfollowsordblequal}{2AB4 0338}
-\pdfglyphtounicode{nsimilarequal}{2244}
-\pdfglyphtounicode{nelement}{2209}
-\pdfglyphtounicode{nowner}{220C}
-\pdfglyphtounicode{notsubsetdbl}{22D0 0338}
-\pdfglyphtounicode{notsupersetdbl}{22D1 0338}
-\pdfglyphtounicode{nsubsetsqequal}{22E2}
-\pdfglyphtounicode{nsupersetsqequal}{22E3}
-\pdfglyphtounicode{colonequal}{2254}
-\pdfglyphtounicode{equalcolon}{2255}
-\pdfglyphtounicode{colonbar}{003A 002D}
-\pdfglyphtounicode{barcolon}{2239}
-\pdfglyphtounicode{Colonequal}{2A74}
-\pdfglyphtounicode{Equalcolon}{2255 }
-\pdfglyphtounicode{Colonbar}{003A 003A 002D}
-\pdfglyphtounicode{Barcolon}{2239 003A}
-\pdfglyphtounicode{strict}{297D}%  fish tail
-\pdfglyphtounicode{strictinverse}{297C}%  fish tail
-\pdfglyphtounicode{strictboth}{297C 297D}%  fish tails
-\pdfglyphtounicode{ampersandinv}{214B}
-\pdfglyphtounicode{lbag}{27C5}
-\pdfglyphtounicode{rbag}{27C6}
-\pdfglyphtounicode{lbagbig}{27C5 FE01}
-\pdfglyphtounicode{rbagbig}{27C6 FE01}
-\pdfglyphtounicode{oless}{29C0}
-\pdfglyphtounicode{ogreater}{29C1}
-\pdfglyphtounicode{owedge}{2227 20DD}
-\pdfglyphtounicode{ovee}{2228 20DD}
-\pdfglyphtounicode{circlebar}{233D}%  APL ?
-\pdfglyphtounicode{circlebackslash}{2298}
-\pdfglyphtounicode{multicloseleft1}{22C9}
-\pdfglyphtounicode{multicloseright1}{22CA}
-\pdfglyphtounicode{multicloseboth1}{22C8 FE01}
-\pdfglyphtounicode{multiopenboth1}{2715 FE01}
-\pdfglyphtounicode{multicloseboth}{22C8}
-\pdfglyphtounicode{multiopenboth}{2715}
-\pdfglyphtounicode{Diamond}{25C7}
-\pdfglyphtounicode{Diamondsolid}{25C6}
-\pdfglyphtounicode{intersectmulti}{2A44 FE01}%  ???
-\pdfglyphtounicode{notsquareimage}{228F 0338}
-\pdfglyphtounicode{notsquareoriginal}{2290 0338}
-\pdfglyphtounicode{dashedarrowleft}{290E}
-\pdfglyphtounicode{dashedarrowright}{290F}
-\pdfglyphtounicode{dashedarrowboth}{290E 290F}
-\pdfglyphtounicode{squiggleleft}{21DC}
-\pdfglyphtounicode{notdblarrowheadright}{2900}
-\pdfglyphtounicode{notdblarrowheadleft}{219E 0337}
-\pdfglyphtounicode{squareasterisk}{29C6}
-\pdfglyphtounicode{squarebackslash}{29C5}
-\pdfglyphtounicode{squarebar}{25EB}
-\pdfglyphtounicode{squareslash}{29C4}
-\pdfglyphtounicode{Wreathproduct}{2240 2240}
-\pdfglyphtounicode{lambdaslash}{019B}
-\pdfglyphtounicode{lambdabar}{D835 DF06 0335}
-\pdfglyphtounicode{club1}{2667}
-\pdfglyphtounicode{diamond1}{2666}
-\pdfglyphtounicode{heart1}{2665}
-\pdfglyphtounicode{spade1}{2664}
-\pdfglyphtounicode{Arrownortheast}{21D7}
-\pdfglyphtounicode{Arrowsoutheast}{21D8}
-\pdfglyphtounicode{Arrownorthwest}{21D6}
-\pdfglyphtounicode{Arrowsouthwest}{21D9}
-\pdfglyphtounicode{Latticetop}{2AEA}
-\pdfglyphtounicode{Perpendicular}{2AEB}
-\pdfglyphtounicode{leadstoext}{219D}
-\pdfglyphtounicode{leadsto}{301C}%  ???
-\pdfglyphtounicode{squareunionmulti}{228E FE01}
-\pdfglyphtounicode{squareintersectmulti}{2A4E FE01}
-\pdfglyphtounicode{dblbracketleft}{27E6}
-\pdfglyphtounicode{dblbracketright}{27E7}
-\pdfglyphtounicode{squareright}{25A1 2192}
-\pdfglyphtounicode{squareleft}{2190 25A1}
-\pdfglyphtounicode{squaredotright}{22A1 2192}
-\pdfglyphtounicode{squaredotleft}{2190 22A1}
-\pdfglyphtounicode{Diamondright}{25C7 2192}%
-\pdfglyphtounicode{Diamondleft}{2190 25C7}
-\pdfglyphtounicode{Diamonddotright}{27D0 2192}
-\pdfglyphtounicode{Diamonddotleft}{2190 27D0}
-\pdfglyphtounicode{squareRight}{25A1 21D2}
-\pdfglyphtounicode{squareLeft}{21D0 25A1}
-\pdfglyphtounicode{squaredotRight}{22A1 21D2}
-\pdfglyphtounicode{squaredotLeft}{21D0 22A1}
-\pdfglyphtounicode{DiamondRight}{25C7 21D2}
-\pdfglyphtounicode{DiamondLeft}{21D0 25C7}
-\pdfglyphtounicode{DiamonddotRight}{27D0 21D2}
-\pdfglyphtounicode{DiamonddotLeft}{21D0 27D0}
-\pdfglyphtounicode{Diamonddot}{27D0}
-\pdfglyphtounicode{circleright}{25CB 2192}
-\pdfglyphtounicode{circleleft}{2190 25CB}
-\pdfglyphtounicode{circledotright}{2299 2192}
-\pdfglyphtounicode{circledotleft}{2190 2299}
-\pdfglyphtounicode{opentrans}{260D FE01}%  ???
-\pdfglyphtounicode{solidtrans}{2051 20D2}%  ???
-\pdfglyphtounicode{topsolidtrans}{2AF1 FE01}%  ???
-\pdfglyphtounicode{topopentrans}{27DF FE01}% ???
+\p{mapsfrom}{2ADE}% turnstile ?
+\p{Mapsto}{27FE}% double arrow
+\p{Mapsfrom}{2AE4}% turnstile ?
+\p{mmapsto}{2AE6}% turnstile ?
+\p{mmapsfrom}{2AE3}% turnstile  ?
+\p{Mmapsto}{255E}% turnstile ?
+\p{Mmapsfrom}{2AE5}% turnstile ?
+\p{medcircle}{25CB}
+\p{medbullet}{25CF}
+\p{parallel1}{2225}
+\p{nparallel}{2226}
+\p{nparallel1}{2226 FE01}
+\p{colonapprox}{003A 2248}
+\p{colonsim}{003A 223C}
+\p{coloncolonapprox}{003A 2248}
+\p{coloncolonsim}{003A 003A 223C}
+\p{doteq}{2250}
+\p{multimapinv}{27DC}
+\p{multimapboth}{29DF}
+\p{solidmultimap}{22B8 FE01}
+\p{solidmultimapinv}{27DC FE01}
+\p{solidmultimapboth}{29DF FE01}
+\p{rsolidmultimapboth}{22B6}
+\p{lsolidmultimapboth}{22B7}
+\p{forcesextra}{22AB}% turnstile ?
+\p{Forcesbar}{22AA}%  turnstile ???
+\p{simequal}{2245}
+\p{precedesordblequal}{2AB3}
+\p{followsordblequal}{2AB4}
+\p{notprecedesorsimilar}{22E0}
+\p{notfollowsorsimilar}{22E1}
+\p{notlessorsimilar}{2274}
+\p{notgreaterorsimilar}{2275}
+\p{notlessorapproxeql}{2A85 0338}
+\p{notgreaterorapproxeql}{2A86 0338}
+\p{notprecedesorcurly}{22E0}
+\p{notfollowsorcurly}{22E1}
+\p{notgreaterorless}{2279}
+\p{notlessorgreater}{2278}
+\p{notdifference}{224F 0338}
+\p{notgeomequivalent}{224E 0338}
+\p{notrevsimilar}{223D 0338}
+\p{notrevasymptequal}{22CD 0338}
+\p{nequal}{2260}
+\p{nequivasymptotic}{226D}
+\p{nequivalence}{2262}
+\p{nsimilar}{2241}
+\p{napproxequal}{2249}
+\p{npropersubset}{2284}
+\p{npropersuperset}{2285}
+\p{nlessmuch}{226A 0338}
+\p{ngreatermuch}{226B 0338}
+\p{notapproxequal}{2249}
+\p{notapproxorequal}{224A 0338}
+\p{notfollowsorequal}{2AB7 0338}
+\p{notprecedesorequal}{2AB8 0338}
+\p{notprecedesordblequal}{2AB3 0338}
+\p{notfollowsordblequal}{2AB4 0338}
+\p{nsimilarequal}{2244}
+\p{nelement}{2209}
+\p{nowner}{220C}
+\p{notsubsetdbl}{22D0 0338}
+\p{notsupersetdbl}{22D1 0338}
+\p{nsubsetsqequal}{22E2}
+\p{nsupersetsqequal}{22E3}
+\p{colonequal}{2254}
+\p{equalcolon}{2255}
+\p{colonbar}{003A 002D}
+\p{barcolon}{2239}
+\p{Colonequal}{2A74}
+\p{Equalcolon}{2255 }
+\p{Colonbar}{003A 003A 002D}
+\p{Barcolon}{2239 003A}
+\p{strict}{297D}%  fish tail
+\p{strictinverse}{297C}%  fish tail
+\p{strictboth}{297C 297D}%  fish tails
+\p{ampersandinv}{214B}
+\p{lbag}{27C5}
+\p{rbag}{27C6}
+\p{lbagbig}{27C5 FE01}
+\p{rbagbig}{27C6 FE01}
+\p{oless}{29C0}
+\p{ogreater}{29C1}
+\p{owedge}{2227 20DD}
+\p{ovee}{2228 20DD}
+\p{circlebar}{233D}%  APL ?
+\p{circlebackslash}{2298}
+\p{multicloseleft1}{22C9}
+\p{multicloseright1}{22CA}
+\p{multicloseboth1}{22C8 FE01}
+\p{multiopenboth1}{2715 FE01}
+\p{multicloseboth}{22C8}
+\p{multiopenboth}{2715}
+\p{Diamond}{25C7}
+\p{Diamondsolid}{25C6}
+\p{intersectmulti}{2A44 FE01}%  ???
+\p{notsquareimage}{228F 0338}
+\p{notsquareoriginal}{2290 0338}
+\p{dashedarrowleft}{290E}
+\p{dashedarrowright}{290F}
+\p{dashedarrowboth}{290E 290F}
+\p{squiggleleft}{21DC}
+\p{notdblarrowheadright}{2900}
+\p{notdblarrowheadleft}{219E 0337}
+\p{squareasterisk}{29C6}
+\p{squarebackslash}{29C5}
+\p{squarebar}{25EB}
+\p{squareslash}{29C4}
+\p{Wreathproduct}{2240 2240}
+\p{lambdaslash}{019B}
+\p{lambdabar}{D835 DF06 0335}
+\p{club1}{2667}
+\p{diamond1}{2666}
+\p{heart1}{2665}
+\p{spade1}{2664}
+\p{Arrownortheast}{21D7}
+\p{Arrowsoutheast}{21D8}
+\p{Arrownorthwest}{21D6}
+\p{Arrowsouthwest}{21D9}
+\p{Latticetop}{2AEA}
+\p{Perpendicular}{2AEB}
+\p{leadstoext}{219D}
+\p{leadsto}{301C}%  ???
+\p{squareunionmulti}{228E FE01}
+\p{squareintersectmulti}{2A4E FE01}
+\p{dblbracketleft}{27E6}
+\p{dblbracketright}{27E7}
+\p{squareright}{25A1 2192}
+\p{squareleft}{2190 25A1}
+\p{squaredotright}{22A1 2192}
+\p{squaredotleft}{2190 22A1}
+\p{Diamondright}{25C7 2192}%
+\p{Diamondleft}{2190 25C7}
+\p{Diamonddotright}{27D0 2192}
+\p{Diamonddotleft}{2190 27D0}
+\p{squareRight}{25A1 21D2}
+\p{squareLeft}{21D0 25A1}
+\p{squaredotRight}{22A1 21D2}
+\p{squaredotLeft}{21D0 22A1}
+\p{DiamondRight}{25C7 21D2}
+\p{DiamondLeft}{21D0 25C7}
+\p{DiamonddotRight}{27D0 21D2}
+\p{DiamonddotLeft}{21D0 27D0}
+\p{Diamonddot}{27D0}
+\p{circleright}{25CB 2192}
+\p{circleleft}{2190 25CB}
+\p{circledotright}{2299 2192}
+\p{circledotleft}{2190 2299}
+\p{opentrans}{260D FE01}%  ???
+\p{solidtrans}{2051 20D2}%  ???
+\p{topsolidtrans}{2AF1 FE01}%  ???
+\p{topopentrans}{27DF FE01}% ???
 
 %% from txsys
-\pdfglyphtounicode{arcwide}{0361}
-\pdfglyphtounicode{arcwider}{0361 FE01}% variants according size
-\pdfglyphtounicode{arcwiderr}{0361 FE02}% .. .. 
-\pdfglyphtounicode{arcwidest}{0361 FE03}% .. .. 
-\pdfglyphtounicode{arcwideult}{0361 FE04}% .. .. 
-\pdfglyphtounicode{barbar}{0304 0304}
-\pdfglyphtounicode{barhat}{0304 0303}
-\pdfglyphtounicode{bartilde}{0304 0302}
-\pdfglyphtounicode{bulletS}{25C5}
-\pdfglyphtounicode{bulletSS}{2022}
-\pdfglyphtounicode{bulletSSS}{2219}
-\pdfglyphtounicode{cdotB}{00B7}
-\pdfglyphtounicode{cdotBB}{22C5}
-\pdfglyphtounicode{ddddot}{20DC}
-\pdfglyphtounicode{ddddotacc}{20DC}
-\pdfglyphtounicode{dddot}{20DB}
-\pdfglyphtounicode{dddotacc}{20DB}
-\pdfglyphtounicode{ddotacc}{0308}
-\pdfglyphtounicode{dotacc}{0307}
-\pdfglyphtounicode{emptysetAlt}{2300}
-\pdfglyphtounicode{emptysetAlt2}{2205}
-\pdfglyphtounicode{harpoonacc}{20D2}
-\pdfglyphtounicode{hatbar}{0303 0304}
-\pdfglyphtounicode{hathat}{0303 0303}
-\pdfglyphtounicode{hattilde}{0303 0302}
-\pdfglyphtounicode{lharpoonacc}{20D0}
-\pdfglyphtounicode{lrharpoonacc}{20E1}
-\pdfglyphtounicode{lrvec}{20E1}
-\pdfglyphtounicode{lvec}{20D6}
-\pdfglyphtounicode{nexists}{2204}
-\pdfglyphtounicode{oarcwide}{0361 0350}% try to add upper arrow-tip
-\pdfglyphtounicode{oarcwider}{0361 FE01 0350}%  .. .. 
-\pdfglyphtounicode{oarcwiderr}{0361 FE02 0350}%  .. .. 
-\pdfglyphtounicode{oarcwidest}{0361 FE03 0350}%  .. .. 
-\pdfglyphtounicode{oarcwideult}{0361 FE04 0350}%  .. .. 
-\pdfglyphtounicode{prime2}{02B9}
-\pdfglyphtounicode{smcompB}{25CB}
-\pdfglyphtounicode{tildebar}{0302 0304}
-\pdfglyphtounicode{tildehat}{0302 0303}
-\pdfglyphtounicode{tildetilde}{0302 0302}
-\pdfglyphtounicode{vec}{20D7}
+\p{arcwide}{0361}
+\p{arcwider}{0361 FE01}% variants according size
+\p{arcwiderr}{0361 FE02}% .. .. 
+\p{arcwidest}{0361 FE03}% .. .. 
+\p{arcwideult}{0361 FE04}% .. .. 
+\p{barbar}{0304 0304}
+\p{barhat}{0304 0303}
+\p{bartilde}{0304 0302}
+\p{bulletS}{25C5}
+\p{bulletSS}{2022}
+\p{bulletSSS}{2219}
+\p{cdotB}{00B7}
+\p{cdotBB}{22C5}
+\p{ddddot}{20DC}
+\p{ddddotacc}{20DC}
+\p{dddot}{20DB}
+\p{dddotacc}{20DB}
+\p{ddotacc}{0308}
+\p{dotacc}{0307}
+\p{emptysetAlt}{2300}
+\p{emptysetAlt2}{2205}
+\p{harpoonacc}{20D2}
+\p{hatbar}{0303 0304}
+\p{hathat}{0303 0303}
+\p{hattilde}{0303 0302}
+\p{lharpoonacc}{20D0}
+\p{lrharpoonacc}{20E1}
+\p{lrvec}{20E1}
+\p{lvec}{20D6}
+\p{nexists}{2204}
+\p{oarcwide}{0361 0350}% try to add upper arrow-tip
+\p{oarcwider}{0361 FE01 0350}%  .. .. 
+\p{oarcwiderr}{0361 FE02 0350}%  .. .. 
+\p{oarcwidest}{0361 FE03 0350}%  .. .. 
+\p{oarcwideult}{0361 FE04 0350}%  .. .. 
+\p{prime2}{02B9}
+\p{smcompB}{25CB}
+\p{tildebar}{0302 0304}
+\p{tildehat}{0302 0303}
+\p{tildetilde}{0302 0302}
+\p{rvec}{20D7}
+\p{vec}{20D7}
 %  from txex-bar, txbex-bar
-\pdfglyphtounicode{angleleftbigx}{27E8 FE01}% variants according size
-\pdfglyphtounicode{anglerightbigx}{27E9 FE01}
-\pdfglyphtounicode{braceleftbigx}{007B FE01}
-\pdfglyphtounicode{bracerightbigx}{007D FE01}
-\pdfglyphtounicode{bracketleftbigx}{005B FE01}
-\pdfglyphtounicode{bracketrightbigx}{005D FE01}
-\pdfglyphtounicode{ceilingleftbigx}{2308 FE01}
-\pdfglyphtounicode{ceilingrightbigx}{2309 FE01}
-\pdfglyphtounicode{floorleftbigx}{230A FE01}
-\pdfglyphtounicode{floorrightbigx}{230B FE01}
-\pdfglyphtounicode{parenleftbigx}{0028 FE01}
-\pdfglyphtounicode{parenrightbigx}{0029 FE01}
-\pdfglyphtounicode{bardblex}{2225 FE01}
-\pdfglyphtounicode{bardblexbigx}{2225 FE01}
-\pdfglyphtounicode{barex}{007C FE01}
-\pdfglyphtounicode{barexbigx}{007C FE01}
-\pdfglyphtounicode{bracehext}{02C9}%  use a macron for horizontal spacing !!
-\pdfglyphtounicode{grouphtipdownleft}{02CA}%  use spacing modifiers to simulate the overbrace 
-\pdfglyphtounicode{grouphtipdownright}{02CB}%  .. ..
-\pdfglyphtounicode{grouphtipupleft}{02CF}%  use spacing modifiers to simulate the underbrace
-\pdfglyphtounicode{grouphtipupright}{02CE}%  .. ..
-\pdfglyphtounicode{groupatipdownleft}{1DFE 02CA}%  include an arrow-tip
-\pdfglyphtounicode{groupatipdownright}{02CB 0350}%  include an arrow-tip
-\pdfglyphtounicode{groupatipupleft}{02F1 02CF}%  include an arrow-tip
-\pdfglyphtounicode{groupatipupright}{02CE 02F2}%  include an arrow-tip
-\pdfglyphtounicode{parenleftbtA}{239D}
-\pdfglyphtounicode{parenleftexA}{239C}
-\pdfglyphtounicode{parenlefttpA}{239B}
-\pdfglyphtounicode{parenrightbtA}{23A0}
-\pdfglyphtounicode{parenrightexA}{239F}
-\pdfglyphtounicode{parenrighttpA}{239E}
-\pdfglyphtounicode{hat4}{0302 FE04}% variants according to width
-\pdfglyphtounicode{hat5}{0302 FE05}%   .. .. ..
-\pdfglyphtounicode{hat6}{0302 FE06}%   .. .. ..
-\pdfglyphtounicode{tilde4}{0303 FE04}% variants according to width
-\pdfglyphtounicode{tilde5}{0303 FE05}%   .. .. ..
-\pdfglyphtounicode{tilde6}{0303 FE06}%   .. .. ..
+\p{angleleftbigx}{27E8 FE01}% variants according size
+\p{anglerightbigx}{27E9 FE01}
+\p{braceleftbigx}{007B FE01}
+\p{bracerightbigx}{007D FE01}
+\p{bracketleftbigx}{005B FE01}
+\p{bracketrightbigx}{005D FE01}
+\p{ceilingleftbigx}{2308 FE01}
+\p{ceilingrightbigx}{2309 FE01}
+\p{floorleftbigx}{230A FE01}
+\p{floorrightbigx}{230B FE01}
+\p{parenleftbigx}{0028 FE01}
+\p{parenrightbigx}{0029 FE01}
+\p{bardblex}{2225 FE01}
+\p{bardblexbigx}{2225 FE02}
+\p{barex}{007C FE01}
+\p{barexbigx}{007C FE01}
+\p{bracehext}{02C9}%  use a macron for horizontal spacing !!
+\p{grouphtipdownleft}{02CA}%  use spacing modifiers to simulate the overbrace 
+\p{grouphtipdownright}{02CB}%  .. ..
+\p{grouphtipupleft}{02CF}%  use spacing modifiers to simulate the underbrace
+\p{grouphtipupright}{02CE}%  .. ..
+\p{groupatipdownleft}{1DFE 02CA}%  include an arrow-tip
+\p{groupatipdownright}{02CB 0350}%  include an arrow-tip
+\p{groupatipupleft}{02F1 02CF}%  include an arrow-tip
+\p{groupatipupright}{02CE 02F2}%  include an arrow-tip
+\p{parenleftbtA}{239D}
+\p{parenleftexA}{239C}
+\p{parenlefttpA}{239B}
+\p{parenrightbtA}{23A0}
+\p{parenrightexA}{239F}
+\p{parenrighttpA}{239E}
+\p{hat4}{0302 FE04}% variants according to width
+\p{hat5}{0302 FE05}%   .. .. ..
+\p{hat6}{0302 FE06}%   .. .. ..
+\p{tilde4}{0303 FE04}% variants according to width
+\p{tilde5}{0303 FE05}%   .. .. ..
+\p{tilde6}{0303 FE06}%   .. .. ..
 % from   txexs  
-\pdfglyphtounicode{cupdottext}{2A03}
-\pdfglyphtounicode{cupdotdisplay}{2A03}
-\pdfglyphtounicode{dblbracketleftbig}{27E6 FE01}% variants according to size
-\pdfglyphtounicode{dblbracketleftbigg}{27E6 FE02}% .. ..
-\pdfglyphtounicode{dblbracketleftBig}{27E6 FE03}% .. ..
-\pdfglyphtounicode{dblbracketleftBigg}{27E6 FE04}% .. ..
-\pdfglyphtounicode{dblbracketleftbt}{23A5 23A3}% gives a solid v-line before bracket pieces
-\pdfglyphtounicode{dblbracketleftex}{23A5 23A2}%    double lines
-\pdfglyphtounicode{dblbracketlefttp}{23A5 23A1}%    lower left-bracket pieces
-\pdfglyphtounicode{dblbracketrightbig}{27E6 FE01}% variants according to size
-\pdfglyphtounicode{dblbracketrightbigg}{27E6 FE02}% .. ..
-\pdfglyphtounicode{dblbracketrightBig}{27E6 FE03}% .. ..
-\pdfglyphtounicode{dblbracketrightBigg}{27E6 FE04}% .. ..
-\pdfglyphtounicode{dblbracketrightbt}{23A6 23A2}% gives a solid v-line after bracket pieces
-\pdfglyphtounicode{dblbracketrightex}{23A5 23A2}%    double lines
-\pdfglyphtounicode{dblbracketrighttp}{23A4 23A2}%    lower right-bracket pieces
-\pdfglyphtounicode{intersectionsqtext}{2A05 FE01}
-\pdfglyphtounicode{intersectionsqdisplay}{2A05 FE01}
-\pdfglyphtounicode{intersectmultitext}{2A44 FE00}%  variant of  'intersect with logical and'
-\pdfglyphtounicode{intersectmultidisplay}{2A44 FE00}%  variant of  'intersect with logical and'
-\pdfglyphtounicode{intersectsqmultitext}{2A05 FE00}%  variant of  'n-ary square intersection'
-\pdfglyphtounicode{intersectsqmultidisplay}{2A05 FE00}%  variant of  'n-ary square intersection'
-\pdfglyphtounicode{lbagbig}{27C5 FE01}% variants according to size
-\pdfglyphtounicode{lbagbigg}{27C5 FE02}% .. .. 
-\pdfglyphtounicode{lbagBig}{27C5 FE03}% .. ..
-\pdfglyphtounicode{lbagBigg}{27C5 FE04}% .. ..
-\pdfglyphtounicode{lbagBiggg}{27C5 FE05}% .. ..
-\pdfglyphtounicode{lbagBigggg}{27C5 FE06}% .. ..
-\pdfglyphtounicode{lbagBiggggg}{27C5 FE07}% .. ..
-\pdfglyphtounicode{rbagbig}{27C6 FE01}% variants according to size
-\pdfglyphtounicode{rbagbigg}{27C6 FE02}% .. ..
-\pdfglyphtounicode{rbagBig}{27C6 FE03}% .. ..
-\pdfglyphtounicode{rbagBigg}{27C6 FE04}% .. ..
-\pdfglyphtounicode{rbagBiggg}{27C6 FE05}% .. ..
-\pdfglyphtounicode{rbagBigggg}{27C6 FE06}% .. ..
-\pdfglyphtounicode{rbagBiggggg}{27C6 FE07}% .. ..
-\pdfglyphtounicode{producttext1}{2715}%  Dingbat multiply symbol
-\pdfglyphtounicode{productdisplay1}{2715}%  Dingbat multiply symbol
-\pdfglyphtounicode{raisedsquare}{2E0B}%  not used, for 'missing' (.notdef) symbol ???
-\pdfglyphtounicode{unionsqmultitext}{2A04 FE00}%  variant of non-square union
-\pdfglyphtounicode{unionsqmultidisplay}{2A04 FE00}%  variant of non-square union
+\p{cupdottext}{2A03}
+\p{cupdotdisplay}{2A03}
+\p{dblbracketleftbig}{27E6 FE01}% variants according to size
+\p{dblbracketleftbigg}{27E6 FE02}% .. ..
+\p{dblbracketleftBig}{27E6 FE03}% .. ..
+\p{dblbracketleftBigg}{27E6 FE04}% .. ..
+\p{dblbracketleftbt}{23A5 23A3}% gives a solid v-line before bracket pieces
+\p{dblbracketleftex}{23A5 23A2}%    double lines
+\p{dblbracketlefttp}{23A5 23A1}%    upper left-bracket pieces
+\p{dblbracketrightbig}{27E6 FE01}% variants according to size
+\p{dblbracketrightbigg}{27E6 FE02}% .. ..
+\p{dblbracketrightBig}{27E6 FE03}% .. ..
+\p{dblbracketrightBigg}{27E6 FE04}% .. ..
+\p{dblbracketrightbt}{23A6 23A2}% gives a solid v-line after bracket pieces
+\p{dblbracketrightex}{23A5 23A2}%    double lines
+\p{dblbracketrighttp}{23A4 23A2}%    upper right-bracket pieces
+\p{intersectionsqtext}{2A05 FE01}
+\p{intersectionsqdisplay}{2A05 FE01}
+\p{intersectmultitext}{2A44 FE00}%  variant of  'intersect with logical and'
+\p{intersectmultidisplay}{2A44 FE00}%  variant of  'intersect with logical and'
+\p{intersectsqmultitext}{2A05 FE00}%  variant of  'n-ary square intersection'
+\p{intersectsqmultidisplay}{2A05 FE00}%  variant of  'n-ary square intersection'
+\p{lbagbig}{27C5 FE01}% variants according to size
+\p{lbagbigg}{27C5 FE02}% .. .. 
+\p{lbagBig}{27C5 FE03}% .. ..
+\p{lbagBigg}{27C5 FE04}% .. ..
+\p{lbagBiggg}{27C5 FE05}% .. ..
+\p{lbagBigggg}{27C5 FE06}% .. ..
+\p{lbagBiggggg}{27C5 FE07}% .. ..
+\p{rbagbig}{27C6 FE01}% variants according to size
+\p{rbagbigg}{27C6 FE02}% .. ..
+\p{rbagBig}{27C6 FE03}% .. ..
+\p{rbagBigg}{27C6 FE04}% .. ..
+\p{rbagBiggg}{27C6 FE05}% .. ..
+\p{rbagBigggg}{27C6 FE06}% .. ..
+\p{rbagBiggggg}{27C6 FE07}% .. ..
+\p{producttext1}{2715}%  Dingbat multiply symbol
+\p{productdisplay1}{2715}%  Dingbat multiply symbol
+\p{raisedsquare}{2E0B}%  not used, for 'missing' (.notdef) symbol ???
+\p{unionsqmultitext}{2A04 FE00}%  variant of non-square union
+\p{unionsqmultidisplay}{2A04 FE00}%  variant of non-square union
 %  T1-encoding
-\pdfglyphtounicode{perthousandzero}{2080}%  use subscript 0
-%  ntxsyralt
-\pdfglyphtounicode{kappa1}{D835 DF18}
-\pdfglyphtounicode{kappa1up}{03F0}
+\p{perthousandzero}{2080}%  use subscript 0
+%  ntxsyralt , fourier-ml ,  fourier-ms, . . .
+\p{kappa1}{D835 DF18}
+\p{kappa1up}{03F0}
+\p{rho2}{03F1}
+\p{partialdiff1}{D835 DF15}
+\p{pi2}{03D6}
+\p{emptysetstress}{2205}
+\p{mapstochar}{21A6}%  ???
+\p{radicallow}{23B7}% 221A ???
 %  fxlri-7alt  (and  fxlri-5alt etc. )
-\pdfglyphtounicode{J.alt}{D835 DE11}
-\pdfglyphtounicode{g.alt}{D835 DE28}
-\pdfglyphtounicode{v.alt}{D835 DE37}
-\pdfglyphtounicode{w.alt}{D835 DE38}
-\pdfglyphtounicode{y.alt}{D835 DE3A}
+\p{J.alt}{D835 DE11}
+\p{g.alt}{D835 DE28}
+\p{v.alt}{D835 DE37}
+\p{w.alt}{D835 DE38}
+\p{y.alt}{D835 DE3A}
 %  rtxbmi-rev , rtxbmi5-rev , rtxbmi7-rev 
-\pdfglyphtounicode{harpoonleftup}{21BF}
-\pdfglyphtounicode{harpoonrightup}{21BE}
-\pdfglyphtounicode{harpoonleftdown}{21C3}
-\pdfglyphtounicode{harpoonrightdown}{21C2}
-\pdfglyphtounicode{hookleftchar}{02D2}
-\pdfglyphtounicode{hookrightchar}{02D3}
+\p{harpoonleftup}{21BC}% was incorrectly {21BF}
+\p{harpoonrightup}{21C0}% was incorrectly {21BE}
+\p{harpoonleftdown}{21BD}% was incorrectly {21C3}
+\p{harpoonrightdown}{21C1}% was incorrectly {21C2}
+\p{hookleftchar}{02D2}
+\p{hookrightchar}{02D3}
+%  fourier and other arrows and math symbols
+\p{dotaccent}{0307}
+\p{geqslant}{2A7E}
+\p{leqslant}{2A7D}
+\p{notgeqslant}{2A7E 0338}
+\p{notleqslant}{2A7D 0338}
+\p{parallelslanted}{2225}
+\p{notparallelslanted}{2226}
+\p{vDash}{22A8}
+\p{notvDash}{22AD}
+\p{blacktriangleleft}{25B6}
+\p{blacktriangleright}{25C0}
+\p{hslash}{210F}
+\p{notexists}{2204}
+\p{bartriple}{2AF4}
+\p{bracketdoubleleft}{27E6}
+\p{bracketdoubleright}{27E7}
+\p{varsubsetneq}{228A}
+\p{subsetneqq}{2ACB}
+\p{notowner}{220C}
+\p{smallsetminus}{2216}% ???
+\p{swords}{2694}
+\p{swordsdown}{2694}%  !!! 
+\p{curvearrowleft}{21B6}
+\p{curvearrowright}{21B7}
+\p{leftleftarrows}{21C7}
+\p{rightrightarrows}{21C9}
+\p{barcino}{1F60E}% !!!
+\p{apple}{1F34E}%  was {F8FF}
+\p{arrowhorizex}{23AF}% was {F8E7}
+\p{arrowvertex}{23D0}% was {F8E6}
+\p{integralex}{23AE}% was {F8F5}
+\p{radicalex}{23AF}%  ???  was {F8E5}
+
+
+\endgroup
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfx.sty b/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
index 2f3f578de01..00b7dcc0f5e 100644
--- a/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
+++ b/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
@@ -6,7 +6,7 @@
 %%
 %% pdfx.dtx  (with options: `package')
 %% 
-%%  Copyright (c) 2018, CV Radhakrishnan <cvr@river-valley.org>,
+%%  Copyright (c) 2019, 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>
@@ -31,7 +31,7 @@
 }{}%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfx}
-  [2018/12/22 v1.6.1 PDF/X and PDF/A support (CVR/HTH/RRM/PS)]
+  [2019/02/27 v1.6.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
@@ -40,6 +40,7 @@
 \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\ifpdfx@noerr   % error messages become just warnings
+\newif\ifpdfx@omitcharset % used with  pdfomitcharset  primitive
 
 \DeclareOption{noerr}{\pdfx@noerrtrue}
 
@@ -67,25 +68,37 @@
    {, else continue to build a non-valid document}%
 }
 
+%%  support  pdfomitcharset  primitive, added to pdfTeX in 2019
+\DeclareOption{nocharset}{\pdfx@omitcharsettrue}
+\DeclareOption{usecharset}{\pdfx@omitcharsetfalse}
+
 %% PDF/A options
 %%  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}}
+ \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2005}%
+ \pdfx@omitcharsetfalse}
 \DeclareOption{a-1b}{\global\pdfx@xfalse\def\xmp@Part{1}%
- \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2005}}
+ \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2005}%
+ \pdfx@omitcharsetfalse}
 \DeclareOption{a-2a}{\global\pdfx@xfalse\def\xmp@Part{2}%
- \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2010}}
+ \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2010}%
+ \pdfx@omitcharsettrue}
 \DeclareOption{a-2b}{\global\pdfx@xfalse\def\xmp@Part{2}%
- \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2010}}
+ \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2010}%
+ \pdfx@omitcharsettrue}
 \DeclareOption{a-2u}{\global\pdfx@xfalse\def\xmp@Part{2}%
- \def\xmp@Conformance{U}\def\xmp@ReleaseDate{2010}}
+ \def\xmp@Conformance{U}\def\xmp@ReleaseDate{2010}%
+ \pdfx@omitcharsettrue}
 \DeclareOption{a-3a}{\global\pdfx@xfalse\def\xmp@Part{3}%
- \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2012}}
+ \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2012}%
+ \pdfx@omitcharsettrue}
 \DeclareOption{a-3b}{\global\pdfx@xfalse\def\xmp@Part{3}%
- \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2012}}
+ \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2012}%
+ \pdfx@omitcharsettrue}
 \DeclareOption{a-3u}{\global\pdfx@xfalse\def\xmp@Part{3}%
- \def\xmp@Conformance{U}\def\xmp@ReleaseDate{2012}}
+ \def\xmp@Conformance{U}\def\xmp@ReleaseDate{2012}%
+ \pdfx@omitcharsettrue}
 %%
 %% PDF/X options
 %% comments added, using
@@ -345,6 +358,17 @@
  \pdfresetpageorigin=0
 \fi
 
+\expandafter\ifx\csname pdfomitcharset\endcsname\relax\else
+ \ifpdfx@omitcharset
+  \pdfomitcharset = 1 %
+  %%  do not create /Charset listings of font glyphs;
+  %%  optional for PDF/A-2,3 and PDF 2.x
+ \else
+  \pdfomitcharset = 0 %
+  %%  create the /Charset listings of font glyphs, required with PDF/A-1
+ \fi
+\fi
+
 \newif\ifpdfx@nopdfinfo
 \ifmathxmp\pdfx@nopdfinfotrue
 \else
@@ -533,26 +557,31 @@
 \expandafter\ifx\csname inputencodingname\endcsname\relax
 \else
  \def\pdfx@restoreencoding#1{%
-  \@tempcnta=128
-  \loop
-   \catcode\@tempcnta=13
-   \advance\@tempcnta\@ne
-  \ifnum\@tempcnta<256
-  \repeat
+   \@tempcnta=128
+   \loop
+    \catcode\@tempcnta=13
+    \advance\@tempcnta\@ne
+   \ifnum\@tempcnta<256
+   \repeat
   \inputencoding{#1}%
+  \let\LastDeclaredEncoding\pdfx@LastDeclaredEncoding
+  \let\DeclareFontEncoding@\pdfx@DeclareFontEncoding@
+  \let\DeclareUnicodeCharacter\pdfx@DeclareUnicodeCharacter
   }%
   \AtEndOfPackage{\pdfx@restoreencoding\pdfx@inputencodingname}%
   \let\pdfx@inputencodingname\inputencodingname
-  \let\pdfx@DeclareUnicodeCharacter\DeclareUnicodeCharacter
+  \global\let\pdfx@DeclareUnicodeCharacter\DeclareUnicodeCharacter
+  \global\let\pdfx@DeclareFontEncoding@\DeclareFontEncoding@
   \UseRawInputEncoding
 \fi
 \InputIfFileExists{\pdfx@encodingfile}{}{}
 \expandafter\ifx\csname pdfx@inputencodingname\endcsname\relax
 \else
   \let\inputencodingname\pdfx@inputencodingname
-  \let\DeclareUnicodeCharacter\pdfx@DeclareUnicodeCharacter
-  \let\DeclareFontEncoding@\DeclareFontEncoding@saved
-  \inputencoding{\inputencodingname}%
+%%  \global\let\DeclareUnicodeCharacter\pdfx@DeclareUnicodeCharacter
+%%  \global\let\DeclareFontEncoding@\DeclareFontEncoding@saved
+  \global\let\pdfx@LastDeclaredEncoding\LastDeclaredEncoding
+  \expandafter\inputencoding\expandafter{\inputencodingname}%
 \fi
 
 %%----------------------------------------------------------------------
@@ -1667,7 +1696,13 @@
      }%
     \expandafter\pdfx@tryoldprofilesfalse
    \fi
-}{\pdfx@tryoldprofilestrue}
+}{%
+ \PackageWarning{pdfx}{%
+   The 'colorprofiles' package is not installed correctly.^^J
+   File  'colorprofiles.tex'  is missing. Proceeding without it.
+ }%
+ \pdfx@tryoldprofilestrue
+}
 
 {\catcode`\| 14 \catcode`\% 12 \catcode`\_ 12 \catcode`\: 12
  \catcode`\. 12 \catcode`\- 12 \catcode`\/ 12
@@ -2351,14 +2386,15 @@
   \expandafter\ifx\expandafter\relax\xmp@Subject\relax\else
    \pdfx@ConvertUTFtoBE{\pdfx@pdfSubject}{\xmp@Subject}%
   \fi
-\else %%  pdfx@nopdfinfotrue
+\else %%  pdfx@nopdfinfofalse
   \expandafter\ifx\expandafter\relax\xmp@Title\relax\else
    \ifluatex
     \pdfx@ConvertUTFtoBE\pdfx@pdfTitle\xmp@Title
    \else\ifxetex
     \pdfx@ConvertUTFtoBE\pdfx@pdfTitle\xmp@Title
    \else
-     \pdfx@GeneratePdfString\pdfx@pdfTitle\xmp@Title
+%%     \pdfx@GeneratePdfString\pdfx@pdfTitle\xmp@Title %  why does this fail ???
+    \pdfx@ConvertUTFtoBE{\pdfx@pdfTitle}{\xmp@Title}%  ???  RRM 2019-02-17
    \fi\fi
   \fi
   \expandafter\ifx\expandafter\relax\xmp@Subject\relax\else
@@ -2367,7 +2403,8 @@
    \else\ifxetex
     \pdfx@ConvertUTFtoBE\pdfx@pdfSubject\xmp@Subject
    \else
-    \pdfx@GeneratePdfString\pdfx@pdfSubject\xmp@Subject
+%%    \pdfx@GeneratePdfString\pdfx@pdfSubject\xmp@Subject %  why does this fail ???
+    \pdfx@ConvertUTFtoBE{\pdfx@pdfSubject}{\xmp@Subject}% 2019-02-17
    \fi\fi
   \fi
  \fi  % end of  \ifpdfx@nopdfinfo
@@ -2436,6 +2473,23 @@
  \egroup
  \spacefactor\accent@spacefactor
 }
+%% same for named accents in math-mode
+\def\pdfx@mathaccentV#1#2#3#4#5{%
+ #5{\mathsurround=\z@\relax
+  \everymath{}%
+  \mathchoice
+   {\setbox\z@\hbox{$\displaystyle #5$}\kern-\wd\z@}%
+   {\setbox\z@\hbox{$\textstyle #5$}\kern-\wd\z@}%
+   {\setbox\z@\hbox{$\scriptstyle #5$}\kern-\wd\z@}%
+   {\setbox\z@\hbox{$\scriptscriptstyle #5$}\kern-\wd\z@}%
+ }%
+ \AMS@mathaccentV{#1}{#2}{#3}{#4}{\phantom{#5}}%
+}
+\AtBeginDocument{%
+ \@ifpackageloaded{amsmath}{%
+  \let\AMS@mathaccentV\mathaccentV
+  \let\mathaccentV\pdfx@mathaccentV}%
+}%
 
 %% How to support XeTeX here ?
 %%%%%  adjust accent characters to the Unicode Combining variant  %%%%
@@ -2479,25 +2533,30 @@
  \pdfglyphtounicode{space_uni034D}{034D}%
 }
 
-\AtBeginDocument{%
+\def\pdfx@check@accents{%
  \ifx\add@accent\LTX@add@accent
   \let\add@accent\PDFX@add@accent
  \else
   \expandafter\ifx\csname MT@orig@add@accent\endcsname\relax
-  \TPDF@error{another package has already patched \string\add@accent }%
-  \else
+  \@ifpackageloaded{mmap}{}{%
+  \pdfx@ErrorWarning{another package has patched \string\add@accent }%
+   {Hit <return> to continue}{}{}}%
+   \else
    \expandafter\let\csname MT@orig@add@accent\endcsname\PDFX@add@accent
  \fi\fi
  \ifxetex
  \else
   \PDFX@combiningchars@unicode
-  \@ifpackageloaded{newtxmath}{%
-    \pdfglyphtounicode{vec}{20D7}%
-    \pdfglyphtounicode{rvec}{20D6}%
-    \pdfglyphtounicode{lrvec}{20E1}%
-   }{}%
+%%  this is now handled by  glyphtounicode-ntx.tex
+%%  \@ifpackageloaded{newtxmath}{%
+%%   \pdfglyphtounicode{vec}{20D7}%
+%%    \pdfglyphtounicode{rvec}{20D6}%
+%%    \pdfglyphtounicode{lrvec}{20E1}%
+%%   }{}%
   \fi %  end of   \ifxetex
+  \let\pdfx@check@accents\unDefiNeD
 }
+\AtBeginDocument{\pdfx@check@accents}
 
 %%  suppress hyperlinks when generating  PDF/X
 \def\pdfx@linkfile@pdfX#1#2#3{%
@@ -2863,7 +2922,7 @@
  %
  % this will have been done already for PDF/X
  %
- \PassOptionsToPackage{xcolor}{cmyk,hyperref}
+ \PassOptionsToPackage{cmyk,hyperref}{xcolor}
  \def\pdfx@handlexcolor{\def\@@mod{cmyk}\selectcolormodel{cmyk}%
    \convertcolorsUtrue\convertcolorsDtrue}
  \ifpdfx@x
@@ -2887,7 +2946,7 @@
 %%  }
  \fi
 \else
- \PassOptionsToPackage{xcolor}{rgb,hyperref}
+ \PassOptionsToPackage{rgb,hyperref}{xcolor}
  \def\pdfx@handlexcolor{\def\@@mod{rgb}\selectcolormodel{rgb}%
    \convertcolorsUtrue\convertcolorsDtrue}
 \fi