summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-02-20 21:22:41 +0000
committerKarl Berry <karl@freefriends.org>2022-02-20 21:22:41 +0000
commit361af17a8a2ae63f39dd6b24aaccdf4ce4c1214b (patch)
tree9eb828e39c363ab99d53463ee4db06dd8f9bba29
parent36c40243665f27f57f0167810c4e29d88347ee0a (diff)
tipauni (20feb22)
git-svn-id: svn://tug.org/texlive/trunk@62108 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/tipauni/README.txt2
-rw-r--r--Master/texmf-dist/doc/latex/tipauni/tipauni-commands.pdfbin70919 -> 70243 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tipauni/tipauni-example.pdfbin110031 -> 109364 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tipauni/tipauni.pdfbin235299 -> 245485 bytes
-rw-r--r--Master/texmf-dist/source/latex/tipauni/tipauni.dtx353
-rw-r--r--Master/texmf-dist/source/latex/tipauni/tipauni.ins4
-rw-r--r--Master/texmf-dist/tex/latex/tipauni/tipauni.sty181
7 files changed, 403 insertions, 137 deletions
diff --git a/Master/texmf-dist/doc/latex/tipauni/README.txt b/Master/texmf-dist/doc/latex/tipauni/README.txt
index 2d8c319a771..f0aa93342f5 100644
--- a/Master/texmf-dist/doc/latex/tipauni/README.txt
+++ b/Master/texmf-dist/doc/latex/tipauni/README.txt
@@ -1,7 +1,7 @@
--------------------------------------------------------------------------
Package: tipauni
Author: निरंजन
-Version: v0.4 (16 December, 2021)
+Version: v0.5 (20 February, 2022)
Description: For producing Unicode characters with TIPA commands.
Repository: https://git.gnu.org.ua/tipauni.git
Bug tracker: https://puszcza.gnu.org.ua/bugs/?group=tipauni
diff --git a/Master/texmf-dist/doc/latex/tipauni/tipauni-commands.pdf b/Master/texmf-dist/doc/latex/tipauni/tipauni-commands.pdf
index 10b4f998ce7..0a7c0ecf31d 100644
--- a/Master/texmf-dist/doc/latex/tipauni/tipauni-commands.pdf
+++ b/Master/texmf-dist/doc/latex/tipauni/tipauni-commands.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tipauni/tipauni-example.pdf b/Master/texmf-dist/doc/latex/tipauni/tipauni-example.pdf
index e8c22e84c5e..372aeddaf6c 100644
--- a/Master/texmf-dist/doc/latex/tipauni/tipauni-example.pdf
+++ b/Master/texmf-dist/doc/latex/tipauni/tipauni-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tipauni/tipauni.pdf b/Master/texmf-dist/doc/latex/tipauni/tipauni.pdf
index 8ff2fc8c2f5..da0fce2737d 100644
--- a/Master/texmf-dist/doc/latex/tipauni/tipauni.pdf
+++ b/Master/texmf-dist/doc/latex/tipauni/tipauni.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/tipauni/tipauni.dtx b/Master/texmf-dist/source/latex/tipauni/tipauni.dtx
index 8c942d1ba66..caeeb9bd340 100644
--- a/Master/texmf-dist/source/latex/tipauni/tipauni.dtx
+++ b/Master/texmf-dist/source/latex/tipauni/tipauni.dtx
@@ -4,14 +4,14 @@
% ---------------------------------------------------------------------------
% Package: tipauni
% Author: निरंजन
-% Version: v0.4 (16 December, 2021)
+% Version: v0.5 (20 February, 2022)
% Description: For producing Unicode characters with TIPA commands.
% Repository: https://git.gnu.org.ua/tipauni.git
% Bug tracker: https://puszcza.gnu.org.ua/bugs/?group=tipauni
% License: GPL v3.0+, GFDL v1.3+
% ---------------------------------------------------------------------------
-% LaTeX Package tipauni v0.4
-% Copyright © 2021 निरंजन
+% LaTeX Package tipauni v0.5
+% Copyright © 2021, 2022 निरंजन
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -33,30 +33,30 @@
% and the derived file tipauni.sty.
% \fi
% \iffalse
-%<*internal>
+%<*internal>
\iffalse
-%</internal>
-%<*readme>
+%</internal>
+%<*readme>
--------------------------------------------------------------------------
Package: tipauni
Author: निरंजन
-Version: v0.4 (16 December, 2021)
+Version: v0.5 (20 February, 2022)
Description: For producing Unicode characters with TIPA commands.
Repository: https://git.gnu.org.ua/tipauni.git
Bug tracker: https://puszcza.gnu.org.ua/bugs/?group=tipauni
License: GPL v3.0+, GFDL v1.3+
--------------------------------------------------------------------------
-%</readme>
-%<*internal>
+%</readme>
+%<*internal>
\fi
-%</internal>
-%<*driver|package>
+%</internal>
+%<*driver|package>
\def\tipauniname{tipauni}
-\def\tipauniversion{0.4}
-\def\tipaunidate{2021-12-16}
+\def\tipauniversion{0.5}
+\def\tipaunidate{2022-02-20}
\def\tipaunidescription{For producing Unicode characters with TIPA commands}
-%</driver|package>
-%<*driver>
+%</driver|package>
+%<*driver>
\documentclass{l3doc}
\usepackage{multicol}
\usepackage{graphicx}
@@ -88,7 +88,7 @@ Scale=0.8%
\begin{document}
\DocInput{\tipauniname.dtx}
\end{document}
-%</driver>
+%</driver>
% \fi
% \title{The \pkg{\tipauniname} package}
% \author{^^A
@@ -104,7 +104,7 @@ Scale=0.8%
% Version \tipauniversion\ --- \tipaunidate\\[1ex]^^A
% {^^A
% \small\faIcon{link}\quad
-% \url{https://ctan.org/pkg/tipauni}
+% \url{https://ctan.org/pkg/tipauni}^^A
% }\\^^A
% {^^A
% \small\faIcon{bug}\quad
@@ -118,7 +118,7 @@ Scale=0.8%
% \vfill
% {%
% \setlength{\parindent}{0pt}
-% Copyright © 2021 {\devtext निरंजन}
+% Copyright © 2021, 2022 {\devtext निरंजन}
%
% Permission is granted to copy, distribute and/or modify this document under
% the terms of the GNU Free Documentation License, Version 1.3 or any later
@@ -138,12 +138,12 @@ Scale=0.8%
% their beloved TIPA shortcuts with the benefits of Unicode i.e.\
% searchability, copy-pasting, changing the font and many more. As this
% package needs the package \pkg{fontspec} for loading an IPA font, it needs
-% to be compiled with \XeLaTeX\ or Lua\LaTeX. This package can also be
-% viewed as an ASCII-based input method for producing IPA characters in
-% Unicode.
+% to be compiled with Lua/\XeLaTeX. This package can also be viewed as an
+% ASCII-based input method for producing IPA characters in Unicode.
% \end{abstract}
%
% \section{Acknowledgements}
+%
% This package is completed because of the rigorous help by Jairo A.\ del Rio,
% Jonathan P.\ Spratte, Phelype Oleinink \textit{\&} Ulrike Fischer. Their
% suggestions and contributions are extremely valuable for the development of
@@ -153,22 +153,126 @@ Scale=0.8%
% \pkg{expl3}. Phelype Oleinik has helped the package by building a test-suit
% for regression-tests. The tests can be seen in the git-repository of the
% project.
+%
+% Lemures Lemniscati pointed a few bugs in the documentation \& the code.
+% Their details are as follows.
+% are as follows:
+%
+% \begin{description}
+% \item[2022-01-03]
+% A typo '\cs{textsh}' in tipauni.dtx.
+% \href{https://puszcza.gnu.org.ua/bugs/index.php?538}{(link)}
+% \item[2022-01-09]
+% Avoid unconditional loading of CharisSIL.
+% \href{https://puszcza.gnu.org.ua/bugs/index.php?539}{(link)}
+% \item[2022-01-09]
+% Fix typos in Input B of Raised and Lowered.
+% \href{https://puszcza.gnu.org.ua/bugs/index.php?540}{(link)}
+% \item[2022-01-09]
+% \cs{textcorner} should be defined by \cs{DeclareTextSymbol}.
+% \href{https://puszcza.gnu.org.ua/bugs/index.php?541}{(link)}
+% \item[2022-01-09]
+% Fix a typo in Input B of Near-close near-front rounded.
+% \href{https://puszcza.gnu.org.ua/bugs/index.php?542}{(link)}
+% \end{description}
+%
+% All of these contributions are highly valuable for the development of this
+% package.
%
% \section{Package options}
%
% \begin{function}{documentfont}
+% \begin{syntax}
+% documentfont=\meta{font-name}
+% \end{syntax}
+%
% The default font for the entire document set by this package is the
-% \href{https://www.ctan.org/pkg/charissil}{Charis SIL}. Users can easily
-% change it with the package-option \verb|documentfont|. This option takes
-% one value which is the \meta{font name}. e.g.\ For using the
-% \href{https://www.ctan.org/pkg/doulossil}{Doulos SIL} font as the main
-% font, use the package like it is used in the following.
+% \href{https://ctan.org/pkg/charissil}{Charis SIL}. Users can easily change
+% it with the package-option \verb|documentfont|. This option takes one
+% value which is the hfont namei. e.g.\ For using the
+% \href{https://ctan.org/pkg/doulossil}{Doulos SIL} font as the main font,
+% use the package like it is used in the following.
+%
% \begin{verbatim}
% \usepackage[documentfont=DoulosSIL]{tipauni}
% \end{verbatim}
+%
+% Please note that you must provide a value to this key. If you pass it an
+% empty value; i.e.,
+% \enquote{\verb|documentfont=\{\}|}/\enquote{\verb|documentfont=|} or no
+% value, i.e., \enquote{\verb|documentfont|}, you will be prompted with
+% errors from package \pkg{tipauni}. If an empty/no-value
+% \verb|documentfont| is used \& no other non-empty \verb|documentfont| has
+% been used so far; then the document is typeset with the default
+% font-family of Lua/\XeLaTeX, i.e., the Latin Modern family. If another
+% \verb|documentfont| has a non-empty value, the value of that option will
+% be used as the font of the document.
+% \end{function}
+%
+% \begin{function}{fontspecoptions}
% \begin{syntax}
-% documentfont=\meta{font name}
+% fontspecoptions=\meta{font-options}
% \end{syntax}
+%
+% This option can be used to set options to the font set with
+% \verb|documentfont| package option. If the \verb|recommendedfont| option
+% is used \& has the highest priority; the options set with
+% \verb|fontspecoptions| will be used with the Charis SIL font. If the
+% \verb|preservefont| option has the highest priority, this parameter will
+% be ineffective \& throw a warning. In the argument of this option write as
+% if you are writing in the optional parameter of the \cs{setmainfont}
+% command. e.g.\
+%
+% \begin{verbatim}
+% \usepackage[fontspecoptions={Scale=1.5}]{tipauni}
+% \end{verbatim}
+%
+% \noindent If this options is used with no value it will be ignored with a
+% warning.
+%
+% \noindent e.g.\ Try \verb|\usepackage[fontspecoptions]{tipauni}|.
+%
+% \medskip
+%
+% \noindent If it is used with an empty value it will reset the fontspec-options so
+% far you have set. e.g.\ Try:
+%
+% \begin{verbatim}
+% \usepackage[%
+% fontspecoptions={Scale=1.5},%
+% fontspecfontspecoptions={}%
+% ]{tipauni}
+% \end{verbatim}
+% \end{function}
+%
+% Please note that the keys so far documented are the only keys which take
+% values. Other than these the following keys \emph{don't} take any value. You
+% will be prompted with an error from package \pkg{expkv} if you use values
+% for the following keys.
+%
+% \begin{function}{preservefont}
+% This option will omit executing the \cs{setmainfont} command with Charis
+% SIL. The typeset document will use the default font of Lua/\XeLaTeX, i.e.,
+% the Latin Modern.
+% \end{function}
+%
+% \begin{function}{recommendedfont}
+% This option is used to override other font definitions made with option
+% \verb|documentfont|. Charis SIL will be used as the main font of the
+% document when this option is used.
+% \end{function}
+%
+% Please note that every option so far mentioned can potentially override each
+% other. e.g.\ If a \verb|documentfont| is added after a \verb|preservefont|,
+% the former will override the latter (\& vice versa). It is true for all
+% these three package options.
+%
+% \begin{function}{resetfontspecoptions}
+% This option is used to reset all the \pkg{fontspec} options set with
+% package option \verb|fontspecoptions|. As noted for the font-options,
+% these two options which deal with the options of the loaded fonts also can
+% override each other. The last one loaded will be considered of the highest
+% priority.
% \end{function}
%
% \begin{function}{incompatible}
@@ -189,6 +293,7 @@ Scale=0.8%
% typing symbols in the IPA chart.
%
% \subsection{Pulmonic consonants}
+%
% \begin{ThreePartTable}
% \begin{TableNotes}
% \item[\textcolor{red}{§}] These commands are also available without
@@ -236,7 +341,7 @@ Scale=0.8%
% Dental voiceless fricative & \verb|\texttheta| & \verb|T| & θ \\
% Dental voiced fricative & \verb|\dh|\tnote{\textcolor{red}{§}} &
% \verb|D| & ð \\
-% Palatal voiceless fricative & \verb|\textsh| & \verb|S| & ʃ \\
+% Palatal voiceless fricative & \verb|\textesh| & \verb|S| & ʃ \\
% Palatal voiced fricative & \verb|\textyogh| & \verb|Z| & ʒ \\
% Retroflex voiceless fricative & \verb|\textrtails| & \verb|\:s| & ʂ \\
% Retroflex voiceless fricative & \verb|\textrtailz| & \verb|\:z| & ʐ \\
@@ -267,6 +372,7 @@ Scale=0.8%
% \end{ThreePartTable}
%
% \subsection{Non-Pulmonic consonants}
+%
% \begin{longtable}{%
% l@{\hspace{0.3cm}-\hspace{0.3cm}}%
% l@{\hspace{0.3cm}-\hspace{0.3cm}}%
@@ -344,7 +450,7 @@ Scale=0.8%
% Description & Input A & Input B &\multicolumn{1}{l}{Symbol}\\
% \midrule
% Near-close near-front unrounded & \verb|\textsci| & \verb|I| & ɪ \\
-% Near-close near-front rounded & \verb|\textscy| & \verb|y| & ʏ \\
+% Near-close near-front rounded & \verb|\textscy| & \verb|Y| & ʏ \\
% Open-mid front unrounded & \verb|\textepsilon| & \verb|E| & ɛ \\
% Close central unrounded & \verb|\textbari| & \verb|1| & ɨ \\
% Close central rounded & \verb|\textbaru| & \verb|0| & ʉ \\
@@ -366,6 +472,7 @@ Scale=0.8%
% }%
%
% \subsection{Independent diacritics}
+%
% \begin{longtable}{%
% l@{\hspace{0.3cm}-\hspace{0.3cm}}%
% l@{\hspace{0.3cm}-\hspace{0.3cm}}%
@@ -385,6 +492,7 @@ Scale=0.8%
% \end{longtable}
%
% \subsection{Dependent diacritics}
+%
% \begin{TableNotes}
% \item[1] The documentation of package the \pkg{tipa} on p.\ 53
% describes a shorthand command
@@ -392,6 +500,7 @@ Scale=0.8%
% functional. I haven't investigated the reasons, but instead provided a new
% shorthand command for this character.
% \end{TableNotes}
+%
% \begin{ThreePartTable}
% {%
% \small
@@ -424,8 +533,8 @@ Scale=0.8%
% Linguolabial & \verb|\textseagull{l}| & \verb+\|ml+ & l̼ \\
% Velarized & \verb|\textsuperimposetilde{i}| & \verb+\vl{i}+\tnote{1} & i̴
% \\
-% Raised & \verb|\textraising{ə}| & \verb+\|’@+ & ə̝ \\
-% Lowered & \verb|\textlowering{ə}| & \verb+\|‘@+ & ə̞ \\
+% Raised & \verb|\textraising{ə}| & \verb+\|'@+ & ə̝ \\
+% Lowered & \verb|\textlowering{ə}| & \verb+\|`@+ & ə̞ \\
% Advanced tongue root & \verb|\textadvancing{ə}| & \verb+\|<@+ & ə̘ \\
% Retracted tongue root & \verb|\textretracting{ə}| & \verb+\|>@+ & ə̙ \\
% Dental & \verb|\textsubbridge{t}| & \verb+\|[t+ & t̪ \\
@@ -439,6 +548,7 @@ Scale=0.8%
% }%
% \end{ThreePartTable}
% \end{documentation}
+%
% \begin{implementation}
% \section{Implementation}
% \begin{macrocode}
@@ -447,23 +557,102 @@ Scale=0.8%
% \end{macrocode}
% Provide the package with some description \textit{\&} version specifications.
% \begin{macrocode}
-\ProvidesPackage{tipauni}[2021/12/16 v0.4
+\ProvidesPackage{tipauni}[2022/02/20 v0.5
Unicode characters with TIPA commands]
% \end{macrocode}
% Load necessary packages.
% \begin{macrocode}
\RequirePackage{xparse}
\RequirePackage{fontspec}
-\RequirePackage{xkeyval}
+\RequirePackage{expkv-def,expkv-opt}
+% \end{macrocode}
+% Package options are provided using the package \pkg{expkv}.
+% \begin{macrocode}
+\newif\iftipauni@document@font
+\def\tipauni@recommended@font{CharisSIL}
+\tipauni@document@fonttrue
+\let\tipauni@font@options\@empty
+\ekvdefinekeys{tipauni}{%
+ bool incompatible = \iftipauni@nontipa@ignore,%
+ noval preservefont = {%
+ \let\tipauni@font\tipauni@undefined
+ \tipauni@document@fontfalse
+ },%
+ estore fontspecoptions = \tipauni@font@options,%
+ new noval fontspecoptions = {%
+ \PackageWarningNoLine{tipauni}{%
+ As you haven't given any value to package option\MessageBreak
+ `fontspecoptions'; it will be ignored. Please\MessageBreak
+ provide a valid (list of) fontspec option(s)%
+ }%
+ },%
+ noval resetfontspecoptions = {%
+ \let\tipauni@font@options\@empty
+ },%
+ noval documentfont = {%
+ \PackageError{tipauni}{No value for the `documentfont' option}{%
+ The `documentfont' option has no value. Please provide a valid font-name,%
+ \MessageBreak
+ otherwise it will be ignored or (if given) the value of another non-empty%
+ \MessageBreak
+ `documentfont' will be used.%
+ }%
+ \ifdefined\tipauni@font
+ \tipauni@document@fonttrue
+ \else
+ \tipauni@document@fontfalse
+ \fi
+ },%
+ new code documentfont = {%
+ \edef\tipauni@temp{#1}%
+ \ifx\tipauni@temp\@empty
+ \PackageError{tipauni}{Empty `documentfont' option}{%
+ The `documentfont' option has an empty value. Please provide a valid%
+ \MessageBreak
+ font-name, otherwise it will be ignored or (if given) the value of%
+ \MessageBreak
+ another non-empty `documentfont' will be used.%
+ }%
+ \ifdefined\tipauni@font
+ \tipauni@document@fonttrue
+ \else
+ \tipauni@document@fontfalse
+ \fi
+ \else
+ \tipauni@document@fonttrue
+ \let\tipauni@font\tipauni@temp
+ \fi
+ },%
+ noval recommendedfont = {%
+ \tipauni@document@fonttrue
+ \let\tipauni@font\tipauni@recommended@font
+ }%
+}
+\ekvoProcessLocalOptions{tipauni}
% \end{macrocode}
-% Package options are provided using the package \pkg{xkeyval}. The following
-% commands provide the option \verb|documentfont|.
+% The following code executes the \verb|\setmainfont| command \& issues a
+% warning in a special case.
% \begin{macrocode}
-\setmainfont{CharisSIL} %% https://ctan.org/pkg/charissil
-\DeclareOptionX{documentfont}{\setmainfont{#1}}
-\newif\ifnontipaignore
-\DeclareOptionX{incompatible}{\nontipaignoretrue}
-\ProcessOptionsX\relax
+\iftipauni@document@font
+ \ifdefined\tipauni@font
+ \else
+ \let\tipauni@font\tipauni@recommended@font
+ \fi
+ \expandafter\setmainfont\expandafter
+ [\expandafter{\tipauni@font@options}]{\tipauni@font}
+\else
+ \ifx\tipauni@font@options\@empty
+ \else
+ \PackageWarningNoLine{tipauni}{%
+ An active font loaded with package fontspec is\MessageBreak
+ necessary for `fontspecoptions' to take effect.\MessageBreak
+ Please use the `documentfont'/`recommendedfont'\MessageBreak
+ option or load a font outside package `tipauni'\MessageBreak
+ to make your options active. Currently ignoring:\MessageBreak
+ [\tipauni@font@options]%
+ }%
+ \fi
+\fi
% \end{macrocode}
% The following commands were kindly suggested by Phelype Oleinik for developing
% a conditional which is always global.
@@ -471,7 +660,7 @@ Unicode characters with TIPA commands]
\newif\ifnontipa
\protected\def\nontipatrue{\global\let\ifnontipa\iftrue}
\protected\def\nontipafalse{\global\let\ifnontipa\iffalse}
-\ifnontipaignore
+\iftipauni@nontipa@ignore
\protected\def\nontipatrue{}
\fi
% \end{macrocode}
@@ -555,8 +744,8 @@ Unicode characters with TIPA commands]
\DeclareTextComposite{\tipaunisemicolon}{TU}{R}{"280}
%%-- Taps or flaps
%%-- Labiodental flap
-\tipaunicmd{\labdentflap}{ⱱ} %% tipauni-exclusive
-\DeclareTextComposite{\tipaunistar}{TU}{v}{"2C71} %% tipauni-exclusive
+\tipaunicmd{\labdentflap}{ⱱ}%% tipauni-exclusive
+\DeclareTextComposite{\tipaunistar}{TU}{v}{"2C71}%% tipauni-exclusive
%%--** Alveolar
\DeclareTextSymbol{\textfishhookr}{TU}{"27E}%% ɾ
%%--** Retroflex
@@ -597,7 +786,7 @@ Unicode characters with TIPA commands]
\DeclareTextComposite{\tipaunistar}{TU}{z}{"26E}
%%-- Approximants
%%-- Labiodental approximant
-\tipaunicmd{\labdentapp}{ʋ} %% tipauni-exclusive
+\tipaunicmd{\labdentapp}{ʋ}%% tipauni-exclusive
%%--** Alveolar
\DeclareTextSymbol{\textturnr}{TU}{"279}%% ɹ
\DeclareTextComposite{\tipaunistar}{TU}{r}{"279}
@@ -620,10 +809,10 @@ Unicode characters with TIPA commands]
\DeclareTextSymbol{\textbullseye}{TU}{"298}%% ʘ
\DeclareTextComposite{\tipaunibang}{TU}{o}{"298}
%%-- Postalveolar click
-\tipaunicmd{\pstalvclick}{ǃ} %% tipauni-exclusive
+\tipaunicmd{\pstalvclick}{ǃ}%% tipauni-exclusive
%%--** Palato-alveolar
\DeclareTextSymbol{\textdoublebarpipe}{TU}{"1C2}%% ǂ
-\DeclareTextComposite{\tipaunibang}{TU}{c}{"1C2} %% tipauni-exclusive
+\DeclareTextComposite{\tipaunibang}{TU}{c}{"1C2}%% tipauni-exclusive
%%--** Alveolar lateral
\DeclareTextSymbol{\textdoublepipe}{TU}{"1C1}% ǁ
%%-- Implosives
@@ -647,24 +836,24 @@ Unicode characters with TIPA commands]
\DeclareTextSymbol{\textturnh}{TU}{"265}%% ɥ
\DeclareTextSymbol{\textsch}{TU}{"29C}%% ʜ
\DeclareTextSymbol{\textbarrevglotstop}{TU}{"2A2}%% ʢ
-\DeclareTextComposite{\tipaunistar}{TU}{1}{"2A2} %% tipauni-exclusive
+\DeclareTextComposite{\tipaunistar}{TU}{1}{"2A2}%% tipauni-exclusive
\DeclareTextSymbol{\textbarglotstop}{TU}{"2A1}%% ʡ
-\DeclareTextComposite{\tipaunistar}{TU}{2}{"2A1} %% tipauni-exclusive
+\DeclareTextComposite{\tipaunistar}{TU}{2}{"2A1}%% tipauni-exclusive
\DeclareTextSymbol{\textctc}{TU}{"255}%% ɕ
\DeclareTextSymbol{\textctz}{TU}{"291}%% ʑ
-\DeclareTextComposite{\tipaunistar}{TU}{Z}{"291} %% tipauni-exclusive
+\DeclareTextComposite{\tipaunistar}{TU}{Z}{"291}%% tipauni-exclusive
\DeclareTextSymbol{\textturnlonglegr}{TU}{"27A}%% ɺ
-\DeclareTextComposite{\tipaunibang}{TU}{r}{"27A} %% tipauni-exclusive
+\DeclareTextComposite{\tipaunibang}{TU}{r}{"27A}%% tipauni-exclusive
\DeclareTextSymbol{\texththeng}{TU}{"267}%% ɧ
-\DeclareTextComposite{\tipaunistar}{TU}{3}{"267} %% tipauni-exclusive
-\DeclareTextComposite{\tipaunistar}{TU}{k}{"029E} % ʞ
-\DeclareTextComposite{\tipaunistar}{TU}{t}{"287} % ʇ
-\DeclareTextComposite{\tipaunistar}{TU}{w}{"28D} % ʍ
-\DeclareTextComposite{\tipaunisemicolon}{TU}{E}{"1D07} % ᴇ
-\DeclareTextComposite{\tipaunisemicolon}{TU}{J}{"1D0A} % ᴊ
-\DeclareTextComposite{\tipaunisemicolon}{TU}{A}{"1D00} % ᴀ
-\DeclareTextComposite{\tipaunisemicolon}{TU}{H}{"29C} % ʜ
-\DeclareTextComposite{\tipaunisemicolon}{TU}{U}{"1D1C} % ᴜ
+\DeclareTextComposite{\tipaunistar}{TU}{3}{"267}%% tipauni-exclusive
+\DeclareTextComposite{\tipaunistar}{TU}{k}{"029E}% ʞ
+\DeclareTextComposite{\tipaunistar}{TU}{t}{"287}% ʇ
+\DeclareTextComposite{\tipaunistar}{TU}{w}{"28D}% ʍ
+\DeclareTextComposite{\tipaunisemicolon}{TU}{E}{"1D07}% ᴇ
+\DeclareTextComposite{\tipaunisemicolon}{TU}{J}{"1D0A}% ᴊ
+\DeclareTextComposite{\tipaunisemicolon}{TU}{A}{"1D00}% ᴀ
+\DeclareTextComposite{\tipaunisemicolon}{TU}{H}{"29C}% ʜ
+\DeclareTextComposite{\tipaunisemicolon}{TU}{U}{"1D1C}% ᴜ
%% Vowels
\DeclareTextSymbol{\textsci}{TU}{"26A}%% ɪ
\DeclareTextSymbol{\textscy}{TU}{"28F}%% ʏ
@@ -700,16 +889,16 @@ Unicode characters with TIPA commands]
% diacritics.
% \begin{macrocode}
%% No audible release
-\DeclareUnicodeAccent{\textcorner}{TU}{"31A}%% ̚
+\DeclareTextSymbol{\textcorner}{TU}{"31A}%% ̚
\tipaunicmd{\tc}{̚}
%% Syllabic
-\DeclareUnicodeAccent{\textsyllabic}{TU}{"0329} %% ̩
+\DeclareUnicodeAccent{\textsyllabic}{TU}{"0329}%% ̩
\NewDocumentCommand\s{ m }{\textsyllabic{\textipa{#1}}\nontipatrue}
%% Non-syllabic
-\DeclareUnicodeAccent{\textsubarch}{TU}{"032F} %% ̯
+\DeclareUnicodeAccent{\textsubarch}{TU}{"032F}%% ̯
\NewDocumentCommand\ns{ m }{\textsubarch{\textipa{#1}}}
%% Laminal
-\DeclareUnicodeAccent{\textsubsquare}{TU}{"033B} %% ̻
+\DeclareUnicodeAccent{\textsubsquare}{TU}{"033B}%% ̻
\NewDocumentCommand\lmn{ m }{\textsubsquare{\textipa{#1}}\nontipatrue}
%% Other complex shorthand commands
\DeclareTextCommand{\@pipeshorthands}{TU}[2]{%
@@ -759,7 +948,7 @@ Unicode characters with TIPA commands]
% We only search for the macros not contained in \pkg{tipa} if this is requested
% by the user.
% \begin{macrocode}
-\ifnontipaignore
+\iftipauni@nontipa@ignore
\cs_new_eq:NN \@@_nontipa_search: \prg_do_nothing:
\cs_new_eq:NN \@@_nontipa_search:n \use_none:n
\else
@@ -1126,66 +1315,66 @@ Unicode characters with TIPA commands]
% \begin{macrocode}
%%-- Dependent diacritic marks
%%--** Voiceless
-\DeclareUnicodeAccent{\textsubring}{TU}{"0325} %% ̥
+\DeclareUnicodeAccent{\textsubring}{TU}{"0325}%% ̥
\DeclareTextCommand{\r}{TU}{\tipaunisubring}
\protected\def\tipaunisubring{\@ifstar{\TipaUniSubRing}{\TipaUniSubRing}}
\NewDocumentCommand\TipaUniSubRing{ m }{\textsubring{\textipa{#1}}}
%%--** Voiced
-\DeclareUnicodeAccent{\textsubwedge}{TU}{"032C} %% ̬
+\DeclareUnicodeAccent{\textsubwedge}{TU}{"032C}%% ̬
\DeclareTextCommand{\v}{TU}{\tipaunisubwedge}
\protected\def\tipaunisubwedge{\@ifstar{\TipaUniSubWedge}{\TipaUniSubWedge}}
\NewDocumentCommand\TipaUniSubWedge{ m }{\textsubwedge{\textipa{#1}}}
%%--** More rounded
-\DeclareUnicodeAccent{\textsubrhalfring}{TU}{"0339} %% ̹
+\DeclareUnicodeAccent{\textsubrhalfring}{TU}{"0339}%% ̹
\NewDocumentCommand\tipaunisubrhalfring{ m }{\textsubrhalfring{\textipa{#1}}}
%%--** Less rounded
-\DeclareUnicodeAccent{\textsublhalfring}{TU}{"031C} %% ̜
+\DeclareUnicodeAccent{\textsublhalfring}{TU}{"031C}%% ̜
\NewDocumentCommand\tipaunisublhalfring{ m }{\textsublhalfring{\textipa{#1}}}
%%--** Advanced
-\DeclareUnicodeAccent{\textsubplus}{TU}{"031F} %% ̟
+\DeclareUnicodeAccent{\textsubplus}{TU}{"031F}%% ̟
\NewDocumentCommand\tipaunisubplus{ m }{\textsubplus{\textipa{#1}}}
%%--** Retracted
-\DeclareUnicodeAccent{\textsubbar}{TU}{"0320} %% ̠
+\DeclareUnicodeAccent{\textsubbar}{TU}{"0320}%% ̠
\DeclareTextCommand{\=}{TU}{\tipaunisubbar}
\protected\def\tipaunisubbar{\@ifstar{\TipaUniSubBar}{\TipaUniSubBar}}
\NewDocumentCommand\TipaUniSubBar{ m }{\textsubbar{\textipa{#1}}}
%%--** Mid-centralized
-\DeclareUnicodeAccent{\textovercross}{TU}{"033D} %% ̽
+\DeclareUnicodeAccent{\textovercross}{TU}{"033D}%% ̽
\NewDocumentCommand\tipauniovercross{ m }{\textovercross{\textipa{#1}}}
%%--** Breathy voiced
-\DeclareUnicodeAccent{\textsubumlaut}{TU}{"0324} %% ̤
+\DeclareUnicodeAccent{\textsubumlaut}{TU}{"0324}%% ̤
\DeclareTextCommand{\"}{TU}{\tipaunisubumlaut}
\protected\def\tipaunisubumlaut{\@ifstar{\TipaUniSubUmlaut}{\TipaUniSubUmlaut}}
\NewDocumentCommand\TipaUniSubUmlaut{ m }{\textsubumlaut{\textipa{#1}}}
%%--** Creaky voiced
-\DeclareUnicodeAccent{\textsubtilde}{TU}{"0330} %% ̰
+\DeclareUnicodeAccent{\textsubtilde}{TU}{"0330}%% ̰
\DeclareTextCommand{\~}{TU}{\tipaunisubtilde}
\protected\def\tipaunisubtilde{\@ifstar{\TipaUniSubTilde}{\TipaUniSubTilde}}
\NewDocumentCommand\TipaUniSubTilde{ m }{\textsubtilde{\textipa{#1}}}
%%--** Linguo-labialized
-\DeclareUnicodeAccent{\textseagull}{TU}{"033C} %% ̼
+\DeclareUnicodeAccent{\textseagull}{TU}{"033C}%% ̼
\NewDocumentCommand\tipauniseagull{ m }{\textseagull{#1}}
%%--** Velarized
-\DeclareUnicodeAccent{\textsuperimposetilde}{TU}{"0334} %% ̴
+\DeclareUnicodeAccent{\textsuperimposetilde}{TU}{"0334}%% ̴
\NewDocumentCommand\tipaunisuperimposetilde{ m }{\textsuperimposetilde{#1}}
\NewDocumentCommand\vl{ m }{\textsuperimposetilde{\textipa{#1}}}
%%--** Raised
-\DeclareUnicodeAccent{\textraising}{TU}{"031D} %% ̝
+\DeclareUnicodeAccent{\textraising}{TU}{"031D}%% ̝
\NewDocumentCommand{\tipauniraising}{m}{\textraising{#1}}
%%--** Lowered
-\DeclareUnicodeAccent{\textlowering}{TU}{"031E} %% ̞
+\DeclareUnicodeAccent{\textlowering}{TU}{"031E}%% ̞
\NewDocumentCommand{\tipaunilowering}{m}{\textlowering{#1}}
-% %%--** Advanced tongue root
-\DeclareUnicodeAccent{\textadvancing}{TU}{"0318} %% ̘
+%%%--** Advanced tongue root
+\DeclareUnicodeAccent{\textadvancing}{TU}{"0318}%% ̘
\NewDocumentCommand{\tipauniadvancing}{m}{\textadvancing{#1}}
%%--** Retracted tongue root
-\DeclareUnicodeAccent{\textretracting}{TU}{"0319} %% ̙
+\DeclareUnicodeAccent{\textretracting}{TU}{"0319}%% ̙
\NewDocumentCommand{\tipauniretracting}{m}{\textretracting{#1}}
%%--** Dental
-\DeclareUnicodeAccent{\textsubbridge}{TU}{"032A} %% ̪
+\DeclareUnicodeAccent{\textsubbridge}{TU}{"032A}%% ̪
\NewDocumentCommand\tipaunisubbridge{ m }{\textsubbridge{#1}}
%%--** Apical
-\DeclareUnicodeAccent{\textinvsubbridge}{TU}{"033A} %% ̺
+\DeclareUnicodeAccent{\textinvsubbridge}{TU}{"033A}%% ̺
\NewDocumentCommand\tipauniinvsubbridge{ m }{\textinvsubbridge{#1}}
%%--** Tie bar (above)
\DeclareTextCommand{\tipaunitexttoptiebar}{TU}[2]{#1\symbol{"0361}#2}
diff --git a/Master/texmf-dist/source/latex/tipauni/tipauni.ins b/Master/texmf-dist/source/latex/tipauni/tipauni.ins
index 839888bfa0d..4ea7f67bb49 100644
--- a/Master/texmf-dist/source/latex/tipauni/tipauni.ins
+++ b/Master/texmf-dist/source/latex/tipauni/tipauni.ins
@@ -15,8 +15,8 @@ Bug tracker: https://puszcza.gnu.org.ua/bugs/?group=tipauni
License: GPL v3.0+, GFDL 1.3+
---------------------------------------------------------------------------
-LaTeX Package tipauni v0.4
-Copyright © 2021 निरंजन
+LaTeX Package tipauni v0.4.1
+Copyright © 2021, 2022 निरंजन
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/Master/texmf-dist/tex/latex/tipauni/tipauni.sty b/Master/texmf-dist/tex/latex/tipauni/tipauni.sty
index 8ebeb4d4001..874522def2f 100644
--- a/Master/texmf-dist/tex/latex/tipauni/tipauni.sty
+++ b/Master/texmf-dist/tex/latex/tipauni/tipauni.sty
@@ -15,8 +15,8 @@
%% License: GPL v3.0+, GFDL 1.3+
%% ---------------------------------------------------------------------------
%%
-%% LaTeX Package tipauni v0.4
-%% Copyright © 2021 निरंजन
+%% LaTeX Package tipauni v0.4.1
+%% Copyright © 2021, 2022 निरंजन
%%
%% This program is free software: you can redistribute it and/or modify
%% it under the terms of the GNU General Public License as published by
@@ -39,23 +39,99 @@
%% ---------------------------------------------------------------------------
%%
\def\tipauniname{tipauni}
-\def\tipauniversion{0.4}
-\def\tipaunidate{2021-12-16}
+\def\tipauniversion{0.5}
+\def\tipaunidate{2022-02-20}
\def\tipaunidescription{For producing Unicode characters with TIPA commands}
-\ProvidesPackage{tipauni}[2021/12/16 v0.4
+\ProvidesPackage{tipauni}[2022/02/20 v0.5
Unicode characters with TIPA commands]
\RequirePackage{xparse}
\RequirePackage{fontspec}
-\RequirePackage{xkeyval}
-\setmainfont{CharisSIL} %% https://ctan.org/pkg/charissil
-\DeclareOptionX{documentfont}{\setmainfont{#1}}
-\newif\ifnontipaignore
-\DeclareOptionX{incompatible}{\nontipaignoretrue}
-\ProcessOptionsX\relax
+\RequirePackage{expkv-def,expkv-opt}
+\newif\iftipauni@document@font
+\def\tipauni@recommended@font{CharisSIL}
+\tipauni@document@fonttrue
+\let\tipauni@font@options\@empty
+\ekvdefinekeys{tipauni}{%
+ bool incompatible = \iftipauni@nontipa@ignore,%
+ noval preservefont = {%
+ \let\tipauni@font\tipauni@undefined
+ \tipauni@document@fontfalse
+ },%
+ estore fontspecoptions = \tipauni@font@options,%
+ new noval fontspecoptions = {%
+ \PackageWarningNoLine{tipauni}{%
+ As you haven't given any value to package option\MessageBreak
+ `fontspecoptions'; it will be ignored. Please\MessageBreak
+ provide a valid (list of) fontspec option(s)%
+ }%
+ },%
+ noval resetfontspecoptions = {%
+ \let\tipauni@font@options\@empty
+ },%
+ noval documentfont = {%
+ \PackageError{tipauni}{No value for the `documentfont' option}{%
+ The `documentfont' option has no value. Please provide a valid font-name,%
+ \MessageBreak
+ otherwise it will be ignored or (if given) the value of another non-empty%
+ \MessageBreak
+ `documentfont' will be used.%
+ }%
+ \ifdefined\tipauni@font
+ \tipauni@document@fonttrue
+ \else
+ \tipauni@document@fontfalse
+ \fi
+ },%
+ new code documentfont = {%
+ \edef\tipauni@temp{#1}%
+ \ifx\tipauni@temp\@empty
+ \PackageError{tipauni}{Empty `documentfont' option}{%
+ The `documentfont' option has an empty value. Please provide a valid%
+ \MessageBreak
+ font-name, otherwise it will be ignored or (if given) the value of%
+ \MessageBreak
+ another non-empty `documentfont' will be used.%
+ }%
+ \ifdefined\tipauni@font
+ \tipauni@document@fonttrue
+ \else
+ \tipauni@document@fontfalse
+ \fi
+ \else
+ \tipauni@document@fonttrue
+ \let\tipauni@font\tipauni@temp
+ \fi
+ },%
+ noval recommendedfont = {%
+ \tipauni@document@fonttrue
+ \let\tipauni@font\tipauni@recommended@font
+ }%
+}
+\ekvoProcessLocalOptions{tipauni}
+\iftipauni@document@font
+ \ifdefined\tipauni@font
+ \else
+ \let\tipauni@font\tipauni@recommended@font
+ \fi
+ \expandafter\setmainfont\expandafter
+ [\expandafter{\tipauni@font@options}]{\tipauni@font}
+\else
+ \ifx\tipauni@font@options\@empty
+ \else
+ \PackageWarningNoLine{tipauni}{%
+ An active font loaded with package fontspec is\MessageBreak
+ necessary for `fontspecoptions' to take effect.\MessageBreak
+ Please use the `documentfont'/`recommendedfont'\MessageBreak
+ option or load a font outside package `tipauni'\MessageBreak
+ to make your options active. Currently ignoring:\MessageBreak
+ [\tipauni@font@options]%
+ }%
+ \fi
+\fi
\newif\ifnontipa
\protected\def\nontipatrue{\global\let\ifnontipa\iftrue}
\protected\def\nontipafalse{\global\let\ifnontipa\iffalse}
-\ifnontipaignore
+\iftipauni@nontipa@ignore
\protected\def\nontipatrue{}
\fi
\NewDocumentCommand\tipaunicmd{ m m }{%
@@ -120,8 +196,8 @@ Unicode characters with TIPA commands]
\DeclareTextComposite{\tipaunisemicolon}{TU}{R}{"280}
%%-- Taps or flaps
%%-- Labiodental flap
-\tipaunicmd{\labdentflap}{ⱱ} %% tipauni-exclusive
-\DeclareTextComposite{\tipaunistar}{TU}{v}{"2C71} %% tipauni-exclusive
+\tipaunicmd{\labdentflap}{ⱱ}%% tipauni-exclusive
+\DeclareTextComposite{\tipaunistar}{TU}{v}{"2C71}%% tipauni-exclusive
%%--** Alveolar
\DeclareTextSymbol{\textfishhookr}{TU}{"27E}%% ɾ
%%--** Retroflex
@@ -162,7 +238,7 @@ Unicode characters with TIPA commands]
\DeclareTextComposite{\tipaunistar}{TU}{z}{"26E}
%%-- Approximants
%%-- Labiodental approximant
-\tipaunicmd{\labdentapp}{ʋ} %% tipauni-exclusive
+\tipaunicmd{\labdentapp}{ʋ}%% tipauni-exclusive
%%--** Alveolar
\DeclareTextSymbol{\textturnr}{TU}{"279}%% ɹ
\DeclareTextComposite{\tipaunistar}{TU}{r}{"279}
@@ -185,10 +261,10 @@ Unicode characters with TIPA commands]
\DeclareTextSymbol{\textbullseye}{TU}{"298}%% ʘ
\DeclareTextComposite{\tipaunibang}{TU}{o}{"298}
%%-- Postalveolar click
-\tipaunicmd{\pstalvclick}{ǃ} %% tipauni-exclusive
+\tipaunicmd{\pstalvclick}{ǃ}%% tipauni-exclusive
%%--** Palato-alveolar
\DeclareTextSymbol{\textdoublebarpipe}{TU}{"1C2}%% ǂ
-\DeclareTextComposite{\tipaunibang}{TU}{c}{"1C2} %% tipauni-exclusive
+\DeclareTextComposite{\tipaunibang}{TU}{c}{"1C2}%% tipauni-exclusive
%%--** Alveolar lateral
\DeclareTextSymbol{\textdoublepipe}{TU}{"1C1}% ǁ
%%-- Implosives
@@ -212,24 +288,24 @@ Unicode characters with TIPA commands]
\DeclareTextSymbol{\textturnh}{TU}{"265}%% ɥ
\DeclareTextSymbol{\textsch}{TU}{"29C}%% ʜ
\DeclareTextSymbol{\textbarrevglotstop}{TU}{"2A2}%% ʢ
-\DeclareTextComposite{\tipaunistar}{TU}{1}{"2A2} %% tipauni-exclusive
+\DeclareTextComposite{\tipaunistar}{TU}{1}{"2A2}%% tipauni-exclusive
\DeclareTextSymbol{\textbarglotstop}{TU}{"2A1}%% ʡ
-\DeclareTextComposite{\tipaunistar}{TU}{2}{"2A1} %% tipauni-exclusive
+\DeclareTextComposite{\tipaunistar}{TU}{2}{"2A1}%% tipauni-exclusive
\DeclareTextSymbol{\textctc}{TU}{"255}%% ɕ
\DeclareTextSymbol{\textctz}{TU}{"291}%% ʑ
-\DeclareTextComposite{\tipaunistar}{TU}{Z}{"291} %% tipauni-exclusive
+\DeclareTextComposite{\tipaunistar}{TU}{Z}{"291}%% tipauni-exclusive
\DeclareTextSymbol{\textturnlonglegr}{TU}{"27A}%% ɺ
-\DeclareTextComposite{\tipaunibang}{TU}{r}{"27A} %% tipauni-exclusive
+\DeclareTextComposite{\tipaunibang}{TU}{r}{"27A}%% tipauni-exclusive
\DeclareTextSymbol{\texththeng}{TU}{"267}%% ɧ
-\DeclareTextComposite{\tipaunistar}{TU}{3}{"267} %% tipauni-exclusive
-\DeclareTextComposite{\tipaunistar}{TU}{k}{"029E} % ʞ
-\DeclareTextComposite{\tipaunistar}{TU}{t}{"287} % ʇ
-\DeclareTextComposite{\tipaunistar}{TU}{w}{"28D} % ʍ
-\DeclareTextComposite{\tipaunisemicolon}{TU}{E}{"1D07} % ᴇ
-\DeclareTextComposite{\tipaunisemicolon}{TU}{J}{"1D0A} % ᴊ
-\DeclareTextComposite{\tipaunisemicolon}{TU}{A}{"1D00} % ᴀ
-\DeclareTextComposite{\tipaunisemicolon}{TU}{H}{"29C} % ʜ
-\DeclareTextComposite{\tipaunisemicolon}{TU}{U}{"1D1C} % ᴜ
+\DeclareTextComposite{\tipaunistar}{TU}{3}{"267}%% tipauni-exclusive
+\DeclareTextComposite{\tipaunistar}{TU}{k}{"029E}% ʞ
+\DeclareTextComposite{\tipaunistar}{TU}{t}{"287}% ʇ
+\DeclareTextComposite{\tipaunistar}{TU}{w}{"28D}% ʍ
+\DeclareTextComposite{\tipaunisemicolon}{TU}{E}{"1D07}% ᴇ
+\DeclareTextComposite{\tipaunisemicolon}{TU}{J}{"1D0A}% ᴊ
+\DeclareTextComposite{\tipaunisemicolon}{TU}{A}{"1D00}% ᴀ
+\DeclareTextComposite{\tipaunisemicolon}{TU}{H}{"29C}% ʜ
+\DeclareTextComposite{\tipaunisemicolon}{TU}{U}{"1D1C}% ᴜ
%% Vowels
\DeclareTextSymbol{\textsci}{TU}{"26A}%% ɪ
\DeclareTextSymbol{\textscy}{TU}{"28F}%% ʏ
@@ -261,16 +337,16 @@ Unicode characters with TIPA commands]
\NewDocumentCommand\stdlnetiebar{ m }{\tipaunits#1}
\NewDocumentCommand\ts{ m }{\tipaunits#1}
%% No audible release
-\DeclareUnicodeAccent{\textcorner}{TU}{"31A}%% ̚
+\DeclareTextSymbol{\textcorner}{TU}{"31A}%% ̚
\tipaunicmd{\tc}{̚}
%% Syllabic
-\DeclareUnicodeAccent{\textsyllabic}{TU}{"0329} %% ̩
+\DeclareUnicodeAccent{\textsyllabic}{TU}{"0329}%% ̩
\NewDocumentCommand\s{ m }{\textsyllabic{\textipa{#1}}\nontipatrue}
%% Non-syllabic
-\DeclareUnicodeAccent{\textsubarch}{TU}{"032F} %% ̯
+\DeclareUnicodeAccent{\textsubarch}{TU}{"032F}%% ̯
\NewDocumentCommand\ns{ m }{\textsubarch{\textipa{#1}}}
%% Laminal
-\DeclareUnicodeAccent{\textsubsquare}{TU}{"033B} %% ̻
+\DeclareUnicodeAccent{\textsubsquare}{TU}{"033B}%% ̻
\NewDocumentCommand\lmn{ m }{\textsubsquare{\textipa{#1}}\nontipatrue}
%% Other complex shorthand commands
\DeclareTextCommand{\@pipeshorthands}{TU}[2]{%
@@ -306,7 +382,7 @@ Unicode characters with TIPA commands]
\tl_new:N \l__tipauni_textipa_tl
\seq_set_split:Nnn \l__tipauni_remove_from_accents_seq { , }
{ \~, \=, \", \r, \v, \t }
-\ifnontipaignore
+\iftipauni@nontipa@ignore
\cs_new_eq:NN \__tipauni_nontipa_search: \prg_do_nothing:
\cs_new_eq:NN \__tipauni_nontipa_search:n \use_none:n
\else
@@ -524,65 +600,66 @@ Unicode characters with TIPA commands]
\ExplSyntaxOff
%%-- Dependent diacritic marks
%%--** Voiceless
-\DeclareUnicodeAccent{\textsubring}{TU}{"0325} %% ̥
+\DeclareUnicodeAccent{\textsubring}{TU}{"0325}%% ̥
\DeclareTextCommand{\r}{TU}{\tipaunisubring}
\protected\def\tipaunisubring{\@ifstar{\TipaUniSubRing}{\TipaUniSubRing}}
\NewDocumentCommand\TipaUniSubRing{ m }{\textsubring{\textipa{#1}}}
%%--** Voiced
-\DeclareUnicodeAccent{\textsubwedge}{TU}{"032C} %% ̬
+\DeclareUnicodeAccent{\textsubwedge}{TU}{"032C}%% ̬
\DeclareTextCommand{\v}{TU}{\tipaunisubwedge}
\protected\def\tipaunisubwedge{\@ifstar{\TipaUniSubWedge}{\TipaUniSubWedge}}
\NewDocumentCommand\TipaUniSubWedge{ m }{\textsubwedge{\textipa{#1}}}
%%--** More rounded
-\DeclareUnicodeAccent{\textsubrhalfring}{TU}{"0339} %% ̹
+\DeclareUnicodeAccent{\textsubrhalfring}{TU}{"0339}%% ̹
\NewDocumentCommand\tipaunisubrhalfring{ m }{\textsubrhalfring{\textipa{#1}}}
%%--** Less rounded
-\DeclareUnicodeAccent{\textsublhalfring}{TU}{"031C} %% ̜
+\DeclareUnicodeAccent{\textsublhalfring}{TU}{"031C}%% ̜
\NewDocumentCommand\tipaunisublhalfring{ m }{\textsublhalfring{\textipa{#1}}}
%%--** Advanced
-\DeclareUnicodeAccent{\textsubplus}{TU}{"031F} %% ̟
+\DeclareUnicodeAccent{\textsubplus}{TU}{"031F}%% ̟
\NewDocumentCommand\tipaunisubplus{ m }{\textsubplus{\textipa{#1}}}
%%--** Retracted
-\DeclareUnicodeAccent{\textsubbar}{TU}{"0320} %% ̠
+\DeclareUnicodeAccent{\textsubbar}{TU}{"0320}%% ̠
\DeclareTextCommand{\=}{TU}{\tipaunisubbar}
\protected\def\tipaunisubbar{\@ifstar{\TipaUniSubBar}{\TipaUniSubBar}}
\NewDocumentCommand\TipaUniSubBar{ m }{\textsubbar{\textipa{#1}}}
%%--** Mid-centralized
-\DeclareUnicodeAccent{\textovercross}{TU}{"033D} %% ̽
+\DeclareUnicodeAccent{\textovercross}{TU}{"033D}%% ̽
\NewDocumentCommand\tipauniovercross{ m }{\textovercross{\textipa{#1}}}
%%--** Breathy voiced
-\DeclareUnicodeAccent{\textsubumlaut}{TU}{"0324} %% ̤
+\DeclareUnicodeAccent{\textsubumlaut}{TU}{"0324}%% ̤
\DeclareTextCommand{\"}{TU}{\tipaunisubumlaut}
\protected\def\tipaunisubumlaut{\@ifstar{\TipaUniSubUmlaut}{\TipaUniSubUmlaut}}
\NewDocumentCommand\TipaUniSubUmlaut{ m }{\textsubumlaut{\textipa{#1}}}
%%--** Creaky voiced
-\DeclareUnicodeAccent{\textsubtilde}{TU}{"0330} %% ̰
+\DeclareUnicodeAccent{\textsubtilde}{TU}{"0330}%% ̰
\DeclareTextCommand{\~}{TU}{\tipaunisubtilde}
\protected\def\tipaunisubtilde{\@ifstar{\TipaUniSubTilde}{\TipaUniSubTilde}}
\NewDocumentCommand\TipaUniSubTilde{ m }{\textsubtilde{\textipa{#1}}}
%%--** Linguo-labialized
-\DeclareUnicodeAccent{\textseagull}{TU}{"033C} %% ̼
+\DeclareUnicodeAccent{\textseagull}{TU}{"033C}%% ̼
\NewDocumentCommand\tipauniseagull{ m }{\textseagull{#1}}
%%--** Velarized
-\DeclareUnicodeAccent{\textsuperimposetilde}{TU}{"0334} %% ̴
+\DeclareUnicodeAccent{\textsuperimposetilde}{TU}{"0334}%% ̴
\NewDocumentCommand\tipaunisuperimposetilde{ m }{\textsuperimposetilde{#1}}
\NewDocumentCommand\vl{ m }{\textsuperimposetilde{\textipa{#1}}}
%%--** Raised
-\DeclareUnicodeAccent{\textraising}{TU}{"031D} %% ̝
+\DeclareUnicodeAccent{\textraising}{TU}{"031D}%% ̝
\NewDocumentCommand{\tipauniraising}{m}{\textraising{#1}}
%%--** Lowered
-\DeclareUnicodeAccent{\textlowering}{TU}{"031E} %% ̞
+\DeclareUnicodeAccent{\textlowering}{TU}{"031E}%% ̞
\NewDocumentCommand{\tipaunilowering}{m}{\textlowering{#1}}
-\DeclareUnicodeAccent{\textadvancing}{TU}{"0318} %% ̘
+%%%--** Advanced tongue root
+\DeclareUnicodeAccent{\textadvancing}{TU}{"0318}%% ̘
\NewDocumentCommand{\tipauniadvancing}{m}{\textadvancing{#1}}
%%--** Retracted tongue root
-\DeclareUnicodeAccent{\textretracting}{TU}{"0319} %% ̙
+\DeclareUnicodeAccent{\textretracting}{TU}{"0319}%% ̙
\NewDocumentCommand{\tipauniretracting}{m}{\textretracting{#1}}
%%--** Dental
-\DeclareUnicodeAccent{\textsubbridge}{TU}{"032A} %% ̪
+\DeclareUnicodeAccent{\textsubbridge}{TU}{"032A}%% ̪
\NewDocumentCommand\tipaunisubbridge{ m }{\textsubbridge{#1}}
%%--** Apical
-\DeclareUnicodeAccent{\textinvsubbridge}{TU}{"033A} %% ̺
+\DeclareUnicodeAccent{\textinvsubbridge}{TU}{"033A}%% ̺
\NewDocumentCommand\tipauniinvsubbridge{ m }{\textinvsubbridge{#1}}
%%--** Tie bar (above)
\DeclareTextCommand{\tipaunitexttoptiebar}{TU}[2]{#1\symbol{"0361}#2}