diff options
author | Karl Berry <karl@freefriends.org> | 2016-02-05 23:40:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-02-05 23:40:13 +0000 |
commit | 463c2ec14523be0366ac7388095b0e1dacbc8d3f (patch) | |
tree | 8c61b63ccc40dcf7308ecafe2c061914be629067 /Master/texmf-dist/tex | |
parent | 51400e096ca50dd3c9303cf8aea839947ea4c0dc (diff) |
pdfx (5feb16)
git-svn-id: svn://tug.org/texlive/trunk@39594 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfx/ICC_LICENSE.txt | 51 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfx/l8uenc.def | 346 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfx/pdfa.xmp | 379 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfx/pdfe.xmp | 149 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfx/pdfvt.xmp | 166 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfx/pdfx.sty | 666 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfx/pdfx.xmp | 150 |
7 files changed, 1049 insertions, 858 deletions
diff --git a/Master/texmf-dist/tex/latex/pdfx/ICC_LICENSE.txt b/Master/texmf-dist/tex/latex/pdfx/ICC_LICENSE.txt deleted file mode 100644 index a4591d973b8..00000000000 --- a/Master/texmf-dist/tex/latex/pdfx/ICC_LICENSE.txt +++ /dev/null @@ -1,51 +0,0 @@ -For the file sRGB_IEC61966-2-1_black_scaled.icc: - - Copyright International Color Consortium, 2009 - - It is hereby acknowledged that the file "sRGB_IEC61966-2-1_black - scaled.icc" is provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY. - - Licensing - - This profile is made available by the International Color Consortium, - and may be copied, distributed, embedded, made, used, and sold without - restriction. Altered versions of this profile shall have the original - identification and copyright information removed and shall not be - misrepresented as the original profile. - - Terms of use - - To anyone who acknowledges that the file "sRGB_IEC61966-2-1_black - scaled.icc" is provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY, - permission to use, copy and distribute these file for any purpose is - hereby granted without fee, provided that the file is not changed - including the ICC copyright notice tag, and that the name of ICC shall - not be used in advertising or publicity pertaining to distribution of - the software without specific, written prior permission. ICC makes no - representations about the suitability of this software for any - purpose. - -For the file coated_FOGRA39L_argl.icc: - - The zlib/libpng License - - Copyright (c) 2008 Kai-Uwe Behrmann - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you - must not claim that you wrote the original software. If you use - this software in a product, an acknowledgment in the product - documentation would be appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and - must not be misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. diff --git a/Master/texmf-dist/tex/latex/pdfx/l8uenc.def b/Master/texmf-dist/tex/latex/pdfx/l8uenc.def new file mode 100644 index 00000000000..e198c738ad7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/pdfx/l8uenc.def @@ -0,0 +1,346 @@ +%% +%% This is file `l8uenc-luatex.def' +%% +%% l8uenc-luatex.def +%% +%% This is a hand-written file, based upon t1enc.def +%% with extensions for more composite characters. +%% +%% Copyright 2015 Ross Moore <ross.moore@mq.edu.au> +%% +\ProvidesFile{l8uenc-luatex.def} + [2015/05/16 v0.1 + Custom LaTeX file] +%\DeclareFontEncoding{U}{}{} +\DeclareTextCommand{\`}{U}[1]{#1̀} +\DeclareTextCommand{\'}{U}[1]{#1́} +\DeclareTextCommand{\^}{U}[1]{#1̂} +\DeclareTextCommand{\~}{U}[1]{#1̃} +\DeclareTextCommand{\"}{U}[1]{#1̈} +\DeclareTextCommand{\H}{U}[1]{#1̋} +\DeclareTextCommand{\r}{U}[1]{#1̊} +\DeclareTextCommand{\v}{U}[1]{#1̌} +\DeclareTextCommand{\u}{U}[1]{#1̆} +\DeclareTextCommand{\=}{U}[1]{#1̄} +\DeclareTextCommand{\.}{U}[1]{#1̇} +\DeclareTextCommand{\b}{U}[1]{#1̱} +\DeclareTextCommand{\c}{U}[1]{#1̧} +\DeclareTextCommand{\d}{U}[1]{#1̣} +\DeclareTextCommand{\k}{U}[1]{#1̨} +\DeclareTextCommand{\textogonekcentered}{U}[1]{#1̨} +\DeclareTextCommand{\textperthousand}{U}{‰} +\DeclareTextCommand{\textpertenthousand}{U}{‱} +\DeclareTextCommand{\AE}{U}{Æ} +\DeclareTextCommand{\DH}{U}{Ð} +\DeclareTextCommand{\DJ}{U}{Đ} +\DeclareTextCommand{\L}{U}{Ł} +\DeclareTextCommand{\NG}{U}{Ŋ} +\DeclareTextCommand{\OE}{U}{Œ} +\DeclareTextCommand{\O}{U}{Ø} +\DeclareTextCommand{\SS}{U}{ẞ} +\DeclareTextCommand{\TH}{U}{Þ} +\DeclareTextCommand{\ae}{U}{æ} +\DeclareTextCommand{\dh}{U}{ð} +\DeclareTextCommand{\dj}{U}{đ} +\DeclareTextCommand{\guillemotleft}{U}{«} +\DeclareTextCommand{\guillemotright}{U}{»} +\DeclareTextCommand{\guilsinglleft}{U}{‹} +\DeclareTextCommand{\guilsinglright}{U}{›} +\DeclareTextCommand{\i}{U}{ı} +\DeclareTextCommand{\j}{U}{𝚥}%!!! Mathematical dotless j +\DeclareTextCommand{\ij}{U}{ij} +\DeclareTextCommand{\IJ}{U}{IJ} +\DeclareTextCommand{\l}{U}{ł} +\DeclareTextCommand{\ng}{U}{ŋ} +\DeclareTextCommand{\oe}{U}{œ} +\DeclareTextCommand{\o}{U}{ø} +\DeclareTextCommand{\quotedblbase}{U}{„} +\DeclareTextCommand{\quotesinglbase}{U}{‚} +\DeclareTextCommand{\ss}{U}{ß} +\DeclareTextSymbol{\textasciicircum}{U}{`\^} +\DeclareTextSymbol{\textasciitilde}{U}{`\~} +\DeclareTextSymbol{\textbackslash}{U}{`\\} +\DeclareTextSymbol{\textbar}{U}{`\|} +\DeclareTextSymbol{\textbraceleft}{U}{`\{} +\DeclareTextSymbol{\textbraceright}{U}{`\}} +\DeclareTextCommand{\textcompwordmark}{U}{} +\DeclareTextSymbol{\textdollar}{U}{`\$} +\DeclareTextCommand{\textemdash}{U}{—} +\DeclareTextCommand{\textendash}{U}{–} +\DeclareTextCommand{\textexclamdown}{U}{¡} +\DeclareTextSymbol{\textgreater}{U}{`\>} +\DeclareTextSymbol{\textless}{U}{`\<} +\DeclareTextCommand{\textquestiondown}{U}{¿} +\DeclareTextCommand{\textquotedblleft}{U}{‟} +\DeclareTextCommand{\textquotedblright}{U}{”} +\DeclareTextSymbol{\textquotedbl}{U}{`\"} +\DeclareTextSymbol{\textquoteleft}{U}{`\`} +\DeclareTextSymbol{\textquoteright}{U}{`\'} +\DeclareTextCommand{\textsection}{U}{§} +\DeclareTextCommand{\S}{U}{§} +\DeclareTextCommand{\textsterling}{U}{£} +\DeclareTextCommand{\pounds}{U}{£} +\DeclareTextSymbol{\textunderscore}{U}{`\_} +\DeclareTextCommand{\textvisiblespace}{U}{␣} +% from utf8.def +\DeclareTextCommand{\textcopyright}{U}{©} +\DeclareTextCommand{\textordfeminine}{U}{ª} +\DeclareTextCommand{\textregistered}{U}{®} +\DeclareTextCommand{\textordmasculine}{U}{º} +%\DeclareTextCommand{\textasciicircum}{U}{ˆ} +%\DeclareTextCommand{\textasciitilde}{U}{˜} +\DeclareTextCommand{\textellipsis}{U}{…} +\DeclareTextCommand{\dots}{U}{…} +\DeclareTextCommand{\texttrademark}{U}{™} +% +\DeclareTextCommand{\th}{U}{þ} +\DeclareTextComposite{\.}{U}{i}{`\i} +\DeclareTextComposite{\.}{U}{\i}{`\i} +\DeclareTextCompositeCommand{\u}{U}{A}{Ă} +\DeclareTextCompositeCommand{\k}{U}{A}{Ą} +\DeclareTextCompositeCommand{\'}{U}{C}{Ć} +\DeclareTextCompositeCommand{\v}{U}{C}{Č} +\DeclareTextCompositeCommand{\v}{U}{D}{Ď} +\DeclareTextCompositeCommand{\v}{U}{E}{Ě} +\DeclareTextCompositeCommand{\k}{U}{E}{Ę} +\DeclareTextCompositeCommand{\u}{U}{G}{Ğ} +\DeclareTextCompositeCommand{\'}{U}{L}{Ĺ} +\DeclareTextCompositeCommand{\v}{U}{L}{Ľ} +\DeclareTextCompositeCommand{\'}{U}{N}{Ń} +\DeclareTextCompositeCommand{\v}{U}{N}{Ň} +\DeclareTextCompositeCommand{\H}{U}{O}{Ő} +\DeclareTextCompositeCommand{\'}{U}{R}{Ŕ} +\DeclareTextCompositeCommand{\v}{U}{R}{Ř} +\DeclareTextCompositeCommand{\'}{U}{S}{Ś} +\DeclareTextCompositeCommand{\v}{U}{S}{Š} +\DeclareTextCompositeCommand{\c}{U}{S}{Ş} +\DeclareTextCompositeCommand{\v}{U}{T}{Ť} +\DeclareTextCompositeCommand{\c}{U}{T}{Ţ} +\DeclareTextCompositeCommand{\H}{U}{U}{Ű} +\DeclareTextCompositeCommand{\r}{U}{U}{Ů} +\DeclareTextCompositeCommand{\"}{U}{Y}{Ÿ} +\DeclareTextCompositeCommand{\'}{U}{Z}{Ź} +\DeclareTextCompositeCommand{\v}{U}{Z}{Ž} +\DeclareTextCompositeCommand{\.}{U}{Z}{Ż} +\DeclareTextCompositeCommand{\.}{U}{I}{İ} +\DeclareTextCompositeCommand{\u}{U}{a}{ă} +\DeclareTextCompositeCommand{\k}{U}{a}{ą} +\DeclareTextCompositeCommand{\'}{U}{c}{ć} +\DeclareTextCompositeCommand{\v}{U}{c}{č} +\DeclareTextCompositeCommand{\v}{U}{d}{ď} +\DeclareTextCompositeCommand{\v}{U}{e}{ě} +\DeclareTextCompositeCommand{\k}{U}{e}{ę} +\DeclareTextCompositeCommand{\u}{U}{g}{ğ} +\DeclareTextCompositeCommand{\'}{U}{l}{ĺ} +\DeclareTextCompositeCommand{\v}{U}{l}{ľ} +\DeclareTextCompositeCommand{\'}{U}{n}{ń} +\DeclareTextCompositeCommand{\v}{U}{n}{ň} +\DeclareTextCompositeCommand{\H}{U}{o}{ő} +\DeclareTextCompositeCommand{\'}{U}{r}{ŕ} +\DeclareTextCompositeCommand{\v}{U}{r}{ř} +\DeclareTextCompositeCommand{\'}{U}{s}{ś} +\DeclareTextCompositeCommand{\v}{U}{s}{š} +\DeclareTextCompositeCommand{\c}{U}{s}{ş} +\DeclareTextCompositeCommand{\v}{U}{t}{ť} +\DeclareTextCompositeCommand{\c}{U}{t}{ţ} +\DeclareTextCompositeCommand{\H}{U}{u}{ű} +\DeclareTextCompositeCommand{\r}{U}{u}{ů} +\DeclareTextCompositeCommand{\"}{U}{y}{ÿ} +\DeclareTextCompositeCommand{\'}{U}{z}{ź} +\DeclareTextCompositeCommand{\v}{U}{z}{ž} +\DeclareTextCompositeCommand{\.}{U}{z}{ż} +\DeclareTextCompositeCommand{\`}{U}{A}{À} +\DeclareTextCompositeCommand{\'}{U}{A}{Á} +\DeclareTextCompositeCommand{\^}{U}{A}{Â} +\DeclareTextCompositeCommand{\~}{U}{A}{Ã} +\DeclareTextCompositeCommand{\"}{U}{A}{Ä} +\DeclareTextCompositeCommand{\r}{U}{A}{Å} +\DeclareTextCompositeCommand{\c}{U}{C}{Ç} +\DeclareTextCompositeCommand{\`}{U}{E}{È} +\DeclareTextCompositeCommand{\'}{U}{E}{É} +\DeclareTextCompositeCommand{\^}{U}{E}{Ê} +\DeclareTextCompositeCommand{\"}{U}{E}{Ë} +\DeclareTextCompositeCommand{\`}{U}{I}{Ì} +\DeclareTextCompositeCommand{\'}{U}{I}{Í} +\DeclareTextCompositeCommand{\^}{U}{I}{Î} +\DeclareTextCompositeCommand{\"}{U}{I}{Ï} +\DeclareTextCompositeCommand{\~}{U}{N}{Ñ} +\DeclareTextCompositeCommand{\`}{U}{O}{Ò} +\DeclareTextCompositeCommand{\'}{U}{O}{Ó} +\DeclareTextCompositeCommand{\^}{U}{O}{Ô} +\DeclareTextCompositeCommand{\~}{U}{O}{Õ} +\DeclareTextCompositeCommand{\"}{U}{O}{Ö} +\DeclareTextCompositeCommand{\`}{U}{U}{Ù} +\DeclareTextCompositeCommand{\'}{U}{U}{Ú} +\DeclareTextCompositeCommand{\^}{U}{U}{Û} +\DeclareTextCompositeCommand{\"}{U}{U}{Ü} +\DeclareTextCompositeCommand{\'}{U}{Y}{Ý} +\DeclareTextCompositeCommand{\`}{U}{a}{à} +\DeclareTextCompositeCommand{\'}{U}{a}{á} +\DeclareTextCompositeCommand{\^}{U}{a}{â} +\DeclareTextCompositeCommand{\~}{U}{a}{ã} +\DeclareTextCompositeCommand{\"}{U}{a}{ä} +\DeclareTextCompositeCommand{\r}{U}{a}{å} +\DeclareTextCompositeCommand{\c}{U}{c}{ç} +\DeclareTextCompositeCommand{\`}{U}{e}{è} +\DeclareTextCompositeCommand{\'}{U}{e}{é} +\DeclareTextCompositeCommand{\^}{U}{e}{ê} +\DeclareTextCompositeCommand{\"}{U}{e}{ë} +\DeclareTextCompositeCommand{\`}{U}{i}{ì} +\DeclareTextCompositeCommand{\`}{U}{\i}{ì} +\DeclareTextCompositeCommand{\'}{U}{i}{í} +\DeclareTextCompositeCommand{\'}{U}{\i}{í} +\DeclareTextCompositeCommand{\^}{U}{i}{î} +\DeclareTextCompositeCommand{\^}{U}{\i}{î} +\DeclareTextCompositeCommand{\"}{U}{i}{ï} +\DeclareTextCompositeCommand{\"}{U}{\i}{ï} +\DeclareTextCompositeCommand{\~}{U}{n}{ñ} +\DeclareTextCompositeCommand{\`}{U}{o}{ò} +\DeclareTextCompositeCommand{\'}{U}{o}{ó} +\DeclareTextCompositeCommand{\^}{U}{o}{ô} +\DeclareTextCompositeCommand{\~}{U}{o}{õ} +\DeclareTextCompositeCommand{\"}{U}{o}{ö} +\DeclareTextCompositeCommand{\`}{U}{u}{ù} +\DeclareTextCompositeCommand{\'}{U}{u}{ú} +\DeclareTextCompositeCommand{\^}{U}{u}{û} +\DeclareTextCompositeCommand{\"}{U}{u}{ü} +\DeclareTextCompositeCommand{\'}{U}{y}{ý} +\DeclareTextCompositeCommand{\k}{U}{o}{\textogonekcentered{o}} +\DeclareTextCompositeCommand{\k}{U}{O}{\textogonekcentered{O}} +% from ts1enc.def +\DeclareTextCommand{\capitalcedilla}{U}[1]{#1̧}%cca7 +\DeclareTextCommand{\capitalogonek}{U}[1]{#1̨}%cca8 +\DeclareTextCommand{\capitalgrave}{U}[1]{#1̀}%cc80 +\DeclareTextCommand{\capitalacute}{U}[1]{#1́}%cc81 +\DeclareTextCommand{\capitalcircumflex}{U}[1]{#1̂}%cc82 +\DeclareTextCommand{\capitaltilde}{U}[1]{#1̃}%cc83 +\DeclareTextCommand{\capitaldieresis}{U}[1]{#1̈}%cc88 +\DeclareTextCommand{\capitalhungarumlaut}{U}[1]{#1̋}%cc8b +\DeclareTextCommand{\capitalring}{U}[1]{#1̊}%cc8a +\DeclareTextCommand{\capitalcaron}{U}[1]{#1̌}%cc8c +\DeclareTextCommand{\capitalbreve}{U}[1]{#1̆}%cc86 +\DeclareTextCommand{\capitalmacron}{U}[1]{#1̄}%cc84 +\DeclareTextCommand{\capitaldotaccent}{U}[1]{#1̇}%cc87 +\DeclareTextCommand{\t}{U}[1]{#1͡}%cda1 +\DeclareTextCommand{\capitaltie}{U}[1]{#1͡}%cda1 +\DeclareTextCommand{\newtie}{U}[1]{#1⁀}%e28180 % or cc91 +\DeclareTextCommand{\capitalnewtie}{U}[1]{#1⁀}%e28180 % or cc91 +\DeclareTextCommand{\textcapitalcompwordmark}{U}{}%e2809c +\DeclareTextCommand{\textascendercompwordmark}{U}{}%e2809c +\DeclareTextCommand{\textquotestraightbase}{U}{‚}%e2809a +\DeclareTextCommand{\textquotestraightdblbase}{U}{„}%e2809e +\DeclareTextCommand{\texttwelveudash}{U}{―}%e28095 +\DeclareTextCommand{\textthreequartersemdash}{U}{‒}%e28092 +\DeclareTextCommand{\textleftarrow}{U}{←}%e28690 +\DeclareTextCommand{\textrightarrow}{U}{→}%e28692 +\DeclareTextCommand{\textblank}{U}{␢}%e290a2 +%\DeclareTextSymbol{\textdollar}{U}{`\$}% +\DeclareTextSymbol{\textquotesingle}{U}{`\'}% +\DeclareTextSymbol{\textasteriskcentered}{U}{`\*} +%\DeclareTextCommand{\textdblhyphen}{U}{꞊}%ea9e8a ???? +\DeclareTextCommand{\textfractionsolidus}{U}{⁄}%e28184 +\DeclareTextCommand{\textzerooldstyle}{U}{0}%efbc90 +\DeclareTextCommand{\textoneoldstyle}{U}{1} +\DeclareTextCommand{\texttwooldstyle}{U}{2} +\DeclareTextCommand{\textthreeoldstyle}{U}{3} +\DeclareTextCommand{\textfouroldstyle}{U}{4} +\DeclareTextCommand{\textfiveoldstyle}{U}{5} +\DeclareTextCommand{\textsixoldstyle}{U}{6} +\DeclareTextCommand{\textsevenoldstyle}{U}{7} +\DeclareTextCommand{\texteightoldstyle}{U}{8} +\DeclareTextCommand{\textnineoldstyle}{U}{9} +\DeclareTextCommand{\textlangle}{U}{〈}%e38088 +\DeclareTextCommand{\textminus}{U}{−}%28892 +\DeclareTextCommand{\textrangle}{U}{〉}%e38089 +\DeclareTextCommand{\textmho}{U}{℧}%e284a7 +\DeclareTextCommand{\textbigcircle}{U}{◯}%e297af +\DeclareTextCommand{\textcircled}{U}[1]{#1⃝}%e2839d +\DeclareTextCommand{\textohm}{U}{Ω}%e284a6 +\DeclareTextCommand{\textlbrackdbl}{U}{〚}%e3809a +\DeclareTextCommand{\textrbrackdbl}{U}{〛}%e3809b +\DeclareTextCommand{\textuparrow}{U}{↑}%e28691 +\DeclareTextCommand{\textdownarrow}{U}{↓}%e28693 +\DeclareTextCommand{\textasciigrave}{U}{ˋ}%cb8b ???? +\DeclareTextCommand{\textborn}{U}{✭}%e29cad or ???? +\DeclareTextCommand{\textdivorced}{U}{⚮}%e29aae +\DeclareTextCommand{\textdied}{U}{✝}%e29c9d or ⚰ %e29ab0 +%\DeclareTextSymbol{\textleaf}{U}{108}% ???? +\DeclareTextCommand{\textmarried}{U}{⚭}%e29aad +\DeclareTextCommand{\textmusicalnote}{U}{♪}%e299aa +\DeclareTextCommand{\texttildelow}{U}{˷}%cbb7 +\DeclareTextCommand{\textdblhyphenchar}{U}{꞊}%ea9e8a ???? +\DeclareTextCommand{\textasciibreve}{U}{˘}%cb98 +\DeclareTextCommand{\textasciicaron}{U}{ˇ}%cb87 +\DeclareTextCommand{\textacutedbl}{U}{˝}%cb9d or ˶ %cbb6 +\DeclareTextCommand{\textgravedbl}{U}{˵}%cbb5 +\DeclareTextCommand{\textdagger}{U}{†}%e280a0 +\DeclareTextCommand{\dag}{U}{†}%e280a0 +\DeclareTextCommand{\textdaggerdbl}{U}{‡}%e280a1 +\DeclareTextCommand{\ddag}{U}{‡}%e280a1 +\DeclareTextCommand{\textbardbl}{U}{‖}%e28096 +%\DeclareTextCommand{\textperthousand}{U}{‰}%e280b0 +\DeclareTextCommand{\textbullet}{U}{•}%e280a2 +\DeclareTextCommand{\bullet}{U}{•}%e280a2 +\DeclareTextCommand{\textcelsius}{U}{℃}%e28483 +\DeclareTextCommand{\textdollaroldstyle}{U}{`\$} +\DeclareTextCommand{\textcentoldstyle}{U}{¢}%c2a2 %var-1: efb880 +\DeclareTextCommand{\textflorin}{U}{ƒ}%c692 +\DeclareTextCommand{\textcolonmonetary}{U}{₡}%e282a1 +\DeclareTextCommand{\textwon}{U}{₩}%e282a9 +\DeclareTextCommand{\textnaira}{U}{₦}%e282a6 +\DeclareTextCommand{\textguarani}{U}{₲}%e282b2 +\DeclareTextCommand{\textpeso}{U}{₱}%e282b1 +\DeclareTextCommand{\textlira}{U}{₤}%e282a4 +\DeclareTextCommand{\textrecipe}{U}{℞}%e2849e +\DeclareTextCommand{\textinterrobang}{U}{‽}%e280bd +\DeclareTextCommand{\textinterrobangdown}{U}{⸘}%e2b898 +\DeclareTextCommand{\textdong}{U}{₫}%e282ab +\DeclareTextCommand{\texttrademark}{U}{™}%e284a2 +%\DeclareTextCommand{\textpertenthousand}{U}{‱}%e280b1 +\DeclareTextCommand{\textpilcrow}{U}{¶}%c2b6 %var-1: efb880 +\DeclareTextCommand{\textbaht}{U}{฿}%e0b8bf +\DeclareTextCommand{\textnumero}{U}{№}%e28496 +\DeclareTextCommand{\textdiscount}{U}{⁒}%e28192 +\DeclareTextCommand{\textestimated}{U}{℮}%e284ae +\DeclareTextCommand{\textopenbullet}{U}{◦}%e297a6 +\DeclareTextCommand{\textservicemark}{U}{℠}%e284a0 +\DeclareTextCommand{\textlquill}{U}{⁅}%e28185 +\DeclareTextCommand{\textrquill}{U}{⁆}%e28186 +\DeclareTextCommand{\textcent}{U}{¢}%c2a2 +%\DeclareTextCommand{\textsterling}{U}{£}%c2a3 +\DeclareTextCommand{\textcurrency}{U}{¤}%c2a4 +\DeclareTextCommand{\textyen}{U}{¥}%c2a5 +\DeclareTextCommand{\textbrokenbar}{U}{¦}%c2a6 +\DeclareTextCommand{\textsection}{U}{§}%c2a7 +\DeclareTextCommand{\textasciidieresis}{U}{¨}%c2a8 +\DeclareTextCommand{\textcopyright}{U}{©}%c2a9 +\DeclareTextCommand{\textordfeminine}{U}{ª}%c2aa +\DeclareTextCommand{\textcopyleft}{U}{©}%???? non-unicode +\DeclareTextCommand{\textlnot}{U}{¬}%c2ac +%\DeclareTextCommand{\-}{U}{}%c2ad % don't override discretionary hyphen +\DeclareTextCommand{\textcircledP}{U}{℗}%e28497 +\DeclareTextCommand{\textregistered}{U}{®}%c2ae +\DeclareTextCommand{\textasciimacron}{U}{¯}%c2af +\DeclareTextCommand{\textdegree}{U}{°}%c2b0 +\DeclareTextCommand{\textpm}{U}{±}%c2b1 +\DeclareTextCommand{\texttwosuperior}{U}{²}%c2b2 +\DeclareTextCommand{\textthreesuperior}{U}{³}%c2b3 +\DeclareTextCommand{\textasciiacute}{U}{´}%c2b4 +\DeclareTextCommand{\textmu}{U}{µ}%c2b5 +\DeclareTextCommand{\textparagraph}{U}{¶}%c2b6 +\DeclareTextCommand{\P}{U}{¶}%c2b6 +\DeclareTextCommand{\textperiodcentered}{U}{·}%c2b7 +\DeclareTextCommand{\textcedilla}{U}{¸}%c2b8 +\DeclareTextCommand{\textreferencemark}{U}{※}%e280bb +\DeclareTextCommand{\textonesuperior}{U}{¹}%c2b9 +\DeclareTextCommand{\textordmasculine}{U}{º}%c2ba +\DeclareTextCommand{\textsurd}{U}{√}%e2889a +\DeclareTextCommand{\textonequarter}{U}{¼}%c2bc +\DeclareTextCommand{\textonehalf}{U}{½}%c2bd +\DeclareTextCommand{\textthreequarters}{U}{¾}%c2be +\DeclareTextCommand{\texteuro}{U}{€}%e282ac +\DeclareTextCommand{\texttimes}{U}{×}%c397 +\DeclareTextCommand{\textdiv}{U}{÷}%c3b7 +\endinput +%% +%% End of file `l8uenc-luatex.def'. diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfa.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfa.xmp index 2f4b59e0cdb..69bc6d8aba3 100644 --- a/Master/texmf-dist/tex/latex/pdfx/pdfa.xmp +++ b/Master/texmf-dist/tex/latex/pdfx/pdfa.xmp @@ -18,7 +18,7 @@ %% version 1999/12/01 or later. %% <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.0-c316 44.253921, Sun Oct 01 2006 17:14:39"> - <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> % xmlns:pdf = "http://ns.adobe.com/pdf/1.3/" % xmlns:pdfx = "http://ns.adobe.com/pdfx/1.3/" % xmlns:pdfaid = "http://www.aiim.org/pdfa/ns/id/" @@ -38,279 +38,144 @@ % xmlns:pim = "http://prismstandard.org/namespaces/pim/2.2/" % xmlns:prl = "http://prismstandard.org/namespaces/prl/2.1/" % xmlns:pur = "http://prismstandard.org/namespaces/primusagerights/2.1/" - <rdf:Description rdf:about="" xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" - xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" - xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#"> - <pdfaExtension:schemas> - <rdf:Bag> +% > + <rdf:Description rdf:about="" xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" + xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" + xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#" +%% RRM: do we really need the following two declarations ? +% xmlns:pdfaType="http://www.aiim.org/pdfa/ns/type#" +% xmlns:pdfaField="http://www.aiim.org/pdfa/ns/field#" + > + <pdfaExtension:schemas> + <rdf:Bag> + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:namespaceURI>http://ns.adobe.com/pdfx/1.3/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>pdfx</pdfaSchema:prefix> + <pdfaSchema:schema>PDF/X Schema</pdfaSchema:schema> + <pdfaSchema:property> + <rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>external</pdfaProperty:category> + <pdfaProperty:description>URL to an online version or preprint</pdfaProperty:description> + <pdfaProperty:name>AuthoritativeDomain</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + </rdf:Seq> + </pdfaSchema:property> + </rdf:li> %% RRM: this declares the namespace resource for PRISM metadata - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:schema>PRISM metadata</pdfaSchema:schema> - <pdfaSchema:namespaceURI>http://prismstandard.org/namespaces/basic/2.2/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>prism</pdfaSchema:prefix> - <pdfaSchema:property> - <rdf:Seq> -%% RRM: Only need to define the tags that are actually used below. + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:schema>PRISM metadata</pdfaSchema:schema> + <pdfaSchema:namespaceURI>http://prismstandard.org/namespaces/basic/2.2/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>prism</pdfaSchema:prefix> + <pdfaSchema:property> + <rdf:Seq> +%% RRM: Only need to define the tags that are actually used below. But \ifx ... \fi must be all on one line. %% declare prism:aggregationType -% need at least one field, for validation - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>aggregationType</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description> - The type of publication. If defined, must be one - of book, catalog, feed, journal, magazine, manual, - newsletter, pamphlet. - </pdfaProperty:description> - </rdf:li> +%\ifx\xmp@PublicationType\@empty\else % need at least one field, for validation + <rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>aggregationType</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>The type of publication. If defined, must be one of book, catalog, feed, journal, magazine, manual, newsletter, pamphlet.</pdfaProperty:description>^^J </rdf:li> %\fi %% declare prism:issn -\ifnot@empty\xmp@Journalnumber{% - <rdf:li rdf:parseType="Resource">^^J% - <pdfaProperty:name>issn</pdfaProperty:name>^^J% - <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J% - <pdfaProperty:category>external</pdfaProperty:category>^^J% - <pdfaProperty:description>^^J% - The ISSN for the publication in which the resource^^J% - was published^^J% - </pdfaProperty:description>^^J% - </rdf:li> -}% + \ifx\xmp@Journalnumber\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>issn</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>The ISSN for the publication in which the resource was published</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:volume -\ifnot@empty\xmp@Volume{% - <rdf:li rdf:parseType="Resource">^^J% - <pdfaProperty:name>volume</pdfaProperty:name>^^J% - <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J% - <pdfaProperty:category>external</pdfaProperty:category>^^J% - <pdfaProperty:description>^^J% - Additional identifier for the publication where^^J% - the resource appeared, providing the Volume^^J% - portion of the common Volume, Number^^J% - scheme^^J% - </pdfaProperty:description>^^J% - </rdf:li> -}% + \ifx\xmp@Volume\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>volume</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Additional identifier for the publication where the resource appeared, providing the Volume portion of the common Volume, Number scheme</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:number -\ifnot@empty\xmp@Issue{% - <rdf:li rdf:parseType="Resource">^^J% - <pdfaProperty:name>number</pdfaProperty:name>^^J% - <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J% - <pdfaProperty:category>external</pdfaProperty:category>^^J% - <pdfaProperty:description>^^J% - Number of the Issue within the Volume^^J% - </pdfaProperty:description>^^J% - </rdf:li> -}% + \ifx\xmp@Issue\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>number</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Number of the Issue within the Volume</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:coverDisplayDate -\ifnot@empty\xmp@CoverDisplayDate{% - <rdf:li rdf:parseType="Resource">^^J% - <pdfaProperty:name>coverDisplayDate</pdfaProperty:name>^^J% - <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J% - <pdfaProperty:category>external</pdfaProperty:category>^^J% - <pdfaProperty:description>^^J% - Date on the cover of a magazine issue, as a^^J% - human-readable text^^J% - string^^J% - </pdfaProperty:description>^^J% - </rdf:li> -}% + \ifx\xmp@CoverDisplayDate\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>coverDisplayDate</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Date on the cover of a magazine issue, as a human-readable text string</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:coverDate -\ifnot@empty\xmp@CoverDate{% - <rdf:li rdf:parseType="Resource">^^J% - <pdfaProperty:name>coverDate</pdfaProperty:name>^^J% - <pdfaProperty:valueType>Date</pdfaProperty:valueType>^^J% - <pdfaProperty:category>external</pdfaProperty:category>^^J% - <pdfaProperty:description>^^J% - Date on the cover of a magazine issue, suitable^^J% - for storing in a database field with a 'date' data^^J% - type^^J% - </pdfaProperty:description>^^J% - </rdf:li> -}% + \ifx\xmp@CoverDate\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>coverDate</pdfaProperty:name>^^J <pdfaProperty:valueType>Date</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Date on the cover of a magazine issue, suitable for storing in a database field with a 'date' data type</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:issueName -\ifnot@empty\xmp@Journaltitle{% - <rdf:li rdf:parseType="Resource">^^J% - <pdfaProperty:name>issueName</pdfaProperty:name>^^J% - <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J% - <pdfaProperty:category>external</pdfaProperty:category>^^J% - <pdfaProperty:description>^^J% - Additional identifier, typically used for major^^J% - issues of a magazine or other^^J% - resource^^J% - </pdfaProperty:description>^^J% - </rdf:li> -}% + \ifx\xmp@Journaltitle\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>issueName</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Additional identifier, typically used for major issues of a magazine or other resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:pageRange -\ifnot@empty\xmp@Firstpage{% - <rdf:li rdf:parseType="Resource">^^J% - <pdfaProperty:name>pageRange</pdfaProperty:name>^^J% - <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J% - <pdfaProperty:category>external</pdfaProperty:category>^^J% - <pdfaProperty:description>^^J% - Page range for the published print version of the^^J% - resource^^J% - </pdfaProperty:description>^^J% - </rdf:li> -}% + \ifx\xmp@Firstpage\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>pageRange</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Page range for the published print version of the resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:startingPage -\ifnot@empty\xmp@Firstpage{% - <rdf:li rdf:parseType="Resource">^^J% - <pdfaProperty:name>startingPage</pdfaProperty:name>^^J% - <pdfaProperty:valueType>Integer</pdfaProperty:valueType>^^J% - <pdfaProperty:category>external</pdfaProperty:category>^^J% - <pdfaProperty:description>^^J% - First page number for the published version of the^^J% - resource^^J% - </pdfaProperty:description>^^J% - </rdf:li> -}% + \ifx\xmp@Firstpage\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>startingPage</pdfaProperty:name>^^J <pdfaProperty:valueType>Integer</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>First page number for the published version of the resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:endingPage -\ifnot@empty\xmp@Lastpage{% - <rdf:li rdf:parseType="Resource">^^J% - <pdfaProperty:name>endingPage</pdfaProperty:name>^^J% - <pdfaProperty:valueType>Integer</pdfaProperty:valueType>^^J% - <pdfaProperty:category>external</pdfaProperty:category>^^J% - <pdfaProperty:description>^^J% - The last page number for the printed resource^^J% - </pdfaProperty:description>^^J% - </rdf:li> -}% + \ifx\xmp@Lastpage\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>endingPage</pdfaProperty:name>^^J <pdfaProperty:valueType>Integer</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>The last page number for the printed resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:doi -\ifnot@empty\xmp@Doi{% - <rdf:li rdf:parseType="Resource">^^J% - <pdfaProperty:name>doi</pdfaProperty:name>^^J% - <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J% - <pdfaProperty:category>external</pdfaProperty:category>^^J% - <pdfaProperty:description>^^J% - Digital Object Identifier, DOI, for the article^^J% - </pdfaProperty:description>^^J% - </rdf:li> -}% + \ifx\xmp@Doi\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>doi</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Digital Object Identifier, DOI, for the article</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:url -\ifnot@empty\xmp@Doi{% - <rdf:li rdf:parseType="Resource">^^J% - <pdfaProperty:name>url</pdfaProperty:name>^^J% - <pdfaProperty:valueType>URL</pdfaProperty:valueType>^^J% - <pdfaProperty:category>external</pdfaProperty:category>^^J% - <pdfaProperty:description>^^J% - URL for the article or unit of content^^J% - </pdfaProperty:description>^^J% - </rdf:li> -}% + \ifx\xmp@Doi\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>url</pdfaProperty:name>^^J <pdfaProperty:valueType>URL</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>URL for the article or unit of content</pdfaProperty:description>^^J </rdf:li>\fi %% RRM: more tags can be declared -% <rdf:li rdf:parseType="Resource"> -% <pdfaProperty:name></pdfaProperty:name> -% <pdfaProperty:valueType>Text</pdfaProperty:valueType> -% <pdfaProperty:category>external</pdfaProperty:category> -% <pdfaProperty:description> -% </pdfaProperty:description> -% </rdf:li> - </rdf:Seq> - </pdfaSchema:property> - </rdf:li> - </rdf:Bag> - </pdfaExtension:schemas> - </rdf:Description> - <rdf:Description rdf:about="" xmlns:pdf="http://ns.adobe.com/pdf/1.3/"> - <pdf:Producer>\xmp@Producer</pdf:Producer> -\ifnot@empty\xmp@@Keywords{% - <pdf:Keywords>\xmp@@Keywords</pdf:Keywords> -}% - </rdf:Description> - <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <dc:format>application/pdf</dc:format> -\ifnot@empty\xmp@Title{% - <dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title> -}% -\ifnot@empty\xmp@@Author{% - <dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator> -}% -\ifnot@empty\xmp@Publisher{% - <dc:publisher><rdf:Bag><rdf:li>\xmp@Publisher</rdf:li></rdf:Bag></dc:publisher> -}% -\ifnot@empty\xmp@Doi{% - <dc:identifier>doi:\xmp@Doi</dc:identifier> -}% -\ifnot@empty\xmp@Copyright{% - <dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></dc:rights> -}% -\ifnot@empty\xmp@Subject{% - <dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description> -}% -\ifnot@empty\xmp@Keywords{% - <dc:subject><rdf:Bag><rdf:li>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject> -}% - </rdf:Description> - <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/"> -\ifnot@empty\xmp@PublicationType{% - <prism:aggregationType>\xmp@PublicationType</prism:aggregationType> -}% -\ifnot@empty\xmp@Journalnumber{% - <prism:issn>\xmp@Journalnumber</prism:issn> -}% -\ifnot@empty\xmp@Volume{% - <prism:volume>\xmp@Volume</prism:volume> -}% -\ifnot@empty\xmp@Issue{% - <prism:number>\xmp@Issue</prism:number> -}% -\ifnot@empty\xmp@CoverDisplayDate{% - <prism:coverDisplayDate>\xmp@CoverDisplayDate</prism:coverDisplayDate> -}% -\ifnot@empty\xmp@CoverDate{% - <prism:coverDate>\xmp@CoverDate</prism:coverDate> -}% -\ifnot@empty\xmp@Journaltitle{% - <prism:issueName>\xmp@Journaltitle</prism:issueName> -}% -\ifnot@empty\xmp@Firstpage{% - <prism:pageRange>\xmp@Firstpage-\xmp@Lastpage</prism:pageRange> -}% -\ifnot@empty\xmp@Firstpage{% - <prism:startingPage>\xmp@Firstpage</prism:startingPage> -}% -\ifnot@empty\xmp@Lastpage{% - <prism:endingPage>\xmp@Lastpage</prism:endingPage> -}% -\ifnot@empty\xmp@Doi{% - <prism:doi>\xmp@Doi</prism:doi> -}% -\ifnot@empty\xmp@Doi{% - <prism:url>http://dx.doi.org/\xmp@Doi</prism:url> -}% - </rdf:Description> - <rdf:Description rdf:about="" xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/"> - <pdfaid:part>\xmp@Part</pdfaid:part> - <pdfaid:conformance>\xmp@Conformance</pdfaid:conformance> - </rdf:Description> - <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/"> - <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool> - <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate> - <xmp:CreateDate>\xmp@convDate</xmp:CreateDate> - <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate> - </rdf:Description> - <rdf:Description rdf:about="" xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/"> -\ifnot@empty\xmp@Copyrighted{% - <xmpRights:Marked>\xmp@Copyrighted</xmpRights:Marked> -}% -\ifnot@empty\xmp@Copyright{% - <xmpRights:UsageTerms><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></xmpRights:UsageTerms> -}% -\ifnot@empty\xmp@CopyrightURL{% - <xmpRights:WebStatement>\xmp@CopyrightURL</xmpRights:WebStatement> -}% - </rdf:Description> - <rdf:Description rdf:about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"> - <xmpMM:DocumentID>uuid:\xmp@docid</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:\xmp@instid</xmpMM:InstanceID> - </rdf:Description> - </rdf:RDF> +% <rdf:li rdf:parseType="Resource"> +% <pdfaProperty:name></pdfaProperty:name> +% <pdfaProperty:valueType>Text</pdfaProperty:valueType> +% <pdfaProperty:category>external</pdfaProperty:category> +% <pdfaProperty:description></pdfaProperty:description> +% </rdf:li> + </rdf:Seq></pdfaSchema:property> + </rdf:li> + </rdf:Bag> + </pdfaExtension:schemas> + </rdf:Description> + <rdf:Description rdf:about="" xmlns:pdf="http://ns.adobe.com/pdf/1.3/"> + <pdf:Producer>\xmp@Producer</pdf:Producer> + \ifx\xmp@@Keywords\@empty\else<pdf:Keywords>\xmp@@Keywords</pdf:Keywords>\fi + </rdf:Description> + <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <dc:format>application/pdf</dc:format> + \ifx\xmp@Title\@empty\else<dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title>\fi + \ifx\xmp@@Author\@empty\else<dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>\fi + \ifx\xmp@Org\@empty\else<dc:publisher><rdf:Bag><rdf:li>\xmp@Org</rdf:li></rdf:Bag></dc:publisher>\fi + \ifx\xmp@Doi\@empty\else<dc:identifier>doi:\xmp@Doi</dc:identifier>\fi + \ifx\xmp@Copyright\@empty\else<dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@@Copyright</rdf:li></rdf:Alt></dc:rights>\fi + \ifx\xmp@Subject\@empty\else<dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description>\fi + \ifx\xmp@Keywords\@empty\else<dc:subject><rdf:Bag><rdf:li>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>\fi + </rdf:Description> + <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/"> + \ifx\xmp@PublicationType\@empty\else<prism:aggregationType>\xmp@PublicationType</prism:aggregationType>\fi + \ifx\xmp@Journalnumber\@empty\else<prism:issn>\xmp@Journalnumber</prism:issn>\fi + \ifx\xmp@Volume\@empty\else<prism:volume>\xmp@Volume</prism:volume>\fi + \ifx\xmp@Issue\@empty\else<prism:number>\xmp@Issue</prism:number>\fi + \ifx\xmp@CoverDisplayDate\@empty\else<prism:coverDisplayDate>\xmp@CoverDisplayDate</prism:coverDisplayDate>\fi + \ifx\xmp@CoverDate\@empty\else<prism:coverDate>\xmp@CoverDate</prism:coverDate>\fi + \ifx\xmp@Journaltitle\@empty\else<prism:issueName>\xmp@Journaltitle</prism:issueName>\fi + \ifx\xmp@Firstpage\@empty\else<prism:pageRange>\xmp@Firstpage-\xmp@Lastpage</prism:pageRange>\fi + \ifx\xmp@Firstpage\@empty\else<prism:startingPage>\xmp@Firstpage</prism:startingPage>\fi + \ifx\xmp@Lastpage\@empty\else<prism:endingPage>\xmp@Lastpage</prism:endingPage>\fi + \ifx\xmp@Doi\@empty\else<prism:doi>\xmp@Doi</prism:doi>\fi + \ifx\xmp@Doi\@empty\else<prism:url>http://dx.doi.org/\xmp@Doi</prism:url>\fi + </rdf:Description> +%% RRM: Is this needed with PDF/A or only with PDF/X ??? + <rdf:Description rdf:about="" xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/"> +% \ifx\xmp@AuthoritativeDomain\@empty\else<pdfx:AuthoritativeDomain><rdf:Bag><rdf:li>\xmp@AuthoritativeDomain</rdf:li></rdf:Bag></pdfx:AuthoritativeDomain>\fi + \ifx\xmp@AuthoritativeDomain\@empty\else<pdfx:AuthoritativeDomain>\xmp@AuthoritativeDomain</pdfx:AuthoritativeDomain>\fi + </rdf:Description> + <rdf:Description rdf:about="" xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/"> + <pdfaid:part>\xmp@Part</pdfaid:part> + <pdfaid:conformance>\xmp@Conformance</pdfaid:conformance> + </rdf:Description> + <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/"> + <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool> + <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate> + <xmp:CreateDate>\xmp@convDate</xmp:CreateDate> + <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate> + </rdf:Description> + <rdf:Description rdf:about="" xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/"> + \ifx\xmp@Copyright\@empty\else<xmpRights:Marked>True</xmpRights:Marked>^^J<xmpRights:UsageTerms><rdf:Alt><rdf:li xml:lang="x-default">\xmp@@Copyright</rdf:li></rdf:Alt></xmpRights:UsageTerms>\fi + \ifx\xmp@WebStatement\@empty\else<xmpRights:WebStatement>\xmp@WebStatement</xmpRights:WebStatement>\fi + </rdf:Description> +% <rdf:Description rdf:about="" xmlns:xmpRights="http://ns.adobe.com/xap/1.0/rights/"> +% <xmpRights:Marked>True</xmpRights:Marked> +% </rdf:Description> +%\@ifundefined{xmpCopyright}{}{% +% <rdf:Description rdf:about="" xmlns:xmpRights="http://ns.adobe.com/xap/1.0/rights/"> +% <xmpRights:Marked>True</xmpRights:Marked> +% </rdf:Description> +%}% + <rdf:Description rdf:about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"> + <xmpMM:DocumentID>uuid:\xmp@docid</xmpMM:DocumentID> + <xmpMM:InstanceID>uuid:\xmp@instid</xmpMM:InstanceID> + </rdf:Description> + </rdf:RDF> </x:xmpmeta> % padding with 512 space characters to allow easier editing within a PDF -\padding@line -\padding@line -\padding@line -\padding@line +\paddingline +\paddingline +\paddingline +\paddingline %% %% End of pdfa.xmp %% %% + diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfe.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfe.xmp index 252c1dd22bd..4dfc12d383d 100644 --- a/Master/texmf-dist/tex/latex/pdfx/pdfe.xmp +++ b/Master/texmf-dist/tex/latex/pdfx/pdfe.xmp @@ -51,7 +51,7 @@ <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate> <xmp:CreateDate>\xmp@convDate</xmp:CreateDate> <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate> - \ifnot@empty\xmp@@Keywords{<pdf:Keywords>\xmp@@Keywords</pdf:Keywords>} + \ifx\xmp@@Keywords\@empty\else<pdf:Keywords>\xmp@@Keywords</pdf:Keywords>\fi <pdf:Producer>\xmp@Producer</pdf:Producer> <pdf:Trapped>False</pdf:Trapped> <pdfe:ISO_PDFEVersion>PDF/E-\xmp@Part</pdfe:ISO_PDFEVersion> @@ -59,14 +59,13 @@ % \ifnum\xmp@Part>3 <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part</pdfxid:GTS_PDFXVersion>\fi % <pdfx:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance\ifnum\xmp@Part<4:\xmp@ReleaseDate\fi</pdfx:GTS_PDFXVersion> % \ifnum\xmp@Part<3 <pdfx:GTS_PDFXConformance>PDF/X-\xmp@Part\xmp@Conformance:\xmp@ReleaseDate</pdfx:GTS_PDFXConformance>\fi - \ifnot@empty\xmp@AuthoritativeDomain{<pdfx:AuthoritativeDomain>\xmp@AuthoritativeDomain</pdfx:AuthoritativeDomain>} + \ifx\xmp@AuthoritativeDomain\@empty\else<pdfx:AuthoritativeDomain>\xmp@AuthoritativeDomain</pdfx:AuthoritativeDomain>\fi </rdf:Description> % <rdf:Description rdf:about="" xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/"> % \ifnum\xmp@Part>3 <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part</pdfxid:GTS_PDFXVersion>\fi % </rdf:Description> % <rdf:Description rdf:about="" xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/"> -% \ifnum\xmp@Part> 3<pdfaid:part>\xmp@Part</pdfaid:part> -% <pdfaid:conformance>\xmp@Conformance</pdfaid:conformance>\fi +% \ifnum\xmp@Part> 3<pdfaid:part>\xmp@Part</pdfaid:part>^^J <pdfaid:conformance>\xmp@Conformance</pdfaid:conformance>\fi % </rdf:Description> % <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/"> % <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool> @@ -75,23 +74,19 @@ % <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate> % </rdf:Description> <rdf:Description rdf:about="" xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/"> - \ifnot@empty\xmp@Copyright{<xmpRights:Marked>True</xmpRights:Marked> - <xmpRights:UsageTerms> - <rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li> - </rdf:Alt> - </xmpRights:UsageTerms>} - \ifnot@empty\xmp@CopyrightURL{<xmpRights:WebStatement>\xmp@CopyrightURL</xmpRights:WebStatement>} + \ifx\xmp@Copyright\@empty\else<xmpRights:Marked>True</xmpRights:Marked>^^J <xmpRights:UsageTerms>^^J <rdf:Alt><rdf:li xml:lang="x-default">\xmp@@Copyright</rdf:li>^^J </rdf:Alt>^^J </xmpRights:UsageTerms>\fi + \ifx\xmp@WebStatement\@empty\else<xmpRights:WebStatement>\xmp@WebStatement</xmpRights:WebStatement>\fi %} </rdf:Description> <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"> <dc:format>application/pdf</dc:format> - \ifnot@empty\xmp@Title{<dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title>} - \ifnot@empty\xmp@@Author{<dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>} - \ifnot@empty\xmp@Publisher{<dc:publisher><rdf:Bag><rdf:li>\xmp@Publisher</rdf:li></rdf:Bag></dc:publisher>} - \ifnot@empty\xmp@Doi{<dc:identifier>doi:\xmp@Doi</dc:identifier>} - \ifnot@empty\xmp@Copyright{<dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></dc:rights>} - \ifnot@empty\xmp@Subject{<dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description>} - \ifnot@empty\xmp@Keywords{<dc:subject><rdf:Bag><rdf:li>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>} + \ifx\xmp@Title\@empty\else<dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title>\fi + \ifx\xmp@@Author\@empty\else<dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>\fi + \ifx\xmp@Org\@empty\else<dc:publisher><rdf:Bag><rdf:li>\xmp@Org</rdf:li></rdf:Bag></dc:publisher>\fi + \ifx\xmp@Doi\@empty\else<dc:identifier>doi:\xmp@Doi</dc:identifier>\fi + \ifx\xmp@Copyright\@empty\else<dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@@Copyright</rdf:li></rdf:Alt></dc:rights>\fi + \ifx\xmp@Subject\@empty\else<dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description>\fi + \ifx\xmp@Keywords\@empty\else<dc:subject><rdf:Bag><rdf:li>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>\fi </rdf:Description> <rdf:Description rdf:about="" xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" @@ -214,91 +209,31 @@ <pdfaSchema:prefix>prism</pdfaSchema:prefix> <pdfaSchema:property> <rdf:Seq> -%% RRM: Only need to define the tags that are actually used below. +%% RRM: Only need to define the tags that are actually used below. But \ifx ... \fi must be all on one line. %% declare prism:aggregationType - \ifnot@empty\xmp@PublicationType{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>aggregationType</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>The type of publication. If defined, must be one of book, catalog, feed, journal, magazine, manual, newsletter, pamphlet.</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@PublicationType\@empty\else <rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>aggregationType</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>The type of publication. If defined, must be one of book, catalog, feed, journal, magazine, manual, newsletter, pamphlet.</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:issn - \ifnot@empty\xmp@Journalnumber{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>issn</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>The ISSN for the publication in which the resource was published</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Journalnumber\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>issn</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>The ISSN for the publication in which the resource was published</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:volume - \ifnot@empty\xmp@Volume{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>volume</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Additional identifier for the publication where the resource appeared, providing the Volume portion of the common Volume, Number scheme</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Volume\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>volume</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Additional identifier for the publication where the resource appeared, providing the Volume portion of the common Volume, Number scheme</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:number - \ifnot@empty\xmp@Issue{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>number</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Number of the Issue within the Volume</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Issue\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>number</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Number of the Issue within the Volume</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:coverDisplayDate - \ifnot@empty\xmp@CoverDisplayDate{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>coverDisplayDate</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Date on the cover of a magazine issue, as a human-readable text string</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@CoverDisplayDate\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>coverDisplayDate</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Date on the cover of a magazine issue, as a human-readable text string</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:coverDate - \ifnot@empty\xmp@CoverDate{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>coverDate</pdfaProperty:name> - <pdfaProperty:valueType>Date</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Date on the cover of a magazine issue, suitable for storing in a database field with a 'date' data type</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@CoverDate\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>coverDate</pdfaProperty:name>^^J <pdfaProperty:valueType>Date</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Date on the cover of a magazine issue, suitable for storing in a database field with a 'date' data type</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:issueName - \ifnot@empty\xmp@Journaltitle{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>issueName</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Additional identifier, typically used for major issues of a magazine or other resource</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Journaltitle\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>issueName</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Additional identifier, typically used for major issues of a magazine or other resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:pageRange - \ifnot@empty\xmp@Firstpage{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>pageRange</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Page range for the published print version of the resource</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Firstpage\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>pageRange</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Page range for the published print version of the resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:startingPage - \ifnot@empty\xmp@Firstpage{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>startingPage</pdfaProperty:name> - <pdfaProperty:valueType>Integer</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>First page number for the published version of the resource</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Firstpage\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>startingPage</pdfaProperty:name>^^J <pdfaProperty:valueType>Integer</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>First page number for the published version of the resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:endingPage - \ifnot@empty\xmp@Lastpage{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>endingPage</pdfaProperty:name> - <pdfaProperty:valueType>Integer</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>The last page number for the printed resource</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Lastpage\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>endingPage</pdfaProperty:name>^^J <pdfaProperty:valueType>Integer</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>The last page number for the printed resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:doi - \ifnot@empty\xmp@Doi{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>doi</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Digital Object Identifier, DOI, for the article</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Doi\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>doi</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Digital Object Identifier, DOI, for the article</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:url - \ifnot@empty\xmp@Doi{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>url</pdfaProperty:name> - <pdfaProperty:valueType>URL</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>URL for the article or unit of content</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Doi\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>url</pdfaProperty:name>^^J <pdfaProperty:valueType>URL</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>URL for the article or unit of content</pdfaProperty:description>^^J </rdf:li>\fi %% RRM: more tags can be declared % <rdf:li rdf:parseType="Resource"> % <pdfaProperty:name></pdfaProperty:name> @@ -312,18 +247,18 @@ </pdfaExtension:schemas> </rdf:Description> <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/"> - \ifnot@empty\xmp@PublicationType{<prism:aggregationType>\xmp@PublicationType</prism:aggregationType>} - \ifnot@empty\xmp@Journalnumber{<prism:issn>\xmp@Journalnumber</prism:issn>} - \ifnot@empty\xmp@Volume{<prism:volume>\xmp@Volume</prism:volume>} - \ifnot@empty\xmp@Issue{<prism:number>\xmp@Issue</prism:number>} - \ifnot@empty\xmp@CoverDisplayDate{<prism:coverDisplayDate>\xmp@CoverDisplayDate</prism:coverDisplayDate>} - \ifnot@empty\xmp@CoverDate{<prism:coverDate>\xmp@CoverDate</prism:coverDate>} - \ifnot@empty\xmp@Journaltitle{<prism:issueName>\xmp@Journaltitle</prism:issueName>} - \ifnot@empty\xmp@Firstpage{<prism:pageRange>\xmp@Firstpage-\xmp@Lastpage</prism:pageRange>} - \ifnot@empty\xmp@Firstpage{<prism:startingPage>\xmp@Firstpage</prism:startingPage>} - \ifnot@empty\xmp@Lastpage{<prism:endingPage>\xmp@Lastpage</prism:endingPage>} - \ifnot@empty\xmp@Doi{<prism:doi>\xmp@Doi</prism:doi>} - \ifnot@empty\xmp@Doi{<prism:url>http://dx.doi.org/\xmp@Doi</prism:url>} + \ifx\xmp@PublicationType\@empty\else<prism:aggregationType>\xmp@PublicationType</prism:aggregationType>\fi + \ifx\xmp@Journalnumber\@empty\else<prism:issn>\xmp@Journalnumber</prism:issn>\fi + \ifx\xmp@Volume\@empty\else<prism:volume>\xmp@Volume</prism:volume>\fi + \ifx\xmp@Issue\@empty\else<prism:number>\xmp@Issue</prism:number>\fi + \ifx\xmp@CoverDisplayDate\@empty\else<prism:coverDisplayDate>\xmp@CoverDisplayDate</prism:coverDisplayDate>\fi + \ifx\xmp@CoverDate\@empty\else<prism:coverDate>\xmp@CoverDate</prism:coverDate>\fi + \ifx\xmp@Journaltitle\@empty\else<prism:issueName>\xmp@Journaltitle</prism:issueName>\fi + \ifx\xmp@Firstpage\@empty\else<prism:pageRange>\xmp@Firstpage-\xmp@Lastpage</prism:pageRange>\fi + \ifx\xmp@Firstpage\@empty\else<prism:startingPage>\xmp@Firstpage</prism:startingPage>\fi + \ifx\xmp@Lastpage\@empty\else<prism:endingPage>\xmp@Lastpage</prism:endingPage>\fi + \ifx\xmp@Doi\@empty\else<prism:doi>\xmp@Doi</prism:doi>\fi + \ifx\xmp@Doi\@empty\else<prism:url>http://dx.doi.org/\xmp@Doi</prism:url>\fi </rdf:Description> % <rdf:Description rdf:about="" % xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -340,7 +275,7 @@ % </dc:description> % <dc:creator> % <rdf:Bag> -% <rdf:li>\xmp@@Author</rdf:li> +% <rdf:li>\xmp@Author</rdf:li> % </rdf:Bag> % </dc:creator> % <dc:subject> @@ -357,10 +292,10 @@ </rdf:RDF> </x:xmpmeta> % padding with 512 space characters to allow easier editing within a PDF -\padding@line -\padding@line -\padding@line -\padding@line +\paddingline +\paddingline +\paddingline +\paddingline %% %% End of pdfx.xmp %% diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfvt.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfvt.xmp index da86e6fc2f9..6de5b0005d4 100644 --- a/Master/texmf-dist/tex/latex/pdfx/pdfvt.xmp +++ b/Master/texmf-dist/tex/latex/pdfx/pdfvt.xmp @@ -46,9 +46,9 @@ % <rdf:Description rdf:about="" xmlns:pdf="http://www.adobe.com/pdf/1.3/"> <dc:format>application/pdf</dc:format> <dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></dc:rights> - \ifnot@empty\xmp@@Author{<dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>} - \ifnot@empty\xmp@Subject{<dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description>} - \ifnot@empty\xmp@Title{<dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title>} + \ifx\xmp@@Author\@empty\else<dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>\fi + \ifx\xmp@Subject\@empty\else<dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description>\fi + \ifx\xmp@Title\@empty\else<dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title>\fi <xmp:CreateDate>\xmp@convDate</xmp:CreateDate> <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool> <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate> @@ -60,12 +60,8 @@ <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance</pdfxid:GTS_PDFXVersion> <pdfvtid:GTS_PDFVTVersion>PDF/VT-\xmp@vtPart\xmp@vtConformance</pdfvtid:GTS_PDFVTVersion> <pdfvtid:GTS_PDFVTModDate>\xmp@convDate</pdfvtid:GTS_PDFVTModDate> - \ifnot@empty\xmp@AuthoritativeDomain{ <pdfx:AuthoritativeDomain> - <rdf:Bag> - <rdf:li>\xmp@AuthoritativeDomain</rdf:li> - </rdf:Bag> - </pdfx:AuthoritativeDomain>} - \ifnot@empty\xmp@@Keywords{<pdf:Keywords>\xmp@@Keywords</pdf:Keywords>} + \ifx\xmp@AuthoritativeDomain\@empty\else <pdfx:AuthoritativeDomain>^^J <rdf:Bag>^^J <rdf:li>\xmp@AuthoritativeDomain</rdf:li>^^J </rdf:Bag>^^J </pdfx:AuthoritativeDomain>\fi + \ifx\xmp@@Keywords\@empty\else<pdf:Keywords>\xmp@@Keywords</pdf:Keywords>\fi <pdf:Producer>\xmp@Producer</pdf:Producer> <pdf:Trapped>False</pdf:Trapped> % <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance</pdfxid:GTS_PDFXVersion> @@ -168,91 +164,31 @@ <pdfaSchema:prefix>prism</pdfaSchema:prefix> <pdfaSchema:property> <rdf:Seq> -%% RRM: Only need to define the tags that are actually used below. +%% RRM: Only need to define the tags that are actually used below. But \ifx ... \fi must be all on one line. %% declare prism:aggregationType - \ifnot@empty\xmp@PublicationType{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>aggregationType</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>The type of publication. If defined, must be one of book, catalog, feed, journal, magazine, manual, newsletter, pamphlet.</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@PublicationType\@empty\else <rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>aggregationType</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>The type of publication. If defined, must be one of book, catalog, feed, journal, magazine, manual, newsletter, pamphlet.</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:issn - \ifnot@empty\xmp@Journalnumber{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>issn</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>The ISSN for the publication in which the resource was published</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Journalnumber\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>issn</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>The ISSN for the publication in which the resource was published</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:volume - \ifnot@empty\xmp@Volume{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>volume</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Additional identifier for the publication where the resource appeared, providing the Volume portion of the common Volume, Number scheme</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Volume\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>volume</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Additional identifier for the publication where the resource appeared, providing the Volume portion of the common Volume, Number scheme</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:number - \ifnot@empty\xmp@Issue{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>number</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Number of the Issue within the Volume</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Issue\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>number</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Number of the Issue within the Volume</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:coverDisplayDate - \ifnot@empty\xmp@CoverDisplayDate{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>coverDisplayDate</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Date on the cover of a magazine issue, as a human-readable text string</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@CoverDisplayDate\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>coverDisplayDate</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Date on the cover of a magazine issue, as a human-readable text string</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:coverDate - \ifnot@empty\xmp@CoverDate{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>coverDate</pdfaProperty:name> - <pdfaProperty:valueType>Date</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Date on the cover of a magazine issue, suitable for storing in a database field with a 'date' data type</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@CoverDate\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>coverDate</pdfaProperty:name>^^J <pdfaProperty:valueType>Date</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Date on the cover of a magazine issue, suitable for storing in a database field with a 'date' data type</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:issueName - \ifnot@empty\xmp@Journaltitle{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>issueName</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Additional identifier, typically used for major issues of a magazine or other resource</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Journaltitle\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>issueName</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Additional identifier, typically used for major issues of a magazine or other resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:pageRange - \ifnot@empty\xmp@Firstpage{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>pageRange</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Page range for the published print version of the resource</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Firstpage\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>pageRange</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Page range for the published print version of the resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:startingPage - \ifnot@empty\xmp@Firstpage{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>startingPage</pdfaProperty:name> - <pdfaProperty:valueType>Integer</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>First page number for the published version of the resource</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Firstpage\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>startingPage</pdfaProperty:name>^^J <pdfaProperty:valueType>Integer</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>First page number for the published version of the resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:endingPage - \ifnot@empty\xmp@Lastpage{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>endingPage</pdfaProperty:name> - <pdfaProperty:valueType>Integer</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>The last page number for the printed resource</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Lastpage\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>endingPage</pdfaProperty:name>^^J <pdfaProperty:valueType>Integer</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>The last page number for the printed resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:doi - \ifnot@empty\xmp@Doi{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>doi</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Digital Object Identifier, DOI, for the article</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Doi\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>doi</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Digital Object Identifier, DOI, for the article</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:url - \ifnot@empty\xmp@Doi{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>url</pdfaProperty:name> - <pdfaProperty:valueType>URL</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>URL for the article or unit of content</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Doi\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>url</pdfaProperty:name>^^J <pdfaProperty:valueType>URL</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>URL for the article or unit of content</pdfaProperty:description>^^J </rdf:li>\fi %% RRM: more tags can be declared % <rdf:li rdf:parseType="Resource"> % <pdfaProperty:name></pdfaProperty:name> @@ -264,11 +200,7 @@ </rdf:li> </rdf:Bag> </pdfaExtension:schemas> -% \ifnot@empty\xmp@AuthoritativeDomain{<pdfx:AuthoritativeDomain> -% <rdf:Bag> -% <rdf:li>\xmp@AuthoritativeDomain</rdf:li> -% </rdf:Bag> -% </pdfx:AuthoritativeDomain>} +% \ifx\xmp@AuthoritativeDomain\@empty\else <pdfx:AuthoritativeDomain>^^J <rdf:Bag>^^J <rdf:li>\xmp@AuthoritativeDomain</rdf:li>^^J </rdf:Bag>^^J </pdfx:AuthoritativeDomain>\fi </rdf:Description> % <rdf:Description rdf:about="" xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/"> % <pdfx:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance\ifnum\xmp@Part<3:\xmp@ReleaseDate\fi</pdfx:GTS_PDFXVersion> @@ -278,8 +210,7 @@ % \ifnum\xmp@Part>3 <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part</pdfxid:GTS_PDFXVersion>\fi % </rdf:Description> % <rdf:Description rdf:about="" xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/"> -% \ifnum\xmp@Part> 3<pdfaid:part>\xmp@Part</pdfaid:part> -% <pdfaid:conformance>\xmp@Conformance</pdfaid:conformance>\fi +% \ifnum\xmp@Part> 3<pdfaid:part>\xmp@Part</pdfaid:part>^^J <pdfaid:conformance>\xmp@Conformance</pdfaid:conformance>\fi % </rdf:Description> % <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/"> % <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool> @@ -288,39 +219,34 @@ % <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate> % </rdf:Description> <rdf:Description rdf:about="" xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/"> - \ifnot@empty\xmp@Copyright{<xmpRights:Marked>True</xmpRights:Marked> - <xmpRights:UsageTerms> - <rdf:Alt> - <rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li> - </rdf:Alt> - </xmpRights:UsageTerms>} - \ifnot@empty\xmp@CopyrightURL{<xmpRights:WebStatement>\xmp@CopyrightURL</xmpRights:WebStatement>} + \ifx\xmp@Copyright\@empty\else<xmpRights:Marked>True</xmpRights:Marked>^^J <xmpRights:UsageTerms>^^J <rdf:Alt>^^J <rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li>^^J </rdf:Alt>^^J </xmpRights:UsageTerms>\fi + \ifx\xmp@WebStatement\@empty\else<xmpRights:WebStatement>\xmp@WebStatement</xmpRights:WebStatement>\fi } </rdf:Description> %%% extra <dc> fields not already covered above % <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"> %% <dc:format>application/pdf</dc:format> -%% \ifnot@empty\xmp@Subject{<dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description>} -%% \ifnot@empty\xmp@Title{<dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title>} -%% \ifnot@empty\xmp@@Author{<dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>} -% \ifnot@empty\xmp@Publisher{<dc:publisher><rdf:Bag><rdf:li>\xmp@Publisher</rdf:li></rdf:Bag></dc:publisher>} -% \ifnot@empty\xmp@Doi{<dc:identifier>doi:\xmp@Doi</dc:identifier>} -% \ifnot@empty\xmp@Copyright{<dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></dc:rights>} -% \ifnot@empty\xmp@Keywords{<dc:subject><rdf:Bag><rdf:li>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>} +%% \ifx\xmp@Subject\@empty\else<dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description>\fi +%% \ifx\xmp@Title\@empty\else<dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title>\fi +%% \ifx\xmp@@Author\@empty\else<dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>\fi +% \ifx\xmp@Org\@empty\else<dc:publisher><rdf:Bag><rdf:li>\xmp@Org</rdf:li></rdf:Bag></dc:publisher>\fi +% \ifx\xmp@Doi\@empty\else<dc:identifier>doi:\xmp@Doi</dc:identifier>\fi +% \ifx\xmp@Copyright\@empty\else<dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></dc:rights>\fi +% \ifx\xmp@Keywords\@empty\else<dc:subject><rdf:Bag><rdf:li>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>\fi % </rdf:Description> <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/"> - \ifnot@empty\xmp@PublicationType{<prism:aggregationType>\xmp@PublicationType</prism:aggregationType>} - \ifnot@empty\xmp@Journalnumber{<prism:issn>\xmp@Journalnumber</prism:issn>} - \ifnot@empty\xmp@Volume{<prism:volume>\xmp@Volume</prism:volume>} - \ifnot@empty\xmp@Issue{<prism:number>\xmp@Issue</prism:number>} - \ifnot@empty\xmp@CoverDisplayDate{<prism:coverDisplayDate>\xmp@CoverDisplayDate</prism:coverDisplayDate>} - \ifnot@empty\xmp@CoverDate{<prism:coverDate>\xmp@CoverDate</prism:coverDate>} - \ifnot@empty\xmp@Journaltitle{<prism:issueName>\xmp@Journaltitle</prism:issueName>} - \ifnot@empty\xmp@Firstpage{<prism:pageRange>\xmp@Firstpage-\xmp@Lastpage</prism:pageRange>} - \ifnot@empty\xmp@Firstpage{<prism:startingPage>\xmp@Firstpage</prism:startingPage>} - \ifnot@empty\xmp@Lastpage{<prism:endingPage>\xmp@Lastpage</prism:endingPage>} - \ifnot@empty\xmp@Doi{<prism:doi>\xmp@Doi</prism:doi>} - \ifnot@empty\xmp@Doi{<prism:url>http://dx.doi.org/\xmp@Doi</prism:url>} + \ifx\xmp@PublicationType\@empty\else<prism:aggregationType>\xmp@PublicationType</prism:aggregationType>\fi + \ifx\xmp@Journalnumber\@empty\else<prism:issn>\xmp@Journalnumber</prism:issn>\fi + \ifx\xmp@Volume\@empty\else<prism:volume>\xmp@Volume</prism:volume>\fi + \ifx\xmp@Issue\@empty\else<prism:number>\xmp@Issue</prism:number>\fi + \ifx\xmp@CoverDisplayDate\@empty\else<prism:coverDisplayDate>\xmp@CoverDisplayDate</prism:coverDisplayDate>\fi + \ifx\xmp@CoverDate\@empty\else<prism:coverDate>\xmp@CoverDate</prism:coverDate>\fi + \ifx\xmp@Journaltitle\@empty\else<prism:issueName>\xmp@Journaltitle</prism:issueName>\fi + \ifx\xmp@Firstpage\@empty\else<prism:pageRange>\xmp@Firstpage-\xmp@Lastpage</prism:pageRange>\fi + \ifx\xmp@Firstpage\@empty\else<prism:startingPage>\xmp@Firstpage</prism:startingPage>\fi + \ifx\xmp@Lastpage\@empty\else<prism:endingPage>\xmp@Lastpage</prism:endingPage>\fi + \ifx\xmp@Doi\@empty\else<prism:doi>\xmp@Doi</prism:doi>\fi + \ifx\xmp@Doi\@empty\else<prism:url>http://dx.doi.org/\xmp@Doi</prism:url>\fi </rdf:Description> % <rdf:Description rdf:about="" % xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -337,7 +263,7 @@ % </dc:description> % <dc:creator> % <rdf:Bag> -% <rdf:li>\xmp@@Author</rdf:li> +% <rdf:li>\xmp@Author</rdf:li> % </rdf:Bag> % </dc:creator> % <dc:subject> @@ -354,10 +280,10 @@ </rdf:RDF> </x:xmpmeta> % padding with 512 space characters to allow easier editing within a PDF -\padding@line -\padding@line -\padding@line -\padding@line +\paddingline +\paddingline +\paddingline +\paddingline %% %% End of pdfx.xmp %% diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfx.sty b/Master/texmf-dist/tex/latex/pdfx/pdfx.sty index cb3d7d74c0d..49c321f80ad 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) 2015, CV Radhakrishnan <cvr@river-valley.org>, +%% Copyright (c) 2016, 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> @@ -21,15 +21,15 @@ %% and version 1.2 or later is part of all distributions of LaTeX %% version 1999/12/01 or later. %% - \@ifpackageloaded{pdfxmult}{% - \PackageError{pdfx}% +\@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 - }{}% + \expandafter\let\csname opt@pdfx.sty\endcsname\@empty\endinput +}{}% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfx} - [2015/02/17 v1.5.3 PDF/X and PDF/A support (CVR/HTH/RRM/PS)] + [2016/02/04 v1.5.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 @@ -91,10 +91,10 @@ \DeclareOption{vt-1}{\global\pdfx@xtrue\global\pdfx@vttrue \def\xmp@Part{4}\def\xmp@vtPart{1}\def\xmp@Conformance{}\def\xmp@vtConformance{}% \def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 } -\DeclareOption{vt-2}{\global\pdfx@xtrue\global\pdfx@vttrue - \def\xmp@Part{4}\def\xmp@vtPart{2}\def\xmp@Conformance{}\def\xmp@vtConformance{}% +\DeclareOption{vt-2}{\global\pdfx@xtrue\global\pdfx@vttrue\global\no@iccprofiletrue + \def\xmp@Part{5}\def\xmp@vtPart{2}\def\xmp@Conformance{pg}\def\xmp@vtConformance{}% \def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 } -\DeclareOption{vt-2s}{\global\pdfx@xtrue\global\pdfx@vttrue +\DeclareOption{vt-2s}{\global\pdfx@xtrue\global\pdfx@vttrue\global\no@iccprofiletrue \def\xmp@Part{5}\def\xmp@vtPart{2}\def\xmp@Conformance{pg}\def\xmp@vtConformance{s}% \def\xmp@ReleaseDate{2010}\global\pdfminorversion=6 } @@ -107,23 +107,35 @@ %% inhibits writing the XMP byte-order marker \DeclareOption{noBOM}{\pdfx@noBOMtrue} +\DeclareOption{useBOM}{\pdfx@noBOMfalse} \pdfminorversion=4 % assumed for PDF/A ; options may change this for PDF/X \expandafter\ifx\csname pdfresetpageorigin\endcsname\relax\else \pdfresetpageorigin=0 \fi + +\ExecuteOptions{noBOM,a-1b} \ProcessOptions +\RequirePackage{ifluatex} +\ifluatex + \RequirePackage{pdftexcmds}% + \let\pdfx@mdfivesum\pdf@mdfivesum +\else + \let\pdfx@mdfivesum\pdfmdfivesum +\fi + \def\pdfx@encodingfile{l8uenc.def} + {\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}% +\def\pdfx@testbannerstr{% + This is pdfTeX, Version 3.14159265-2.6-1.40.15 (TeX Live 2014/dev) kpathsea version 6.2.0dev}% \ifx\pdfx@bannerstring\pdfx@testbannerstr \typeout{This version of pdfTeX cannot write out upper-range character bytes, 128-255.}% \typeout{Any UTF-8 Unicode characters in the Metadata will not be written correctly.}% \typeout{Please update to a more stable version of pdfTeX.^^J}% - \pdfx@noBOMtrue \fi \ifpdfx@x @@ -141,11 +153,18 @@ /TrimBox[25 20 570 773]} \fi \ifnum\pdfminorversion >3 \relax - \pdfmapline{+dummy-space <dummy-space.pfb} + \expandafter\ifx\csname pdfsuppresswarningdupmap\endcsname\relax + \pdfmapline{+dummy-space <dummy-space.pfb} + \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 +%% the "pdftex" option seems to work fine with LuaTeX \ifpdfx@x \@ifpackageloaded{hyperref}{% \hypersetup{draft,pdftex,pdfpagemode=UseNone,bookmarks=false,pdfversion=1.\the\pdfminorversion]} @@ -162,13 +181,18 @@ \else \@ifpackageloaded{hyperref}{% \hypersetup{pdftex,pdfa}% + \Hy@pdfatrue }{% \RequirePackage[pdftex,pdfa]{hyperref} + \Hy@pdfatrue }% \fi\fi -\hypersetup{pdfencoding=unicode} +\hypersetup{pdfencoding=auto}% unicode -\RequirePackage{inputenc} +\ifluatex\else + \RequirePackage{inputenc} +\fi +\InputIfFileExists{\pdfx@encodingfile}{}{} %%---------------------------------------------------------------------- %% Macros for reading XMP data with special catcodes. Usage: @@ -186,75 +210,44 @@ \xmp@doparse{#1}% } \def\xmp@doparse#1#2{% - \def\@this{#2}#1% - \endgroup% + \def\@this{#2}#1 + \endgroup } %%---------------------------------------------------------------------- %% Local commands. They are only brought into scope during the reading %% of xmpdata. -\def\pdfx@localcommands{% - \def\Title{\xmp@parse{\global\let\xmp@Title\@this}}% - \def\Author{\xmp@parse{\global\let\xmp@Author\@this}}% - \def\Keywords{\xmp@parse{\global\let\xmp@Keywords\@this}}% - \def\Subject{\xmp@parse{\global\let\xmp@Subject\@this}}% - \def\CreatorTool{\xmp@parse{\global\let\xmp@CreatorTool\@this}}% - \def\Producer{\xmp@parse{\global\let\xmp@Producer\@this}}% - \def\Volume{\xmp@parse{\global\let\xmp@Volume\@this}}% - \def\Issue{\xmp@parse{\global\let\xmp@Issue\@this}}% - \def\CoverDisplayDate{\xmp@parse{\global\let\xmp@CoverDisplayDate\@this}}% - \def\CoverDate{\xmp@parse{\global\let\xmp@CoverDate\@this}}% +\def\pdfx@localcommands{ + \def\Title{\xmp@parse{\global\let\xmp@Title\@this}} + \def\Author{\xmp@parse{\global\let\xmp@Author\@this}} + \def\Keywords{\xmp@parse{\global\let\xmp@Keywords\@this}} + \def\Subject{\xmp@parse{\global\let\xmp@Subject\@this}} + \def\CreatorTool{\xmp@parse{\global\let\xmp@CreatorTool\@this}} + \def\Producer{\xmp@parse{\global\let\xmp@Producer\@this}} + \def\Volume{\xmp@parse{\global\let\xmp@Volume\@this}} + \def\Issue{\xmp@parse{\global\let\xmp@Issue\@this}} + \def\CoverDisplayDate{\xmp@parse{\global\let\xmp@CoverDisplayDate\@this}} + \def\CoverDate{\xmp@parse{\global\let\xmp@CoverDate\@this}} \def\Copyright{\xmp@parse{\global\let\xmp@Copyright\@this% - \ifx\xmp@Copyrighted\@empty\gdef\xmp@Copyrighted{True}\fi}}% + \ifx\xmp@Copyrighted\@empty\gdef\xmp@Copyrighted{True}\fi}} \def\CopyrightURL{\xmp@parse{\global\let\xmp@CopyrightURL\@this% - \ifx\xmp@Copyrighted\@empty\gdef\xmp@Copyrighted{True}\fi}}% - \def\Copyrighted{\xmp@parse{\global\let\xmp@Copyrighted\@this}}% - \def\Doi{\xmp@parse{\global\let\xmp@Doi\@this}}% - \def\Lastpage{\xmp@parse{\global\let\xmp@Lastpage\@this}}% - \def\Firstpage{\xmp@parse{\global\let\xmp@Firstpage\@this}}% - \def\PublicationType{\xmp@parse{\global\let\xmp@PublicationType\@this}}% + \ifx\xmp@Copyrighted\@empty\gdef\xmp@Copyrighted{True}\fi}} + \def\Copyrighted{\xmp@parse{\global\let\xmp@Copyrighted\@this}} + \def\Doi{\xmp@parse{\global\let\xmp@Doi\@this}} + \def\Lastpage{\xmp@parse{\global\let\xmp@Lastpage\@this}} + \def\Firstpage{\xmp@parse{\global\let\xmp@Firstpage\@this}} + \def\PublicationType{\xmp@parse{\global\let\xmp@PublicationType\@this}} \def\Journaltitle{\xmp@parse{\global\let\xmp@Journaltitle\@this% - \ifx\xmp@PublicationType\@empty\gdef\xmp@PublicationType{journal}\fi}}% - \def\Journalnumber{\xmp@parse{\global\let\xmp@Journalnumber\@this}}% - \def\Publisher{\xmp@parse{\global\let\xmp@Publisher\@this}}% - \def\AuthoritativeDomain{\xmp@parse{\global\let\xmp@AuthoritativeDomain\@this}}% - % some aliases for backward compatibility: - \let\Creator\CreatorTool% - \let\Org\Publisher% - \let\WebStatement\CopyrightURL% - % user-level commands for color profiles: - \let\setRGBcolorprofile\pdfx@setRGBcolorprofile% - \let\setCMYKcolorprofile\pdfx@setCMYKcolorprofile% - \let\setGRAYcolorprofile\pdfx@setGRAYcolorprofile% + \ifx\xmp@PublicationType\@empty\gdef\xmp@PublicationType{journal}\fi}} + \def\Journalnumber{\xmp@parse{\global\let\xmp@Journalnumber\@this}} + \def\Publisher{\xmp@parse{\global\let\xmp@Publisher\@this}} + \def\AuthoritativeDomain{\xmp@parse{\global\let\xmp@AuthoritativeDomain\@this}} % currently unused; for backward compatibility + \let\Creator\CreatorTool % for backward compatibility + \let\Org\Publisher % for backward compatibility + \let\WebStatement\CopyrightURL % for backward compatibility } %%---------------------------------------------------------------------- -%% Defaults - -\def\xmp@Producer{pdfTeX} -\edef\xmp@CreatorTool{\@pdfcreator} - -\global\let\xmp@Title\@empty -\global\let\xmp@Author\@empty -\global\let\xmp@Keywords\@empty -\global\let\xmp@Subject\@empty -\global\let\xmp@Volume\@empty -\global\let\xmp@Issue\@empty -\global\let\xmp@CoverDisplayDate\@empty -\global\let\xmp@CoverDate\@empty -\global\let\xmp@Copyright\@empty -\global\let\xmp@CopyrightURL\@empty -\global\let\xmp@Copyrighted\@empty -\global\let\xmp@Doi\@empty -\global\let\xmp@Lastpage\@empty -\global\let\xmp@Firstpage\@empty -\global\let\xmp@PublicationType\@empty -\global\let\xmp@Journaltitle\@empty -\global\let\xmp@Journalnumber\@empty -\global\let\xmp@Publisher\@empty -\global\let\xmp@AuthoritativeDomain\@empty - -%%---------------------------------------------------------------------- %% The following characters and markup can be used within the XMP data %% defined by \Author, \Title, and so on. %% @@ -301,45 +294,85 @@ {\obeyspaces\gdef\pdfx@sep{</rdf:li>^^J <rdf:li>}} -\def\pdfx@xmpmarkup{% - \pdfx@actives% - \edef\@amp{\expandafter\@gobble\string\&}% - \edef\@hash{\expandafter\@gobble\string\#}% - \edef\ {\expandafter\@gobble\string\ }% - \edef\%{\expandafter\@gobble\string\%}% - \edef\{{\expandafter\@gobble\string\{}% - \edef\}{\expandafter\@gobble\string\}}% - \edef\backslash{\expandafter\@gobble\string\\}% - \def\@unicode##1{\@amp\@hash x##1;}% - \def\pdfx@amp{\@unicode{0026}}% - \def\pdfx@lt{\@unicode{003c}}% - \def\pdfx@gt{\@unicode{003e}}% - \def\copyright{\@unicode{00A9}}% +\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% + \let\sep\pdfx@sep + \the\pdfxsafeforxmp@toks } +%% 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#1{% user command + \expandafter\global\expandafter\pdfxsafeforxmp@toks + \expandafter{\the\pdfxsafeforxmp@toks#1}} + %%---------------------------------------------------------------------- %% 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\>}% +\def\pdfx@pdfmarkup{ + \pdfx@actives + \edef\%{\expandafter\@gobble\string\%} + \edef\{{\expandafter\@gobble\string\{} + \edef\}{\expandafter\@gobble\string\}} + \edef\pdfx@backslash{\expandafter\@gobble\string\\} + \def\backslash{\pdfx@backslash000\pdfx@backslash134} + \edef\pdfx@amp{\expandafter\@gobble\string\&} + \edef\pdfx@lt{\expandafter\@gobble\string\<} + \edef\pdfx@gt{\expandafter\@gobble\string\>} \let\TextCopyright\copyright % for backward compatibility - \def\sep{, }% - % Note: '\ ', \&, \copyright are already predefined by hyperref. + \def\sep{, } +%% Note: '\ ', \&, \copyright are already predefined by hyperref. + \the\pdfxsafeforxmp@toks } %%---------------------------------------------------------------------- -\def\pdfx@findUUID#1{\edef\pdfx@tmpstring{\pdfmdfivesum{#1}} +%% Defaults + +\ifluatex + \def\xmp@Producer{LuaTeX} +\else + \def\xmp@Producer{pdfTeX} +\fi +\edef\xmp@CreatorTool{\@pdfcreator} + +\global\let\xmp@Title\@empty +\global\let\xmp@Author\@empty +\global\let\xmp@Keywords\@empty +\global\let\xmp@Subject\@empty +\global\let\xmp@Volume\@empty +\global\let\xmp@Issue\@empty +\global\let\xmp@CoverDisplayDate\@empty +\global\let\xmp@CoverDate\@empty +\global\let\xmp@Copyright\@empty +\global\let\xmp@CopyrightURL\@empty +\gdef\xmp@WebStatement{\xmp@CopyrightURL} +\global\let\xmp@Doi\@empty +\global\let\xmp@Lastpage\@empty +\global\let\xmp@Firstpage\@empty +\global\let\xmp@PublicationType\@empty +\global\let\xmp@Journaltitle\@empty +\global\let\xmp@Journalnumber\@empty +\global\let\xmp@Publisher\@empty +\gdef\xmp@Org{\xmp@Publisher} +\global\let\xmp@AuthoritativeDomain\@empty + +%%---------------------------------------------------------------------- +\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} @@ -366,74 +399,110 @@ %% ----- Color Profiles ------- %% Define how to specify the profile, so the default %% can be over-ridden in the .xmpdata file. - -%% The user-level macros are only brought into scope during the reading -%% of xmpdata. %% -%% Usage: -%% \setRGBcolorprofile{<filename>}{<identifier>}{<info string>}{<registry URL>} -%% \setCMYKcolorprofile{<filename>}{<output intent>}{<identifier>}{<registry URL>} -%% \setGRAYcolorprofile{<filename>}{<output intent>}{<identifier>}{<registry URL>} -%% -%% Within the arguments of each macro, the characters '<', '>', '&', -%% '^', '_', '#', '$', and '~' can be used as themselves, but -%% '%' must be escaped as '\%'. -%% -%% Note: -%% * RGB profile is used with PDF/A and PDF/E files. -%% * CMYK profile is used with PDF/X and PDF/VT files. -%% * GRAY profile is currently unused. -\def\pdfx@profilecatcodes{% - \catcode`\<=12\catcode`\>=12\catcode`\&=12\catcode`\^=12 - \catcode`\_=12\catcode`\#=12\catcode`\$=12\catcode`\~=12 - \edef\%{\expandafter\@gobble\string\%}% +%% --- user-command --- RGB profile needed with PDF/A-?? files +%% \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-?? files +%% \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 files +%% \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 needed with PDF/X-4p and PDF/X-5pg files +%% \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\)}% + \pdfx@externalprofile} +%% +%% +\def\pdfx@setRGBcolorprofiledir#1{% + \gdef\pdfx@RGBcolorprofiledir{#1}% } -\def\pdfx@setRGBcolorprofile{% - \begingroup - \pdfx@profilecatcodes - \pdfx@dosetRGBcolorprofile} -\def\pdfx@dosetRGBcolorprofile#1#2#3#4{% - \xdef\pdfx@rgb@profile{#1}% valid file name - \xdef\pdfx@rgb@identifier{#2}% - \xdef\pdfx@rgb@info{#3}% - \pdfstringdef\pdfx@rgb@registry{#4}% valid URL - \endgroup}% closes-off \pdfx@setRGBcolorprofile -%% -\def\pdfx@setCMYKcolorprofile{% - \begingroup - \pdfx@profilecatcodes - \pdfx@dosetCMYKcolorprofile} -\def\pdfx@dosetCMYKcolorprofile#1#2#3#4{% - \xdef\pdfx@cmyk@profile{#1}% valid file name - \pdfstringdef\pdfx@cmyk@intent{#2}% color intent - \pdfstringdef\pdfx@cmyk@identifier{#3}% text string identifier - \pdfstringdef\pdfx@cmyk@registry{#4}% valid URL - \endgroup}% closes-off \pdfx@setCMYKcolorprofile -%% -\def\pdfx@setGRAYcolorprofile{% - \begingroup - \pdfx@profilecatcodes - \pdfx@dosetGRAYcolorprofile} -\def\pdfx@dosetGRAYcolorprofile#1#2#3#4{% - \xdef\pdfx@gray@profile{#1}% valid file name - \xdef\pdfx@gray@intent{#2}% - \xdef\pdfx@gray@identifier{#3}% +\def\pdfx@setCMYKcolorprofiledir#1{% + \gdef\pdfx@CMYKcolorprofiledir{#1}% +} +\pdfx@setRGBcolorprofiledir{} +\pdfx@setCMYKcolorprofiledir{} + +%% This does indeed work! Use it in .xmpdata files +\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 +\let\pdfxSetColorProfileDir\pdfxSetCMYKcolorProfileDir % for back-compatibility +%% +\def\pdfx@setrgbprofile#1#2#3#4{% + \xdef\pdfx@rgb@profile{\pdfx@RGBcolorprofiledir#1}% valid file name + \gdef\pdfx@rgb@identifier{#2}% + \gdef\pdfx@rgb@info{#3}% + \pdfstringdef\pdfx@rgb@registry{#4}% valid URL + \endgroup}% closes-off \setRGBcolorprofile +%% +\def\pdfx@setcmykprofile#1#2#3#4{% + \xdef\pdfx@cmyk@profile{\pdfx@CMYKcolorprofiledir#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}% closes-off \setCMYKcolorprofile +%% +\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 \pdfx@setGRAYcolorprofile -%%---------------------------------------------------------------------- + \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 +%% %% default color profiles -\pdfx@setRGBcolorprofile{sRGB_IEC61966-2-1_black_scaled.icc} - {sRGB_IEC61966-2-1_black_scaled} - {sRGB IEC61966 v2.1 with black scaling} - {http://www.color.org} -\pdfx@setCMYKcolorprofile{coated_FOGRA39L_argl.icc} - {Coated FOGRA39} - {FOGRA39 (ISO Coated v2 300\% (ECI))} - {http://www.argyllcms.com/} -\pdfx@setGRAYcolorprofile{Gray_linear.icc} - {} - {Custom} - {http://www.freedesktop.org/wiki/OpenIcc} +{\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 : %% @@ -452,15 +521,41 @@ %% %% 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. +%% 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. +%% +%%---------------------------------------------------------------------- +{\catcode`\| 14 \catcode`\% 12 \catcode`\_ 12 + \edef\@bchar{\expandafter\@gobble\string\\}| + \edef\({\string\(}\edef\){\string\)}| + \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}|{FOGRA39L.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}| + \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 : @@ -489,46 +584,97 @@ %% distribution. %%---------------------------------------------------------------------- +\newif\ifexternalICCprofiles + \begingroup - \inputencoding{8bit}% +%% 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{}% + \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 + \inputencoding{8bit}% + \fi \makeatletter \pdfx@localcommands +%% \InputIfFileExists{\jobname.xmpdata}% - {\typeout{**pdfx: Metadata file \jobname.xmpdata read successfully.}}% - {\typeout{**pdfx: No file \jobname.xmpdata . Metadata will be incomplete!}} + {\typeout{** pdfx: Metadata file \jobname.xmpdata read successfully.}}% + {\typeout{** pdfx: No file \jobname.xmpdata . Metadata will be incomplete!}} \endgroup + %% ---------------------------------------------------------------------- +\newif\ifpdfx@cmyk \begingroup \ifpdfx@x % PDF/X needs a CMYK color profile for printing - \def\0{\string\0} + \global\pdfx@cmyktrue + \edef\@pctchar{\expandafter\@gobble\string\%} + \edef\@bchar{\expandafter\@gobble\string\\} + \edef\0{\string\0} + \edef\({\string\(} + \edef\){\string\)} \catcode`\_ 12 \ifno@iccprofile % PDF/X-4p and PDF/X-5pg - \immediate\pdfobj {<</FS /URL /F (http://www.color.org/registry/profiles/Coated_Fogra39L_VIGC_300.icc)>>} + \immediate\pdfobj {<</FS/URL/F(\pdfx@colorURL)>>} \edef\OBJ@URLs{\the\pdflastobj}% - \xdef\pdfx@cmyk@intent{Coated_Fogra39L_VIGC_300}% - \xdef\pdfx@cmyk@identifier{Coated_Fogra39L_VIGC_300.icc}% +%% \xdef\pdfx@cmyk@intent{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.0}% +%% \xdef\pdfx@cmyk@info{Coated FOGRA39 \(ISO 12647-2:2004\)}% +%% \xdef\pdfx@cmyk@name{Coated FOGRA39 \(ISO 12647-2:2004\)}% +%% \xdef\pdfx@cmyk@identifier{FOGRA39}% \immediate\pdfobj {<<% - /CheckSum <5449c505618a9b6c38634b4708ae9e37>^^J% d5f0714cd9d6092b6ac93b625f5d8a0c>% - /ICCVersion (\004\002\000\000)% 4.2.0.0 - /ProfileCS (CMYK)^^J% - /ProfileName (\pdfx@cmyk@identifier)^^J% + /CheckSum <\pdfx@profile@checksum>^^J% + /ICCVersion <\pdfx@iccversion>% + /ProfileCS (\pdfx@profileCS)^^J% + /ProfileName (\pdfx@extprofile)^^J% /URLs [\OBJ@URLs\space 0 R ] >>} % \edef\OBJ@ICC{\the\pdflastobj}% +%% \IfFileExists{\pdfx@rgb@profile}{% +%% \immediate\pdfobj stream attr{/N 3^^J /Alternate /DeviceRGB} file{\pdfx@rgb@profile}% +%% \edef\OBJ@RGB{\the\pdflastobj}% +%% }{% +%% \errmessage{No color profile found to use for RGB screen colors.}% +%% }% \pdfcatalog{% /OutputIntents [ << /Type/OutputIntent /S/GTS_PDFX /OutputCondition (\pdfx@cmyk@intent)% /OutputConditionIdentifier (\pdfx@cmyk@identifier)% + /Info(\pdfx@cmyk@intent)% /RegistryName(\pdfx@cmyk@registry) - % extra dictionary required for PDF/X-4p and PDF/X-5pg +%% extra dictionary required for PDF/X-4p and PDF/X-5pg /DestOutputProfileRef \OBJ@ICC\space 0 R >> ]}% +%% \else % PDF/X-1 , PDF/X-1a , PDF/X-3 , PDF/X-4 , PDF/X-5g - \IfFileExists{\pdfx@cmyk@profile}{% +%% + \IfFileExists{"\pdfx@cmyk@profile"}{% % embedded CMYK color profile - \immediate\pdfobj stream attr{/N 4} file{\pdfx@cmyk@profile}% + \immediate\pdfobj stream attr{/N 4} file{"\pdfx@cmyk@profile"}% \edef\OBJ@CMYK{\the\pdflastobj}% \pdfcatalog{% /OutputIntents [ << @@ -536,22 +682,47 @@ /S/GTS_PDFX /OutputCondition (\pdfx@cmyk@intent)% /OutputConditionIdentifier (\pdfx@cmyk@identifier)% + /Info(\pdfx@cmyk@intent)% /RegistryName(\pdfx@cmyk@registry) /DestOutputProfile \OBJ@CMYK\space 0 R >> ]}% }{% - \errmessage{No color profile found to use for CMYK printing colors.}% + \errmessage{No color profile \pdfx@cmyk@profile\ found to use for CMYK printing colors.}% }% \fi % end of \ifno@iccprofile \else -%% PDF/A needs an RGB color profile for on-screen rendering - \IfFileExists{\pdfx@rgb@profile}{% - \immediate\pdfobj stream attr{/N 3^^J/Alternate/DeviceRGB} file{\pdfx@rgb@profile}% - \edef\OBJ@RGB{\the\pdflastobj}% +%% 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"}{% + % embedded CMYK color profile + \immediate\pdfobj stream attr{/N 4} file{"\pdfx@cmyk@profile"}% + \edef\OBJ@CMYK{\the\pdflastobj}% + \pdfcatalog{% + /ViewerPreferences <</DisplayDocTitle true >> + /OutputIntents [ << + /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\space 0 R + /Info(\pdfx@cmyk@intent)% + /RegistryName(\pdfx@cmyk@registry) + >> ]}% }{% - \errmessage{No color profile found to use for RGB screen colors.}% + \errmessage{No color profile \pdfx@cmyk@profile\ found to use for CMYK screen colors.}% }% - \pdfcatalog{% + \else +%% PDF/A and PDF/E usually need an RGB color profile for on-screen rendering + \global\pdfx@cmykfalse + \IfFileExists{"\pdfx@rgb@profile"}{% + \immediate\pdfobj stream attr{/N 3^^J/Alternate/DeviceRGB} file{"\pdfx@rgb@profile"}% + \edef\OBJ@RGB{\the\pdflastobj}% + \pdfcatalog{% /ViewerPreferences <</DisplayDocTitle true >> /OutputIntents [ << /Type /OutputIntent @@ -560,12 +731,16 @@ \else /S/GTS_PDFA1 \fi - /OutputConditionIdentifier (\pdfx@rgb@identifier)% + /OutputConditionIdentifier (\pdfx@rgb@identifier)% /DestOutputProfile \OBJ@RGB\space 0 R /Info(\pdfx@rgb@info) /RegistryName(\pdfx@rgb@registry) >> ]}% + }{% + \errmessage{No color profile found to use for RGB screen colors.}% + }% + \fi % end of \ifx \fi % end of \ifpdfx@x \endgroup @@ -581,9 +756,16 @@ \begingroup \pdfx@xmpmarkup \def\sep{, }% - \inputencoding{8bit}\makeatletter + \ifluatex\else + \inputencoding{8bit}% + \fi + \makeatletter + \IfFileExists{\pdfx@encodingfile}{% + \def\cf@encoding{U}\fontencoding{U}% + }{}% \xdef\xmp@@Keywords{\xmp@Keywords} \xdef\xmp@@Author{\xmp@Author} + \xdef\xmp@@Copyright{\xmp@Copyright} \endgroup %% ---------------------------------------------------------------------- @@ -623,16 +805,18 @@ %% ---------------------------------------------------------------------- %% \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 +%% 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 + \global\let#1\empty \else \begingroup - \inputencoding{utf8}% - \hypersetup{pdfencoding=unicode}% + \ifluatex\else + \inputencoding{utf8}% + \fi + \hypersetup{pdfencoding=auto}% \pdfstringdef#1{#2}% \endgroup \fi @@ -655,7 +839,8 @@ \pdfgentounicode=1 \ifpdfx@x - {\pdfinfo{% order of these dictionary keys should not matter + {\def\sep{,}% + \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)% @@ -677,10 +862,11 @@ \ifx\pdfx@Title\@empty\else /Title(\pdfx@Title)\fi /Trapped/False% }% end of PDF/X info - }% + }% end of scope for \sep \else \ifpdfx@e - {\pdfinfo{% order of these dictionary keys should not matter + {\def\sep{,}% + \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)% @@ -692,16 +878,17 @@ \ifx\pdfx@Title\@empty\else /Title(\pdfx@Title)\fi /Trapped/False% }% end of PDF/E info - }% + }% end of scope for \sep \else \def\pdfx@confA{a}% \def\pdfx@confB{b}% \def\pdfx@confU{u}% - \edef\xmp@conformance{\csname pdfx@conf\xmp@Conformance\endcsname}% + \expandafter\def\expandafter\xmp@conf\expandafter{\csname pdfx@conf\xmp@Conformance\endcsname}% \AtBeginDocument{% \def\PDF@FinishDoc{% \Hy@UseMaketitleInfos - \pdfinfo{% + {\def\sep{, }% + \pdfinfo{% \ifx\pdfx@Title\@empty\else /Title(\pdfx@Title)\fi \ifx\pdfx@Author\@empty\else /Author(\pdfx@Author)\fi \ifx\pdfx@Subject\@empty\else /Subject(\pdfx@Subject)\fi @@ -719,8 +906,9 @@ \fi /Producer(\pdfx@Producer)% /Trapped/False - /GTS_PDFA1Version (PDF/A-\xmp@Part\xmp@conformance:\xmp@ReleaseDate)% + /GTS_PDFA1Version (PDF/A-\xmp@Part\xmp@conf:\xmp@ReleaseDate)% }% end of PDF/A info + }% end of scope for \sep }% end of \PDF@FinishDoc }% end of \AtBeginDocument \fi\fi @@ -740,12 +928,12 @@ \else \def\xmp@template{pdfa}% \fi\fi - % patch commands from xmpincl.sty ... +%% patch commands from xmpincl.sty … \def\pdfx@xmpinclStart{% supply byte-order marker - <?xpacket begin='^^ef^^bb^^bf'? id='W5M0MpCehiHzreSzNTczkc9d' ?> % + <?xpacket begin='^^ef^^bb^^be' id='W5M0MpCehiHzreSzNTczkc9d' ?> % }% \def\pdfx@xmpinclStartAlt{% no byte-order marker - <?xpacket begin=''? id='W5M0MpCehiHzreSzNTczkc9d' ?> % + <?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d' ?> % }% \def\pdfx@xmpinclEnd{% allow XMP packet to be writable <?xpacket end='w'?> % @@ -756,19 +944,63 @@ \let\mcs@xmpinclStart\pdfx@xmpinclStartAlt \fi \let\mcs@xmpinclEnd\pdfx@xmpinclEnd -%% ... preventing their redefinition +%% … 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 + \inputencoding{8bit}% + \fi + \makeatletter +%% \let\&=\xmpAmp \pdfx@xmpmarkup - \catcode `\_ 12 + \def\cf@encoding{U}\fontencoding{U}% + \providecommand{\ifnot@empty}[2]{\ifx#1\@empty\relax\else#2\fi}% +%% \catcode `\_ 12 \obeyspaces% beware of 128 space characters in the next line -- for padding end of XMP packet - \def\padding@line{ }% - \def\ifnot@empty#1#2{\ifx#1\@empty\else#2\fi} - \inputencoding{8bit}\makeatletter + \gdef\paddingline{ }% \typeout{Using XMP template file: \xmp@template.xmp}% \includexmp{\xmp@template} \endgroup +%% +%% controls the color model and conversions with xcolor package +%% +\ifpdfx@cmyk + \PassOptionsToPackage{xcolor}{cmyk,hyperref} + \def\pdfx@handlexcolor{\selectcolormodel{cmyk}\convertcolorsUtrue\convertcolorsDtrue} +%%\hypersetup{allbordercolors=black,allcolors=black}% else link borders use RGB + \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{\selectcolormodel{rgb}\convertcolorsUtrue\convertcolorsDtrue} +\fi +\@ifpackageloaded{xcolor}{\pdfx@handlexcolor}{% + \AtBeginDocument{\@ifpackageloaded{xcolor}{\pdfx@handlexcolor}{}} +} + %% disable hyperref options, to prevent changes that will cause an incompatibility \Hy@DisableOption{pdfauthor}% \Hy@DisableOption{pdftitle}% @@ -778,6 +1010,8 @@ \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/tex/latex/pdfx/pdfx.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfx.xmp index 4342740c57e..de12224c2d3 100644 --- a/Master/texmf-dist/tex/latex/pdfx/pdfx.xmp +++ b/Master/texmf-dist/tex/latex/pdfx/pdfx.xmp @@ -48,33 +48,29 @@ <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool> <xmp:CreateDate>\xmp@convDate</xmp:CreateDate> <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate> - \ifnot@empty\xmp@@Keywords{<pdf:Keywords>\xmp@@Keywords</pdf:Keywords>} + \ifx\xmp@@Keywords\@empty\else<pdf:Keywords>\xmp@@Keywords</pdf:Keywords>\fi <pdf:Producer>\xmp@Producer</pdf:Producer> <pdf:Trapped>False</pdf:Trapped> \ifnum\xmp@Part<4 <pdf:Version>PDF/X-\xmp@Part</pdf:Version>\fi \ifnum\xmp@Part>3 <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance</pdfxid:GTS_PDFXVersion>\fi - <pdfx:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance\ifnum\xmp@Part<4:\xmp@ReleaseDate\fi</pdfx:GTS_PDFXVersion> + <pdfx:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance\ifnum\xmp@Part<4:\xmp@ReleaseDate</pdfx:GTS_PDFXVersion>\else</pdfx:GTS_PDFXVersion>\fi \ifnum\xmp@Part<3 <pdfx:GTS_PDFXConformance>PDF/X-\xmp@Part\xmp@Conformance:\xmp@ReleaseDate</pdfx:GTS_PDFXConformance>\fi -% \ifnot@empty\xmp@AuthoritativeDomain{<pdfx:AuthoritativeDomain><rdf:Bag><rdf:li>\xmp@AuthoritativeDomain</rdf:li></rdf:Bag></pdfx:AuthoritativeDomain>} - \ifnot@empty\xmp@AuthoritativeDomain{<pdfx:AuthoritativeDomain>\xmp@AuthoritativeDomain</pdfx:AuthoritativeDomain>} +% \ifx\xmp@AuthoritativeDomain\@empty\else<pdfx:AuthoritativeDomain><rdf:Bag><rdf:li>\xmp@AuthoritativeDomain</rdf:li></rdf:Bag></pdfx:AuthoritativeDomain>\fi +% \ifx\xmp@AuthoritativeDomain\@empty\else<pdfx:AuthoritativeDomain>\xmp@AuthoritativeDomain</pdfx:AuthoritativeDomain>\fi </rdf:Description> <rdf:Description rdf:about="" xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/"> - \ifnot@empty\xmp@Copyright{<xmpRights:Marked>True</xmpRights:Marked> - <xmpRights:UsageTerms> - <rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li> - </rdf:Alt> - </xmpRights:UsageTerms>} - \ifnot@empty\xmp@CopyrightURL{<xmpRights:WebStatement>\xmp@CopyrightURL</xmpRights:WebStatement>} + \ifx\xmp@Copyright\@empty\else<xmpRights:Marked>True</xmpRights:Marked>^^J <xmpRights:UsageTerms>^^J <rdf:Alt><rdf:li xml:lang="x-default">\xmp@@Copyright</rdf:li>^^J </rdf:Alt>^^J </xmpRights:UsageTerms>\fi + \ifx\xmp@WebStatement\@empty\else<xmpRights:WebStatement>\xmp@WebStatement</xmpRights:WebStatement>\fi </rdf:Description> <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"> <dc:format>application/pdf</dc:format> - \ifnot@empty\xmp@Title{<dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title>} - \ifnot@empty\xmp@@Author{<dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>} - \ifnot@empty\xmp@Publisher{<dc:publisher><rdf:Bag><rdf:li>\xmp@Publisher</rdf:li></rdf:Bag></dc:publisher>} - \ifnot@empty\xmp@Doi{<dc:identifier>doi:\xmp@Doi</dc:identifier>} - \ifnot@empty\xmp@Copyright{<dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></dc:rights>} - \ifnot@empty\xmp@Subject{<dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description>} - \ifnot@empty\xmp@Keywords{<dc:subject><rdf:Bag><rdf:li>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>} + \ifx\xmp@Title\@empty\else<dc:title><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Title</rdf:li></rdf:Alt></dc:title>\fi + \ifx\xmp@@Author\@empty\else<dc:creator><rdf:Seq><rdf:li>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>\fi + \ifx\xmp@Org\@empty\else<dc:publisher><rdf:Bag><rdf:li>\xmp@Org</rdf:li></rdf:Bag></dc:publisher>\fi + \ifx\xmp@Doi\@empty\else<dc:identifier>doi:\xmp@Doi</dc:identifier>\fi + \ifx\xmp@Copyright\@empty\else<dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></dc:rights>\fi + \ifx\xmp@Subject\@empty\else<dc:description><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Subject</rdf:li></rdf:Alt></dc:description>\fi + \ifx\xmp@Keywords\@empty\else<dc:subject><rdf:Bag><rdf:li>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>\fi </rdf:Description> <rdf:Description rdf:about="" xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" @@ -188,91 +184,31 @@ <pdfaSchema:prefix>prism</pdfaSchema:prefix> <pdfaSchema:property> <rdf:Seq> -%% RRM: Only need to define the tags that are actually used below. +%% RRM: Only need to define the tags that are actually used below. But \ifx ... \fi must be all on one line. %% declare prism:aggregationType - \ifnot@empty\xmp@PublicationType{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>aggregationType</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>The type of publication. If defined, must be one of book, catalog, feed, journal, magazine, manual, newsletter, pamphlet.</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@PublicationType\@empty\else <rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>aggregationType</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>The type of publication. If defined, must be one of book, catalog, feed, journal, magazine, manual, newsletter, pamphlet.</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:issn - \ifnot@empty\xmp@Journalnumber{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>issn</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>The ISSN for the publication in which the resource was published</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Journalnumber\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>issn</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>The ISSN for the publication in which the resource was published</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:volume - \ifnot@empty\xmp@Volume{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>volume</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Additional identifier for the publication where the resource appeared, providing the Volume portion of the common Volume, Number scheme</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Volume\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>volume</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Additional identifier for the publication where the resource appeared, providing the Volume portion of the common Volume, Number scheme</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:number - \ifnot@empty\xmp@Issue{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>number</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Number of the Issue within the Volume</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Issue\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>number</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Number of the Issue within the Volume</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:coverDisplayDate - \ifnot@empty\xmp@CoverDisplayDate{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>coverDisplayDate</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Date on the cover of a magazine issue, as a human-readable text string</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@CoverDisplayDate\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>coverDisplayDate</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Date on the cover of a magazine issue, as a human-readable text string</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:coverDate - \ifnot@empty\xmp@CoverDate{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>coverDate</pdfaProperty:name> - <pdfaProperty:valueType>Date</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Date on the cover of a magazine issue, suitable for storing in a database field with a 'date' data type</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@CoverDate\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>coverDate</pdfaProperty:name>^^J <pdfaProperty:valueType>Date</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Date on the cover of a magazine issue, suitable for storing in a database field with a 'date' data type</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:issueName - \ifnot@empty\xmp@Journaltitle{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>issueName</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Additional identifier, typically used for major issues of a magazine or other resource</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Journaltitle\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>issueName</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Additional identifier, typically used for major issues of a magazine or other resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:pageRange - \ifnot@empty\xmp@Firstpage{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>pageRange</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Page range for the published print version of the resource</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Firstpage\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>pageRange</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Page range for the published print version of the resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:startingPage - \ifnot@empty\xmp@Firstpage{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>startingPage</pdfaProperty:name> - <pdfaProperty:valueType>Integer</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>First page number for the published version of the resource</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Firstpage\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>startingPage</pdfaProperty:name>^^J <pdfaProperty:valueType>Integer</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>First page number for the published version of the resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:endingPage - \ifnot@empty\xmp@Lastpage{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>endingPage</pdfaProperty:name> - <pdfaProperty:valueType>Integer</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>The last page number for the printed resource</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Lastpage\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>endingPage</pdfaProperty:name>^^J <pdfaProperty:valueType>Integer</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>The last page number for the printed resource</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:doi - \ifnot@empty\xmp@Doi{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>doi</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>Digital Object Identifier, DOI, for the article</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Doi\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>doi</pdfaProperty:name>^^J <pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>Digital Object Identifier, DOI, for the article</pdfaProperty:description>^^J </rdf:li>\fi %% declare prism:url - \ifnot@empty\xmp@Doi{<rdf:li rdf:parseType="Resource"> - <pdfaProperty:name>url</pdfaProperty:name> - <pdfaProperty:valueType>URL</pdfaProperty:valueType> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>URL for the article or unit of content</pdfaProperty:description> - </rdf:li>} + \ifx\xmp@Doi\@empty\else<rdf:li rdf:parseType="Resource">^^J <pdfaProperty:name>url</pdfaProperty:name>^^J <pdfaProperty:valueType>URL</pdfaProperty:valueType>^^J <pdfaProperty:category>external</pdfaProperty:category>^^J <pdfaProperty:description>URL for the article or unit of content</pdfaProperty:description>^^J </rdf:li>\fi %% RRM: more tags can be declared % <rdf:li rdf:parseType="Resource"> % <pdfaProperty:name></pdfaProperty:name> @@ -286,18 +222,18 @@ </pdfaExtension:schemas> </rdf:Description> <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/"> - \ifnot@empty\xmp@PublicationType{<prism:aggregationType>\xmp@PublicationType</prism:aggregationType>} - \ifnot@empty\xmp@Journalnumber{<prism:issn>\xmp@Journalnumber</prism:issn>} - \ifnot@empty\xmp@Volume{<prism:volume>\xmp@Volume</prism:volume>} - \ifnot@empty\xmp@Issue{<prism:number>\xmp@Issue</prism:number>} - \ifnot@empty\xmp@CoverDisplayDate{<prism:coverDisplayDate>\xmp@CoverDisplayDate</prism:coverDisplayDate>} - \ifnot@empty\xmp@CoverDate{<prism:coverDate>\xmp@CoverDate</prism:coverDate>} - \ifnot@empty\xmp@Journaltitle{<prism:issueName>\xmp@Journaltitle</prism:issueName>} - \ifnot@empty\xmp@Firstpage{<prism:pageRange>\xmp@Firstpage-\xmp@Lastpage</prism:pageRange>} - \ifnot@empty\xmp@Firstpage{<prism:startingPage>\xmp@Firstpage</prism:startingPage>} - \ifnot@empty\xmp@Lastpage{<prism:endingPage>\xmp@Lastpage</prism:endingPage>} - \ifnot@empty\xmp@Doi{<prism:doi>\xmp@Doi</prism:doi>} - \ifnot@empty\xmp@Doi{<prism:url>http://dx.doi.org/\xmp@Doi</prism:url>} + \ifx\xmp@PublicationType\@empty\else<prism:aggregationType>\xmp@PublicationType</prism:aggregationType>\fi + \ifx\xmp@Journalnumber\@empty\else<prism:issn>\xmp@Journalnumber</prism:issn>\fi + \ifx\xmp@Volume\@empty\else<prism:volume>\xmp@Volume</prism:volume>\fi + \ifx\xmp@Issue\@empty\else<prism:number>\xmp@Issue</prism:number>\fi + \ifx\xmp@CoverDisplayDate\@empty\else<prism:coverDisplayDate>\xmp@CoverDisplayDate</prism:coverDisplayDate>\fi + \ifx\xmp@CoverDate\@empty\else<prism:coverDate>\xmp@CoverDate</prism:coverDate>\fi + \ifx\xmp@Journaltitle\@empty\else<prism:issueName>\xmp@Journaltitle</prism:issueName>\fi + \ifx\xmp@Firstpage\@empty\else<prism:pageRange>\xmp@Firstpage-\xmp@Lastpage</prism:pageRange>\fi + \ifx\xmp@Firstpage\@empty\else<prism:startingPage>\xmp@Firstpage</prism:startingPage>\fi + \ifx\xmp@Lastpage\@empty\else<prism:endingPage>\xmp@Lastpage</prism:endingPage>\fi + \ifx\xmp@Doi\@empty\else<prism:doi>\xmp@Doi</prism:doi>\fi + \ifx\xmp@Doi\@empty\else<prism:url>http://dx.doi.org/\xmp@Doi</prism:url>\fi </rdf:Description> % <rdf:Description rdf:about="" % xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -314,7 +250,7 @@ % </dc:description> % <dc:creator> % <rdf:Bag> -% <rdf:li>\xmp@@Author</rdf:li> +% <rdf:li>\xmp@Author</rdf:li> % </rdf:Bag> % </dc:creator> % <dc:subject> @@ -333,10 +269,10 @@ </rdf:RDF> </x:xmpmeta> % padding with 512 space characters to allow easier editing within a PDF -\padding@line -\padding@line -\padding@line -\padding@line +\paddingline +\paddingline +\paddingline +\paddingline %% %% End of pdfx.xmp %% |