pdfx (14may17)

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

4 files changed, 206 insertions, 194 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf b/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf
index 6f60577ec1e..dc46f00a00c 100644
--- a/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf
+++ b/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf
diff --git a/Master/texmf-dist/source/latex/pdfx/pdfx.dtx b/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
index ffd326defab..741f895fe0f 100644
--- a/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
+++ b/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
@@ -19,13 +19,13 @@
 %
 % \fi
 %
-% \CheckSum{3863}
+% \CheckSum{3857}
 % \iffalse
 %
 %<*driver>
 \pdfcompresslevel 9
 \providecommand{\pdfxopt}{a-2u}
-\providecommand{\thisyear}{2016}
+\providecommand{\thisyear}{2017}
 \begin{filecontents*}{./\jobname.xmpdata}
 \Title{Generation of PDF/X- and PDF/A-compliant PDFs with pdfTeX \textemdash\ pdfx.sty}
 \Author{\CVR\sep \Thanh\sep Ross~Moore\sep Peter Selinger}
@@ -37,7 +37,7 @@
 \CopyrightURL{http://tug.org/texlive/}
 \CoverDisplayDate{May \thisyear}
 \CoverDate{\thisyear-05-03}
-\CreatorTool{pdfTeX + pdfx.sty with option \pdfxopt, from TeX Live 2016}
+\CreatorTool{pdfTeX + pdfx.sty with option \pdfxopt, from TeX Live \thisyear}
 \pdfxEnableCommands{%
  \def\CVR{C.V. Radhakrishnan}\def\Thanh{H^^c3^^a0n Th\eee Thanh}%
  \def\eee{^^c3^^aa^^cc^^81 }}
@@ -129,11 +129,13 @@
 %   Fixed the quoted file-name problem, evident with LuaTeX.
 %   Method to generate correct bookmarks with non-active (transliterated) input.
 %   Added support for XeLaTeX, improvements with LuaTeX. Updated documentation.} 
-%
+% \changes{v1.5.82}{2017/05/12}{%
+%   Adjusted to changes in the LaTeX core, affecting macros for composite
+%   commands; incl. \textsuperscript and others.}%
 % \title{Generation of PDF/X- and PDF/A-compliant PDFs
 %  with pdf\TeX{} --- \texttt{pdfx.sty}}
-% \date{2016/05/03}
-% \version{1.5.8}
+% \date{2017/05/12}
+% \version{1.5.82}
 % \keywords{PDF, PDF/A, PDF/X, pdf\TeX, \LaTeX, Multilingual Metadata}
 % \author{C.\,V.\,Radhakrishnan, \Thanh, Ross~Moore {\upshape\small
 % and} Peter Selinger}
@@ -1882,6 +1884,7 @@
 % Several other `rebinding' commands are defined, mostly with package-loading options.
 %\begin{itemize}
 % \item |\LIIXUmapTeXnames| always defined
+% \item |\LIIXUscriptcommands| handles |\textsuperscript|, |\textsubscript|
 % \item |\LIIXUmaparabicletters| with |arbxmp|
 % \item |\LIIXUmapgreekletters| with |grkxmp| and |LGRxmp|
 % \item |\LIIXUmaplatinchars| and |\LIIXUcancelfontswitches| with |LATxmp|
@@ -2029,7 +2032,7 @@
 % the produced PDF. This is modified, using |\pdfxEnableCommands| in the |\jobname.xmpdata|
 % file, to just place a comma after the surname in the metadata, as it precedes the given name.
 %
-%\bigskip
+%\newpage\noindent
 % Another way that jobs can be customised using essentially the same \LaTeX\ source,
 % is via the command used to initiate the job. For example the file |sample.tex|,
 % accompanying the |pdfx| distribution, can be used to test the loading options to create
@@ -2050,14 +2053,16 @@
 % A default |\providecommand{\pdfxopt}{a-1b}| at the start of |sample.tex| catches the case
 % of normal typesetting, doing nothing when |\pdfxopt| already has an expansion value.
 % 
-%
+% \goodbreak
 % \subsection[Further Developments]{Further Developments}\label{ssec-further}
 %
 % Prospects for further development of the |pdfx| package are as follows, 
 % listed not necessarily in order of perceived importance.
 % \begin{itemize}
 %  \item
-%    Support for the |dvips| driver with Ghostscript as PDF producer.
+%    Support for the |dvips| driver with Ghostscript as PDF producer; possible since |gs v9.21|.
+%  \item
+%    Support for |Lang| specification in XMP Metadata.
 %  \item
 %    Separate the |L8U| encoding support into a separate package.
 %  \item
@@ -2750,9 +2755,7 @@
  \liixu@enableIeC
  \liixu@enablenumberline
  \def\empty{}% used in LICR patterns
- \let\sp\textsuperstring
- \let\sb\textsubstring
- \let\textsuperscript\dotextsuperscript
+ \LIIXUscriptcommands
  \LIIXUmapTeXnames
 %%  from Hyperref's  psdextra.def
  \csname psdmapshortnames\endcsname
@@ -3600,7 +3603,7 @@
 %% so save these for later reversion.
 %%
 \newif\ifpdf@activechars
-\ifcat ^^c0\active \pdf@activecharstrue\fi
+{\ifnum\catcode`^^c0 = 13\relax \aftergroup\pdf@activecharstrue\fi}%
 %%
 %% normally not used with XeTeX
 %%
diff --git a/Master/texmf-dist/tex/latex/pdfx/l8uenc.def b/Master/texmf-dist/tex/latex/pdfx/l8uenc.def
index 2e820abfd7e..ca216c92f8b 100644
--- a/Master/texmf-dist/tex/latex/pdfx/l8uenc.def
+++ b/Master/texmf-dist/tex/latex/pdfx/l8uenc.def
@@ -7,14 +7,16 @@
 %% pd1end.def, puenc.def, puvnenc.def and others,
 %% with extensions for more composite characters.
 %% 
-%% Copyright 2016 Ross Moore <ross.moore@mq.edu.au>
+%% Copyright 2017 Ross Moore <ross.moore@mq.edu.au>
 %%
 %% defines re-binding commands
 %%    \LIIXUmapmathspaces
 %%    \LIIXUmapmathletterlikes
+%%    \LIIXUmapTeXnames
+%%    \LIIXUscriptcommands
 %% 
 \ProvidesFile{l8uenc.def}
- [2016/03/18 v0.4
+ [2017/03/02 v0.5
      Custom LaTeX file, for UTF8 encoded letters and symbols]
 %\DeclareFontEncoding{L8U}{}{}
 
@@ -196,21 +198,30 @@
 \DeclareTextCompositeCommand{\textogonekcentered}{L8U}{\ }{ ̨}
 \DeclareTextCompositeCommand{\textroundcap}{L8U}{\ }{ ̑}
 
+%%  LaTeX in 2017 precludes direct use of
+%%    \textsuperscript  and  \textsubscript
+
+\def\LIIXUscriptcommands{%
+ \let\textsuperscript\dotextsuperscript
+ \let\textsubscript\dotextsubscript
+ \let\sp\textsuperstring
+ \let\sb\textsubstring
+}
 
 \DeclareTextCommand{\dotextsuperscript}{L8U}[1]{#1}
-\DeclareTextCommand{\textsubscript}{L8U}[1]{#1}
+\DeclareTextCommand{\dotextsubscript}{L8U}[1]{#1}
 \DeclareTextCommand{\textpalhookbelow}{L8U}[1]{#1̡}%
 
 
 \def\textsuperstring#1{\textsuper@ii#1\@empty\@empty}
 \def\textsuper@i#1{\textsuper@ii#1\@empty}
-\def\textsuper@ii#1#2\@empty{\textsuperscript{#1}%
+\def\textsuper@ii#1#2\@empty{\dotextsuperscript{#1}%
  \ifx\@empty#2\@empty\expandafter\@gobble
  \else\expandafter\textsuper@i\fi{#2}}
 
 \def\textsubstring#1{\textsub@ii#1\@empty\@empty}
 \def\textsub@i#1{\textsub@ii#1\@empty}
-\def\textsub@ii#1#2\@empty{\textsubscript{#1}%
+\def\textsub@ii#1#2\@empty{\dotextsubscript{#1}%
  \ifx\@empty#2\@empty\expandafter\@gobble
  \else\expandafter\textsub@i\fi{#2}}
 
@@ -297,9 +308,9 @@
 \DeclareTextCommand{\textplusminus}{L8U}{±}
 \DeclareTextCommand{\textpm}{L8U}{±}
 \DeclareTextCommand{\texttwosuperior}{L8U}{²}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{2}{²}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{2}{²}
 \DeclareTextCommand{\textthreesuperior}{L8U}{³}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{3}{³}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{3}{³}
 \DeclareTextCommand{\textasciiacute}{L8U}{´}
 \DeclareTextCommand{\textmu}{L8U}{µ}%  beware Greek
 \DeclareTextCommand{\textparagraph}{L8U}{¶}
@@ -309,7 +320,7 @@
 \DeclareTextCommand{\textcdot}{L8U}{·}
 \DeclareTextCommand{\textasciicedilla}{L8U}{¸}
 \DeclareTextCommand{\textonesuperior}{L8U}{¹}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{1}{¹}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{1}{¹}
 % see utf8.def (above)
 \DeclareTextCommand{\guillemotright}{L8U}{»}
 \DeclareTextCommand{\textonequarter}{L8U}{¼}
@@ -1160,59 +1171,59 @@
 %
 % Spacing modifiers  Ux02B0 – Ux02FF
 %
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{h}{ʰ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\texthth}{ʱ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{j}{ʲ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{r}{ʳ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\textturnr}{ʴ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\textturnrrtail}{ʵ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\textinvscr}{ʶ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{w}{ʷ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{y}{ʸ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{'}{ʹ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{"}{ʺ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{`}{ʻ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{'}{ʼ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{'}{ʽ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\rhook}{ʾ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\lhook}{ʿ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{?}{ˀ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{}{ˁ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{<}{˂}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{>}{˃}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{^}{˄}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\vee}{˅}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{h}{ʰ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\texthth}{ʱ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{j}{ʲ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{r}{ʳ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textturnr}{ʴ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textturnrrtail}{ʵ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textinvscr}{ʶ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{w}{ʷ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{y}{ʸ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{'}{ʹ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{"}{ʺ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{`}{ʻ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{'}{ʼ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{'}{ʽ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\rhook}{ʾ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\lhook}{ʿ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{?}{ˀ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{}{ˁ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{<}{˂}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{>}{˃}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{^}{˄}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\vee}{˅}
 \DeclareTextCompositeCommand{\^}{L8U}{\empty}{ˆ}
 \DeclareTextCompositeCommand{\v}{L8U}{\empty}{ˇ}
 \DeclareTextCommand{\textprimstress}{L8U}{ˈ}
 \DeclareTextCompositeCommand{\=}{L8U}{\empty}{ˉ}
 \DeclareTextCompositeCommand{\'}{L8U}{\empty}{ˊ}
 \DeclareTextCompositeCommand{\`}{L8U}{\empty}{ˋ}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{}{ˌ}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{}{ˌ}
 \DeclareTextCompositeCommand{\b}{L8U}{\empty}{ˍ}
 %\DeclareTextCompositeCommand{\b}{L8U}{h}{ˎ}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{h}{ˏ}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{ˏ}
 \DeclareTextCommand{\textlengthmark}{L8U}{ː}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{h}{ˑ}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{h}{˒}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{h}{˓}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{h}{˔}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{h}{˕}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{h}{˖}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{h}{˗}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{ˑ}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{˒}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{˓}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{˔}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{˕}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{˖}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{˗}
 \DeclareTextCompositeCommand{\u}{L8U}{\empty}{˘}
 \DeclareTextCompositeCommand{\.}{L8U}{\empty}{˙}
 \DeclareTextCompositeCommand{\r}{L8U}{\empty}{˚}
 \DeclareTextCompositeCommand{\k}{L8U}{\empty}{˛}
 \DeclareTextCompositeCommand{\~}{L8U}{\empty}{˜}
 \DeclareTextCompositeCommand{\H}{L8U}{\empty}{˝}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{h}{˞}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{h}{˟}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\gamma}{ˠ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{l}{ˡ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{s}{ˢ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{x}{ˣ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\textglotstop}{ˤ}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{˞}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{h}{˟}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\gamma}{ˠ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{l}{ˡ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{s}{ˢ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{x}{ˣ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textglotstop}{ˤ}
 \DeclareTextCompositeCommand{\texttone}{L8U}{5}{˥}
 \DeclareTextCompositeCommand{\texttone}{L8U}{4}{˦}
 \DeclareTextCompositeCommand{\texttone}{L8U}{3}{˧}
@@ -1223,23 +1234,23 @@
 %\DeclareTextCompositeCommand{\texttone}{L8U}{1}{ˬ}
 %\DeclareTextCompositeCommand{\texttone}{L8U}{1}{˭}
 %\DeclareTextCompositeCommand{\texttone}{L8U}{1}{ˮ}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{\vee}{˯}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{^}{˰}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{<}{˱}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{>}{˲}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{o}{˳}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\vee}{˯}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{^}{˰}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{<}{˱}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{>}{˲}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{o}{˳}
 %\DeclareTextCommand{\texttone}{L8U}{˴}
 %\DeclareTextCommand{\texttone}{L8U}{˵}
 %\DeclareTextCommand{\texttone}{L8U}{˶}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{~}{˷}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{~}{˷}
 %\DeclareTextCommand{????}{L8U}{1}{˸}
 %\DeclareTextCommand{\texttone}{L8U}{˹}
 %\DeclareTextCommand{\texttone}{L8U}{˺}
 %\DeclareTextCommand{\texttone}{L8U}{˻}
 %\DeclareTextCommand{\texttone}{L8U}{˼}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{??}{˽}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{??}{˾}
-%\DeclareTextCompositeCommand{\textsubscript}{L8U}{\larrow}{˿}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{??}{˽}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{??}{˾}
+%\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\larrow}{˿}
 
 
 %
@@ -1283,81 +1294,81 @@
 \DeclareTextCommand{\textscel}{L8U}{ᴫ}%* U+1D2B
 %
 % Ux1D2C – Ux1D6A
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{A}{ᴬ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\AE}{ᴭ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{B}{ᴮ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\B B}{ᴯ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{D}{ᴰ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{E}{ᴱ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\revE}{ᴲ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{G}{ᴳ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{H}{ᴴ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{I}{ᴵ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{J}{ᴶ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{K}{ᴷ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{L}{ᴸ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{M}{ᴹ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{N}{ᴺ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\revN}{ᴻ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{O}{ᴼ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\OU}{ᴽ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{P}{ᴾ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{R}{ᴿ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{T}{ᵀ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{U}{ᵁ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{W}{ᵂ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{a}{ᵃ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\textturna}{ᵄ}% ???
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\alpha}{ᵅ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\textinvae}{ᵆ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{b}{ᵇ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{d}{ᵈ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{e}{ᵉ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\schwa}{ᵊ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\texteopen}{ᵋ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\textrevepsilon}{ᵌ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{g}{ᵍ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{???}{ᵎ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{k}{ᵏ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{m}{ᵐ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\ng}{ᵑ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{o}{ᵒ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\textopeno}{ᵓ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{???}{ᵔ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{???}{ᵕ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{p}{ᵖ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{t}{ᵗ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{u}{ᵘ}
-%\DeclareTextCompositeCommand{\textsuperscript}{L8U}{???}{ᵙ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\textturnm}{ᵚ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{v}{ᵛ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\textain}{ᵜ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\beta}{ᵝ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\gamma}{ᵞ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\delta}{ᵟ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\phi}{ᵠ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\chi}{ᵡ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{A}{ᴬ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\AE}{ᴭ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{B}{ᴮ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\B B}{ᴯ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{D}{ᴰ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{E}{ᴱ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\revE}{ᴲ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{G}{ᴳ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{H}{ᴴ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{I}{ᴵ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{J}{ᴶ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{K}{ᴷ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{L}{ᴸ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{M}{ᴹ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{N}{ᴺ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\revN}{ᴻ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{O}{ᴼ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\OU}{ᴽ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{P}{ᴾ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{R}{ᴿ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{T}{ᵀ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{U}{ᵁ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{W}{ᵂ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{a}{ᵃ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textturna}{ᵄ}% ???
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\alpha}{ᵅ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textinvae}{ᵆ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{b}{ᵇ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{d}{ᵈ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{e}{ᵉ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\schwa}{ᵊ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\texteopen}{ᵋ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textrevepsilon}{ᵌ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{g}{ᵍ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{???}{ᵎ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{k}{ᵏ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{m}{ᵐ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\ng}{ᵑ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{o}{ᵒ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textopeno}{ᵓ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{???}{ᵔ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{???}{ᵕ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{p}{ᵖ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{t}{ᵗ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{u}{ᵘ}
+%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{???}{ᵙ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textturnm}{ᵚ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{v}{ᵛ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textain}{ᵜ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\beta}{ᵝ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\gamma}{ᵞ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\delta}{ᵟ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\phi}{ᵠ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\chi}{ᵡ}
 %
 \DeclareTextCommand{\textiinferior}{L8U}{ᵢ}%* U+1D62
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{i}{ᵢ}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{i}{ᵢ}
 \DeclareTextCommand{\textrinferior}{L8U}{ᵣ}%* U+1D63
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{r}{ᵣ}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{r}{ᵣ}
 \DeclareTextCommand{\textuinferior}{L8U}{ᵤ}%* U+1D64
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{u}{ᵤ}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{u}{ᵤ}
 \DeclareTextCommand{\textvinferior}{L8U}{ᵥ}%* U+1D65
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{v}{ᵥ}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{v}{ᵥ}
 \DeclareTextCommand{\textbetainferior}{L8U}{ᵦ}%* U+1D66
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{\beta}{ᵦ}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\beta}{ᵦ}
 \DeclareTextCommand{\textgammainferior}{L8U}{ᵧ}%* U+1D67
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{\gamma}{ᵧ}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\gamma}{ᵧ}
 \DeclareTextCommand{\textrhoinferior}{L8U}{ᵨ}%* U+1D68
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{\rho}{ᵨ}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\rho}{ᵨ}
 \DeclareTextCommand{\textphiinferior}{L8U}{ᵩ}%* U+1D69
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{\phi}{ᵩ}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\phi}{ᵩ}
 \DeclareTextCommand{\textchiinferior}{L8U}{ᵪ}%* U+1D6A
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{\chi}{ᵪ}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\chi}{ᵪ}
 %
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{H}{ᵸ}%  cyrillic en
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{H}{ᵸ}%  cyrillic en
 %
 \DeclareTextCommand{\textbarsci}{L8U}{ᵻ}%* U+1D7B
 \DeclareTextCommand{\textbarp}{L8U}{ᵽ}%* U+1D7D
@@ -1370,31 +1381,31 @@
 \DeclareTextCommand{\textPUrhookepsilon}{L8U}{ᶓ}% U+1D93
 \DeclareTextCommand{\textPUrhookopeno}{L8U}{ᶗ}% U+1D97
 %
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{c}{ᶜ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{c}{ᶜ}
 %
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{f}{ᶠ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{f}{ᶠ}
 %
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{g}{ᶢ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{g}{ᶢ}
 %
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\iota}{ᶥ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{I}{ᶦ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\iota}{ᶥ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{I}{ᶦ}
 %
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{L}{ᶫ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{L}{ᶫ}
 %
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{N}{ᶰ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{N}{ᶰ}
 %
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\phi}{ᶲ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\phi}{ᶲ}
 %
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\esh}{ᶴ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\esh}{ᶴ}
 %
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\upsilon}{ᶷ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\upsilon}{ᶷ}
 %
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{U}{ᶸ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{U}{ᶸ}
 %
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{z}{ᶻ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{z}{ᶻ}
 %
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\ezh}{ᶾ}
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{\theta}{ᶿ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\ezh}{ᶾ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\theta}{ᶿ}
 
 
 \fi  % end of \ifipaxmp
@@ -2033,91 +2044,91 @@
 % 
 
 \DeclareTextCommand{\textzerosuperior}{L8U}{⁰}%* U+2070
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{0}{⁰}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{0}{⁰}
 \DeclareTextCommand{\textisuperior}{L8U}{ⁱ}%* U+2071
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{i}{ⁱ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{i}{ⁱ}
 %
 \DeclareTextCommand{\textfoursuperior}{L8U}{⁴}%* U+2074
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{4}{⁴}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{4}{⁴}
 \DeclareTextCommand{\textfivesuperior}{L8U}{⁵}%* U+2075
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{5}{⁵}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{5}{⁵}
 \DeclareTextCommand{\textsixsuperior}{L8U}{⁶}%* U+2076
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{6}{⁶}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{6}{⁶}
 \DeclareTextCommand{\textsevensuperior}{L8U}{⁷}%* U+2077
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{7}{⁷}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{7}{⁷}
 \DeclareTextCommand{\texteightsuperior}{L8U}{⁸}%* U+2078
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{8}{⁸}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{8}{⁸}
 \DeclareTextCommand{\textninesuperior}{L8U}{⁹}%* U+2079
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{9}{⁹}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{9}{⁹}
 \DeclareTextCommand{\textplussuperior}{L8U}{⁺}%* U+207A
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{+}{⁺}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{+}{⁺}
 \DeclareTextCommand{\textminussuperior}{L8U}{⁻}%* U+207B
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{-}{⁻}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{-}{⁻}
 \DeclareTextCommand{\textequalsuperior}{L8U}{⁼}%* U+207C
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{=}{⁼}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{=}{⁼}
 \DeclareTextCommand{\textparenleftsuperior}{L8U}{⁽}%* U+207D
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{(}{⁽}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{(}{⁽}
 \DeclareTextCommand{\textparenrightsuperior}{L8U}{⁾}%* U+207E
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{)}{⁾}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{)}{⁾}
 \DeclareTextCommand{\textnsuperior}{L8U}{ⁿ}%* U+207F
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{n}{ⁿ}
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{n}{ⁿ}
 \DeclareTextCommand{\textzeroinferior}{L8U}{₀}%* U+2080
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{0}{₀}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{0}{₀}
 \DeclareTextCommand{\textoneinferior}{L8U}{₁}%* U+2081
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{1}{₁}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{1}{₁}
 \DeclareTextCommand{\texttwoinferior}{L8U}{₂}%* U+2082
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{2}{₂}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{2}{₂}
 \DeclareTextCommand{\textthreeinferior}{L8U}{₃}%* U+2083
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{3}{₃}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{3}{₃}
 \DeclareTextCommand{\textfourinferior}{L8U}{₄}%* U+2084
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{4}{₄}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{4}{₄}
 \DeclareTextCommand{\textfiveinferior}{L8U}{₅}%* U+2085
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{5}{₅}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{5}{₅}
 \DeclareTextCommand{\textsixinferior}{L8U}{₆}%* U+2086
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{6}{₆}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{6}{₆}
 \DeclareTextCommand{\textseveninferior}{L8U}{₇}%* U+2087
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{7}{₇}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{7}{₇}
 \DeclareTextCommand{\texteightinferior}{L8U}{₈}%* U+2088
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{8}{₈}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{8}{₈}
 \DeclareTextCommand{\textnineinferior}{L8U}{₉}%* U+2089
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{9}{₉}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{9}{₉}
 \DeclareTextCommand{\textplusinferior}{L8U}{₊}%* U+208A
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{+}{₊}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{+}{₊}
 \DeclareTextCommand{\textminusinferior}{L8U}{₋}%* U+208B
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{-}{₋}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{-}{₋}
 \DeclareTextCommand{\textequalsinferior}{L8U}{₌}%* U+208C
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{=}{₌}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{=}{₌}
 \DeclareTextCommand{\textparenleftinferior}{L8U}{₍}%* U+208D
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{(}{₍}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{(}{₍}
 \DeclareTextCommand{\textparenrightinferior}{L8U}{₎}%* U+208E
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{)}{₎}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{)}{₎}
 %
 \DeclareTextCommand{\textainferior}{L8U}{ₐ}%* U+2090
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{a}{ₐ}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{a}{ₐ}
 \DeclareTextCommand{\texteinferior}{L8U}{ₑ}%* U+2091
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{e}{ₑ}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{e}{ₑ}
 \DeclareTextCommand{\textoinferior}{L8U}{ₒ}%* U+2092
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{o}{ₒ}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{o}{ₒ}
 \DeclareTextCommand{\textxinferior}{L8U}{ₓ}%* U+2093
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{x}{ₓ}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{x}{ₓ}
 \DeclareTextCommand{\textschwainferior}{L8U}{ₔ}%* U+2094
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{\schwa}{ₔ}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\schwa}{ₔ}
 \DeclareTextCommand{\textHinferior}{L8U}{^^e2^^82^^95}%* U+2095
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{H}{^^e2^^82^^95}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{H}{^^e2^^82^^95}
 \DeclareTextCommand{\textKinferior}{L8U}{^^e2^^82^^96}%* U+2096
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{K}{^^e2^^82^^96}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{K}{^^e2^^82^^96}
 \DeclareTextCommand{\textLinferior}{L8U}{^^e2^^82^^97}%* U+2097
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{L}{^^e2^^82^^97}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{L}{^^e2^^82^^97}
 \DeclareTextCommand{\textMinferior}{L8U}{^^e2^^82^^98}%* U+2098
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{M}{^^e2^^82^^98}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{M}{^^e2^^82^^98}
 \DeclareTextCommand{\textNinferior}{L8U}{^^e2^^82^^99}%* U+2099
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{N}{^^e2^^82^^99}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{N}{^^e2^^82^^99}
 \DeclareTextCommand{\textPinferior}{L8U}{^^e2^^82^^9a}%* U+209A
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{P}{^^e2^^82^^9A}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{P}{^^e2^^82^^9A}
 \DeclareTextCommand{\textSinferior}{L8U}{^^e2^^82^^9b}%* U+209B
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{S}{^^e2^^82^^9B}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{S}{^^e2^^82^^9B}
 \DeclareTextCommand{\textTinferior}{L8U}{^^e2^^82^^9c}%* U+209C
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{T}{^^e2^^82^^9C}
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{T}{^^e2^^82^^9C}
 
 
 %
@@ -3200,8 +3211,8 @@
 \DeclareTextCommand{\textvarhexagon}{L8U}{⬡}%* U+2B21
 
 \DeclareTextCommand{\textjinferior}{L8U}{ⱼ}%* U+2C7C
-\DeclareTextCompositeCommand{\textsubscript}{L8U}{j}{ⱼ}%
-\DeclareTextCompositeCommand{\textsuperscript}{L8U}{V}{ⱽ}%
+\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{j}{ⱼ}%
+\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{V}{ⱽ}%
 
 \DeclareTextCommand{\textslashdiv}{L8U}{⸓}%* U+2E13
 \DeclareTextCommand{\textinterrobangdown}{L8U}{⸘}% U+2E18
diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfx.sty b/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
index 2917deca7a7..58412c70a33 100644
--- a/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
+++ b/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
@@ -545,9 +545,7 @@
  \liixu@enableIeC
  \liixu@enablenumberline
  \def\empty{}% used in LICR patterns
- \let\sp\textsuperstring
- \let\sb\textsubstring
- \let\textsuperscript\dotextsuperscript
+ \LIIXUscriptcommands
  \LIIXUmapTeXnames
 %%  from Hyperref's  psdextra.def
  \csname psdmapshortnames\endcsname
@@ -1395,7 +1393,7 @@
 %% so save these for later reversion.
 %%
 \newif\ifpdf@activechars
-\ifcat ^^c0\active \pdf@activecharstrue\fi
+{\ifnum\catcode`^^c0 = 13\relax \aftergroup\pdf@activecharstrue\fi}%
 %%
 %% normally not used with XeTeX
 %%