diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/pdfx/pdfx.pdf | bin | 2403770 -> 2412333 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/pdfx/sample.tex | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/pdfx/pdfx.dtx | 147 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/pdfx/pdfx.ins | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfx/l8ucyr.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfx/l8uenc.def | 654 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfx/l8ugrk.def | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfx/l8ulat.def | 9 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfx/l8umath.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfx/pdfx.sty | 101 |
10 files changed, 657 insertions, 274 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf b/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf Binary files differindex dc46f00a00c..1000559bf70 100644 --- a/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf +++ b/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf diff --git a/Master/texmf-dist/doc/latex/pdfx/sample.tex b/Master/texmf-dist/doc/latex/pdfx/sample.tex index 0186b5d7205..042f5dc1c24 100644 --- a/Master/texmf-dist/doc/latex/pdfx/sample.tex +++ b/Master/texmf-dist/doc/latex/pdfx/sample.tex @@ -1,6 +1,4 @@ -\pdfcompresslevel=0 -\pdfobjcompresslevel=0 -\providecommand{\pdfxopt}{a-1b,mathxmp} +\providecommand{\pdfxopt}{a-1b,allxmp,mathxmp} % XMP Metadata first \begin{filecontents*}{\jobname.xmpdata} \Title{Unicode: U₄(ℤ[1/√2, i]). — @@ -39,6 +37,7 @@ \usepackage[\pdfxopt]{pdfx} %\usepackage[LY1]{fontenc} \usepackage[OT1,T1]{fontenc} +\usepackage{textcomp,ptmxcomp,tipa,extraipa} %\listfiles \tracingstats=2 diff --git a/Master/texmf-dist/source/latex/pdfx/pdfx.dtx b/Master/texmf-dist/source/latex/pdfx/pdfx.dtx index 741f895fe0f..1a636a76814 100644 --- a/Master/texmf-dist/source/latex/pdfx/pdfx.dtx +++ b/Master/texmf-dist/source/latex/pdfx/pdfx.dtx @@ -19,7 +19,7 @@ % % \fi % -% \CheckSum{3857} +% \CheckSum{3939} % \iffalse % %<*driver> @@ -28,7 +28,7 @@ \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} +\Author{\CVR\sep \Thanh\sep Ross Moore\sep Peter Selinger} \Subject{This package supports generation of PDF/X-, PDF/A- and PDF/E-compliant documents, in most of their variants, using pdfLaTeX, LuaLaTeX and XeLaTeX.} \Keywords{PDF/X-, PDF/A- and PDF/E-compliance\sep Multilingual Metadata\sep installation\sep \TeX Live \thisyear} \PublicationType{manual} @@ -36,10 +36,10 @@ \Copyrighted{False} \CopyrightURL{http://tug.org/texlive/} \CoverDisplayDate{May \thisyear} -\CoverDate{\thisyear-05-03} +\CoverDate{\thisyear-05-17} \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\CVR{C.V. Radhakrishnan}\def\Thanh{H\`an Th\eee Thanh}% \def\eee{^^c3^^aa^^cc^^81 }} \end{filecontents*} \documentclass[a4paper]{ltxdoc} @@ -48,7 +48,7 @@ \usepackage{graphicx} \usepackage[T1]{fontenc} \hypersetup{citecolor=blue} -\EnableCrossrefs +\EnableCrossrefs \CodelineIndex \RecordChanges \begin{document} @@ -131,13 +131,16 @@ % 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.}% +% commands; incl. \texttt{\textbackslash textsuperscript} and others.}% +% \changes{v1.5.83}{2017/05/16}{Improved support for XeLaTeX and LuaLaTeX.}% +% \changes{v1.5.84}{2017/05/18}{Fully expand options for hyperref. Better support for +% extended IPA letters and modifiers. Adjusted release versions and dates.}% % \title{Generation of PDF/X- and PDF/A-compliant PDFs % with pdf\TeX{} --- \texttt{pdfx.sty}} -% \date{2017/05/12} -% \version{1.5.82} +% \date{2017/05/18} +% \version{1.5.84} % \keywords{PDF, PDF/A, PDF/X, pdf\TeX, \LaTeX, Multilingual Metadata} -% \author{C.\,V.\,Radhakrishnan, \Thanh, Ross~Moore {\upshape\small +% \author{C.\,V.\,Radhakrishnan, \Thanh, Ross Moore {\upshape\small % and} Peter Selinger} % \contact{\texttt{[cvr,thanh]@river-valley.org},\\% % \texttt{ross.moore@mq.edu.au}, \texttt{selinger@mathstat.dal.ca}\hss} @@ -157,7 +160,7 @@ % As of \TeX\,Live 2016 it now also works with Lua\LaTeX\ and Xe\LaTeX, % when using appropriate command-line options\footnote{% % The required invokation is:\quad -% |xelatex --shell-escape -output-driver="xdvipdfmx -z 0" <filename>.tex |}, but +% |xelatex --shell-escape <filename>.tex |}, but % with some limitations --- see Sections~\ref{sssec-xetex} and \ref{sssec-luatex}. % By `supports', we mean that the package provides correct and sufficient % means to declare that a document conforms with a stated PDF variant @@ -370,6 +373,8 @@ % \item |noBOM|: do not generate the optional byte-order marker. (default) % \item |noerr|: avoids stopping when making PDF/X with an RGB profile, % and at other unusual situations. +% \item |pdf12|: use PDF 1.2, overriding the version specified by the +% applicable standard.\\This may produce a non-standard-conforming PDF file. % \item |pdf13|: use PDF 1.3, overriding the version specified by the % applicable standard.\\This may produce a non-standard-conforming PDF file. % \item |pdf14|: use PDF 1.4, overriding the version specified by the @@ -407,11 +412,12 @@ % and |Ux1D00|--|Ux1DFF| % \item |mathxmp|: mathematical letters, symbols, operators % arrows, alphanumeric forms. -% \item |allxmp|: all of the above, as well as those listed next. +% \item |allxmp|: all of the above, as well as those listed next; +% used primarily for testing compatibility with other packages. % \end{itemize} % The characters supported by these options include those supported % by |hyperref.sty| via the |PDFdoc| encodings (|PD1| and |PU|) -% for inclusion in PDF files. Extra supported is provided for math +% for inclusion in PDF files. Extra support is provided for math % alphabets. For Armenian, the macros defined by Arm\TeX\ are supported. % % \medskip @@ -882,7 +888,7 @@ % \subsection{Limitations and dependencies} % % The |pdfx.sty| package works with \pdftex\ and also Lua\TeX\ and Xe\TeX\ -% with some limitations. +% with some minor limitations. % It further depends on the following other packages. % \begin{enumerate} % \item |xmpincl| for insertion of metadata into PDF. @@ -946,7 +952,7 @@ % validate to a particular PDF standard, one need to use a command % to run the \TeX\ engine, as follows. % \begin{decl}[] -% |xelatex -shell-escape -output-driver="xdvipdfmx -z 0" <filename>.tex | +% |xelatex -shell-escape <filename>.tex | % \end{decl} % The |-shell-escape| option allows a command-line task to be run, % which writes the creation-date \& time of the running job into @@ -957,14 +963,6 @@ % this need for |-shell-escape| must be viewed as imposing a limitation on the % work-flows in which this can be safely used. % -% More severe is the need for the |-z 0| output-driver option, which disables -% all compression in the final PDF output. -% This is needed since all the PDF standards require the XMP metadata -% packet to be present as uncompressed plain text, in UTF-8 format. -% The only way to achieve this with Xe\LaTeX\ is for no compression being -% used at all by the |xdvipdfmx| driver program. The result can be file sizes -% more than $10\times$ what is produced by \TeX\ engines using compression. -% % Xe\TeX\ is designed for processing UTF-8 input only. When presented % with a \LaTeX\ source using a legacy encoding, such as |latin2| or |koi8-r|, % the input is accepted and a PDF produced. Yet there will be garbage @@ -1541,7 +1539,7 @@ % |\textaristerikeraia\textalpha\textsampi\textqoppa\textzeta\textdexiakeraia| % \end{decl} % The corresponding trick does not work with |\Greeknumeral|, but the uppercasing -% can be done by manually from the string obtained using |\greeknumeral|, +% can be done manually from the string obtained using |\greeknumeral|, % \begin{decl}[] % |\textaristerikeraia\textAlpha\textSampi\textQoppa\textZeta\textdexiakeraia| % \end{decl} @@ -1884,7 +1882,8 @@ % Several other `rebinding' commands are defined, mostly with package-loading options. %\begin{itemize} % \item |\LIIXUmapTeXnames| always defined -% \item |\LIIXUscriptcommands| handles |\textsuperscript|, |\textsubscript| +% \item |\LIIXUscriptcommands| handles |\textsuperscript|, |\textsubscript|, |\t| +% \item |\LIIXUtipacommands| handles IPA letters and symbols % \item |\LIIXUmaparabicletters| with |arbxmp| % \item |\LIIXUmapgreekletters| with |grkxmp| and |LGRxmp| % \item |\LIIXUmaplatinchars| and |\LIIXUcancelfontswitches| with |LATxmp| @@ -2241,7 +2240,7 @@ }{}% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfx} - [2016/05/03 v1.5.8 PDF/X and PDF/A support (CVR/HTH/RRM/PS)] + [2017/05/18 v1.5.84 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 @@ -2374,6 +2373,7 @@ \global\pdfminorversion=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 } @@ -2437,10 +2437,14 @@ \global\vnmxmptrue \global\latEXTxmptrue \global\latLATxmptrue + \global\vnmxmptrue \global\ipaxmptrue \global\mathxmptrue + \global\let\pdfx@useactivespacestrue\pdfx@useactivespacesfalse } +\newif\ifpdfx@useactivespaces + \ExecuteOptions{noBOM,a-1b} \ProcessOptions @@ -2460,7 +2464,6 @@ \ifarmSCIxmp\pdfx@nopdfinfotrue \fi\fi\fi\fi\fi -\newif\ifpdfx@useactivespaces \iflatLATxmp\pdfx@useactivespacestrue\fi \ifgrkLGRxmp\pdfx@useactivespacestrue\fi \ifcyrKOIxmp\pdfx@useactivespacestrue\fi @@ -2592,14 +2595,14 @@ \fi \fi -\ifluatex\else +\ifluatex\else\ifxetex\else \@ifpackageloaded{inputenc}{% }{% \RequirePackage{inputenc} % allow this to be loaded again cleanly \expandafter\let\csname ver@inputenc.sty\endcsname\relax } -\fi +\fi\fi %% pseudo-declare the L8U encoding \expandafter\let\csname L8U-cmd\expandafter\endcsname\csname OT1-cmd\endcsname @@ -2756,6 +2759,7 @@ \liixu@enablenumberline \def\empty{}% used in LICR patterns \LIIXUscriptcommands + \LIIXUtipacommands \LIIXUmapTeXnames %% from Hyperref's psdextra.def \csname psdmapshortnames\endcsname @@ -2874,12 +2878,12 @@ \PackageWarning{pdfx}{% CreationDate is not properly supported;^^J PDF validation may fail. To avoid this problem use:^^J - xelatex -shell-escape -output-driver="xdvipdfmx -z 0" <filename>^^J} + xelatex -shell-escape <filename>^^J} \else \PackageError{pdfx}{% CreationDate is not properly supported;^^J PDF validation may fail.}{To avoid this problem use:^^J - xelatex -shell-escape -output-driver="xdvipdfmx -z 0" <filename> } + xelatex -shell-escape <filename> } \fi \fi \fi @@ -2942,74 +2946,74 @@ %% the "pdftex" option seems to work fine with LuaTeX %% Hyperref options for PDF/X -\def\pdfx@pdfX@opts@pdftex{% +\edef\pdfx@pdfX@opts@pdftex{% draft,pdftex,pdfpagemode=UseNone,bookmarks=false,% pdfversion=1.\thepdfminorversion,pdfstartview=} -\def\pdfx@pdfX@opts@xetex{% +\edef\pdfx@pdfX@opts@xetex{% draft,xetex,pdfpagemode=UseNone,bookmarks=false,% pdfversion=1.\thepdfminorversion,pdfstartview=} -\def\pdfx@pdfX@opts@luatex{% - draft,pdftex,pdfpagemode=UseNone,bookmarks=false,% +\edef\pdfx@pdfX@opts@luatex{% + draft,luatex,pdfpagemode=UseNone,bookmarks=false,% pdfversion=1.\thepdfminorversion,pdfstartview=} %% Hyperref options for PDF/A and PDF/E -\def\pdfx@pdfAE@opts@pdftex{pdftex,pdfa,pdfversion=1.\thepdfminorversion}% -\def\pdfx@pdfAE@opts@xetex{xetex,pdfa,pdfversion=1.\thepdfminorversion}% -\def\pdfx@pdfAE@opts@luatex{pdftex,pdfa,pdfversion=1.\thepdfminorversion}% +\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}% \ifpdfx@x \@ifpackageloaded{hyperref}{% \ifxetex - \hypersetup{\pdfx@pdfX@opts@xetex} + \expandafter\hypersetup\expandafter{\pdfx@pdfX@opts@xetex} \else\ifluatex - \hypersetup{\pdfx@pdfX@opts@luatex} + \expandafter\hypersetup\expandafter{\pdfx@pdfX@opts@luatex} \else - \hypersetup{\pdfx@pdfX@opts@pdftex} + \expandafter\hypersetup\expandafter{\pdfx@pdfX@opts@pdftex} \fi\fi }{% \ifxetex - \RequirePackage[\pdfx@pdfX@opts@xetex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfX@opts@xetex]{hyperref} \else\ifluatex - \RequirePackage[\pdfx@pdfX@opts@luatex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfX@opts@luatex]{hyperref} \else - \RequirePackage[\pdfx@pdfX@opts@pdftex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfX@opts@pdftex]{hyperref} \fi\fi }% \else \ifpdfx@e \@ifpackageloaded{hyperref}{% \ifxetex - \hypersetup{\pdfx@pdfAE@opts@xetex} + \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@xetex} \else\ifluatex - \hypersetup{\pdfx@pdfAE@opts@luatex} + \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@luatex} \else - \hypersetup{\pdfx@pdfAE@opts@pdftex} + \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@pdftex} \fi\fi }{% \ifxetex - \RequirePackage[\pdfx@pdfAE@opts@xetex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@xetex]{hyperref} \else\ifluatex - \RequirePackage[\pdfx@pdfAE@opts@luatex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@luatex]{hyperref} \else - \RequirePackage[\pdfx@pdfAE@opts@pdftex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@pdftex]{hyperref} \fi\fi }% \else % generating PDF/A or ... \@ifpackageloaded{hyperref}{% \ifxetex - \hypersetup{\pdfx@pdfAE@opts@xetex}% + \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@xetex}% \else\ifluatex - \hypersetup{\pdfx@pdfAE@opts@luatex}% + \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@luatex}% \else - \hypersetup{\pdfx@pdfAE@opts@pdftex}% + \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@pdftex}% \fi\fi }{% \ifxetex - \RequirePackage[\pdfx@pdfAE@opts@xetex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@xetex]{hyperref} \else\ifluatex - \RequirePackage[\pdfx@pdfAE@opts@luatex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@luatex]{hyperref} \else - \RequirePackage[\pdfx@pdfAE@opts@pdftex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@pdftex]{hyperref} \fi\fi }% \fi\fi @@ -3018,6 +3022,11 @@ \hypersetup{psdextra} \fi +%% hyperref doesn't set the minor version for XeTeX +\ifxetex + \special{pdf:minorversion \thepdfminorversion} +\fi + \ifx\xmp@CreatorTool\@empty \edef\xmp@CreatorTool{\@pdfcreator} \fi @@ -3588,9 +3597,9 @@ \global\let#1\empty \else \begingroup - \ifluatex\else + \ifluatex\else\ifxetex\else \inputencoding{utf8}% - \fi + \fi\fi \hypersetup{pdfencoding=auto}% \pdfstringdef#1{#2}% \endgroup @@ -3932,6 +3941,30 @@ \let\includexmp\pdfx@xmpincl@xetex \fi +%% macro provided by Leonardo E. Segovia on 2007-05-15 +%% <leonardo.segovia@cs.uns.edu.ar> +\def\pdfx@xmpincl@luatex#1{% + \IfFileExists{#1.xmp}{% + \mcs@xmpincl@patchFile{#1}% + \begingroup + \pdfcompresslevel=0 + \immediate\pdfobj uncompressed stream attr {/Type /Metadata /Subtype /XML} + file{#1.xmpi}% + \pdfcatalog{/Metadata \the\pdflastobj\space 0 R}% + \endgroup + }{% + \newcommand{\mcs@xmpincl@filename}{#1.xmp}% + \PackageError{xmpincl}% + {The file \mcs@xmpincl@filename\space was not found}% + {The file \mcs@xmpincl@filename\space The metadata file + wasn't found.\MessageBreak Oops.}% + } +} +\ifluatex + \let\includexmp\pdfx@xmpincl@luatex +\fi + + %%---------------------------------------------------------------------- \begingroup \ifpdfx@x diff --git a/Master/texmf-dist/source/latex/pdfx/pdfx.ins b/Master/texmf-dist/source/latex/pdfx/pdfx.ins index e4a8eee433e..b62eafff473 100644 --- a/Master/texmf-dist/source/latex/pdfx/pdfx.ins +++ b/Master/texmf-dist/source/latex/pdfx/pdfx.ins @@ -4,7 +4,7 @@ \preamble - Copyright (c) 2015, CV Radhakrishnan <cvr@river-valley.org>, + Copyright (c) 2017, 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> diff --git a/Master/texmf-dist/tex/latex/pdfx/l8ucyr.def b/Master/texmf-dist/tex/latex/pdfx/l8ucyr.def index 2418389b040..06e6524fa46 100644 --- a/Master/texmf-dist/tex/latex/pdfx/l8ucyr.def +++ b/Master/texmf-dist/tex/latex/pdfx/l8ucyr.def @@ -6,10 +6,10 @@ %% 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 2017 Ross Moore <ross.moore@mq.edu.au> %% \ProvidesFile{l8ucyr.def} - [2016/03/18 v0.4 + [2017/05/18 v0.5 Cyrillic support for UTF8 in XMP metadata] % @@ -25,6 +25,7 @@ \DeclareTextCommand{\CYRdasia}{L8U}[1]{#1҅}% \DeclareTextCommand{\CYRpsili}{L8U}[1]{#1҆}% \DeclareTextCommand{\CYRpokrytie}{L8U}[1]{#1҇}% +\DeclareTextCommand{\CYRSDSC}{L8U}[1]{#1̧}% \DeclareTextCommand{\cyrlegion}{L8U}[1]{#1҈}% \DeclareTextCommand{\cyrleodr}{L8U}[1]{#1҉}% % @@ -296,7 +297,6 @@ %%\DeclareTextCompositeCommand{\c}{L8U}{С}{Ҫ} \DeclareTextCompositeCommand{\k}{L8U}{\CYRS}{Ҫ}% PD1 %%\DeclareTextCompositeCommand{\k}{L8U}{С}{Ҫ}% PD1 -\DeclareTextCommand{\CYRSDSC}{L8U}{Ҫ} \DeclareTextCompositeCommand{\c}{L8U}{\cyrs}{ҫ} %%\DeclareTextCompositeCommand{\k}{L8U}{с}{ҫ}% PD1 \DeclareTextCompositeCommand{\k}{L8U}{\cyrs}{ҫ}% PD1 diff --git a/Master/texmf-dist/tex/latex/pdfx/l8uenc.def b/Master/texmf-dist/tex/latex/pdfx/l8uenc.def index ca216c92f8b..92b1be827fa 100644 --- a/Master/texmf-dist/tex/latex/pdfx/l8uenc.def +++ b/Master/texmf-dist/tex/latex/pdfx/l8uenc.def @@ -14,9 +14,10 @@ %% \LIIXUmapmathletterlikes %% \LIIXUmapTeXnames %% \LIIXUscriptcommands +%% \LIIXUtipacommands %% \ProvidesFile{l8uenc.def} - [2017/03/02 v0.5 + [2017/03/18 v0.7 Custom LaTeX file, for UTF8 encoded letters and symbols] %\DeclareFontEncoding{L8U}{}{} @@ -51,20 +52,27 @@ {#2#4}% {#3#4#5}% } +\gdef\liixu@swapnexttokens#1#2{% + % #1 = input token + % #2 = macro to continue parsing + #2{#1}} \DeclareTextCommand{\textTeX}{L8U}{TeX} \DeclareTextCommand{\textLaTeX}{L8U}{LaTeX} +\DeclareTextCommand{\textLaTeXe}{L8U}{LaTeXe}% \DeclareTextCommand{\textXeTeX}{L8U}{XeTeX}%{XɘTeX}{XƎTEX} \DeclareTextCommand{\textLuaTeX}{L8U}{LuaTeX} \def\LIIXUmapTeXnames{% \let\TeX\textTeX \let\LaTeX\textLaTeX + \let\LaTeXe\textLaTeXe \let\XeTeX\textXeTeX \let\LuaTeX\textLuaTeX } -% Combining accents and diacritics Ux0300 – Ux 036F + +% Combining accents and diacritics Ux0300 – Ux036F %\DeclareTextCommand{\uc@cmb}{L8U}{}% used by ucs.sty @@ -73,6 +81,7 @@ \DeclareTextCommand{\^}{L8U}[1]{#1̂} \DeclareTextCommand{\~}{L8U}[1]{#1̃} \DeclareTextCommand{\=}{L8U}[1]{#1̄} +\DeclareTextCommand{\dotextoverline}{L8U}[1]{#1̅}% % \DeclareTextCommand{\u}{L8U}[1]{#1̆} \DeclareTextCommand{\.}{L8U}[1]{#1̇} @@ -89,24 +98,31 @@ \DeclareTextCommand{\G}{L8U}[1]{#1̏}% double-grave accent \DeclareTextCommand{\textdotbreve}{L8U}[1]{#1̐} \DeclareTextCommand{\textroundcap}{L8U}[1]{#1̑} -% +\DeclareTextCommand{\textinvbreve}{L8U}[1]{#1̑} +\DeclareTextCommand{\textturncommaabove}{L8U}[1]{#1̒} +\DeclareTextCommand{\textcommaabove}{L8U}[1]{#1̒} +\DeclareTextCommand{\textrevcommaabove}{L8U}[1]{#1̔} +\DeclareTextCommand{\textcommaabover}{L8U}[1]{#1̕} \DeclareTextCommand{\textsubgrave}{L8U}[1]{#1̖} \DeclareTextCommand{\textsubacute}{L8U}[1]{#1̗} \DeclareTextCommand{\textsubadvancing}{L8U}[1]{#1̘} \DeclareTextCommand{\textsubretracting}{L8U}[1]{#1̙} -% +\DeclareTextCommand{\textlangleabove}{L8U}[1]{#1̚} +\DeclareTextCommand{\textrighthorn}{L8U}[1]{#1̛} \DeclareTextCommand{\textsublhalfring}{L8U}[1]{#1̜} \DeclareTextCommand{\textraising}{L8U}[1]{#1̝} \DeclareTextCommand{\textlowering}{L8U}[1]{#1̞} \DeclareTextCommand{\textsubplus}{L8U}[1]{#1̟} -\DeclareTextCommand{\textsubbar}{L8U}[1]{#1̠} +\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{\textsubdot}{L8U}[1]{#1̣} \DeclareTextCommand{\d}{L8U}[1]{#1̣} \DeclareTextCommand{\textsubumlaut}{L8U}[1]{#1̤} \DeclareTextCommand{\textsubring}{L8U}[1]{#1̥} -% \DeclareTextCommand{\textcommabelow}{L8U}[1]{#1̦} \DeclareTextCommand{\c}{L8U}[1]{#1̧} \DeclareTextCommand{\textpolhook}{L8U}[1]{#1̨} @@ -120,32 +136,58 @@ \DeclareTextCommand{\textsubbreve}{L8U}[1]{#1̮} \DeclareTextCommand{\textsubarch}{L8U}[1]{#1̯} \DeclareTextCommand{\textsubtilde}{L8U}[1]{#1̰} +\DeclareTextCommand{\textsubbar}{L8U}[1]{#1̱} %\DeclareTextCommand{\textsubmacron}{L8U}[1]{#1̱} \DeclareTextCommand{\b}{L8U}[1]{#1̱} -% +\DeclareTextCommand{\textsubdoublebar}{L8U}[1]{#1͇} \DeclareTextCommand{\textsuperimposetilde}{L8U}[1]{#1̴} \DeclareTextCommand{\B}{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{\textinvsubbridge}{L8U}[1]{#1̺} \DeclareTextCommand{\textsubsquare}{L8U}[1]{#1̻} \DeclareTextCommand{\textseagull}{L8U}[1]{#1̼} \DeclareTextCommand{\textovercross}{L8U}[1]{#1̽} -% +%\DeclareTextCommand{\textverticaltilde}{L8U}[1]{#1̾} +\DeclareTextCommand{\textdoubleoverline}{L8U}[1]{#1̿} +% Ux0340 – Ux034F %\DeclareTextCommand{\textdasia}{L8U}[1]{#1̀}% see greek %\DeclareTextCommand{\textoxia}{L8U}[1]{#1́}% see greek %\DeclareTextCommand{\textperispomeni}{L8U}[1]{#1͂}% see greek %\DeclareTextCommand{\textdialytikatonos}{L8U}[1]{#1̈́}% see greek -\DeclareTextCommand{\textogonekcentered}{L8U}[1]{#1̨} -\DeclareTextCommand{\overbridge}{L8U}[1]{#1͆} -\DeclareTextCommand{\subdoublebar}{L8U}[1]{#1͇} -\DeclareTextCommand{\subdoublevert}{L8U}[1]{#1͈} -\DeclareTextCommand{\subcorner}{L8U}[1]{#1͉} -\DeclareTextCommand{\crtilde}{L8U}[1]{#1͊} -\DeclareTextCommand{\dottedtilde}{L8U}[1]{#1͋} -\DeclareTextCommand{\doubletilde}{L8U}[1]{#1͌} -\DeclareTextCommand{\spreadlips}{L8U}[1]{#1͍} -\DeclareTextCommand{\whistle}{L8U}[1]{#1͎} +\DeclareTextCommand{\textogonekcentered}{L8U}[1]{#1̨}% Ux0345 +\DeclareTextCommand{\textoverbridge}{L8U}[1]{#1͆} +\DeclareTextCommand{\textsubdoublevert}{L8U}[1]{#1͈} +\DeclareTextCommand{\textsubcorner}{L8U}[1]{#1͉} +\DeclareTextCommand{\textcrtilde}{L8U}[1]{#1͊} +\DeclareTextCommand{\textdottedtilde}{L8U}[1]{#1͋} +\DeclareTextCommand{\textdoubletilde}{L8U}[1]{#1͌} +\DeclareTextCommand{\textspreadlips}{L8U}[1]{#1͍} +\DeclareTextCommand{\textwhistle}{L8U}[1]{#1͎} +\DeclareTextCommand{\textgraphemejoin}{L8U}[1]{#1͏}% Ux034F (invisible) +% Ux0350 – Ux0362 +\DeclareTextCommand{\textrightarrowhead}{L8U}[1]{#1͐} +\DeclareTextCommand{\textlefthalfring}{L8U}[1]{#1͑} +%\DeclareTextCommand{\textfermata}{L8U}[1]{#1͒}% see greek ??? +%\DeclareTextCommand{\textsubx}{L8U}[1]{#1͓} +\DeclareTextCommand{\textsublptr}{L8U}[1]{#1͔} +\DeclareTextCommand{\textsubrptr}{L8U}[1]{#1͕} +\DeclareTextCommand{\textrightuparrowhead}{L8U}[1]{#1͖} +\DeclareTextCommand{\textrighthalfring}{L8U}[1]{#1͗} +%\DeclareTextCommand{\textdotabove}{L8U}[1]{#1͘} +%\DeclareTextCommand{\textsubstar}{L8U}[1]{#1͙} +%\DeclareTextCommand{\textsubinfty}{L8U}[1]{#1͚} +%\DeclareTextCommand{\textzigzagabove}{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{\dotexttie}{L8U}[1]{#1͡} +\DeclareTextCommand{\textsliding}{L8U}[1]{#1͢} +% Ux0363 – Ux036F % @@ -154,63 +196,169 @@ \DeclareTextCompositeCommand{\'}{L8U}{\@empty}{´} \DeclareTextCompositeCommand{\^}{L8U}{\@empty}{^} \DeclareTextCompositeCommand{\~}{L8U}{\@empty}{˜} +\DeclareTextCompositeCommand{\=}{L8U}{\@empty}{ ̄} +\DeclareTextCompositeCommand{\dotextoverline}{L8U}{\@empty}{¯}% +\DeclareTextCompositeCommand{\u}{L8U}{\@empty}{˘} +\DeclareTextCompositeCommand{\.}{L8U}{\@empty}{˙} \DeclareTextCompositeCommand{\"}{L8U}{\@empty}{¨} -\DeclareTextCompositeCommand{\H}{L8U}{\@empty}{˝} +\DeclareTextCompositeCommand{\m}{L8U}{\@empty}{ ̉} \DeclareTextCompositeCommand{\r}{L8U}{\@empty}{˚} +\DeclareTextCompositeCommand{\H}{L8U}{\@empty}{˝} \DeclareTextCompositeCommand{\v}{L8U}{\@empty}{ˇ} -\DeclareTextCompositeCommand{\u}{L8U}{\@empty}{˘} -\DeclareTextCompositeCommand{\.}{L8U}{\@empty}{˙} -\DeclareTextCompositeCommand{\=}{L8U}{\@empty}{¯} +\DeclareTextCompositeCommand{\textvbaraccent}{L8U}{\@empty}{ ̍} +\DeclareTextCompositeCommand{\textdoublevbaraccent}{L8U}{\@empty}{ ̎} +\DeclareTextCompositeCommand{\G}{L8U}{\@empty}{ ̏} \DeclareTextCompositeCommand{\b}{L8U}{\@empty}{_} \DeclareTextCompositeCommand{\c}{L8U}{\@empty}{¸} \DeclareTextCompositeCommand{\d}{L8U}{\@empty}{.} \DeclareTextCompositeCommand{\k}{L8U}{\@empty}{˛} -\DeclareTextCompositeCommand{\`}{L8U}{\ }{`} -\DeclareTextCompositeCommand{\'}{L8U}{\ }{´} -\DeclareTextCompositeCommand{\^}{L8U}{\ }{^} -\DeclareTextCompositeCommand{\~}{L8U}{\ }{˜} -\DeclareTextCompositeCommand{\"}{L8U}{\ }{¨} -\DeclareTextCompositeCommand{\H}{L8U}{\ }{˝} -\DeclareTextCompositeCommand{\r}{L8U}{\ }{˚} -\DeclareTextCompositeCommand{\v}{L8U}{\ }{ˇ} -\DeclareTextCompositeCommand{\u}{L8U}{\ }{˘} -\DeclareTextCompositeCommand{\.}{L8U}{\ }{˙} -\DeclareTextCompositeCommand{\=}{L8U}{\ }{¯} + +\DeclareTextCompositeCommand{\`}{L8U}{\ }{`}% Ux0300 +\DeclareTextCompositeCommand{\'}{L8U}{\ }{´}% Ux0301 +\DeclareTextCompositeCommand{\^}{L8U}{\ }{^}% Ux0302 +\DeclareTextCompositeCommand{\~}{L8U}{\ }{˜}% Ux0303 +\DeclareTextCompositeCommand{\=}{L8U}{\ }{ ̄}% Ux0304 +\DeclareTextCompositeCommand{\dotextoverline}{L8U}{\ }{¯}% Ux0305 +\DeclareTextCompositeCommand{\u}{L8U}{\ }{˘}% Ux0306 +\DeclareTextCompositeCommand{\.}{L8U}{\ }{˙}% Ux0307 +\DeclareTextCompositeCommand{\"}{L8U}{\ }{¨}% Ux0308 +\DeclareTextCompositeCommand{\m}{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{\textdotbreve}{L8U}{\ }{ ̐}% Ux0310 +\DeclareTextCompositeCommand{\textroundcap}{L8U}{\ }{ ̑}% Ux0311 + \DeclareTextCompositeCommand{\b}{L8U}{\ }{_} \DeclareTextCompositeCommand{\c}{L8U}{\ }{¸} \DeclareTextCompositeCommand{\d}{L8U}{\ }{.} \DeclareTextCompositeCommand{\k}{L8U}{\ }{˛} -\DeclareTextCompositeCommand{\t}{L8U}{\@empty}{ ͡} -\DeclareTextCompositeCommand{\t}{L8U}{\ }{ ͡} \DeclareTextCompositeCommand{\B}{L8U}{\@empty}{ ̵} \DeclareTextCompositeCommand{\B}{L8U}{\ }{ ̵} -\DeclareTextCompositeCommand{\m}{L8U}{\@empty}{ ̉} -\DeclareTextCompositeCommand{\m}{L8U}{\ }{ ̉} +%\DeclareTextCompositeCommand{\m}{L8U}{\@empty}{ ̉} +%\DeclareTextCompositeCommand{\m}{L8U}{\ }{ ̉} \DeclareTextCompositeCommand{\M}{L8U}{\@empty}{ ̢} \DeclareTextCompositeCommand{\M}{L8U}{\ }{ ̢} -\DeclareTextCompositeCommand{\G}{L8U}{\@empty}{ ̏} -\DeclareTextCompositeCommand{\G}{L8U}{\ }{ ̏} +%\DeclareTextCompositeCommand{\G}{L8U}{\@empty}{ ̏} +%\DeclareTextCompositeCommand{\G}{L8U}{\ }{ ̏} + +\DeclareTextCompositeCommand{\dotexttie}{L8U}{\@empty}{ ͡} +\DeclareTextCompositeCommand{\dotexttie}{L8U}{\ }{ ͡} + + +\DeclareTextCommand{\dotextsuperscript}{L8U}[1]{#1} +\DeclareTextCommand{\dotextsubscript}{L8U}[1]{#1} + \DeclareTextCommand{\textgravemacron}{L8U}[1]{#1̄̀} \DeclareTextCommand{\textacutemacron}{L8U}[1]{#1̄́} \DeclareTextCompositeCommand{\textogonekcentered}{L8U}{\ }{ ̨} \DeclareTextCompositeCommand{\textroundcap}{L8U}{\ }{ ̑} +\DeclareTextCompositeCommand{\textroundcap}{L8U}{\@empty}{ ̑} + +% Ux1DC0 – Ux1DCA +\DeclareTextCommand{\textmacronacute}{L8U}[1]{#1᷄}% Ux1DC4 +\DeclareTextCommand{\textgravemacron}{L8U}[1]{#1᷅}% Ux1DC5 +\DeclareTextCommand{\textmacrongrave}{L8U}[1]{#1᷆}% Ux1DC6 +\DeclareTextCommand{\textacutemacron}{L8U}[1]{#1᷇}% Ux1DC7 +\DeclareTextCommand{\textgraveacutegrave}{L8U}[1]{#1᷈}% Ux1DC8 +\DeclareTextCommand{\textacutegraveacute}{L8U}[1]{#1᷉}% Ux1DC9 +% +\DeclareTextCommand{\textoverw}{L8U}[1]{#1ᷓ}% Ux1DD3 +\DeclareTextCommand{\textoverae}{L8U}[1]{#1ᷔ}% Ux1DD4 +\DeclareTextCommand{\textoveraolig}{L8U}[1]{#1ᷕ}% Ux1DD5 +% +\DeclareTextCommand{\textupstep}{L8U}[1]{#1ꜛ}% UxA71C +\DeclareTextCommand{\textdownstep}{L8U}[1]{#1ꜜ}% UxA71D + + %% LaTeX in 2017 precludes direct use of -%% \textsuperscript and \textsubscript +%% \textsuperscript \textsubscript \t \def\LIIXUscriptcommands{% \let\textsuperscript\dotextsuperscript \let\textsubscript\dotextsubscript + \let\t\dotexttie + \let\textoverline\dotextoverline \let\sp\textsuperstring \let\sb\textsubstring } -\DeclareTextCommand{\dotextsuperscript}{L8U}[1]{#1} -\DeclareTextCommand{\dotextsubscript}{L8U}[1]{#1} -\DeclareTextCommand{\textpalhookbelow}{L8U}[1]{#1̡}% +\def\LIIXUtipacommands{% + \let\capitalgrave\`% + \let\capitalacute\'% + \let\capitalcircumflex\^% + \let\capitaltilde\~% + \let\capitalmacron\=% + \let\capitalbreve\u + \let\capitaldotaccent\.% + \let\capitaldieresis\"% + \let\texthookabove\m + \let\capitalring\r + \let\capitalhungarumlaut\H + \let\capitalcaron\v + \let\U\textdoublevbaraccent + \let\textdoublegrave\G + \let\newtie\textroundcap + \let\textadvancing\textsubadvancing + \let\textretracting\textsubretracting + \let\capitalcedilla\c + \let\capitalogonek\k + \let\textundertie\textsubbreve + \let\textsstrokethru\B + \let\capitaltie\dotexttie + \let\texttoptiebar\dotexttie + \let\texthighrise\textmacronacute + \let\textlowrise\textgravemacron + \let\textrisefall\textgraveacutegrave + \let\textfallrise\textacutegraveacute +% from tipax.sty + \let\textsck\textPUsck + \let\textscm\textPUscm + \let\textscp\textPUscp + \let\textrevscr\textPUrevscr + \let\textrhooka\textPUrhooka + \let\textdblig\textPUdblig + \let\textrhooke\textPUrhooke + \let\textrhookepsilon\textPUrhookepsilon + \let\textlhti\textPUlhti % psdextra doesn't have this + \let\textnrleg\textPUnrleg + \let\textrhookopeno\textPUrhookopeno + \let\textlhookp\textPUlhookp % psdextra doesn't have this + \let\textqplig\textPUqplig + \let\textlooptoprevesh\textPUlooptoprevesh % psdextra doesn't have this + \let\textbenttailyogh\textPUbenttailyogh % psdextra doesn't have this + \let\textglotstopvari\textPUglotstopvari % psdextra doesn't have this + \let\textglotstopvarii\textPUglotstopvarii % psdextra doesn't have this + \let\textheng\textPUheng + \let\textlhookfour\textPUlhookfour + \let\textscf\textPUscf + \let\textaolig\textPUaolig + \let\spreadlips\textspreadlips + \let\overbridge\textoverbridge + \let\subdoublebar\textsubdoublebar + \let\subdoublevert\textsubdoublevert + \let\subcorner\textsubcorner + \let\whistle\textwhistle + \let\sliding\textsliding + \let\crtilde\textcrtilde + \let\dottedtilde\textdottedtilde + \let\doubletilde\textdoubletilde + \let\sublptr\textsublptr + \let\subrptr\textsubrptr + \let\textfemale\textPUfemale + \let\female\textPUfemale + \let\venus\textPUfemale + \let\Venus\textPUfemale + \let\Female\textPUfemale +} + \def\textsuperstring#1{\textsuper@ii#1\@empty\@empty} @@ -235,9 +383,8 @@ % \DeclareTextCommand{\textSS}{L8U}{ẞ}% Ux1E9E -\DeclareTextCommand{\textTeX}{L8U}{TeX}% -\DeclareTextCommand{\textLaTeX}{L8U}{LaTeX}% +% XML special symbols < > & as entities: &#<num>; \def\liixu@unicode#1{\liixu@realamp\liixu@realhash x#1;} \edef\liixu@realamp{\expandafter\@gobble\string\&} \edef\liixu@realhash{\expandafter\@gobble\string\#} @@ -270,13 +417,31 @@ \DeclareTextCommand{\textbackquote}{L8U}{\string`}% straight, not curly \DeclareTextCommand{\textasciiquote}{L8U}{\string'}% straight quote \DeclareTextCommand{\textunderscore}{L8U}{\string_} + +\DeclareTextCommand{\textMVPlus}{L8U}{+}% U+002B +\DeclareTextCommand{\textMVComma}{L8U}{,}% U+002C +\DeclareTextCommand{\textMVMinus}{L8U}{-}% U+002D +\DeclareTextCommand{\textMVPeriod}{L8U}{.}% U+002E +\DeclareTextCommand{\textMVDivision}{L8U}{/}% U+002F +\DeclareTextCommand{\textMVZero}{L8U}{0}% U+0030 +\DeclareTextCommand{\textMVOne}{L8U}{1}% U+0031 +\DeclareTextCommand{\textMVTwo}{L8U}{2}% U+0032 +\DeclareTextCommand{\textMVThree}{L8U}{3}% U+0033 +\DeclareTextCommand{\textMVFour}{L8U}{4}% U+0034 +\DeclareTextCommand{\textMVFive}{L8U}{5}% U+0035 +\DeclareTextCommand{\textMVSix}{L8U}{6}% U+0036 +\DeclareTextCommand{\textMVSeven}{L8U}{7}% U+0037 +\DeclareTextCommand{\textMVEight}{L8U}{8}% U+0038 +\DeclareTextCommand{\textMVNine}{L8U}{9}% U+0039 +\DeclareTextCommand{\textMVAt}{L8U}{@}% U+0040 + % from utf8.def \DeclareTextCommand{\textcopyright}{L8U}{©} \DeclareTextCommand{\textordfeminine}{L8U}{ª} \DeclareTextCommand{\textregistered}{L8U}{®} \DeclareTextCommand{\textordmasculine}{L8U}{º} %\DeclareTextCommand{\textasciicircum}{L8U}{ˆ} -%\DeclareTextCommand{\textasciitilde}{L8U}{˜} +%\DeclareTextCommand{\textasciitilde}{L8U}{~} \DeclareTextCommand{\textellipsis}{L8U}{…} \DeclareTextCommand{\textdots}{L8U}{…}% need this in XMP \DeclareTextCommand{\texttrademark}{L8U}{™} @@ -336,7 +501,7 @@ \DeclareTextCompositeCommand{\~}{L8U}{A}{Ã} \DeclareTextCompositeCommand{\"}{L8U}{A}{Ä} \DeclareTextCompositeCommand{\r}{L8U}{A}{Å} -\DeclareTextCommand{\AA}{L8U}{Å} +%\DeclareTextCommand{\AA}{L8U}{Å}% macro -> \r A \DeclareTextCommand{\AE}{L8U}{Æ} \DeclareTextCompositeCommand{\c}{L8U}{C}{Ç} \DeclareTextCompositeCommand{\`}{L8U}{E}{È} @@ -364,6 +529,7 @@ \DeclareTextCompositeCommand{\"}{L8U}{U}{Ü} \DeclareTextCompositeCommand{\'}{L8U}{Y}{Ý} \DeclareTextCommand{\TH}{L8U}{Þ} +\DeclareTextCommand{\textThorn}{L8U}{Þ} \DeclareTextCommand{\ss}{L8U}{ß} \DeclareTextCompositeCommand{\`}{L8U}{a}{à} \DeclareTextCompositeCommand{\'}{L8U}{a}{á} @@ -371,7 +537,7 @@ \DeclareTextCompositeCommand{\~}{L8U}{a}{ã} \DeclareTextCompositeCommand{\"}{L8U}{a}{ä} \DeclareTextCompositeCommand{\r}{L8U}{a}{å} -\DeclareTextCommand{\aa}{L8U}{å} +%\DeclareTextCommand{\aa}{L8U}{å}% macro -> \r a \DeclareTextCommand{\ae}{L8U}{æ} \DeclareTextCompositeCommand{\c}{L8U}{c}{ç} \DeclareTextCompositeCommand{\`}{L8U}{e}{è} @@ -402,6 +568,7 @@ \DeclareTextCompositeCommand{\"}{L8U}{u}{ü} \DeclareTextCompositeCommand{\'}{L8U}{y}{ý} \DeclareTextCommand{\th}{L8U}{þ} +\DeclareTextCommand{\textthorn}{L8U}{þ} \DeclareTextCompositeCommand{\"}{L8U}{y}{ÿ} % % Latin Extended-A Ux0100 – Ux0177 @@ -487,6 +654,7 @@ \DeclareTextCompositeCommand{\v}{L8U}{d}{ď} \DeclareTextCompositeCommand{\B}{L8U}{d}{đ} \DeclareTextCommand{\dj}{L8U}{đ} +\DeclareTextCommand{\textcrd}{L8U}{đ} \DeclareTextCompositeCommand{\=}{L8U}{e}{ē} \DeclareTextCompositeCommand{\u}{L8U}{e}{ě} \DeclareTextCompositeCommand{\.}{L8U}{e}{ė} @@ -692,18 +860,23 @@ % Latin Extended-B Ux0180 – Ux024F % \DeclareTextCompositeCommand{\B}{L8U}{b}{ƀ} +\DeclareTextCommand{\textcrb}{L8U}{ƀ} \DeclareTextCompositeCommand{\m}{L8U}{B}{Ɓ} +\DeclareTextCommand{\texthausaB}{L8U}{Ɓ} \DeclareTextCompositeCommand{\=}{L8U}{B}{Ƃ} \DeclareTextCompositeCommand{\=}{L8U}{b}{ƃ} % tone 6 — upper & lower \DeclareTextCompositeCommand{\m}{L8U}{O}{Ɔ} \DeclareTextCompositeCommand{\m}{L8U}{C}{Ƈ} +\DeclareTextCommand{\texthtc}{L8U}{ƈ} \DeclareTextCompositeCommand{\m}{L8U}{c}{ƈ} \DeclareTextCompositeCommand{\M}{L8U}{D}{Ɖ} +\DeclareTextCommand{\texthausaD}{L8U}{Ɗ} \DeclareTextCompositeCommand{\m}{L8U}{D}{Ɗ} \DeclareTextCompositeCommand{\=}{L8U}{D}{Ƌ} \DeclareTextCompositeCommand{\=}{L8U}{d}{ƌ} % turned delta +\DeclareTextCommand{\textEreversed}{L8U}{Ǝ} \DeclareTextCompositeCommand{\M}{L8U}{E}{Ǝ} \DeclareTextCommand{\textrevE}{L8U}{Ǝ} \DeclareTextCommand{\SCHWA}{L8U}{Ə} @@ -714,29 +887,36 @@ \DeclareTextCompositeCommand{\m}{L8U}{G}{Ɠ} \DeclareTextCommand{\textGammaafrican}{L8U}{Ɣ} \DeclareTextCommand{\hv}{L8U}{ƕ} +\DeclareTextCommand{\texthvlig}{L8U}{ƕ} \DeclareTextCompositeCommand{\m}{L8U}{I}{Ɩ} \DeclareTextCommand{\textIotaafrican}{L8U}{Ɩ} \DeclareTextCompositeCommand{\B}{L8U}{I}{Ɨ} +\DeclareTextCommand{\texthausaK}{L8U}{Ƙ} \DeclareTextCompositeCommand{\m}{L8U}{K}{Ƙ} +\DeclareTextCommand{\texthtk}{L8U}{ƙ} \DeclareTextCompositeCommand{\m}{L8U}{k}{ƙ} +\DeclareTextCommand{\textbarl}{L8U}{ƚ} \DeclareTextCompositeCommand{\B}{L8U}{l}{ƚ} \DeclareTextCommand{\textcrlambda}{L8U}{ƛ} %\DeclareTextCompositeCommand{\M}{L8U}{M}{Ɯ}% Is this known? \DeclareTextCompositeCommand{\m}{L8U}{J}{Ɲ} -\DeclareTextCommand{\textnrleg}{L8U}{ƞ} +\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}{Ƥ} +\DeclareTextCommand{\texthtp}{L8U}{ƥ} \DeclareTextCompositeCommand{\m}{L8U}{p}{ƥ} % \YR % Tone 2 — upper & lower \DeclareTextCommand{\ESH}{L8U}{Ʃ} -\DeclareTextCommand{\textlooptoprevesh}{L8U}{ƪ} +\DeclareTextCommand{\textPUlooptoprevesh}{L8U}{ƪ} \DeclareTextCommand{\textlhtlongi}{L8U}{ƪ} \DeclareTextCommand{\textlhookt}{L8U}{ƫ} \DeclareTextCompositeCommand{\m}{L8U}{T}{Ƭ} +\DeclareTextCommand{\texthtt}{L8U}{ƭ} \DeclareTextCompositeCommand{\m}{L8U}{t}{ƭ} \DeclareTextCompositeCommand{\M}{L8U}{T}{Ʈ} % U with middle tilde, used mainly with Vietnamese @@ -750,12 +930,13 @@ \DeclareTextCompositeCommand{\m}{L8U}{y}{ƴ} \DeclareTextCompositeCommand{\B}{L8U}{Z}{Ƶ} \DeclareTextCompositeCommand{\B}{L8U}{z}{ƶ} -\DeclareTextCompositeCommand{\M}{L8U}{Z}{Ʒ} \DeclareTextCommand{\EZH}{L8U}{Ʒ} +\DeclareTextCompositeCommand{\M}{L8U}{Z}{Ʒ} \DeclareTextCommand{\ezh}{L8U}{ʒ}% Ux0292 % EZH reversed \DeclareTextCommand{\textrevyogh}{L8U}{ƹ} -\DeclareTextCommand{\textbenttailyogh}{L8U}{ƺ} +\DeclareTextCommand{\textPUbenttailyogh}{L8U}{ƺ} +\DeclareTextCommand{\textcrtwo}{L8U}{ƻ} \DeclareTextCompositeCommand{\B}{L8U}{2}{ƻ} % Tone 5 — upper & lower \DeclareTextCommand{\textcrinvglotstop}{L8U}{ƾ} @@ -792,6 +973,7 @@ \DeclareTextCompositeCommand{\v}{L8U}{\"u}{ǚ} \DeclareTextCompositeCommand{\`}{L8U}{\"U}{Ǜ} \DeclareTextCompositeCommand{\`}{L8U}{\"u}{ǜ} +\DeclareTextCommand{\textinve}{L8U}{ǝ} \DeclareTextCompositeCommand{\M}{L8U}{e}{ǝ} \DeclareTextCompositeCommand{\=}{L8U}{\"A}{Ǟ} \DeclareTextCompositeCommand{\=}{L8U}{\"a}{ǟ} @@ -850,7 +1032,9 @@ \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{e}{ȅ} \DeclareTextCompositeCommand{\G}{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{\textdblgravecmb}{L8U}{i}{ȉ} @@ -858,13 +1042,17 @@ \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{\i}{ȉ} \DeclareTextCompositeCommand{\G}{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{\textdblgravecmb}{L8U}{o}{ȍ} \DeclareTextCompositeCommand{\G}{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{\textdblgravecmb}{L8U}{r}{ȑ} @@ -876,7 +1064,9 @@ \DeclareTextCompositeCommand{\textdblgravecmb}{L8U}{u}{ȕ} \DeclareTextCompositeCommand{\G}{L8U}{u}{ȕ} \DeclareTextCompositeCommand{\textroundcap}{L8U}{U}{Ȗ} +\DeclareTextCompositeCommand{\textinvbreve}{L8U}{U}{Ȗ} \DeclareTextCompositeCommand{\textroundcap}{L8U}{u}{ȗ} +\DeclareTextCompositeCommand{\textinvbreve}{L8U}{u}{ȗ} \DeclareTextCompositeCommand{\textcommabelow}{L8U}{S}{Ș} \DeclareTextCompositeCommand{\textcommabelow}{L8U}{s}{ș} \DeclareTextCompositeCommand{\textcommabelow}{L8U}{T}{Ț} @@ -889,6 +1079,7 @@ \DeclareTextCommand{\textctd}{L8U}{ȡ} % \OU and \ou \DeclareTextCompositeCommand{\textcommabelow}{L8U}{Z}{Ȥ} +\DeclareTextCommand{\textcommatailz}{L8U}{ȥ} \DeclareTextCompositeCommand{\textcommabelow}{L8U}{z}{ȥ} \DeclareTextCompositeCommand{\.}{L8U}{A}{Ȧ} \DeclareTextCompositeCommand{\.}{L8U}{a}{ȧ} @@ -905,7 +1096,9 @@ \DeclareTextCompositeCommand{\.}{L8U}{O}{Ȯ} \DeclareTextCompositeCommand{\.}{L8U}{o}{ȯ} \DeclareTextCompositeCommand{\=}{L8U}{\.O}{Ȱ} -\DeclareTextCompositeCommand{\=}{L8U}{\.{O}}{ȱ} +\DeclareTextCompositeCommand{\=}{L8U}{\.{O}}{Ȱ} +\DeclareTextCompositeCommand{\=}{L8U}{\.o}{ȱ} +\DeclareTextCompositeCommand{\=}{L8U}{\.{o}}{ȱ} \DeclareTextCompositeCommand{\=}{L8U}{Y}{Ȳ} \DeclareTextCompositeCommand{\=}{L8U}{y}{ȳ} \DeclareTextCommand{\textctl}{L8U}{ȴ} @@ -913,17 +1106,18 @@ \DeclareTextCommand{\textctt}{L8U}{ȶ} \DeclareTextCommand{\textdotlessj}{L8U}{ȷ} %\DeclareTextCommand{\j}{L8U}{ȷ}% dotless-j already declared -\DeclareTextCommand{\textdblig}{L8U}{ȸ} -\DeclareTextCommand{\textqplig}{L8U}{ȹ} +\DeclareTextCommand{\textPUdblig}{L8U}{ȸ} +\DeclareTextCommand{\textPUqplig}{L8U}{ȹ} \DeclareTextCommand{\textstrokea}{L8U}{Ⱥ} \DeclareTextCommand{\textstrokecapitalc}{L8U}{Ȼ} +\DeclareTextCommand{\textslashc}{L8U}{ȼ} \DeclareTextCommand{\textstrokec}{L8U}{ȼ} \DeclareTextCommand{\textbarcapitall}{L8U}{Ƚ} \DeclareTextCommand{\textstrokecapitalt}{L8U}{Ⱦ} \DeclareTextCommand{\textrts}{L8U}{ȿ} \DeclareTextCommand{\textrtz}{L8U}{ɀ} -\DeclareTextCommand{\textglotstopvari}{L8U}{Ɂ} -\DeclareTextCommand{\textglotstopvarii}{L8U}{ɂ} +\DeclareTextCommand{\textPUglotstopvari}{L8U}{Ɂ} +\DeclareTextCommand{\textPUglotstopvarii}{L8U}{ɂ} \DeclareTextCommand{\textbarcapitalb}{L8U}{Ƀ} \DeclareTextCommand{\textbarcapitalu}{L8U}{Ʉ} \DeclareTextCommand{\textturnedcapitalv}{L8U}{Ʌ} @@ -1014,6 +1208,9 @@ % \DeclareTextCommand{\textschwa}{L8U}{ə}% Ux0259 +\DeclareTextCommand{\texttone}{L8U}{}% so composites can be used, post-2017 + + \ifipaxmp % % IPA Extensions Ux0250 – Ux02AF @@ -1038,6 +1235,7 @@ %\DeclareTextCommand{\textschwa}{L8U}{ə}% see above \DeclareTextCompositeCommand{\m}{L8U}{\schwa}{ɚ} \DeclareTextCommand{\textrhookschwa}{L8U}{ɚ} +\DeclareTextCommand{\textniepsilon}{L8U}{ɛ}% ???? \DeclareTextCompositeCommand{\m}{L8U}{e}{ɛ} \DeclareTextCommand{\texteopen}{L8U}{ɛ} %\DeclareTextCommand{\textepsilon}{L8U}{ɛ}% beware greek @@ -1050,10 +1248,11 @@ \DeclareTextCommand{\texthtg}{L8U}{ɠ} \DeclareTextCommand{\textscriptg}{L8U}{ɡ} \DeclareTextCommand{\textscg}{L8U}{ɢ} -\DeclareTextCompositeCommand{\m}{L8U}{g}{ɣ} +\DeclareTextCommand{\textipagamma}{L8U}{ɣ} \DeclareTextCommand{\textbabygamma}{L8U}{ɣ} \DeclareTextCommand{\textgammalatinsmall}{L8U}{ɣ} %\DeclareTextCommand{\textgamma}{L8U}{ɣ}% beware greek +\DeclareTextCompositeCommand{\m}{L8U}{g}{ɣ} \DeclareTextCommand{\textramshorns}{L8U}{ɤ} \DeclareTextCommand{\textturnh}{L8U}{ɥ} \DeclareTextCompositeCommand{\m}{L8U}{h}{ɦ} @@ -1061,8 +1260,9 @@ \DeclareTextCommand{\texththeng}{L8U}{ɧ} \DeclareTextCompositeCommand{\B}{L8U}{i}{ɨ} \DeclareTextCommand{\textbari}{L8U}{ɨ} -\DeclareTextCompositeCommand{\m}{L8U}{i}{ɩ} +\DeclareTextCommand{\textniiota}{L8U}{ɩ} \DeclareTextCommand{\textiotalatin}{L8U}{ɩ} +\DeclareTextCompositeCommand{\m}{L8U}{i}{ɩ} \DeclareTextCommand{\textsci}{L8U}{ɪ} \DeclareTextCommand{\textltilde}{L8U}{ɫ} \DeclareTextCommand{\textbeltl}{L8U}{ɬ} @@ -1082,6 +1282,7 @@ \DeclareTextCommand{\textbaro}{L8U}{ɵ} \DeclareTextCommand{\textscoelig}{L8U}{ɶ} \DeclareTextCommand{\textcloseomega}{L8U}{ɷ} +\DeclareTextCommand{\textniphi}{L8U}{ɸ} \DeclareTextCommand{\textphilatin}{L8U}{ɸ} %\DeclareTextCommand{\textphi}{L8U}{ɸ}% beware greek \DeclareTextCommand{\textturnr}{L8U}{ɹ} @@ -1090,7 +1291,7 @@ \DeclareTextCommand{\textlonglegr}{L8U}{ɼ} \DeclareTextCommand{\textrtailr}{L8U}{ɽ} \DeclareTextCommand{\textfishhookr}{L8U}{ɾ} -\DeclareTextCommand{\textlhti}{L8U}{ɿ} +\DeclareTextCommand{\textPUlhti}{L8U}{ɿ} \DeclareTextCommand{\textlhtlongi}{L8U}{ɿ} \DeclareTextCommand{\textscr}{L8U}{ʀ} \DeclareTextCommand{\textinvscr}{L8U}{ʁ} @@ -1098,15 +1299,15 @@ \DeclareTextCompositeCommand{\m}{L8U}{s}{ʃ} \DeclareTextCommand{\esh}{L8U}{ʃ} \DeclareTextCommand{\textesh}{L8U}{ʃ} -\DeclareTextCompositeCommand{\m}{L8U}{\textbardotlessj}{ʄ} \DeclareTextCommand{\texthtbardotlessj}{L8U}{ʄ} +\DeclareTextCompositeCommand{\m}{L8U}{\textbardotlessj}{ʄ} \DeclareTextCompositeCommand{\m}{L8U}{S}{ʅ} \DeclareTextCommand{\textvibyi}{L8U}{ʅ} \DeclareTextCommand{\textctesh}{L8U}{ʆ} \DeclareTextCommand{\textturnt}{L8U}{ʇ} -\DeclareTextCompositeCommand{\m}{L8U}{t}{ʈ} \DeclareTextCommand{\textrtailt}{L8U}{ʈ} \DeclareTextCommand{\texttretroflexhook}{L8U}{ʈ} +\DeclareTextCompositeCommand{\m}{L8U}{t}{ʈ} \DeclareTextCompositeCommand{\B}{L8U}{u}{ʉ} \DeclareTextCommand{\textbaru}{L8U}{ʉ} \DeclareTextCommand{\textscupsilon}{L8U}{ʊ} @@ -1155,6 +1356,8 @@ \DeclareTextCommand{\textlslig}{L8U}{ʪ} \DeclareTextCommand{\textlzlig}{L8U}{ʫ} % percussives: bilabial and bidental +%\DeclareTextCommand{\textbilabial}{L8U}{ʬ} +%\DeclareTextCommand{\textbidental}{L8U}{ʭ} \DeclareTextCommand{\textlhtlongy}{L8U}{ʮ} \DeclareTextCommand{\textvibyy}{L8U}{ʯ} @@ -1171,14 +1374,19 @@ % % Spacing modifiers Ux02B0 – Ux02FF % +\DeclareTextCommand{\textoverh}{L8U}{ʰ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{h}{ʰ} +\DeclareTextCommand{\textoverheng}{L8U}{ʱ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\texthth}{ʱ} +\DeclareTextCommand{\textoverj}{L8U}{ʲ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{j}{ʲ} +\DeclareTextCommand{\textoverr}{L8U}{ʳ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{r}{ʳ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textturnr}{ʴ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textturnrrtail}{ʵ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textinvscr}{ʶ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{w}{ʷ} +\DeclareTextCommand{\textovery}{L8U}{ʸ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{y}{ʸ} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{'}{ʹ} %\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{"}{ʺ} @@ -1204,6 +1412,7 @@ %\DeclareTextCompositeCommand{\b}{L8U}{h}{ˎ} %\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{ˏ} \DeclareTextCommand{\textlengthmark}{L8U}{ː} +\DeclareTextCommand{\texthalflength}{L8U}{ˑ} %\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{ˑ} %\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{˒} %\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{h}{˓} @@ -1250,6 +1459,7 @@ %\DeclareTextCommand{\texttone}{L8U}{˼} %\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{??}{˽} %\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{??}{˾} +\DeclareTextCommand{\textsbleftarrow}{L8U}{˿} %\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\larrow}{˿} @@ -1262,9 +1472,9 @@ %\DeclareTextCommand{\textscae}{L8U}{ᴁ}% U+1D01 %\DeclareTextCommand{\textinvscae}{L8U}{ᴂ}% U+1D02 %\DeclareTextCommand{\textbarscb}{L8U}{ᴃ}% U+1D03 -%\DeclareTextCommand{\textscc}{L8U}{ᴄ}%* U+1D04 -\DeclareTextCommand{\textscd}{L8U}{ᴅ}%* U+1D05 -%\DeclareTextCommand{\textbarscd}{L8U}{ᴆ}%* U+1D06 +%\DeclareTextCommand{\textscc}{L8U}{ᴄ}% U+1D04 +\DeclareTextCommand{\textscd}{L8U}{ᴅ}% U+1D05 +%\DeclareTextCommand{\textbarscd}{L8U}{ᴆ}% U+1D06 \DeclareTextCommand{\textsce}{L8U}{ᴇ}% U+1D07 %\DeclareTextCommand{\textrevscopene}{L8U}{ᴈ}% U+1D08 %\DeclareTextCommand{\textinvsci}{L8U}{ᴊ}% U+1D09 @@ -1278,20 +1488,20 @@ \DeclareTextCommand{\textPUscp}{L8U}{ᴘ}% U+1D18 \DeclareTextCommand{\textPUrevscr}{L8U}{ᴙ}% U+1D19 % -\DeclareTextCommand{\textscu}{L8U}{ᴜ}%* U+1D1C +\DeclareTextCommand{\textscu}{L8U}{ᴜ}% U+1D1C % -\DeclareTextCommand{\textscv}{L8U}{ᴠ}%* U+1D20 -\DeclareTextCommand{\textscw}{L8U}{w}%* U+1D21 -\DeclareTextCommand{\textscz}{L8U}{z}%* U+1D22 -\DeclareTextCommand{\textscezh}{L8U}{ᴣ}%* U+1D23 +\DeclareTextCommand{\textscv}{L8U}{ᴠ}% U+1D20 +\DeclareTextCommand{\textscw}{L8U}{w}% U+1D21 +\DeclareTextCommand{\textscz}{L8U}{z}% U+1D22 +\DeclareTextCommand{\textscezh}{L8U}{ᴣ}% U+1D23 % -\DeclareTextCommand{\textain}{L8U}{ᴥ}%* U+1D25 -\DeclareTextCommand{\textscgamma}{L8U}{ᴦ}%* U+1D26 -\DeclareTextCommand{\textsclambda}{L8U}{ᴧ}%* U+1D27 -\DeclareTextCommand{\textscpi}{L8U}{ᴨ}%* U+1D28 -\DeclareTextCommand{\textscrho}{L8U}{ᴩ}%* U+1D29 -\DeclareTextCommand{\textscpsi}{L8U}{ᴪ}%* U+1D2A -\DeclareTextCommand{\textscel}{L8U}{ᴫ}%* U+1D2B +\DeclareTextCommand{\textain}{L8U}{ᴥ}% U+1D25 +\DeclareTextCommand{\textscgamma}{L8U}{ᴦ}% U+1D26 +\DeclareTextCommand{\textsclambda}{L8U}{ᴧ}% U+1D27 +\DeclareTextCommand{\textscpi}{L8U}{ᴨ}% U+1D28 +\DeclareTextCommand{\textscrho}{L8U}{ᴩ}% U+1D29 +\DeclareTextCommand{\textscpsi}{L8U}{ᴪ}% U+1D2A +\DeclareTextCommand{\textscel}{L8U}{ᴫ}% U+1D2B % % Ux1D2C – Ux1D6A \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{A}{ᴬ} @@ -1344,68 +1554,152 @@ \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{v}{ᵛ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textain}{ᵜ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\beta}{ᵝ} +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textbeta}{ᵝ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\gamma}{ᵞ} +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textgamma}{ᵞ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\delta}{ᵟ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\phi}{ᵠ} \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\chi}{ᵡ} +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textchi}{ᵡ} % -\DeclareTextCommand{\textiinferior}{L8U}{ᵢ}%* U+1D62 +\DeclareTextCommand{\textiinferior}{L8U}{ᵢ}% U+1D62 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{i}{ᵢ} -\DeclareTextCommand{\textrinferior}{L8U}{ᵣ}%* U+1D63 +\DeclareTextCommand{\textrinferior}{L8U}{ᵣ}% U+1D63 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{r}{ᵣ} -\DeclareTextCommand{\textuinferior}{L8U}{ᵤ}%* U+1D64 +\DeclareTextCommand{\textuinferior}{L8U}{ᵤ}% U+1D64 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{u}{ᵤ} -\DeclareTextCommand{\textvinferior}{L8U}{ᵥ}%* U+1D65 +\DeclareTextCommand{\textvinferior}{L8U}{ᵥ}% U+1D65 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{v}{ᵥ} -\DeclareTextCommand{\textbetainferior}{L8U}{ᵦ}%* U+1D66 +\DeclareTextCommand{\textbetainferior}{L8U}{ᵦ}% U+1D66 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\beta}{ᵦ} -\DeclareTextCommand{\textgammainferior}{L8U}{ᵧ}%* U+1D67 +\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\textbeta}{ᵦ} +\DeclareTextCommand{\textgammainferior}{L8U}{ᵧ}% U+1D67 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\gamma}{ᵧ} -\DeclareTextCommand{\textrhoinferior}{L8U}{ᵨ}%* U+1D68 +\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\textgamma}{ᵧ} +\DeclareTextCommand{\textrhoinferior}{L8U}{ᵨ}% U+1D68 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\rho}{ᵨ} -\DeclareTextCommand{\textphiinferior}{L8U}{ᵩ}%* U+1D69 +\DeclareTextCommand{\textphiinferior}{L8U}{ᵩ}% U+1D69 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\phi}{ᵩ} -\DeclareTextCommand{\textchiinferior}{L8U}{ᵪ}%* U+1D6A +\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\textvarphi}{ᵩ} +\DeclareTextCommand{\textchiinferior}{L8U}{ᵪ}% U+1D6A \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\chi}{ᵪ} +\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\textchi}{ᵪ} % \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{H}{ᵸ}% cyrillic en -% -\DeclareTextCommand{\textbarsci}{L8U}{ᵻ}%* U+1D7B -\DeclareTextCommand{\textbarp}{L8U}{ᵽ}%* U+1D7D -\DeclareTextCommand{\textbarscu}{L8U}{ᵾ}%* U+1D7E -%\DeclareTextCommand{\textbarscinvomega}{L8U}{ᵿ}%* U+1D7F -% +%\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\cyrn}{ᵸ}% cyrillic en +% +\DeclareTextCommand{\textbarsci}{L8U}{ᵻ}% U+1D7B +\DeclareTextCommand{\textbarp}{L8U}{ᵽ}% U+1D7D +\DeclareTextCommand{\textbarscu}{L8U}{ᵾ}% U+1D7E +%\DeclareTextCommand{\textbarscinvomega}{L8U}{ᵿ}% U+1D7F +% +\DeclareTextCommand{\textlhookb}{L8U}{ᶀ}% U+1D80 +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{b}{ᶀ}% +\DeclareTextCommand{\textlhookd}{L8U}{ᶁ}% U+1D81 +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{d}{ᶁ}% +\DeclareTextCommand{\textlhookf}{L8U}{ᶂ}% U+1D82 +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{f}{ᶂ}% +\DeclareTextCommand{\textlhookg}{L8U}{ᶃ}% U+1D83 +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{g}{ᶃ}% +\DeclareTextCommand{\textlhookk}{L8U}{ᶄ}% U+1D84 +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{k}{ᶄ}% +\DeclareTextCommand{\textlhookl}{L8U}{ᶅ}% U+1D85 +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{l}{ᶅ}% +\DeclareTextCommand{\textlhookm}{L8U}{ᶆ}% U+1D86 +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{m}{ᶆ}% +\DeclareTextCommand{\textlhookn}{L8U}{ᶇ}% U+1D87 +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{n}{ᶇ}% +\DeclareTextCommand{\textPUlhookp}{L8U}{ᶈ}% U+1D88 +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{p}{ᶈ}% +\DeclareTextCommand{\textlhookr}{L8U}{ᶉ}% U+1D89 +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{r}{ᶉ}% +\DeclareTextCommand{\textlhooks}{L8U}{ᶊ}% U+1D8A +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{s}{ᶊ}% +\DeclareTextCommand{\textlhookesh}{L8U}{ᶋ}% U+1D8B +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{\textesh}{ᶋ}% +\DeclareTextCommand{\textlhookv}{L8U}{ᶌ}% U+1D8C +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{v}{ᶌ}% +\DeclareTextCommand{\textlhookx}{L8U}{ᶍ}% U+1D8D +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{x}{ᶍ}% +\DeclareTextCommand{\textlhookz}{L8U}{ᶎ}% U+1D8E +\DeclareTextCompositeCommand{\textpalhookbelow}{L8U}{z}{ᶎ}% +%\DeclareTextCommand{\textrhooka}{L8U}{ᶏ}% U+1D8F in tipax.sty \DeclareTextCommand{\textPUrhooka}{L8U}{ᶏ}% U+1D8F -\DeclareTextCommand{\texthtrtaild}{L8U}{ᶑ}%* U+1D91 +\DeclareTextCompositeCommand{\textrethookbelow}{L8U}{a}{ᶏ}% +\DeclareTextCommand{\textrhookalpha}{L8U}{ᶐ}% U+1D90 +\DeclareTextCompositeCommand{\textrethookbelow}{L8U}{\textalpha}{ᶐ}% +\DeclareTextCommand{\texthtrtaild}{L8U}{ᶑ}% U+1D91 +\DeclareTextCompositeCommand{\textrethookbelow}{L8U}{\texthtd}{ᶑ}% +%\DeclareTextCommand{\textrhooke}{L8U}{ᶒ}% U+1D92 in tipax.sty \DeclareTextCommand{\textPUrhooke}{L8U}{ᶒ}% U+1D92 +\DeclareTextCompositeCommand{\textrethookbelow}{L8U}{e}{ᶒ}% +%\DeclareTextCommand{\textrhookepsilon}{L8U}{ᶓ}% U+1D93 \DeclareTextCommand{\textPUrhookepsilon}{L8U}{ᶓ}% U+1D93 +\DeclareTextCompositeCommand{\textrethookbelow}{L8U}{\textepsilon}{ᶓ}% +\DeclareTextCompositeCommand{\textrethookbelow}{L8U}{\textrevepsilon}{ᶔ}% +\DeclareTextCommand{\textrhookturne}{L8U}{ᶕ}% U+1D95 +\DeclareTextCompositeCommand{\textrethookbelow}{L8U}{\textreve}{ᶕ}% +\DeclareTextCommand{\textrhooki}{L8U}{ᶖ}% U+1D96 +\DeclareTextCompositeCommand{\textrethookbelow}{L8U}{i}{ᶖ}% +%\DeclareTextCommand{\textrhookopeno}{L8U}{ᶗ}% U+1D97 +\DeclareTextCompositeCommand{\textrethookbelow}{L8U}{\textopeno}{ᶗ}% \DeclareTextCommand{\textPUrhookopeno}{L8U}{ᶗ}% U+1D97 -% -\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{c}{ᶜ} -% -\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{f}{ᶠ} -% +\DeclareTextCommand{\textrhookesh}{L8U}{ᶘ}% U+1D98 +\DeclareTextCompositeCommand{\textrethookbelow}{L8U}{\textesh}{ᶘ}% +\DeclareTextCommand{\textrhooku}{L8U}{ᶙ}% U+1D99 +\DeclareTextCompositeCommand{\textrethookbelow}{L8U}{u}{ᶙ}% +\DeclareTextCommand{\textrhookezh}{L8U}{ᶚ}% U+1D9A +\DeclareTextCompositeCommand{\textrethookbelow}{L8U}{\textezh}{ᶚ}% +\DeclareTextCompositeCommand{\textrethookbelow}{L8U}{\textyogh}{ᶚ}% +% Ux1D9B – Ux1DBF +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textturnalpha}{ᶛ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{c}{ᶜ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textctc}{ᶝ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\dh}{ᶞ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textrevepsilon}{ᶟ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{f}{ᶠ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textbardotlessj}{ᶡ}% \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{g}{ᶢ} -% -\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\iota}{ᶥ} -\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{I}{ᶦ} -% -\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{L}{ᶫ} -% -\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{N}{ᶰ} -% -\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\phi}{ᶲ} -% -\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\esh}{ᶴ} -% -\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\upsilon}{ᶷ} -% -\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{U}{ᶸ} -% -\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{z}{ᶻ} -% -\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\ezh}{ᶾ} -\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\theta}{ᶿ} +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textturnh}{ᶣ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textbari}{ᶤ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\iota}{ᶥ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textiota}{ᶥ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{I}{ᶦ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textsci}{ᶦ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textbarsci}{ᶧ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textctj}{ᶨ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textrtaill}{ᶩ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textlhookl}{ᶪ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{L}{ᶫ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textscl}{ᶫ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textltailm}{ᶬ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textturnmrleg}{ᶭ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textltailn}{ᶮ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textrtailn}{ᶯ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{N}{ᶰ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textscn}{ᶰ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textbaro}{ᶱ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\phi}{ᶲ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textphi}{ᶲ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textrhooks}{ᶳ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\esh}{ᶴ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textesh}{ᶴ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textlhookt}{ᶵ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textbaru}{ᶶ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\upsilon}{ᶷ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textupsilon}{ᶷ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textscupsilon}{ᶷ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{U}{ᶸ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textscu}{ᶸ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textscriptv}{ᶹ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textturnv}{ᶺ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{z}{ᶻ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textrtailz}{ᶼ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textctz}{ᶽ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\schwa}{ᶾ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\textschwa}{ᶾ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\theta}{ᶿ}% +\DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{\texttheta}{ᶿ}% \fi % end of \ifipaxmp @@ -1949,6 +2243,7 @@ \DeclareTextCommand{\textasciicaron}{L8U}{ˇ}% U+02C7 \DeclareTextCommand{\textasciigrave}{L8U}{ˋ}% U+02CB \DeclareTextCommand{\textasciibreve}{L8U}{˘}% U+02D8 +\DeclareTextCommand{\texthungarumlaut}{L8U}{˝}% \DeclareTextCommand{\textacutedbl}{L8U}{˝}% U+02DD or ˶ % U+02F6 \DeclareTextCommand{\textgravedbl}{L8U}{˵}% U+02F5 \DeclareTextCommand{\texttildelow}{L8U}{˷}% U+02F7 @@ -1960,7 +2255,7 @@ \DeclareTextCommand{\textcopyleft}{L8U}{©}%???? non-unicode \DeclareTextCommand{\textlnot}{L8U}{¬}%c2ac %\DeclareTextCommand{\-}{L8U}{}%c2ad % don't override discretionary hyphen - +\DeclareTextCommand{\textsofthyphen}{L8U}{}%c2ad % % General Punctuation Ux2000 – Ux205F @@ -1993,6 +2288,8 @@ \DeclareTextCommand{\textcompwordmark}{L8U}{}% U+200C +\DeclareTextCommand{\ZWNJ}{L8U}{}% U+200C +\DeclareTextCommand{\noboundary}{L8U}{}% U+200D % \DeclareTextCommand{\textthreequartersemdash}{L8U}{‒}% U+2012 \DeclareTextCommand{\textendash}{L8U}{–}% U+2013 @@ -2048,86 +2345,95 @@ \DeclareTextCommand{\textisuperior}{L8U}{ⁱ}%* U+2071 \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{i}{ⁱ} % -\DeclareTextCommand{\textfoursuperior}{L8U}{⁴}%* U+2074 +\DeclareTextCommand{\textfoursuperior}{L8U}{⁴}% U+2074 \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{4}{⁴} -\DeclareTextCommand{\textfivesuperior}{L8U}{⁵}%* U+2075 +\DeclareTextCommand{\textfivesuperior}{L8U}{⁵}% U+2075 \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{5}{⁵} -\DeclareTextCommand{\textsixsuperior}{L8U}{⁶}%* U+2076 +\DeclareTextCommand{\textsixsuperior}{L8U}{⁶}% U+2076 \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{6}{⁶} -\DeclareTextCommand{\textsevensuperior}{L8U}{⁷}%* U+2077 +\DeclareTextCommand{\textsevensuperior}{L8U}{⁷}% U+2077 \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{7}{⁷} -\DeclareTextCommand{\texteightsuperior}{L8U}{⁸}%* U+2078 +\DeclareTextCommand{\texteightsuperior}{L8U}{⁸}% U+2078 \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{8}{⁸} -\DeclareTextCommand{\textninesuperior}{L8U}{⁹}%* U+2079 +\DeclareTextCommand{\textninesuperior}{L8U}{⁹}% U+2079 \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{9}{⁹} -\DeclareTextCommand{\textplussuperior}{L8U}{⁺}%* U+207A +\DeclareTextCommand{\textplussuperior}{L8U}{⁺}% U+207A \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{+}{⁺} -\DeclareTextCommand{\textminussuperior}{L8U}{⁻}%* U+207B +\DeclareTextCommand{\textminussuperior}{L8U}{⁻}% U+207B \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{-}{⁻} -\DeclareTextCommand{\textequalsuperior}{L8U}{⁼}%* U+207C +\DeclareTextCommand{\textequalsuperior}{L8U}{⁼}% U+207C \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{=}{⁼} -\DeclareTextCommand{\textparenleftsuperior}{L8U}{⁽}%* U+207D +\DeclareTextCommand{\textparenleftsuperior}{L8U}{⁽}% U+207D \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{(}{⁽} -\DeclareTextCommand{\textparenrightsuperior}{L8U}{⁾}%* U+207E +\DeclareTextCommand{\textparenrightsuperior}{L8U}{⁾}% U+207E \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{)}{⁾} -\DeclareTextCommand{\textnsuperior}{L8U}{ⁿ}%* U+207F +\DeclareTextCommand{\textnsuperior}{L8U}{ⁿ}% U+207F \DeclareTextCompositeCommand{\dotextsuperscript}{L8U}{n}{ⁿ} -\DeclareTextCommand{\textzeroinferior}{L8U}{₀}%* U+2080 +\DeclareTextCommand{\textzeroinferior}{L8U}{₀}% U+2080 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{0}{₀} -\DeclareTextCommand{\textoneinferior}{L8U}{₁}%* U+2081 +\DeclareTextCommand{\textoneinferior}{L8U}{₁}% U+2081 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{1}{₁} -\DeclareTextCommand{\texttwoinferior}{L8U}{₂}%* U+2082 +\DeclareTextCommand{\texttwoinferior}{L8U}{₂}% U+2082 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{2}{₂} -\DeclareTextCommand{\textthreeinferior}{L8U}{₃}%* U+2083 +\DeclareTextCommand{\textthreeinferior}{L8U}{₃}% U+2083 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{3}{₃} -\DeclareTextCommand{\textfourinferior}{L8U}{₄}%* U+2084 +\DeclareTextCommand{\textfourinferior}{L8U}{₄}% U+2084 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{4}{₄} -\DeclareTextCommand{\textfiveinferior}{L8U}{₅}%* U+2085 +\DeclareTextCommand{\textfiveinferior}{L8U}{₅}% U+2085 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{5}{₅} -\DeclareTextCommand{\textsixinferior}{L8U}{₆}%* U+2086 +\DeclareTextCommand{\textsixinferior}{L8U}{₆}% U+2086 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{6}{₆} -\DeclareTextCommand{\textseveninferior}{L8U}{₇}%* U+2087 +\DeclareTextCommand{\textseveninferior}{L8U}{₇}% U+2087 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{7}{₇} -\DeclareTextCommand{\texteightinferior}{L8U}{₈}%* U+2088 +\DeclareTextCommand{\texteightinferior}{L8U}{₈}% U+2088 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{8}{₈} -\DeclareTextCommand{\textnineinferior}{L8U}{₉}%* U+2089 +\DeclareTextCommand{\textnineinferior}{L8U}{₉}% U+2089 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{9}{₉} -\DeclareTextCommand{\textplusinferior}{L8U}{₊}%* U+208A +\DeclareTextCommand{\textplusinferior}{L8U}{₊}% U+208A \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{+}{₊} -\DeclareTextCommand{\textminusinferior}{L8U}{₋}%* U+208B +\DeclareTextCommand{\textminusinferior}{L8U}{₋}% U+208B \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{-}{₋} -\DeclareTextCommand{\textequalsinferior}{L8U}{₌}%* U+208C +\DeclareTextCommand{\textequalsinferior}{L8U}{₌}% U+208C \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{=}{₌} -\DeclareTextCommand{\textparenleftinferior}{L8U}{₍}%* U+208D +\DeclareTextCommand{\textparenleftinferior}{L8U}{₍}% U+208D \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{(}{₍} -\DeclareTextCommand{\textparenrightinferior}{L8U}{₎}%* U+208E +\DeclareTextCommand{\textparenrightinferior}{L8U}{₎}% U+208E \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{)}{₎} % -\DeclareTextCommand{\textainferior}{L8U}{ₐ}%* U+2090 +\DeclareTextCommand{\textainferior}{L8U}{ₐ}% U+2090 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{a}{ₐ} -\DeclareTextCommand{\texteinferior}{L8U}{ₑ}%* U+2091 +\DeclareTextCommand{\texteinferior}{L8U}{ₑ}% U+2091 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{e}{ₑ} -\DeclareTextCommand{\textoinferior}{L8U}{ₒ}%* U+2092 +\DeclareTextCommand{\textoinferior}{L8U}{ₒ}% U+2092 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{o}{ₒ} -\DeclareTextCommand{\textxinferior}{L8U}{ₓ}%* U+2093 +\DeclareTextCommand{\textxinferior}{L8U}{ₓ}% U+2093 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{x}{ₓ} -\DeclareTextCommand{\textschwainferior}{L8U}{ₔ}%* U+2094 +\DeclareTextCommand{\textschwainferior}{L8U}{ₔ}% U+2094 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\schwa}{ₔ} -\DeclareTextCommand{\textHinferior}{L8U}{^^e2^^82^^95}%* U+2095 +\DeclareTextCompositeCommand{\dotextsubscript}{L8U}{\textschwa}{ₔ} +\DeclareTextCommand{\texthinferior}{L8U}{^^e2^^82^^95}% U+2095 +\DeclareTextCommand{\textHinferior}{L8U}{^^e2^^82^^95}% U+2095 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{H}{^^e2^^82^^95} -\DeclareTextCommand{\textKinferior}{L8U}{^^e2^^82^^96}%* U+2096 +\DeclareTextCommand{\texthinferior}{L8U}{^^e2^^82^^96}% U+2096 +\DeclareTextCommand{\textKinferior}{L8U}{^^e2^^82^^96}% U+2096 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{K}{^^e2^^82^^96} -\DeclareTextCommand{\textLinferior}{L8U}{^^e2^^82^^97}%* U+2097 +\DeclareTextCommand{\textlinferior}{L8U}{^^e2^^82^^97}% U+2097 +\DeclareTextCommand{\textLinferior}{L8U}{^^e2^^82^^97}% U+2097 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{L}{^^e2^^82^^97} -\DeclareTextCommand{\textMinferior}{L8U}{^^e2^^82^^98}%* U+2098 +\DeclareTextCommand{\textminferior}{L8U}{^^e2^^82^^98}% U+2098 +\DeclareTextCommand{\textMinferior}{L8U}{^^e2^^82^^98}% U+2098 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{M}{^^e2^^82^^98} -\DeclareTextCommand{\textNinferior}{L8U}{^^e2^^82^^99}%* U+2099 +\DeclareTextCommand{\textninferior}{L8U}{^^e2^^82^^99}% U+2099 +\DeclareTextCommand{\textNinferior}{L8U}{^^e2^^82^^99}% U+2099 \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{N}{^^e2^^82^^99} -\DeclareTextCommand{\textPinferior}{L8U}{^^e2^^82^^9a}%* U+209A +\DeclareTextCommand{\textpinferior}{L8U}{^^e2^^82^^9a}% U+209A +\DeclareTextCommand{\textPinferior}{L8U}{^^e2^^82^^9a}% U+209A \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{P}{^^e2^^82^^9A} -\DeclareTextCommand{\textSinferior}{L8U}{^^e2^^82^^9b}%* U+209B +\DeclareTextCommand{\textsinferior}{L8U}{^^e2^^82^^9b}% U+209B +\DeclareTextCommand{\textSinferior}{L8U}{^^e2^^82^^9b}% U+209B \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{S}{^^e2^^82^^9B} -\DeclareTextCommand{\textTinferior}{L8U}{^^e2^^82^^9c}%* U+209C +\DeclareTextCommand{\texttinferior}{L8U}{^^e2^^82^^9c}% U+209C +\DeclareTextCommand{\textTinferior}{L8U}{^^e2^^82^^9c}% U+209C \DeclareTextCompositeCommand{\dotextsubscript}{L8U}{T}{^^e2^^82^^9C} @@ -2168,28 +2474,28 @@ % Letterlike symbols Ux2100 – Ux214F % \DeclareTextCommand{\textcelsius}{L8U}{℃}% U+2103 -\DeclareTextCommand{\texthslash}{L8U}{ℏ}%* U+210F -\DeclareTextCommand{\textIm}{L8U}{ℑ}%* U+2111 -\DeclareTextCommand{\textell}{L8U}{ℓ}%* U+2113 +\DeclareTextCommand{\texthslash}{L8U}{ℏ}% U+210F +\DeclareTextCommand{\textIm}{L8U}{ℑ}% U+2111 +\DeclareTextCommand{\textell}{L8U}{ℓ}% U+2113 \DeclareTextCommand{\textnumero}{L8U}{№}% U+2116 \DeclareTextCommand{\textcircledP}{L8U}{℗}% U+2117 -\DeclareTextCommand{\textwp}{L8U}{℘}%* U+2118 -\DeclareTextCommand{\textRe}{L8U}{ℜ}%* U+211C +\DeclareTextCommand{\textwp}{L8U}{℘}% U+2118 +\DeclareTextCommand{\textRe}{L8U}{ℜ}% U+211C \DeclareTextCommand{\textrecipe}{L8U}{℞}% U+211E \DeclareTextCommand{\textservicemark}{L8U}{℠}% U+2120 \DeclareTextCommand{\texttrademark}{L8U}{™}% U+2122 \DeclareTextCommand{\textohm}{L8U}{Ω}% U+2126 -\DeclareTextCommand{\textmho}{L8U}{℧}%* U+2127 -\DeclareTextCommand{\textriota}{L8U}{℩}%* U+2129 +\DeclareTextCommand{\textmho}{L8U}{℧}% U+2127 +\DeclareTextCommand{\textriota}{L8U}{℩}% U+2129 \DeclareTextCommand{\textangstrom}{L8U}{Å}% U+212B \DeclareTextCommand{\textestimated}{L8U}{℮}% U+212E -\DeclareTextCommand{\textFinv}{L8U}{Ⅎ}%* U+2132 -\DeclareTextCommand{\textaleph}{L8U}{ℵ}%* U+2135 -\DeclareTextCommand{\textbeth}{L8U}{ℶ}%* U+2136 -\DeclareTextCommand{\textgimel}{L8U}{ℷ}%* U+2137 -\DeclareTextCommand{\textdaleth}{L8U}{ℸ}%* U+2138 -\DeclareTextCommand{\textfax}{L8U}{℻}%* U+213B -\DeclareTextCommand{\textGame}{L8U}{⅁}%* U+2141 +\DeclareTextCommand{\textFinv}{L8U}{Ⅎ}% U+2132 +\DeclareTextCommand{\textaleph}{L8U}{ℵ}% U+2135 +\DeclareTextCommand{\textbeth}{L8U}{ℶ}% U+2136 +\DeclareTextCommand{\textgimel}{L8U}{ℷ}% U+2137 +\DeclareTextCommand{\textdaleth}{L8U}{ℸ}% U+2138 +\DeclareTextCommand{\textfax}{L8U}{℻}% U+213B +\DeclareTextCommand{\textGame}{L8U}{⅁}% U+2141 \DeclareTextCommand{\textinvamp}{L8U}{⅋}% U+214B \def\LIIXUmapmathletterlikes{% diff --git a/Master/texmf-dist/tex/latex/pdfx/l8ugrk.def b/Master/texmf-dist/tex/latex/pdfx/l8ugrk.def index 2c952662778..84bd25e3b45 100644 --- a/Master/texmf-dist/tex/latex/pdfx/l8ugrk.def +++ b/Master/texmf-dist/tex/latex/pdfx/l8ugrk.def @@ -339,6 +339,7 @@ \DeclareTextCommand{\textdasiaoxiaiota}{L8U}[1]{῞#1ͅ} \DeclareTextCommand{\textpsiliperispomeniiota}{L8U}[1]{῏#1ͅ} \DeclareTextCommand{\textdasiaperispomeniiota}{L8U}[1]{῟#1ͅ} +\DeclareTextCommand{\textperispomeniiota}{L8U}[1]{#1͂ͅ}% \DeclareTextCompositeCommand{\textsubiota}{L8U}{\textpsili}{\textpsiliiota} \DeclareTextCompositeCommand{\textsubiota}{L8U}{\textdasia}{\textdasiaiota} diff --git a/Master/texmf-dist/tex/latex/pdfx/l8ulat.def b/Master/texmf-dist/tex/latex/pdfx/l8ulat.def index 854192d17bd..f507364231e 100644 --- a/Master/texmf-dist/tex/latex/pdfx/l8ulat.def +++ b/Master/texmf-dist/tex/latex/pdfx/l8ulat.def @@ -182,22 +182,31 @@ \obeyspaces \DeclareTextCompositeCommand{\textLATenc}{L8U}{ }{\space}% +\DeclareTextCommand{\textLATgobblespace}{L8U}{\textLAT@i} \DeclareTextCompositeCommand{\textLATgobblespace}{L8U}{ }{\textLAT@i}% \DeclareTextCompositeCommand{\textLIIenc}{L8U}{ }{\space}% +\DeclareTextCommand{\textLIIgobblespace}{L8U}{\textLII@i} \DeclareTextCompositeCommand{\textLIIgobblespace}{L8U}{ }{\textLII@i}% \DeclareTextCompositeCommand{\textLIIIenc}{L8U}{ }{\space}% +\DeclareTextCommand{\textLIIIgobblespace}{L8U}{\textLIII@i} \DeclareTextCompositeCommand{\textLIIIgobblespace}{L8U}{ }{\textLIII@i}% \DeclareTextCompositeCommand{\textLIVenc}{L8U}{ }{\space}% +\DeclareTextCommand{\textLIVgobblespace}{L8U}{\textLIV@i} \DeclareTextCompositeCommand{\textLIVgobblespace}{L8U}{ }{\textLIV@i}% \DeclareTextCompositeCommand{\textLTVenc}{L8U}{ }{\space}% +\DeclareTextCommand{\textLTVgobblespace}{L8U}{\textLTV@i} \DeclareTextCompositeCommand{\textLTVgobblespace}{L8U}{ }{\textLTV@i}% \DeclareTextCompositeCommand{\textLVIenc}{L8U}{ }{\space}% +\DeclareTextCommand{\textLVIgobblespace}{L8U}{\textLVI@i} \DeclareTextCompositeCommand{\textLVIgobblespace}{L8U}{ }{\textLVI@i}% +\DeclareTextCommand{\textLVIIgobblespace}{L8U}{\textLVII@i} \DeclareTextCompositeCommand{\textLVIIenc}{L8U}{ }{\space}% \DeclareTextCompositeCommand{\textLVIIgobblespace}{L8U}{ }{\textLVII@i}% \DeclareTextCompositeCommand{\textLIIXenc}{L8U}{ }{\space}% +\DeclareTextCommand{\textLIIXgobblespace}{L8U}{\textLIIX@i} \DeclareTextCompositeCommand{\textLIIXgobblespace}{L8U}{ }{\textLIIX@i}% \DeclareTextCompositeCommand{\textLIXenc}{L8U}{ }{\space}% +\DeclareTextCommand{\textLIXgobblespace}{L8U}{\textLIX@i} \DeclareTextCompositeCommand{\textLIXgobblespace}{L8U}{ }{\textLIX@i}% \catcode`\ 10 diff --git a/Master/texmf-dist/tex/latex/pdfx/l8umath.def b/Master/texmf-dist/tex/latex/pdfx/l8umath.def index 4bb6b10a487..9e413931c70 100644 --- a/Master/texmf-dist/tex/latex/pdfx/l8umath.def +++ b/Master/texmf-dist/tex/latex/pdfx/l8umath.def @@ -24,7 +24,7 @@ %% \LIIXUmapmathalphabets %% \ProvidesFile{l8umath.def} - [2016/03/18 v0.4 + [2017/05/17 v0.5 Custom LaTeX file, for UTF8 encoded math symbols] % @@ -58,6 +58,8 @@ \DeclareTextCommand{\textmathunderrightarrow}{L8U}[1]{\textmathdounderrightarrow#1} \DeclareTextCommand{\textmathdounderrightarrow}{L8U}[2]{#1͢#2}% U+0362 +\DeclareTextCommand{\textmathnormal}{L8U}[1]{#1}% intended for math generally + \DeclareTextCompositeCommand{\textmathnormal}{L8U}{\acute}{\liixu@mathreorder\textmathacute} \DeclareTextCompositeCommand{\textmathnormal}{L8U}{\bar}{\liixu@mathreorder\textmathbar} \DeclareTextCompositeCommand{\textmathnormal}{L8U}{\breve}{\liixu@mathreorder\textmathbreve} @@ -1376,7 +1378,7 @@ \let\mathup\textmathrmstring \let\mbox\textmathrmstring \let\mathit\textmathitstring - \let\mathnormal\textmathitstring +% \let\mathnormal\textmathitstring \let\mathbf\textmathbfstring \let\mathbfup\textmathbfstring \let\mathbold\textmathbitstring diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfx.sty b/Master/texmf-dist/tex/latex/pdfx/pdfx.sty index 58412c70a33..0d2fb58b38f 100644 --- a/Master/texmf-dist/tex/latex/pdfx/pdfx.sty +++ b/Master/texmf-dist/tex/latex/pdfx/pdfx.sty @@ -6,7 +6,7 @@ %% %% pdfx.dtx (with options: `package') %% -%% Copyright (c) 2015, CV Radhakrishnan <cvr@river-valley.org>, +%% Copyright (c) 2017, CV Radhakrishnan <cvr@river-valley.org>, %% Han The Thanh <thanh@river-valley.org>, %% Ross Moore <ross.moore@mq.edu.au>, %% Peter Selinger <selinger@mathstat.dal.ca> @@ -31,7 +31,7 @@ }{}% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfx} - [2016/05/03 v1.5.8 PDF/X and PDF/A support (CVR/HTH/RRM/PS)] + [2017/05/18 v1.5.84 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 @@ -164,6 +164,7 @@ \global\pdfminorversion=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 } @@ -227,10 +228,14 @@ \global\vnmxmptrue \global\latEXTxmptrue \global\latLATxmptrue + \global\vnmxmptrue \global\ipaxmptrue \global\mathxmptrue + \global\let\pdfx@useactivespacestrue\pdfx@useactivespacesfalse } +\newif\ifpdfx@useactivespaces + \ExecuteOptions{noBOM,a-1b} \ProcessOptions @@ -250,7 +255,6 @@ \ifarmSCIxmp\pdfx@nopdfinfotrue \fi\fi\fi\fi\fi -\newif\ifpdfx@useactivespaces \iflatLATxmp\pdfx@useactivespacestrue\fi \ifgrkLGRxmp\pdfx@useactivespacestrue\fi \ifcyrKOIxmp\pdfx@useactivespacestrue\fi @@ -382,14 +386,14 @@ \fi \fi -\ifluatex\else +\ifluatex\else\ifxetex\else \@ifpackageloaded{inputenc}{% }{% \RequirePackage{inputenc} % allow this to be loaded again cleanly \expandafter\let\csname ver@inputenc.sty\endcsname\relax } -\fi +\fi\fi %% pseudo-declare the L8U encoding \expandafter\let\csname L8U-cmd\expandafter\endcsname\csname OT1-cmd\endcsname @@ -546,6 +550,7 @@ \liixu@enablenumberline \def\empty{}% used in LICR patterns \LIIXUscriptcommands + \LIIXUtipacommands \LIIXUmapTeXnames %% from Hyperref's psdextra.def \csname psdmapshortnames\endcsname @@ -664,12 +669,12 @@ \PackageWarning{pdfx}{% CreationDate is not properly supported;^^J PDF validation may fail. To avoid this problem use:^^J - xelatex -shell-escape -output-driver="xdvipdfmx -z 0" <filename>^^J} + xelatex -shell-escape <filename>^^J} \else \PackageError{pdfx}{% CreationDate is not properly supported;^^J PDF validation may fail.}{To avoid this problem use:^^J - xelatex -shell-escape -output-driver="xdvipdfmx -z 0" <filename> } + xelatex -shell-escape <filename> } \fi \fi \fi @@ -732,74 +737,74 @@ %% the "pdftex" option seems to work fine with LuaTeX %% Hyperref options for PDF/X -\def\pdfx@pdfX@opts@pdftex{% +\edef\pdfx@pdfX@opts@pdftex{% draft,pdftex,pdfpagemode=UseNone,bookmarks=false,% pdfversion=1.\thepdfminorversion,pdfstartview=} -\def\pdfx@pdfX@opts@xetex{% +\edef\pdfx@pdfX@opts@xetex{% draft,xetex,pdfpagemode=UseNone,bookmarks=false,% pdfversion=1.\thepdfminorversion,pdfstartview=} -\def\pdfx@pdfX@opts@luatex{% - draft,pdftex,pdfpagemode=UseNone,bookmarks=false,% +\edef\pdfx@pdfX@opts@luatex{% + draft,luatex,pdfpagemode=UseNone,bookmarks=false,% pdfversion=1.\thepdfminorversion,pdfstartview=} %% Hyperref options for PDF/A and PDF/E -\def\pdfx@pdfAE@opts@pdftex{pdftex,pdfa,pdfversion=1.\thepdfminorversion}% -\def\pdfx@pdfAE@opts@xetex{xetex,pdfa,pdfversion=1.\thepdfminorversion}% -\def\pdfx@pdfAE@opts@luatex{pdftex,pdfa,pdfversion=1.\thepdfminorversion}% +\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}% \ifpdfx@x \@ifpackageloaded{hyperref}{% \ifxetex - \hypersetup{\pdfx@pdfX@opts@xetex} + \expandafter\hypersetup\expandafter{\pdfx@pdfX@opts@xetex} \else\ifluatex - \hypersetup{\pdfx@pdfX@opts@luatex} + \expandafter\hypersetup\expandafter{\pdfx@pdfX@opts@luatex} \else - \hypersetup{\pdfx@pdfX@opts@pdftex} + \expandafter\hypersetup\expandafter{\pdfx@pdfX@opts@pdftex} \fi\fi }{% \ifxetex - \RequirePackage[\pdfx@pdfX@opts@xetex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfX@opts@xetex]{hyperref} \else\ifluatex - \RequirePackage[\pdfx@pdfX@opts@luatex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfX@opts@luatex]{hyperref} \else - \RequirePackage[\pdfx@pdfX@opts@pdftex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfX@opts@pdftex]{hyperref} \fi\fi }% \else \ifpdfx@e \@ifpackageloaded{hyperref}{% \ifxetex - \hypersetup{\pdfx@pdfAE@opts@xetex} + \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@xetex} \else\ifluatex - \hypersetup{\pdfx@pdfAE@opts@luatex} + \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@luatex} \else - \hypersetup{\pdfx@pdfAE@opts@pdftex} + \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@pdftex} \fi\fi }{% \ifxetex - \RequirePackage[\pdfx@pdfAE@opts@xetex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@xetex]{hyperref} \else\ifluatex - \RequirePackage[\pdfx@pdfAE@opts@luatex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@luatex]{hyperref} \else - \RequirePackage[\pdfx@pdfAE@opts@pdftex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@pdftex]{hyperref} \fi\fi }% \else % generating PDF/A or ... \@ifpackageloaded{hyperref}{% \ifxetex - \hypersetup{\pdfx@pdfAE@opts@xetex}% + \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@xetex}% \else\ifluatex - \hypersetup{\pdfx@pdfAE@opts@luatex}% + \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@luatex}% \else - \hypersetup{\pdfx@pdfAE@opts@pdftex}% + \expandafter\hypersetup\expandafter{\pdfx@pdfAE@opts@pdftex}% \fi\fi }{% \ifxetex - \RequirePackage[\pdfx@pdfAE@opts@xetex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@xetex]{hyperref} \else\ifluatex - \RequirePackage[\pdfx@pdfAE@opts@luatex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@luatex]{hyperref} \else - \RequirePackage[\pdfx@pdfAE@opts@pdftex]{hyperref} + \expandafter\RequirePackage\expandafter[\pdfx@pdfAE@opts@pdftex]{hyperref} \fi\fi }% \fi\fi @@ -808,6 +813,11 @@ \hypersetup{psdextra} \fi +%% hyperref doesn't set the minor version for XeTeX +\ifxetex + \special{pdf:minorversion \thepdfminorversion} +\fi + \ifx\xmp@CreatorTool\@empty \edef\xmp@CreatorTool{\@pdfcreator} \fi @@ -1378,9 +1388,9 @@ \global\let#1\empty \else \begingroup - \ifluatex\else + \ifluatex\else\ifxetex\else \inputencoding{utf8}% - \fi + \fi\fi \hypersetup{pdfencoding=auto}% \pdfstringdef#1{#2}% \endgroup @@ -1722,6 +1732,29 @@ \let\includexmp\pdfx@xmpincl@xetex \fi +%% macro provided by Leonardo E. Segovia on 2007-05-15 +%% <leonardo.segovia@cs.uns.edu.ar> +\def\pdfx@xmpincl@luatex#1{% + \IfFileExists{#1.xmp}{% + \mcs@xmpincl@patchFile{#1}% + \begingroup + \pdfcompresslevel=0 + \immediate\pdfobj uncompressed stream attr {/Type /Metadata /Subtype /XML} + file{#1.xmpi}% + \pdfcatalog{/Metadata \the\pdflastobj\space 0 R}% + \endgroup + }{% + \newcommand{\mcs@xmpincl@filename}{#1.xmp}% + \PackageError{xmpincl}% + {The file \mcs@xmpincl@filename\space was not found}% + {The file \mcs@xmpincl@filename\space The metadata file + wasn't found.\MessageBreak Oops.}% + } +} +\ifluatex + \let\includexmp\pdfx@xmpincl@luatex +\fi + %%---------------------------------------------------------------------- \begingroup \ifpdfx@x |