diff options
Diffstat (limited to 'Master/texmf-dist/tex')
22 files changed, 3759 insertions, 1570 deletions
diff --git a/Master/texmf-dist/tex/latex/pdfx/AdobeColorProfiles.tex b/Master/texmf-dist/tex/latex/pdfx/AdobeColorProfiles.tex index 5d78bafe9e4..a4dea479276 100644 --- a/Master/texmf-dist/tex/latex/pdfx/AdobeColorProfiles.tex +++ b/Master/texmf-dist/tex/latex/pdfx/AdobeColorProfiles.tex @@ -1,4 +1,11 @@ +%%% +%%% file: AdobeColorProfiles.tex +%%% version 1.1 2018-11-15 +%%% information compiled by: <ross.moore@mq.edu.au> +%%% % This file gives macros to specify CMYK Color Profiles as supported by Adobe's Acrobat Pro DC software. +% Some alternatives are also included, available on some MacOS platforms +% % Identifying names, comments and descriptions are taken from AC/DC's "Color Setup" Preferences panel. % --- user-command --- CMYK profile needed with PDF/X-?? files % \setCMYKcolorprofile{<filename>}{<output intent>}{<identifier>}{<registry URL>} @@ -23,15 +30,32 @@ {Coated FOGRA39 \string\(ISO 12647-2:2004\string\)}% /ProfileName {http://www.color.org}% /RegistryName }% +% also available using: +\gdef\MacFOGRAXXXIX{% + \pdfxSetCMYKcolorProfileDir\MacOSLibraryColordir + \setCMYKcolorprofile{CoatedFOGRA39.icc}% + {CoatedFOGRA39}% + {Coated FOGRA39 \string\(ISO 12647-2:2004\string\)}% /ProfileName + {http://www.color.org}% /RegistryName +} -% Coated GRACoL — no + +% Coated GRACoL % Coated GRACoL 2006 \(ISO 12647-2:2004\) \gdef\CoatedGRACoL{\setCMYKcolorprofile{CoatedGRACoL2006.icc}% {CGATS TR 006}% /OutputConditionIdentifier % {GRACoL2006_Coated1v2.icc}% /ProfileName {Coated GRACoL 2006 \string\(ISO 12647-2:2004\string\)}% {http://www.color.org}% /RegistryName -}% does not validate ??? +}% +% also available using: +\gdef\MacCoatedGRACoL{% + \pdfxSetCMYKcolorProfileDir\MacOSLibraryColordir + \setCMYKcolorprofile{GRACoL2006_Coated1v2.icc}% + {CGATS TR 006}% /OutputConditionIdentifier + {Coated GRACoL 2006 \string\(ISO 12647-2:2004\string\)}% + {http://www.color.org}% /RegistryName +}% % ISO Web Coated @@ -59,6 +83,14 @@ % {Japan Color 2001 Coated: Printing process definition: ISO 12647-2:2004, sheet-fed offset printing, positive plates, paper type 3 \string\(coated, 105 gsm\string\), screen frequency 69/cm.}% {http://www.color.org}% /RegistryName }% +% also available using: +\gdef\MacJapanColorMMICoated{% + \pdfxSetCMYKcolorProfileDir\MacOSLibraryColordir + \setCMYKcolorprofile{JapanColor2001Coated.icc}% + {JC200103}% /OutputConditionIdentifier + {Japan Color 2001 Coated}% /ProfileName + {http://www.color.org}% /RegistryName +}% % Japan Color 2001 Uncoated @@ -127,32 +159,47 @@ }% -% U.S. Web Coated (SWOP) 3v2 – no +% U.S. Web Coated (SWOP) 3v2 \gdef\SWOPCGATSIII{\setCMYKcolorprofile{WebCoatedSWOP2006Grade3.icc}% {CGATS TR 003}% /OutputConditionIdentifier {SWOP2006_Coated3v2.icc}% /ProfileName % {Web Offset CTP plates ISO 2846-1 Inks - Variable screen frequency / G7 Methodology / Grade #3 paper}% /OutputCondition {http://www.color.org}% /RegistryName -}% does not validate - - -% U.S. Web Coated (SWOP) 5v2 – no +}% +% also available using +\gdef\MacSWOPCGATSIII{% + \pdfxSetCMYKcolorProfileDir\MacOSLibraryColordir + \setCMYKcolorprofile{SWOP2006_Coated3v2.icc}% + {CGATS TR 003}% /OutputConditionIdentifier + {SWOP2006_Coated3v2.icc}% /ProfileName + {http://www.color.org}% /RegistryName +} + +% U.S. Web Coated (SWOP) 5v2 \gdef\SWOPCGATSV{\setCMYKcolorprofile{WebCoatedSWOP2006Grade5.icc}% {CGATS TR 005}% /OutputConditionIdentifier {SWOP2006_Coated5v2.icc}% /ProfileName % {Web Offset CTP plates ISO 2846-1 Inks - Variable screen frequency / G7 Methodology / grade #5 Paper}% /OutputCondition {http://www.color.org}% /RegistryName -}% does not validate +}% -% ISO Coated v2 (ECI) – no +% ISO Coated v2 (ECI) \gdef\ISOCoatedECI{\setCMYKcolorprofile{CoatedFOGRA39.icc}% {FOGRA39}% /OutputConditionIdentifier {ISO Coated v2 \string\(ECI\string\)}% /ProfileName % {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.}% /OutputCondition {http://www.color.org}% /RegistryName -}% does not validate +}% +% also available using +\gdef\MacISOCoatedECI{% + \pdfxSetCMYKcolorProfileDir\MacOSLibraryColordir + \setCMYKcolorprofile{ISOcoated_v2_eci.icc}% + {FOGRA39}% /OutputConditionIdentifier + {ISO Coated v2 \string\(ECI\string\)}% /ProfileName + {http://www.color.org}% /RegistryName +}% % FOGRA29 @@ -183,11 +230,31 @@ %Uses the FOGRA27 press characterization. It is designed to produce quality separations for standard ISO printing using: 350% total ink coverage, positive film and coated paper. {http://www.color.org}% /RegistryName }% +% also available using: +\gdef\MacCoatedFOGRA{% + \pdfxSetCMYKcolorProfileDir\MacOSLibraryColordir + \setCMYKcolorprofile{CoatedFOGRA27.icc}% + {FOGRA27}% + {Coated FOGRA27 \(ISO 12647-2:2004\)}% + {http://www.color.org}% /RegistryName +}% +% ISO Newspaper (IFRA 26%) +% this is not in Adobe's directory, but is supported by: +\gdef\MacIFRAXXVI{% + \pdfxSetCMYKcolorProfileDir\MacOSLibraryColordir + \setCMYKcolorprofile{ISOnewspaper26v4.icc}% + {IFRA26}% + {Printing process definition: ISO/DIS 12647-3:2004, Coldset offset printing, contact exposed negative acting plates or computer to plate \(tone value increase of 26\%\), newsprint, screen ruling 40 lines per cm.}% + {http://www.color.org}% /RegistryName +} + \endinput +%% Incomplete information on other Profiles + % U.S. Sheetfed Coated v2 % USSheetfedCoated.icc \gdef\SheetfedCoated{\setCMYKcolorprofile{USSheetfedCoated.icc}% @@ -205,9 +272,7 @@ {http://www.color.org}% /RegistryName }% - - -% ISO Newspaper (IFRA 26%) – no +% ISO Newspaper (IFRA 26%) – needs: \gdef\IFRAXXVI{\setEXTERNALprofile{ISOnewspaper26v4}% /ProfileName {Printing process definition: ISO/DIS 12647-3:2004, Coldset offset printing, contact exposed negative acting plates or computer to plate \(tone value increase of 26\%\), newsprint, screen ruling 40 lines per cm.}% /OutputCondition {IFRA26}% /OutputConditionIdentifier /OutputCondition (dIDS_OUTPUTCOND_IFRA26_long) diff --git a/Master/texmf-dist/tex/latex/pdfx/CallasColorProfiles.tex b/Master/texmf-dist/tex/latex/pdfx/CallasColorProfiles.tex new file mode 100644 index 00000000000..c44a1794bef --- /dev/null +++ b/Master/texmf-dist/tex/latex/pdfx/CallasColorProfiles.tex @@ -0,0 +1,118 @@ +% This file gives macros to specify CMYK Color Profiles as supported by Callas's pdfaPilot 7 software. +% Identifying names, comments and descriptions are taken from pdfaPilot's "Color Setup" Preferences panel. +% --- user-command --- CMYK profile needed with PDF/X-?? files +% \setCMYKcolorprofile{<filename>}{<output intent>}{<identifier>}{<registry URL>} +% \setCUSTOMcolorprofile{<filename>}{<directory>}{<identifier>}{<registry URL>}% +%% {<num>}{<ICC version>}{<color names>}{<CheckSum>} +% e.g. + +\begingroup + \catcode`\_ 12 \catcode`\( 12 \catcode`\) 12 \catcode`\/ 12 \catcode`\- 12 + +%% Locations of Callas profiles on Mac OS X: +%% consult the list of profiles given at the end, to choose the correct directory. +% +\gdef\CallasMacOSpdfaPilotdir{/Applications/callas pdfaPilot 7/callas pdfaPilot.app/Contents/Resources/etc} +\gdef\CallasMacOSAcroPlugindir{% + /Library/Application Support/Adobe/Acrobat/Beta/Plug-ins/callas software/pdfaPilot7.acroplugin/Versions/A/Resources/} + +%% use one of the following: +\global\let\CallasMacOSdir\CallasMacOSpdfaPilotdir +%\global\let\CallasMacOSdir\CallasMacOSAcroPlugindir + +\gdef\CallasAPDFLdir{\CallasMacOSdir/APDFL/Resource/Color/Profiles/} +\gdef\CallasColorConversiondir{\CallasMacOSdir/ColorConversion/ManageColors/} +\gdef\CallasDeviceLinkdir{\CallasMacOSdir/DeviceLink/} +\gdef\CallasProfilesdir{\CallasMacOSdir/ICC profiles/} +\gdef\CallasCMYKdir{\CallasMacOSdir/ICC profiles/CMYK/} +\gdef\CallasRGBdir{\CallasMacOSdir/ICC profiles/RGB/} +\gdef\CallasGraydir{\CallasMacOSdir/ICC profiles/Gray/} +\gdef\CallasLabdir{\CallasMacOSdir/ICC profiles/Lab/} +\gdef\CallasPDFPSTool{\CallasMacOSdir/PDFPSTool/ICCProfiles/} + +%e.g., Use \pdfxSetCMYKcolorProfileDir{\CallasCMYKdir} within the .xmpdata file + + +%% Custom Color space example + +% 7C Indigo TAC370 (ColorLogic) +% "7 color profile" +% Custom 7-color profile. +\gdef\viiIndigoTAC{% + \let\CallasMacOSdir\CallasMacOSpdfaPilotdir + \setCUSTOMcolorprofile + {7C Indigo_TAC370_ColorLogic.icc}% + {\CallasProfilesdir}% + {7C Indigo TAC370 (ColorLogic)}% /ProfileName + {http://www.colorlogic.de}% /RegistryName + {7CLR}% number of colors specifier + {02400000}% ICC version + {/Cyan /Magenta /Yellow /Black /Orange /Green /Violet}% colour names + {48110b8b410ee6be015f3932c3167869}% CheckSum +}% + + +\endgroup +\endinput + +/Applications/callas pdfaPilot 7/callas pdfaPilot.app/Contents/Resources/etc/ + + APDFL/Resource/Color/Profiles/USWebCoatedSWOP.icc + ColorConversion/ManageColors/DefaultCMYK.icc + DeviceLink/DL4_sRGB-ISOcoated_v2_300_bas_0001.icc + DeviceLink/ISOcoated_v2_to_PSOcoated_v3_DeviceLink.icc + DeviceLink/PSOcoated_v3_to_ISOcoated_v2_DeviceLink.icc + ICC profiles/7C Indigo_TAC370_ColorLogic.icc + ICC profiles/sRGB IEC61966-2.1.icc + ICC profiles/CMYK/CoatedFOGRA27.icc + ICC profiles/CMYK/CoatedFOGRA39.icc + ICC profiles/CMYK/EuroscaleCoated.icc + ICC profiles/CMYK/GRACoL2006_Coated1v2.icc + ICC profiles/CMYK/ISOcoated_v2_eci.icc + ICC profiles/CMYK/ISOnewspaper26v4.icc + ICC profiles/CMYK/JapanColor2001Coated.icc + ICC profiles/CMYK/PSO_Coated_300_NPscreen_ISO12647_eci.icc + ICC profiles/CMYK/PSO_LWC_Improved_eci.icc + ICC profiles/CMYK/PSO_MFC_Paper_eci.icc + ICC profiles/CMYK/PSO_SNP_Paper_eci.icc + ICC profiles/CMYK/PSO_Uncoated_ISO12647_eci.icc + ICC profiles/CMYK/PSOcoated_v3.icc + ICC profiles/CMYK/SWOP2006_Coated3v2.icc + ICC profiles/CMYK/USWebCoatedSWOP.icc + ICC profiles/CMYK/callas_small_FOGRA39.icc + ICC profiles/Gray/Dot Gain 10 prct.icc + ICC profiles/Gray/Dot Gain 15 prct.icc + ICC profiles/Gray/Dot Gain 20 prct.icc + ICC profiles/Gray/Dot Gain 25 prct.icc + ICC profiles/Gray/Dot Gain 30 prct.icc + ICC profiles/Lab/Generic Lab Profile.icc + ICC profiles/RGB/AdobeRGB1998.icc + ICC profiles/RGB/ECI-RGB.V1.0.icc + ICC profiles/RGB/eciRGB_v2.icc + PDFPSTool/ICCProfiles/AdobeRGB1998.icc + PDFPSTool/ICCProfiles/AppleRGB.icc + PDFPSTool/ICCProfiles/BlackWhite.icc + PDFPSTool/ICCProfiles/CIERGB.icc + PDFPSTool/ICCProfiles/CoatedFOGRA27.icc + PDFPSTool/ICCProfiles/CoatedFOGRA39.icc + PDFPSTool/ICCProfiles/CoatedGRACol2006.icc + PDFPSTool/ICCProfiles/ColorMatchRGB.icc + PDFPSTool/ICCProfiles/EuropeISOCoatedFOGRA27.icc + PDFPSTool/ICCProfiles/EuroscaleCoated.icc + PDFPSTool/ICCProfiles/EuroscaleUncoated.icc + PDFPSTool/ICCProfiles/JapanColor2001Coated.icc + PDFPSTool/ICCProfiles/JapanColor2001Uncoated.icc + PDFPSTool/ICCProfiles/JapanColor2002Newspaper.icc + PDFPSTool/ICCProfiles/JapanStandard.icc + PDFPSTool/ICCProfiles/JapanWebCoated.icc + PDFPSTool/ICCProfiles/PAL_SECAM.icc + PDFPSTool/ICCProfiles/SMPTE-C.icc + PDFPSTool/ICCProfiles/USSheetfedCoated.icc + PDFPSTool/ICCProfiles/USSheetfedUncoated.icc + PDFPSTool/ICCProfiles/USWebCoatedSWOP.icc + PDFPSTool/ICCProfiles/USWebUncoated.icc + PDFPSTool/ICCProfiles/UnCoatedFOGRA29.icc + PDFPSTool/ICCProfiles/WebCoatedFOGRA28.icc + PDFPSTool/ICCProfiles/WebCoatedSWOP2006Grade3.icc + PDFPSTool/ICCProfiles/WebCoatedSWOP2006Grade5.icc + PDFPSTool/ICCProfiles/WideGamutRGB.icc 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/armglyphs.dfu b/Master/texmf-dist/tex/latex/pdfx/armglyphs.dfu index acfdfa4e1c9..a71c64aa5b2 100644 --- a/Master/texmf-dist/tex/latex/pdfx/armglyphs.dfu +++ b/Master/texmf-dist/tex/latex/pdfx/armglyphs.dfu @@ -83,7 +83,7 @@ \pdfglyphtounicode{Armre}{0550} \pdfglyphtounicode{Armse}{054D} \pdfglyphtounicode{Armtyun}{054F} -\pdfglyphtounicode{Armvovyun}{05480552} +\pdfglyphtounicode{Armvovyun}{0548 0552} \pdfglyphtounicode{Armvev}{054E} \pdfglyphtounicode{Armvyun}{0552} \pdfglyphtounicode{Armkhe}{053D} @@ -115,7 +115,7 @@ \pdfglyphtounicode{armre}{0580} \pdfglyphtounicode{armse}{057D} \pdfglyphtounicode{armtyun}{057F} -\pdfglyphtounicode{armvovyun}{05780582} +\pdfglyphtounicode{armvovyun}{0578 0582} \pdfglyphtounicode{armvev}{057E} \pdfglyphtounicode{armvyun}{0582} \pdfglyphtounicode{armkhe}{056D} diff --git a/Master/texmf-dist/tex/latex/pdfx/coated_FOGRA39L_argl.icc b/Master/texmf-dist/tex/latex/pdfx/coated_FOGRA39L_argl.icc Binary files differdeleted file mode 100644 index 449c5f922f9..00000000000 --- a/Master/texmf-dist/tex/latex/pdfx/coated_FOGRA39L_argl.icc +++ /dev/null diff --git a/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-cmr.tex b/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-cmr.tex index 731a8d07b69..f0f377fe0aa 100644 --- a/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-cmr.tex +++ b/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-cmr.tex @@ -1,6 +1,7 @@ % % Copyright (c) 2008, Han The Thanh <thanh@river-valley.org> % Copyright (c) 2014, Peter Selinger <selinger@mathstat.dal.ca> +% Copyright (c) 2018, Ross Moore <ross.moore@mq.edu.au> % % This file may be distributed and/or modified under the conditions % of the LaTeX Project Public License, either version 1.2 of this @@ -15,17 +16,18 @@ % Changes: % 2014/08/11: PS1 - mapped most glyphs to existing Unicode code points. % 2014/08/11: PS1 - added mappings for the xyatip and xybtip fonts. +% 2018/09/18: RRM - use variation selectors for the different sizes %% Glyphs from the cmex fonts: -\pdfglyphtounicode{angbracketleftBig}{27E8} -\pdfglyphtounicode{angbracketleftBigg}{27E8} -\pdfglyphtounicode{angbracketleftbig}{27E8} -\pdfglyphtounicode{angbracketleftbigg}{27E8} -\pdfglyphtounicode{angbracketrightBig}{27E9} -\pdfglyphtounicode{angbracketrightBigg}{27E9} -\pdfglyphtounicode{angbracketrightbig}{27E9} -\pdfglyphtounicode{angbracketrightbigg}{27E9} +\pdfglyphtounicode{angbracketleftBig}{27E8 FE02} +\pdfglyphtounicode{angbracketleftBigg}{27E8 FE04} +\pdfglyphtounicode{angbracketleftbig}{27E8 FE01} +\pdfglyphtounicode{angbracketleftbigg}{27E8 FE03} +\pdfglyphtounicode{angbracketrightBig}{27E9 FE02} +\pdfglyphtounicode{angbracketrightBigg}{27E9 FE04} +\pdfglyphtounicode{angbracketrightbig}{27E9 FE01} +\pdfglyphtounicode{angbracketrightbigg}{27E9 FE03} \pdfglyphtounicode{arrowbt}{2193} \pdfglyphtounicode{arrowdblbt}{21D3} \pdfglyphtounicode{arrowdbltp}{21D1} @@ -33,123 +35,123 @@ \pdfglyphtounicode{arrowhookright}{21A9} \pdfglyphtounicode{arrowtp}{2191} \pdfglyphtounicode{arrowvertex}{23D0} -\pdfglyphtounicode{arrowvertexdbl}{ED12} -\pdfglyphtounicode{backslashBig}{005C} -\pdfglyphtounicode{backslashBigg}{005C} -\pdfglyphtounicode{backslashbig}{005C} -\pdfglyphtounicode{backslashbigg}{005C} +\pdfglyphtounicode{arrowvertexdbl}{20E6}% was {ED12}% PUA +\pdfglyphtounicode{backslashBig}{005C FE02} +\pdfglyphtounicode{backslashBigg}{005C FE04} +\pdfglyphtounicode{backslashbig}{005C FE01} +\pdfglyphtounicode{backslashbigg}{005C FE03} \pdfglyphtounicode{braceex}{23AA} -\pdfglyphtounicode{bracehtipdownleft}{ED17} -\pdfglyphtounicode{bracehtipdownright}{ED18} -\pdfglyphtounicode{bracehtipupleft}{ED19} -\pdfglyphtounicode{bracehtipupright}{ED1A} -\pdfglyphtounicode{braceleftBig}{007B} -\pdfglyphtounicode{braceleftBigg}{007B} -\pdfglyphtounicode{braceleftbig}{007B} -\pdfglyphtounicode{braceleftbigg}{007B} +\pdfglyphtounicode{bracehtipdownleft}{23DF}% was {ED17}% PUA +\pdfglyphtounicode{bracehtipdownright}{23DF}% was {ED18}% PUA +\pdfglyphtounicode{bracehtipupleft}{23DE}% was {ED19}% PUA +\pdfglyphtounicode{bracehtipupright}{23DE}% was {ED1A}% PUA +\pdfglyphtounicode{braceleftBig}{007B FE02} +\pdfglyphtounicode{braceleftBigg}{007B FE04} +\pdfglyphtounicode{braceleftbig}{007B FE01} +\pdfglyphtounicode{braceleftbigg}{007B FE03} \pdfglyphtounicode{braceleftbt}{23A9} \pdfglyphtounicode{braceleftmid}{23A8} \pdfglyphtounicode{bracelefttp}{23A7} -\pdfglyphtounicode{bracerightBig}{007D} -\pdfglyphtounicode{bracerightBigg}{007D} -\pdfglyphtounicode{bracerightbig}{007D} -\pdfglyphtounicode{bracerightbigg}{007D} +\pdfglyphtounicode{bracerightBig}{007D FE02} +\pdfglyphtounicode{bracerightBigg}{007D FE04} +\pdfglyphtounicode{bracerightbig}{007D FE01} +\pdfglyphtounicode{bracerightbigg}{007D FE03} \pdfglyphtounicode{bracerightbt}{23AD} \pdfglyphtounicode{bracerightmid}{23AC} \pdfglyphtounicode{bracerighttp}{23AB} -\pdfglyphtounicode{bracketleftBig}{005B} -\pdfglyphtounicode{bracketleftBigg}{005B} -\pdfglyphtounicode{bracketleftbig}{005B} -\pdfglyphtounicode{bracketleftbigg}{005B} +\pdfglyphtounicode{bracketleftBig}{005B FE02} +\pdfglyphtounicode{bracketleftBigg}{005B FE04} +\pdfglyphtounicode{bracketleftbig}{005B FE01} +\pdfglyphtounicode{bracketleftbigg}{005B FE03} \pdfglyphtounicode{bracketleftbt}{23A3} \pdfglyphtounicode{bracketleftex}{23A2} \pdfglyphtounicode{bracketlefttp}{23A1} -\pdfglyphtounicode{bracketrightBig}{005D} -\pdfglyphtounicode{bracketrightBigg}{005D} -\pdfglyphtounicode{bracketrightbig}{005D} -\pdfglyphtounicode{bracketrightbigg}{005D} +\pdfglyphtounicode{bracketrightBig}{005D FE02} +\pdfglyphtounicode{bracketrightBigg}{005D FE04} +\pdfglyphtounicode{bracketrightbig}{005D FE01} +\pdfglyphtounicode{bracketrightbigg}{005D FE03} \pdfglyphtounicode{bracketrightbt}{23A6} \pdfglyphtounicode{bracketrightex}{23A5} \pdfglyphtounicode{bracketrighttp}{23A4} -\pdfglyphtounicode{ceilingleftBig}{2308} -\pdfglyphtounicode{ceilingleftBigg}{2308} -\pdfglyphtounicode{ceilingleftbig}{2308} -\pdfglyphtounicode{ceilingleftbigg}{2308} -\pdfglyphtounicode{ceilingrightBig}{2309} -\pdfglyphtounicode{ceilingrightBigg}{2309} -\pdfglyphtounicode{ceilingrightbig}{2309} -\pdfglyphtounicode{ceilingrightbigg}{2309} -\pdfglyphtounicode{circledotdisplay}{2A00} -\pdfglyphtounicode{circledottext}{2A00} -\pdfglyphtounicode{circlemultiplydisplay}{2A02} -\pdfglyphtounicode{circlemultiplytext}{2A02} -\pdfglyphtounicode{circleplusdisplay}{2A01} -\pdfglyphtounicode{circleplustext}{2A01} -\pdfglyphtounicode{contintegraldisplay}{222E} -\pdfglyphtounicode{contintegraltext}{222E} -\pdfglyphtounicode{coproductdisplay}{2210} -\pdfglyphtounicode{coproducttext}{2210} -\pdfglyphtounicode{floorleftBig}{230A} -\pdfglyphtounicode{floorleftBigg}{230A} -\pdfglyphtounicode{floorleftbig}{230A} -\pdfglyphtounicode{floorleftbigg}{230A} -\pdfglyphtounicode{floorrightBig}{230B} -\pdfglyphtounicode{floorrightBigg}{230B} -\pdfglyphtounicode{floorrightbig}{230B} -\pdfglyphtounicode{floorrightbigg}{230B} -\pdfglyphtounicode{hatwide}{02C6} -\pdfglyphtounicode{hatwider}{02C6} -\pdfglyphtounicode{hatwidest}{02C6} -\pdfglyphtounicode{integraldisplay}{222B} -\pdfglyphtounicode{integraltext}{222B} -\pdfglyphtounicode{intersectiondisplay}{22C2} -\pdfglyphtounicode{intersectiontext}{22C2} -\pdfglyphtounicode{logicalanddisplay}{22C0} -\pdfglyphtounicode{logicalandtext}{22C0} -\pdfglyphtounicode{logicalordisplay}{22C1} -\pdfglyphtounicode{logicalortext}{22C1} +\pdfglyphtounicode{ceilingleftBig}{2308 FE02} +\pdfglyphtounicode{ceilingleftBigg}{2308 FE04} +\pdfglyphtounicode{ceilingleftbig}{2308 FE01} +\pdfglyphtounicode{ceilingleftbigg}{2308 FE03} +\pdfglyphtounicode{ceilingrightBig}{2309 FE02} +\pdfglyphtounicode{ceilingrightBigg}{2309 FE04} +\pdfglyphtounicode{ceilingrightbig}{2309 FE01} +\pdfglyphtounicode{ceilingrightbigg}{2309 FE03} +\pdfglyphtounicode{circledotdisplay}{2A00 FE02} +\pdfglyphtounicode{circledottext}{2A00 FE01} +\pdfglyphtounicode{circlemultiplydisplay}{2A02 FE02} +\pdfglyphtounicode{circlemultiplytext}{2A02 FE01} +\pdfglyphtounicode{circleplusdisplay}{2A01 FE02} +\pdfglyphtounicode{circleplustext}{2A01 FE01} +\pdfglyphtounicode{contintegraldisplay}{222E FE02} +\pdfglyphtounicode{contintegraltext}{222E FE01} +\pdfglyphtounicode{coproductdisplay}{2210 FE02} +\pdfglyphtounicode{coproducttext}{2210 FE01} +\pdfglyphtounicode{floorleftBig}{230A FE02} +\pdfglyphtounicode{floorleftBigg}{230A FE04} +\pdfglyphtounicode{floorleftbig}{230A FE01} +\pdfglyphtounicode{floorleftbigg}{230A FE03} +\pdfglyphtounicode{floorrightBig}{230B FE02} +\pdfglyphtounicode{floorrightBigg}{230B FE04} +\pdfglyphtounicode{floorrightbig}{230B FE01} +\pdfglyphtounicode{floorrightbigg}{230B FE03} +\pdfglyphtounicode{hatwide}{02C6 FE01} +\pdfglyphtounicode{hatwider}{02C6 FE02} +\pdfglyphtounicode{hatwidest}{02C6 FE03} +\pdfglyphtounicode{integraldisplay}{222B FE02} +\pdfglyphtounicode{integraltext}{222B FE01} +\pdfglyphtounicode{intersectiondisplay}{22C2 FE02} +\pdfglyphtounicode{intersectiontext}{22C2 FE01} +\pdfglyphtounicode{logicalanddisplay}{22C0 FE02} +\pdfglyphtounicode{logicalandtext}{22C0 FE01} +\pdfglyphtounicode{logicalordisplay}{22C1 FE02} +\pdfglyphtounicode{logicalortext}{22C1 FE01} \pdfglyphtounicode{mapsto}{21A6} -\pdfglyphtounicode{parenleftBig}{0028} -\pdfglyphtounicode{parenleftBigg}{0028} -\pdfglyphtounicode{parenleftbig}{0028} -\pdfglyphtounicode{parenleftbigg}{0028} +\pdfglyphtounicode{parenleftBig}{0028 FE02} +\pdfglyphtounicode{parenleftBigg}{0028 FE04} +\pdfglyphtounicode{parenleftbig}{0028 FE01} +\pdfglyphtounicode{parenleftbigg}{0028 FE03} \pdfglyphtounicode{parenleftbt}{239D} \pdfglyphtounicode{parenleftex}{239C} \pdfglyphtounicode{parenlefttp}{239B} -\pdfglyphtounicode{parenrightBig}{0029} -\pdfglyphtounicode{parenrightBigg}{0029} -\pdfglyphtounicode{parenrightbig}{0029} -\pdfglyphtounicode{parenrightbigg}{0029} +\pdfglyphtounicode{parenrightBig}{0029 FE02} +\pdfglyphtounicode{parenrightBigg}{0029 FE04} +\pdfglyphtounicode{parenrightbig}{0029 FE01} +\pdfglyphtounicode{parenrightbigg}{0029 FE03} \pdfglyphtounicode{parenrightbt}{23A0} \pdfglyphtounicode{parenrightex}{239F} \pdfglyphtounicode{parenrighttp}{239E} -\pdfglyphtounicode{productdisplay}{220F} -\pdfglyphtounicode{producttext}{220F} -\pdfglyphtounicode{radicalBig}{221A} -\pdfglyphtounicode{radicalBigg}{221A} -\pdfglyphtounicode{radicalbig}{221A} -\pdfglyphtounicode{radicalbigg}{221A} -\pdfglyphtounicode{radicalbt}{221A} -\pdfglyphtounicode{radicaltp}{ED6A} -\pdfglyphtounicode{radicalvertex}{ED6B} -\pdfglyphtounicode{slashBig}{002F} -\pdfglyphtounicode{slashBigg}{002F} -\pdfglyphtounicode{slashbig}{002F} -\pdfglyphtounicode{slashbigg}{002F} -\pdfglyphtounicode{summationdisplay}{2211} -\pdfglyphtounicode{summationtext}{2211} +\pdfglyphtounicode{productdisplay}{220F FE02} +\pdfglyphtounicode{producttext}{220F FE01} +\pdfglyphtounicode{radicalBig}{221A FE02} +\pdfglyphtounicode{radicalBigg}{221A FE04} +\pdfglyphtounicode{radicalbig}{221A FE01} +\pdfglyphtounicode{radicalbigg}{221A FE03} +\pdfglyphtounicode{radicalbt}{23B7}% was {221A} +\pdfglyphtounicode{radicaltp}{231C}% was {ED6A}% PUA +\pdfglyphtounicode{radicalvertex}{20D3}% was {ED6B}% PUA +\pdfglyphtounicode{slashBig}{002F FE02} +\pdfglyphtounicode{slashBigg}{002F FE04} +\pdfglyphtounicode{slashbig}{002F FE01} +\pdfglyphtounicode{slashbigg}{002F FE03} +\pdfglyphtounicode{summationdisplay}{2211 FE02} +\pdfglyphtounicode{summationtext}{2211 FE01} \pdfglyphtounicode{tie}{2040} -\pdfglyphtounicode{tildewide}{02DC} -\pdfglyphtounicode{tildewider}{02DC} -\pdfglyphtounicode{tildewidest}{02DC} -\pdfglyphtounicode{uniondisplay}{22C3} -\pdfglyphtounicode{unionmultidisplay}{2A04} -\pdfglyphtounicode{unionmultitext}{2A04} -\pdfglyphtounicode{unionsqdisplay}{2A06} -\pdfglyphtounicode{unionsqtext}{2A06} -\pdfglyphtounicode{uniontext}{22C3} -\pdfglyphtounicode{vextenddouble}{ED79} -\pdfglyphtounicode{vextendsingle}{23D0} +\pdfglyphtounicode{tildewide}{02DC FE01} +\pdfglyphtounicode{tildewider}{02DC FE02} +\pdfglyphtounicode{tildewidest}{02DC FE03} +\pdfglyphtounicode{uniondisplay}{22C3 FE02} +\pdfglyphtounicode{unionmultidisplay}{2A04 FE02} +\pdfglyphtounicode{unionmultitext}{2A04 FE01} +\pdfglyphtounicode{unionsqdisplay}{2A06 FE02} +\pdfglyphtounicode{unionsqtext}{2A06 FE01} +\pdfglyphtounicode{uniontext}{22C3 FE01} +\pdfglyphtounicode{vextenddouble}{20E6}% was {ED79}% PUA +\pdfglyphtounicode{vextendsingle}{20D3}%%% was {23D0} %% Glyphs from the cmr fonts: diff --git a/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-ntx.tex b/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-ntx.tex new file mode 100644 index 00000000000..71d85435fce --- /dev/null +++ b/Master/texmf-dist/tex/latex/pdfx/glyphtounicode-ntx.tex @@ -0,0 +1,371 @@ +% +% Unicode mappings for ntx text/math glyph names +% (c) 2018 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' + +%% from TeXGyre fonts +\pdfglyphtounicode{cwm}{200B}% 0-width space +\pdfglyphtounicode{diameter}{2300}% +\pdfglyphtounicode{anglearc}{2222}% +\pdfglyphtounicode{ell}{2113}% +\pdfglyphtounicode{dotbelow}{0323}% +\pdfglyphtounicode{hookabove}{0309}% +%% Private Use characters +\pdfglyphtounicode{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}% +%% 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} +%% from txbsya +\pdfglyphtounicode{squaresmallsolid}{25A0} +\pdfglyphtounicode{axisshort}{2027}% hyphenation point +\pdfglyphtounicode{arrowaxisright}{27A1}% Dingbat +\pdfglyphtounicode{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}% ? +%% 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}% ??? + +%% 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} +% 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}% .. .. .. +% 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 +% T1-encoding +\pdfglyphtounicode{perthousandzero}{2080}% use subscript 0 +% ntxsyralt +\pdfglyphtounicode{kappa1}{D835 DF18} +\pdfglyphtounicode{kappa1up}{03F0} +% 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} +% rtxbmi-rev , rtxbmi5-rev , rtxbmi7-rev +\pdfglyphtounicode{harpoonleftup}{21BF} +\pdfglyphtounicode{harpoonrightup}{21BE} +\pdfglyphtounicode{harpoonleftdown}{21C3} +\pdfglyphtounicode{harpoonrightdown}{21C2} +\pdfglyphtounicode{hookleftchar}{02D2} +\pdfglyphtounicode{hookrightchar}{02D3} diff --git a/Master/texmf-dist/tex/latex/pdfx/l8uenc.def b/Master/texmf-dist/tex/latex/pdfx/l8u-penc.def index 92b1be827fa..ec13c426606 100644 --- a/Master/texmf-dist/tex/latex/pdfx/l8uenc.def +++ b/Master/texmf-dist/tex/latex/pdfx/l8u-penc.def @@ -1,13 +1,14 @@ %% -%% This is file `l8uenc.def' +%% This is file `l8u-penc.def' +%% Formerly known as `l8uenc.def' %% -%% l8uenc.def +%% l8u-penc.def %% %% This is a hand-written file, based upon t1enc.def %% pd1end.def, puenc.def, puvnenc.def and others, %% with extensions for more composite characters. %% -%% Copyright 2017 Ross Moore <ross.moore@mq.edu.au> +%% Copyright 2018 Ross Moore <ross.moore@mq.edu.au> %% %% defines re-binding commands %% \LIIXUmapmathspaces @@ -16,8 +17,8 @@ %% \LIIXUscriptcommands %% \LIIXUtipacommands %% -\ProvidesFile{l8uenc.def} - [2017/03/18 v0.7 +\ProvidesFile{l8u-penc.def} + [2017/06/23 v0.8 Custom LaTeX file, for UTF8 encoded letters and symbols] %\DeclareFontEncoding{L8U}{}{} @@ -87,17 +88,19 @@ \DeclareTextCommand{\.}{L8U}[1]{#1̇} \DeclareTextCommand{\"}{L8U}[1]{#1̈} %\DeclareTextCommand{\h}{L8U}[1]{#1̉}% Vietnamese hook above -\DeclareTextCommand{\m}{L8U}[1]{#1̉}% TIPA misc., hook above +\DeclareTextCommand{\texttipam}{L8U}[1]{#1̉}% TIPA misc., hook above \DeclareTextCommand{\r}{L8U}[1]{#1̊} \DeclareTextCommand{\H}{L8U}[1]{#1̋} \DeclareTextCommand{\v}{L8U}[1]{#1̌} \DeclareTextCommand{\textvbaraccent}{L8U}[1]{#1̍} \DeclareTextCommand{\textdoublevbaraccent}{L8U}[1]{#1̎} \DeclareTextCommand{\textdblgravecmb}{L8U}[1]{#1̏} +\DeclareTextCommand{\textdoublegrave}{L8U}[1]{#1̏} \DeclareTextCommand{\textdblgrave}{L8U}[1]{#1̏} -\DeclareTextCommand{\G}{L8U}[1]{#1̏}% double-grave accent +\DeclareTextCommand{\texttipaG}{L8U}[1]{#1̏}% double-grave accent \DeclareTextCommand{\textdotbreve}{L8U}[1]{#1̐} \DeclareTextCommand{\textroundcap}{L8U}[1]{#1̑} +%\DeclareTextCommand{\|c}{L8U}[1]{#1̑}% used in IPA environment \DeclareTextCommand{\textinvbreve}{L8U}[1]{#1̑} \DeclareTextCommand{\textturncommaabove}{L8U}[1]{#1̒} \DeclareTextCommand{\textcommaabove}{L8U}[1]{#1̒} @@ -105,51 +108,69 @@ \DeclareTextCommand{\textcommaabover}{L8U}[1]{#1̕} \DeclareTextCommand{\textsubgrave}{L8U}[1]{#1̖} \DeclareTextCommand{\textsubacute}{L8U}[1]{#1̗} +\DeclareTextCommand{\textadvancing}{L8U}[1]{#1̘} \DeclareTextCommand{\textsubadvancing}{L8U}[1]{#1̘} +%\DeclareTextCommand{\|<}{L8U}[1]{#1̘}% used in IPA environment +\DeclareTextCommand{\textretracting}{L8U}[1]{#1̙} \DeclareTextCommand{\textsubretracting}{L8U}[1]{#1̙} +%\DeclareTextCommand{\|>}{L8U}[1]{#1̙}% used in IPA environment \DeclareTextCommand{\textlangleabove}{L8U}[1]{#1̚} \DeclareTextCommand{\textrighthorn}{L8U}[1]{#1̛} \DeclareTextCommand{\textsublhalfring}{L8U}[1]{#1̜} +%\DeclareTextCommand{\|(}{L8U}[1]{#1̜}% used in IPA environment \DeclareTextCommand{\textraising}{L8U}[1]{#1̝} +%\DeclareTextCommand{\|'}{L8U}[1]{#1̝}% used in IPA environment \DeclareTextCommand{\textlowering}{L8U}[1]{#1̞} +%\DeclareTextCommand{\|`}{L8U}[1]{#1̞}% used in IPA environment \DeclareTextCommand{\textsubplus}{L8U}[1]{#1̟} +%\DeclareTextCommand{\|+}{L8U}[1]{#1̟}% used in IPA environment \DeclareTextCommand{\textsubminus}{L8U}[1]{#1̠} % \DeclareTextCommand{\textpalhookbelow}{L8U}[1]{#1̡}% U+0321 \DeclareTextCommand{\textpalhook}{L8U}[1]{#1̡}% \DeclareTextCommand{\textrethookbelow}{L8U}[1]{#1̢}% U+0322 -\DeclareTextCommand{\M}{L8U}[1]{#1̢}% TIPA Misc., hook below +\DeclareTextCommand{\texttipaM}{L8U}[1]{#1̢}% TIPA Misc., hook below \DeclareTextCommand{\textsubdot}{L8U}[1]{#1̣} \DeclareTextCommand{\d}{L8U}[1]{#1̣} \DeclareTextCommand{\textsubumlaut}{L8U}[1]{#1̤} +%\DeclareTextCommand{\"*}{L8U}[1]{#1̩}% used in IPA environment \DeclareTextCommand{\textsubring}{L8U}[1]{#1̥} +%\DeclareTextCommand{\r*}{L8U}[1]{#1̥}% used in IPA environment \DeclareTextCommand{\textcommabelow}{L8U}[1]{#1̦} \DeclareTextCommand{\c}{L8U}[1]{#1̧} \DeclareTextCommand{\textpolhook}{L8U}[1]{#1̨} \DeclareTextCommand{\k}{L8U}[1]{#1̨} \DeclareTextCommand{\textsyllabic}{L8U}[1]{#1̩} +%\DeclareTextCommand{\s}{L8U}[1]{#1̩}% used in IPA environment \DeclareTextCommand{\textsubbridge}{L8U}[1]{#1̪} +%\DeclareTextCommand{\|[}{L8U}[1]{#1̪}% used in IPA environment \DeclareTextCommand{\textsubw}{L8U}[1]{#1̫} +%\DeclareTextCommand{\|w}{L8U}[1]{#1̫}% used in IPA environment \DeclareTextCommand{\textsubwedge}{L8U}[1]{#1̭} \DeclareTextCommand{\textsubcircum}{L8U}[1]{#1̭} \DeclareTextCommand{\charettesubbreve}{L8U}[1]{#1̮} \DeclareTextCommand{\textsubbreve}{L8U}[1]{#1̮} \DeclareTextCommand{\textsubarch}{L8U}[1]{#1̯} \DeclareTextCommand{\textsubtilde}{L8U}[1]{#1̰} +%\DeclareTextCommand{\~*}{L8U}[1]{#1̰}% used in IPA environment \DeclareTextCommand{\textsubbar}{L8U}[1]{#1̱} %\DeclareTextCommand{\textsubmacron}{L8U}[1]{#1̱} -\DeclareTextCommand{\b}{L8U}[1]{#1̱} +\DeclareTextCommand{\texttipab}{L8U}[1]{#1̱} \DeclareTextCommand{\textsubdoublebar}{L8U}[1]{#1͇} \DeclareTextCommand{\textsuperimposetilde}{L8U}[1]{#1̴} -\DeclareTextCommand{\B}{L8U}[1]{#1̵}% TIPA, short stroke over +\DeclareTextCommand{\texttipaB}{L8U}[1]{#1̵}% TIPA, short stroke over \DeclareTextCommand{\textlstrokethru}{L8U}[1]{#1̶} \DeclareTextCommand{\textsstrikethru}{L8U}[1]{#1̷} \DeclareTextCommand{\textlstrikethru}{L8U}[1]{#1̸} \DeclareTextCommand{\textsubrhalfring}{L8U}[1]{#1̹} +%\DeclareTextCommand{\|)}{L8U}[1]{#1̹}% used in IPA environment \DeclareTextCommand{\textinvsubbridge}{L8U}[1]{#1̺} +%\DeclareTextCommand{\|]}{L8U}[1]{#1̺}% used in IPA environment \DeclareTextCommand{\textsubsquare}{L8U}[1]{#1̻} \DeclareTextCommand{\textseagull}{L8U}[1]{#1̼} +%\DeclareTextCommand{\|m}{L8U}[1]{#1̼}% used in IPA environment \DeclareTextCommand{\textovercross}{L8U}[1]{#1̽} +%\DeclareTextCommand{\|x}{L8U}[1]{#1̽}% used in IPA environment %\DeclareTextCommand{\textverticaltilde}{L8U}[1]{#1̾} \DeclareTextCommand{\textdoubleoverline}{L8U}[1]{#1̿} % Ux0340 – Ux034F @@ -159,6 +180,7 @@ %\DeclareTextCommand{\textdialytikatonos}{L8U}[1]{#1̈́}% see greek \DeclareTextCommand{\textogonekcentered}{L8U}[1]{#1̨}% Ux0345 \DeclareTextCommand{\textoverbridge}{L8U}[1]{#1͆} +\DeclareTextCommand{\textbibridge}{L8U}[1]{#1̪͆}% Ux0346 Ux032A \DeclareTextCommand{\textsubdoublevert}{L8U}[1]{#1͈} \DeclareTextCommand{\textsubcorner}{L8U}[1]{#1͉} \DeclareTextCommand{\textcrtilde}{L8U}[1]{#1͊} @@ -180,17 +202,62 @@ %\DeclareTextCommand{\textsubstar}{L8U}[1]{#1͙} %\DeclareTextCommand{\textsubinfty}{L8U}[1]{#1͚} %\DeclareTextCommand{\textzigzagabove}{L8U}[1]{#1͛} +\DeclareTextCommand{\textbottomtiebar}{L8U}[1]{#1͜} \DeclareTextCommand{\textdoublebrevebelow}{L8U}[1]{#1͜} \DeclareTextCommand{\textdoublebreve}{L8U}[1]{#1͝} \DeclareTextCommand{\textdoublemacron}{L8U}[1]{#1͞} \DeclareTextCommand{\textdoublemacronbelow}{L8U}[1]{#1͟} \DeclareTextCommand{\textdoubletilde}{L8U}[1]{#1͠} +\DeclareTextCommand{\texttoptiebar}{L8U}[1]{#1͡} \DeclareTextCommand{\dotexttie}{L8U}[1]{#1͡} \DeclareTextCommand{\textsliding}{L8U}[1]{#1͢} + +% some double-accents +\DeclareTextCommand{\textgravedot}{L8U}[1]{#1̀̇}% +%\DeclareTextCommand{\`.}{L8U}[1]{#1̀̇}% used in IPA environment +\DeclareTextCommand{\textdotacute}{L8U}[1]{#1̇́} +%\DeclareTextCommand{\.'}{L8U}[1]{#1̇́}% used in IPA environment +\DeclareTextCommand{\textacutewedge}{L8U}[1]{#1̌́} +\DeclareTextCommand{\textacutemacron}{L8U}[1]{#1̄́} +%\DeclareTextCommand{\'=}{L8U}[1]{#1̄́}% used in IPA environment +\DeclareTextCommand{\textcircumdot}{L8U}[1]{#1̇̂} +%\DeclareTextCommand{\^.}{L8U}[1]{#1̇̂}% used in IPA environment +\DeclareTextCommand{\texttildedot}{L8U}[1]{#1̇̃} +%\DeclareTextCommand{\~.}{L8U}[1]{#1̇̃}% used in IPA environment +\DeclareTextCommand{\textringmacron}{L8U}[1]{#1̄̊} +\DeclareTextCommand{\textbrevemacron}{L8U}[1]{#1̄̆} +%\DeclareTextCommand{\u=}{L8U}[1]{#1̄̆}% used in IPA environment + +% some stroked letters +\DeclareTextCommand{\textbarb}{L8U}{b̶} +\DeclareTextCommand{\textbarc}{L8U}{c̵} +\DeclareTextCommand{\textbard}{L8U}{d̶} +\DeclareTextCommand{\textbarg}{L8U}{g̶} +\DeclareTextCommand{\textcrg}{L8U}{ǥ}% U+01E5 +%\DeclareTextCommand{\textdoublebaresh}{L8U}{ʃ̵̵} +\DeclareTextCommand{\textdoublebaresh}{L8U}{ʄ̵}% U+0284 U+0335 +\DeclareTextCommand{\textdoublebarslash}{L8U}{/̵̵}% U+0335 U+0335 + + % Ux0363 – Ux036F +% Extended IPA: composites with multiple combining characters +\DeclareTextCommand{\textpartvoiceless}{L8U}[1]{₍#1̥₎}% U+208D U+0325 U+208E +\DeclareTextCommand{\textinipartvoiceless}{L8U}[1]{₍#1̥}% U+208D U+0325 +\DeclareTextCommand{\textfinpartvoiceless}{L8U}[1]{#1̥₎}% U+0325 U+208E % +\DeclareTextCommand{\textpartvoice}{L8U}[1]{₍#1̬₎}% U+208D U+032C U+208E +\DeclareTextCommand{\textinipartvoice}{L8U}[1]{₍#1̬}% U+208D U+032C +\DeclareTextCommand{\textfinpartvoice}{L8U}[1]{#1̬₎}% U+032C U+208E + + +% provides access to some IPA characters +\DeclareTextCommand{\texttipaG}{L8U}[1]{#1} +\DeclareTextCommand{\texttipam}{L8U}[1]{#1} +\DeclareTextCommand{\texttipaM}{L8U}[1]{#1} + +% accents, composed with space or empty % \DeclareTextCompositeCommand{\`}{L8U}{\@empty}{`} \DeclareTextCompositeCommand{\'}{L8U}{\@empty}{´} @@ -201,13 +268,13 @@ \DeclareTextCompositeCommand{\u}{L8U}{\@empty}{˘} \DeclareTextCompositeCommand{\.}{L8U}{\@empty}{˙} \DeclareTextCompositeCommand{\"}{L8U}{\@empty}{¨} -\DeclareTextCompositeCommand{\m}{L8U}{\@empty}{ ̉} +\DeclareTextCompositeCommand{\texttipam}{L8U}{\@empty}{ ̉} \DeclareTextCompositeCommand{\r}{L8U}{\@empty}{˚} \DeclareTextCompositeCommand{\H}{L8U}{\@empty}{˝} \DeclareTextCompositeCommand{\v}{L8U}{\@empty}{ˇ} \DeclareTextCompositeCommand{\textvbaraccent}{L8U}{\@empty}{ ̍} \DeclareTextCompositeCommand{\textdoublevbaraccent}{L8U}{\@empty}{ ̎} -\DeclareTextCompositeCommand{\G}{L8U}{\@empty}{ ̏} +\DeclareTextCompositeCommand{\texttipaG}{L8U}{\@empty}{ ̏} \DeclareTextCompositeCommand{\b}{L8U}{\@empty}{_} \DeclareTextCompositeCommand{\c}{L8U}{\@empty}{¸} \DeclareTextCompositeCommand{\d}{L8U}{\@empty}{.} @@ -222,13 +289,13 @@ \DeclareTextCompositeCommand{\u}{L8U}{\ }{˘}% Ux0306 \DeclareTextCompositeCommand{\.}{L8U}{\ }{˙}% Ux0307 \DeclareTextCompositeCommand{\"}{L8U}{\ }{¨}% Ux0308 -\DeclareTextCompositeCommand{\m}{L8U}{\ }{ ̉}% Ux0309 +\DeclareTextCompositeCommand{\texttipam}{L8U}{\ }{ ̉}% Ux0309 \DeclareTextCompositeCommand{\r}{L8U}{\ }{˚}% Ux030A \DeclareTextCompositeCommand{\H}{L8U}{\ }{˝}% Ux030B \DeclareTextCompositeCommand{\v}{L8U}{\ }{ˇ}% Ux030C \DeclareTextCompositeCommand{\textvbaraccent}{L8U}{\ }{ ̍}% Ux030D \DeclareTextCompositeCommand{\textdoublevbaraccent}{L8U}{\ }{ ̎}% Ux030E -\DeclareTextCompositeCommand{\G}{L8U}{\ }{ ̏}% Ux030F +%\DeclareTextCompositeCommand{\texttipaG}{L8U}{\ }{ ̏}% Ux030F \DeclareTextCompositeCommand{\textdotbreve}{L8U}{\ }{ ̐}% Ux0310 \DeclareTextCompositeCommand{\textroundcap}{L8U}{\ }{ ̑}% Ux0311 @@ -238,14 +305,11 @@ \DeclareTextCompositeCommand{\k}{L8U}{\ }{˛} -\DeclareTextCompositeCommand{\B}{L8U}{\@empty}{ ̵} -\DeclareTextCompositeCommand{\B}{L8U}{\ }{ ̵} -%\DeclareTextCompositeCommand{\m}{L8U}{\@empty}{ ̉} -%\DeclareTextCompositeCommand{\m}{L8U}{\ }{ ̉} -\DeclareTextCompositeCommand{\M}{L8U}{\@empty}{ ̢} -\DeclareTextCompositeCommand{\M}{L8U}{\ }{ ̢} -%\DeclareTextCompositeCommand{\G}{L8U}{\@empty}{ ̏} -%\DeclareTextCompositeCommand{\G}{L8U}{\ }{ ̏} +% these are at risk of being redefined +\DeclareTextCompositeCommand{\texttipaB}{L8U}{\@empty}{ ̵}% \texttipaB +\DeclareTextCompositeCommand{\texttipaB}{L8U}{\ }{ ̵} +\DeclareTextCompositeCommand{\texttipaM}{L8U}{\@empty}{ ̢}% \texttipaM +\DeclareTextCompositeCommand{\texttipaM}{L8U}{\ }{ ̢} \DeclareTextCompositeCommand{\dotexttie}{L8U}{\@empty}{ ͡} \DeclareTextCompositeCommand{\dotexttie}{L8U}{\ }{ ͡} @@ -262,11 +326,19 @@ \DeclareTextCompositeCommand{\textroundcap}{L8U}{\@empty}{ ̑} % Ux1DC0 – Ux1DCA +\DeclareTextCommand{\texthighrise}{L8U}[1]{#1᷄}% Ux1DC4 +\DeclareTextCommand{\textmidacute}{L8U}[1]{#1᷄}% Ux1DC4 \DeclareTextCommand{\textmacronacute}{L8U}[1]{#1᷄}% Ux1DC4 +\DeclareTextCommand{\textgravemid}{L8U}[1]{#1᷅}% Ux1DC5 +\DeclareTextCommand{\textlowrise}{L8U}[1]{#1᷅}% Ux1DC5 \DeclareTextCommand{\textgravemacron}{L8U}[1]{#1᷅}% Ux1DC5 \DeclareTextCommand{\textmacrongrave}{L8U}[1]{#1᷆}% Ux1DC6 \DeclareTextCommand{\textacutemacron}{L8U}[1]{#1᷇}% Ux1DC7 +\DeclareTextCommand{\textrisefall}{L8U}[1]{#1᷈}% Ux1DC8 +\DeclareTextCommand{\textgravecircum}{L8U}[1]{#1᷈}% Ux1DC8 \DeclareTextCommand{\textgraveacutegrave}{L8U}[1]{#1᷈}% Ux1DC8 +\DeclareTextCommand{\textcircumacute}{L8U}[1]{#1᷉}% Ux1DC9 +\DeclareTextCommand{\textfallrise}{L8U}[1]{#1᷉}% Ux1DC9 \DeclareTextCommand{\textacutegraveacute}{L8U}[1]{#1᷉}% Ux1DC9 % \DeclareTextCommand{\textoverw}{L8U}[1]{#1ᷓ}% Ux1DD3 @@ -276,7 +348,28 @@ \DeclareTextCommand{\textupstep}{L8U}[1]{#1ꜛ}% UxA71C \DeclareTextCommand{\textdownstep}{L8U}[1]{#1ꜜ}% UxA71D +\ifipaxmp + +% to be bound to \sups +\DeclareTextCommand{\textipasups}{L8U}[2]{#1\textoverscript{#2}} +\DeclareTextCommand{\textoverscript}{L8U}[1]{\textsuperscript{#1}} + +% composites producing combining characters +\DeclareTextCompositeCommand{\textoverscript}{L8U}{a}{ͣ}% +\DeclareTextCompositeCommand{\textoverscript}{L8U}{e}{ͤ}% +\DeclareTextCompositeCommand{\textoverscript}{L8U}{i}{ͥ}% +\DeclareTextCompositeCommand{\textoverscript}{L8U}{o}{ͦ}% +\DeclareTextCompositeCommand{\textoverscript}{L8U}{u}{ͧ}% +\DeclareTextCompositeCommand{\textoverscript}{L8U}{c}{ͨ}% +\DeclareTextCompositeCommand{\textoverscript}{L8U}{d}{ͩ}% +\DeclareTextCompositeCommand{\textoverscript}{L8U}{h}{ͪ}% +\DeclareTextCompositeCommand{\textoverscript}{L8U}{m}{ͫ}% +\DeclareTextCompositeCommand{\textoverscript}{L8U}{r}{ͬ}% +\DeclareTextCompositeCommand{\textoverscript}{L8U}{t}{ͭ}% +\DeclareTextCompositeCommand{\textoverscript}{L8U}{v}{ͮ}% +\DeclareTextCompositeCommand{\textoverscript}{L8U}{x}{ͯ}% +\fi %% LaTeX in 2017 precludes direct use of %% \textsuperscript \textsubscript \t @@ -288,9 +381,18 @@ \let\textoverline\dotextoverline \let\sp\textsuperstring \let\sb\textsubstring + \let\noboundary\liixu@noboundary + \let\ZWNJ\liixu@ZWNJ +% support for some macros that are redefined incompatibly in some packages + \let\textlozenge\dotextlozenge } \def\LIIXUtipacommands{% + \let\B\texttipaB + \def\ipabar##1##2##3##4##5{\texttipaB{##1}}% + \let\G\texttipaG + \let\M\texttipaM + \let\m\texttipam \let\capitalgrave\`% \let\capitalacute\'% \let\capitalcircumflex\^% @@ -299,26 +401,26 @@ \let\capitalbreve\u \let\capitaldotaccent\.% \let\capitaldieresis\"% - \let\texthookabove\m + \let\texthookabove\texttipam \let\capitalring\r \let\capitalhungarumlaut\H \let\capitalcaron\v \let\U\textdoublevbaraccent - \let\textdoublegrave\G + \let\textdoublegrave\texttipaG \let\newtie\textroundcap \let\textadvancing\textsubadvancing \let\textretracting\textsubretracting \let\capitalcedilla\c \let\capitalogonek\k \let\textundertie\textsubbreve - \let\textsstrokethru\B + \let\textsstrokethru\texttipaB \let\capitaltie\dotexttie \let\texttoptiebar\dotexttie \let\texthighrise\textmacronacute \let\textlowrise\textgravemacron \let\textrisefall\textgraveacutegrave \let\textfallrise\textacutegraveacute -% from tipax.sty +% from tipax.sty and extraipa.sty \let\textsck\textPUsck \let\textscm\textPUscm \let\textscp\textPUscp @@ -342,6 +444,7 @@ \let\textaolig\textPUaolig \let\spreadlips\textspreadlips \let\overbridge\textoverbridge + \let\bibridge\textbibridge \let\subdoublebar\textsubdoublebar \let\subdoublevert\textsubdoublevert \let\subcorner\textsubcorner @@ -350,6 +453,12 @@ \let\crtilde\textcrtilde \let\dottedtilde\textdottedtilde \let\doubletilde\textdoubletilde + \let\partvoiceless\textpartvoiceless + \let\inipartvoiceless\textinipartvoiceless + \let\finpartvoiceless\textfinpartvoiceless + \let\partvoice\textpartvoice + \let\inipartvoice\textinipartvoice + \let\finpartvoice\textfinpartvoice \let\sublptr\textsublptr \let\subrptr\textsubrptr \let\textfemale\textPUfemale @@ -357,6 +466,13 @@ \let\venus\textPUfemale \let\Venus\textPUfemale \let\Female\textPUfemale + \let\wynn\textwynn + \let\sups\texttipasups +\let\*\textipavari +\let\:\textipavarii +\let\;\textipavariii +\let\!\textipavariv +\let\|\textipavarv } @@ -512,7 +628,7 @@ \DeclareTextCompositeCommand{\'}{L8U}{I}{Í} \DeclareTextCompositeCommand{\^}{L8U}{I}{Î} \DeclareTextCompositeCommand{\"}{L8U}{I}{Ï} -\DeclareTextCompositeCommand{\M}{L8U}{D}{Ð} +\DeclareTextCompositeCommand{\texttipaM}{L8U}{D}{Ð} \DeclareTextCommand{\DH}{L8U}{Ð} \DeclareTextCompositeCommand{\~}{L8U}{N}{Ñ} \DeclareTextCompositeCommand{\`}{L8U}{O}{Ò} @@ -581,7 +697,7 @@ \DeclareTextCompositeCommand{\.}{L8U}{C}{Ċ} \DeclareTextCompositeCommand{\v}{L8U}{C}{Č} \DeclareTextCompositeCommand{\v}{L8U}{D}{Ď} -\DeclareTextCompositeCommand{\B}{L8U}{D}{Đ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{D}{Đ} \DeclareTextCommand{\DJ}{L8U}{Đ} \DeclareTextCompositeCommand{\=}{L8U}{E}{Ē} \DeclareTextCompositeCommand{\u}{L8U}{E}{Ě} @@ -593,7 +709,7 @@ \DeclareTextCompositeCommand{\.}{L8U}{G}{Ġ} \DeclareTextCompositeCommand{\c}{L8U}{G}{Ģ} \DeclareTextCompositeCommand{\^}{L8U}{H}{Ĥ} -\DeclareTextCompositeCommand{\B}{L8U}{H}{Ħ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{H}{Ħ} \DeclareTextCommand{\textHslash}{L8U}{Ħ}% PD1 \DeclareTextCommand{\textHbar}{L8U}{Ħ} \DeclareTextCompositeCommand{\~}{L8U}{I}{Ĩ} @@ -608,13 +724,13 @@ \DeclareTextCompositeCommand{\c}{L8U}{L}{Ļ} \DeclareTextCompositeCommand{\v}{L8U}{L}{Ľ} \DeclareTextCompositeCommand{\.}{L8U}{L}{Ŀ} -\DeclareTextCompositeCommand{\B}{L8U}{L}{Ł} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{L}{Ł} \DeclareTextCommand{\Lstroke}{L8U}{Ł} \DeclareTextCommand{\L}{L8U}{Ł} \DeclareTextCompositeCommand{\'}{L8U}{N}{Ń} \DeclareTextCompositeCommand{\c}{L8U}{N}{Ņ} \DeclareTextCompositeCommand{\v}{L8U}{N}{Ň} -\DeclareTextCompositeCommand{\m}{L8U}{N}{Ŋ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{N}{Ŋ} \DeclareTextCommand{\NG}{L8U}{Ŋ} \DeclareTextCompositeCommand{\=}{L8U}{O}{Ō} \DeclareTextCompositeCommand{\u}{L8U}{O}{Ŏ} @@ -629,7 +745,7 @@ \DeclareTextCompositeCommand{\v}{L8U}{S}{Š} \DeclareTextCompositeCommand{\c}{L8U}{T}{Ţ} \DeclareTextCompositeCommand{\v}{L8U}{T}{Ť} -\DeclareTextCompositeCommand{\B}{L8U}{T}{Ŧ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{T}{Ŧ} \DeclareTextCommand{\textTslash}{L8U}{Ŧ}% PD1 \DeclareTextCompositeCommand{\~}{L8U}{U}{Ũ} \DeclareTextCompositeCommand{\=}{L8U}{U}{Ū} @@ -652,7 +768,7 @@ \DeclareTextCompositeCommand{\.}{L8U}{c}{ċ} \DeclareTextCompositeCommand{\v}{L8U}{c}{č} \DeclareTextCompositeCommand{\v}{L8U}{d}{ď} -\DeclareTextCompositeCommand{\B}{L8U}{d}{đ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{d}{đ} \DeclareTextCommand{\dj}{L8U}{đ} \DeclareTextCommand{\textcrd}{L8U}{đ} \DeclareTextCompositeCommand{\=}{L8U}{e}{ē} @@ -665,9 +781,10 @@ \DeclareTextCompositeCommand{\.}{L8U}{g}{ġ} \DeclareTextCompositeCommand{\c}{L8U}{g}{ģ} \DeclareTextCompositeCommand{\^}{L8U}{h}{ĥ} -\DeclareTextCompositeCommand{\B}{L8U}{h}{ħ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{h}{ħ} \DeclareTextCommand{\texthslash}{L8U}{ħ}% PD1 \DeclareTextCommand{\texthbar}{L8U}{ħ} +\DeclareTextCommand{\textcrh}{L8U}{ħ} \DeclareTextCompositeCommand{\~}{L8U}{i}{ĩ} \DeclareTextCompositeCommand{\~}{L8U}{\i}{ĩ} \DeclareTextCompositeCommand{\=}{L8U}{i}{ī} @@ -685,7 +802,7 @@ \DeclareTextCompositeCommand{\c}{L8U}{l}{ļ} \DeclareTextCompositeCommand{\v}{L8U}{l}{ľ} \DeclareTextCompositeCommand{\.}{L8U}{l}{ŀ} -\DeclareTextCompositeCommand{\B}{L8U}{l}{ł} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{l}{ł} \DeclareTextCommand{\textbarl}{L8U}{ł} \DeclareTextCommand{\lstroke}{L8U}{ł} \DeclareTextCommand{\l}{L8U}{ł} @@ -693,7 +810,7 @@ \DeclareTextCompositeCommand{\c}{L8U}{n}{ņ} \DeclareTextCompositeCommand{\v}{L8U}{n}{ň} \DeclareTextCommand{\textnapostrophe}{L8U}{ʼn}% PD1 -\DeclareTextCompositeCommand{\m}{L8U}{n}{ŋ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{n}{ŋ} \DeclareTextCommand{\ng}{L8U}{ŋ} \DeclareTextCompositeCommand{\=}{L8U}{o}{ō} \DeclareTextCompositeCommand{\u}{L8U}{o}{ŏ} @@ -708,7 +825,7 @@ \DeclareTextCompositeCommand{\v}{L8U}{s}{š} \DeclareTextCompositeCommand{\c}{L8U}{t}{ţ} \DeclareTextCompositeCommand{\v}{L8U}{t}{ť} -\DeclareTextCompositeCommand{\B}{L8U}{t}{ŧ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{t}{ŧ} \DeclareTextCommand{\texttslash}{L8U}{ŧ}% PD1 \DeclareTextCompositeCommand{\~}{L8U}{u}{ũ} \DeclareTextCompositeCommand{\=}{L8U}{u}{ū} @@ -734,10 +851,10 @@ % \let\next\relax \iflatLATxmp - \IfFileExists{l8ulat.def}{% - \def\next{\input{l8ulat.def}}% - }{\PackageError{l8uenc}{% - The required file l8ulat.def could not be found. + \IfFileExists{l8ulat-penc.def}{% + \def\next{\input{l8ulat-penc.def}}% + }{\PackageError{l8u-penc}{% + The required file l8ulat-penc.def could not be found. Type <return> to continue without it. }{% Upper 8-bit characters appearing in the metadata may @@ -751,16 +868,15 @@ \ifgrkLGRxmp\grkxmptrue\fi - % % support for Greek alphabet % \let\next\relax \ifgrkxmp - \IfFileExists{l8ugrk.def}{% - \def\next{\input{l8ugrk.def}}% - }{\PackageError{l8uenc}{% - The required file l8ugrk.def could not be found. + \IfFileExists{l8ugrk-penc.def}{% + \def\next{\input{l8ugrk-penc.def}}% + }{\PackageError{l8u-penc}{% + The required file l8ugrk-penc.def could not be found. Type <return> to continue without it. }{% Greek characters in the metadata will not be interpreted @@ -779,10 +895,10 @@ % \let\next\relax \ifcyrxmp - \IfFileExists{l8ucyr.def}{% - \def\next{\input{l8ucyr.def}}% - }{\PackageError{l8uenc}{% - The required file l8ucyr.def could not be found. + \IfFileExists{l8ucyr-penc.def}{% + \def\next{\input{l8ucyr-penc.def}}% + }{\PackageError{l8u-penc}{% + The required file l8ucyr-penc.def could not be found. Type <return> to continue without it. }{% Cyrillic characters in the metadata will not be interpreted @@ -799,10 +915,10 @@ % \let\next\relax \ifarbxmp - \IfFileExists{l8uarb.def}{% - \def\next{\input{l8uarb.def}}% - }{\PackageError{l8uenc}{% - The required file l8uarb.def could not be found. + \IfFileExists{l8uarb-penc.def}{% + \def\next{\input{l8uarb-penc.def}}% + }{\PackageError{l8u-penc}{% + The required file l8uarb-penc.def could not be found. Type <return> to continue without it. }{% Arabic characters in the metadata will not be interpreted @@ -817,10 +933,10 @@ % \let\next\relax \ifarmxmp - \IfFileExists{l8uarm.def}{% - \def\next{\input{l8uarm.def}}% - }{\PackageError{l8uenc}{% - The required file l8uarm.def could not be found. + \IfFileExists{l8uarm-penc.def}{% + \def\next{\input{l8uarm-penc.def}}% + }{\PackageError{l8u-penc}{% + The required file l8uarm-penc.def could not be found. Type <return> to continue without it. }{% Armenian characters in the metadata will not be interpreted @@ -839,10 +955,10 @@ % \let\next\relax \ifmathxmp - \IfFileExists{l8umath.def}{% - \def\next{\input{l8umath.def}}% - }{\PackageError{l8uenc}{% - The required file l8umath.def could not be found. + \IfFileExists{l8umath-penc.def}{% + \def\next{\input{l8umath-penc.def}}% + }{\PackageError{l8u-penc}{% + The required file l8umath-penc.def could not be found. Type <return> to continue without it. }{% Mathematical symbols or macros in the metadata will not @@ -859,88 +975,89 @@ % % Latin Extended-B Ux0180 – Ux024F % -\DeclareTextCompositeCommand{\B}{L8U}{b}{ƀ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{b}{ƀ} \DeclareTextCommand{\textcrb}{L8U}{ƀ} -\DeclareTextCompositeCommand{\m}{L8U}{B}{Ɓ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{B}{Ɓ} \DeclareTextCommand{\texthausaB}{L8U}{Ɓ} \DeclareTextCompositeCommand{\=}{L8U}{B}{Ƃ} \DeclareTextCompositeCommand{\=}{L8U}{b}{ƃ} % tone 6 — upper & lower -\DeclareTextCompositeCommand{\m}{L8U}{O}{Ɔ} -\DeclareTextCompositeCommand{\m}{L8U}{C}{Ƈ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{O}{Ɔ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{C}{Ƈ} \DeclareTextCommand{\texthtc}{L8U}{ƈ} -\DeclareTextCompositeCommand{\m}{L8U}{c}{ƈ} -\DeclareTextCompositeCommand{\M}{L8U}{D}{Ɖ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{c}{ƈ} +\DeclareTextCompositeCommand{\texttipaM}{L8U}{D}{Ɖ} \DeclareTextCommand{\texthausaD}{L8U}{Ɗ} -\DeclareTextCompositeCommand{\m}{L8U}{D}{Ɗ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{D}{Ɗ} \DeclareTextCompositeCommand{\=}{L8U}{D}{Ƌ} \DeclareTextCompositeCommand{\=}{L8U}{d}{ƌ} % turned delta \DeclareTextCommand{\textEreversed}{L8U}{Ǝ} -\DeclareTextCompositeCommand{\M}{L8U}{E}{Ǝ} +\DeclareTextCompositeCommand{\texttipaM}{L8U}{E}{Ǝ} \DeclareTextCommand{\textrevE}{L8U}{Ǝ} \DeclareTextCommand{\SCHWA}{L8U}{Ə} -\DeclareTextCompositeCommand{\m}{L8U}{E}{Ɛ} -\DeclareTextCompositeCommand{\m}{L8U}{F}{Ƒ} -\DeclareTextCompositeCommand{\m}{L8U}{f}{ƒ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{E}{Ɛ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{F}{Ƒ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{f}{ƒ} \DeclareTextCommand{\textflorin}{L8U}{ƒ} -\DeclareTextCompositeCommand{\m}{L8U}{G}{Ɠ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{G}{Ɠ} \DeclareTextCommand{\textGammaafrican}{L8U}{Ɣ} \DeclareTextCommand{\hv}{L8U}{ƕ} \DeclareTextCommand{\texthvlig}{L8U}{ƕ} -\DeclareTextCompositeCommand{\m}{L8U}{I}{Ɩ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{I}{Ɩ} \DeclareTextCommand{\textIotaafrican}{L8U}{Ɩ} -\DeclareTextCompositeCommand{\B}{L8U}{I}{Ɨ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{I}{Ɨ}% Viby-I \DeclareTextCommand{\texthausaK}{L8U}{Ƙ} -\DeclareTextCompositeCommand{\m}{L8U}{K}{Ƙ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{K}{Ƙ} \DeclareTextCommand{\texthtk}{L8U}{ƙ} -\DeclareTextCompositeCommand{\m}{L8U}{k}{ƙ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{k}{ƙ} \DeclareTextCommand{\textbarl}{L8U}{ƚ} -\DeclareTextCompositeCommand{\B}{L8U}{l}{ƚ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{l}{ƚ} \DeclareTextCommand{\textcrlambda}{L8U}{ƛ} -%\DeclareTextCompositeCommand{\M}{L8U}{M}{Ɯ}% Is this known? -\DeclareTextCompositeCommand{\m}{L8U}{J}{Ɲ} +%\DeclareTextCompositeCommand{\texttipaM}{L8U}{M}{Ɯ}% Is this known? +\DeclareTextCompositeCommand{\texttipam}{L8U}{J}{Ɲ} \DeclareTextCommand{\textPUnrleg}{L8U}{ƞ} % O with middle tilde, used mainly with Vietnamese %\DeclareTextCommand{\textmidtildeO}{L8U}{Ɵ} \DeclareTextCommand{\Ohorn}{L8U}{Ơ} \DeclareTextCommand{\ohorn}{L8U}{ơ} % \OI and \oi ??? -\DeclareTextCompositeCommand{\m}{L8U}{P}{Ƥ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{P}{Ƥ} \DeclareTextCommand{\texthtp}{L8U}{ƥ} -\DeclareTextCompositeCommand{\m}{L8U}{p}{ƥ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{p}{ƥ} % \YR % Tone 2 — upper & lower \DeclareTextCommand{\ESH}{L8U}{Ʃ} \DeclareTextCommand{\textPUlooptoprevesh}{L8U}{ƪ} -\DeclareTextCommand{\textlhtlongi}{L8U}{ƪ} +\DeclareTextCommand{\textPUlooptoprevesh}{L8U}{ƪ} +\DeclareTextCommand{\textraisevibyi}{L8U}{ƪ}% IPA ???? \DeclareTextCommand{\textlhookt}{L8U}{ƫ} -\DeclareTextCompositeCommand{\m}{L8U}{T}{Ƭ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{T}{Ƭ} \DeclareTextCommand{\texthtt}{L8U}{ƭ} -\DeclareTextCompositeCommand{\m}{L8U}{t}{ƭ} -\DeclareTextCompositeCommand{\M}{L8U}{T}{Ʈ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{t}{ƭ} +\DeclareTextCompositeCommand{\texttipaM}{L8U}{T}{Ʈ} % U with middle tilde, used mainly with Vietnamese \DeclareTextCommand{\Uhorn}{L8U}{Ư} \DeclareTextCommand{\uhorn}{L8U}{ư} % -\DeclareTextCompositeCommand{\m}{L8U}{U}{Ʊ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{U}{Ʊ} \DeclareTextCommand{\textupsilonlatin}{L8U}{Ʊ} -\DeclareTextCompositeCommand{\m}{L8U}{V}{Ʋ} -\DeclareTextCompositeCommand{\m}{L8U}{Y}{Ƴ} -\DeclareTextCompositeCommand{\m}{L8U}{y}{ƴ} -\DeclareTextCompositeCommand{\B}{L8U}{Z}{Ƶ} -\DeclareTextCompositeCommand{\B}{L8U}{z}{ƶ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{V}{Ʋ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{Y}{Ƴ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{y}{ƴ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{Z}{Ƶ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{z}{ƶ} \DeclareTextCommand{\EZH}{L8U}{Ʒ} -\DeclareTextCompositeCommand{\M}{L8U}{Z}{Ʒ} +\DeclareTextCompositeCommand{\texttipaM}{L8U}{Z}{Ʒ} \DeclareTextCommand{\ezh}{L8U}{ʒ}% Ux0292 % EZH reversed \DeclareTextCommand{\textrevyogh}{L8U}{ƹ} \DeclareTextCommand{\textPUbenttailyogh}{L8U}{ƺ} \DeclareTextCommand{\textcrtwo}{L8U}{ƻ} -\DeclareTextCompositeCommand{\B}{L8U}{2}{ƻ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{2}{ƻ} % Tone 5 — upper & lower \DeclareTextCommand{\textcrinvglotstop}{L8U}{ƾ} -\DeclareTextCommand{\wynn}{L8U}{ƿ} +\DeclareTextCommand{\textwynn}{L8U}{ƿ} \DeclareTextCommand{\textpipe}{L8U}{ǀ} \DeclareTextCommand{\textvertline}{L8U}{ǀ} \DeclareTextCommand{\textdoublepipe}{L8U}{ǁ} @@ -974,16 +1091,16 @@ \DeclareTextCompositeCommand{\`}{L8U}{\"U}{Ǜ} \DeclareTextCompositeCommand{\`}{L8U}{\"u}{ǜ} \DeclareTextCommand{\textinve}{L8U}{ǝ} -\DeclareTextCompositeCommand{\M}{L8U}{e}{ǝ} +\DeclareTextCompositeCommand{\texttipaM}{L8U}{e}{ǝ} \DeclareTextCompositeCommand{\=}{L8U}{\"A}{Ǟ} \DeclareTextCompositeCommand{\=}{L8U}{\"a}{ǟ} \DeclareTextCompositeCommand{\=}{L8U}{\.A}{Ǡ} \DeclareTextCompositeCommand{\=}{L8U}{\.a}{ǡ} \DeclareTextCompositeCommand{\=}{L8U}{\AE}{Ǣ} \DeclareTextCompositeCommand{\=}{L8U}{\ae}{ǣ} -\DeclareTextCompositeCommand{\B}{L8U}{G}{Ǥ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{G}{Ǥ} \DeclareTextCommand{\textGslash}{L8U}{Ǥ}% PD1 -\DeclareTextCompositeCommand{\B}{L8U}{g}{ǥ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{g}{ǥ} \DeclareTextCommand{\textgslash}{L8U}{ǥ}% PD1 \DeclareTextCompositeCommand{\v}{L8U}{G}{Ǧ} \DeclareTextCompositeCommand{\v}{L8U}{g}{ǧ} @@ -1022,47 +1139,47 @@ \DeclareTextCompositeCommand{\'}{L8U}{\o}{ǿ} % Ux0200 \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{A}{Ȁ} -\DeclareTextCompositeCommand{\G}{L8U}{A}{Ȁ} +\DeclareTextCompositeCommand{\texttipaG}{L8U}{A}{Ȁ} \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{a}{ȁ} -\DeclareTextCompositeCommand{\G}{L8U}{a}{ȁ} +\DeclareTextCompositeCommand{\texttipaG}{L8U}{a}{ȁ} \DeclareTextCompositeCommand{\textroundcap}{L8U}{A}{Ȃ} \DeclareTextCompositeCommand{\textroundcap}{L8U}{a}{ȃ} \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{E}{Ȅ} -\DeclareTextCompositeCommand{\G}{L8U}{E}{Ȅ} +\DeclareTextCompositeCommand{\texttipaG}{L8U}{E}{Ȅ} \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{e}{ȅ} -\DeclareTextCompositeCommand{\G}{L8U}{e}{ȅ} +\DeclareTextCompositeCommand{\texttipaG}{L8U}{e}{ȅ} \DeclareTextCompositeCommand{\textroundcap}{L8U}{E}{Ȇ} \DeclareTextCompositeCommand{\textinvbreve}{L8U}{E}{Ȇ} \DeclareTextCompositeCommand{\textroundcap}{L8U}{e}{ȇ} \DeclareTextCompositeCommand{\textinvbreve}{L8U}{e}{ȇ} \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{I}{Ȉ} -\DeclareTextCompositeCommand{\G}{L8U}{I}{Ȉ} +\DeclareTextCompositeCommand{\texttipaG}{L8U}{I}{Ȉ} \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{i}{ȉ} -\DeclareTextCompositeCommand{\G}{L8U}{i}{ȉ} +\DeclareTextCompositeCommand{\texttipaG}{L8U}{i}{ȉ} \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{\i}{ȉ} -\DeclareTextCompositeCommand{\G}{L8U}{\i}{ȉ} +\DeclareTextCompositeCommand{\texttipaG}{L8U}{\i}{ȉ} \DeclareTextCompositeCommand{\textroundcap}{L8U}{I}{Ȋ} \DeclareTextCompositeCommand{\textinvbreve}{L8U}{I}{Ȋ} \DeclareTextCompositeCommand{\textroundcap}{L8U}{i}{ȋ} \DeclareTextCompositeCommand{\textinvbreve}{L8U}{i}{ȋ} \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{O}{Ȍ} -\DeclareTextCompositeCommand{\G}{L8U}{O}{Ȍ} +\DeclareTextCompositeCommand{\texttipaG}{L8U}{O}{Ȍ} \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{o}{ȍ} -\DeclareTextCompositeCommand{\G}{L8U}{o}{ȍ} +\DeclareTextCompositeCommand{\texttipaG}{L8U}{o}{ȍ} \DeclareTextCompositeCommand{\textroundcap}{L8U}{O}{Ȏ} \DeclareTextCompositeCommand{\textinvbreve}{L8U}{O}{Ȏ} \DeclareTextCompositeCommand{\textroundcap}{L8U}{o}{ȏ} \DeclareTextCompositeCommand{\textinvbreve}{L8U}{o}{ȏ} \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{R}{Ȑ} -\DeclareTextCompositeCommand{\G}{L8U}{R}{Ȑ} +\DeclareTextCompositeCommand{\texttipaG}{L8U}{R}{Ȑ} \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{r}{ȑ} -\DeclareTextCompositeCommand{\G}{L8U}{r}{ȑ} +\DeclareTextCompositeCommand{\texttipaG}{L8U}{r}{ȑ} \DeclareTextCompositeCommand{\textroundcap}{L8U}{R}{Ȓ} \DeclareTextCompositeCommand{\textroundcap}{L8U}{r}{ȓ} \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{U}{Ȕ} -\DeclareTextCompositeCommand{\G}{L8U}{U}{Ȕ} +\DeclareTextCompositeCommand{\texttipaG}{L8U}{U}{Ȕ} \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{u}{ȕ} -\DeclareTextCompositeCommand{\G}{L8U}{u}{ȕ} +\DeclareTextCompositeCommand{\texttipaG}{L8U}{u}{ȕ} \DeclareTextCompositeCommand{\textroundcap}{L8U}{U}{Ȗ} \DeclareTextCompositeCommand{\textinvbreve}{L8U}{U}{Ȗ} \DeclareTextCompositeCommand{\textroundcap}{L8U}{u}{ȗ} @@ -1075,7 +1192,7 @@ \DeclareTextCommand{\yogh}{L8U}{ȝ} \DeclareTextCompositeCommand{\v}{L8U}{H}{Ȟ} \DeclareTextCompositeCommand{\v}{L8U}{h}{ȟ} -\DeclareTextCompositeCommand{\M}{L8U}{N}{Ƞ} +\DeclareTextCompositeCommand{\texttipaM}{L8U}{N}{Ƞ} \DeclareTextCommand{\textctd}{L8U}{ȡ} % \OU and \ou \DeclareTextCompositeCommand{\textcommabelow}{L8U}{Z}{Ȥ} @@ -1144,64 +1261,42 @@ \fi % end of \iflatEXTxmp +% +% support for Hebrew characters +% +\let\next\relax \ifhebxmp + \IfFileExists{l8uheb-penc.def}{% + \def\next{\input{l8uheb-penc.def}}% + }{\PackageError{l8u-penc}{% + The required file l8uheb-penc.def could not be found. + Type <return> to continue without it. + }{% + Hebrew characters in the metadata will not be interpreted + correctly. PDF validation will likely fail. + }% + \hebxmpfalse + } +\fi \next + +% +% support for Devanagari characters +% +\let\next\relax +\ifdevxmp + \IfFileExists{l8udev-penc.def}{% + \def\next{\input{l8udev-penc.def}}% + }{\PackageError{l8u-penc}{% + The required file l8udev-penc.def could not be found. + Type <return> to continue without it. + }{% + Devanagari characters in the metadata will not be interpreted + correctly. PDF validation will likely fail. + }% + \devxmpfalse + } +\fi \next -\DeclareTextCommand{\sheva}{L8U}[1]{ְ#1}% U+05B0 -\DeclareTextCommand{\hatafsegol}{L8U}[1]{ֱ#1} -\DeclareTextCommand{\hatafpatah}{L8U}[1]{ֲ#1} -\DeclareTextCommand{\hatafqamats}{L8U}[1]{ֳ#1} -\DeclareTextCommand{\hiriq}{L8U}[1]{ִ#1} -\DeclareTextCommand{\tsere}{L8U}[1]{ֵ#1} -\DeclareTextCommand{\segol}{L8U}[1]{ֶ#1} -\DeclareTextCommand{\patah}{L8U}[1]{ַ#1} -\DeclareTextCommand{\qamats}{L8U}[1]{ָ#1} -\DeclareTextCommand{\holam}{L8U}[1]{ֹ#1} -% -\DeclareTextCommand{\qubuts}{L8U}[1]{ֻ#1}% U+05BB -\DeclareTextCommand{\dagesh}{L8U}[1]{ּ#1} -\DeclareTextCommand{\meteg}{L8U}[1]{ֽ#1} -\DeclareTextCommand{\maqaf}{L8U}{־} -% -\DeclareTextCommand{\shindot}{L8U}[1]{ׁ#1}% U+05C1 -\DeclareTextCommand{\sindot}{L8U}[1]{ׂ#1} -\DeclareTextCommand{\sofpasuq}{L8U}{׃}% U+05C3 -%\DeclareTextCommand{\nunhafukha}{L8U}{׃}% U+05C6 -% -\DeclareTextCommand{\hebalef}{L8U}{א}% U+05D0 -\DeclareTextCommand{\hebbet}{L8U}{ב}% U+05D1 -\DeclareTextCommand{\hebgimel}{L8U}{ג}% U+05D2 -\DeclareTextCommand{\hebdalet}{L8U}{ד}% U+05D3 -\DeclareTextCommand{\hebhe}{L8U}{ה}% U+05D4 -\DeclareTextCommand{\hebvav}{L8U}{ו}% U+05D5 -\DeclareTextCommand{\hebzayin}{L8U}{ז}% U+05D6 -\DeclareTextCommand{\hebhet}{L8U}{ח}% U+05D7 -\DeclareTextCommand{\hebtet}{L8U}{ט}% U+05D8 -\DeclareTextCommand{\hebyod}{L8U}{י}% U+05D9 -\DeclareTextCommand{\hebfinalkaf}{L8U}{ך}% U+05DA -\DeclareTextCommand{\hebkaf}{L8U}{כ}% U+05DB -\DeclareTextCommand{\heblamed}{L8U}{ל}% U+05DC -\DeclareTextCommand{\hebfinalmem}{L8U}{ם}% U+05DD -\DeclareTextCommand{\hebmem}{L8U}{מ}% U+05DE -\DeclareTextCommand{\hebfinalnun}{L8U}{ן}% U+05DF -\DeclareTextCommand{\hebnun}{L8U}{נ}% U+05E0 -\DeclareTextCommand{\hebsamekh}{L8U}{ס}% U+05E1 -\DeclareTextCommand{\hebayin}{L8U}{ע}% U+05E2 -\DeclareTextCommand{\hebfinalpe}{L8U}{ף}% U+05E3 -\DeclareTextCommand{\hebpe}{L8U}{פ}% U+05E4 -\DeclareTextCommand{\hebfinaltsadi}{L8U}{ץ}% U+05E5 -\DeclareTextCommand{\hebtsadi}{L8U}{צ}% U+05E6 -\DeclareTextCommand{\hebqof}{L8U}{ק}% U+05E7 -\DeclareTextCommand{\hebresh}{L8U}{ר}% U+05E8 -\DeclareTextCommand{\hebshin}{L8U}{ש}% U+05E9 -\DeclareTextCommand{\hebtav}{L8U}{ת}% U+05EA -% -\DeclareTextCommand{\doublevav}{L8U}{װ}% U+05F0 -\DeclareTextCommand{\vavyod}{L8U}{ױ}% U+05F1 -\DeclareTextCommand{\doubleyod}{L8U}{ײ}% U+05F2 -%\DeclareTextCommand{\geresh}{L8U}{׳}% U+05F3 -%\DeclareTextCommand{\gershayim}{L8U}{״}% U+05F4 - -\fi % end of \ifhebxmp % % used in multiple encodings @@ -1218,65 +1313,68 @@ \DeclareTextCommand{\textturna}{L8U}{ɐ} \DeclareTextCommand{\textscripta}{L8U}{ɑ} \DeclareTextCommand{\textturnscripta}{L8U}{ɒ} -\DeclareTextCompositeCommand{\m}{L8U}{b}{ɓ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{b}{ɓ} \DeclareTextCommand{\texthtb}{L8U}{ɓ} -\DeclareTextCompositeCommand{\m}{L8U}{o}{ɔ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{o}{ɔ} \DeclareTextCommand{\textoopen}{L8U}{ɔ} \DeclareTextCommand{\textopeno}{L8U}{ɔ} \DeclareTextCommand{\textctc}{L8U}{ɕ} -\DeclareTextCompositeCommand{\M}{L8U}{d}{ɖ} +\DeclareTextCompositeCommand{\texttipaM}{L8U}{d}{ɖ} \DeclareTextCommand{\textdtail}{L8U}{ɖ} \DeclareTextCommand{\textrtaild}{L8U}{ɖ} -\DeclareTextCompositeCommand{\m}{L8U}{d}{ɗ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{d}{ɗ} \DeclareTextCommand{\texthtd}{L8U}{ɗ} \DeclareTextCommand{\textdhook}{L8U}{ɗ} \DeclareTextCommand{\textreve}{L8U}{ɘ} \DeclareTextCommand{\schwa}{L8U}{ə} %\DeclareTextCommand{\textschwa}{L8U}{ə}% see above -\DeclareTextCompositeCommand{\m}{L8U}{\schwa}{ɚ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{\schwa}{ɚ} \DeclareTextCommand{\textrhookschwa}{L8U}{ɚ} \DeclareTextCommand{\textniepsilon}{L8U}{ɛ}% ???? -\DeclareTextCompositeCommand{\m}{L8U}{e}{ɛ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{e}{ɛ} \DeclareTextCommand{\texteopen}{L8U}{ɛ} %\DeclareTextCommand{\textepsilon}{L8U}{ɛ}% beware greek \DeclareTextCommand{\textrevepsilon}{L8U}{ɜ} \DeclareTextCommand{\textrhookrevepsilon}{L8U}{ɝ} \DeclareTextCommand{\textcloserevepsilon}{L8U}{ɞ} -\DeclareTextCompositeCommand{\B}{L8U}{j}{ɟ} -\DeclareTextCompositeCommand{\B}{L8U}{\j}{ɟ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{j}{ɟ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{\j}{ɟ} \DeclareTextCommand{\textbardotlessj}{L8U}{ɟ} +\DeclareTextCommand{\textObardotlessj}{L8U}{ɟ} \DeclareTextCommand{\texthtg}{L8U}{ɠ} \DeclareTextCommand{\textscriptg}{L8U}{ɡ} +\DeclareTextCommand{\textg}{L8U}{ɡ} \DeclareTextCommand{\textscg}{L8U}{ɢ} \DeclareTextCommand{\textipagamma}{L8U}{ɣ} \DeclareTextCommand{\textbabygamma}{L8U}{ɣ} \DeclareTextCommand{\textgammalatinsmall}{L8U}{ɣ} %\DeclareTextCommand{\textgamma}{L8U}{ɣ}% beware greek -\DeclareTextCompositeCommand{\m}{L8U}{g}{ɣ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{g}{ɣ} \DeclareTextCommand{\textramshorns}{L8U}{ɤ} \DeclareTextCommand{\textturnh}{L8U}{ɥ} -\DeclareTextCompositeCommand{\m}{L8U}{h}{ɦ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{h}{ɦ} \DeclareTextCommand{\texthth}{L8U}{ɦ} \DeclareTextCommand{\texththeng}{L8U}{ɧ} -\DeclareTextCompositeCommand{\B}{L8U}{i}{ɨ} -\DeclareTextCommand{\textbari}{L8U}{ɨ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{i}{ɨ} +\DeclareTextCommand{\textbari}{L8U}{ɨ}% Viby-i ??? \DeclareTextCommand{\textniiota}{L8U}{ɩ} \DeclareTextCommand{\textiotalatin}{L8U}{ɩ} -\DeclareTextCompositeCommand{\m}{L8U}{i}{ɩ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{i}{ɩ} \DeclareTextCommand{\textsci}{L8U}{ɪ} \DeclareTextCommand{\textltilde}{L8U}{ɫ} \DeclareTextCommand{\textbeltl}{L8U}{ɬ} \DeclareTextCommand{\textrtaill}{L8U}{ɭ} \DeclareTextCommand{\lezh}{L8U}{ɮ} \DeclareTextCommand{\textlyoghlig}{L8U}{ɮ} +\DeclareTextCommand{\textOlyoghlig}{L8U}{ɮ} \DeclareTextCommand{\textturnm}{L8U}{ɯ} \DeclareTextCommand{\textturnmrleg}{L8U}{ɰ} -\DeclareTextCompositeCommand{\m}{L8U}{m}{ɱ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{m}{ɱ} \DeclareTextCommand{\textltailm}{L8U}{ɱ} -\DeclareTextCompositeCommand{\m}{L8U}{j}{ɲ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{j}{ɲ} \DeclareTextCommand{\textltailn}{L8U}{ɲ} \DeclareTextCommand{\textnhookleft}{L8U}{ɲ} -\DeclareTextCompositeCommand{\m}{L8U}{n}{ɳ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{n}{ɳ} \DeclareTextCommand{\textrtailn}{L8U}{ɳ} \DeclareTextCommand{\textscn}{L8U}{ɴ} \DeclareTextCommand{\textbaro}{L8U}{ɵ} @@ -1296,24 +1394,24 @@ \DeclareTextCommand{\textscr}{L8U}{ʀ} \DeclareTextCommand{\textinvscr}{L8U}{ʁ} \DeclareTextCommand{\textrtails}{L8U}{ʂ} -\DeclareTextCompositeCommand{\m}{L8U}{s}{ʃ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{s}{ʃ} \DeclareTextCommand{\esh}{L8U}{ʃ} \DeclareTextCommand{\textesh}{L8U}{ʃ} \DeclareTextCommand{\texthtbardotlessj}{L8U}{ʄ} -\DeclareTextCompositeCommand{\m}{L8U}{\textbardotlessj}{ʄ} -\DeclareTextCompositeCommand{\m}{L8U}{S}{ʅ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{\textbardotlessj}{ʄ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{S}{ʅ} \DeclareTextCommand{\textvibyi}{L8U}{ʅ} \DeclareTextCommand{\textctesh}{L8U}{ʆ} \DeclareTextCommand{\textturnt}{L8U}{ʇ} \DeclareTextCommand{\textrtailt}{L8U}{ʈ} \DeclareTextCommand{\texttretroflexhook}{L8U}{ʈ} -\DeclareTextCompositeCommand{\m}{L8U}{t}{ʈ} -\DeclareTextCompositeCommand{\B}{L8U}{u}{ʉ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{t}{ʈ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{u}{ʉ} \DeclareTextCommand{\textbaru}{L8U}{ʉ} \DeclareTextCommand{\textscupsilon}{L8U}{ʊ} %\DeclareTextCommand{\textupsilon}{L8U}{ʊ}% beware greek -\DeclareTextCompositeCommand{\m}{L8U}{u}{ʋ} -\DeclareTextCompositeCommand{\m}{L8U}{v}{ʋ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{u}{ʋ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{v}{ʋ} \DeclareTextCommand{\textscriptv}{L8U}{ʋ} \DeclareTextCommand{\textvhook}{L8U}{ʋ} \DeclareTextCommand{\textturnv}{L8U}{ʌ} @@ -1322,7 +1420,7 @@ \DeclareTextCommand{\textscy}{L8U}{ʏ} \DeclareTextCommand{\textrtailz}{L8U}{ʐ} \DeclareTextCommand{\textctz}{L8U}{ʑ} -\DeclareTextCompositeCommand{\m}{L8U}{z}{ʒ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{z}{ʒ} \DeclareTextCommand{\ezh}{L8U}{ʒ} \DeclareTextCommand{\textezh}{L8U}{ʒ} \DeclareTextCommand{\textyogh}{L8U}{ʒ} @@ -1339,22 +1437,25 @@ \DeclareTextCommand{\textctj}{L8U}{ʝ} \DeclareTextCommand{\textturnk}{L8U}{ʞ} \DeclareTextCommand{\textscl}{L8U}{ʟ} -\DeclareTextCompositeCommand{\m}{L8U}{q}{ʠ} +\DeclareTextCompositeCommand{\texttipam}{L8U}{q}{ʠ} \DeclareTextCommand{\texthtq}{L8U}{ʠ} -\DeclareTextCompositeCommand{\B}{L8U}{\textglotstop}{ʡ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{\textglotstop}{ʡ} \DeclareTextCommand{\textbarglotstop}{L8U}{ʡ} -\DeclareTextCompositeCommand{\B}{L8U}{\textrevglotstop}{ʢ} +\DeclareTextCompositeCommand{\texttipaB}{L8U}{\textrevglotstop}{ʢ} \DeclareTextCommand{\textbarrevglotstop}{L8U}{ʢ} \DeclareTextCommand{\textdzlig}{L8U}{ʣ} \DeclareTextCommand{\textdyoghlig}{L8U}{ʤ} \DeclareTextCommand{\textdctzlig}{L8U}{ʥ} +\DeclareTextCommand{\textctdctzlig}{L8U}{ȡʑ}% IPA character, break the ligature \DeclareTextCommand{\texttslig}{L8U}{ʦ} \DeclareTextCommand{\textteshlig}{L8U}{ʧ} \DeclareTextCommand{\texttesh}{L8U}{ʧ} \DeclareTextCommand{\texttctclig}{L8U}{ʨ} +\DeclareTextCommand{\textcttctclig}{L8U}{ȶɕ}% IPA character, break the ligature \DeclareTextCommand{\textfenglig}{L8U}{ʩ} \DeclareTextCommand{\textlslig}{L8U}{ʪ} \DeclareTextCommand{\textlzlig}{L8U}{ʫ} +\DeclareTextCommand{\textturncelig}{L8U}{ɔe}% IPA character, break the ligature % percussives: bilabial and bidental %\DeclareTextCommand{\textbilabial}{L8U}{ʬ} %\DeclareTextCommand{\textbidental}{L8U}{ʭ} @@ -1388,16 +1489,21 @@ \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{w}{ʷ} \DeclareTextCommand{\textovery}{L8U}{ʸ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{y}{ʸ} +\DeclareTextCommand{\textceltpal}{L8U}{ʹ} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{'}{ʹ} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{"}{ʺ} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{`}{ʻ} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{'}{ʼ} +\DeclareTextCommand{\\textrevapostrophe}{L8U}{ʽ} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{'}{ʽ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\rhook}{ʾ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\lhook}{ʿ} +\DeclareTextCommand{\textraiseglotstop}{L8U}{ˀ} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{?}{ˀ} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{}{ˁ} +\DeclareTextCommand{\textlptr}{L8U}{˂} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{<}{˂} +\DeclareTextCommand{\textrptr}{L8U}{˃} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{>}{˃} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{^}{˄} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\vee}{˅} @@ -1407,7 +1513,7 @@ \DeclareTextCompositeCommand{\=}{L8U}{\empty}{ˉ} \DeclareTextCompositeCommand{\'}{L8U}{\empty}{ˊ} \DeclareTextCompositeCommand{\`}{L8U}{\empty}{ˋ} -%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{}{ˌ} +\DeclareTextCommand{\textsecstress}{L8U}{ˌ} \DeclareTextCompositeCommand{\b}{L8U}{\empty}{ˍ} %\DeclareTextCompositeCommand{\b}{L8U}{h}{ˎ} %\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{ˏ} @@ -1426,7 +1532,7 @@ \DeclareTextCompositeCommand{\k}{L8U}{\empty}{˛} \DeclareTextCompositeCommand{\~}{L8U}{\empty}{˜} \DeclareTextCompositeCommand{\H}{L8U}{\empty}{˝} -%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{˞} +\DeclareTextCommand{\textrhoticity}{L8U}{˞} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{h}{˟} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\gamma}{ˠ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{l}{ˡ} @@ -1453,8 +1559,8 @@ %\DeclareTextCommand{\texttone}{L8U}{˶} %\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{~}{˷} %\DeclareTextCommand{????}{L8U}{1}{˸} -%\DeclareTextCommand{\texttone}{L8U}{˹} -%\DeclareTextCommand{\texttone}{L8U}{˺} +\DeclareTextCommand{\textopencorner}{L8U}{˹} +%\DeclareTextCommand{\textcorner}{L8U}{˺} %\DeclareTextCommand{\texttone}{L8U}{˻} %\DeclareTextCommand{\texttone}{L8U}{˼} %\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{??}{˽} @@ -1462,6 +1568,95 @@ \DeclareTextCommand{\textsbleftarrow}{L8U}{˿} %\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\larrow}{˿} +% declare composites to be bound to \* \: \; \! \| +\DeclareTextCommand{\textipavari}{L8U}[1]{#1}% bound to \* +\DeclareTextCommand{\textipavarii}{L8U}[1]{#1}% bound to \: +\DeclareTextCommand{\textipavariii}{L8U}[1]{#1}% bound to \; +\DeclareTextCommand{\textipavariv}{L8U}[1]{#1}% bound to \! + +\DeclareTextCompositeCommand{\textipavari}{L8U}{f}{ɟ} +\DeclareTextCompositeCommand{\textipavari}{L8U}{k}{ʞ} +\DeclareTextCompositeCommand{\textipavari}{L8U}{r}{ɹ} +\DeclareTextCompositeCommand{\textipavari}{L8U}{t}{ʇ} +\DeclareTextCompositeCommand{\textipavari}{L8U}{w}{ʍ} +% +\DeclareTextCompositeCommand{\textipavari}{L8U}{j}{ɉ} +\DeclareTextCompositeCommand{\textipavari}{L8U}{n}{ɲ} +\DeclareTextCompositeCommand{\textipavari}{L8U}{h}{ħ} +\DeclareTextCompositeCommand{\textipavari}{L8U}{l}{ɬ} +\DeclareTextCompositeCommand{\textipavari}{L8U}{z}{ɮ} +% +\DeclareTextCompositeCommand{\textipavari}{L8U}{\#}{} + +\DeclareTextCompositeCommand{\textipavarii}{L8U}{A}{ᴀ} +\DeclareTextCompositeCommand{\textipavarii}{L8U}{B}{ʙ} +\DeclareTextCompositeCommand{\textipavarii}{L8U}{E}{ᴇ} +\DeclareTextCompositeCommand{\textipavarii}{L8U}{G}{} +\DeclareTextCompositeCommand{\textipavarii}{L8U}{H}{ʜ} +\DeclareTextCompositeCommand{\textipavarii}{L8U}{J}{ᴊ} +\DeclareTextCompositeCommand{\textipavarii}{L8U}{L}{ʟ} +\DeclareTextCompositeCommand{\textipavarii}{L8U}{N}{ɴ} +\DeclareTextCompositeCommand{\textipavarii}{L8U}{R}{ʀ} +\DeclareTextCompositeCommand{\textipavarii}{L8U}{U}{ᴜ} + +\DeclareTextCompositeCommand{\textipavariii}{L8U}{d}{ɖ} +\DeclareTextCompositeCommand{\textipavariii}{L8U}{l}{ɭ} +\DeclareTextCompositeCommand{\textipavariii}{L8U}{n}{ɳ} +\DeclareTextCompositeCommand{\textipavariii}{L8U}{r}{ɽ} +\DeclareTextCompositeCommand{\textipavariii}{L8U}{s}{ʂ} +\DeclareTextCompositeCommand{\textipavariii}{L8U}{t}{ʈ} +\DeclareTextCompositeCommand{\textipavariii}{L8U}{z}{ʐ} + +\DeclareTextCompositeCommand{\textipavariv}{L8U}{b}{ɓ} +\DeclareTextCompositeCommand{\textipavariv}{L8U}{d}{ɗ} +\DeclareTextCompositeCommand{\textipavariv}{L8U}{g}{ɠ} +\DeclareTextCompositeCommand{\textipavariv}{L8U}{G}{ʛ} +\DeclareTextCompositeCommand{\textipavariv}{L8U}{j}{ʄ} +\DeclareTextCompositeCommand{\textipavariv}{L8U}{o}{ʘ} + +% these are the mormal \texttipa replacements +\DeclareTextCompositeCommand{\textipavaro}{L8U}{A}{ɑ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{B}{ß} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{C}{ɕ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{D}{ð} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{E}{ɛ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{F}{ɸ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{G}{ɣ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{H}{ɦ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{I}{ɪ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{J}{ʝ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{K}{ʁ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{L}{ʎ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{M}{ɱ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{N}{ŋ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{O}{ɔ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{P}{ʔ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{Q}{ʕ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{R}{ɾ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{S}{ʃ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{T}{θ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{U}{ʊ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{V}{ʋ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{W}{ɯ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{X}{χ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{Y}{ʏ} +\DeclareTextCompositeCommand{\textipavaro}{L8U}{Z}{ʒ} + +\DeclareTextCommand{\textipavarv}{L8U}[1]{#1}% bound to \| +\DeclareTextCompositeCommand{\textipavarv}{L8U}{[}{\textsubbridge} +\DeclareTextCompositeCommand{\textipavarv}{L8U}{]}{\textinvsubbridge} +\DeclareTextCompositeCommand{\textipavarv}{L8U}{(}{\textsublhalfring} +\DeclareTextCompositeCommand{\textipavarv}{L8U}{)}{\textsubrhalfring} +\DeclareTextCompositeCommand{\textipavarv}{L8U}{c}{\textroundcap} +\DeclareTextCompositeCommand{\textipavarv}{L8U}{+}{\textsubplus} +\DeclareTextCompositeCommand{\textipavarv}{L8U}{'}{\textraising} +\DeclareTextCompositeCommand{\textipavarv}{L8U}{`}{\textlowering} +\DeclareTextCompositeCommand{\textipavarv}{L8U}{<}{\textadvancing} +\DeclareTextCompositeCommand{\textipavarv}{L8U}{>}{\textretracting} +\DeclareTextCompositeCommand{\textipavarv}{L8U}{x}{\textovercross} +\DeclareTextCompositeCommand{\textipavarv}{L8U}{w}{\textsubw} +\DeclareTextCompositeCommand{\textipavarv}{L8U}{m}{\textseagull} + % % Phonetic Extensions Ux1D00 – Ux1D70 @@ -1507,7 +1702,7 @@ \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{A}{ᴬ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\AE}{ᴭ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{B}{ᴮ} -\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\B B}{ᴯ} +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\texttipaB B}{ᴯ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{D}{ᴰ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{E}{ᴱ} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\revE}{ᴲ} @@ -1667,6 +1862,7 @@ \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{I}{ᶦ}% \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textsci}{ᶦ}% \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textbarsci}{ᶧ}% +%\DeclareTextCommand{\textraisevibyi}{L8U}{ᶧ}% raised swedish viby-i \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textctj}{ᶨ}% \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textrtaill}{ᶩ}% \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textlhookl}{ᶪ}% @@ -1701,6 +1897,10 @@ \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\theta}{ᶿ}% \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\texttheta}{ᶿ}% +% arrows +\DeclareTextCommand{\textglobrise}{L8U}{↗} +\DeclareTextCommand{\textglobfall}{L8U}{↘} + \fi % end of \ifipaxmp @@ -1902,8 +2102,8 @@ \DeclareTextCompositeCommand{\r}{L8U}{y}{ẙ}% U+1E99 %\DeclareTextCompositeCommand{\smallhalfring}{L8U}{a}{ẚ}% U+1E9A \DeclareTextCompositeCommand{\.}{L8U}{\textlongs}{ẛ}% U+1E9B -%\DeclareTextCompositeCommand{\B}{L8U}{\textlongs}{ẜ}% U+1E9C -\DeclareTextCompositeCommand{\B}{L8U}{\textlongs}{ẝ}% U+1E9D +%\DeclareTextCompositeCommand{\texttipaB}{L8U}{\textlongs}{ẜ}% U+1E9C +\DeclareTextCompositeCommand{\texttipaB}{L8U}{\textlongs}{ẝ}% U+1E9D \fi % end of \iflatEXTxmp @@ -1930,16 +2130,16 @@ % Ux1EA0 \DeclareTextCompositeCommand{\d}{L8U}{A}{Ạ}% U+1EA0 \DeclareTextCompositeCommand{\d}{L8U}{a}{ạ}% U+1EA1 -%\DeclareTextCompositeCommand{\m}{L8U}{\u A}{Ả}% U+1EA2 -%\DeclareTextCompositeCommand{\m}{L8U}{\u{A}}{Ả}% U+1EA2 -%\DeclareTextCompositeCommand{\m}{L8U}{\u a}{ả}% U+1EA3 -%\DeclareTextCompositeCommand{\m}{L8U}{\u{a}}{ả}% U+1EA3 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\u A}{Ả}% U+1EA2 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\u{A}}{Ả}% U+1EA2 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\u a}{ả}% U+1EA3 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\u{a}}{ả}% U+1EA3 \DeclareTextCompositeCommand{\'}{L8U}{\^A}{Ấ}% U+1EA4 \DeclareTextCompositeCommand{\'}{L8U}{\^a}{ấ}% U+1EA5 \DeclareTextCompositeCommand{\`}{L8U}{\^A}{Ấ}% U+1EA6 \DeclareTextCompositeCommand{\`}{L8U}{\^a}{ấ}% U+1EA7 -%\DeclareTextCompositeCommand{\m}{L8U}{\^A}{Ẩ}% U+1EA8 -%\DeclareTextCompositeCommand{\m}{L8U}{\^a}{ẩ}% U+1EA9 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\^A}{Ẩ}% U+1EA8 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\^a}{ẩ}% U+1EA9 \DeclareTextCompositeCommand{\~}{L8U}{\^A}{Ẫ}% U+1EAA \DeclareTextCompositeCommand{\~}{L8U}{\^a}{ẫ}% U+1EAB \DeclareTextCompositeCommand{\d}{L8U}{\^A}{Ậ}% U+1EAC @@ -1957,8 +2157,8 @@ \DeclareTextCompositeCommand{\`}{L8U}{\u{A}}{Ằ}% U+1EB0 \DeclareTextCompositeCommand{\`}{L8U}{\u a}{ằ}% U+1EB1 \DeclareTextCompositeCommand{\`}{L8U}{\u{a}}{ằ}% U+1EB1 -%\DeclareTextCompositeCommand{\m}{L8U}{\u A}{Ẳ}% U+1EB2 -%\DeclareTextCompositeCommand{\m}{L8U}{\u A}{ẳ}% U+1EB3 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\u A}{Ẳ}% U+1EB2 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\u A}{ẳ}% U+1EB3 \DeclareTextCompositeCommand{\~}{L8U}{\u A}{Ẵ}% U+1EB4 \DeclareTextCompositeCommand{\~}{L8U}{\u{A}}{Ẵ}% U+1EB4 \DeclareTextCompositeCommand{\~}{L8U}{\u a}{ẵ}% U+1EB5 @@ -2006,8 +2206,8 @@ \fi \DeclareTextCompositeCommand{\d}{L8U}{E}{Ẹ}% U+1EB8 \DeclareTextCompositeCommand{\d}{L8U}{e}{ẹ}% U+1EB9 -%\DeclareTextCompositeCommand{\m}{L8U}{E}{Ẻ}% U+1EBA -%\DeclareTextCompositeCommand{\m}{L8U}{e}{ẻ}% U+1EBB +%\DeclareTextCompositeCommand{\texttipam}{L8U}{E}{Ẻ}% U+1EBA +%\DeclareTextCompositeCommand{\texttipam}{L8U}{e}{ẻ}% U+1EBB \DeclareTextCompositeCommand{\~}{L8U}{E}{Ẽ}% U+1EBC \DeclareTextCompositeCommand{\~}{L8U}{e}{ẽ}% U+1EBD \DeclareTextCompositeCommand{\'}{L8U}{\^E}{Ế}% U+1EBE @@ -2015,8 +2215,8 @@ % Ux1EC0 \DeclareTextCompositeCommand{\`}{L8U}{\^E}{Ề}% U+1EC0 \DeclareTextCompositeCommand{\`}{L8U}{\^e}{ề}% U+1EC1 -%\DeclareTextCompositeCommand{\m}{L8U}{\^E}{Ể}% U+1EC2 -%\DeclareTextCompositeCommand{\m}{L8U}{\^e}{ể}% U+1EC3 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\^E}{Ể}% U+1EC2 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\^e}{ể}% U+1EC3 \DeclareTextCompositeCommand{\~}{L8U}{\^E}{Ễ}% U+1EC4 \DeclareTextCompositeCommand{\~}{L8U}{\^e}{ễ}% U+1EC5 \DeclareTextCompositeCommand{\d}{L8U}{\^E}{Ệ}% U+1EC6 @@ -2048,9 +2248,9 @@ \DeclareTextCompositeCommand{\~}{L8U}{\ecircumflex}{ễ}% U+1EC5 \DeclareTextCompositeCommand{\d}{L8U}{\ecircumflex}{ệ}% U+1EC7 \fi -%\DeclareTextCompositeCommand{\m}{L8U}{I}{Ỉ}% U+1EC8 -%\DeclareTextCompositeCommand{\m}{L8U}{i}{ỉ}% U+1EC9 -%\DeclareTextCompositeCommand{\m}{L8U}{\i}{ỉ}% U+1EC9 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{I}{Ỉ}% U+1EC8 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{i}{ỉ}% U+1EC9 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\i}{ỉ}% U+1EC9 \DeclareTextCompositeCommand{\d}{L8U}{I}{Ị}% U+1ECA \DeclareTextCompositeCommand{\d}{L8U}{i}{ị}% U+1ECB \ifvnmxmp @@ -2069,15 +2269,15 @@ \fi \DeclareTextCompositeCommand{\d}{L8U}{O}{Ọ}% U+1ECC \DeclareTextCompositeCommand{\d}{L8U}{o}{ọ}% U+1ECD -%\DeclareTextCompositeCommand{\m}{L8U}{O}{Ỏ}% U+1ECE -%\DeclareTextCompositeCommand{\m}{L8U}{o}{ỏ}% U+1ECF +%\DeclareTextCompositeCommand{\texttipam}{L8U}{O}{Ỏ}% U+1ECE +%\DeclareTextCompositeCommand{\texttipam}{L8U}{o}{ỏ}% U+1ECF % \DeclareTextCompositeCommand{\'}{L8U}{\^O}{Ố}% U+1ED0 \DeclareTextCompositeCommand{\'}{L8U}{\^o}{ố}% U+1ED1 \DeclareTextCompositeCommand{\`}{L8U}{\^O}{Ồ}% U+1ED2 \DeclareTextCompositeCommand{\`}{L8U}{\^o}{ồ}% U+1ED3 -%\DeclareTextCompositeCommand{\m}{L8U}{\^O}{Ổ}% U+1ED4 -%\DeclareTextCompositeCommand{\m}{L8U}{\^o}{ổ}% U+1ED5 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\^O}{Ổ}% U+1ED4 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\^o}{ổ}% U+1ED5 \DeclareTextCompositeCommand{\~}{L8U}{\^O}{Ỗ}% U+1ED6 \DeclareTextCompositeCommand{\~}{L8U}{\^o}{ỗ}% U+1ED7 \DeclareTextCompositeCommand{\d}{L8U}{\^O}{Ộ}% U+1ED8 @@ -2090,8 +2290,8 @@ \DeclareTextCompositeCommand{\'}{L8U}{\ohorn}{ớ}% U+1EDB \DeclareTextCompositeCommand{\`}{L8U}{\Ohorn}{Ờ}% U+1EDC \DeclareTextCompositeCommand{\`}{L8U}{\ohorn}{ờ}% U+1EDD -%\DeclareTextCompositeCommand{\m}{L8U}{\Ohorn}{Ở}% U+1EDE -%\DeclareTextCompositeCommand{\m}{L8U}{\ohorn}{ở}% U+1EDF +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\Ohorn}{Ở}% U+1EDE +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\ohorn}{ở}% U+1EDF \DeclareTextCompositeCommand{\~}{L8U}{\Ohorn}{Ỡ}% U+1EE0 \DeclareTextCompositeCommand{\~}{L8U}{\ohorn}{ỡ}% U+1EE1 \DeclareTextCompositeCommand{\d}{L8U}{\Ohorn}{Ợ}% U+1EE2 @@ -2131,14 +2331,14 @@ \fi \DeclareTextCompositeCommand{\d}{L8U}{U}{Ụ}% U+1EE4 \DeclareTextCompositeCommand{\d}{L8U}{u}{ụ}% U+1EE5 -%\DeclareTextCompositeCommand{\m}{L8U}{U}{Ủ}% U+1EE6 -%\DeclareTextCompositeCommand{\m}{L8U}{u}{ủ}% U+1EE7 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{U}{Ủ}% U+1EE6 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{u}{ủ}% U+1EE7 \DeclareTextCompositeCommand{\'}{L8U}{\Uhorn}{Ứ}% U+1EE8 \DeclareTextCompositeCommand{\'}{L8U}{\uhorn}{ứ}% U+1EE9 \DeclareTextCompositeCommand{\`}{L8U}{\Uhorn}{Ừ}% U+1EEA \DeclareTextCompositeCommand{\`}{L8U}{\uhorn}{ừ}% U+1EEB -%\DeclareTextCompositeCommand{\m}{L8U}{\Uhorn}{Ử}% U+1EEC -%\DeclareTextCompositeCommand{\m}{L8U}{\uhorn}{ử}% U+1EED +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\Uhorn}{Ử}% U+1EEC +%\DeclareTextCompositeCommand{\texttipam}{L8U}{\uhorn}{ử}% U+1EED \DeclareTextCompositeCommand{\~}{L8U}{\Uhorn}{Ữ}% U+1EEE \DeclareTextCompositeCommand{\~}{L8U}{\uhorn}{ữ}% U+1EEF % @@ -2171,8 +2371,8 @@ \DeclareTextCompositeCommand{\`}{L8U}{y}{ỳ}% U+1EF3 \DeclareTextCompositeCommand{\d}{L8U}{Y}{Ỵ}% U+1EF4 \DeclareTextCompositeCommand{\d}{L8U}{y}{ỵ}% U+1EF5 -%\DeclareTextCompositeCommand{\m}{L8U}{Y}{Ỷ}% U+1EF6 -%\DeclareTextCompositeCommand{\m}{L8U}{y}{ỷ}% U+1EF7 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{Y}{Ỷ}% U+1EF6 +%\DeclareTextCompositeCommand{\texttipam}{L8U}{y}{ỷ}% U+1EF7 \DeclareTextCompositeCommand{\~}{L8U}{Y}{Ỹ}% U+1EF8 \DeclareTextCompositeCommand{\~}{L8U}{y}{ỹ}% U+1EF9 \ifvnmxmp @@ -2287,15 +2487,16 @@ } -\DeclareTextCommand{\textcompwordmark}{L8U}{}% U+200C -\DeclareTextCommand{\ZWNJ}{L8U}{}% U+200C -\DeclareTextCommand{\noboundary}{L8U}{}% U+200D +\DeclareTextCommand{\textcompwordmark}{L8U}{}% U+200C may show as invisible +\DeclareTextCommand{\liixu@ZWNJ}{L8U}{}% U+200C may show as invisible +\DeclareTextCommand{\liixu@noboundary}{L8U}{}% U+200D may show as invisible % \DeclareTextCommand{\textthreequartersemdash}{L8U}{‒}% U+2012 \DeclareTextCommand{\textendash}{L8U}{–}% U+2013 \DeclareTextCommand{\textemdash}{L8U}{—}% U+2014 \DeclareTextCommand{\texttwelveudash}{L8U}{―}% U+2015 \DeclareTextCommand{\textbardbl}{L8U}{‖}% U+2016 +\DeclareTextCommand{\textdoublevertline}{L8U}{‖}% U+2016 % \DeclareTextCommand{\textquoteleft}{L8U}{‘}% U+2018 \DeclareTextCommand{\textquoteright}{L8U}{’}% U+2019 @@ -3119,7 +3320,7 @@ % \DeclareTextCommand{\textdiamond}{L8U}{◇}%* U+25C7 % -\DeclareTextCommand{\textlozenge}{L8U}{◊}%* U+25CA +\DeclareTextCommand{\dotextlozenge}{L8U}{◊}%* U+25CA % \DeclareTextCommand{\textLEFTCIRCLE}{L8U}{◖}%* U+25D6 \DeclareTextCommand{\textRIGHTCIRCLE}{L8U}{◗}%* U+25D7 @@ -3548,6 +3749,11 @@ \DeclareTextCommand{\textoo}{L8U}{ꝏ}%* U+A74F \DeclareTextCommand{\textcircumlow}{L8U}{ꞈ}% U+A788 +% +% Latin Extended-E : U+AB30–AB6F Unicode v9.0 +% IPA +% +\DeclareTextCommand{\textscomega}{L8U}{^^ea^^ad^^a5}%* U+AB65 % % Alphabetic Presentation Forms @@ -3629,4 +3835,4 @@ \endinput %% -%% End of file `l8uenc.def'. +%% End of file `l8u-penc.def'. diff --git a/Master/texmf-dist/tex/latex/pdfx/l8uarb.def b/Master/texmf-dist/tex/latex/pdfx/l8uarb-penc.def index b5ecdba71da..aaa425b583f 100644 --- a/Master/texmf-dist/tex/latex/pdfx/l8uarb.def +++ b/Master/texmf-dist/tex/latex/pdfx/l8uarb-penc.def @@ -1,15 +1,16 @@ %% -%% This is file `l8uarb.def' +%% This is file `l8uarb-penc.def' +%% Formerly known as l8uarb.def . %% -%% l8uarb.def +%% l8uarb-penc.def %% %% This is a hand-written file, based upon t1enc.def %% with extensions for more composite characters. %% -%% Copyright 2016 Ross Moore <ross.moore@mq.edu.au> +%% Copyright 2016, 2017 Ross Moore <ross.moore@mq.edu.au> %% -\ProvidesFile{l8uarb.def} - [2016/03/18 v0.4 +\ProvidesFile{l8uarb-penc.def} + [2017/06/23 v0.5 Arabic support for UTF8 in XMP metadata] % @@ -135,8 +136,9 @@ % General Punctuation % -\DeclareTextCommand{\ZWNJ}{L8U}{}% U+200C -\DeclareTextCommand{\noboundary}{L8U}{^^e2^^80^^8d}% U+200D +% already declared in l8u-penc.def +%\DeclareTextCommand{\ZWNJ}{L8U}{}% U+200C +%\DeclareTextCommand{\liixu@noboundary}{L8U}{^^e2^^80^^8d}% U+200D % diff --git a/Master/texmf-dist/tex/latex/pdfx/l8uarm.def b/Master/texmf-dist/tex/latex/pdfx/l8uarm-penc.def index 0835a5ad275..6ef50ce230e 100644 --- a/Master/texmf-dist/tex/latex/pdfx/l8uarm.def +++ b/Master/texmf-dist/tex/latex/pdfx/l8uarm-penc.def @@ -1,15 +1,16 @@ %% -%% This is file `l8uarm.def' +%% This is file `l8uarm-penc.def' +%% Formerly known as `l8uarm.def' %% -%% l8uarm.def +%% l8uarm-penc.def %% %% This is a hand-written file, based upon ot6enc.def %% with extensions for more composite characters. %% %% Copyright 2016 Ross Moore <ross.moore@mq.edu.au> %% -\ProvidesFile{l8uarm.def} - [2016/03/18 v0.4 +\ProvidesFile{l8uarm-penc.def} + [2017/06/23 v0.5 Armenian support for UTF8 in XMP metadata] % @@ -142,7 +143,7 @@ \DeclareTextCommand{\textArmTeX}{L8U}{ԱրմTeX} \DeclareTextCommand{\textlatArmTeX}{L8U}{ArmTeX} -\def\LIIXUmaparmenianletters{% +\gdef\LIIXUmaparmenianletters{% \let\ArmTeX\textArmTeX \let\latArmTeX\textlatArmTeX \let\Armayb\textArmayb @@ -251,6 +252,7 @@ \let\textanjgic\textarmemdash \let\armemdash\textarmemdash \let\armbl\textarmbreaklig + \let\*\textarmbreaklig \let\textbreaklig\textarmbreaklig \let\armabbrev\textarmabbrev \let\armabr\textarmabr diff --git a/Master/texmf-dist/tex/latex/pdfx/l8ucyr.def b/Master/texmf-dist/tex/latex/pdfx/l8ucyr-penc.def index 06e6524fa46..bd437b576f9 100644 --- a/Master/texmf-dist/tex/latex/pdfx/l8ucyr.def +++ b/Master/texmf-dist/tex/latex/pdfx/l8ucyr-penc.def @@ -1,15 +1,16 @@ %% -%% This is file `l8ucyr.def' +%% This is file `l8ucyr-penc.def' +%% Formerly known as `l8ucyr.def' %% -%% l8ucyr.def +%% l8ucyr-penc.def %% %% This is a hand-written file, based upon t1enc.def %% with extensions for more composite characters. %% %% Copyright 2017 Ross Moore <ross.moore@mq.edu.au> %% -\ProvidesFile{l8ucyr.def} - [2017/05/18 v0.5 +\ProvidesFile{l8ucyr-penc.def} + [2017/06/23 v0.6 Cyrillic support for UTF8 in XMP metadata] % diff --git a/Master/texmf-dist/tex/latex/pdfx/l8udev.def b/Master/texmf-dist/tex/latex/pdfx/l8udev-penc.def index 7a6f459b18d..39616b7ae2f 100644 --- a/Master/texmf-dist/tex/latex/pdfx/l8udev.def +++ b/Master/texmf-dist/tex/latex/pdfx/l8udev-penc.def @@ -1,15 +1,16 @@ %% -%% This is file `l8uarb.def' +%% This is file `l8udev-penc.def' +%% Formerly known as `l8udev.def' %% -%% l8uarb.def +%% l8udev-penc.def %% %% This is a hand-written file, based upon t1enc.def %% with extensions for more composite characters. %% -%% Copyright 2016 Ross Moore <ross.moore@mq.edu.au> +%% Copyright 2016, 2017 Ross Moore <ross.moore@mq.edu.au> %% -\ProvidesFile{l8udev.def} - [2016/03/18 v0.4 +\ProvidesFile{l8udev-penc.def} + [2017/06/23 v0.5 Devanagari support for UTF8 in XMP metadata] % @@ -149,8 +150,8 @@ \DeclareTextCompositeCommand{\textdevanagarinukta}{L8U}{\textdevanagariddha}{ढ़} \DeclareTextCompositeCommand{\textdevanagarinukta}{L8U}{ढ}{ढ़} \DeclareTextCommand{\textdevanagarifa}{L8U}{फ़} -\DeclareTextCompositeCommand{\textdevanagarinukta}{L8U}{\textdevanagaripha}{L8U}{फ़} -\DeclareTextCompositeCommand{\textdevanagarinukta}{L8U}{फ}{L8U}{फ़} +\DeclareTextCompositeCommand{\textdevanagarinukta}{L8U}{\textdevanagaripha}{फ़} +\DeclareTextCompositeCommand{\textdevanagarinukta}{L8U}{फ}{फ़} \DeclareTextCommand{\textdevanagariyya}{L8U}{य़} \DeclareTextCompositeCommand{\textdevanagarinukta}{L8U}{\textdevanagariya}{य़} \DeclareTextCompositeCommand{\textdevanagarinukta}{L8U}{य}{य़} diff --git a/Master/texmf-dist/tex/latex/pdfx/l8ugrk.def b/Master/texmf-dist/tex/latex/pdfx/l8ugrk-penc.def index 84bd25e3b45..4904e293175 100644 --- a/Master/texmf-dist/tex/latex/pdfx/l8ugrk.def +++ b/Master/texmf-dist/tex/latex/pdfx/l8ugrk-penc.def @@ -1,15 +1,16 @@ %% -%% This is file `l8ugrk.def' +%% This is file `l8ugrk-penc.def' +%% Formerly known as `l8ugrk.def' %% -%% l8ugrk.def +%% l8ugrk-penc.def %% %% This is a hand-written file, based upon t1enc.def %% with extensions for more composite characters. %% -%% Copyright 2016 Ross Moore <ross.moore@mq.edu.au> +%% Copyright 2018 Ross Moore <ross.moore@mq.edu.au> %% -\ProvidesFile{l8ugrk.def} - [2016/03/18 v0.4 +\ProvidesFile{l8ugrk-penc.def} + [2018/11/28 v0.6 Greek support for UTF8 in XMP metadata] % @@ -102,7 +103,7 @@ \DeclareTextCompositeCommand{\'}{L8U}{Ω}{Ώ\restarttextLGR} \DeclareTextCompositeCommand{\'}{L8U}{\textIotadieresis}{ΐ\restarttextLGR}% PD1 \DeclareTextCompositeCommand{\textdialytikatonos}{L8U}{\textiota}{ΐ\restarttextLGR} -\DeclareTextCommand{\textAlpha}{L8U}{\liixu@fookforsubiota{Α}{ᾼ}} +\DeclareTextCommand{\textAlpha}{L8U}{\liixu@lookforsubiota{Α}{ᾼ}} \DeclareTextCommand{\textBeta}{L8U}{Β} \DeclareTextCommand{\textGamma}{L8U}{Γ} \DeclareTextCommand{\textDelta}{L8U}{Δ} @@ -890,7 +891,7 @@ \def\liixu@recover@empty#1{#1\@empty} \DeclareTextCommand{\text@checkfinalsigma}{L8U}[1]{\textsigma\textgreekLGR@i#1} \DeclareTextCompositeCommand{\text@checkfinalsigma}{L8U}{v}{\textsigma} -\DeclareTextCompositeCommand{\text@checkfinalsigma}{L8U}{\noboundary}{\textsigma} +\DeclareTextCompositeCommand{\text@checkfinalsigma}{L8U}{\liixu@noboundary}{\textsigma} \obeyspaces \DeclareTextCompositeCommand{\textLGRenc}{L8U}{\sep}{\sep }% \DeclareTextCompositeCommand{\textLGRenc}{L8U}{ }{\space}% diff --git a/Master/texmf-dist/tex/latex/pdfx/l8uheb-penc.def b/Master/texmf-dist/tex/latex/pdfx/l8uheb-penc.def new file mode 100644 index 00000000000..0cad5a67d8b --- /dev/null +++ b/Master/texmf-dist/tex/latex/pdfx/l8uheb-penc.def @@ -0,0 +1,513 @@ +%% +%% This is file `l8uheb-penc.def' +%% formerly known as `l8uheb.def' +%% +%% l8uheb-penc.def +%% +%% This is a hand-written file, based upon various hebrew packages +%% with extensions for more composite characters. +%% +%% Copyright 2018 Ross Moore <ross.moore@mq.edu.au> +%% +\ProvidesFile{l8uheb-penc.def} + [2018/11/15 v0.5 + Hebrew support for UTF8 in XMP metadata] + +% +% uses macro names from ../babel-hebrew/{he8,lhe}enc.def +% and ../babel-hebrew/cp{1255,862}enc.def +% and ../ucs/data/uni-5.def +% +% defines command: \LIIXUmaphebrewletters +% parsers: \textLHE LHE transliterated ASCII +% \textHEBO for cp862 +% \textHEB HE8 for ISO 8859-8, cp1255 +% with \newshequel at ^^a4 + +\def\LIIXUmaphebrewletters{% + \let\sheva\textsheva + \let\hatafsegol\hebhatafsegol + \let\hatafpatah\hebhatafpatah + \let\hatafqamats\hebhatafqamats + \let\hiriq\hebhiriq + \let\tsere\hebtsere + \let\segol\hebsegol + \let\patah\hebpatah + \let\qamats\hebqamats + \let\holam\hebholam + \let\qubuts\hebqubuts + \let\dagesh\hebdagesh + \let\meteg\hebmeteg + \let\maqaf\hebmaqaf + \let\shindot\hebshindot + \let\sindot\hebsindot + \let\sofpasuq\hebsofpasuq + \let\nunhafukha\hebnunhafukha + \let\doublevav\hebdoublevav + \let\vavyod\hebvavyod + \let\doubleyod\hebdoubleyod + \let\geresh\hebgeresh + \let\gershayim\hebgershayim + \let\rafe\hebrafe + \let\newsheqel\textnewsheqel % Ux20AA + \let\lefttorightmark\textLR + \let\righttoleftmark\textRL + \let\hebsin\hebshin +% \let\\text +% \let\\text +% \let\\text +} + +%%%% Hebrew Characters + marks Ux0590 – Ux05FF +% +\DeclareTextCommand{\hebsheva}{L8U}[1]{ְ#1}% U+05B0 +\DeclareTextCommand{\hebhatafsegol}{L8U}[1]{ֱ#1} +\DeclareTextCommand{\hebhatafpatah}{L8U}[1]{ֲ#1} +\DeclareTextCommand{\hebhatafqamats}{L8U}[1]{ֳ#1} +\DeclareTextCommand{\hebhiriq}{L8U}[1]{ִ#1} +\DeclareTextCommand{\hebtsere}{L8U}[1]{ֵ#1} +\DeclareTextCommand{\hebsegol}{L8U}[1]{ֶ#1} +\DeclareTextCommand{\hebpatah}{L8U}[1]{ַ#1} +\DeclareTextCommand{\hebqamats}{L8U}[1]{ָ#1} +\DeclareTextCommand{\hebholam}{L8U}[1]{ֹ#1} +% +\DeclareTextCommand{\hebqubuts}{L8U}[1]{ֻ#1}% U+05BB +\DeclareTextCommand{\hebdagesh}{L8U}[1]{ּ#1}% U+05BC +\DeclareTextCommand{\hebmeteg}{L8U}[1]{ֽ#1}% U+05BD +\DeclareTextCommand{\hebmaqaf}{L8U}{־}% ??? U+05BE +\DeclareTextCommand{\hebrafe}{L8U}[1]{ֿ#1}% U+05BF +% +\DeclareTextCommand{\hebpaseq}{L8U}{׀}% U+05C0 +\DeclareTextCommand{\hebshindot}{L8U}[1]{ׁ#1}% U+05C1 +\DeclareTextCommand{\hebsindot}{L8U}[1]{ׂ#1}% U+05C2 +\DeclareTextCommand{\hebsofpasuq}{L8U}{׃}% U+05C3 +%\DeclareTextCommand{\hebhebupperdot}{L8U}{ׄ}% U+05C4 +%\DeclareTextCommand{\hebheblowerdot}{L8U}{ׅ}% U+05C5 +%\DeclareTextCommand{\hebnunhafukha}{L8U}{׃}% U+05C6 +%\DeclareTextCommand{\hebqamatsqatan}{L8U}{ׇ}% U+05C7 +% +\DeclareTextCommand{\hebshindotdagesh}{L8U}[1]{#1ּׁ}% Ux05C1+Ux05BC +\DeclareTextCommand{\hebsindotdagesh}{L8U}[1]{#1ּׂ}% Ux05C2+Ux05BC +% +\DeclareTextCommand{\hebalef}{L8U}{א}% U+05D0 +\DeclareTextCommand{\hebbet}{L8U}{ב}% U+05D1 +\DeclareTextCommand{\hebgimel}{L8U}{ג}% U+05D2 +\DeclareTextCommand{\hebdalet}{L8U}{ד}% U+05D3 +\DeclareTextCommand{\hebhe}{L8U}{ה}% U+05D4 +\DeclareTextCommand{\hebvav}{L8U}{ו}% U+05D5 +\DeclareTextCommand{\hebzayin}{L8U}{ז}% U+05D6 +\DeclareTextCommand{\hebhet}{L8U}{ח}% U+05D7 +\DeclareTextCommand{\hebtet}{L8U}{ט}% U+05D8 +\DeclareTextCommand{\hebyod}{L8U}{י}% U+05D9 +\DeclareTextCommand{\hebfinalkaf}{L8U}{ך}% U+05DA +\DeclareTextCommand{\hebkaf}{L8U}{כ}% U+05DB +\DeclareTextCommand{\heblamed}{L8U}{ל}% U+05DC +\DeclareTextCommand{\hebfinalmem}{L8U}{ם}% U+05DD +\DeclareTextCommand{\hebmem}{L8U}{מ}% U+05DE +\DeclareTextCommand{\hebfinalnun}{L8U}{ן}% U+05DF +\DeclareTextCommand{\hebnun}{L8U}{נ}% U+05E0 +\DeclareTextCommand{\hebsamekh}{L8U}{ס}% U+05E1 +\DeclareTextCommand{\hebayin}{L8U}{ע}% U+05E2 +\DeclareTextCommand{\hebfinalpe}{L8U}{ף}% U+05E3 +\DeclareTextCommand{\hebpe}{L8U}{פ}% U+05E4 +\DeclareTextCommand{\hebfinaltsadi}{L8U}{ץ}% U+05E5 +\DeclareTextCommand{\hebtsadi}{L8U}{צ}% U+05E6 +\DeclareTextCommand{\hebqof}{L8U}{ק}% U+05E7 +\DeclareTextCommand{\hebresh}{L8U}{ר}% U+05E8 +\DeclareTextCommand{\hebshin}{L8U}{ש}% U+05E9 +\DeclareTextCommand{\hebtav}{L8U}{ת}% U+05EA +% +\DeclareTextCommand{\hebdoublevav}{L8U}{װ}% U+05F0 +\DeclareTextCommand{\hebvavyod}{L8U}{ױ}% U+05F1 +\DeclareTextCommand{\hebdoubleyod}{L8U}{ײ}% U+05F2 +%\DeclareTextCommand{\hebgeresh}{L8U}{׳}% U+05F3 +%\DeclareTextCommand{\hebgershayim}{L8U}{״}% U+05F4 + +\DeclareTextCommand{\textnewsheqel}{L8U}{₪}% U+20AA + + +\DeclareTextCompositeCommand{\hebhiriq}{L8U}{\hebyod}{יִ}% UxFB1D +\DeclareTextCompositeCommand{\hebshindot}{L8U}{\hebshin}{שׁ}% UxFB2A +\DeclareTextCompositeCommand{\hebsindot}{L8U}{\hebshin}{שׂ}% UxFB2B +\DeclareTextCompositeCommand{\hebshindot}{L8U}{\dagesh}{\hebshindotdagesh}% +\DeclareTextCompositeCommand{\hebshindot}{L8U}{\hebdagesh}{\hebshindotdagesh}% +\DeclareTextCompositeCommand{\hebshindotdagesh}{L8U}{\hebshin}{שּׁ}% UxFB2C +\DeclareTextCompositeCommand{\hebsindot}{L8U}{\dagesh}{\hebsindotdagesh}% +\DeclareTextCompositeCommand{\hebsindot}{L8U}{\hebdagesh}{\hebsindotdagesh}% +\DeclareTextCompositeCommand{\hebsindotdagesh}{L8U}{\hebshin}{שּׂ}% UxFB2D +\DeclareTextCompositeCommand{\hebpatah}{L8U}{\hebalef}{אַ}% UxFB2E +\DeclareTextCompositeCommand{\hebqamats}{L8U}{\hebalef}{אָ}% UxFB2F +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebalef}{אּ}% UxFB30 = אּ +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebbet}{בּ}% UxFB31 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebgimel}{גּ}% UxFB32 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebdalet}{דּ}% UxFB33 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebhe}{הּ}% +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebvav}{וּ}% +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebzayin}{זּ}% UxFB36 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebtet}{טּ}% +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebyod}{יּ}% +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebfinalkaf}{ךּ}% UxFB3A +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebkaf}{כּ}% +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\heblamed}{לּ}% UxFB3C +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebmem}{מּ}% +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebnun}{נּ}% +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebsamekh}{סּ}% UxFB41 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebfinalpe}{ףּ}% UxFB43 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebpe}{פּ}% +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebtsadi}{צּ}% UxFB46 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebqof}{קּ}% UxFB47 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebresh}{רּ}% UxFB48 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebshin}{שּ}% UxFB49 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{\hebtav}{תּ}% UxFB4A +\DeclareTextCompositeCommand{\hebholam}{L8U}{\hebvav}{וֹ}% UxFB4B +\DeclareTextCompositeCommand{\hebrafe}{L8U}{\hebbet}{בֿ}% UxFB4C +\DeclareTextCompositeCommand{\hebrafe}{L8U}{\hebkaf}{כֿ}% UxFB4D +\DeclareTextCompositeCommand{\hebrafe}{L8U}{\hebpe}{פֿ}% UxFB4e + + +\ifhebHEBxmp\else\expandafter\endinput\fi + +% implement transliteration for LHE, HE8 encoded input + +\DeclareTextCommand{\texthebLHEstring}{L8U}[1]{\texthebLHE@ii#1\@empty\@empty} +\DeclareTextCommand{\textLHE}{L8U}[1]{\texthebLHEstring{#1}} +\DeclareTextCommand{\textLHEenc}{L8U}[1]{#1} + +\def\texthebLHE@i#1{\texthebLHE@ii#1}% +\def\texthebLHE@ii#1#2\@empty{\ifx\@empty#2\@empty + \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi + {\textLHEenc{#1}}{\textLHEenc{#1}\texthebLHE@i#2\@empty}} + +\DeclareTextCommand{\texthebHEBstring}{L8U}[1]{\texthebHEB@ii#1\@empty\@empty} +\DeclareTextCommand{\textHEB}{L8U}[1]{\texthebHEBstring{#1}} +\DeclareTextCommand{\textHEBenc}{L8U}[1]{#1} + +\def\texthebHEB@i#1{\texthebHEB@ii#1}% +\def\texthebHEB@ii#1#2\@empty{\ifx\@empty#2\@empty + \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi + {\textHEBenc{#1}}{\textHEBenc{#1}\texthebHEB@i#2\@empty}} + +\DeclareTextCommand{\texthebHEBOstring}{L8U}[1]{\texthebHEBO@ii#1\@empty\@empty} +\DeclareTextCommand{\textHEBO}{L8U}[1]{\texthebHEBstring{#1}} +\DeclareTextCommand{\textHEBOenc}{L8U}[1]{#1} + +\def\texthebHEBO@i#1{\texthebHEBO@ii#1}% +\def\texthebHEBO@ii#1#2\@empty{\ifx\@empty#2\@empty + \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi + {\textHEBOenc{#1}}{\textHEBOenc{#1}\texthebHEBO@i#2\@empty}} + +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{\TeX}{TeX} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{\LaTeX}{LaTeX} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{\TeX}{TeX} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{\LaTeX}{LaTeX} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{\TeX}{TeX} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{\LaTeX}{LaTeX} + + +% use these bindings below, for readability +\global\let\heb@en\liixu@checkemptyornext +\global\let\heb@nc\liixu@checknextchar + + +\obeyspaces +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{\sep}{\textLR\sep }% +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{ }{\space}% +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{\sep}{\textLR\sep }% +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{ }{\space}% +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{\sep}{\textLR\sep }% +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{ }{\space}% +\catcode`\ 10 + +% LHE transliteration of ASCII codes +% +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{`}{א} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{a}{ב} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{b}{ג} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{c}{ד} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{d}{ה} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{e}{ו} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{f}{ז} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{g}{ח} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{h}{ט} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{i}{י} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{j}{ך} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{k}{כ} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{l}{ל} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{m}{ם} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{n}{מ} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{o}{ן} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{p}{נ} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{q}{ס} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{r}{ע} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{s}{ף} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{t}{פ} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{u}{ץ} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{v}{צ} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{w}{ק} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{x}{ר} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{y}{ש} +\DeclareTextCompositeCommand{\textLHEenc}{L8U}{z}{ת} + + +% HE8 encoding, based on ISO 8859-8 and cp1255 +% + +% cp1255 only +% +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^80}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^81}{} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^82}{\quotesinglbase} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^83}{\textflorin} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^84}{\quotedblbase} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^85}{\textellipsis} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^86}{\textdagger} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^87}{\textdaggerdbl} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^88}{\textasciicircum} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^89}{\textperthousand} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^8a}{} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^8b}{\guilsinglleft} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^8c}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^8d}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^8e}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^8f}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^90}{} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^91}{\textquoteleft} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^92}{\textquoteright} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^93}{\textquotedblleft} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^94}{\textquotedblright} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^95}{\textbullet} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^96}{\textendash} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^97}{\textemdash} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^98}{\textasciitilde} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^99}{\texttrademark} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^9a}{} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^9b}{\guilsinglright} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^9c}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^9d}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^9e}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^9f}{} + +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^a0}{\textnobreakspace} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^a1}{} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^a2}{\textcent} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^a3}{\textsterling} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^a4}{\textcurrency}% 8859-8 +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^a4}{\newsheqel}% cp1255 +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^a5}{\textyen} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^a6}{\textbrokenbar} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^a7}{\textsection} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^a8}{\textasciidieresis} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^a9}{\textcopyright} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^aa}{\texttimes} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^ab}{\guillemotleft} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^ac}{\textlogicalnot} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^ad}{}% discretionary hyphen (invisible) +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^ae}{\textregistered} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^af}{textasciimacron} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^b0}{\textdegree} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^b1}{\textpm} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^b2}{\texttwosuperior} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^b3}{\textthreesuperior} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^b4}{\textasciigrave} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^b5}{\textmu} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^b6}{\textparagraph} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^b7}{\textperiodcentred} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^b8}{\textasciicedilla} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^b9}{\textonesuperior} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^ba}{\textdiv} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^bb}{\guillemotright} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^bc}{\textonequarter} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^bd}{\textonehalf} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^be}{\textthreequarters} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^bf}{} + +% cp1255 +% +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^c0}{\hebsheva} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^c1}{\hebhatafsegol} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^c2}{\hebhatafpatah} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^c3}{\hebhatafqamats} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^c4}{\hebhiriq} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^c5}{\hebtsere} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^c6}{\hebsegol} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^c7}{\hebpatah} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^c8}{\hebqamats} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^c9}{\hebholam} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^ca}{} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^cb}{\hebqubuts} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^cc}{\hebdagesh} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^cd}{\hebmeteg} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^ce}{\hebmaqaf} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^cf}{\hebrafe} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^d0}{\hebpaseq} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^d1}{\hebshindot} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^d2}{\hebsindot} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^d3}{\hebsofpasuq} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^d4}{\hebdoublevav} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^d5}{\hebvavyod} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^d6}{\hebdoubleyod} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^d7}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^d8}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^d9}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^da}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^db}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^dc}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^dd}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^de}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^df}{} + + +% 8859-8 and cp1255 +% +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^e0}{\hebalef} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^e1}{\hebbet} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^e2}{\hebgimel} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^e3}{\hebdalet} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^e4}{\hebhe} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^e5}{\hebvav} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^e6}{\hebzayin} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^e7}{\hebhet} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^e8}{\hebtet} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^e9}{\hebyod} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^ea}{\hebfinalkaf} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^eb}{\hebkaf} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^ec}{\heblamed} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^ed}{\hebfinalmem} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^ee}{\hebmem} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^ef}{\hebfinalnun} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^f0}{\hebnun} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^f1}{\hebsamekh} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^f2}{\hebayin} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^f3}{\hebfinalpe} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^f4}{\hebpe} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^f5}{\hebfinaltsadi} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^f6}{\hebtsadi} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^f7}{\hebqof} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^f8}{\hebresh} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^f9}{\hebshin} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^fa}{\hebtav} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^fb}{} +%\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^fc}{} + +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^fe}{\textLR} +\DeclareTextCompositeCommand{\textHEBenc}{L8U}{^^ff}{\textRL} + + +\DeclareTextCompositeCommand{\hebhiriq}{L8U}{^^e9}{יִ}% UxFB1D +\DeclareTextCompositeCommand{\hebshindot}{L8U}{^^f9}{שׁ}% UxFB2A +\DeclareTextCompositeCommand{\hebsindot}{L8U}{^^f9}{שׂ}% UxFB2B +\DeclareTextCompositeCommand{\hebshindot}{L8U}{^^cc}{\hebshindotdagesh}% +\DeclareTextCompositeCommand{\hebshindotdagesh}{L8U}{^^f9}{שּׁ}% UxFB2C +\DeclareTextCompositeCommand{\hebsindot}{L8U}{^^cc}{\hebsindotdagesh}% +\DeclareTextCompositeCommand{\hebsindotdagesh}{L8U}{^^f9}{שּׂ}% UxFB2D +\DeclareTextCompositeCommand{\hebpatah}{L8U}{^^e0}{אַ}% UxFB2E +\DeclareTextCompositeCommand{\hebqamats}{L8U}{^^e0}{אָ}% UxFB2F +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^e0}{אּ}% UxFB30 = אּ +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^e1}{בּ}% UxFB31 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^e2}{גּ}% UxFB32 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^e3}{דּ}% UxFB33 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^e4}{הּ}% UxFB34 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^e5}{וּ}% UxFB35 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^e6}{זּ}% UxFB36 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^e8}{טּ}% UxFB38 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^e9}{יּ}% UxFB39 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^ea}{ךּ}% UxFB3A +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^eb}{כּ}% UxFB3B +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^ec}{לּ}% UxFB3C +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^ee}{מּ}% UxFB3E +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^f0}{נּ}% UxFB40 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^f1}{סּ}% UxFB41 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^f3}{ףּ}% UxFB43 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^f4}{פּ}% UxFB44 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^f6}{צּ}% UxFB46 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^f7}{קּ}% UxFB47 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^f8}{רּ}% UxFB48 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^f9}{שּ}% UxFB49 +\DeclareTextCompositeCommand{\hebdagesh}{L8U}{^^fa}{תּ}% UxFB4A +\DeclareTextCompositeCommand{\hebholam}{L8U}{^^e5}{וֹ}% UxFB4B +\DeclareTextCompositeCommand{\hebrafe}{L8U}{^^e1}{בֿ}% UxFB4C +\DeclareTextCompositeCommand{\hebrafe}{L8U}{^^eb}{כֿ}% UxFB4D +\DeclareTextCompositeCommand{\hebrafe}{L8U}{^^f4}{פֿ}% UxFB4E + + +% cp862 HEBO = "old-style" +% +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^80}{\hebalef} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^81}{\hebbet} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^82}{\hebgimel} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^83}{\hebdalet} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^84}{\hebhe} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^85}{\hebvav} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^86}{\hebzayin} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^87}{\hebhet} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^88}{\hebtet} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^89}{\hebyod} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^8a}{\hebfinalkaf} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^8b}{\hebkaf} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^8c}{\heblamed} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^8d}{\hebfinalmem} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^8e}{\hebmem} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^8f}{\hebfinalnun} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^90}{\hebnun} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^91}{\hebsamekh} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^92}{\hebayin} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^93}{\hebfinalpe} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^94}{\hebpe} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^95}{\hebfinaltsadi} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^96}{\hebtsadi} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^97}{\hebqof} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^98}{\hebresh} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^99}{\hebshin} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^9a}{\hebtav} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^9b}{\textcent} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^9c}{\textstirling} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^9d}{\textyen} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^9e}{\textpeseta} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^9f}{\textflorin} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^a0}{\'{a}} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^a1}{\'{\i}} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^a2}{\'{o}} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^a3}{\'{u}} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^a4}{\~{n}} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^a5}{\~{N}} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^a6}{\textordfeminine} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^a7}{\textordmasculine} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^a8}{\textquestiondown} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^aa}{\textlogicalnot} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^ab}{\textonehalf} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^ac}{\textonequarter} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^ad}{\textexclamdown} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^ae}{\guillemotleft} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^af}{\guillemotright} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^e0}{\alpha} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^e1}{\ss} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^e2}{\Gamma} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^e3}{\pi} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^e4}{\Sigma} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^e5}{\sigma} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^e6}{\textmu} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^e7}{\tau} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^e8}{\Phi} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^e9}{\Theta} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^ea}{\Omega} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^eb}{\delta} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^ec}{\infty} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^ed}{\phi} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^ee}{\varepsilon} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^ef}{\cap} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^f0}{\equiv} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^f1}{\textpm} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^f2}{\ge} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^f3}{\le} +%\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^f4}{} +%\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^f5}{} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^f6}{\textdiv} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^f7}{\approx} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^f8}{\textdegree} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^f9}{\textperiodcentered} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^fa}{\textbullet} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^fb}{\textsurd} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^fc}{\textonesuperior} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^fd}{\texttwosuperior} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^fe}{\textblacksquare} +\DeclareTextCompositeCommand{\textHEBOenc}{L8U}{^^ff}{\nobreakspace} diff --git a/Master/texmf-dist/tex/latex/pdfx/l8ulat.def b/Master/texmf-dist/tex/latex/pdfx/l8ulat-penc.def index f507364231e..7bed49240cb 100644 --- a/Master/texmf-dist/tex/latex/pdfx/l8ulat.def +++ b/Master/texmf-dist/tex/latex/pdfx/l8ulat-penc.def @@ -1,15 +1,16 @@ %% -%% This is file `l8ulat.def' +%% This is file `l8ulat-penc.def' +%% Formerly known as `l8ulat.def' %% -%% l8ulat.def +%% l8ulat-penc.def %% %% This is a hand-written file, based upon ot6enc.def %% with extensions for more composite characters. %% %% Copyright 2016 Ross Moore <ross.moore@mq.edu.au> %% -\ProvidesFile{l8ulat.def} - [2016/04/13 v0.4 +\ProvidesFile{l8ulat-penc.def} + [2017/06/23 v0.5 Latin1–Latin9 conversion to UTF8 in XMP metadata] % diff --git a/Master/texmf-dist/tex/latex/pdfx/l8umath.def b/Master/texmf-dist/tex/latex/pdfx/l8umath-penc.def index 9e413931c70..9a19afc1efd 100644 --- a/Master/texmf-dist/tex/latex/pdfx/l8umath.def +++ b/Master/texmf-dist/tex/latex/pdfx/l8umath-penc.def @@ -1,13 +1,14 @@ %% -%% This is file `l8umath.def' +%% This is file `l8umath-penc.def' +%% Formerly known as `l8umath.def' %% -%% l8umath.def +%% l8umath-penc.def %% %% This is a hand-written file, based upon parts %% of puenc.def and other files, with extensions %% for more automation. %% -%% Copyright 2016 Ross Moore <ross.moore@mq.edu.au> +%% Copyright 2016, 2017 Ross Moore <ross.moore@mq.edu.au> %% %% defines the following commands %% \LIIXUmapmathaccents @@ -23,8 +24,8 @@ %% \LIIXUmapunimathgreek %% \LIIXUmapmathalphabets %% -\ProvidesFile{l8umath.def} - [2017/05/17 v0.5 +\ProvidesFile{l8umath-penc.def} + [2017/06/23 v0.6 Custom LaTeX file, for UTF8 encoded math symbols] % diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfa.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfa.xmp index c1a2149ae87..271cc62d92a 100644 --- a/Master/texmf-dist/tex/latex/pdfx/pdfa.xmp +++ b/Master/texmf-dist/tex/latex/pdfx/pdfa.xmp @@ -1,8 +1,8 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -%% File: pdfa.xmp +%% File: pdfa.xmp (for pdfx.sty v1.6) %% -%% Copyright (c) 2016, CV Radhakrishnan <cvr@river-valley.org>, +%% Copyright (c) 2018, CV Radhakrishnan <cvr@river-valley.org>, %% Han The Thanh <thanh@river-valley.org>, %% Ross Moore <ross.moore@mq.edu.au>, %% Peter Selinger <selinger@mathstat.dal.ca> @@ -18,9 +18,10 @@ %% 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:pdfxid="http://www.npes.org/pdfx/ns/id/"> % xmlns:pdfaid = "http://www.aiim.org/pdfa/ns/id/" % xmlns:xmp = "http://ns.adobe.com/xap/1.0/" % xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/" @@ -31,71 +32,83 @@ % xmlns:pdfaProperty = "http://www.aiim.org/pdfa/ns/property#" % xmlns:pdfaSchema = "http://www.aiim.org/pdfa/ns/schema#" % xmlns:pdfaType = "http://www.aiim.org/pdfa/ns/type#" -% xmlns:prism = "http://prismstandard.org/namespaces/basic/2.2/" +% xmlns:prism = "http://prismstandard.org/namespaces/basic/2.2/" %% RRM: Other possible namespaces. %% If these are used, then appropriate tags need to be declared, using %% pdfaExtension:schemas similarly to below for prism: -% xmlns:pim = "http://prismstandard.org/namespaces/pim/2.2/" -% xmlns:prl = "http://prismstandard.org/namespaces/prl/2.1/" -% xmlns:pur = "http://prismstandard.org/namespaces/primusagerights/2.1/" +% 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#" + <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> + > + <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 PDF/UA metadata + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:namespaceURI>http://www.aiim.org/pdfua/ns/id/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>pdfuaid</pdfaSchema:prefix> + <pdfaSchema:schema>PDF/UA ID Schema</pdfaSchema:schema> + <pdfaSchema:property><rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>Part of PDF/UA standard</pdfaProperty:description> + <pdfaProperty:name>part</pdfaProperty:name> + <pdfaProperty:valueType>Integer</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> + <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 %\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 + <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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 + <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> %% RRM: more tags can be declared % <rdf:li rdf:parseType="Resource"> % <pdfaProperty:name></pdfaProperty:name> @@ -103,71 +116,80 @@ % <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> + </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@PublicationType\@empty\else <dc:type><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@PublicationType>\xmp@PublicationType</rdf:li></rdf:Bag></dc:type>\fi +\ifx\xmp@Title\@empty\else <dc:title><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Title>\xmp@Title</rdf:li></rdf:Alt></dc:title>\fi +\ifx\xmp@@Author\@empty\else <dc:creator><rdf:Seq><rdf:li\xmp@checklang\xmp@lang@Author>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>\fi +\ifx\xmp@Publisher\@empty\else <dc:publisher><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Publisher>\xmp@Publisher</rdf:li></rdf:Bag></dc:publisher>\fi +\ifx\xmp@Language\@empty\else <dc:language><rdf:Bag><rdf:li>\xmp@Language</rdf:li></rdf:Bag></dc:language>\fi +\ifx\xmp@Doi\@empty\else <dc:identifier>doi:\xmp@Doi</dc:identifier>\fi +\ifx\xmp@ISBN\@empty\else <dc:identifier>ISBN:\xmp@ISBN</dc:identifier>\fi +\ifx\xmp@URL\@empty\else <dc:identifier>URL:\xmp@URL</dc:identifier>\fi +\ifx\xmp@Copyright\@empty\else <dc:rights><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Copyright>\xmp@@Copyright</rdf:li></rdf:Alt></dc:rights>\fi +\ifx\xmp@Subject\@empty\else <dc:description><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Subject>\xmp@Subject</rdf:li></rdf:Alt></dc:description>\fi +\ifx\xmp@Keywords\@empty\else <dc:subject><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Keywords>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>\fi +\ifx\xmp@Source\@empty\else <dc:source>\xmp@Source</dc:source>\fi +\ifx\xmp@Coverage\@empty\else <dc:coverage\xmp@checklang\xmp@lang@Coverage>\xmp@Coverage</dc:coverage>\fi +\ifx\xmp@Date\@empty\else <dc:date><rdf:Seq><rdf:li>\xmp@Date</rdf:li></rdf:Seq></dc:date>\fi +\ifx\xmp@Contributor\@empty\else <dc:contributor><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Contributor>\xmp@Contributor</rdf:li></rdf:Bag></dc:contributor>\fi +\ifx\xmp@Relation\@empty\else <dc:relation><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Relation>\xmp@Relation</rdf:li></rdf:Bag></dc:relation>\fi + </rdf:Description> + <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/"> +\ifx\xmp@PublicationType\@empty\else <prism:aggregationType\xmp@checklang\xmp@lang@PublicationType>\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@checklang\xmp@lang@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@checklang\xmp@lang@JournalTitle>\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 +\ifx\xmp@URL\@empty\else <prism:url>\xmp@URL</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>\ifx\xmp@Copyrighted\@empty True\else\xmp@Copyrighted\fi</xmpRights:Marked>^^J<xmpRights:UsageTerms><rdf:Alt><rdf:li xml:lang="x-default">\xmp@@Copyright</rdf:li></rdf:Alt></xmpRights:UsageTerms>\fi - \ifx\xmp@CopyrightURL\@empty\else<xmpRights:WebStatement>\xmp@CopyrightURL</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> + <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 + </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> +\ifx\xmp@PDFUA\@empty\else <rdf:Description rdf:about="" xmlns:pdfuaid="http://www.aiim.org/pdfua/ns/id/">^^J <pdfuaid:part>\xmp@UAlevel</pdfuaid:part>^^J </rdf:Description>\fi + <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> +\ifx\xmp@Advisory\@empty\else <xmp:Advisory><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Advisory>\xmp@Advisory</rdf:li></rdf:Bag></xmp:Advisory>\fi +\ifx\xmp@BaseURL\@empty\else <xmp:BaseURL>\xmp@BaseURL</xmp:BaseURL>\fi +\ifx\xmp@Identifier\@empty\else <xmp:Identifier><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Identifier>\xmp@Identifier</rdf:li></rdf:Bag></xmp:Identifier>\fi +\ifx\xmp@Nickname\@empty\else <xmp:Nickname\xmp@checklang\xmp@lang@Nickname>\xmp@Nickname</xmp:Nickname>\fi +\ifx\xmp@Thumbnails\@empty\else <xmp:Thumbnails><rdf:Alt><rdf:li>\xmp@Thumbnails</rdf:li></rdf:Alt></xmp:Thumbnails>\fi + </rdf:Description> + <rdf:Description rdf:about="" xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/"> +\ifx\xmp@Copyright\@empty\else <xmpRights:Marked>\ifx\xmp@Copyrighted\@empty True\else\xmp@Copyrighted\fi</xmpRights:Marked>^^J <xmpRights:UsageTerms><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Copyright>\xmp@@Copyright</rdf:li></rdf:Alt></xmpRights:UsageTerms>\fi +\ifx\xmp@CopyrightURL\@empty\else <xmpRights:WebStatement>\xmp@CopyrightURL</xmpRights:WebStatement>\fi +\ifx\xmp@Owner\@empty\else <xmpRights:Owner><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Owner>\xmp@Owner</rdf:li></rdf:Bag></xmpRights:Owner>\fi +\ifx\xmp@CertificateURL\@empty\else <xmpRights:Certificate>\xmp@CertificateURL</xmpRights:Certificate>\fi + </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 \paddingline diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfe.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfe.xmp index 1fd07a347e3..68c50c6d038 100644 --- a/Master/texmf-dist/tex/latex/pdfx/pdfe.xmp +++ b/Master/texmf-dist/tex/latex/pdfx/pdfe.xmp @@ -1,8 +1,8 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -%% File: pdfx.xmp +%% File: pdfe.xmp (for pdfx.sty v1.6) %% -%% Copyright (c) 2016, CV Radhakrishnan <cvr@river-valley.org>, +%% Copyright (c) 2018, CV Radhakrishnan <cvr@river-valley.org>, %% Han The Thanh <thanh@river-valley.org>, %% Ross Moore <ross.moore@mq.edu.au>, %% Peter Selinger <selinger@mathstat.dal.ca> @@ -18,222 +18,159 @@ %% version 1999/12/01 or later. %% <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.0-c316 44.253921, Sun Oct 01 2006 17:14:39"> - <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <rdf:Description rdf:about="" - xmlns:xmp="http://ns.adobe.com/xap/1.0/" - xmlns:pdf="http://ns.adobe.com/pdf/1.3/" - xmlns:pdfe="http://www.aiim.org/pdfe/ns/id/" - xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/" - > -% xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/"> -%% xmlns:pdf = "http://ns.adobe.com/pdf/1.3/" -%% xmlns:pdfx = "http://ns.adobe.com/pdfx/1.3/" -%% xmlns:pdfxid = "http://www.npes.org/pdfx/ns/id/" -%% xmlns:xmp = "http://ns.adobe.com/xap/1.0/" -%% xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/" -%% xmlns:dc = "http://purl.org/dc/elements/1.1/" -%% xmlns:dcterms = "http://purl.org/dc/terms/" -%% xmlns:pdfaExtension = "http://www.aiim.org/pdfa/ns/extension/" -%% xmlns:pdfaField = "http://www.aiim.org/pdfa/ns/field#" -%% xmlns:pdfaProperty = "http://www.aiim.org/pdfa/ns/property#" -%% xmlns:pdfaSchema = "http://www.aiim.org/pdfa/ns/schema#" -%% xmlns:pdfaType = "http://www.aiim.org/pdfa/ns/type#" -%% xmlns:prism = "http://prismstandard.org/namespaces/basic/2.2/" -%%% RRM: Other possible namespaces. -%%% If these are used, then appropriate tags need to be declared, using -%%% pdfaExtension:schemas similarly to below for prism: -%% xmlns:pim = "http://prismstandard.org/namespaces/pim/2.2/" -%% xmlns:prl = "http://prismstandard.org/namespaces/prl/2.1/" -%% xmlns:pur = "http://prismstandard.org/namespaces/primusagerights/2.1/" -%% > -% <rdf:Description rdf:about="" xmlns:pdf="http://www.adobe.com/pdf/1.3/"> - <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool> - <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate> - <xmp:CreateDate>\xmp@convDate</xmp:CreateDate> - <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate> - \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> -%\ifnum\xmp@Part<4 <pdf:Version>PDF/X-\xmp@Part</pdf:Version>\fi -% \ifnum\xmp@Part>3 <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part</pdfxid:GTS_PDFXVersion>\fi -% <pdfx:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance\ifnum\xmp@Part<4:\xmp@ReleaseDate\fi</pdfx:GTS_PDFXVersion> -% \ifnum\xmp@Part<3 <pdfx:GTS_PDFXConformance>PDF/X-\xmp@Part\xmp@Conformance:\xmp@ReleaseDate</pdfx:GTS_PDFXConformance>\fi - \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>^^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> -% <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>\ifx\xmp@Copyrighted\@empty True\else\xmp@Copyrighted\fi</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: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: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#" + <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +% xmlns:pdf = "http://ns.adobe.com/pdf/1.3/" +% xmlns:pdfe = "http://www.aiim.org/pdfe/ns/id/" +% xmlns:pdfx = "http://ns.adobe.com/pdfx/1.3/" +% xmlns:pdfxid = "http://www.npes.org/pdfx/ns/id/"> +% xmlns:pdfaid = "http://www.aiim.org/pdfa/ns/id/" +% xmlns:xmp = "http://ns.adobe.com/xap/1.0/" +% xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/" +% xmlns:dc = "http://purl.org/dc/elements/1.1/" +% xmlns:dcterms = "http://purl.org/dc/terms/" +% xmlns:pdfaExtension = "http://www.aiim.org/pdfa/ns/extension/" +% xmlns:pdfaField = "http://www.aiim.org/pdfa/ns/field#" +% xmlns:pdfaProperty = "http://www.aiim.org/pdfa/ns/property#" +% xmlns:pdfaSchema = "http://www.aiim.org/pdfa/ns/schema#" +% xmlns:pdfaType = "http://www.aiim.org/pdfa/ns/type#" +% xmlns:prism = "http://prismstandard.org/namespaces/basic/2.2/" +%% RRM: Other possible namespaces. +%% If these are used, then appropriate tags need to be declared, using +%% pdfaExtension:schemas similarly to below for prism: +% xmlns:pim = "http://prismstandard.org/namespaces/pim/2.2/" +% xmlns:prl = "http://prismstandard.org/namespaces/prl/2.1/" +% xmlns:pur = "http://prismstandard.org/namespaces/primusagerights/2.1/" +% > + <rdf:Description rdf:about="" + xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" + xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" + xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#" %% RRM: do we really need the following two declarations ? % xmlns:pdfaType="http://www.aiim.org/pdfa/ns/type#" % xmlns:pdfaField="http://www.aiim.org/pdfa/ns/field#" - > - <pdfaExtension:schemas> - <rdf:Bag> - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:namespaceURI>http://ns.adobe.com/pdf/1.3/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>pdf</pdfaSchema:prefix> - <pdfaSchema:schema>Adobe PDF Schema</pdfaSchema:schema> - <pdfaSchema:property> - <rdf:Seq> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>A name object indicating whether the document has been modified to include trapping information</pdfaProperty:description> - <pdfaProperty:name>Trapped</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - </rdf:Seq> - </pdfaSchema:property> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:namespaceURI>http://www.aiim.org/pdfe/ns/id/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>pdfeid</pdfaSchema:prefix> - <pdfaSchema:schema>PDF/E ID Schema</pdfaSchema:schema> - <pdfaSchema:property> - <rdf:Seq> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>ID of PDF/E standard</pdfaProperty:description> - <pdfaProperty:name>ISO_PDFEVersion</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - </rdf:Seq> - </pdfaSchema:property> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:namespaceURI>http://ns.adobe.com/pdfx/1.3/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>pdfx</pdfaSchema:prefix> - <pdfaSchema:schema>PDF/X Schema</pdfaSchema:schema> - <pdfaSchema:property> - <rdf:Seq> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description> - <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>Conformance level of PDF/X standard</pdfaProperty:description> - <pdfaProperty:name>GTS_PDFXConformance</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>URL to an online version or preprint</pdfaProperty:description> - <pdfaProperty:name>AuthoritativeDomain</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>Company creating the PDF</pdfaProperty:description> - <pdfaProperty:name>Company</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>Date when document was last modified</pdfaProperty:description> - <pdfaProperty:name>SourceModified</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - </rdf:Seq> - </pdfaSchema:property> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:namespaceURI>http://ns.adobe.com/xap/1.0/mm/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>xmpMM</pdfaSchema:prefix> - <pdfaSchema:schema>XMP Media Management Schema</pdfaSchema:schema> - <pdfaSchema:property> - <rdf:Seq> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>UUID based identifier for specific incarnation of a document</pdfaProperty:description> - <pdfaProperty:name>InstanceID</pdfaProperty:name> - <pdfaProperty:valueType>URI</pdfaProperty:valueType> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>The common identifier for all versions and renditions of a document.</pdfaProperty:description> - <pdfaProperty:name>OriginalDocumentID</pdfaProperty:name> - <pdfaProperty:valueType>URI</pdfaProperty:valueType> - </rdf:li> - </rdf:Seq> - </pdfaSchema:property> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:namespaceURI>http://www.npes.org/pdfx/ns/id/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>pdfxid</pdfaSchema:prefix> - <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema> - <pdfaSchema:property> - <rdf:Seq> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description> - <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - </rdf:Seq> - </pdfaSchema:property> - </rdf:li> + > + <pdfaExtension:schemas> + <rdf:Bag> + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:namespaceURI>http://ns.adobe.com/pdf/1.3/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>pdf</pdfaSchema:prefix> + <pdfaSchema:schema>Adobe PDF Schema</pdfaSchema:schema> + <pdfaSchema:property><rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>A name object indicating whether the document has been modified to include trapping information</pdfaProperty:description> + <pdfaProperty:name>Trapped</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>PDF/X Part Version</pdfaProperty:description> + <pdfaProperty:name>Version</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li></rdf:Seq> + </pdfaSchema:property> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:namespaceURI>http://ns.adobe.com/pdfx/1.3/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>pdfx</pdfaSchema:prefix> + <pdfaSchema:schema>PDF/X Schema</pdfaSchema:schema> + <pdfaSchema:property><rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description> + <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>Conformance level of PDF/X standard</pdfaProperty:description> + <pdfaProperty:name>GTS_PDFXConformance</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>URL to an online version or preprint</pdfaProperty:description> + <pdfaProperty:name>AuthoritativeDomain</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>Company creating the PDF</pdfaProperty:description> + <pdfaProperty:name>Company</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>Date when document was last modified</pdfaProperty:description> + <pdfaProperty:name>SourceModified</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li></rdf:Seq> + </pdfaSchema:property> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:namespaceURI>http://ns.adobe.com/xap/1.0/mm/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>xmpMM</pdfaSchema:prefix> + <pdfaSchema:schema>XMP Media Management Schema</pdfaSchema:schema> + <pdfaSchema:property><rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>UUID based identifier for specific incarnation of a document</pdfaProperty:description> + <pdfaProperty:name>InstanceID</pdfaProperty:name> + <pdfaProperty:valueType>URI</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>The common identifier for all versions and renditions of a document.</pdfaProperty:description> + <pdfaProperty:name>OriginalDocumentID</pdfaProperty:name> + <pdfaProperty:valueType>URI</pdfaProperty:valueType> + </rdf:li></rdf:Seq> + </pdfaSchema:property> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:namespaceURI>http://www.npes.org/pdfx/ns/id/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>pdfxid</pdfaSchema:prefix> + <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema> + <pdfaSchema:property><rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description> + <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li></rdf:Seq> + </pdfaSchema:property> + </rdf:li> %% RRM: this declares the namespace resource for PRISM metadata - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:schema>PRISM metadata</pdfaSchema:schema> - <pdfaSchema:namespaceURI>http://prismstandard.org/namespaces/basic/2.2/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>prism</pdfaSchema:prefix> - <pdfaSchema:property> - <rdf:Seq> + <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 - \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 +%\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 + <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> %% RRM: more tags can be declared % <rdf:li rdf:parseType="Resource"> % <pdfaProperty:name></pdfaProperty:name> @@ -241,55 +178,84 @@ % <pdfaProperty:category>external</pdfaProperty:category> % <pdfaProperty:description></pdfaProperty:description> % </rdf:li> - </rdf:Seq></pdfaSchema:property> - </rdf:li> - </rdf:Bag> - </pdfaExtension:schemas> - </rdf:Description> - <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/"> - \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/"> -% <dc:format>application/pdf</dc:format> -% <dc:title> -% <rdf:Alt> -% <rdf:li xml:lang="x-default">\xmp@Title</rdf:li> -% </rdf:Alt> -% </dc:title> -% <dc:description> -% <rdf:Alt> -% <rdf:li xml:lang="x-default">\xmp@Subject</rdf:li> -% </rdf:Alt> -% </dc:description> -% <dc:creator> -% <rdf:Bag> -% <rdf:li>\xmp@Author</rdf:li> -% </rdf:Bag> -% </dc:creator> -% <dc:subject> -% <rdf:Bag> -% <rdf:li>\xmp@Keywords</rdf:li> -% </rdf:Bag> -% </dc:subject> -% </rdf:Description> - <rdf:Description rdf:about="" - xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"> - <xmpMM:DocumentID>uuid:\xmp@docid</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:\xmp@instid</xmpMM:InstanceID> - </rdf:Description> - </rdf:RDF> + </rdf:Seq></pdfaSchema:property> + </rdf:li> + </rdf:Bag> + </pdfaExtension:schemas> + </rdf:Description> + <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <dc:format>application/pdf</dc:format> +\ifx\xmp@PublicationType\@empty\else <dc:type><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@PublicationType>\xmp@PublicationType</rdf:li></rdf:Bag></dc:type>\fi +\ifx\xmp@Title\@empty\else <dc:title><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Title>\xmp@Title</rdf:li></rdf:Alt></dc:title>\fi +\ifx\xmp@@Author\@empty\else <dc:creator><rdf:Seq><rdf:li\xmp@checklang\xmp@lang@Author>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>\fi +\ifx\xmp@Publisher\@empty\else <dc:publisher><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Publisher>\xmp@Publisher</rdf:li></rdf:Bag></dc:publisher>\fi +\ifx\xmp@Language\@empty\else <dc:language><rdf:Bag><rdf:li>\xmp@Language</rdf:li></rdf:Bag></dc:language>\fi +\ifx\xmp@Doi\@empty\else <dc:identifier>doi:\xmp@Doi</dc:identifier>\fi +\ifx\xmp@ISBN\@empty\else <dc:identifier>ISBN:\xmp@ISBN</dc:identifier>\fi +\ifx\xmp@URL\@empty\else <dc:identifier>URL:\xmp@URL</dc:identifier>\fi +\ifx\xmp@Copyright\@empty\else <dc:rights><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Copyright>\xmp@@Copyright</rdf:li></rdf:Alt></dc:rights>\fi +\ifx\xmp@Subject\@empty\else <dc:description><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Subject>\xmp@Subject</rdf:li></rdf:Alt></dc:description>\fi +\ifx\xmp@Keywords\@empty\else <dc:subject><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Keywords>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>\fi +\ifx\xmp@Source\@empty\else <dc:source>\xmp@Source</dc:source>\fi +\ifx\xmp@Coverage\@empty\else <dc:coverage\xmp@checklang\xmp@lang@Coverage>\xmp@Coverage</dc:coverage>\fi +\ifx\xmp@Date\@empty\else <dc:date><rdf:Seq><rdf:li>\xmp@Date</rdf:li></rdf:Seq></dc:date>\fi +\ifx\xmp@Contributor\@empty\else <dc:contributor><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Contributor>\xmp@Contributor</rdf:li></rdf:Bag></dc:contributor>\fi +\ifx\xmp@Relation\@empty\else <dc:relation><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Relation>\xmp@Relation</rdf:li></rdf:Bag></dc:relation>\fi + </rdf:Description> + <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/"> +\ifx\xmp@PublicationType\@empty\else <prism:aggregationType\xmp@checklang\xmp@lang@PublicationType>\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@checklang\xmp@lang@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@checklang\xmp@lang@JournalTitle>\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 +\ifx\xmp@URL\@empty\else <prism:url>\xmp@URL</prism:url>\fi + </rdf:Description> + <rdf:Description rdf:about="" + xmlns:xmp="http://ns.adobe.com/xap/1.0/" + xmlns:pdf="http://ns.adobe.com/pdf/1.3/" + xmlns:pdfe="http://www.aiim.org/pdfe/ns/id/" + xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/" +% xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/" + > + <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool> + <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate> + <xmp:CreateDate>\xmp@convDate</xmp:CreateDate> + <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate> + <pdf:Producer>\xmp@Producer</pdf:Producer> +\ifx\xmp@@Keywords\@empty\else <pdf:Keywords>\xmp@@Keywords</pdf:Keywords>\fi + <pdf:Trapped>False</pdf:Trapped> + <pdfe:ISO_PDFEVersion>PDF/E-\xmp@Part</pdfe:ISO_PDFEVersion> +%\ifnum\xmp@Part<4 <pdf:Version>PDF/X-\xmp@Part</pdf:Version>\fi +%\ifnum\xmp@Part>3 <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance</pdfxid:GTS_PDFXVersion>\fi +% <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 +\ifx\xmp@AuthoritativeDomain\@empty\else <pdfx:AuthoritativeDomain><rdf:Bag><rdf:li>\xmp@AuthoritativeDomain</rdf:li></rdf:Bag></pdfx:AuthoritativeDomain>\fi +\ifx\xmp@Advisory\@empty\else <xmp:Advisory><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Advisory>\xmp@Advisory</rdf:li></rdf:Bag></xmp:Advisory>\fi +\ifx\xmp@BaseURL\@empty\else <xmp:BaseURL>\xmp@BaseURL</xmp:BaseURL>\fi +\ifx\xmp@Identifier\@empty\else <xmp:Identifier><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Identifier>\xmp@Identifier</rdf:li></rdf:Bag></xmp:Identifier>\fi +\ifx\xmp@Nickname\@empty\else <xmp:Nickname\xmp@checklang\xmp@lang@Nickname>\xmp@Nickname</xmp:Nickname>\fi +\ifx\xmp@Thumbnails\@empty\else <xmp:Thumbnails><rdf:Alt><rdf:li>\xmp@Thumbnails</rdf:li></rdf:Alt></xmp:Thumbnails>\fi + </rdf:Description> + <rdf:Description rdf:about="" xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/"> +\ifx\xmp@Copyright\@empty\else <xmpRights:Marked>\ifx\xmp@Copyrighted\@empty True\else\xmp@Copyrighted\fi</xmpRights:Marked>^^J <xmpRights:UsageTerms><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Copyright>\xmp@@Copyright</rdf:li></rdf:Alt></xmpRights:UsageTerms>\fi +\ifx\xmp@CopyrightURL\@empty\else <xmpRights:WebStatement>\xmp@CopyrightURL</xmpRights:WebStatement>\fi +\ifx\xmp@Owner\@empty\else <xmpRights:Owner><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Owner>\xmp@Owner</rdf:li></rdf:Bag></xmpRights:Owner>\fi +\ifx\xmp@CertificateURL\@empty\else <xmpRights:Certificate>\xmp@CertificateURL</xmpRights:Certificate>\fi + </rdf:Description> + <rdf:Description rdf:about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"> + <xmpMM:DocumentID>uuid:\xmp@docid</xmpMM:DocumentID> + <xmpMM:InstanceID>uuid:\xmp@instid</xmpMM:InstanceID> +\ifnum\xmp@Part>3 <xmpMM:RenditionClass>default</xmpMM:RenditionClass>\fi +\ifnum\xmp@Part>3 <xmpMM:VersionID>1</xmpMM:VersionID>\fi + </rdf:Description> + </rdf:RDF> </x:xmpmeta> % padding with 512 space characters to allow easier editing within a PDF \paddingline diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfvt.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfvt.xmp index 998f5f02eb0..49922d701be 100644 --- a/Master/texmf-dist/tex/latex/pdfx/pdfvt.xmp +++ b/Master/texmf-dist/tex/latex/pdfx/pdfvt.xmp @@ -1,8 +1,8 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -%% File: pdfx.xmp +%% File: pdfvt.xmp (for pdfx.sty v1.6) %% -%% Copyright (c) 2016, CV Radhakrishnan <cvr@river-valley.org>, +%% Copyright (c) 2018, CV Radhakrishnan <cvr@river-valley.org>, %% Han The Thanh <thanh@river-valley.org>, %% Ross Moore <ross.moore@mq.edu.au>, %% Peter Selinger <selinger@mathstat.dal.ca> @@ -17,178 +17,161 @@ %% and version 1.2 or later is part of all distributions of LaTeX %% version 1999/12/01 or later. %% -<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c014 81.156655, 2014/07/22-00:39:16 "> - <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <rdf:Description rdf:about="" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xmp="http://ns.adobe.com/xap/1.0/" - xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" - xmlns:pdf="http://ns.adobe.com/pdf/1.3/" - xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/" - xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/" - xmlns:pdfvtid="http://www.npes.org/pdfvt/ns/id/" - xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" - xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" - xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#" - > -%% xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/" -%% xmlns:dcterms = "http://purl.org/dc/terms/" -%% xmlns:pdfaField = "http://www.aiim.org/pdfa/ns/field#" -%% xmlns:pdfaType = "http://www.aiim.org/pdfa/ns/type#" -%% xmlns:prism = "http://prismstandard.org/namespaces/basic/2.2/" -%%% RRM: Other possible namespaces. -%%% If these are used, then appropriate tags need to be declared, using -%%% pdfaExtension:schemas similarly to below for prism: -%% xmlns:pim = "http://prismstandard.org/namespaces/pim/2.2/" -%% xmlns:prl = "http://prismstandard.org/namespaces/prl/2.1/" -%% xmlns:pur = "http://prismstandard.org/namespaces/primusagerights/2.1/" -%% > -% <rdf:Description rdf:about="" xmlns:pdf="http://www.adobe.com/pdf/1.3/"> - <dc:format>application/pdf</dc:format> - <dc:rights><rdf:Alt><rdf:li xml:lang="x-default">\xmp@Copyright</rdf:li></rdf:Alt></dc:rights> - \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> - <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate> - <xmpMM:VersionID>1</xmpMM:VersionID> - <xmpMM:DocumentID>uuid:\xmp@docid</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:\xmp@instid</xmpMM:InstanceID> - <xmpMM:RenditionClass>default</xmpMM:RenditionClass> - <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance</pdfxid:GTS_PDFXVersion> - <pdfvtid:GTS_PDFVTVersion>PDF/VT-\xmp@vtPart\xmp@vtConformance</pdfvtid:GTS_PDFVTVersion> - <pdfvtid:GTS_PDFVTModDate>\xmp@convDate</pdfvtid:GTS_PDFVTModDate> - \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> - <pdfaExtension:schemas> - <rdf:Bag> - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:namespaceURI>http://ns.adobe.com/pdf/1.3/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>pdf</pdfaSchema:prefix> - <pdfaSchema:schema>Adobe PDF Schema</pdfaSchema:schema> - <pdfaSchema:property> - <rdf:Seq> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>A name object indicating whether the document has been modified to include trapping information</pdfaProperty:description> - <pdfaProperty:name>Trapped</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - </rdf:Seq> - </pdfaSchema:property> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:namespaceURI>http://ns.adobe.com/pdfx/1.3/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>pdfx</pdfaSchema:prefix> - <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema> - <pdfaSchema:property> - <rdf:Seq> -% <rdf:li rdf:parseType="Resource"> -% <pdfaProperty:category>internal</pdfaProperty:category> -% <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description> -% <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name> -% <pdfaProperty:valueType>Text</pdfaProperty:valueType> -% </rdf:li> -% <rdf:li rdf:parseType="Resource"> -% <pdfaProperty:category>internal</pdfaProperty:category> -% <pdfaProperty:description>Conformance level of PDF/X standard</pdfaProperty:description> -% <pdfaProperty:name>GTS_PDFXConformance</pdfaProperty:name> -% <pdfaProperty:valueType>Text</pdfaProperty:valueType> -% </rdf:li> -% <rdf:li rdf:parseType="Resource"> -% <pdfaProperty:category>internal</pdfaProperty:category> -% <pdfaProperty:description>Company creating the PDF</pdfaProperty:description> -% <pdfaProperty:name>Company</pdfaProperty:name> -% <pdfaProperty:valueType>Text</pdfaProperty:valueType> -% </rdf:li> -% <rdf:li rdf:parseType="Resource"> -% <pdfaProperty:category>internal</pdfaProperty:category> -% <pdfaProperty:description>Date when document was last modified</pdfaProperty:description> -% <pdfaProperty:name>SourceModified</pdfaProperty:name> -% <pdfaProperty:valueType>Text</pdfaProperty:valueType> -% </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>external</pdfaProperty:category> - <pdfaProperty:description>URI to author's online version of the document</pdfaProperty:description> - <pdfaProperty:name>AuthoritativeDomain</pdfaProperty:name> - <pdfaProperty:valueType>URI</pdfaProperty:valueType> - </rdf:li> - </rdf:Seq> - </pdfaSchema:property> - </rdf:li> -% <rdf:li rdf:parseType="Resource"> -% <pdfaSchema:namespaceURI>http://ns.adobe.com/xap/1.0/mm/</pdfaSchema:namespaceURI> -% <pdfaSchema:prefix>xmpMM</pdfaSchema:prefix> -% <pdfaSchema:schema>XMP Media Management Schema</pdfaSchema:schema> -% <pdfaSchema:property> -% <rdf:Seq> -% <rdf:li rdf:parseType="Resource"> -% <pdfaProperty:category>internal</pdfaProperty:category> -% <pdfaProperty:description>UUID based identifier for specific incarnation of a document</pdfaProperty:description> -% <pdfaProperty:name>InstanceID</pdfaProperty:name> -% <pdfaProperty:valueType>URI</pdfaProperty:valueType> -% </rdf:li> -% <rdf:li rdf:parseType="Resource"> -% <pdfaProperty:category>internal</pdfaProperty:category> -% <pdfaProperty:description>The common identifier for all versions and renditions of a document.</pdfaProperty:description> -% <pdfaProperty:name>OriginalDocumentID</pdfaProperty:name> -% <pdfaProperty:valueType>URI</pdfaProperty:valueType> -% </rdf:li> -% </rdf:Seq> -% </pdfaSchema:property> -% </rdf:li> -% <rdf:li rdf:parseType="Resource"> -% <pdfaSchema:namespaceURI>http://www.npes.org/pdfx/ns/id/</pdfaSchema:namespaceURI> -% <pdfaSchema:prefix>pdfxid</pdfaSchema:prefix> -% <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema> -% <pdfaSchema:property> -% <rdf:Seq> -% <rdf:li rdf:parseType="Resource"> -% <pdfaProperty:category>internal</pdfaProperty:category> -% <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description> -% <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name> -% <pdfaProperty:valueType>Text</pdfaProperty:valueType> -% </rdf:li> -% </rdf:Seq> -% </pdfaSchema:property> -% </rdf:li> +<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.0-c316 44.253921, Sun Oct 01 2006 17:14:39"> + <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +% xmlns:pdf = "http://ns.adobe.com/pdf/1.3/" +% xmlns:pdfe = "http://www.aiim.org/pdfe/ns/id/" +% xmlns:pdfx = "http://ns.adobe.com/pdfx/1.3/" +% xmlns:pdfxid = "http://www.npes.org/pdfx/ns/id/"> +% xmlns:pdfvtid = "http://www.npes.org/pdfvt/ns/id/" +% xmlns:pdfaid = "http://www.aiim.org/pdfa/ns/id/" +% xmlns:xmp = "http://ns.adobe.com/xap/1.0/" +% xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/" +% xmlns:dc = "http://purl.org/dc/elements/1.1/" +% xmlns:dcterms = "http://purl.org/dc/terms/" +% xmlns:pdfaExtension = "http://www.aiim.org/pdfa/ns/extension/" +% xmlns:pdfaField = "http://www.aiim.org/pdfa/ns/field#" +% xmlns:pdfaProperty = "http://www.aiim.org/pdfa/ns/property#" +% xmlns:pdfaSchema = "http://www.aiim.org/pdfa/ns/schema#" +% xmlns:pdfaType = "http://www.aiim.org/pdfa/ns/type#" +% xmlns:prism = "http://prismstandard.org/namespaces/basic/2.2/" +%% RRM: Other possible namespaces. +%% If these are used, then appropriate tags need to be declared, using +%% pdfaExtension:schemas similarly to below for prism: +% xmlns:pim = "http://prismstandard.org/namespaces/pim/2.2/" +% xmlns:prl = "http://prismstandard.org/namespaces/prl/2.1/" +% xmlns:pur = "http://prismstandard.org/namespaces/primusagerights/2.1/" +% > + <rdf:Description rdf:about="" + xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" + xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" + xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#" +%% RRM: do we really need the following two declarations ? +% xmlns:pdfaType="http://www.aiim.org/pdfa/ns/type#" +% xmlns:pdfaField="http://www.aiim.org/pdfa/ns/field#" + > + <pdfaExtension:schemas> + <rdf:Bag> + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:namespaceURI>http://ns.adobe.com/pdf/1.3/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>pdf</pdfaSchema:prefix> + <pdfaSchema:schema>Adobe PDF Schema</pdfaSchema:schema> + <pdfaSchema:property><rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>A name object indicating whether the document has been modified to include trapping information</pdfaProperty:description> + <pdfaProperty:name>Trapped</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>PDF/X Part Version</pdfaProperty:description> + <pdfaProperty:name>Version</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li></rdf:Seq> + </pdfaSchema:property> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:namespaceURI>http://ns.adobe.com/pdfx/1.3/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>pdfx</pdfaSchema:prefix> + <pdfaSchema:schema>PDF/X Schema</pdfaSchema:schema> + <pdfaSchema:property><rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description> + <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>Conformance level of PDF/X standard</pdfaProperty:description> + <pdfaProperty:name>GTS_PDFXConformance</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>URL to an online version or preprint</pdfaProperty:description> + <pdfaProperty:name>AuthoritativeDomain</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>Company creating the PDF</pdfaProperty:description> + <pdfaProperty:name>Company</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>Date when document was last modified</pdfaProperty:description> + <pdfaProperty:name>SourceModified</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li></rdf:Seq> + </pdfaSchema:property> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:namespaceURI>http://ns.adobe.com/xap/1.0/mm/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>xmpMM</pdfaSchema:prefix> + <pdfaSchema:schema>XMP Media Management Schema</pdfaSchema:schema> + <pdfaSchema:property><rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>UUID based identifier for specific incarnation of a document</pdfaProperty:description> + <pdfaProperty:name>InstanceID</pdfaProperty:name> + <pdfaProperty:valueType>URI</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>The common identifier for all versions and renditions of a document.</pdfaProperty:description> + <pdfaProperty:name>OriginalDocumentID</pdfaProperty:name> + <pdfaProperty:valueType>URI</pdfaProperty:valueType> + </rdf:li></rdf:Seq> + </pdfaSchema:property> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:namespaceURI>http://www.npes.org/pdfx/ns/id/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>pdfxid</pdfaSchema:prefix> + <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema> + <pdfaSchema:property><rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description> + <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li></rdf:Seq> + </pdfaSchema:property> + </rdf:li> %% RRM: this declares the namespace resource for PRISM metadata - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:schema>PRISM metadata</pdfaSchema:schema> - <pdfaSchema:namespaceURI>http://prismstandard.org/namespaces/basic/2.2/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>prism</pdfaSchema:prefix> - <pdfaSchema:property> - <rdf:Seq> + <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 - \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 +%\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 + <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> %% RRM: more tags can be declared % <rdf:li rdf:parseType="Resource"> % <pdfaProperty:name></pdfaProperty:name> @@ -196,88 +179,89 @@ % <pdfaProperty:category>external</pdfaProperty:category> % <pdfaProperty:description></pdfaProperty:description> % </rdf:li> - </rdf:Seq></pdfaSchema:property> - </rdf:li> - </rdf:Bag> - </pdfaExtension:schemas> -% \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> -% \ifnum\xmp@Part<3 <pdfx:GTS_PDFXConformance>PDF/X-\xmp@Part\xmp@Conformance:\xmp@ReleaseDate</pdfx:GTS_PDFXConformance>\fi -% </rdf:Description> -% <rdf:Description rdf:about="" xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/"> -% \ifnum\xmp@Part>3 <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part</pdfxid:GTS_PDFXVersion>\fi -% </rdf:Description> -% <rdf:Description rdf:about="" xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/"> -% \ifnum\xmp@Part> 3<pdfaid:part>\xmp@Part</pdfaid:part>^^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> -% <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>\ifx\xmp@Copyrighted\@empty True\else\xmp@Copyrighted\fi</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> -%%% 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> -%% \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/"> - \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/"> -% <dc:format>application/pdf</dc:format> -% <dc:title> -% <rdf:Alt> -% <rdf:li xml:lang="x-default">\xmp@Title</rdf:li> -% </rdf:Alt> -% </dc:title> -% <dc:description> -% <rdf:Alt> -% <rdf:li xml:lang="x-default">\xmp@Subject</rdf:li> -% </rdf:Alt> -% </dc:description> -% <dc:creator> -% <rdf:Bag> -% <rdf:li>\xmp@Author</rdf:li> -% </rdf:Bag> -% </dc:creator> -% <dc:subject> -% <rdf:Bag> -% <rdf:li>\xmp@Keywords</rdf:li> -% </rdf:Bag> -% </dc:subject> -% </rdf:Description> -% <rdf:Description rdf:about="" -% xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"> -% <xmpMM:DocumentID>uuid:\xmp@docid</xmpMM:DocumentID> -% <xmpMM:InstanceID>uuid:\xmp@instid</xmpMM:InstanceID> -% </rdf:Description> - </rdf:RDF> + </rdf:Seq></pdfaSchema:property> + </rdf:li> + </rdf:Bag> + </pdfaExtension:schemas> + </rdf:Description> + <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <dc:format>application/pdf</dc:format> +\ifx\xmp@PublicationType\@empty\else <dc:type><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@PublicationType>\xmp@PublicationType</rdf:li></rdf:Bag></dc:type>\fi +\ifx\xmp@Title\@empty\else <dc:title><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Title>\xmp@Title</rdf:li></rdf:Alt></dc:title>\fi +\ifx\xmp@@Author\@empty\else <dc:creator><rdf:Seq><rdf:li\xmp@checklang\xmp@lang@Author>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>\fi +\ifx\xmp@Publisher\@empty\else <dc:publisher><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Publisher>\xmp@Publisher</rdf:li></rdf:Bag></dc:publisher>\fi +\ifx\xmp@Language\@empty\else <dc:language><rdf:Bag><rdf:li>\xmp@Language</rdf:li></rdf:Bag></dc:language>\fi +\ifx\xmp@Doi\@empty\else <dc:identifier>doi:\xmp@Doi</dc:identifier>\fi +\ifx\xmp@ISBN\@empty\else <dc:identifier>ISBN:\xmp@ISBN</dc:identifier>\fi +\ifx\xmp@URL\@empty\else <dc:identifier>URL:\xmp@URL</dc:identifier>\fi +\ifx\xmp@Copyright\@empty\else <dc:rights><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Copyright>\xmp@@Copyright</rdf:li></rdf:Alt></dc:rights>\fi +\ifx\xmp@Subject\@empty\else <dc:description><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Subject>\xmp@Subject</rdf:li></rdf:Alt></dc:description>\fi +\ifx\xmp@Keywords\@empty\else <dc:subject><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Keywords>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>\fi +\ifx\xmp@Source\@empty\else <dc:source>\xmp@Source</dc:source>\fi +\ifx\xmp@Coverage\@empty\else <dc:coverage\xmp@checklang\xmp@lang@Coverage>\xmp@Coverage</dc:coverage>\fi +\ifx\xmp@Date\@empty\else <dc:date><rdf:Seq><rdf:li>\xmp@Date</rdf:li></rdf:Seq></dc:date>\fi +\ifx\xmp@Contributor\@empty\else <dc:contributor><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Contributor>\xmp@Contributor</rdf:li></rdf:Bag></dc:contributor>\fi +\ifx\xmp@Relation\@empty\else <dc:relation><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Relation>\xmp@Relation</rdf:li></rdf:Bag></dc:relation>\fi + </rdf:Description> + <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/"> +\ifx\xmp@PublicationType\@empty\else <prism:aggregationType\xmp@checklang\xmp@lang@PublicationType>\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@checklang\xmp@lang@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@checklang\xmp@lang@JournalTitle>\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 +\ifx\xmp@URL\@empty\else <prism:url>\xmp@URL</prism:url>\fi + </rdf:Description> + <rdf:Description rdf:about="" + xmlns:xmp="http://ns.adobe.com/xap/1.0/" + xmlns:pdf="http://ns.adobe.com/pdf/1.3/" + xmlns:pdfe="http://www.aiim.org/pdfe/ns/id/" + xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/" + xmlns:pdfvtid="http://www.npes.org/pdfvt/ns/id/" + xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/" + > + <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool> + <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate> + <xmp:CreateDate>\xmp@convDate</xmp:CreateDate> + <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate> + <pdf:Producer>\xmp@Producer</pdf:Producer> +\ifx\xmp@@Keywords\@empty\else <pdf:Keywords>\xmp@@Keywords</pdf:Keywords>\fi + <pdf:Trapped>False</pdf:Trapped> +% <pdfe:ISO_PDFEVersion>PDF/E-\xmp@Part</pdfe:ISO_PDFEVersion> +%\ifnum\xmp@Part<4 <pdf:Version>PDF/X-\xmp@Part</pdf:Version>\fi +%\ifnum\xmp@Part>3 <pdfxid:GTS_PDFXVersion>PDF/X-\xmp@Part\xmp@Conformance</pdfxid:GTS_PDFXVersion>\fi +% <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 + <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> +\ifx\xmp@AuthoritativeDomain\@empty\else <pdfx:AuthoritativeDomain><rdf:Bag><rdf:li>\xmp@AuthoritativeDomain</rdf:li></rdf:Bag></pdfx:AuthoritativeDomain>\fi +\ifx\xmp@Advisory\@empty\else <xmp:Advisory><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Advisory>\xmp@Advisory</rdf:li></rdf:Bag></xmp:Advisory>\fi +\ifx\xmp@BaseURL\@empty\else <xmp:BaseURL>\xmp@BaseURL</xmp:BaseURL>\fi +\ifx\xmp@Identifier\@empty\else <xmp:Identifier><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Identifier>\xmp@Identifier</rdf:li></rdf:Bag></xmp:Identifier>\fi +\ifx\xmp@Nickname\@empty\else <xmp:Nickname\xmp@checklang\xmp@lang@Nickname>\xmp@Nickname</xmp:Nickname>\fi +\ifx\xmp@Thumbnails\@empty\else <xmp:Thumbnails><rdf:Alt><rdf:li>\xmp@Thumbnails</rdf:li></rdf:Alt></xmp:Thumbnails>\fi + </rdf:Description> + <rdf:Description rdf:about="" xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/"> +\ifx\xmp@Copyright\@empty\else <xmpRights:Marked>\ifx\xmp@Copyrighted\@empty True\else\xmp@Copyrighted\fi</xmpRights:Marked>^^J <xmpRights:UsageTerms><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Copyright>\xmp@@Copyright</rdf:li></rdf:Alt></xmpRights:UsageTerms>\fi +\ifx\xmp@CopyrightURL\@empty\else <xmpRights:WebStatement>\xmp@CopyrightURL</xmpRights:WebStatement>\fi +\ifx\xmp@Owner\@empty\else <xmpRights:Owner><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Owner>\xmp@Owner</rdf:li></rdf:Bag></xmpRights:Owner>\fi +\ifx\xmp@CertificateURL\@empty\else <xmpRights:Certificate>\xmp@CertificateURL</xmpRights:Certificate>\fi + </rdf:Description> + <rdf:Description rdf:about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"> + <xmpMM:VersionID>\xmpMM@VersionID</xmpMM:VersionID> + <xmpMM:DocumentID>uuid:\xmp@docid</xmpMM:DocumentID> + <xmpMM:InstanceID>uuid:\xmp@instid</xmpMM:InstanceID> + <xmpMM:RenditionClass>default</xmpMM:RenditionClass> +%\ifnum\xmp@Part>3 <xmpMM:VersionID>1</xmpMM:VersionID>\fi + </rdf:Description> + </rdf:RDF> </x:xmpmeta> % padding with 512 space characters to allow easier editing within a PDF \paddingline diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfx.sty b/Master/texmf-dist/tex/latex/pdfx/pdfx.sty index 0d2fb58b38f..51e70d637c5 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) 2017, CV Radhakrishnan <cvr@river-valley.org>, +%% Copyright (c) 2018, CV Radhakrishnan <cvr@river-valley.org>, %% Han The Thanh <thanh@river-valley.org>, %% Ross Moore <ross.moore@mq.edu.au>, %% Peter Selinger <selinger@mathstat.dal.ca> @@ -31,11 +31,12 @@ }{}% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfx} - [2017/05/18 v1.5.84 PDF/X and PDF/A support (CVR/HTH/RRM/PS)] + [2018/11/29 v1.6 PDF/X and PDF/A support (CVR/HTH/RRM/PS)] \newif\ifpdfx@noBOM \pdfx@noBOMfalse % use a BOM in the XMP packet \newif\ifpdfx@x \pdfx@xfalse % PDF/X mode -\newif\ifpdfx@e \pdfx@efalse % PDF/E mode; not implemented yet +\newif\ifpdfx@e \pdfx@efalse % PDF/E mode; not fully implemented yet +\newif\ifpdfx@ua\pdfx@uafalse % PDF/UA mode; not fully implemented yet \newif\ifpdfx@vt \pdfx@vtfalse % PDF/VT mode, extension of PDF/X \newif\ifno@iccprofile % used with PDF/X-4p and PDF/X-5pg \newif\ifpdfx@noerr % error messages become just warnings @@ -48,6 +49,25 @@ \def\xmp@ReleaseDate{2005} % 2001 for PDF/X-1, 2005 for PDF/A-1, % 2010 for PDF/A-2, 2012 for PDF/A-3. +\newcount\pdfx@minorversion +\expandafter\ifx\csname pdfminorversion\endcsname\relax +\else + \global\pdfx@minorversion=\the\pdfminorversion +\fi + +\def\pdfx@ErrorWarning#1#2#3#4{% + \ifpdfx@noerr \PackageWarning{pdfx}{#1.^^J #2#3.^^J}% + \else \PackageError{pdfx}{#1}{#2#4.^^J + Use option 'noerr' to avoid this message.^^J}% + \fi} + +\def\pdfx@Xvn@message{% + \pdfx@ErrorWarning{PDF/X-5n has no default profile}% + {Provide your own}{; continuing to build a non-valid document}% + {, else continue to build a non-valid document}% +} + +%% PDF/A options %% default is to create PDF/A-1b %% options can change this for PDF/X or higher levels of PDF/A \DeclareOption{a-1a}{\global\pdfx@xfalse\def\xmp@Part{1}% @@ -66,135 +86,160 @@ \def\xmp@Conformance{B}\def\xmp@ReleaseDate{2012}} \DeclareOption{a-3u}{\global\pdfx@xfalse\def\xmp@Part{3}% \def\xmp@Conformance{U}\def\xmp@ReleaseDate{2012}} -\DeclareOption{x-1}{\global\pdfx@xtrue\def\xmp@Part{1}% - \def\xmp@Conformance{a}\def\xmp@ReleaseDate{2001}% - \global\pdfminorversion=3 } -\DeclareOption{x-1a}{\global\pdfx@xtrue\def\xmp@Part{1}% +%% +%% PDF/X options +%% comments added, using +%% https://www.eci.org/_media/downloads/pdfx/pdfx_faq_english_nov05.pdf +%% https://en.wikipedia.org/wiki/PDF/X#List_of_the_PDF.2FX_standards +%% +\DeclareOption{x-1}{\global\pdfx@xtrue\def\xmp@Part{1}% obsolete + \def\xmp@Conformance{a}\def\xmp@ReleaseDate{1999}% CMYK only + \global\pdfx@minorversion=2\relax + \pdfx@ErrorWarning{PDF/X-1:1999 is no longer an accepted standard}% + {Use option x-1a1 or x-1a3 }{; continuing to build a non-valid document}% + {, else continue to build a non-valid document.}% + }% effectively same as x-1a1 +\DeclareOption{x-1a}{\global\pdfx@xtrue\def\xmp@Part{1}% CMYK only \def\xmp@Conformance{a}\def\xmp@ReleaseDate{2003}% - \global\pdfminorversion=3 } + \global\pdfx@minorversion=3 }% same as x-1a3 \DeclareOption{x-1a1}{\global\pdfx@xtrue\def\xmp@Part{1}% - \def\xmp@Conformance{a}\def\xmp@ReleaseDate{2001}% - \global\pdfminorversion=3 } + \def\xmp@Conformance{a}\def\xmp@ReleaseDate{2001}% ISO 15930-1:2001 + \global\pdfx@minorversion=3 } \DeclareOption{x-1a3}{\global\pdfx@xtrue\def\xmp@Part{1}% - \def\xmp@Conformance{a}\def\xmp@ReleaseDate{2003}% - \global\pdfminorversion=3 } -\DeclareOption{x-2}{\global\pdfx@xtrue\def\xmp@Part{2}% - \def\xmp@Conformance{}\def\xmp@ReleaseDate{2002}% - \global\pdfminorversion=4 } -\DeclareOption{x-3}{\global\pdfx@xtrue\def\xmp@Part{3}% - \def\xmp@Conformance{}\def\xmp@ReleaseDate{2002}% - \global\pdfminorversion=3 } + \def\xmp@Conformance{a}\def\xmp@ReleaseDate{2003}% ISO 15930-4:2003 + \global\pdfx@minorversion=3 } +\DeclareOption{x-2}{\global\pdfx@xtrue\def\xmp@Part{2}% XMP Metadata +%% \def\xmp@Conformance{}\def\xmp@ReleaseDate{2002}% ISO 15930-2:2003 + \def\xmp@Conformance{}\def\xmp@ReleaseDate{2003}% ISO 15930-5, withdrawn 2011 + \global\pdfx@minorversion=4\relax + \pdfx@ErrorWarning{PDF/X-2:2003 was never published as a standard}% + {Use option x-1a or x-3 }{; continuing to build a non-valid document}% + {, else continue to build a non-valid document}% + }% external OPI workflow, i.e. multiple files involved +\DeclareOption{x-3}{\global\pdfx@xtrue\def\xmp@Part{3}% RGB allowed, but rare! + \def\xmp@Conformance{}\def\xmp@ReleaseDate{2003}% + \global\pdfminorversion=4 }% same as x-303 \DeclareOption{x-302}{\global\pdfx@xtrue\def\xmp@Part{3}% - \def\xmp@Conformance{}\def\xmp@ReleaseDate{2002}% - \global\pdfminorversion=3 } + \def\xmp@Conformance{}\def\xmp@ReleaseDate{2002}% ISO 15930-3:2002 + \global\pdfx@minorversion=3 } \DeclareOption{x-303}{\global\pdfx@xtrue\def\xmp@Part{3}% - \def\xmp@Conformance{}\def\xmp@ReleaseDate{2003}% - \global\pdfminorversion=4 } + \def\xmp@Conformance{}\def\xmp@ReleaseDate{2003}% ISO 15930-6:2003 + \global\pdfx@minorversion=4 } %%% Later versions, yet to be fully implemented \DeclareOption{x-4}{\global\pdfx@xtrue\def\xmp@Part{4}% - \def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}% - \global\pdfminorversion=6 } + \def\xmp@Conformance{}\def\xmp@ReleaseDate{2010}% ISO 15930-7:2010 + \global\pdfx@minorversion=6 }% same as x-410 \DeclareOption{x-4p}{\global\pdfx@xtrue\global\no@iccprofiletrue - \def\xmp@Part{4}\def\xmp@Conformance{p}\def\xmp@ReleaseDate{2008}% - \global\pdfminorversion=6 } + \def\xmp@Part{4}\def\xmp@Conformance{p}\def\xmp@ReleaseDate{2010}% + \global\pdfx@minorversion=6 }% same as x-4p10 \DeclareOption{x-408}{\global\pdfx@xtrue\def\xmp@Part{4}% - \def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}% - \global\pdfminorversion=6 } + \def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}% ISO 15930-7:2008 + \global\pdfx@minorversion=6 } \DeclareOption{x-410}{\global\pdfx@xtrue\def\xmp@Part{4}% - \def\xmp@Conformance{}\def\xmp@ReleaseDate{2010}% - \global\pdfminorversion=6 } + \def\xmp@Conformance{}\def\xmp@ReleaseDate{2010}% ISO 15930-7:2010 + \global\pdfx@minorversion=6 } \DeclareOption{x-4p08}{\global\pdfx@xtrue\global\no@iccprofiletrue \def\xmp@Part{4}\def\xmp@Conformance{p}\def\xmp@ReleaseDate{2008}% - \global\pdfminorversion=6 } + \global\pdfx@minorversion=6 }% ISO 15930-7:2010 \DeclareOption{x-4p10}{\global\pdfx@xtrue\global\no@iccprofiletrue \def\xmp@Part{4}\def\xmp@Conformance{p}\def\xmp@ReleaseDate{2010}% - \global\pdfminorversion=6 } + \global\pdfx@minorversion=6 }% ISO 15930-7:2010 \DeclareOption{x-5}{\global\pdfx@xtrue\def\xmp@Part{5}% - \def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}% - \global\pdfminorversion=6 } + \def\xmp@Conformance{g}\def\xmp@ReleaseDate{2008}% + \global\pdfx@minorversion=6 }% ISO 15930-8:2010 \DeclareOption{x-5g}{\global\pdfx@xtrue\def\xmp@Part{5}% \def\xmp@Conformance{g}\def\xmp@ReleaseDate{2008}% - \global\pdfminorversion=6 } -\DeclareOption{x-5n}{\global\pdfx@xtrue\def\xmp@Part{5}% - \def\xmp@Conformance{n}\def\xmp@ReleaseDate{2008}% - \global\pdfminorversion=6 } + \global\pdfx@minorversion=6 }% ISO 15930-8:2010 +\DeclareOption{x-5n}{\global\pdfx@xtrue %\global\no@iccprofiletrue + \def\xmp@Part{5}\def\xmp@Conformance{n}\def\xmp@ReleaseDate{2010}% + \global\pdfx@minorversion=6 \pdfx@Xvn@message}% ISO 15930-8:2010 \DeclareOption{x-5pg}{\global\pdfx@xtrue\global\no@iccprofiletrue - \def\xmp@Part{5}\def\xmp@Conformance{pg}\def\xmp@ReleaseDate{2008}% - \global\pdfminorversion=6 } + \def\xmp@Part{5}\def\xmp@Conformance{pg}\def\xmp@ReleaseDate{2010}% + \global\pdfx@minorversion=6 }% ISO 15930-8:2010 \DeclareOption{x-508}{\global\pdfx@xtrue\def\xmp@Part{5}% - \def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}% - \global\pdfminorversion=6 } + \def\xmp@Conformance{g}\def\xmp@ReleaseDate{2008}% + \global\pdfx@minorversion=6 }% ISO 15930-8:2008 \DeclareOption{x-5g08}{\global\pdfx@xtrue\def\xmp@Part{5}% \def\xmp@Conformance{g}\def\xmp@ReleaseDate{2008}% - \global\pdfminorversion=6 } -\DeclareOption{x-5n08}{\global\pdfx@xtrue\def\xmp@Part{5}% - \def\xmp@Conformance{n}\def\xmp@ReleaseDate{2008}% - \global\pdfminorversion=6 } + \global\pdfx@minorversion=6 }% ISO 15930-8:2008 +\DeclareOption{x-5n08}{\global\pdfx@xtrue %\global\no@iccprofiletrue + \def\xmp@Part{5}\def\xmp@Conformance{n}\def\xmp@ReleaseDate{2008}% + \global\pdfx@minorversion=6 \pdfx@Xvn@message}% ISO 15930-8:2008 \DeclareOption{x-5pg08}{\global\pdfx@xtrue\global\no@iccprofiletrue \def\xmp@Part{5}\def\xmp@Conformance{pg}\def\xmp@ReleaseDate{2008}% - \global\pdfminorversion=6 } + \global\pdfx@minorversion=6 }% ISO 15930-8:2008 \DeclareOption{x-510}{\global\pdfx@xtrue\def\xmp@Part{5}% - \def\xmp@Conformance{}\def\xmp@ReleaseDate{2010}% - \global\pdfminorversion=6 } + \def\xmp@Conformance{g}\def\xmp@ReleaseDate{2010}% + \global\pdfx@minorversion=6 }% ISO 15930-8:2010 \DeclareOption{x-5g10}{\global\pdfx@xtrue\def\xmp@Part{5}% \def\xmp@Conformance{g}\def\xmp@ReleaseDate{2010}% - \global\pdfminorversion=6 } -\DeclareOption{x-5n10}{\global\pdfx@xtrue\def\xmp@Part{5}% - \def\xmp@Conformance{n}\def\xmp@ReleaseDate{2010}% - \global\pdfminorversion=6 } + \global\pdfx@minorversion=6 }% ISO 15930-8:2010 +\DeclareOption{x-5n10}{\global\pdfx@xtrue %\global\no@iccprofiletrue + \def\xmp@Part{5}\def\xmp@Conformance{n}\def\xmp@ReleaseDate{2010}% + \global\pdfx@minorversion=6 \pdfx@Xvn@message}% ISO 15930-8:2010 \DeclareOption{x-5pg10}{\global\pdfx@xtrue\global\no@iccprofiletrue \def\xmp@Part{5}\def\xmp@Conformance{pg}\def\xmp@ReleaseDate{2010}% - \global\pdfminorversion=6 } + \global\pdfx@minorversion=6 }% ISO 15930-8:2010 +%% +%% PDF/E options +%% +\DeclareOption{e}{\global\pdfx@xfalse\global\pdfx@etrue + \def\xmp@Part{1}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}% + \gdef\thepdfminorversion{6}% same as e-1 + } \DeclareOption{e-1}{\global\pdfx@xfalse\global\pdfx@etrue \def\xmp@Part{1}\def\xmp@Conformance{}\def\xmp@ReleaseDate{2008}% - \global\pdfminorversion=6 } + \gdef\thepdfminorversion{6}% ISO 24517-1:2008 + } +%% PDF/UA options +%% +\let\xmp@PDFUA\@empty +\DeclareOption{ua}{\global\pdfx@uatrue % ISO 14289-1:2012, 2014 + \def\xmp@UAlevel{1}\let\xmp@PDFUA\relax}% same as ua-1 +\DeclareOption{ua-1}{\global\pdfx@uatrue % ISO 14289-1:2012, 2014 + \def\xmp@UAlevel{1}\let\xmp@PDFUA\relax} +%% +%% PDF/VT options +%% \DeclareOption{vt-1}{\global\pdfx@xtrue\global\pdfx@vttrue \def\xmp@Part{4}\def\xmp@vtPart{1}\def\xmp@Conformance{}% \def\xmp@vtConformance{}\def\xmp@ReleaseDate{2010}% - \global\pdfminorversion=6 } + \gdef\xmpMM@VersionID{1}% + \global\pdfx@minorversion=6 } \DeclareOption{vt-2}{\global\pdfx@xtrue\global\pdfx@vttrue - \global\no@iccprofiletrue + \global\no@iccprofiletrue \gdef\xmpMM@VersionID{1}% \def\xmp@Part{5}\def\xmp@vtPart{2}\def\xmp@Conformance{pg}% \def\xmp@vtConformance{}\def\xmp@ReleaseDate{2010}% - \global\pdfminorversion=6 } + \global\pdfx@minorversion=6 } \DeclareOption{vt-2s}{\global\pdfx@xtrue\global\pdfx@vttrue - \global\no@iccprofiletrue + \global\no@iccprofiletrue \gdef\xmpMM@VersionID{1}% \def\xmp@Part{5}\def\xmp@vtPart{2}\def\xmp@Conformance{pg}% \def\xmp@vtConformance{s}\def\xmp@ReleaseDate{2010}% - \global\pdfminorversion=6 } + \global\pdfx@minorversion=6 } %% options to alter PDF minor version, in case needed in special circumstances -\DeclareOption{pdf12}{\global\pdfminorversion=2 } -\DeclareOption{pdf13}{\global\pdfminorversion=3 } -\DeclareOption{pdf14}{\global\pdfminorversion=4 } -\DeclareOption{pdf15}{\global\pdfminorversion=5 } -\DeclareOption{pdf16}{\global\pdfminorversion=6 } -\DeclareOption{pdf17}{\global\pdfminorversion=7 } +\DeclareOption{pdf12}{\global\pdfx@minorversion=2 }% 1999 +\DeclareOption{pdf13}{\global\pdfx@minorversion=3 }% 2001 Acrobat 4 (ISBN 0-201-61588-6) +\DeclareOption{pdf14}{\global\pdfx@minorversion=4 }% 2003 Acrobat 5 (ISBN 0-201-75839-3) +\DeclareOption{pdf15}{\global\pdfx@minorversion=5 }% 2005 Acrobat 6 +\DeclareOption{pdf16}{\global\pdfx@minorversion=6 }% 2006 Acrobat 7 (ISBN 0-321-30474-8) +\DeclareOption{pdf17}{\global\pdfx@minorversion=7 }% 2008 ISO 32000-1:2008 %% inhibits writing the XMP byte-order marker \DeclareOption{noBOM}{\pdfx@noBOMtrue} \DeclareOption{useBOM}{\pdfx@noBOMfalse} -\expandafter\ifx\csname pdfminorversion\endcsname\relax - \gdef\thepdfminorversion{4}% assumed with XeTeX - \def\pdf@minorversion@xetex=#1{\gdef\thepdfminorversion{#1}}% - \let\pdfminorversion\pdf@minorversion@xetex -\else - \pdfminorversion=4 % assumed for PDF/A ; options may change this for PDF/X -\fi -\expandafter\ifx\csname pdfresetpageorigin\endcsname\relax\else - \pdfresetpageorigin=0 -\fi - %% options for language character macros in XMP metadata \newif\ifcyrxmp \newif\ifcyrKOIxmp \newif\ifgrkxmp \newif\ifgrkLGRxmp \newif\ifhebxmp +\newif\ifhebHEBxmp \newif\ifarbxmp \newif\ifarmxmp \newif\ifarmSCIxmp +\newif\ifdevxmp \newif\ifvnmxmp \newif\iflatEXTxmp \newif\iflatLATxmp @@ -208,9 +253,11 @@ \DeclareOption{grkxmp}{\global\grkxmptrue} \DeclareOption{LGRxmp}{\global\grkLGRxmptrue\global\grkxmptrue} \DeclareOption{hebxmp}{\global\hebxmptrue} +\DeclareOption{HEBxmp}{\global\hebHEBxmptrue\global\hebxmptrue} \DeclareOption{arbxmp}{\global\arbxmptrue} \DeclareOption{armxmp}{\global\armxmptrue} \DeclareOption{AR8xmp}{\global\armSCIxmptrue\global\armxmptrue} +\DeclareOption{devxmp}{\global\devxmptrue} \DeclareOption{vnmxmp}{\global\vnmxmptrue} \DeclareOption{ipaxmp}{\global\ipaxmptrue\global\latEXTxmptrue} \DeclareOption{mathxmp}{\global\mathxmptrue\global\grkxmptrue} @@ -222,9 +269,11 @@ \global\grkxmptrue \global\grkLGRxmptrue \global\hebxmptrue + \global\hebHEBxmptrue \global\arbxmptrue \global\armxmptrue \global\armSCIxmptrue + \global\devxmptrue \global\vnmxmptrue \global\latEXTxmptrue \global\latLATxmptrue @@ -239,8 +288,61 @@ \ExecuteOptions{noBOM,a-1b} \ProcessOptions +\ifpdfx@ua\ifpdfx@x\else + \expandafter\if\xmp@Conformance A\else + \pdfx@ErrorWarning{PDF/UA requires 'Tagged PDF' for any structure.^^J + Then PDF/A Conformance must be 'a'}% + {Use option 'a-\xmp@Part a'}% + {; continuing with a likely invalid document}% + {, or continue for a likely invalid document}% +%%% \gdef\xmp@Conformance{A}% do we want this? +\fi\fi\fi + +\expandafter\ifx\csname pdflastobj\endcsname\relax +\else + \ifnum\pdflastobj >\z@ % pdftex has already written objects + \ifnum\pdfx@minorversion=\pdfminorversion\else + \PackageError{pdfx}% + {^^J(pdfx) Cannot change the \string\pdfminorversion^^J% + (pdfx) PDF version remains at 1.\the\pdfminorversion.^^J% + (pdfx) Use \string\pdfminorversion=\the\pdfx@minorversion\space + before \string\documentclass}% + {(pdfx) Another package or document-class has written objects into the PDF.^^J% + (pdfx) Hit return to continue with PDF version 1.\the\pdfminorversion.% + }% + \global\pdfx@minorversion=\the\pdfminorversion + \fi + \else + \global\pdfminorversion\pdfx@minorversion + \fi +\fi + \expandafter\ifx\csname thepdfminorversion\endcsname\relax - \xdef\thepdfminorversion{\the\pdfminorversion} + \expandafter\ifx\csname pdfminorversion\endcsname\relax + \else + \xdef\thepdfminorversion{\the\pdfminorversion} +\fi\fi + +\expandafter\ifx\csname pdfminorversion\endcsname\relax + \gdef\thepdfminorversion{4}% assumed with XeTeX + \def\pdf@minorversion@xetex=#1{\gdef\thepdfminorversion{#1}}% + \let\pdfminorversion\pdf@minorversion@xetex +\else + \ifnum\pdfminorversion < 4\relax + \ifpdfx@x + % more testing needed with PDF/X + \else + \pdfminorversion=4\relax % assumed for PDF/A ; options may change this for PDF/X + \gdef\thepdfminorversion{4}% + \fi + \else + \ifnum\pdfminorversion<\thepdfminorversion\relax + \global\pdfminorversion=\thepdfminorversion\relax + \fi + \fi +\fi +\expandafter\ifx\csname pdfresetpageorigin\endcsname\relax\else + \pdfresetpageorigin=0 \fi \newif\ifpdfx@nopdfinfo @@ -250,20 +352,26 @@ \else \ifgrkLGRxmp\pdfx@nopdfinfotrue \else + \ifhebHEBxmp\pdfx@nopdfinfotrue +\else \ifcyrKOIxmp\pdfx@nopdfinfotrue \else \ifarmSCIxmp\pdfx@nopdfinfotrue -\fi\fi\fi\fi\fi +\fi\fi\fi\fi\fi\fi \iflatLATxmp\pdfx@useactivespacestrue\fi \ifgrkLGRxmp\pdfx@useactivespacestrue\fi +\ifhebHEBxmp\pdfx@useactivespacestrue\fi \ifcyrKOIxmp\pdfx@useactivespacestrue\fi \ifarmSCIxmp\pdfx@useactivespacestrue\fi \newif\ifpdfx@transliterated \ifgrkLGRxmp\pdfx@transliteratedtrue\fi +\ifhebHEBxmp\pdfx@transliteratedtrue\fi \ifarmSCIxmp\pdfx@transliteratedtrue\fi +\RequirePackage{iftex} +\RequirePackage{ifpdf} %% Support for pdfTeX primitives when using XeTeX: \RequirePackage{ifxetex} \ifxetex @@ -281,6 +389,8 @@ \let\pdfobjcompresslevel\pdf@compress@xetex \fi +%%\newif\ifpdfx@pdfmark % control future support for dvips + \RequirePackage{ifluatex} \ifluatex \IfFileExists{luatex85.sty}{% 2016+ @@ -290,6 +400,7 @@ }% \RequirePackage{pdftexcmds}% \let\pdfx@mdfivesum\pdf@mdfivesum + \let\pdfescapestring\pdf@escapestring \else \ifxetex \usepackage{everyshi}% @@ -304,7 +415,7 @@ \let\pdfx@mdfivesum\pdfmdfivesum \fi \fi -\def\pdfx@encodingfile{l8uenc.def} +\def\pdfx@encodingfile{l8u-penc.def} \expandafter\ifx\csname pdftexbanner\endcsname\relax \expandafter\ifx\csname luatexbanner\endcsname\relax @@ -358,6 +469,7 @@ /MediaBox[0 0 \pdfx@mwidth\space \pdfx@mheight]^^J %% /ArtBox[0 0 \pdfx@mwidth\space \pdfx@mheight]^^J /BleedBox[0 0 \pdfx@mwidth\space \pdfx@mheight]^^J + /CropBox[0 0 \pdfx@mwidth\space \pdfx@mheight]^^J /TrimBox[25 20 \pdfx@twidth\space \pdfx@theight]} }\next \ifxetex @@ -366,6 +478,13 @@ \EveryShipout{% \immediate\special{pdf:put @thispage <<\pdfx@everypage@xetex>>}}% \fi +\else +%% PDF/A-1b doesn't allow object compression + \ifnum\xmp@ReleaseDate=2005\relax + \expandafter\ifx\csname pdfobjcompresslevel\endcsname\relax + \else + \pdfobjcompresslevel=0\relax + \fi \fi \fi \ifxetex %% How to support XeTeX here ? @@ -400,7 +519,32 @@ \@namedef{T@L8U}{}% \@namedef{D@L8U}{}% \@namedef{M@L8U}{}% + +%% adjust to LaTeX's 2018 change to the default encoding +\expandafter\ifx\csname inputencodingname\endcsname\relax +\else + \def\pdfx@restoreencoding#1{% + \@tempcnta=128 + \loop + \catcode\@tempcnta=13 + \advance\@tempcnta\@ne + \ifnum\@tempcnta<256 + \repeat + \inputencoding{#1}% + }% + \AtEndOfPackage{\pdfx@restoreencoding\pdfx@inputencodingname}% + \let\pdfx@inputencodingname\inputencodingname + \let\pdfx@DeclareUnicodeCharacter\DeclareUnicodeCharacter + \UseRawInputEncoding +\fi \InputIfFileExists{\pdfx@encodingfile}{}{} +\expandafter\ifx\csname pdfx@inputencodingname\endcsname\relax +\else + \let\inputencodingname\pdfx@inputencodingname + \let\DeclareUnicodeCharacter\pdfx@DeclareUnicodeCharacter + \let\DeclareFontEncoding@\DeclareFontEncoding@saved + \inputencoding{\inputencodingname}% +\fi %%---------------------------------------------------------------------- %% Macros for reading XMP data with special catcodes. Usage: @@ -418,42 +562,425 @@ \ifpdfx@useactivespaces\obeyspaces\fi % capture spaces as active characters \xmp@doparse{#1}% } +\def\afterxmp@parse{}% methods may change this \def\xmp@doparse#1#2{% \def\@this{#2}#1 \endgroup + % do any post-processing + \afterxmp@parse + \def\afterxmp@parse{}% } %%---------------------------------------------------------------------- %% Local commands. They are only brought into scope during the reading -%% of xmpdata. +%% of xmpdata. Some fields can have a 'xml:lang' attribute; others must have. +%% LANG values as in: (BCP 47) https://tools.ietf.org/html/rfc5646#appendix-A +%% +\def\xmp@lang@Default{x-default} +\let\xmp@lang@Title\xmp@lang@Default +\let\xmp@lang@Author\xmp@lang@Default +\let\xmp@lang@Keywords\xmp@lang@Default +\let\xmp@lang@Subject\xmp@lang@Default +%%\def\xmp@lang@CreatorTool{\xmp@lang@Default} +\let\xmp@lang@Producer\xmp@lang@Default +%%\def\xmp@lang@Volume{\xmp@lang@Default} +%%\def\xmp@lang@Issue{\xmp@lang@Default} +\let\xmp@lang@Copyright\xmp@lang@Default +\let\xmp@lang@PublicationType\xmp@lang@Default +\let\xmp@lang@Publisher\xmp@lang@Default +\let\xmp@lang@Coverage\xmp@lang@Default +\let\xmp@lang@Contributor\xmp@lang@Default +\let\xmp@lang@Relation\xmp@lang@Default +%%% PRISM fields +\let\xmp@lang@CoverDisplayDate\xmp@lang@Default +\let\xmp@lang@JournalTitle\xmp@lang@Default +%%\def\xmp@lang@JournalNumber{\xmp@lang@Default} +%%% xmp: & xmpRights: fields +\let\xmp@lang@Advisory\xmp@lang@Default +\let\xmp@lang@Identifier\xmp@lang@Default +\let\xmp@lang@Nickname\xmp@lang@Default +\let\xmp@lang@Owner\xmp@lang@Default + +%% some validators require a language attribute for +%% dc:title set via \Title +%% dc:description set via \Subject +%% dc:rights set via \Copyright +%% xmpRights:UsageTerms set via \Copyright +%% +{\catcode `\" 12 \catcode`\: 12 \catcode`\= 12 + \gdef\pdfx@xmp@checklang#1{% + \ifx #1\xmp@lang@Default\else\space xml:lang="#1"\fi} + \gdef\pdfx@xmp@strictlang#1{\space xml:lang="#1"} +}% end of \catcodes +\let\xmp@checklang\pdfx@xmp@checklang +\let\xmp@strictlang\pdfx@xmp@strictlang + +\newcommand{\pdfx@Title}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@Title{#1}\fi + \xmp@parse{\global\let\xmp@Title\@this}} + +%% allow for multiple authors, keywords and languages +%% also: contributor, date, relation, type, thumbnails +%% and AuthoritativeDomain, Advisory, Identifier, Owner +\newcommand{\pdfx@Author}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@Author{#1}\fi + \def\afterxmp@parse{\let\Author\pdfx@extraAuthor}% + \xmp@parse{\global\let\xmp@Author\@this}} +\newcommand{\pdfx@Keywords}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@Keywords{#1}\fi + \def\afterxmp@parse{\let\Keywords\pdfx@extraKeywords}% + \xmp@parse{\global\let\xmp@Keywords\@this}} +\newcommand{\pdfx@Language}{% + \def\afterxmp@parse{\let\Language\pdfx@extraLanguages}% + \xmp@parse{\global\let\xmp@Language\@this}} + +\newcommand{\pdfx@AuthoritativeDomain}{% + \def\afterxmp@parse{\let\AuthoritativeDomain\pdfx@extraAuthoritativeDomain}% + \xmp@parse{\global\let\xmp@AuthoritativeDomain\@this}} +\newcommand{\pdfx@Date}{% + \def\afterxmp@parse{\let\Date\pdfx@extraDate}% + \xmp@parse{\global\let\xmp@Date\@this}} +\newcommand{\pdfx@Contributor}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@Contributor{#1}\fi + \def\afterxmp@parse{\let\Contributor\pdfx@extraContributor}% + \xmp@parse{\global\let\xmp@Contributor\@this}} +\newcommand{\pdfx@Relation}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@Relation{#1}\fi + \def\afterxmp@parse{\let\Relation\pdfx@extraRelation}% + \xmp@parse{\global\let\xmp@Relation\@this}} +%%\newcommand{\pdfx@Type}[1][]{% +%% \ifx\relax#1\relax\else\gdef\xmp@lang@Type{#1}\fi +%% \def\afterxmp@parse{\let\Type\pdfx@extraType}% +%% \xmp@parse{\global\let\xmp@Type\@this}} + +\newcommand{\pdfx@Advisory}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@Advisory{#1}\fi + \def\afterxmp@parse{\let\Advisory\pdfx@extraAdvisory}% + \xmp@parse{\global\let\xmp@Advisory\@this}} +\newcommand{\pdfx@Identifier}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@Identifier{#1}\fi + \def\afterxmp@parse{\let\Identifier\pdfx@extraIdentifier}% + \xmp@parse{\global\let\xmp@Identifier\@this}} +\newcommand{\pdfx@Thumbnails}{% + \def\afterxmp@parse{\let\Thumbnails\pdfx@extraThumbnails}% + \xmp@parse{\global\let\xmp@Thumbnails\@this}} + +\newcommand{\pdfx@Owner}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@Owner{#1}\fi + \def\afterxmp@parse{\let\Owner\pdfx@extraOwner}% + \xmp@parse{\global\let\xmp@Owner\@this}} + +{\obeyspaces% + \ifpdfx@useactivespaces\gdef\pdfx@insert@sep{\sep }% + \else\gdef\pdfx@insert@sep{\sep}\fi% +} +\newcommand{\pdfx@extraAuthor}[1][]{% + \ifx\relax#1\relax + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Author + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Author\pdfx@insert@sep}% + \else + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Author + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Author\pdfx@insert@sep[#1]}% + \fi + \def\afterxmp@parse{% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Author + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Author\xmp@extraAuthor}% + }% + \xmp@parse{\global\let\xmp@extraAuthor\@this}% + }% +\newcommand{\pdfx@extraKeywords}[1][]{% + \ifx\relax#1\relax + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Keywords + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Keywords\pdfx@insert@sep}% + \else% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Keywords + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Keywords\pdfx@insert@sep[#1]}% + \fi% + \def\afterxmp@parse{% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Keywords + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Keywords\xmp@extraKeywords}}% + \xmp@parse{\global\let\xmp@extraKeywords\@this}% + }% +\newcommand{\pdfx@extraLanguages}{% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Language + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Language\pdfx@insert@sep}% + \def\afterxmp@parse{% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Language + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Language\xmp@extraLanguages}}% + \xmp@parse{\global\let\xmp@extraLanguages\@this}% + }% + +\newcommand{\pdfx@extraContributor}[1][]{% + \ifx\relax#1\relax + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Contributor + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Contributor\pdfx@insert@sep}% + \else + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Contributor + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Contributor\pdfx@insert@sep[#1]}% + \fi + \def\afterxmp@parse{% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Contributor + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Contributor\xmp@extraContributor}% + }% + \xmp@parse{\global\let\xmp@extraContributor\@this}% + }% + +\newcommand{\pdfx@extraAuthoritativeDomain}{% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@AuthoritativeDomain + \expandafter\expandafter\expandafter{% + \expandafter\xmp@AuthoritativeDomain\pdfx@insert@sep}% + \def\afterxmp@parse{% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@AuthoritativeDomain + \expandafter\expandafter\expandafter{% + \expandafter\xmp@AuthoritativeDomain\xmp@extraAuthoritativeDomain}% + }% + \xmp@parse{\global\let\xmp@extraAuthoritativeDomain\@this}% + }% + +\newcommand{\pdfx@extraDate}{% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Date + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Date\pdfx@insert@sep}% + \def\afterxmp@parse{% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Date + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Date\xmp@extraDate}% + }% + \xmp@parse{\global\let\xmp@extraDate\@this}% + }% + +\newcommand{\pdfx@extraRelation}[1][]{% + \ifx\relax#1\relax + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Relation + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Relation\pdfx@insert@sep}% + \else + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Relation + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Relation\pdfx@insert@sep[#1]}% + \fi + \def\afterxmp@parse{% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Relation + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Relation\xmp@extraRelation}% + }% + \xmp@parse{\global\let\xmp@extraRelation\@this}% + }% + +%%\newcommand{\pdfx@extraType}[1][]{% +%%% \show\xmp@Type +%% \ifx\relax#1\relax +%% \expandafter\expandafter\expandafter\gdef +%% \expandafter\expandafter\expandafter\xmp@Type +%% \expandafter\expandafter\expandafter{% +%% \expandafter\xmp@Type\pdfx@insert@sep}% +%% \else +%% \expandafter\expandafter\expandafter\gdef +%% \expandafter\expandafter\expandafter\xmp@Type +%% \expandafter\expandafter\expandafter{% +%% \expandafter\xmp@Type\pdfx@insert@sep[#1]}% +%% \fi +%% \def\afterxmp@parse{% +%% \expandafter\expandafter\expandafter\gdef +%% \expandafter\expandafter\expandafter\xmp@Type +%% \expandafter\expandafter\expandafter{% +%% \expandafter\xmp@Type\xmp@extraType}% +%% %\show\xmp@Type +%% }% +%% \xmp@parse{\global\let\xmp@extraType\@this}% +%% }% + +\newcommand{\pdfx@extraAdvisory}[1][]{% + \ifx\relax#1\relax + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Advisory + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Advisory\pdfx@insert@sep}% + \else + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Advisory + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Advisory\pdfx@insert@sep[#1]}% + \fi + \def\afterxmp@parse{% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Advisory + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Advisory\xmp@extraAdvisory}% + }% + \xmp@parse{\global\let\xmp@extraAdvisory\@this}% + }% + +\newcommand{\pdfx@extraIdentifier}[1][]{% + \ifx\relax#1\relax + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Identifier + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Identifier\pdfx@insert@sep}% + \else + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Identifier + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Identifier\pdfx@insert@sep[#1]}% + \fi + \def\afterxmp@parse{% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Identifier + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Identifier\xmp@extraIdentifier}% + }% + \xmp@parse{\global\let\xmp@extraIdentifier\@this}% + }% + +\newcommand{\pdfx@extraThumbnails}[1][]{% + \ifx\relax#1\relax + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Thumbnails + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Thumbnails\pdfx@insert@sep}% + \else + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Thumbnails + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Thumbnails\pdfx@insert@sep[#1]}% + \fi + \def\afterxmp@parse{% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Thumbnails + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Thumbnails\xmp@extraThumbnails}% + }% + \xmp@parse{\global\let\xmp@extraThumbnails\@this}% + }% + +\newcommand{\pdfx@extraOwner}[1][]{% + \ifx\relax#1\relax + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Owner + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Owner\pdfx@insert@sep}% + \else + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Owner + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Owner\pdfx@insert@sep[#1]}% + \fi + \def\afterxmp@parse{% + \expandafter\expandafter\expandafter\gdef + \expandafter\expandafter\expandafter\xmp@Owner + \expandafter\expandafter\expandafter{% + \expandafter\xmp@Owner\xmp@extraOwner}% + }% + \xmp@parse{\global\let\xmp@extraOwner\@this}% + }% + +\newcommand{\pdfx@Subject}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@Subject{#1}\fi + \xmp@parse{\global\let\xmp@Subject\@this}} +\newcommand{\pdfx@Producer}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@Producer{#1}\fi + \xmp@parse{\global\let\xmp@Producer\@this}} +\newcommand{\pdfx@Publisher}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@Publisher{#1}\fi + \xmp@parse{\global\let\xmp@Publisher\@this}} +\newcommand{\pdfx@Copyright}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@Copyright{#1}\fi + \xmp@parse{\global\let\xmp@Copyright\@this% + \ifx\xmp@Copyrighted\@empty\gdef\xmp@Copyrighted{True}\fi}} + +\newcommand{\pdfx@Coverage}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@Coverage{#1}\fi + \xmp@parse{\global\let\xmp@Coverage\@this}} + +%% PRISM Text fields +\newcommand{\pdfx@CoverDisplayDate}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@CoverDisplayDate{#1}\fi + \xmp@parse{\global\let\xmp@CoverDisplayDate\@this}} +\newcommand{\pdfx@JournalTitle}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@JournalTitle{#1}\fi + \ifx\xmp@PublicationType\@empty\gdef\xmp@PublicationType{journal}\fi + \xmp@parse{\global\let\xmp@JournalTitle\@this}} + +%% Uses PRISM Controlled Vocabulary: +%% http://prismstandard.org/vocabularies/3.0/aggregationtype.xml +%% blog, book, bookazine, catalog, feed, journal, magazine, manual +%% newsletter, newspaper, other, report, pamphlet, vook, whitepaper +%% +\newcommand{\pdfx@PublicationType}[1][]{% + \ifx\relax#1\relax\else\gdef\xmp@lang@PublicationType{#1}\fi + \xmp@parse{\global\let\xmp@PublicationType\@this}} + \def\pdfx@localcommands{ - \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}} + \let\Title\pdfx@Title + \let\Author\pdfx@Author + \let\Keywords\pdfx@Keywords + \let\Subject\pdfx@Subject + \let\Language\pdfx@Language \def\CreatorTool{\xmp@parse{\global\let\xmp@CreatorTool\@this}} - \def\Producer{\xmp@parse{\global\let\xmp@Producer\@this}} + \let\Producer\pdfx@Producer \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}} + \let\CoverDisplayDate\pdfx@CoverDisplayDate \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}} + \let\Copyright\pdfx@Copyright \def\CopyrightURL{\xmp@parse{\global\let\xmp@CopyrightURL\@this% \ifx\xmp@Copyrighted\@empty\gdef\xmp@Copyrighted{True}\fi}} \def\Copyrighted{\xmp@parse{\global\let\xmp@Copyrighted\@this}} \def\Doi{\xmp@parse{\global\let\xmp@Doi\@this}} + \def\ISBN{\xmp@parse{\global\let\xmp@ISBN\@this}} + \def\URLlink{\xmp@parse{\global\let\xmp@URL\@this}} \def\Lastpage{\xmp@parse{\global\let\xmp@Lastpage\@this}} \def\Firstpage{\xmp@parse{\global\let\xmp@Firstpage\@this}} - \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}} + \let\PublicationType\pdfx@PublicationType + \let\Journaltitle\pdfx@JournalTitle \def\Journalnumber{\xmp@parse{\global\let\xmp@Journalnumber\@this}} - \def\Publisher{\xmp@parse{\global\let\xmp@Publisher\@this}} + \let\Publisher\pdfx@Publisher + \let\Coverage\pdfx@Coverage + \def\Source{\xmp@parse{\global\let\xmp@Source\@this}} + \let\Contributor\pdfx@Contributor + \let\Date\pdfx@Date + \let\Relation\pdfx@Relation + \let\Advisory\pdfx@Advisory + \def\BaseURL{\xmp@parse{\global\let\xmp@BaseURL\@this}} + \let\Identifier\pdfx@Identifier + \let\Nickname\pdfx@Nickname + \let\Thumbnails\pdfx@Thumbnails + \let\Owner\pdfx@Owner + \def\CertificateURL{\xmp@parse{\global\let\xmp@CertificateURL\@this}} + \def\MMversionID{\xmp@parse{\global\let\xmpMM@versionID\@this}} +%% \let\Type\pdfx@Type %% %% currently unused; for backward compatibility only - \def\AuthoritativeDomain{\xmp@parse - {\global\let\xmp@AuthoritativeDomain\@this}} + \let\AuthoritativeDomain\pdfx@AuthoritativeDomain \let\Creator\CreatorTool % for backward compatibility \let\Org\Publisher % for backward compatibility \let\WebStatement\CopyrightURL % for backward compatibility @@ -504,10 +1031,21 @@ %%---------------------------------------------------------------------- %% Markup bindings to be used during XMP generation. -{\obeyspaces\ifpdfx@useactivespaces% -\xdef\pdfx@sep {</rdf:li>^^J <rdf:li>}% -\else\gdef\pdfx@sep{</rdf:li>^^J <rdf:li>}% -\fi} +{% + \catcode`\<=12 \catcode`\>=12 \catcode`\/=12 \catcode`\:=12 \catcode`\"=12 +\obeyspaces\ifpdfx@useactivespaces% + \gdef\pdfx@sep {\pdfx@check@lang}% +\else% + \gdef\pdfx@sep{\pdfx@check@lang}% +\fi% + \xdef\pdfx@sep@nolang{</rdf:li>^^J <rdf:li>}% + \xdef\pdfx@sep@lang[#1]{</rdf:li>^^J <rdf:li xml:lang="#1">}% +}% end of \obeyspaces and \catcode .... + +\def\pdfx@check@lang#1{% + \ifx[#1\expandafter\@firstoftwo + \else\expandafter\@secondoftwo\fi + {\pdfx@sep@lang#1}{\pdfx@sep@nolang#1}} \def\pdfx@xmpmarkup{% \pdfx@actives @@ -580,7 +1118,9 @@ \fi \ifarbxmp \LIIXUmaparabicletters\fi \ifarmxmp \LIIXUmaparmenianletters\fi + \ifdevxmp\LIIXUmapdevaccents\fi \ifgrkxmp \LIIXUmapgreekletters\fi + \ifhebxmp \LIIXUmaphebrewletters\fi } %% In case macros are used in XMP Metadata, need a way to map these @@ -614,6 +1154,12 @@ \def\sep{; }% %\let\sep\pdfx@sep %% Note: '\ ', \&, \copyright are already predefined by hyperref. +%% allow LICRs to expand into PDF strings + \def\cf@encoding{PU}% + \def\9##1{\ifcase##1\string\0\or\string\1\or\string\2\or\string\3\fi}% + \def\8{\string\00}% + \def\0{\string\0}\def\1{\string\1}\def\2{\string\2}\def\3{\string\3}% + \pdfx@xmpunimarkup \the\pdfxsafeforxmp@toks } @@ -626,12 +1172,14 @@ \else \def\xmp@Producer{pdfTeX} \fi\fi +\global\let\pdfxProducer\xmp@Producer \global\let\xmp@CreatorTool\@empty \global\let\xmp@Title\@empty \global\let\xmp@Author\@empty \global\let\xmp@Keywords\@empty \global\let\xmp@Subject\@empty +\global\let\xmp@Language\@empty \global\let\xmp@Volume\@empty \global\let\xmp@Issue\@empty \global\let\xmp@CoverDisplayDate\@empty @@ -641,41 +1189,67 @@ \global\let\xmp@CopyrightURL\@empty \gdef\xmp@WebStatement{\xmp@CopyrightURL} \global\let\xmp@Doi\@empty +\global\let\xmp@ISBN\@empty +\global\let\xmp@URL\@empty \global\let\xmp@Lastpage\@empty \global\let\xmp@Firstpage\@empty \global\let\xmp@PublicationType\@empty \global\let\xmp@Journaltitle\@empty \global\let\xmp@Journalnumber\@empty +%%\global\let\xmp@Type\@empty +\global\let\xmp@Contributor\@empty +\global\let\xmp@Coverage\@empty +\global\let\xmp@Date\@empty +\global\let\xmp@Relation\@empty +\global\let\xmp@Source\@empty \global\let\xmp@Publisher\@empty \gdef\xmp@Org{\xmp@Publisher} \global\let\xmp@AuthoritativeDomain\@empty +\global\let\xmp@Advisory\@empty +\global\let\xmp@BaseURL\@empty +\global\let\xmp@Identifier\@empty +\global\let\xmp@Nickname\@empty +\global\let\xmp@Thumbnails\@empty +\global\let\xmp@Owner\@empty +\global\let\xmp@CertificateURL\@empty %%---------------------------------------------------------------------- %% Alternative way to get the CreationDate using Lua for XeTeX \ifdefined\pdfcreationdate\else + \begingroup %% ensure correct catcodes, not done by \dospecials + \catcode`\:=12 \catcode`\.=12 \begin{filecontents*}{creationdate.lua} os.remove("creationdate.timestamp") io.output("creationdate.timestamp"):write(os.date("\\edef\\tempa{\\string D:%Y%m%d%H%M%S}\n\\def\\tempb{%z}")) \end{filecontents*} + \endgroup \ifnum\shellescape=1 - \begingroup + \begingroup %% ensure correct catcodes when file is read in + \catcode`\'=12 \catcode`\.=12 \catcode`\:=12 \catcode`\+=12 \immediate\write18{texlua creationdate.lua} \input{creationdate.timestamp} \def\tempc#1#2#3#4#5{#1#2#3'#4#5'} \edef\tempb{\expandafter\tempc\tempb} \edef\x{\endgroup\def\noexpand\pdfcreationdate{\tempa\tempb}}\x \else + \begingroup %% ensure correct catcodes in the error/warning messages + \catcode`\<=12 \catcode`\>=12 \catcode`\"=12 \catcode`\-=12 + \catcode`\: 12 \catcode`\' 12 \catcode`\= 12 \ifpdfx@noerr \PackageWarning{pdfx}{% CreationDate is not properly supported;^^J PDF validation may fail. To avoid this problem use:^^J - xelatex -shell-escape <filename>^^J} + xelatex -shell-escape -output-driver="xdvipdfmx -z 0" <filename>^^J} \else \PackageError{pdfx}{% CreationDate is not properly supported;^^J PDF validation may fail.}{To avoid this problem use:^^J - xelatex -shell-escape <filename> } + xelatex -shell-escape -output-driver="xdvipdfmx -z 0" <filename> } \fi + %% Using a constant date, to allow processing to finish smoothly. + \edef\x{\endgroup + \def\noexpand\pdfcreationdate{\string D:20181028075445+10'00'}}% + \x \fi \fi @@ -728,29 +1302,69 @@ %%---------------------------------------------------------------------- %% load xcolor before hyperref to get the link colors correct %% +\PassOptionsToPackage{nosetpagesize}{color} +\PassOptionsToPackage{nosetpagesize}{graphics} +\@ifpackageloaded{xcolor}{% + % Beamer will have already loaded xcolor + % need to understand what options it used +}{ \ifpdfx@x \RequirePackage[cmyk,hyperref]{xcolor} \else -%% \RequirePackage[rgb,hyperref]{xcolor} + \RequirePackage[rgb,hyperref]{xcolor} \fi +}% + +%% loading puenc.def will kill a lot of what mathtext.sty established +\@ifpackageloaded{mathtext}{% + \PackageWarningNoLine{pdfx}{pdfx.sty and hyperref.sty should be loaded^^J + before mathtext.sty , otherwise text symbols may not show in math mode.}% +}{} + +\newif\ifpdfx@hluatex +\IfFileExists{hluatex.def}{\pdfx@hluatextrue}{\pdfx@hluatexfalse} %% the "pdftex" option seems to work fine with LuaTeX +\def\pdfx@luatest{\ifpdfx@hluatex luatex\else pdftex \fi} %% Hyperref options for PDF/X \edef\pdfx@pdfX@opts@pdftex{% - draft,pdftex,pdfpagemode=UseNone,bookmarks=false,% - pdfversion=1.\thepdfminorversion,pdfstartview=} + draft,pdftex,pdfpagemode=UseNone,bookmarks=false,% + pdfversion=1.\thepdfminorversion,pdfstartview=} \edef\pdfx@pdfX@opts@xetex{% - draft,xetex,pdfpagemode=UseNone,bookmarks=false,% - pdfversion=1.\thepdfminorversion,pdfstartview=} -\edef\pdfx@pdfX@opts@luatex{% - draft,luatex,pdfpagemode=UseNone,bookmarks=false,% - pdfversion=1.\thepdfminorversion,pdfstartview=} + draft,xetex,pdfpagemode=UseNone,bookmarks=false,% + pdfversion=1.\thepdfminorversion,pdfstartview=} + \edef\pdfx@pdfX@opts@luatex{% + draft,\pdfx@luatest,pdfpagemode=UseNone,bookmarks=false,% + pdfversion=1.\thepdfminorversion,pdfstartview=}% + +\newif\ifpdfx@hyperrefloaded +\expandafter\ifx\csname ifHy@pdfa\endcsname\relax\else\pdfx@hyperrefloadedtrue\fi %% Hyperref options for PDF/A and PDF/E -\edef\pdfx@pdfAE@opts@pdftex{pdftex,pdfa,pdfversion=1.\thepdfminorversion}% -\edef\pdfx@pdfAE@opts@xetex{xetex,pdfa,pdfversion=1.\thepdfminorversion}% -\edef\pdfx@pdfAE@opts@luatex{luatex,pdfa,pdfversion=1.\thepdfminorversion}% +\newtoks\pdfx@tmptoks +\pdfx@tmptoks{% +\ifHy@pdfa + \edef\pdfx@pdfAE@opts@pdftex{pdftex}% + \edef\pdfx@pdfAE@opts@xetex{xetex,pdfversion=1.\thepdfminorversion}% + \edef\pdfx@pdfAE@opts@luatex{\pdfx@luatest,pdfversion=1.\thepdfminorversion}% + \edef\pdfx@pdfAE@opts@pdfmark{pdfmark,pdfversion=1.\thepdfminorversion}% + \else + \edef\pdfx@pdfAE@opts@pdftex{pdftex,pdfa}% + \edef\pdfx@pdfAE@opts@xetex{xetex,pdfa,pdfversion=1.\thepdfminorversion}% + \edef\pdfx@pdfAE@opts@luatex{\pdfx@luatest,pdfa,pdfversion=1.\thepdfminorversion}% + \edef\pdfx@pdfAE@opts@pdfmark{pdfmark,pdfa,pdfversion=1.\thepdfminorversion}% + \fi +} +\ifpdfx@hyperrefloaded + \the\pdfx@tmptoks\relax +\else + \edef\pdfx@pdfAE@opts@pdftex{pdftex,pdfa}% + \edef\pdfx@pdfAE@opts@xetex{xetex,pdfa,pdfversion=1.\thepdfminorversion}% + \edef\pdfx@pdfAE@opts@luatex{\pdfx@luatest,pdfa,pdfversion=1.\thepdfminorversion}% + \edef\pdfx@pdfAE@opts@pdfmark{pdfmark,pdfa,pdfversion=1.\thepdfminorversion}% +\fi +\pdfx@tmptoks{}% \ifpdfx@x \@ifpackageloaded{hyperref}{% @@ -823,6 +1437,7 @@ \fi \newif\ifpdfx@cmyk +\newif\ifpdfx@custom \ifpdfx@x % PDF/X normally needs a CMYK color profile for printing \global\pdfx@cmyktrue \fi @@ -870,21 +1485,26 @@ \catcode`\_ 11\relax\catcode`\& 11\relax\catcode`\~ 11\relax \catcode`\% 11\relax \edef\({\string\(}\edef\){\string\)}% - \pdfx@externalprofile} + \ifno@iccprofile + \expandafter\pdfx@externalprofile + \else + \expandafter\pdfx@externalprofile@gobble + \fi + } %% %% \def\pdfx@setRGBcolorprofiledir#1{% - \gdef\pdfx@RGBcolorprofiledir{#1}% + \xdef\pdfx@RGBcolorprofiledir{#1}% } \def\pdfx@setCMYKcolorprofiledir#1{% - \gdef\pdfx@CMYKcolorprofiledir{#1}% + \xdef\pdfx@CMYKcolorprofiledir{#1}% } \pdfx@setRGBcolorprofiledir{} \pdfx@setCMYKcolorprofiledir{} %% This does indeed work! Use it in .xmpdata files -\providecommand{\MacOSColordir}% - {/System/Library/ColorSync/Profiles/} +\providecommand{\MacOSColordir}{/System/Library/ColorSync/Profiles/} +\providecommand{\MacOSLibraryColordir}{/Library/ColorSync/Profiles/} \providecommand{\AdobeMacOSdir}% {/Library/Application Support/Adobe/Color/Profiles/Recommended/} \edef\pdfx@tmp{C:\string\Windows\string\System32\string\Spool% @@ -900,7 +1520,8 @@ \let\pdfxSetColorProfileDir\pdfxSetCMYKcolorProfileDir %% \def\pdfx@setrgbprofile#1#2#3#4{% - \xdef\pdfx@rgb@profile{\pdfx@RGBcolorprofiledir#1}% valid file name + \xdef\pdfx@rgb@profile{\pdfx@RGBcolorprofiledir#1}% valid file path/name + \xdef\pdfx@rgb@profilename{#1}% valid file name \gdef\pdfx@rgb@identifier{#2}% \gdef\pdfx@rgb@info{#3}% \pdfstringdef\pdfx@rgb@registry{#4}% valid URL @@ -909,7 +1530,8 @@ }% closes-off \setRGBcolorprofile %% \def\pdfx@setcmykprofile#1#2#3#4{% - \xdef\pdfx@cmyk@profile{\pdfx@CMYKcolorprofiledir#1}% valid file name + \xdef\pdfx@cmyk@profile{\pdfx@CMYKcolorprofiledir#1}% valid file path/name + \xdef\pdfx@cmyk@profilename{#1}% valid file name %% \expandafter\gdef\expandafter\pdfx@cmyk@profile\expandafter %% {\pdfx@colorprofiledir#1}% valid file name \gdef\pdfx@cmyk@intent{#2}% @@ -920,7 +1542,28 @@ %% \pdfstringdef\pdfx@cmyk@registry{#4}% valid URL \endgroup \global\pdfx@cmyktrue - }% closes-off \setCMYKcolorprofile + }% closes-off \setcmykcolorprofile +%% +\def\setCUSTOMcolorprofile{% + \begingroup + \catcode`\_ 11\relax\catcode`\& 11\relax\catcode`\~ 11\relax + \catcode`\% 11\relax + \edef\({\string\(}\edef\){\string\)}% + \pdfx@setcustomprofile +} +\def\pdfx@setcustomprofile#1#2#3#4#5#6#7#8{% + \xdef\pdfx@customcolorprofiledir{#2}% valid directory location + \xdef\pdfx@custom@profile{#1}% valid file name + \gdef\pdfx@custom@identifier{#3}% + \gdef\pdfx@custom@registry{#4}% + \gdef\pdfx@custom@numcolors{#5}% num-colors specifier + \gdef\pdfx@iccversion{#6}% Hex string for /ICCVersion < ... > + \gdef\pdfx@custom@colornames{#7}% + \gdef\pdfx@profile@checksum{#8}% Hex string for /CheckSum < ... > +\endgroup + \global\pdfx@cmykfalse + \global\pdfx@customtrue + }% closes-off \pdfx@setcustomprofile %% \def\pdfx@setgrayprofile#1#2#3#4{% \gdef\pdfx@gray@profile{#1}% valid file name @@ -940,8 +1583,13 @@ \gdef\pdfx@cmyk@info{#8}% for /Info \gdef\pdfx@profile@checksum{#9}% Hex string for /CheckSum < ... > \endgroup}% closes-off \setEXTERNALprofile +\def\pdfx@externalprofile@gobble#1#2#3#4#5#6#7#8#9{% + \PackageError{pdfx}{Wrong option for using an External Color profile}% + {Use one of the options: x-4p , x-4p08 , x-4p10 or x-5pg .}% + \endgroup} %% %% default color profiles + {\catcode`\_ 12 \catcode`\& 12 \catcode`\~ 12 \gdef\pdfx@xprofile@cmykdefault{coated_FOGRA39L_argl.icc} \gdef\pdfx@aprofile@rgbdefault{sRGB_IEC61966-2-1_black_scaled.icc} @@ -981,9 +1629,43 @@ %% software for any purpose. %% %%---------------------------------------------------------------------- -{\catcode`\| 14 \catcode`\% 12 \catcode`\_ 12 + +\newif\ifpdfx@tryoldprofiles + +%% The colorprofiles package was added to TeXLive in October 2018. +%% It allows the default Color Profiles to be maintained independent +%% of the pdfx package. +%% In particular sRGB_IEC61966-2-1_black_scaled.icc is no longer +%% distributed with TeXLive 2018 and later. +%% Older versions still have this file. +%% +\IfFileExists{colorprofiles.tex}{% + \RequirePackage{colorprofiles}[2018/11/01]% + \ifx\colorpro@rgb@profile\relax + \expandafter\pdfx@tryoldprofilestrue + \else + \begingroup %% \endgroup occurs within the macro expansion + \pdfx@setrgbprofile{\colorpro@rgb@profile + }{\colorpro@rgb@identifier + }{\colorpro@rgb@info + }{\colorpro@rgb@registry + }% + \begingroup %% \endgroup occurs within the macro expansion + \pdfx@setcmykprofile{\colorpro@cmyk@profile + }{\colorpro@cmyk@intent + }{\colorpro@cmyk@identifier + }{\colorpro@cmyk@registry + }% + \expandafter\pdfx@tryoldprofilesfalse + \fi +}{\pdfx@tryoldprofilestrue} + +{\catcode`\| 14 \catcode`\% 12 \catcode`\_ 12 \catcode`\: 12 + \catcode`\. 12 \catcode`\- 12 \catcode`\/ 12 \edef\@bchar{\expandafter\@gobble\string\\}| \edef\({\string\(}\edef\){\string\)}| +\ifpdfx@tryoldprofiles + || this will be used by TeXLive installations up to 2017. \begingroup | \endgroup occurs within the macro expansion \expandafter\pdfx@setrgbprofile\expandafter {sRGB_IEC61966-2-1_black_scaled.icc}| @@ -995,6 +1677,7 @@ {Coated FOGRA39}| {FOGRA39 \string\(ISO Coated v2 300%\space \string\(ECI\string\)\string\)}| {http://www.argyllcms.com/}|{http://www.color.org}| +\fi || end of \ifpdfx@tryoldprofiles \begingroup | \endgroup occurs within the macro expansion \pdfx@setgrayprofile{Gray_linear.icc}| {}| @@ -1010,6 +1693,7 @@ {Coated FOGRA39 \(ISO 12647-2:2004\)}{74FF62F330BF0DBE4495B5720542D511}| \fi }% end of \catcode + %% %%---------------------------------------------------------------------- %% License for the file coated_FOGRA39L_argl.icc : @@ -1039,6 +1723,7 @@ %%---------------------------------------------------------------------- \newif\ifexternalICCprofiles +\newif\ifpdfx@noXMPdata \begingroup %% override unneeded color-profile specifier @@ -1077,70 +1762,104 @@ \fi\fi \makeatletter \pdfx@localcommands -%% +%% Do this in a box, so any stray characters don't get into TeX's lists. +\setbox0\hbox{% \InputIfFileExists{\jobname.xmpdata}% {\typeout{** pdfx: Metadata file \jobname.xmpdata read successfully.}}% {\typeout{** pdfx: No file \jobname.xmpdata . - Metadata will be incomplete!}} + Metadata will be incomplete!}\aftergroup\pdfx@noXMPdatatrue}} \endgroup +%% ---------------------------------------------------------------------- + +\def\pdfx@LanguageSpec{} +\def\pdfx@mainLanguage{en-US}% absolute default +\def\pdfx@checkfor@sep#1#2\sep#3\pdfx@endparse{\def#1{#2}} +\ifx\@empty\xmp@Language\else + \expandafter\pdfx@checkfor@sep\expandafter\pdfx@mainLanguage\xmp@Language + \sep\pdfx@endparse +\fi +\edef\pdfx@LanguageSpec{/Lang (\pdfx@mainLanguage)} %% ---------------------------------------------------------------------- \begingroup -\ifpdfx@x % PDF/X needs a CMYK or RGB color profile for printing + \catcode`\_ 12 \catcode`\" 12 \catcode`\' 12 + \catcode`\< 12 \catcode`\> 12 \catcode`\/ 12 \catcode`\[ 12 \catcode`\] 12 \edef\@pctchar{\expandafter\@gobble\string\%} \edef\@bchar{\expandafter\@gobble\string\\} \edef\0{\string\0} \edef\({\string\(} \edef\){\string\)} - \catcode`\_ 12 +%% + \def\pdfx@outcatalog@dict{% + \pdfx@LanguageSpec + /ViewerPreferences <</DisplayDocTitle true >> + /OutputIntents \pdfx@outintents % needs appropriate expansion + }% +\ifpdfx@x % PDF/X needs a CMYK or RGB color profile for printing \ifno@iccprofile % PDF/X-4p and PDF/X-5pg - \ifxetex - \special{pdf:obj @colorURL <</FS/URL/F(\pdfx@colorURL)>>}% - \special{pdf:obj @colorprofile <<% +%% +%% URL and metadata for the desired external Color Profile +%% + \edef\pdfx@colorURL@dict{<</FS/URL/F(\pdfx@colorURL)>>} + \def\pdfx@colorprofile@dict{<< % /CheckSum <\pdfx@profile@checksum>^^J% /ICCVersion <\pdfx@iccversion>% /ProfileCS (\pdfx@profileCS)^^J% /ProfileName (\pdfx@extprofile)^^J% - /URLs [ @colorURL ] - >>} - \def\OBJ@ICC{@colorprofile}% - \else - \immediate\pdfobj {<</FS/URL/F(\pdfx@colorURL)>>}% + /URLs [\OBJ@URLs] >> + } +%% How to specify the PDF objects with different drivers + \ifxetex + \def\OBJ@URLs{ @colorURL }% + \def\OBJ@ICC{ @colorprofile }% + \immediate\special{pdf:obj \OBJ@URLs \pdfx@colorURL@dict }% + \immediate\special{pdf:obj \OBJ@ICC \pdfx@colorprofile@dict }% + \else % pdfTeX & LuaTeX + \immediate\pdfobj{\pdfx@colorURL@dict}% \edef\OBJ@URLs{\the\pdflastobj\space 0 R}% - \immediate\pdfobj {<<% - /CheckSum <\pdfx@profile@checksum>^^J% - /ICCVersion <\pdfx@iccversion>% - /ProfileCS (\pdfx@profileCS)^^J% - /ProfileName (\pdfx@extprofile)^^J% - /URLs [\OBJ@URLs ] - >>} % + \immediate\pdfobj{\pdfx@colorprofile@dict}% \edef\OBJ@ICC{\the\pdflastobj\space 0 R}% \fi - \pdfcatalog{% - /OutputIntents [ << - /Type/OutputIntent - /S/GTS_PDFX - /OutputCondition (\pdfx@cmyk@intent)% - /OutputConditionIdentifier (\pdfx@cmyk@identifier)% - /Info(\pdfx@cmyk@intent)% - /RegistryName(\pdfx@cmyk@registry) +%% Output Intent dictionary, with object reference + \edef\pdfx@outintent@dict{% + /Type/OutputIntent + /S/GTS_PDFX^^J + /OutputCondition (\pdfx@cmyk@intent)^^J + /OutputConditionIdentifier (\pdfx@cmyk@identifier)^^J + /Info(\pdfx@cmyk@intent)^^J + /RegistryName(\pdfx@cmyk@registry)^^J %% extra dictionary required for PDF/X-4p and PDF/X-5pg - /DestOutputProfileRef \OBJ@ICC - >> ]}% + /DestOutputProfileRef \OBJ@ICC + }% %% \else % PDF/X-1 , PDF/X-1a , PDF/X-3 , PDF/X-4 , PDF/X-5g %% \ifpdfx@cmyk \IfFileExists{"\pdfx@cmyk@profile"}{% % embedded CMYK color profile + %% + %% Output Intent dictionary, with object reference + \def\pdfx@outintent@dict{% + /Type/OutputIntent + /S/GTS_PDFX^^J + /OutputCondition (\pdfx@cmyk@intent)^^J + /OutputConditionIdentifier (\pdfx@cmyk@identifier)^^J + /Info(\pdfx@cmyk@intent)^^J + /RegistryName(\pdfx@cmyk@registry) + /DestOutputProfile \OBJ@CMYK + }% + \def\pdfx@numcoords{/N 4}% +%% \ifxetex - \immediate\special{pdf:fstream @colorprofile (\pdfx@cmyk@profile) <</N 4>>} \def\OBJ@CMYK{@colorprofile}% - \else - \immediate\pdfobj stream attr{/N 4} file{\pdfx@cmyk@profile}% + \immediate\special{% + pdf:fstream \OBJ@CMYK (\pdfx@cmyk@profile) <<\pdfx@numcoords >>}% + \else % pdfTeX + \immediate\pdfobj stream attr{\pdfx@numcoords} file {\pdfx@cmyk@profile}% \edef\OBJ@CMYK{\the\pdflastobj\space 0 R}% \fi \pdfcatalog{% + \pdfx@LanguageSpec /OutputIntents [ << /Type/OutputIntent /S/GTS_PDFX @@ -1151,9 +1870,63 @@ /DestOutputProfile \OBJ@CMYK >> ]}% }{% - \errmessage{No color profile \pdfx@cmyk@profile\ found + \PackageError{pdfx}{No color profile \pdfx@cmyk@profilename\space found to use for CMYK printing colors.}% + {Is this the correct directory: \pdfx@CMYKcolorprofiledir\space ?}% + }% end of \IfFileExists for CMYK + \else\ifpdfx@custom +%% allow Custom profile with PDF/X-5n + \IfFileExists{"\pdfx@customcolorprofiledir\pdfx@custom@profile"}{% +%% embedded Custom color profile +%% + %% Output Intent dictionary, with object reference + \def\pdfx@outintent@dict{% + /Type/OutputIntent + /S/GTS_PDFX^^J + /OutputConditionIdentifier (Custom)^^J + /OutputCondition (\pdfx@custom@identifier)^^J + /Info(\pdfx@custom@profile)^^J + /RegistryName(\pdfx@custom@registry) + /Registry(\pdfx@custom@registry) + /DestOutputProfileRef \OBJ@CustomDir + }% + \def\OBJ@CustomDir{<< + \pdfx@numcoords^^J + /URLs [ << /Type /Filespec ^^J/EF \OBJ@CustomFile^^J + /F (\pdfx@custom@profile) /UF (\pdfx@custom@profile) >>]^^J + >>} +%% need more attributes: + \def\pdfx@numcoords{% + /CheckSum <\pdfx@profile@checksum>^^J% + /ICCVersion <\pdfx@iccversion>% + /ProfileName (\pdfx@custom@profile)^^J% + /ProfileCS (\pdfx@custom@numcolors)^^J% + /ColorantTable [\pdfx@custom@colornames] + }% + \def\pdfx@custom@filespec{% + /Type /EmbeddedFile >>^^J + /Subtype (application/vnd.iccprofile ) }% +%% + \ifxetex + \def\OBJ@CustomFile{@colorprofile}% + \immediate\special{pdf:fstream \OBJ@CustomFile + (\pdfx@customcolorprofiledir\pdfx@custom@profile) <<\pdfx@custom@filespec >>}% + \else % pdfTeX + \immediate\pdfobj stream attr{\pdfx@custom@filespec} file % + {\pdfx@customcolorprofiledir\pdfx@custom@profile}% + \edef\OBJ@CustomFile{\the\pdflastobj\space 0 R}% + \fi + \pdfcatalog{% + \pdfx@LanguageSpec + /OutputIntents [ << \pdfx@outintent@dict >>]}% + }{% + \PackageError{pdfx}% + {No color profile \pdfx@custom@profile\space found to use for Custom printing colors.}% + {Is this the correct directory: \pdfx@customcolorprofiledir\space ?}% + }% end of \IfFileExists for Custom + \global\pdfx@cmyktrue % for TeX coloring +%% \else % allow RGB profile with PDF/X ??? \ifpdfx@noerr \PackageWarning{pdfx}{PDF/X normally requires a CMYK color profile.^^J @@ -1162,14 +1935,25 @@ \PackageError{pdfx}{PDF/X normally requires a CMYK color profile.}% {To use RGB ensure profile is of type 'prtr' not 'mntr'.^^J^^J}% \fi + % embedded RGB color profile + %% + %% Output Intent dictionary, with object reference + \def\pdfx@outintent@dict{% + /Type /OutputIntent + /S/GTS_PDFX^^J + /OutputConditionIdentifier (\pdfx@rgb@identifier)^^J + /DestOutputProfile \OBJ@RGB^^J + /Info(\pdfx@rgb@info)^^J + /RegistryName(\pdfx@rgb@registry) + }% \IfFileExists{"\pdfx@rgb@profile"}{% + \def\pdfx@numcoords{/N 3 /Alternate/DeviceRGB} \ifxetex - \immediate\special{pdf:fstream @colorprofile (\pdfx@rgb@profile) << - /N 3 /Alternate/DeviceRGB >>} + \immediate\special{% + pdf:fstream @colorprofile (\pdfx@rgb@profile) << \pdfx@numcoords >>} \def\OBJ@RGB{@colorprofile}% \else - \immediate\pdfobj stream attr{/N 3^^J/Alternate/DeviceRGB} - file{\pdfx@rgb@profile}% + \immediate\pdfobj stream attr{\pdfx@numcoords} file{\pdfx@rgb@profile}% \edef\OBJ@RGB{\the\pdflastobj\space 0 R}% \fi \edef\pdfx@outintent@dict{% @@ -1181,90 +1965,65 @@ /RegistryName(\pdfx@rgb@registry) }% \ifxetex - \special{pdf:obj @outintent@dict << \pdfx@outintent@dict >>} - \edef\pdfx@outintent@dict{ @outintent@dict }% - \else -%% pdfTeX or LuaTeX - \fi - \ifxetex - \immediate\special{pdf:obj @outintentsarray [ ]}% - \immediate\special{pdf:put @outintentsarray \pdfx@outintent@dict}% - \def\pdfx@outintents{@outintentsarray}% - \else - \immediate\pdfobj{<<\pdfx@outintent@dict>>} - \edef\pdfx@outintents{[\the\pdflastobj\space 0 R]}% - \fi - \pdfcatalog{% - /ViewerPreferences <</DisplayDocTitle true >> - /OutputIntents \pdfx@outintents - }% + \def\OBJ@RGB{ @colorprofile }% + \immediate\special{% + pdf:fstream @colorprofile (\pdfx@rgb@profile) <<\pdfx@numcoords >>} + \else %% pdfTeX or LuaTeX + \immediate\pdfobj stream attr{\pdfx@numcoords} file{\pdfx@rgb@profile}% + \edef\OBJ@RGB{\the\pdflastobj\space 0 R}% + \fi }{% - \errmessage{No color profile found to use for RGB screen colors.}% - }% + \PackageError{pdfx}% + {No color profile \pdfx@rgb@profilename\space found to use for RGB screen colors.}% + {Is this the correct directory: \pdfx@RGBcolorprofiledir\space ?}% + }% end of \IfFileExists for RGB + \fi % end of \ifpdfx@custom \fi % end of \ifpdfx@cmyk \fi % end of \ifno@iccprofile +%% end of PDF/X \else %% PDF/A and PDF/E can specify a CMYK profile \expandafter\ifx\expandafter\relax\pdfx@rgb@profile\relax \global\pdfx@cmyktrue \IfFileExists{"\pdfx@cmyk@profile"}{% + \def\pdfx@numcoords{/N 4} % embedded CMYK color profile -%% How to support XeTeX here ? - \ifxetex - \special{pdf:fstream @colorprofile (\pdfx@cmyk@profile) <</N 4>>} - \def\OBJ@CMYK{@colorprofile}% - \else - \immediate\pdfobj stream attr{/N 4} file{\pdfx@cmyk@profile}% - \edef\OBJ@CMYK{\the\pdflastobj\space 0 R}% - \fi - \edef\pdfx@outintent@dict{% - /Type /OutputIntent - \ifpdfx@e - /S/ISO_PDFE1 - \else - /S/GTS_PDFA1 + \ifxetex + \def\OBJ@CMYK{@colorprofile}% + \special{pdf:fstream @colorprofile (\pdfx@cmyk@profile) <<\pdfx@numcoords >>} + \else %% pdfTeX or LuaTeX + \immediate\pdfobj stream attr{\pdfx@numcoords} file{\pdfx@cmyk@profile}% + \edef\OBJ@CMYK{\the\pdflastobj\space 0 R}% \fi + \edef\pdfx@outintent@dict{% + /Type /OutputIntent + \ifpdfx@e + /S/ISO_PDFE1 + \else + /S/GTS_PDFA1 + \fi /OutputCondition (\pdfx@cmyk@intent)% use this or /Info ? /OutputConditionIdentifier (\pdfx@cmyk@identifier)% /DestOutputProfile \OBJ@CMYK /Info(\pdfx@cmyk@intent)% /RegistryName(\pdfx@cmyk@registry) - } - \ifxetex - \special{pdf:obj @outintent@dict << \pdfx@outintent@dict >>} - \edef\pdfx@outintent@dict{ @outintent@dict }% - \else -%% pdfTeX - \fi - \ifxetex - \immediate\special{pdf:obj @outintentsarray [ ]}% - \immediate\special{pdf:put @outintentsarray \pdfx@outintent@dict}% - \def\pdfx@outintents{@outintentsarray}% - \else - \immediate\pdfobj{<<\pdfx@outintent@dict>>} - \edef\pdfx@outintents{[\the\pdflastobj\space 0 R]}% - \fi - \pdfcatalog{% - /ViewerPreferences <</DisplayDocTitle true >> - /OutputIntents \pdfx@outintents - } + }% }{% - \errmessage{No color profile \pdfx@cmyk@profile\ found - to use for CMYK screen colors.}% - }% + \PackageError{pdfx}{No color profile \pdfx@cmyk@profilename\space found + to use for CMYK printing colors.}% + {Is this the correct directory: \pdfx@CMYKcolorprofiledir\space ?}% + }% end of \IfFileExists for CMYK \else %% PDF/A and PDF/E usually need an RGB color profile for on-screen rendering \global\pdfx@cmykfalse - \IfFileExists{"\pdfx@rgb@profile"}{% -%% How to support XeTeX here ? + \expandafter\IfFileExists\expandafter{\pdfx@rgb@profile}{% + \def\pdfx@numcoords{/N 3 /Alternate/DeviceRGB} \ifxetex - \immediate\special{pdf:fstream @colorprofile (\pdfx@rgb@profile) << - /N 3 /Alternate/DeviceRGB >>} - \def\OBJ@RGB{@colorprofile}% + \def\OBJ@RGB{ @colorprofile }% + \immediate\special{pdf:fstream @colorprofile (\pdfx@rgb@profile) <<\pdfx@numcoords >>} \else - \immediate\pdfobj stream attr{/N 3^^J/Alternate/DeviceRGB} - file{\pdfx@rgb@profile}% - \edef\OBJ@RGB{\the\pdflastobj\space 0 R}% + \immediate\pdfobj stream attr{\pdfx@numcoords} file{\pdfx@rgb@profile}% + \edef\OBJ@RGB{\the\pdflastobj\space 0 R}% \fi \edef\pdfx@outintent@dict{% /Type /OutputIntent @@ -1278,29 +2037,37 @@ /Info(\pdfx@rgb@info) /RegistryName(\pdfx@rgb@registry) }% + }{% + \PackageError{pdfx}% + {No color profile \pdfx@rgb@profilename\space found to use for RGB screen colors.}% + {Is this the correct directory: \pdfx@RGBcolorprofiledir\space ?}% + }% end of \IfFileExists for RGB + \fi % end of ifx for PDF/A or PDF/E +\fi % end of ifpdfx@x +%% + \expandafter\ifx\csname pdfx@outintent@dict\endcsname\relax + \else +%% +%% build the OutputIntent array +%% \ifxetex - \special{pdf:obj @outintent@dict << \pdfx@outintent@dict >>} - \edef\pdfx@outintent@dict{ @outintent@dict }% + \def\pdfx@outintents{ @outintentsarray }% + \def\pdfx@outintentref{ @outintent@dict }% + \immediate\special{pdf:obj \pdfx@outintentref << \pdfx@outintent@dict >>} + \immediate\special{pdf:obj \pdfx@outintents [ ]}% + \immediate\special{pdf:put \pdfx@outintents \pdfx@outintentref }% \else -%% pdfTeX + \immediate\pdfobj{<<\pdfx@outintent@dict>>}% + \edef\pdfx@outintents{[\the\pdflastobj\space 0 R]}% \fi - \ifxetex - \immediate\special{pdf:obj @outintentsarray [ ]}% - \immediate\special{pdf:put @outintentsarray \pdfx@outintent@dict}% - \def\pdfx@outintents{@outintentsarray}% +%% +%% make the Catalog entry, if not already done +%% + \ifx\pdfx@outcatalog@dict\relax \else - \immediate\pdfobj{<<\pdfx@outintent@dict>>} - \edef\pdfx@outintents{[\the\pdflastobj\space 0 R]}% + \pdfcatalog{\pdfx@outcatalog@dict}% \fi - \pdfcatalog{% - /ViewerPreferences <</DisplayDocTitle true >> - /OutputIntents \pdfx@outintents - }% - }{% - \errmessage{No color profile found to use for RGB screen colors.}% - }% - \fi % end of \ifx -\fi % end of \ifpdfx@x +\fi % end of OutputIntent array and Catalog entry \endgroup %% ---------------------------------------------------------------------- @@ -1320,9 +2087,10 @@ \fi\fi \makeatletter \IfFileExists{\pdfx@encodingfile}{% -%% \def\cf@encoding{U}\fontencoding{U}% \def\cf@encoding{L8U}\fontencoding{L8U}% }{}% + \let\protect\@typeset@protect + \pdfx@xmpmarkup %% !!!!! no longer needed %% \xdef\xmp@@Author{\xmp@Author}% no need to expand \global\let\xmp@@Author\xmp@Author \def\sep{; }% expand to replace \sep !!! no longer needed @@ -1405,7 +2173,7 @@ \newif\ifpdf@activechars {\ifnum\catcode`^^c0 = 13\relax \aftergroup\pdf@activecharstrue\fi}% %% -%% normally not used with XeTeX +%% normally not used with XeTeX or LuaTeX %% \ifpdf@activechars @@ -1466,54 +2234,218 @@ %% ---------------------------------------------------------------------- %% detect when \sep is used for multiple authors %% then suppress the /Author field in PDF /Info -\newif\ifpdfx@sepinAuthor +\newif\ifpdfx@sep@infield@ \let\pdfx@endparse\relax \def\pdfx@parseforsep#1\sep#2\pdfx@endparse{% - \ifx\relax#2\relax\else\pdfx@sepinAuthortrue\fi + \pdfx@sep@infield@false + \ifx\relax#2\relax\else\pdfx@sep@infield@true\fi +} + +\begingroup + \let\CATCODE\catcode + \let\ENDGROUP\endgroup + \let\GDEF\gdef + \CATCODE`\m 12 \CATCODE`\a 12 \CATCODE`\c 12 \CATCODE`\r 12 \CATCODE`\o 12 + \CATCODE`\: 12 \CATCODE`\- 12 \CATCODE`\> 12 + \GDEF\pdfx@DOSTRIP@MACRO macro:->#1\@{#1}% +\ENDGROUP +\def\pdfx@strip@macro#1{% + \expandafter\edef\expandafter#1\expandafter{% + \expandafter\pdfx@DOSTRIP@MACRO\meaning#1\@}% } %% Convert the relevant XMP properties to PDF strings, expanding markup %% (such as \sep, \&, \copyright, etc) in an appropriate way. -%% These PDF strings are actually not necessary, but if supplied they +%% These PDF strings are actually not always necessary, but if supplied they %% must match exactly what is in the XMP version. This may be impossible %% if math symbols are used; e.g. Plane-1 alphanumerics. %% Generally, it is better to *not* provide PDF-info strings; %% instead just providing metadata through XMP. %% This is not always enough — a driver may add it by default! %% +%% But some PDF readers don't support XMP, so it is nice to have +%% /Info fields, when this can be done reliably. +%% \begingroup + \RequirePackage{stringenc}% + \expandafter\ifx\csname pdf@escapehex\endcsname\relax + \PackageWarning{pdfx}{% + Missing an implementation of \string\pdf@escapehex ^^J + Translated Metadata cannot be generated as PDF strings.^^J}% + \def\pdfx@GeneratePdfString#1#2{}% + \def\pdfx@ConvertUTFtoBE#1#2{}% + \else + \def\pdfx@GeneratePdfString#1#2{% + % converts a UTF-8 string to UTF-16be + \StringEncodingConvert{#1}{#2}{utf8}{utf16be}% + \xdef#1{\string\376\string\377\pdfescapestring{#1}}% + }% + \def\pdfx@ConvertUTFtoBE#1#2{% + \setbox0=\hbox{% catch any rubbish escaping to the MVL + \def\cf@encoding{L8U}\fontencoding{L8U}% + \ifluatex + \let\pdfescapestring\luaescapestring + \else\ifxetex\else + \inputencoding{8bit}% + \fi\fi +%% \pdfx@xmpmarkup %% don't want some things + \pdfx@xmpunimarkup + \let\backslash\textbackslash + \edef\pdfx@temp{#2}% ensure XMP expands to UTF8 + \pdfx@GeneratePdfString{#1}{\pdfx@temp}% + }% + }% + \fi \pdfx@pdfmarkup - \global\let\pdfx@Title\@empty - \global\let\pdfx@Subject\@empty - \global\let\pdfx@Keywords\@empty - \ifpdfx@nopdfinfo\else - \pdfx@topdfstring\pdfx@Title\xmp@Title + \global\let\pdfx@pdfAuthor\@empty + \global\let\pdfx@pdfTitle\@empty + \global\let\pdfx@pdfSubject\@empty + \global\let\pdfx@pdfKeywords\@empty + \ifpdfx@nopdfinfo % transliterated strings present +%% RRM: this may still work with parser macros ??? + \ifluatex + %% \pdf@escapehex gets it wrong!! + %% Is there a better way ? + \else + \pdfx@ConvertUTFtoBE\pdfx@pdfTitle\xmp@Title + \pdfx@ConvertUTFtoBE\pdfx@pdfSubject\xmp@Subject + \fi +\else + \pdfx@topdfstring\pdfx@pdfTitle\xmp@Title \ifpdfx@e\else\ifpdfx@x\else - \pdfx@topdfstring\pdfx@Subject\xmp@Subject + \pdfx@topdfstring\pdfx@pdfSubject\xmp@Subject \fi\fi -%% \pdfx@topdfstring\pdfx@Keywords\xmp@Keywords \fi \pdfx@topdfstring\pdfx@CreatorTool\xmp@CreatorTool \pdfx@topdfstring\pdfx@Producer\xmp@Producer - \expandafter\pdfx@parseforsep\xmp@Author\sep\pdfx@endparse - \ifpdfx@sepinAuthor - \aftergroup\let\aftergroup\pdfx@Author\aftergroup\@empty - \else - \aftergroup\let\aftergroup\pdfx@Author\aftergroup\@empty -%% \pdfx@topdfstring\pdfx@Author\xmp@Author - \fi +%% \pdfescapestring needed + \expandafter\ifx\csname pdfescapestring\endcsname\relax + \else + \expandafter\ifx\expandafter\relax\xmp@Author\relax + \else +%% check for multiple authors with parser macro + \expandafter\pdfx@parseforsep\xmp@Author\sep\pdfx@endparse + \ifpdfx@sep@infield@ + \else + \pdfx@ConvertUTFtoBE{\pdfx@pdfAuthor}{\xmp@Author}% + \fi %% end of \ifpdfx@sep@infield@ + \fi %% end of \xmp@Author test + \expandafter\ifx\expandafter\relax\xmp@Keywords\relax + \else +%% check for multiple keywords with parser macro + \expandafter\pdfx@parseforsep\xmp@Keywords\sep\pdfx@endparse + \ifpdfx@sep@infield@\else + \ifluatex\else + \pdfx@ConvertUTFtoBE{\pdfx@pdfKeywords}{\xmp@Keywords}% + \fi + \fi %% end of \ifpdfx@sep@infield@ + \fi %% end of \xmp@Keywords test +%% + \fi %% end of \pdfescapestring test \endgroup -%% How to support XeTeX here ? -\ifxetex\else +%% Affects CMap creation for certain fonts, according to glyph names +%% How to support XeTeX here ? +%% Maybe it's best to be using an updated mmap.sty ? +\ifxetex +\else \input glyphtounicode.tex \input glyphtounicode-cmr.tex + \input glyphtounicode-ntx.tex \pdfgentounicode=1 - \ifgrkLGRxmp - \pdfglyphtounicode{internalchar2}{200D}% - \fi \fi +\ifgrkLGRxmp + \ifxetex\else + \pdfglyphtounicode{internalchar2}{200D}% +\fi \fi + +%% patch to place accents *after* the base character, rather than before +%% based on coding from mmap.sty by RRM +\newif\ifPDFX@inaccent +\let\LTX@add@accent\add@accent +\def\PDFX@add@accent#1#2{% + \hmode@bgroup + \let \hmode@start@before@group \@firstofone + \setbox\@tempboxa\hbox{\PDFX@inaccenttrue + #2\global\mathchardef\accent@spacefactor\spacefactor}% + #2\kern-\wd\@tempboxa +%% \ifdim\ht\@tempboxa>1ex\relax + \dimen@=\ht\@tempboxa\advance\dimen@-1ex\relax +%%% reduce how much a nested accent is raised + \ifPDFX@inaccent\advance\dimen@-.2ex\relax\fi + \raise\dimen@\hbox to\wd\@tempboxa{\hss + \accent#1{\vphantom{#2}}\hss}% +%% \else +%% \accent#1{%\vphantom{#2} +%% \vrule width\z@ height\ht\@tempboxa depth\dp\@tempboxa}% +%% \fi + \egroup + \spacefactor\accent@spacefactor +} + +%% How to support XeTeX here ? +%%%%% adjust accent characters to the Unicode Combining variant %%%% +\def\PDFX@combiningchars@unicode{% + \pdfglyphtounicode{grave}{0300}% + \pdfglyphtounicode{acute}{0301}% + \pdfglyphtounicode{circumflex}{0302}% + \pdfglyphtounicode{tilde}{0303}% + \pdfglyphtounicode{macron}{0304}% + \pdfglyphtounicode{Macronsmall}{0304}% + \pdfglyphtounicode{breve}{0306}% + \pdfglyphtounicode{dotaccent}{0307}% + \pdfglyphtounicode{Dotaccent}{0307}% + \pdfglyphtounicode{Dotaccentsmall}{0307}% + \pdfglyphtounicode{dieresis}{0308}% + \pdfglyphtounicode{ogonek}{0309}% + \pdfglyphtounicode{ring}{030A}% + \pdfglyphtounicode{hungarumlaut}{030B}% + \pdfglyphtounicode{caron}{030C}% + \pdfglyphtounicode{cedilla}{0327}% + \pdfglyphtounicode{commaaccent}{0326}% droid + % tie accents in berenisadf lm stix and others + \pdfglyphtounicode{tieaccentlowercase}{0311}% + \pdfglyphtounicode{tieaccentcapital}{0361}% + \pdfglyphtounicode{newtieaccentlowercase}{0311}% + \pdfglyphtounicode{newtieaccentcapital}{0361}% + % cm-unicode + \pdfglyphtounicode{space_uni030D}{030D}% + \pdfglyphtounicode{space_uni030E}{030E}% + \pdfglyphtounicode{space_uni030F}{030F}% + \pdfglyphtounicode{space_uni0311}{0311}% + \pdfglyphtounicode{space_uni0321}{0321}% + \pdfglyphtounicode{space_uni0322}{0322}% + \pdfglyphtounicode{space_uni032A}{032A}% + \pdfglyphtounicode{space_uni032B}{032B}% + \pdfglyphtounicode{space_uni0335}{0335}% + \pdfglyphtounicode{space_uni0337}{0337}% + \pdfglyphtounicode{space_uni033A}{033A}% + \pdfglyphtounicode{space_uni033B}{033B}% + \pdfglyphtounicode{space_uni033C}{033C}% + \pdfglyphtounicode{space_uni034D}{034D}% +} +\AtBeginDocument{% + \ifx\add@accent\LTX@add@accent + \let\add@accent\PDFX@add@accent + \else + \expandafter\ifx\csname MT@orig@add@accent\endcsname\relax + \TPDF@error{another package has already patched \string\add@accent }% + \else + \expandafter\let\csname MT@orig@add@accent\endcsname\PDFX@add@accent + \fi\fi + \ifxetex + \else + \PDFX@combiningchars@unicode + \@ifpackageloaded{newtxmath}{% + \pdfglyphtounicode{vec}{20D7}% + \pdfglyphtounicode{rvec}{20D6}% + \pdfglyphtounicode{lrvec}{20E1}% + }{}% + \fi % end of \ifxetex +} + +%% suppress hyperlinks when generating PDF/X \def\pdfx@linkfile@pdfX#1#2#3{% \Hy@colorlink\@filecolor#1\Hy@xspace@end} \def\pdfx@linkstart@pdfX#1#2#3{% @@ -1522,6 +2454,7 @@ \Hy@colorlink\@urlcolor#1\endgroup\Hy@xspace@end} \def\pdfx@StartlinkName@pdfX#1#2{} \def\pdfx@close@pdflink{\Hy@VerboseLinkStop\Hy@endcolorlink}% +\def\pdfx@Acrobatmenu@noaction#1#2{#2} \ifpdfx@x \let\hyper@linkfile\pdfx@linkfile@pdfX @@ -1530,19 +2463,20 @@ \let\hyper@linkend\relax \let\Hy@StartlinkName\pdfx@StartlinkName@pdfX \let\close@pdflink\pdfx@close@pdflink + \let\AcrobatMenu\pdfx@Acrobatmenu@noaction \Hy@bookmarksfalse %% {\def\sep{;}% should not be needed, but just in case \AtBeginDocument{% % cancel annotations and links % \def\PDF@FinishDoc{% ??? What uses this ??? - \Hy@UseMaketitleInfos - {\def\sep{; }% should not be needed, but just in case + \begingroup + \def\sep{; }% should not be needed, but just in case \pdfinfo{% - \ifx\pdfx@Title\@empty\else /Title(\pdfx@Title)\fi - \ifx\pdfx@Author\@empty\else /Author(\pdfx@Author)\fi - \ifx\pdfx@Subject\@empty\else /Subject(\pdfx@Subject)\fi - \ifx\pdfx@Keywords\@empty\else /Keywords(\pdfx@Keywords)\fi + \ifx\pdfx@pdfTitle\@empty\else /Title(\pdfx@pdfTitle)\fi + \ifx\pdfx@pdfAuthor\@empty\else /Author(\pdfx@pdfAuthor)\fi + \ifx\pdfx@pdfSubject\@empty\else /Subject(\pdfx@pdfSubject)\fi + \ifx\pdfx@pdfKeywords\@empty\else /Keywords(\pdfx@pdfKeywords)\fi /Creator(\pdfx@CreatorTool)% \ifx\@pdfcreationdate\@empty /CreationDate(D:\pdfx@convDate)% @@ -1572,9 +2506,9 @@ %% support for PDF/VT extensions of PDF/X-4 and PDF/X-5 /GTS_PDFVTVersion(PDF/VT-\xmp@vtPart\xmp@vtConformance)% \fi - }% end of PDF/X info - }% end of scope for \sep - }% end of \PDF@FinishDoc + }%% end of PDF/X info + \endgroup %% end of scope for \sep + }%% end of \PDF@FinishDoc }% end of \AtBeginDocument %% \pdfinfo{% order of these dictionary keys should not matter %% \ifx\pdfx@Author\@empty\else /Author(\pdfx@Author)\fi @@ -1605,16 +2539,16 @@ %% }% end of PDF/X info %% }% end of scope for \sep \else - \ifpdfx@e + \ifpdfx@e %% PDF/E \AtBeginDocument{% \def\PDF@FinishDoc{% ??? What uses this ??? - \Hy@UseMaketitleInfos - {\def\sep{; }% should not be needed, but just in case + \begingroup + \def\sep{; }% should not be needed, but just in case \pdfinfo{% - \ifx\pdfx@Title\@empty\else /Title(\pdfx@Title)\fi - \ifx\pdfx@Author\@empty\else /Author(\pdfx@Author)\fi - \ifx\pdfx@Subject\@empty\else /Subject(\pdfx@Subject)\fi - \ifx\pdfx@Keywords\@empty\else /Keywords(\pdfx@Keywords)\fi + \ifx\pdfx@pdfTitle\@empty\else /Title(\pdfx@pdfTitle)\fi + \ifx\pdfx@pdfAuthor\@empty\else /Author(\pdfx@pdfAuthor)\fi + \ifx\pdfx@pdfSubject\@empty\else /Subject(\pdfx@pdfSubject)\fi + \ifx\pdfx@pdfKeywords\@empty\else /Keywords(\pdfx@pdfKeywords)\fi /Creator(\pdfx@CreatorTool)% \ifx\@pdfcreationdate\@empty /CreationDate(D:\pdfx@convDate)% @@ -1631,7 +2565,7 @@ /Trapped/False /GTS_PDFEVersion(PDF/E-1\xmp@Conformance:\xmp@ReleaseDate)% }% end of PDF/E info - }% end of scope for \sep + \endgroup %% end of scope for \sep }% end of \PDF@FinishDoc }% end of \AtBeginDocument %% {\def\sep{;}% should not be needed, but just in case @@ -1652,7 +2586,7 @@ %% /Trapped/False% %% }% end of PDF/E info %% }% end of scope for \sep - \else + \else %% PDF/A \def\pdfx@confA{a}% \def\pdfx@confB{b}% \def\pdfx@confU{u}% @@ -1660,13 +2594,13 @@ {\csname pdfx@conf\xmp@Conformance\endcsname}% \AtBeginDocument{% \def\PDF@FinishDoc{% ??? What uses this ??? - \Hy@UseMaketitleInfos - {\def\sep{; }% should not be needed, but just in case + \begingroup + \def\sep{; }% should not be needed, but just in case \pdfinfo{% - \ifx\pdfx@Title\@empty\else /Title(\pdfx@Title)\fi - \ifx\pdfx@Author\@empty\else /Author(\pdfx@Author)\fi - \ifx\pdfx@Subject\@empty\else /Subject(\pdfx@Subject)\fi - \ifx\pdfx@Keywords\@empty\else /Keywords(\pdfx@Keywords)\fi + \ifx\pdfx@pdfTitle\@empty\else /Title(\pdfx@pdfTitle)\fi + \ifx\pdfx@pdfAuthor\@empty\else /Author(\pdfx@pdfAuthor)\fi + \ifx\pdfx@pdfSubject\@empty\else /Subject(\pdfx@pdfSubject)\fi + \ifx\pdfx@pdfKeywords\@empty\else /Keywords(\pdfx@pdfKeywords)\fi /Creator(\pdfx@CreatorTool)% \ifx\@pdfcreationdate\@empty /CreationDate(D:\pdfx@convDate)% @@ -1683,14 +2617,15 @@ /Trapped/False /GTS_PDFA1Version (PDF/A-\xmp@Part\xmp@conf:\xmp@ReleaseDate)% }% end of PDF/A info - }% end of scope for \sep + \endgroup %% end of scope for \sep }% end of \PDF@FinishDoc }% end of \AtBeginDocument \fi\fi %%---------------------------------------------------------------------- +\begingroup +%% override the \ifpdf check of xmpincl package \ifxetex - % override the \ifpdf check \pdftrue \else\ifluatex \pdftrue @@ -1732,7 +2667,7 @@ \let\includexmp\pdfx@xmpincl@xetex \fi -%% macro provided by Leonardo E. Segovia on 2007-05-15 +%% macro provided by Leonardo E. Segovia on 2017-05-15 %% <leonardo.segovia@cs.uns.edu.ar> \def\pdfx@xmpincl@luatex#1{% \IfFileExists{#1.xmp}{% @@ -1741,7 +2676,8 @@ \pdfcompresslevel=0 \immediate\pdfobj uncompressed stream attr {/Type /Metadata /Subtype /XML} file{#1.xmpi}% - \pdfcatalog{/Metadata \the\pdflastobj\space 0 R}% + \pdfcatalog{%\pdfx@LanguageSpec + /Metadata \the\pdflastobj\space 0 R}% \endgroup }{% \newcommand{\mcs@xmpincl@filename}{#1.xmp}% @@ -1769,6 +2705,8 @@ \else \def\xmp@template{pdfa}% \fi\fi + \catcode`\'=12 \catcode`\<=12 \catcode`\>=12 \catcode`\?=12 + \catcode`\"=12 \catcode`\= 12 %% used within the template file %% patch commands from xmpincl.sty ... \def\pdfx@xmpinclStart{% supply byte-order marker <?xpacket begin='^^ef^^bb^^be' id='W5M0MpCehiHzreSzNTczkc9d' ?> % @@ -1797,8 +2735,10 @@ \inputencoding{8bit}% \fi\fi \makeatletter + \def\cf@encoding{L8U}\fontencoding{L8U}% + \providecommand{\ifnot@empty}[2]{\ifx#1\@empty\relax\else#2\fi}% \pdfx@xmpmarkup - \expandafter\global\expandafter +\expandafter\global\expandafter \let\csname L8U-cmd\expandafter\endcsname\csname U-cmd\endcsname \def\cf@encoding{L8U}\fontencoding{L8U}% \providecommand{\ifnot@empty}[2]{\ifx#1\@empty\relax\else#2\fi}% @@ -1867,6 +2807,8 @@ \global\let ^^f3\pdfx@save@fiii \fi +\endgroup + %% %% controls the color model and conversions with xcolor package %% @@ -1908,6 +2850,30 @@ } %%---------------------------------------------------------------------- +%% Disable some actions in Beamer navigation +\@ifclassloaded{beamer}{% + \let\real@insertslidenavigationsymbol + \insertslidenavigationsymbol + \let\real@insertbackfindforwardnavigationsymbol + \insertbackfindforwardnavigationsymbol + \def\pdfx@insertslidenavigationsymbol{{% + \let\Acrobatmenu\pdfx@Acrobatmenu@noaction + \real@insertslidenavigationsymbol + }}% + \def\pdfx@insertbackfindforwardnavigationsymbol{{% + \let\Acrobatmenu\pdfx@Acrobatmenu@noaction + \real@insertbackfindforwardnavigationsymbol + }}% + \AtBeginDocument{% + \ifHy@pdfa + \let\insertslidenavigationsymbol + \pdfx@insertslidenavigationsymbol + \let\insertbackfindforwardnavigationsymbol + \pdfx@insertbackfindforwardnavigationsymbol + \fi}% +}{} + +%%---------------------------------------------------------------------- \ifpdfx@transliterated %% support for bookmarks with transliterated input \RequirePackage{stringenc} @@ -1933,6 +2899,7 @@ \let\Hy@@writetorep\@@writetorep \def\pdfx@@writetorep#1#2#3#4#5{% \begingroup + \pdfx@xmpunimarkup \pdfx@prebookmark \edef\pdfstringdefPreHook{%\pdfstringdefPreHook \the\pdfx@DisabledCommands}% diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfx.xmp b/Master/texmf-dist/tex/latex/pdfx/pdfx.xmp index fa404dc9fd7..d6f8fd02e4a 100644 --- a/Master/texmf-dist/tex/latex/pdfx/pdfx.xmp +++ b/Master/texmf-dist/tex/latex/pdfx/pdfx.xmp @@ -1,8 +1,8 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -%% File: pdfx.xmp +%% File: pdfx.xmp (for pdfx.sty v1.6) %% -%% Copyright (c) 2016, CV Radhakrishnan <cvr@river-valley.org>, +%% Copyright (c) 2018, CV Radhakrishnan <cvr@river-valley.org>, %% Han The Thanh <thanh@river-valley.org>, %% Ross Moore <ross.moore@mq.edu.au>, %% Peter Selinger <selinger@mathstat.dal.ca> @@ -18,197 +18,158 @@ %% version 1999/12/01 or later. %% <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.0-c316 44.253921, Sun Oct 01 2006 17:14:39"> - <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <rdf:Description rdf:about="" - xmlns:xmp="http://ns.adobe.com/xap/1.0/" - xmlns:pdf="http://ns.adobe.com/pdf/1.3/" - xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/" - xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/"> -%% xmlns:pdf = "http://ns.adobe.com/pdf/1.3/" -%% xmlns:pdfx = "http://ns.adobe.com/pdfx/1.3/" -%% xmlns:pdfxid = "http://www.npes.org/pdfx/ns/id/" -%% xmlns:xmp = "http://ns.adobe.com/xap/1.0/" -%% xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/" -%% xmlns:dc = "http://purl.org/dc/elements/1.1/" -%% xmlns:dcterms = "http://purl.org/dc/terms/" -%% xmlns:pdfaExtension = "http://www.aiim.org/pdfa/ns/extension/" -%% xmlns:pdfaField = "http://www.aiim.org/pdfa/ns/field#" -%% xmlns:pdfaProperty = "http://www.aiim.org/pdfa/ns/property#" -%% xmlns:pdfaSchema = "http://www.aiim.org/pdfa/ns/schema#" -%% xmlns:pdfaType = "http://www.aiim.org/pdfa/ns/type#" -%% xmlns:prism = "http://prismstandard.org/namespaces/basic/2.2/" -%%% RRM: Other possible namespaces. -%%% If these are used, then appropriate tags need to be declared, using -%%% pdfaExtension:schemas similarly to below for prism: -%% xmlns:pim = "http://prismstandard.org/namespaces/pim/2.2/" -%% xmlns:prl = "http://prismstandard.org/namespaces/prl/2.1/" -%% xmlns:pur = "http://prismstandard.org/namespaces/primusagerights/2.1/" -%% > - <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate> - <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool> - <xmp:CreateDate>\xmp@convDate</xmp:CreateDate> - <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate> - \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</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 -% \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/"> - \ifx\xmp@Copyright\@empty\else<xmpRights:Marked>\ifx\xmp@Copyrighted\@empty True\else\xmp@Copyrighted\fi</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: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: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#" + <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:pdfxid="http://www.npes.org/pdfx/ns/id/"> +% xmlns:pdfaid = "http://www.aiim.org/pdfa/ns/id/" +% xmlns:xmp = "http://ns.adobe.com/xap/1.0/" +% xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/" +% xmlns:dc = "http://purl.org/dc/elements/1.1/" +% xmlns:dcterms = "http://purl.org/dc/terms/" +% xmlns:pdfaExtension = "http://www.aiim.org/pdfa/ns/extension/" +% xmlns:pdfaField = "http://www.aiim.org/pdfa/ns/field#" +% xmlns:pdfaProperty = "http://www.aiim.org/pdfa/ns/property#" +% xmlns:pdfaSchema = "http://www.aiim.org/pdfa/ns/schema#" +% xmlns:pdfaType = "http://www.aiim.org/pdfa/ns/type#" +% xmlns:prism = "http://prismstandard.org/namespaces/basic/2.2/" +%% RRM: Other possible namespaces. +%% If these are used, then appropriate tags need to be declared, using +%% pdfaExtension:schemas similarly to below for prism: +% xmlns:pim = "http://prismstandard.org/namespaces/pim/2.2/" +% xmlns:prl = "http://prismstandard.org/namespaces/prl/2.1/" +% xmlns:pur = "http://prismstandard.org/namespaces/primusagerights/2.1/" +% > + <rdf:Description rdf:about="" + xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" + xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" + xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#" %% RRM: do we really need the following two declarations ? % xmlns:pdfaType="http://www.aiim.org/pdfa/ns/type#" % xmlns:pdfaField="http://www.aiim.org/pdfa/ns/field#" - > - <pdfaExtension:schemas> - <rdf:Bag> - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:namespaceURI>http://ns.adobe.com/pdf/1.3/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>pdf</pdfaSchema:prefix> - <pdfaSchema:schema>Adobe PDF Schema</pdfaSchema:schema> - <pdfaSchema:property> - <rdf:Seq> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>A name object indicating whether the document has been modified to include trapping information</pdfaProperty:description> - <pdfaProperty:name>Trapped</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>PDF/X Part Version</pdfaProperty:description> - <pdfaProperty:name>Version</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - </rdf:Seq> - </pdfaSchema:property> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:namespaceURI>http://ns.adobe.com/pdfx/1.3/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>pdfx</pdfaSchema:prefix> - <pdfaSchema:schema>PDF/X Schema</pdfaSchema:schema> - <pdfaSchema:property> - <rdf:Seq> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description> - <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>Conformance level of PDF/X standard</pdfaProperty:description> - <pdfaProperty:name>GTS_PDFXConformance</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>URL to an online version or preprint</pdfaProperty:description> - <pdfaProperty:name>AuthoritativeDomain</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>Company creating the PDF</pdfaProperty:description> - <pdfaProperty:name>Company</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>Date when document was last modified</pdfaProperty:description> - <pdfaProperty:name>SourceModified</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - </rdf:Seq> - </pdfaSchema:property> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:namespaceURI>http://ns.adobe.com/xap/1.0/mm/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>xmpMM</pdfaSchema:prefix> - <pdfaSchema:schema>XMP Media Management Schema</pdfaSchema:schema> - <pdfaSchema:property> - <rdf:Seq> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>UUID based identifier for specific incarnation of a document</pdfaProperty:description> - <pdfaProperty:name>InstanceID</pdfaProperty:name> - <pdfaProperty:valueType>URI</pdfaProperty:valueType> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>The common identifier for all versions and renditions of a document.</pdfaProperty:description> - <pdfaProperty:name>OriginalDocumentID</pdfaProperty:name> - <pdfaProperty:valueType>URI</pdfaProperty:valueType> - </rdf:li> - </rdf:Seq> - </pdfaSchema:property> - </rdf:li> - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:namespaceURI>http://www.npes.org/pdfx/ns/id/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>pdfxid</pdfaSchema:prefix> - <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema> - <pdfaSchema:property> - <rdf:Seq> - <rdf:li rdf:parseType="Resource"> - <pdfaProperty:category>internal</pdfaProperty:category> - <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description> - <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name> - <pdfaProperty:valueType>Text</pdfaProperty:valueType> - </rdf:li> - </rdf:Seq> - </pdfaSchema:property> - </rdf:li> + > + <pdfaExtension:schemas> + <rdf:Bag> + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:namespaceURI>http://ns.adobe.com/pdf/1.3/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>pdf</pdfaSchema:prefix> + <pdfaSchema:schema>Adobe PDF Schema</pdfaSchema:schema> + <pdfaSchema:property><rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>A name object indicating whether the document has been modified to include trapping information</pdfaProperty:description> + <pdfaProperty:name>Trapped</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>PDF/X Part Version</pdfaProperty:description> + <pdfaProperty:name>Version</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li></rdf:Seq> + </pdfaSchema:property> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:namespaceURI>http://ns.adobe.com/pdfx/1.3/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>pdfx</pdfaSchema:prefix> + <pdfaSchema:schema>PDF/X Schema</pdfaSchema:schema> + <pdfaSchema:property><rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description> + <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>Conformance level of PDF/X standard</pdfaProperty:description> + <pdfaProperty:name>GTS_PDFXConformance</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>URL to an online version or preprint</pdfaProperty:description> + <pdfaProperty:name>AuthoritativeDomain</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>Company creating the PDF</pdfaProperty:description> + <pdfaProperty:name>Company</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>Date when document was last modified</pdfaProperty:description> + <pdfaProperty:name>SourceModified</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li></rdf:Seq> + </pdfaSchema:property> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:namespaceURI>http://ns.adobe.com/xap/1.0/mm/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>xmpMM</pdfaSchema:prefix> + <pdfaSchema:schema>XMP Media Management Schema</pdfaSchema:schema> + <pdfaSchema:property><rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>UUID based identifier for specific incarnation of a document</pdfaProperty:description> + <pdfaProperty:name>InstanceID</pdfaProperty:name> + <pdfaProperty:valueType>URI</pdfaProperty:valueType> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>The common identifier for all versions and renditions of a document.</pdfaProperty:description> + <pdfaProperty:name>OriginalDocumentID</pdfaProperty:name> + <pdfaProperty:valueType>URI</pdfaProperty:valueType> + </rdf:li></rdf:Seq> + </pdfaSchema:property> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <pdfaSchema:namespaceURI>http://www.npes.org/pdfx/ns/id/</pdfaSchema:namespaceURI> + <pdfaSchema:prefix>pdfxid</pdfaSchema:prefix> + <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema> + <pdfaSchema:property><rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <pdfaProperty:category>internal</pdfaProperty:category> + <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description> + <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name> + <pdfaProperty:valueType>Text</pdfaProperty:valueType> + </rdf:li></rdf:Seq> + </pdfaSchema:property> + </rdf:li> %% RRM: this declares the namespace resource for PRISM metadata - <rdf:li rdf:parseType="Resource"> - <pdfaSchema:schema>PRISM metadata</pdfaSchema:schema> - <pdfaSchema:namespaceURI>http://prismstandard.org/namespaces/basic/2.2/</pdfaSchema:namespaceURI> - <pdfaSchema:prefix>prism</pdfaSchema:prefix> - <pdfaSchema:property> - <rdf:Seq> + <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 - \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 +%\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 +\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 - \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 + <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> %% RRM: more tags can be declared % <rdf:li rdf:parseType="Resource"> % <pdfaProperty:name></pdfaProperty:name> @@ -216,57 +177,81 @@ % <pdfaProperty:category>external</pdfaProperty:category> % <pdfaProperty:description></pdfaProperty:description> % </rdf:li> - </rdf:Seq></pdfaSchema:property> - </rdf:li> - </rdf:Bag> - </pdfaExtension:schemas> - </rdf:Description> - <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/"> - \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/"> -% <dc:format>application/pdf</dc:format> -% <dc:title> -% <rdf:Alt> -% <rdf:li xml:lang="x-default">\xmp@Title</rdf:li> -% </rdf:Alt> -% </dc:title> -% <dc:description> -% <rdf:Alt> -% <rdf:li xml:lang="x-default">\xmp@Subject</rdf:li> -% </rdf:Alt> -% </dc:description> -% <dc:creator> -% <rdf:Bag> -% <rdf:li>\xmp@Author</rdf:li> -% </rdf:Bag> -% </dc:creator> -% <dc:subject> -% <rdf:Bag> -% <rdf:li>\xmp@Keywords</rdf:li> -% </rdf:Bag> -% </dc:subject> -% </rdf:Description> - <rdf:Description rdf:about="" - xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"> - <xmpMM:DocumentID>uuid:\xmp@docid</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:\xmp@instid</xmpMM:InstanceID> -\ifnum\xmp@Part>3 <xmpMM:RenditionClass>default</xmpMM:RenditionClass>\fi -\ifnum\xmp@Part>3 <xmpMM:VersionID>1</xmpMM:VersionID>\fi - </rdf:Description> - </rdf:RDF> + </rdf:Seq></pdfaSchema:property> + </rdf:li> + </rdf:Bag> + </pdfaExtension:schemas> + </rdf:Description> + <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <dc:format>application/pdf</dc:format> +\ifx\xmp@PublicationType\@empty\else <dc:type><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@PublicationType>\xmp@PublicationType</rdf:li></rdf:Bag></dc:type>\fi +\ifx\xmp@Title\@empty\else <dc:title><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Title>\xmp@Title</rdf:li></rdf:Alt></dc:title>\fi +\ifx\xmp@@Author\@empty\else <dc:creator><rdf:Seq><rdf:li\xmp@checklang\xmp@lang@Author>\xmp@@Author</rdf:li></rdf:Seq></dc:creator>\fi +\ifx\xmp@Publisher\@empty\else <dc:publisher><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Publisher>\xmp@Publisher</rdf:li></rdf:Bag></dc:publisher>\fi +\ifx\xmp@Language\@empty\else <dc:language><rdf:Bag><rdf:li>\xmp@Language</rdf:li></rdf:Bag></dc:language>\fi +\ifx\xmp@Doi\@empty\else <dc:identifier>doi:\xmp@Doi</dc:identifier>\fi +\ifx\xmp@ISBN\@empty\else <dc:identifier>ISBN:\xmp@ISBN</dc:identifier>\fi +\ifx\xmp@URL\@empty\else <dc:identifier>URL:\xmp@URL</dc:identifier>\fi +\ifx\xmp@Copyright\@empty\else <dc:rights><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Copyright>\xmp@@Copyright</rdf:li></rdf:Alt></dc:rights>\fi +\ifx\xmp@Subject\@empty\else <dc:description><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Subject>\xmp@Subject</rdf:li></rdf:Alt></dc:description>\fi +\ifx\xmp@Keywords\@empty\else <dc:subject><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Keywords>\xmp@Keywords</rdf:li></rdf:Bag></dc:subject>\fi +\ifx\xmp@Source\@empty\else <dc:source>\xmp@Source</dc:source>\fi +\ifx\xmp@Coverage\@empty\else <dc:coverage\xmp@checklang\xmp@lang@Coverage>\xmp@Coverage</dc:coverage>\fi +\ifx\xmp@Date\@empty\else <dc:date><rdf:Seq><rdf:li>\xmp@Date</rdf:li></rdf:Seq></dc:date>\fi +\ifx\xmp@Contributor\@empty\else <dc:contributor><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Contributor>\xmp@Contributor</rdf:li></rdf:Bag></dc:contributor>\fi +\ifx\xmp@Relation\@empty\else <dc:relation><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Relation>\xmp@Relation</rdf:li></rdf:Bag></dc:relation>\fi + </rdf:Description> + <rdf:Description rdf:about="" xmlns:prism="http://prismstandard.org/namespaces/basic/2.2/"> +\ifx\xmp@PublicationType\@empty\else <prism:aggregationType\xmp@checklang\xmp@lang@PublicationType>\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@checklang\xmp@lang@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@checklang\xmp@lang@JournalTitle>\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 +\ifx\xmp@URL\@empty\else <prism:url>\xmp@URL</prism:url>\fi + </rdf:Description> + <rdf:Description rdf:about="" + xmlns:xmp="http://ns.adobe.com/xap/1.0/" + xmlns:pdf="http://ns.adobe.com/pdf/1.3/" + xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/" + xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/"> + <xmp:CreatorTool>\xmp@CreatorTool</xmp:CreatorTool> + <xmp:ModifyDate>\xmp@convDate</xmp:ModifyDate> + <xmp:CreateDate>\xmp@convDate</xmp:CreateDate> + <xmp:MetadataDate>\xmp@convDate</xmp:MetadataDate> + <pdf:Producer>\xmp@Producer</pdf:Producer> +\ifx\xmp@@Keywords\@empty\else <pdf:Keywords>\xmp@@Keywords</pdf:Keywords>\fi + <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</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 +\ifx\xmp@AuthoritativeDomain\@empty\else <pdfx:AuthoritativeDomain><rdf:Bag><rdf:li>\xmp@AuthoritativeDomain</rdf:li></rdf:Bag></pdfx:AuthoritativeDomain>\fi +\ifx\xmp@Advisory\@empty\else <xmp:Advisory><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Advisory>\xmp@Advisory</rdf:li></rdf:Bag></xmp:Advisory>\fi +\ifx\xmp@BaseURL\@empty\else <xmp:BaseURL>\xmp@BaseURL</xmp:BaseURL>\fi +\ifx\xmp@Identifier\@empty\else <xmp:Identifier><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Identifier>\xmp@Identifier</rdf:li></rdf:Bag></xmp:Identifier>\fi +\ifx\xmp@Nickname\@empty\else <xmp:Nickname\xmp@checklang\xmp@lang@Nickname>\xmp@Nickname</xmp:Nickname>\fi +\ifx\xmp@Thumbnails\@empty\else <xmp:Thumbnails><rdf:Alt><rdf:li>\xmp@Thumbnails</rdf:li></rdf:Alt></xmp:Thumbnails>\fi + </rdf:Description> + <rdf:Description rdf:about="" xmlns:xmpRights = "http://ns.adobe.com/xap/1.0/rights/"> +\ifx\xmp@Copyright\@empty\else <xmpRights:Marked>\ifx\xmp@Copyrighted\@empty True\else\xmp@Copyrighted\fi</xmpRights:Marked>^^J <xmpRights:UsageTerms><rdf:Alt><rdf:li\xmp@strictlang\xmp@lang@Copyright>\xmp@@Copyright</rdf:li></rdf:Alt></xmpRights:UsageTerms>\fi +\ifx\xmp@CopyrightURL\@empty\else <xmpRights:WebStatement>\xmp@CopyrightURL</xmpRights:WebStatement>\fi +\ifx\xmp@Owner\@empty\else <xmpRights:Owner><rdf:Bag><rdf:li\xmp@checklang\xmp@lang@Owner>\xmp@Owner</rdf:li></rdf:Bag></xmpRights:Owner>\fi +\ifx\xmp@CertificateURL\@empty\else <xmpRights:Certificate>\xmp@CertificateURL</xmpRights:Certificate>\fi + </rdf:Description> + <rdf:Description rdf:about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"> + <xmpMM:DocumentID>uuid:\xmp@docid</xmpMM:DocumentID> + <xmpMM:InstanceID>uuid:\xmp@instid</xmpMM:InstanceID> +\ifnum\xmp@Part>3 <xmpMM:RenditionClass>default</xmpMM:RenditionClass>\fi +\ifnum\xmp@Part>3 <xmpMM:VersionID>1</xmpMM:VersionID>\fi + </rdf:Description> + </rdf:RDF> </x:xmpmeta> % padding with 512 space characters to allow easier editing within a PDF \paddingline diff --git a/Master/texmf-dist/tex/latex/pdfx/text89.def b/Master/texmf-dist/tex/latex/pdfx/text89.def new file mode 100644 index 00000000000..30ae90ff7ec --- /dev/null +++ b/Master/texmf-dist/tex/latex/pdfx/text89.def @@ -0,0 +1,32 @@ +\DeclareInputText{128}{?} +\DeclareInputText{129}{?} +\DeclareInputText{130}{?} +\DeclareInputText{131}{?} +\DeclareInputText{132}{?} +\DeclareInputText{133}{?} +\DeclareInputText{134}{?} +\DeclareInputText{135}{?} +\DeclareInputText{136}{?} +\DeclareInputText{137}{?} +\DeclareInputText{138}{?} +\DeclareInputText{139}{?} +\DeclareInputText{140}{?} +\DeclareInputText{141}{?} +\DeclareInputText{142}{?} +\DeclareInputText{143}{?} +\DeclareInputText{144}{?} +\DeclareInputText{145}{?} +\DeclareInputText{146}{?} +\DeclareInputText{147}{?} +\DeclareInputText{148}{?} +\DeclareInputText{149}{?} +\DeclareInputText{150}{?} +\DeclareInputText{151}{?} +\DeclareInputText{152}{?} +\DeclareInputText{153}{?} +\DeclareInputText{154}{?} +\DeclareInputText{155}{?} +\DeclareInputText{156}{?} +\DeclareInputText{157}{?} +\DeclareInputText{158}{?} +\DeclareInputText{159}{?} |