summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pdfx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-11 22:01:25 +0000
committerKarl Berry <karl@freefriends.org>2019-03-11 22:01:25 +0000
commit4e23992233ebab05b200a616b19c4347bf2b8ce9 (patch)
tree2bab86271542b70fe5224d0de3792f1351822759 /Master/texmf-dist/tex/latex/pdfx
parent0d1fe251af3bfe4a6727482ebb290910f43e4e00 (diff)
pdfx (11mar19)
git-svn-id: svn://tug.org/texlive/trunk@50338 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pdfx')
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/glyphtounicode-ntx.tex742
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/pdfx.sty127
2 files changed, 488 insertions, 381 deletions
diff --git a/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-ntx.tex b/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-ntx.tex
index 71d85435fce..73651ce0a1e 100644
--- a/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-ntx.tex
+++ b/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-ntx.tex
@@ -1,371 +1,419 @@
+%%
+%% file: glyphtounicode-ntx.tex
+%% version 1.02 date: 2019-02-11
%
% Unicode mappings for ntx text/math glyph names
-% (c) 2018 Ross Moore <ross.moore@mq.edu.au>
+% (c) 2018, 2019 Ross Moore <ross.moore@mq.edu.au>
%
% These should be loaded along with the files:
% glyphtounicode.tex
% glyphtounicode-cmr.tex
% when generating files to validate for PDF/A and/or Accessibiity (PDF/UA)
% using newtxmath.sty and/or newtxtext.sty .
-
+%
%% possible corrections - - depends upon usage ???
-\pdfglyphtounicode{slurabove}{2312}% was 2322 'frown'
+\begingroup
+\let\p\pdfglyphtounicode
+\p{slurabove}{2312}% was 2322 'frown'
%% from TeXGyre fonts
-\pdfglyphtounicode{cwm}{200B}% 0-width space
-\pdfglyphtounicode{diameter}{2300}%
-\pdfglyphtounicode{anglearc}{2222}%
-\pdfglyphtounicode{ell}{2113}%
-\pdfglyphtounicode{dotbelow}{0323}%
-\pdfglyphtounicode{hookabove}{0309}%
+\p{cwm}{200B}% 0-width space
+\p{diameter}{2300}%
+\p{anglearc}{2222}%
+\p{ell}{2113}%
+\p{dotbelow}{0323}%
+\p{hookabove}{0309}%
%% Private Use characters
-\pdfglyphtounicode{threequartersemdash}{2014}% was F6DE
+\p{threequartersemdash}{2014}% was F6DE
%% from txmia (and also txmbia )
-\pdfglyphtounicode{g1}{D835 DC54}% 0067
-\pdfglyphtounicode{y1}{D835 DC66}% 0079
-\pdfglyphtounicode{v1}{D835 DC63}% 0076
-\pdfglyphtounicode{w1}{D835 DC64}% 0077
-\pdfglyphtounicode{bbA}{D835 DD38}%
-\pdfglyphtounicode{bbB}{D835 DD39}%
-\pdfglyphtounicode{bbC}{2102}% *
-\pdfglyphtounicode{bbD}{D835 DD3B}%
-\pdfglyphtounicode{bbE}{D835 DD3C}%
-\pdfglyphtounicode{bbF}{D835 DD3D}%
-\pdfglyphtounicode{bbG}{D835 DD3E}%
-\pdfglyphtounicode{bbH}{210D}% *
-\pdfglyphtounicode{bbI}{D835 DD40}%
-\pdfglyphtounicode{bbJ}{D835 DD41}%
-\pdfglyphtounicode{bbK}{D835 DD42}%
-\pdfglyphtounicode{bbL}{D835 DD43}%
-\pdfglyphtounicode{bbM}{D835 DD44}%
-\pdfglyphtounicode{bbN}{2115}% *
-\pdfglyphtounicode{bbO}{D835 DD46}%
-\pdfglyphtounicode{bbP}{2119}%
-\pdfglyphtounicode{bbQ}{211A}% *
-\pdfglyphtounicode{bbR}{211D}% *
-\pdfglyphtounicode{bbS}{D835 DD4A}%
-\pdfglyphtounicode{bbT}{D835 DD4B}%
-\pdfglyphtounicode{bbU}{D835 DD4C}%
-\pdfglyphtounicode{bbV}{D835 DD4D}%
-\pdfglyphtounicode{bbW}{D835 DD4E}%
-\pdfglyphtounicode{bbX}{D835 DD4F}%
-\pdfglyphtounicode{bbY}{D835 DD50}%
-\pdfglyphtounicode{bbZ}{2124}% *
-\pdfglyphtounicode{bbk}{D835 DD5C}%
+\p{g1}{D835 DC54}% 0067
+\p{y1}{D835 DC66}% 0079
+\p{v1}{D835 DC63}% 0076
+\p{w1}{D835 DC64}% 0077
+\p{bbA}{D835 DD38}%
+\p{bbB}{D835 DD39}%
+\p{bbC}{2102}% *
+\p{bbD}{D835 DD3B}%
+\p{bbE}{D835 DD3C}%
+\p{bbF}{D835 DD3D}%
+\p{bbG}{D835 DD3E}%
+\p{bbH}{210D}% *
+\p{bbI}{D835 DD40}%
+\p{bbJ}{D835 DD41}%
+\p{bbK}{D835 DD42}%
+\p{bbL}{D835 DD43}%
+\p{bbM}{D835 DD44}%
+\p{bbN}{2115}% *
+\p{bbO}{D835 DD46}%
+\p{bbP}{2119}%
+\p{bbQ}{211A}% *
+\p{bbR}{211D}% *
+\p{bbS}{D835 DD4A}%
+\p{bbT}{D835 DD4B}%
+\p{bbU}{D835 DD4C}%
+\p{bbV}{D835 DD4D}%
+\p{bbW}{D835 DD4E}%
+\p{bbX}{D835 DD4F}%
+\p{bbY}{D835 DD50}%
+\p{bbZ}{2124}% *
+\p{bbk}{D835 DD5C}%
%% from txsyc (and also txbsyc)
-\pdfglyphtounicode{nequal}{2260}
-\pdfglyphtounicode{npropersubset}{2284}
-\pdfglyphtounicode{npropersuperset}{2285}
-\pdfglyphtounicode{nelement}{2209}
-\pdfglyphtounicode{nowner}{220C}
-\pdfglyphtounicode{colonequal}{2254}
-\pdfglyphtounicode{equalcolon}{2255}
+\p{nequal}{2260}
+\p{npropersubset}{2284}
+\p{npropersuperset}{2285}
+\p{nelement}{2209}
+\p{nowner}{220C}
+\p{colonequal}{2254}
+\p{equalcolon}{2255}
%% from txbsya
-\pdfglyphtounicode{squaresmallsolid}{25A0}
-\pdfglyphtounicode{axisshort}{2027}% hyphenation point
-\pdfglyphtounicode{arrowaxisright}{27A1}% Dingbat
-\pdfglyphtounicode{arrowaxisleft}{2B05}% black arrow
+\p{squaresmallsolid}{25A0}
+\p{axisshort}{2027}% hyphenation point
+\p{arrowaxisright}{27A1}% Dingbat
+\p{arrowaxisleft}{2B05}% black arrow
%% from txbsyb
-\pdfglyphtounicode{lessornotsimilar}{22E6}
-\pdfglyphtounicode{greaterornotsimilar}{22E7}
-\pdfglyphtounicode{notsimequal}{2247}
-\pdfglyphtounicode{subsetornoteql}{2ACB}
-\pdfglyphtounicode{supersetornoteql}{2ACC}
-\pdfglyphtounicode{notshortbar}{2016 0337}
-\pdfglyphtounicode{notshortparallel}{2AF2}% ?
-\pdfglyphtounicode{barshort}{2758}% ?
-\pdfglyphtounicode{parallelshort}{2016}% ?
+\p{lessornotsimilar}{22E6}
+\p{greaterornotsimilar}{22E7}
+\p{notsimequal}{2247}
+\p{subsetornoteql}{2ACB}
+\p{supersetornoteql}{2ACC}
+\p{notshortbar}{2016 0337}
+\p{notshortparallel}{2AF2}% ?
+\p{barshort}{2758}% ?
+\p{parallelshort}{2016}% ?
%% from txsyc and txbsyc
-\pdfglyphtounicode{mapsfrom}{2ADE}% turnstile ?
-\pdfglyphtounicode{Mapsto}{27FE}% double arrow
-\pdfglyphtounicode{Mapsfrom}{2AE4}% turnstile ?
-\pdfglyphtounicode{mmapsto}{2AE6}% turnstile ?
-\pdfglyphtounicode{mmapsfrom}{2AE3}% turnstile ?
-\pdfglyphtounicode{Mmapsto}{255E}% turnstile ?
-\pdfglyphtounicode{Mmapsfrom}{2AE5}% turnstile ?
-\pdfglyphtounicode{medcircle}{25CB}
-\pdfglyphtounicode{medbullet}{25CF}
-\pdfglyphtounicode{parallel1}{2225}
-\pdfglyphtounicode{nparallel}{2226}
-\pdfglyphtounicode{nparallel1}{2226 FE01}
-\pdfglyphtounicode{colonapprox}{003A 2248}
-\pdfglyphtounicode{colonsim}{003A 223C}
-\pdfglyphtounicode{coloncolonapprox}{003A 2248}
-\pdfglyphtounicode{coloncolonsim}{003A 003A 223C}
-\pdfglyphtounicode{doteq}{2250}
-\pdfglyphtounicode{multimapinv}{27DC}
-\pdfglyphtounicode{multimapboth}{29DF}
-\pdfglyphtounicode{solidmultimap}{22B8 FE01}
-\pdfglyphtounicode{solidmultimapinv}{27DC FE01}
-\pdfglyphtounicode{solidmultimapboth}{29DF FE01}
-\pdfglyphtounicode{rsolidmultimapboth}{22B6}
-\pdfglyphtounicode{lsolidmultimapboth}{22B7}
-\pdfglyphtounicode{forcesextra}{22AB}% turnstile ?
-\pdfglyphtounicode{Forcesbar}{22AA}% turnstile ???
-\pdfglyphtounicode{simequal}{2245}
-\pdfglyphtounicode{precedesordblequal}{2AB3}
-\pdfglyphtounicode{followsordblequal}{2AB4}
-\pdfglyphtounicode{notprecedesorsimilar}{22E0}
-\pdfglyphtounicode{notfollowsorsimilar}{22E1}
-\pdfglyphtounicode{notlessorsimilar}{2274}
-\pdfglyphtounicode{notgreaterorsimilar}{2275}
-\pdfglyphtounicode{notlessorapproxeql}{2A85 0338}
-\pdfglyphtounicode{notgreaterorapproxeql}{2A86 0338}
-\pdfglyphtounicode{notprecedesorcurly}{22E0}
-\pdfglyphtounicode{notfollowsorcurly}{22E1}
-\pdfglyphtounicode{notgreaterorless}{2279}
-\pdfglyphtounicode{notlessorgreater}{2278}
-\pdfglyphtounicode{notdifference}{224F 0338}
-\pdfglyphtounicode{notgeomequivalent}{224E 0338}
-\pdfglyphtounicode{notrevsimilar}{223D 0338}
-\pdfglyphtounicode{notrevasymptequal}{22CD 0338}
-\pdfglyphtounicode{nequal}{2260}
-\pdfglyphtounicode{nequivasymptotic}{226D}
-\pdfglyphtounicode{nequivalence}{2262}
-\pdfglyphtounicode{nsimilar}{2241}
-\pdfglyphtounicode{napproxequal}{2249}
-\pdfglyphtounicode{npropersubset}{2284}
-\pdfglyphtounicode{npropersuperset}{2285}
-\pdfglyphtounicode{nlessmuch}{226A 0338}
-\pdfglyphtounicode{ngreatermuch}{226B 0338}
-\pdfglyphtounicode{notapproxequal}{2249}
-\pdfglyphtounicode{notapproxorequal}{224A 0338}
-\pdfglyphtounicode{notfollowsorequal}{2AB7 0338}
-\pdfglyphtounicode{notprecedesorequal}{2AB8 0338}
-\pdfglyphtounicode{notprecedesordblequal}{2AB3 0338}
-\pdfglyphtounicode{notfollowsordblequal}{2AB4 0338}
-\pdfglyphtounicode{nsimilarequal}{2244}
-\pdfglyphtounicode{nelement}{2209}
-\pdfglyphtounicode{nowner}{220C}
-\pdfglyphtounicode{notsubsetdbl}{22D0 0338}
-\pdfglyphtounicode{notsupersetdbl}{22D1 0338}
-\pdfglyphtounicode{nsubsetsqequal}{22E2}
-\pdfglyphtounicode{nsupersetsqequal}{22E3}
-\pdfglyphtounicode{colonequal}{2254}
-\pdfglyphtounicode{equalcolon}{2255}
-\pdfglyphtounicode{colonbar}{003A 002D}
-\pdfglyphtounicode{barcolon}{2239}
-\pdfglyphtounicode{Colonequal}{2A74}
-\pdfglyphtounicode{Equalcolon}{2255 }
-\pdfglyphtounicode{Colonbar}{003A 003A 002D}
-\pdfglyphtounicode{Barcolon}{2239 003A}
-\pdfglyphtounicode{strict}{297D}% fish tail
-\pdfglyphtounicode{strictinverse}{297C}% fish tail
-\pdfglyphtounicode{strictboth}{297C 297D}% fish tails
-\pdfglyphtounicode{ampersandinv}{214B}
-\pdfglyphtounicode{lbag}{27C5}
-\pdfglyphtounicode{rbag}{27C6}
-\pdfglyphtounicode{lbagbig}{27C5 FE01}
-\pdfglyphtounicode{rbagbig}{27C6 FE01}
-\pdfglyphtounicode{oless}{29C0}
-\pdfglyphtounicode{ogreater}{29C1}
-\pdfglyphtounicode{owedge}{2227 20DD}
-\pdfglyphtounicode{ovee}{2228 20DD}
-\pdfglyphtounicode{circlebar}{233D}% APL ?
-\pdfglyphtounicode{circlebackslash}{2298}
-\pdfglyphtounicode{multicloseleft1}{22C9}
-\pdfglyphtounicode{multicloseright1}{22CA}
-\pdfglyphtounicode{multicloseboth1}{22C8 FE01}
-\pdfglyphtounicode{multiopenboth1}{2715 FE01}
-\pdfglyphtounicode{multicloseboth}{22C8}
-\pdfglyphtounicode{multiopenboth}{2715}
-\pdfglyphtounicode{Diamond}{25C7}
-\pdfglyphtounicode{Diamondsolid}{25C6}
-\pdfglyphtounicode{intersectmulti}{2A44 FE01}% ???
-\pdfglyphtounicode{notsquareimage}{228F 0338}
-\pdfglyphtounicode{notsquareoriginal}{2290 0338}
-\pdfglyphtounicode{dashedarrowleft}{290E}
-\pdfglyphtounicode{dashedarrowright}{290F}
-\pdfglyphtounicode{dashedarrowboth}{290E 290F}
-\pdfglyphtounicode{squiggleleft}{21DC}
-\pdfglyphtounicode{notdblarrowheadright}{2900}
-\pdfglyphtounicode{notdblarrowheadleft}{219E 0337}
-\pdfglyphtounicode{squareasterisk}{29C6}
-\pdfglyphtounicode{squarebackslash}{29C5}
-\pdfglyphtounicode{squarebar}{25EB}
-\pdfglyphtounicode{squareslash}{29C4}
-\pdfglyphtounicode{Wreathproduct}{2240 2240}
-\pdfglyphtounicode{lambdaslash}{019B}
-\pdfglyphtounicode{lambdabar}{D835 DF06 0335}
-\pdfglyphtounicode{club1}{2667}
-\pdfglyphtounicode{diamond1}{2666}
-\pdfglyphtounicode{heart1}{2665}
-\pdfglyphtounicode{spade1}{2664}
-\pdfglyphtounicode{Arrownortheast}{21D7}
-\pdfglyphtounicode{Arrowsoutheast}{21D8}
-\pdfglyphtounicode{Arrownorthwest}{21D6}
-\pdfglyphtounicode{Arrowsouthwest}{21D9}
-\pdfglyphtounicode{Latticetop}{2AEA}
-\pdfglyphtounicode{Perpendicular}{2AEB}
-\pdfglyphtounicode{leadstoext}{219D}
-\pdfglyphtounicode{leadsto}{301C}% ???
-\pdfglyphtounicode{squareunionmulti}{228E FE01}
-\pdfglyphtounicode{squareintersectmulti}{2A4E FE01}
-\pdfglyphtounicode{dblbracketleft}{27E6}
-\pdfglyphtounicode{dblbracketright}{27E7}
-\pdfglyphtounicode{squareright}{25A1 2192}
-\pdfglyphtounicode{squareleft}{2190 25A1}
-\pdfglyphtounicode{squaredotright}{22A1 2192}
-\pdfglyphtounicode{squaredotleft}{2190 22A1}
-\pdfglyphtounicode{Diamondright}{25C7 2192}%
-\pdfglyphtounicode{Diamondleft}{2190 25C7}
-\pdfglyphtounicode{Diamonddotright}{27D0 2192}
-\pdfglyphtounicode{Diamonddotleft}{2190 27D0}
-\pdfglyphtounicode{squareRight}{25A1 21D2}
-\pdfglyphtounicode{squareLeft}{21D0 25A1}
-\pdfglyphtounicode{squaredotRight}{22A1 21D2}
-\pdfglyphtounicode{squaredotLeft}{21D0 22A1}
-\pdfglyphtounicode{DiamondRight}{25C7 21D2}
-\pdfglyphtounicode{DiamondLeft}{21D0 25C7}
-\pdfglyphtounicode{DiamonddotRight}{27D0 21D2}
-\pdfglyphtounicode{DiamonddotLeft}{21D0 27D0}
-\pdfglyphtounicode{Diamonddot}{27D0}
-\pdfglyphtounicode{circleright}{25CB 2192}
-\pdfglyphtounicode{circleleft}{2190 25CB}
-\pdfglyphtounicode{circledotright}{2299 2192}
-\pdfglyphtounicode{circledotleft}{2190 2299}
-\pdfglyphtounicode{opentrans}{260D FE01}% ???
-\pdfglyphtounicode{solidtrans}{2051 20D2}% ???
-\pdfglyphtounicode{topsolidtrans}{2AF1 FE01}% ???
-\pdfglyphtounicode{topopentrans}{27DF FE01}% ???
+\p{mapsfrom}{2ADE}% turnstile ?
+\p{Mapsto}{27FE}% double arrow
+\p{Mapsfrom}{2AE4}% turnstile ?
+\p{mmapsto}{2AE6}% turnstile ?
+\p{mmapsfrom}{2AE3}% turnstile ?
+\p{Mmapsto}{255E}% turnstile ?
+\p{Mmapsfrom}{2AE5}% turnstile ?
+\p{medcircle}{25CB}
+\p{medbullet}{25CF}
+\p{parallel1}{2225}
+\p{nparallel}{2226}
+\p{nparallel1}{2226 FE01}
+\p{colonapprox}{003A 2248}
+\p{colonsim}{003A 223C}
+\p{coloncolonapprox}{003A 2248}
+\p{coloncolonsim}{003A 003A 223C}
+\p{doteq}{2250}
+\p{multimapinv}{27DC}
+\p{multimapboth}{29DF}
+\p{solidmultimap}{22B8 FE01}
+\p{solidmultimapinv}{27DC FE01}
+\p{solidmultimapboth}{29DF FE01}
+\p{rsolidmultimapboth}{22B6}
+\p{lsolidmultimapboth}{22B7}
+\p{forcesextra}{22AB}% turnstile ?
+\p{Forcesbar}{22AA}% turnstile ???
+\p{simequal}{2245}
+\p{precedesordblequal}{2AB3}
+\p{followsordblequal}{2AB4}
+\p{notprecedesorsimilar}{22E0}
+\p{notfollowsorsimilar}{22E1}
+\p{notlessorsimilar}{2274}
+\p{notgreaterorsimilar}{2275}
+\p{notlessorapproxeql}{2A85 0338}
+\p{notgreaterorapproxeql}{2A86 0338}
+\p{notprecedesorcurly}{22E0}
+\p{notfollowsorcurly}{22E1}
+\p{notgreaterorless}{2279}
+\p{notlessorgreater}{2278}
+\p{notdifference}{224F 0338}
+\p{notgeomequivalent}{224E 0338}
+\p{notrevsimilar}{223D 0338}
+\p{notrevasymptequal}{22CD 0338}
+\p{nequal}{2260}
+\p{nequivasymptotic}{226D}
+\p{nequivalence}{2262}
+\p{nsimilar}{2241}
+\p{napproxequal}{2249}
+\p{npropersubset}{2284}
+\p{npropersuperset}{2285}
+\p{nlessmuch}{226A 0338}
+\p{ngreatermuch}{226B 0338}
+\p{notapproxequal}{2249}
+\p{notapproxorequal}{224A 0338}
+\p{notfollowsorequal}{2AB7 0338}
+\p{notprecedesorequal}{2AB8 0338}
+\p{notprecedesordblequal}{2AB3 0338}
+\p{notfollowsordblequal}{2AB4 0338}
+\p{nsimilarequal}{2244}
+\p{nelement}{2209}
+\p{nowner}{220C}
+\p{notsubsetdbl}{22D0 0338}
+\p{notsupersetdbl}{22D1 0338}
+\p{nsubsetsqequal}{22E2}
+\p{nsupersetsqequal}{22E3}
+\p{colonequal}{2254}
+\p{equalcolon}{2255}
+\p{colonbar}{003A 002D}
+\p{barcolon}{2239}
+\p{Colonequal}{2A74}
+\p{Equalcolon}{2255 }
+\p{Colonbar}{003A 003A 002D}
+\p{Barcolon}{2239 003A}
+\p{strict}{297D}% fish tail
+\p{strictinverse}{297C}% fish tail
+\p{strictboth}{297C 297D}% fish tails
+\p{ampersandinv}{214B}
+\p{lbag}{27C5}
+\p{rbag}{27C6}
+\p{lbagbig}{27C5 FE01}
+\p{rbagbig}{27C6 FE01}
+\p{oless}{29C0}
+\p{ogreater}{29C1}
+\p{owedge}{2227 20DD}
+\p{ovee}{2228 20DD}
+\p{circlebar}{233D}% APL ?
+\p{circlebackslash}{2298}
+\p{multicloseleft1}{22C9}
+\p{multicloseright1}{22CA}
+\p{multicloseboth1}{22C8 FE01}
+\p{multiopenboth1}{2715 FE01}
+\p{multicloseboth}{22C8}
+\p{multiopenboth}{2715}
+\p{Diamond}{25C7}
+\p{Diamondsolid}{25C6}
+\p{intersectmulti}{2A44 FE01}% ???
+\p{notsquareimage}{228F 0338}
+\p{notsquareoriginal}{2290 0338}
+\p{dashedarrowleft}{290E}
+\p{dashedarrowright}{290F}
+\p{dashedarrowboth}{290E 290F}
+\p{squiggleleft}{21DC}
+\p{notdblarrowheadright}{2900}
+\p{notdblarrowheadleft}{219E 0337}
+\p{squareasterisk}{29C6}
+\p{squarebackslash}{29C5}
+\p{squarebar}{25EB}
+\p{squareslash}{29C4}
+\p{Wreathproduct}{2240 2240}
+\p{lambdaslash}{019B}
+\p{lambdabar}{D835 DF06 0335}
+\p{club1}{2667}
+\p{diamond1}{2666}
+\p{heart1}{2665}
+\p{spade1}{2664}
+\p{Arrownortheast}{21D7}
+\p{Arrowsoutheast}{21D8}
+\p{Arrownorthwest}{21D6}
+\p{Arrowsouthwest}{21D9}
+\p{Latticetop}{2AEA}
+\p{Perpendicular}{2AEB}
+\p{leadstoext}{219D}
+\p{leadsto}{301C}% ???
+\p{squareunionmulti}{228E FE01}
+\p{squareintersectmulti}{2A4E FE01}
+\p{dblbracketleft}{27E6}
+\p{dblbracketright}{27E7}
+\p{squareright}{25A1 2192}
+\p{squareleft}{2190 25A1}
+\p{squaredotright}{22A1 2192}
+\p{squaredotleft}{2190 22A1}
+\p{Diamondright}{25C7 2192}%
+\p{Diamondleft}{2190 25C7}
+\p{Diamonddotright}{27D0 2192}
+\p{Diamonddotleft}{2190 27D0}
+\p{squareRight}{25A1 21D2}
+\p{squareLeft}{21D0 25A1}
+\p{squaredotRight}{22A1 21D2}
+\p{squaredotLeft}{21D0 22A1}
+\p{DiamondRight}{25C7 21D2}
+\p{DiamondLeft}{21D0 25C7}
+\p{DiamonddotRight}{27D0 21D2}
+\p{DiamonddotLeft}{21D0 27D0}
+\p{Diamonddot}{27D0}
+\p{circleright}{25CB 2192}
+\p{circleleft}{2190 25CB}
+\p{circledotright}{2299 2192}
+\p{circledotleft}{2190 2299}
+\p{opentrans}{260D FE01}% ???
+\p{solidtrans}{2051 20D2}% ???
+\p{topsolidtrans}{2AF1 FE01}% ???
+\p{topopentrans}{27DF FE01}% ???
%% from txsys
-\pdfglyphtounicode{arcwide}{0361}
-\pdfglyphtounicode{arcwider}{0361 FE01}% variants according size
-\pdfglyphtounicode{arcwiderr}{0361 FE02}% .. ..
-\pdfglyphtounicode{arcwidest}{0361 FE03}% .. ..
-\pdfglyphtounicode{arcwideult}{0361 FE04}% .. ..
-\pdfglyphtounicode{barbar}{0304 0304}
-\pdfglyphtounicode{barhat}{0304 0303}
-\pdfglyphtounicode{bartilde}{0304 0302}
-\pdfglyphtounicode{bulletS}{25C5}
-\pdfglyphtounicode{bulletSS}{2022}
-\pdfglyphtounicode{bulletSSS}{2219}
-\pdfglyphtounicode{cdotB}{00B7}
-\pdfglyphtounicode{cdotBB}{22C5}
-\pdfglyphtounicode{ddddot}{20DC}
-\pdfglyphtounicode{ddddotacc}{20DC}
-\pdfglyphtounicode{dddot}{20DB}
-\pdfglyphtounicode{dddotacc}{20DB}
-\pdfglyphtounicode{ddotacc}{0308}
-\pdfglyphtounicode{dotacc}{0307}
-\pdfglyphtounicode{emptysetAlt}{2300}
-\pdfglyphtounicode{emptysetAlt2}{2205}
-\pdfglyphtounicode{harpoonacc}{20D2}
-\pdfglyphtounicode{hatbar}{0303 0304}
-\pdfglyphtounicode{hathat}{0303 0303}
-\pdfglyphtounicode{hattilde}{0303 0302}
-\pdfglyphtounicode{lharpoonacc}{20D0}
-\pdfglyphtounicode{lrharpoonacc}{20E1}
-\pdfglyphtounicode{lrvec}{20E1}
-\pdfglyphtounicode{lvec}{20D6}
-\pdfglyphtounicode{nexists}{2204}
-\pdfglyphtounicode{oarcwide}{0361 0350}% try to add upper arrow-tip
-\pdfglyphtounicode{oarcwider}{0361 FE01 0350}% .. ..
-\pdfglyphtounicode{oarcwiderr}{0361 FE02 0350}% .. ..
-\pdfglyphtounicode{oarcwidest}{0361 FE03 0350}% .. ..
-\pdfglyphtounicode{oarcwideult}{0361 FE04 0350}% .. ..
-\pdfglyphtounicode{prime2}{02B9}
-\pdfglyphtounicode{smcompB}{25CB}
-\pdfglyphtounicode{tildebar}{0302 0304}
-\pdfglyphtounicode{tildehat}{0302 0303}
-\pdfglyphtounicode{tildetilde}{0302 0302}
-\pdfglyphtounicode{vec}{20D7}
+\p{arcwide}{0361}
+\p{arcwider}{0361 FE01}% variants according size
+\p{arcwiderr}{0361 FE02}% .. ..
+\p{arcwidest}{0361 FE03}% .. ..
+\p{arcwideult}{0361 FE04}% .. ..
+\p{barbar}{0304 0304}
+\p{barhat}{0304 0303}
+\p{bartilde}{0304 0302}
+\p{bulletS}{25C5}
+\p{bulletSS}{2022}
+\p{bulletSSS}{2219}
+\p{cdotB}{00B7}
+\p{cdotBB}{22C5}
+\p{ddddot}{20DC}
+\p{ddddotacc}{20DC}
+\p{dddot}{20DB}
+\p{dddotacc}{20DB}
+\p{ddotacc}{0308}
+\p{dotacc}{0307}
+\p{emptysetAlt}{2300}
+\p{emptysetAlt2}{2205}
+\p{harpoonacc}{20D2}
+\p{hatbar}{0303 0304}
+\p{hathat}{0303 0303}
+\p{hattilde}{0303 0302}
+\p{lharpoonacc}{20D0}
+\p{lrharpoonacc}{20E1}
+\p{lrvec}{20E1}
+\p{lvec}{20D6}
+\p{nexists}{2204}
+\p{oarcwide}{0361 0350}% try to add upper arrow-tip
+\p{oarcwider}{0361 FE01 0350}% .. ..
+\p{oarcwiderr}{0361 FE02 0350}% .. ..
+\p{oarcwidest}{0361 FE03 0350}% .. ..
+\p{oarcwideult}{0361 FE04 0350}% .. ..
+\p{prime2}{02B9}
+\p{smcompB}{25CB}
+\p{tildebar}{0302 0304}
+\p{tildehat}{0302 0303}
+\p{tildetilde}{0302 0302}
+\p{rvec}{20D7}
+\p{vec}{20D7}
% from txex-bar, txbex-bar
-\pdfglyphtounicode{angleleftbigx}{27E8 FE01}% variants according size
-\pdfglyphtounicode{anglerightbigx}{27E9 FE01}
-\pdfglyphtounicode{braceleftbigx}{007B FE01}
-\pdfglyphtounicode{bracerightbigx}{007D FE01}
-\pdfglyphtounicode{bracketleftbigx}{005B FE01}
-\pdfglyphtounicode{bracketrightbigx}{005D FE01}
-\pdfglyphtounicode{ceilingleftbigx}{2308 FE01}
-\pdfglyphtounicode{ceilingrightbigx}{2309 FE01}
-\pdfglyphtounicode{floorleftbigx}{230A FE01}
-\pdfglyphtounicode{floorrightbigx}{230B FE01}
-\pdfglyphtounicode{parenleftbigx}{0028 FE01}
-\pdfglyphtounicode{parenrightbigx}{0029 FE01}
-\pdfglyphtounicode{bardblex}{2225 FE01}
-\pdfglyphtounicode{bardblexbigx}{2225 FE01}
-\pdfglyphtounicode{barex}{007C FE01}
-\pdfglyphtounicode{barexbigx}{007C FE01}
-\pdfglyphtounicode{bracehext}{02C9}% use a macron for horizontal spacing !!
-\pdfglyphtounicode{grouphtipdownleft}{02CA}% use spacing modifiers to simulate the overbrace
-\pdfglyphtounicode{grouphtipdownright}{02CB}% .. ..
-\pdfglyphtounicode{grouphtipupleft}{02CF}% use spacing modifiers to simulate the underbrace
-\pdfglyphtounicode{grouphtipupright}{02CE}% .. ..
-\pdfglyphtounicode{groupatipdownleft}{1DFE 02CA}% include an arrow-tip
-\pdfglyphtounicode{groupatipdownright}{02CB 0350}% include an arrow-tip
-\pdfglyphtounicode{groupatipupleft}{02F1 02CF}% include an arrow-tip
-\pdfglyphtounicode{groupatipupright}{02CE 02F2}% include an arrow-tip
-\pdfglyphtounicode{parenleftbtA}{239D}
-\pdfglyphtounicode{parenleftexA}{239C}
-\pdfglyphtounicode{parenlefttpA}{239B}
-\pdfglyphtounicode{parenrightbtA}{23A0}
-\pdfglyphtounicode{parenrightexA}{239F}
-\pdfglyphtounicode{parenrighttpA}{239E}
-\pdfglyphtounicode{hat4}{0302 FE04}% variants according to width
-\pdfglyphtounicode{hat5}{0302 FE05}% .. .. ..
-\pdfglyphtounicode{hat6}{0302 FE06}% .. .. ..
-\pdfglyphtounicode{tilde4}{0303 FE04}% variants according to width
-\pdfglyphtounicode{tilde5}{0303 FE05}% .. .. ..
-\pdfglyphtounicode{tilde6}{0303 FE06}% .. .. ..
+\p{angleleftbigx}{27E8 FE01}% variants according size
+\p{anglerightbigx}{27E9 FE01}
+\p{braceleftbigx}{007B FE01}
+\p{bracerightbigx}{007D FE01}
+\p{bracketleftbigx}{005B FE01}
+\p{bracketrightbigx}{005D FE01}
+\p{ceilingleftbigx}{2308 FE01}
+\p{ceilingrightbigx}{2309 FE01}
+\p{floorleftbigx}{230A FE01}
+\p{floorrightbigx}{230B FE01}
+\p{parenleftbigx}{0028 FE01}
+\p{parenrightbigx}{0029 FE01}
+\p{bardblex}{2225 FE01}
+\p{bardblexbigx}{2225 FE02}
+\p{barex}{007C FE01}
+\p{barexbigx}{007C FE01}
+\p{bracehext}{02C9}% use a macron for horizontal spacing !!
+\p{grouphtipdownleft}{02CA}% use spacing modifiers to simulate the overbrace
+\p{grouphtipdownright}{02CB}% .. ..
+\p{grouphtipupleft}{02CF}% use spacing modifiers to simulate the underbrace
+\p{grouphtipupright}{02CE}% .. ..
+\p{groupatipdownleft}{1DFE 02CA}% include an arrow-tip
+\p{groupatipdownright}{02CB 0350}% include an arrow-tip
+\p{groupatipupleft}{02F1 02CF}% include an arrow-tip
+\p{groupatipupright}{02CE 02F2}% include an arrow-tip
+\p{parenleftbtA}{239D}
+\p{parenleftexA}{239C}
+\p{parenlefttpA}{239B}
+\p{parenrightbtA}{23A0}
+\p{parenrightexA}{239F}
+\p{parenrighttpA}{239E}
+\p{hat4}{0302 FE04}% variants according to width
+\p{hat5}{0302 FE05}% .. .. ..
+\p{hat6}{0302 FE06}% .. .. ..
+\p{tilde4}{0303 FE04}% variants according to width
+\p{tilde5}{0303 FE05}% .. .. ..
+\p{tilde6}{0303 FE06}% .. .. ..
% from txexs
-\pdfglyphtounicode{cupdottext}{2A03}
-\pdfglyphtounicode{cupdotdisplay}{2A03}
-\pdfglyphtounicode{dblbracketleftbig}{27E6 FE01}% variants according to size
-\pdfglyphtounicode{dblbracketleftbigg}{27E6 FE02}% .. ..
-\pdfglyphtounicode{dblbracketleftBig}{27E6 FE03}% .. ..
-\pdfglyphtounicode{dblbracketleftBigg}{27E6 FE04}% .. ..
-\pdfglyphtounicode{dblbracketleftbt}{23A5 23A3}% gives a solid v-line before bracket pieces
-\pdfglyphtounicode{dblbracketleftex}{23A5 23A2}% double lines
-\pdfglyphtounicode{dblbracketlefttp}{23A5 23A1}% lower left-bracket pieces
-\pdfglyphtounicode{dblbracketrightbig}{27E6 FE01}% variants according to size
-\pdfglyphtounicode{dblbracketrightbigg}{27E6 FE02}% .. ..
-\pdfglyphtounicode{dblbracketrightBig}{27E6 FE03}% .. ..
-\pdfglyphtounicode{dblbracketrightBigg}{27E6 FE04}% .. ..
-\pdfglyphtounicode{dblbracketrightbt}{23A6 23A2}% gives a solid v-line after bracket pieces
-\pdfglyphtounicode{dblbracketrightex}{23A5 23A2}% double lines
-\pdfglyphtounicode{dblbracketrighttp}{23A4 23A2}% lower right-bracket pieces
-\pdfglyphtounicode{intersectionsqtext}{2A05 FE01}
-\pdfglyphtounicode{intersectionsqdisplay}{2A05 FE01}
-\pdfglyphtounicode{intersectmultitext}{2A44 FE00}% variant of 'intersect with logical and'
-\pdfglyphtounicode{intersectmultidisplay}{2A44 FE00}% variant of 'intersect with logical and'
-\pdfglyphtounicode{intersectsqmultitext}{2A05 FE00}% variant of 'n-ary square intersection'
-\pdfglyphtounicode{intersectsqmultidisplay}{2A05 FE00}% variant of 'n-ary square intersection'
-\pdfglyphtounicode{lbagbig}{27C5 FE01}% variants according to size
-\pdfglyphtounicode{lbagbigg}{27C5 FE02}% .. ..
-\pdfglyphtounicode{lbagBig}{27C5 FE03}% .. ..
-\pdfglyphtounicode{lbagBigg}{27C5 FE04}% .. ..
-\pdfglyphtounicode{lbagBiggg}{27C5 FE05}% .. ..
-\pdfglyphtounicode{lbagBigggg}{27C5 FE06}% .. ..
-\pdfglyphtounicode{lbagBiggggg}{27C5 FE07}% .. ..
-\pdfglyphtounicode{rbagbig}{27C6 FE01}% variants according to size
-\pdfglyphtounicode{rbagbigg}{27C6 FE02}% .. ..
-\pdfglyphtounicode{rbagBig}{27C6 FE03}% .. ..
-\pdfglyphtounicode{rbagBigg}{27C6 FE04}% .. ..
-\pdfglyphtounicode{rbagBiggg}{27C6 FE05}% .. ..
-\pdfglyphtounicode{rbagBigggg}{27C6 FE06}% .. ..
-\pdfglyphtounicode{rbagBiggggg}{27C6 FE07}% .. ..
-\pdfglyphtounicode{producttext1}{2715}% Dingbat multiply symbol
-\pdfglyphtounicode{productdisplay1}{2715}% Dingbat multiply symbol
-\pdfglyphtounicode{raisedsquare}{2E0B}% not used, for 'missing' (.notdef) symbol ???
-\pdfglyphtounicode{unionsqmultitext}{2A04 FE00}% variant of non-square union
-\pdfglyphtounicode{unionsqmultidisplay}{2A04 FE00}% variant of non-square union
+\p{cupdottext}{2A03}
+\p{cupdotdisplay}{2A03}
+\p{dblbracketleftbig}{27E6 FE01}% variants according to size
+\p{dblbracketleftbigg}{27E6 FE02}% .. ..
+\p{dblbracketleftBig}{27E6 FE03}% .. ..
+\p{dblbracketleftBigg}{27E6 FE04}% .. ..
+\p{dblbracketleftbt}{23A5 23A3}% gives a solid v-line before bracket pieces
+\p{dblbracketleftex}{23A5 23A2}% double lines
+\p{dblbracketlefttp}{23A5 23A1}% upper left-bracket pieces
+\p{dblbracketrightbig}{27E6 FE01}% variants according to size
+\p{dblbracketrightbigg}{27E6 FE02}% .. ..
+\p{dblbracketrightBig}{27E6 FE03}% .. ..
+\p{dblbracketrightBigg}{27E6 FE04}% .. ..
+\p{dblbracketrightbt}{23A6 23A2}% gives a solid v-line after bracket pieces
+\p{dblbracketrightex}{23A5 23A2}% double lines
+\p{dblbracketrighttp}{23A4 23A2}% upper right-bracket pieces
+\p{intersectionsqtext}{2A05 FE01}
+\p{intersectionsqdisplay}{2A05 FE01}
+\p{intersectmultitext}{2A44 FE00}% variant of 'intersect with logical and'
+\p{intersectmultidisplay}{2A44 FE00}% variant of 'intersect with logical and'
+\p{intersectsqmultitext}{2A05 FE00}% variant of 'n-ary square intersection'
+\p{intersectsqmultidisplay}{2A05 FE00}% variant of 'n-ary square intersection'
+\p{lbagbig}{27C5 FE01}% variants according to size
+\p{lbagbigg}{27C5 FE02}% .. ..
+\p{lbagBig}{27C5 FE03}% .. ..
+\p{lbagBigg}{27C5 FE04}% .. ..
+\p{lbagBiggg}{27C5 FE05}% .. ..
+\p{lbagBigggg}{27C5 FE06}% .. ..
+\p{lbagBiggggg}{27C5 FE07}% .. ..
+\p{rbagbig}{27C6 FE01}% variants according to size
+\p{rbagbigg}{27C6 FE02}% .. ..
+\p{rbagBig}{27C6 FE03}% .. ..
+\p{rbagBigg}{27C6 FE04}% .. ..
+\p{rbagBiggg}{27C6 FE05}% .. ..
+\p{rbagBigggg}{27C6 FE06}% .. ..
+\p{rbagBiggggg}{27C6 FE07}% .. ..
+\p{producttext1}{2715}% Dingbat multiply symbol
+\p{productdisplay1}{2715}% Dingbat multiply symbol
+\p{raisedsquare}{2E0B}% not used, for 'missing' (.notdef) symbol ???
+\p{unionsqmultitext}{2A04 FE00}% variant of non-square union
+\p{unionsqmultidisplay}{2A04 FE00}% variant of non-square union
% T1-encoding
-\pdfglyphtounicode{perthousandzero}{2080}% use subscript 0
-% ntxsyralt
-\pdfglyphtounicode{kappa1}{D835 DF18}
-\pdfglyphtounicode{kappa1up}{03F0}
+\p{perthousandzero}{2080}% use subscript 0
+% ntxsyralt , fourier-ml , fourier-ms, . . .
+\p{kappa1}{D835 DF18}
+\p{kappa1up}{03F0}
+\p{rho2}{03F1}
+\p{partialdiff1}{D835 DF15}
+\p{pi2}{03D6}
+\p{emptysetstress}{2205}
+\p{mapstochar}{21A6}% ???
+\p{radicallow}{23B7}% 221A ???
% fxlri-7alt (and fxlri-5alt etc. )
-\pdfglyphtounicode{J.alt}{D835 DE11}
-\pdfglyphtounicode{g.alt}{D835 DE28}
-\pdfglyphtounicode{v.alt}{D835 DE37}
-\pdfglyphtounicode{w.alt}{D835 DE38}
-\pdfglyphtounicode{y.alt}{D835 DE3A}
+\p{J.alt}{D835 DE11}
+\p{g.alt}{D835 DE28}
+\p{v.alt}{D835 DE37}
+\p{w.alt}{D835 DE38}
+\p{y.alt}{D835 DE3A}
% rtxbmi-rev , rtxbmi5-rev , rtxbmi7-rev
-\pdfglyphtounicode{harpoonleftup}{21BF}
-\pdfglyphtounicode{harpoonrightup}{21BE}
-\pdfglyphtounicode{harpoonleftdown}{21C3}
-\pdfglyphtounicode{harpoonrightdown}{21C2}
-\pdfglyphtounicode{hookleftchar}{02D2}
-\pdfglyphtounicode{hookrightchar}{02D3}
+\p{harpoonleftup}{21BC}% was incorrectly {21BF}
+\p{harpoonrightup}{21C0}% was incorrectly {21BE}
+\p{harpoonleftdown}{21BD}% was incorrectly {21C3}
+\p{harpoonrightdown}{21C1}% was incorrectly {21C2}
+\p{hookleftchar}{02D2}
+\p{hookrightchar}{02D3}
+% fourier and other arrows and math symbols
+\p{dotaccent}{0307}
+\p{geqslant}{2A7E}
+\p{leqslant}{2A7D}
+\p{notgeqslant}{2A7E 0338}
+\p{notleqslant}{2A7D 0338}
+\p{parallelslanted}{2225}
+\p{notparallelslanted}{2226}
+\p{vDash}{22A8}
+\p{notvDash}{22AD}
+\p{blacktriangleleft}{25B6}
+\p{blacktriangleright}{25C0}
+\p{hslash}{210F}
+\p{notexists}{2204}
+\p{bartriple}{2AF4}
+\p{bracketdoubleleft}{27E6}
+\p{bracketdoubleright}{27E7}
+\p{varsubsetneq}{228A}
+\p{subsetneqq}{2ACB}
+\p{notowner}{220C}
+\p{smallsetminus}{2216}% ???
+\p{swords}{2694}
+\p{swordsdown}{2694}% !!!
+\p{curvearrowleft}{21B6}
+\p{curvearrowright}{21B7}
+\p{leftleftarrows}{21C7}
+\p{rightrightarrows}{21C9}
+\p{barcino}{1F60E}% !!!
+\p{apple}{1F34E}% was {F8FF}
+\p{arrowhorizex}{23AF}% was {F8E7}
+\p{arrowvertex}{23D0}% was {F8E6}
+\p{integralex}{23AE}% was {F8F5}
+\p{radicalex}{23AF}% ??? was {F8E5}
+
+
+\endgroup \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfx.sty b/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
index 2f3f578de01..00b7dcc0f5e 100644
--- a/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
+++ b/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
@@ -6,7 +6,7 @@
%%
%% pdfx.dtx (with options: `package')
%%
-%% Copyright (c) 2018, CV Radhakrishnan <cvr@river-valley.org>,
+%% Copyright (c) 2019, CV Radhakrishnan <cvr@river-valley.org>,
%% Han The Thanh <thanh@river-valley.org>,
%% Ross Moore <ross.moore@mq.edu.au>,
%% Peter Selinger <selinger@mathstat.dal.ca>
@@ -31,7 +31,7 @@
}{}%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfx}
- [2018/12/22 v1.6.1 PDF/X and PDF/A support (CVR/HTH/RRM/PS)]
+ [2019/02/27 v1.6.3 PDF/X and PDF/A support (CVR/HTH/RRM/PS)]
\newif\ifpdfx@noBOM \pdfx@noBOMfalse % use a BOM in the XMP packet
\newif\ifpdfx@x \pdfx@xfalse % PDF/X mode
@@ -40,6 +40,7 @@
\newif\ifpdfx@vt \pdfx@vtfalse % PDF/VT mode, extension of PDF/X
\newif\ifno@iccprofile % used with PDF/X-4p and PDF/X-5pg
\newif\ifpdfx@noerr % error messages become just warnings
+\newif\ifpdfx@omitcharset % used with pdfomitcharset primitive
\DeclareOption{noerr}{\pdfx@noerrtrue}
@@ -67,25 +68,37 @@
{, else continue to build a non-valid document}%
}
+%% support pdfomitcharset primitive, added to pdfTeX in 2019
+\DeclareOption{nocharset}{\pdfx@omitcharsettrue}
+\DeclareOption{usecharset}{\pdfx@omitcharsetfalse}
+
%% PDF/A options
%% default is to create PDF/A-1b
%% options can change this for PDF/X or higher levels of PDF/A
\DeclareOption{a-1a}{\global\pdfx@xfalse\def\xmp@Part{1}%
- \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2005}}
+ \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2005}%
+ \pdfx@omitcharsetfalse}
\DeclareOption{a-1b}{\global\pdfx@xfalse\def\xmp@Part{1}%
- \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2005}}
+ \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2005}%
+ \pdfx@omitcharsetfalse}
\DeclareOption{a-2a}{\global\pdfx@xfalse\def\xmp@Part{2}%
- \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2010}}
+ \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2010}%
+ \pdfx@omitcharsettrue}
\DeclareOption{a-2b}{\global\pdfx@xfalse\def\xmp@Part{2}%
- \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2010}}
+ \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2010}%
+ \pdfx@omitcharsettrue}
\DeclareOption{a-2u}{\global\pdfx@xfalse\def\xmp@Part{2}%
- \def\xmp@Conformance{U}\def\xmp@ReleaseDate{2010}}
+ \def\xmp@Conformance{U}\def\xmp@ReleaseDate{2010}%
+ \pdfx@omitcharsettrue}
\DeclareOption{a-3a}{\global\pdfx@xfalse\def\xmp@Part{3}%
- \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2012}}
+ \def\xmp@Conformance{A}\def\xmp@ReleaseDate{2012}%
+ \pdfx@omitcharsettrue}
\DeclareOption{a-3b}{\global\pdfx@xfalse\def\xmp@Part{3}%
- \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2012}}
+ \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2012}%
+ \pdfx@omitcharsettrue}
\DeclareOption{a-3u}{\global\pdfx@xfalse\def\xmp@Part{3}%
- \def\xmp@Conformance{U}\def\xmp@ReleaseDate{2012}}
+ \def\xmp@Conformance{U}\def\xmp@ReleaseDate{2012}%
+ \pdfx@omitcharsettrue}
%%
%% PDF/X options
%% comments added, using
@@ -345,6 +358,17 @@
\pdfresetpageorigin=0
\fi
+\expandafter\ifx\csname pdfomitcharset\endcsname\relax\else
+ \ifpdfx@omitcharset
+ \pdfomitcharset = 1 %
+ %% do not create /Charset listings of font glyphs;
+ %% optional for PDF/A-2,3 and PDF 2.x
+ \else
+ \pdfomitcharset = 0 %
+ %% create the /Charset listings of font glyphs, required with PDF/A-1
+ \fi
+\fi
+
\newif\ifpdfx@nopdfinfo
\ifmathxmp\pdfx@nopdfinfotrue
\else
@@ -533,26 +557,31 @@
\expandafter\ifx\csname inputencodingname\endcsname\relax
\else
\def\pdfx@restoreencoding#1{%
- \@tempcnta=128
- \loop
- \catcode\@tempcnta=13
- \advance\@tempcnta\@ne
- \ifnum\@tempcnta<256
- \repeat
+ \@tempcnta=128
+ \loop
+ \catcode\@tempcnta=13
+ \advance\@tempcnta\@ne
+ \ifnum\@tempcnta<256
+ \repeat
\inputencoding{#1}%
+ \let\LastDeclaredEncoding\pdfx@LastDeclaredEncoding
+ \let\DeclareFontEncoding@\pdfx@DeclareFontEncoding@
+ \let\DeclareUnicodeCharacter\pdfx@DeclareUnicodeCharacter
}%
\AtEndOfPackage{\pdfx@restoreencoding\pdfx@inputencodingname}%
\let\pdfx@inputencodingname\inputencodingname
- \let\pdfx@DeclareUnicodeCharacter\DeclareUnicodeCharacter
+ \global\let\pdfx@DeclareUnicodeCharacter\DeclareUnicodeCharacter
+ \global\let\pdfx@DeclareFontEncoding@\DeclareFontEncoding@
\UseRawInputEncoding
\fi
\InputIfFileExists{\pdfx@encodingfile}{}{}
\expandafter\ifx\csname pdfx@inputencodingname\endcsname\relax
\else
\let\inputencodingname\pdfx@inputencodingname
- \let\DeclareUnicodeCharacter\pdfx@DeclareUnicodeCharacter
- \let\DeclareFontEncoding@\DeclareFontEncoding@saved
- \inputencoding{\inputencodingname}%
+%% \global\let\DeclareUnicodeCharacter\pdfx@DeclareUnicodeCharacter
+%% \global\let\DeclareFontEncoding@\DeclareFontEncoding@saved
+ \global\let\pdfx@LastDeclaredEncoding\LastDeclaredEncoding
+ \expandafter\inputencoding\expandafter{\inputencodingname}%
\fi
%%----------------------------------------------------------------------
@@ -1667,7 +1696,13 @@
}%
\expandafter\pdfx@tryoldprofilesfalse
\fi
-}{\pdfx@tryoldprofilestrue}
+}{%
+ \PackageWarning{pdfx}{%
+ The 'colorprofiles' package is not installed correctly.^^J
+ File 'colorprofiles.tex' is missing. Proceeding without it.
+ }%
+ \pdfx@tryoldprofilestrue
+}
{\catcode`\| 14 \catcode`\% 12 \catcode`\_ 12 \catcode`\: 12
\catcode`\. 12 \catcode`\- 12 \catcode`\/ 12
@@ -2351,14 +2386,15 @@
\expandafter\ifx\expandafter\relax\xmp@Subject\relax\else
\pdfx@ConvertUTFtoBE{\pdfx@pdfSubject}{\xmp@Subject}%
\fi
-\else %% pdfx@nopdfinfotrue
+\else %% pdfx@nopdfinfofalse
\expandafter\ifx\expandafter\relax\xmp@Title\relax\else
\ifluatex
\pdfx@ConvertUTFtoBE\pdfx@pdfTitle\xmp@Title
\else\ifxetex
\pdfx@ConvertUTFtoBE\pdfx@pdfTitle\xmp@Title
\else
- \pdfx@GeneratePdfString\pdfx@pdfTitle\xmp@Title
+%% \pdfx@GeneratePdfString\pdfx@pdfTitle\xmp@Title % why does this fail ???
+ \pdfx@ConvertUTFtoBE{\pdfx@pdfTitle}{\xmp@Title}% ??? RRM 2019-02-17
\fi\fi
\fi
\expandafter\ifx\expandafter\relax\xmp@Subject\relax\else
@@ -2367,7 +2403,8 @@
\else\ifxetex
\pdfx@ConvertUTFtoBE\pdfx@pdfSubject\xmp@Subject
\else
- \pdfx@GeneratePdfString\pdfx@pdfSubject\xmp@Subject
+%% \pdfx@GeneratePdfString\pdfx@pdfSubject\xmp@Subject % why does this fail ???
+ \pdfx@ConvertUTFtoBE{\pdfx@pdfSubject}{\xmp@Subject}% 2019-02-17
\fi\fi
\fi
\fi % end of \ifpdfx@nopdfinfo
@@ -2436,6 +2473,23 @@
\egroup
\spacefactor\accent@spacefactor
}
+%% same for named accents in math-mode
+\def\pdfx@mathaccentV#1#2#3#4#5{%
+ #5{\mathsurround=\z@\relax
+ \everymath{}%
+ \mathchoice
+ {\setbox\z@\hbox{$\displaystyle #5$}\kern-\wd\z@}%
+ {\setbox\z@\hbox{$\textstyle #5$}\kern-\wd\z@}%
+ {\setbox\z@\hbox{$\scriptstyle #5$}\kern-\wd\z@}%
+ {\setbox\z@\hbox{$\scriptscriptstyle #5$}\kern-\wd\z@}%
+ }%
+ \AMS@mathaccentV{#1}{#2}{#3}{#4}{\phantom{#5}}%
+}
+\AtBeginDocument{%
+ \@ifpackageloaded{amsmath}{%
+ \let\AMS@mathaccentV\mathaccentV
+ \let\mathaccentV\pdfx@mathaccentV}%
+}%
%% How to support XeTeX here ?
%%%%% adjust accent characters to the Unicode Combining variant %%%%
@@ -2479,25 +2533,30 @@
\pdfglyphtounicode{space_uni034D}{034D}%
}
-\AtBeginDocument{%
+\def\pdfx@check@accents{%
\ifx\add@accent\LTX@add@accent
\let\add@accent\PDFX@add@accent
\else
\expandafter\ifx\csname MT@orig@add@accent\endcsname\relax
- \TPDF@error{another package has already patched \string\add@accent }%
- \else
+ \@ifpackageloaded{mmap}{}{%
+ \pdfx@ErrorWarning{another package has patched \string\add@accent }%
+ {Hit <return> to continue}{}{}}%
+ \else
\expandafter\let\csname MT@orig@add@accent\endcsname\PDFX@add@accent
\fi\fi
\ifxetex
\else
\PDFX@combiningchars@unicode
- \@ifpackageloaded{newtxmath}{%
- \pdfglyphtounicode{vec}{20D7}%
- \pdfglyphtounicode{rvec}{20D6}%
- \pdfglyphtounicode{lrvec}{20E1}%
- }{}%
+%% this is now handled by glyphtounicode-ntx.tex
+%% \@ifpackageloaded{newtxmath}{%
+%% \pdfglyphtounicode{vec}{20D7}%
+%% \pdfglyphtounicode{rvec}{20D6}%
+%% \pdfglyphtounicode{lrvec}{20E1}%
+%% }{}%
\fi % end of \ifxetex
+ \let\pdfx@check@accents\unDefiNeD
}
+\AtBeginDocument{\pdfx@check@accents}
%% suppress hyperlinks when generating PDF/X
\def\pdfx@linkfile@pdfX#1#2#3{%
@@ -2863,7 +2922,7 @@
%
% this will have been done already for PDF/X
%
- \PassOptionsToPackage{xcolor}{cmyk,hyperref}
+ \PassOptionsToPackage{cmyk,hyperref}{xcolor}
\def\pdfx@handlexcolor{\def\@@mod{cmyk}\selectcolormodel{cmyk}%
\convertcolorsUtrue\convertcolorsDtrue}
\ifpdfx@x
@@ -2887,7 +2946,7 @@
%% }
\fi
\else
- \PassOptionsToPackage{xcolor}{rgb,hyperref}
+ \PassOptionsToPackage{rgb,hyperref}{xcolor}
\def\pdfx@handlexcolor{\def\@@mod{rgb}\selectcolormodel{rgb}%
\convertcolorsUtrue\convertcolorsDtrue}
\fi