CTAN sync 202003120300

21 files changed, 1649 insertions, 119 deletions

diff --git a/macros/latex/contrib/cases/README b/macros/latex/contrib/cases/README
index ee694332bf..5ddd34b8a4 100644
--- a/macros/latex/contrib/cases/README
+++ b/macros/latex/contrib/cases/README
@@ -1,4 +1,4 @@
-cases.sty version 3.0 2020/02/22
+cases.sty version 3.1 2020/03/10
 
 Copyright 1993, 1994, 1995, 2000, 2002, 2020 by Donald Arseneau,
 asnd@triumf.ca, Vancouver, Canada.
diff --git a/macros/latex/contrib/cases/cases.pdf b/macros/latex/contrib/cases/cases.pdf
index 21e48d54ff..168e8488fc 100644
--- a/macros/latex/contrib/cases/cases.pdf
+++ b/macros/latex/contrib/cases/cases.pdf
diff --git a/macros/latex/contrib/cases/cases.sty b/macros/latex/contrib/cases/cases.sty
index 66609ee492..13d2effa54 100644
--- a/macros/latex/contrib/cases/cases.sty
+++ b/macros/latex/contrib/cases/cases.sty
@@ -1,4 +1,4 @@
-%  C A S E S . S T Y             ver 3.0    Feb 2020
+%  C A S E S . S T Y             ver 3.1    Mar 2020
 %
 %  Copyright (C) 1993,1994,1995,2000,2002,2020 by Donald Arseneau
 %                                       asnd@triumf.ca
@@ -30,11 +30,11 @@
 %
 %  For detailed description and package options, see cases.pdf (cases.tex).
  
-\ProvidesPackage{cases}[2020/02/22 ver 3.0]
+\ProvidesPackage{cases}[2020/03/10 ver 3.1]
 
 \newdimen\numc@numwid
 
-% copy \@@eqncr but change error message and handle \tag{} for amsmath:
+% copy \@@eqncr but change error message and handle \tag for amsmath:
 \def\@@numc@cr{\let\reserved@a\relax
     \ifcase\@eqcnt \def\reserved@a{& & &}\or \def\reserved@a{& &}%
      \or \def\reserved@a{&}\else
@@ -42,7 +42,6 @@
        \@latex@error{Too many columns in numcases environment}\@ehc\fi
      \reserved@a \if@eqnsw\@eqnnum\stepcounter{equation}\else \iftag@ \df@tag\fi\fi
      \global\@eqnswtrue\global\@eqcnt\z@\cr}
-
 \let\iftag@=\iffalse
 
 \newenvironment{numcases}[1]%
@@ -54,7 +53,7 @@
  \numc@setsub % maybe \subequations (handling \refstepcounter)
  \def\@currentlabel{\p@equation\theequation}%
  \global\@eqnswtrue\m@th
- \def\tag##1{\def\@currentlabel{##1}\tag@in@align{##1}}%
+ \let\tag\numc@tag
  \settowidth{\numc@numwid}{\ \advance\c@equation\tw@\numc@eqnnum}%
  \@tempskipb\@centering
  \ifx\numc@left\mathindent % fleqn:
@@ -74,9 +73,9 @@
   \everycr{}\let\\\@eqncr \let\@@eqncr\@@numc@cr
   \tabskip\@tempskipa
   \halign to\dimen@ii \bgroup % white space for LHS followed by RHS
-    \kern\wd\z@ \kern10\p@ % assume width of brace
-    \global\let\iftag@=\iffalse % for amsmath (make sure this is not in if block)
-    \global\@eqcnt\@ne $\numc@dispstyle{##}$\hfil 
+    \kern\wd\z@ \kern10\p@ % assume (and force) width of brace
+    \global\let\iftag@=\iffalse % for amsmath (make sure this is not in \if block)
+    \global\@eqcnt\@ne $\numc@dispstyle ##\relax$\hfil 
     \tabskip\z@skip &% explanation
     \global\@eqcnt\tw@
     \numc@expstyle\quad ##\unskip\numc@expstyle\hfil % \unskip removes quad if no explanation
@@ -133,6 +132,11 @@ $$\global\@ignoretrue}
 
 \@ifundefined{c@parentequation}{% No AMS
 \def\numc@eqnnum{\@eqnnum}
+% for \tag (but not \tag*) without amsmath, using \@@numc@cr above.
+\def\numc@tag#1{\def\@currentlabel{#1}%
+  \gdef\df@tag{\def\theequation{#1}\@eqnnum}%
+  \global\let\iftag@=\iftrue
+  \nonumber}
 %
 % These versions of subequations follow the style of Gildea's subeqn.sty,
 % but are thoroughly rewritten.  
@@ -184,8 +188,9 @@ $$\global\@ignoretrue}
 %  \subequations already defined;
 % use tag format
 \def\numc@eqnnum{\tagform@{\theequation}}    
-% add little space after brace to amsmath's cases
+\def\numc@tag{\tag@in@align}
 
+% add little space after brace to amsmath's cases
 \def\@tempa{%
   \let\@ifnextchar\new@ifnextchar
   \left\lbrace
@@ -241,7 +246,7 @@ $$\global\@ignoretrue}
     \openup\jot
     \tabskip\z@skip 
     \halign \bgroup 
-      $\numc@dispstyle{##}\m@th$\hfil 
+      $\numc@dispstyle ##\m@th$\hfil 
       &\numc@expstyle\quad ##\unskip\numc@expstyle\hfil % \unskip removes space if no explanations
       \cr
  }{%
diff --git a/macros/latex/contrib/cases/cases.tex b/macros/latex/contrib/cases/cases.tex
index f2bb343590..42a2b3efb5 100644
--- a/macros/latex/contrib/cases/cases.tex
+++ b/macros/latex/contrib/cases/cases.tex
@@ -23,9 +23,9 @@
 %\addtokomafont{title}{\rmfamily}
 
 \title{The \pkg{cases} package%
-  \textnormal{\thanks{~~This manual corresponds to \pkg{cases}~v3.0, dated 2020/02/22.}}}
+  \textnormal{\thanks{~~This manual corresponds to \pkg{cases}~v3.1, dated 2020/03/10.}}}
 \author{Donald Arseneau\\\mail{asnd@triumf.ca}}
-\date{Feb 2020}
+\date{Mar 2020}
 
 
 \begin{document}
@@ -69,7 +69,7 @@ case. In a \env{subnumcases} environment, a \cmd{\label} in the \meta{left side}
 equation gives the overall equation number, without any letter. 
 
 To use this package, 
-include "\usepackage{cases}"  after \cmd{\documentclass}, and also after 
+include "\usepackage{cases}" after \cmd{\documentclass}, and also after 
 "\usepackage{amsmath}" if you are using that.
 
 \fancybreak
@@ -89,7 +89,7 @@ this package.
 \item[\opt{subnum}] Force all \env{numcases} environments to be treated as 
     \env{subnumcases}.
 \item[\opt{amsstyle}] For compatibility with \pkg{amsmath}'s \env{cases}, make \env{numcases}
-    use cramped math style ("\textstyle"), and put explanations in the same math style.
+    use cramped math style (\cmd{\textstyle}), and put explanations in the same math style.
 \item[\opt{casesstyle}] Change \pkg{amsmath}'s \env{cases} environment to work in the text/math style
     of \env{numcases}.
 \item[\opt{cases}] Define a \env{cases} environment for use without \pkg{amsmath}. (This 
@@ -114,8 +114,8 @@ A simple example is:
 Giving:
 %
 \begin{numcases} {|x|=}
-  x, & for $x \geq 0$\\
-  -x, & for $x < 0$
+  x, & for $x \geq 0$\label{x}\\
+  -x, & for $x < 0$\label{-x}
 \end{numcases}
 
 \fancybreak
@@ -185,10 +185,14 @@ which produces
 To get this more compact layout with \env{numcases} you can insert "\textstyle" 
 at the beginning of each case, as needed, or use the \pkg{cases} 
 package option \opt{amsstyle}. 
-To have  the \env{cases} environment give the more open layout of eq.~(\ref{weqn}) 
-you can put "\displaystyle" at the beginning of each case, or use the  
-option \opt{casesstyle} for the \pkg{cases} package. (Yes these go with the cases package, they
-are not options for amsmath.)
+To have  the (unnumbered) \env{cases} environment give the more open layout of
+eq.~(\ref{weqn}) you can put "\displaystyle" at the beginning of each case, or use
+the option \opt{casesstyle} for the \pkg{cases} package. (Yes these go with the
+\pkg{cases} package, they are not options for \pkg{amsmath}.)
+
+Another slight difference is that the cases within \env{numcases} can be right-justified by
+inserting \cmd{\hfill} at the beginning of each, which might be desired in rare situations,
+like maybe the absolute value example numbered (\ref{x}) and (\ref{-x}) above.
 
 For full disclosure, even without any relevant package options, cases.sty will 
 slightly adjust the \env{cases} environment from \pkg{amsmath}, by adding a little
@@ -205,6 +209,6 @@ sub-numbering style can be controlled more easily by defining
 \begin{verbatim}
 \renewcommand\thesubequation{\themainequation.\Alph{equation}} % 13.C
 \end{verbatim}
-
+(noting that the counter to reference is `equation' not `subequation').
 
 \end{document}
diff --git a/macros/latex/contrib/langsci-avm/README b/macros/latex/contrib/langsci-avm/README
new file mode 100644
index 0000000000..d08baf1fac
--- /dev/null
+++ b/macros/latex/contrib/langsci-avm/README
@@ -0,0 +1,38 @@
+langsci-avm is aimed at typesetting beautiful feature structures, 
+also known as attribute-value matrices (AVMs), for use in linguistics.
+
+The package provides a minimal and easy to read syntax. 
+It depends only on the array package and can be placed almost everywhere, 
+in particular in footnotes or graphs and tree structures. The package is meant
+as an update to, and serves the same purpose as, Christopher Manning’s 
+avm package, but shares no code base with that package.
+
+langsci-avm was developed at Language Science Press to help in the
+production of scientific texts in linguistics, in particular an 
+upcoming HPSG handbook.
+
+Copyright (C) 2020 by Felix Kopecky, Language Science Press
+
+This work consists of the file  langsci-avm.dtx &
+                                include/smallcaps-standalone.pdf.
+          and the derived files langsci-avm.ins,
+                                langsci-avm.pdf, 
+                                langsci-avm.sty.
+                                
+It may be distributed and/or modified under the conditions of the
+LaTeX Project Public License (LPPL), either version 1.3c of this
+license or (at your option) any later version. The latest version
+of this license is at <http://www.latex-project.org/lppl.txt>.
+
+This work is ``maintained'' (per LPPL maintenance status) by
+Felix Kopecky <felix.kopecky@langsci-press.org>.
+
+The development version of the bundle can be found at
+
+   https://github.com/langsci/langsci-avm
+
+for those people who are interested. Pull requests are welcome.
+
+Please report any bugs or feature requests to 
+
+   https://github.com/langsci/langsci-avm/issues
diff --git a/macros/latex/contrib/langsci-avm/include/smallcaps-standalone.pdf b/macros/latex/contrib/langsci-avm/include/smallcaps-standalone.pdf
new file mode 100644
index 0000000000..4b19ef7c3c
--- /dev/null
+++ b/macros/latex/contrib/langsci-avm/include/smallcaps-standalone.pdf
diff --git a/macros/latex/contrib/langsci-avm/langsci-avm.dtx b/macros/latex/contrib/langsci-avm/langsci-avm.dtx
new file mode 100644
index 0000000000..1d507aa499
--- /dev/null
+++ b/macros/latex/contrib/langsci-avm/langsci-avm.dtx
@@ -0,0 +1,719 @@
+% \iffalse meta-comment
+% !TeX program = xelatex
+% !TeX encoding = utf-8
+%<*internal>
+\begingroup
+%</internal>
+%<*install>
+\input{l3docstrip.tex}
+\keepsilent
+\askforoverwritefalse
+\preamble
+------------------------------------------------------------------------------
+
+langsci-avm: Attribute-value matrices (AVMs) and feature structures in LaTeX3.
+
+Copyright (C) 2020 by Felix Kopecky, Language Science Press
+
+This work consists of the file  langsci-avm.dtx &
+                                include/smallcaps-standalone.pdf.
+          and the derived files langsci-avm.ins,
+                                langsci-avm.pdf, 
+                                langsci-avm.sty.
+                                
+It may be distributed and/or modified under the conditions of the
+LaTeX Project Public License (LPPL), either version 1.3c of this
+license or (at your option) any later version. The latest version
+of this license is at <http://www.latex-project.org/lppl.txt>.
+
+This work is ``maintained'' (per LPPL maintenance status) by
+Felix Kopecky <felix.kopecky@langsci-press.org>.
+
+The development version of the bundle can be found at
+
+   https://github.com/langsci/langsci-avm
+
+for those people who are interested. Pull requests are welcome.
+
+Please report any bugs or feature requests to 
+
+   https://github.com/langsci/langsci-avm/issues
+
+------------------------------------------------------------------------------
+\endpreamble
+\declarepreamble\minimalpreamble
+\endpreamble
+\postamble
+\endpostamble
+\usedir{tex/latex/langsci-avm}
+\generate{
+  \file{\jobname.sty}{\from{\jobname.dtx}{package}}
+}
+%</install>
+%<install>\endbatchfile
+%<*internal>
+\usepreamble\minimalpreamble
+\usepostamble\defaultpostamble
+\usedir{source/latex/langsci-avm}
+\generate{
+  \file{\jobname.ins}{\from{\jobname.dtx}{install}}
+}
+\endgroup
+%</internal>
+%<*driver>
+\documentclass{l3doc}
+\usepackage[linguistics]{forest}
+\usepackage{langsci-avm,enumitem,url,gb4e}
+\setlist[description]{font=\normalfont}
+\begin{document}
+  \DocInput{\jobname.dtx}
+\end{document}
+%</driver>
+% \fi
+% \title{\pkg{langsci-avm}}
+% \author{Felix Kopecky\thanks{\protect\url{mailto:felix.kopecky@langsci-press.org}. 
+% 		Please submit bug reports and feature requests to
+% 		\protect\url{https://github.com/langsci/langsci-avm/issues}.
+% 	}}
+% \date{Version 0.1.0-beta -- 11th March 2020}
+% \maketitle
+% \frenchspacing
+% \begin{documentation}
+% \section{Introduction}
+% \pkg{langsci-avm} is a \LaTeX3 package aimed at typesetting beautiful feature structures, also known as \emph{attribute-value matrices}, for use in linguistics. The package provides a minimal and easy to read syntax. It depends only on the \pkg{array} package and can be placed almost everywhere, in particular in footnotes or graphs and tree structures. The package is meant as an update to, and serves the same purpose as, Christopher Manning's \pkg{avm} package, but shares no code base with that package. When you come from \pkg{avm}, please see Section~\ref{sec:switching} for a quick conversion guide.
+%
+% To start using \pkg{langsci-avm}, place |\usepackage{langsci-avm}| in your preamble.
+% 
+% \subsection{Example}
+% \begin{verbatim}
+% \avm{
+% [ ctxt & [ max-qud \\
+%            sal-utt & \{ [  cat \\ 
+%                           cont <ind & i> 
+%                         ]
+%                      \}
+%           ]
+% ]
+% }
+% \end{verbatim}
+% {\centering\avm{
+%     [ ctxt & [max-qud \\
+%                 sal-utt & \{ [  cat\\ cont <ind & i> ]  \}\\
+%                 ]
+%     ]
+% }\medskip\\}
+% \subsection{Acknowledgements}
+% Thanks to Phelype Oleinik for help on recursion and expansion with \LaTeX3. Thanks to Ahmet Bilal Özdemir and Stefan Müller for their contributions in planning and testing this package.
+% 
+% \section{User interface}
+% \subsection{Typing structures and settings}\label{sec:options}
+% 
+% \begin{function}{\avm}
+%   \begin{syntax}
+%     \cs{avm} \oarg{options} \marg{structure}
+%   \end{syntax}
+%   The heart of this package and its root document comand is |\avm|. It currently runs only in text mode, but can be run in math mode if it is escaped with |$\avm$|. In the scope of the command, delimiter characters are processed to open and close (sub-)structures, as described in Section~\ref{sec:commands}. For a description of the \meta{options}, see |\avmsetup|.
+% \end{function}
+% 
+% \begin{function}{\avmsetup}
+%   \begin{syntax}
+%     \cs{avmsetup} \marg{options}
+%   \end{syntax}
+%   \meta{options} is a comma-separated list of |key = value| settings. The \marg{options} are the same as in \cs{avm}\oarg{options}. When inserted in \cs{avm}\oarg{options}, they apply locally, and globally if given to \cs{avmsetup}. Local settings always override global ones, and you can have any feasible number of \cs{avmsetup}s in your document.
+%   
+%   \begin{description}[style=nextline]
+%   \item[|stretch =| \meta{factor} \hfill (initially |1.15|)] Define \cs{arraystretch}, i.e. the factor of line spacing. Increasing this may be useful if there is too little vertical space between delimiters in subsequent rows.
+%   
+%   \item[|columnsep =| \meta{length} \hfill (initially |0.5ex|)] Define the \cs{arraycolsep}, i.e. horizontal space before and after any column. The first and second column will have |1\columnsep| to the left and right, respectively. Between the two the distance is |2\columnsep|. Using relative units (like |ex| or |em|) may be a good idea so that |columnsep| scales well with changes in font size.
+%   
+%   \item[|delimfactor =| \meta{factor} \hfill (initially |1000|)] Sets \cs{delimiterfactor}. The calculation for the minimum height of a delimiter is $y \cdot f /1000$, where $y$ is the height of the content and $f$ the value of  \cmd{delimfactor}. The default |1000| ensure that the delimiters' height is at least that of the structure.
+%   
+%   \item[|delimfall =| \meta{length} \hfill (initially |0pt|)] Controls \cs{delimitershortfall}, i.e. the maximum height that the delimiters can be shorter than the enclosed structure. The default |0pt| ensure that the delimiters are not shorter than the contents.
+%   
+%   \item[|attributes =| \meta{font settings} \hfill (initially |\textbackslash scshape|)] The font for attributes, i.e. the first column of each structure.
+%   
+%   \item[|values =| \meta{font settings} \hfill (initially |\textbackslash itshape|)] The font for values, i.e. the second column of each structure.
+%   
+%   \item[|types =| \meta{font settings} \hfill (initially |\textbackslash itshape|)] The font used in \cs{type} and \cs{type*}.
+%   \item[|tags =| \meta{format settings} \hfill (initially |\textbackslash footnotesize|)] The font (size) used in \cs{tag} and the shortcuts \cs{1}...\cs{9}.
+%   \item[|switch =| \meta{token} \hfill (initially |!|)] Define the escape token. Change this if you need to use ``!'' as a text glyph.
+%   \end{description}
+% \end{function}
+% 
+% \subsection{Commands available in the scope of \texttt{\textbackslash avm}}\label{sec:commands}
+% 
+% \begin{function}{[...],<...>,(...),\{...\}}
+% \begin{syntax}
+%     \cmd{[} \meta{structure} \cmd{]}
+%     \cmd{<} \meta{structure} \cmd{>}
+%     \cmd{(} \meta{structure} \cmd{)}
+%     \cmd{\{} \meta{structure} \cmd{\}}
+%   \end{syntax}
+%   Within the scope of \cs{avm}, these delimiters create (sub-)structures that are enclosed by the respective delimiter.  Due to the special meaning that curly braces have in \LaTeX, they are the only ones that need to be run with an escape token (|\|). It is currently possible to mix delimiters, e.g. with |<|\meta{structure}|)|, but this may change in future versions.
+%   
+%   A \meta{structure} is basically the content of a stylised \cmd{array}: The columns are separated by \cmd{&} and a new line is entered with \cmd{\\}.
+%   
+%   \pkg{langsci-avm} expects your (sub-)structures to have \emph{at most two columns}, so that for every line in each (sub-)structure, there should be no more than one \cmd{&}. It is recommended to have exactly one \cmd{&} in your \meta{structure}. In the current beta version, display issues may appear in some structures if none is given.\bigskip\\
+%   \noindent\begin{minipage}[c]{.5\linewidth}
+% \begin{verbatim}
+% \avm{
+%   [ < ( \{ ... \} ) > ]
+% }
+% \end{verbatim}
+% \end{minipage}\begin{minipage}[c]{.5\linewidth}
+% \avm{
+%   [ < ( \{ ... \} ) > ]
+% }
+% \end{minipage}\bigskip\\
+% \noindent\begin{minipage}[c]{.5\linewidth}
+% \begin{verbatim}
+% \avm{
+%   [ \{ ... \} \\
+%   < ( ... ), ( ... ) > ]
+% }
+% \end{verbatim}
+% \end{minipage}\begin{minipage}[c]{.5\linewidth}
+% \avm{
+%   [ \{ ... \} \\
+%   < ( ... ), ( ... ) > ]
+% }
+% \end{minipage}
+% \end{function}
+% 
+% \begin{function}{!...!}
+% \begin{syntax}
+%     \cmd{!} \meta{text} \cmd{!}
+%   \end{syntax}
+%   Escapes the |avm| mode so that all delimiters can be used as usual characters. If you need |!| as a regular character, see \cs{avmsetup} to change the |switch| option.
+% \end{function}
+% 
+% \begin{function}{\tag,\1,...,\9}
+%   \begin{syntax}
+%    \cs{tag} \marg{identifier}
+%    \cmd{\1, \2, \3, \4, \5, \6, \7, \8, \9}
+%   \end{syntax}
+%   \cs{tag} puts its \marg{identifier} in a box, more precisely an \cs{fbox}. Within the box, the |tags| font is applied. \cs{1}, ..., \cs{9} are shortcuts to \cs{tag} and place the respective number in the box. For example, \cs{4} is equivalent to |\tag{4}|. The shortcuts do not take any arguments.
+%   
+% If you want to use this command outside an AVM, you can obtain, for example, \avm{\4}, by using |\avm{\4}|, or the equivalent  |{\fboxsep.25ex\fbox{\footnotesize 4}}|.\bigskip\\   
+% \noindent\begin{minipage}{.6\linewidth}
+% \begin{verbatim}
+% \avm{[ attr1 & \4\\
+%        attr2 & \4[attr3 & val3\\
+%                   attr4 & val4] ]}
+%  \end{verbatim}
+%  \end{minipage}\begin{minipage}{.4\linewidth}
+%  \avm{[ attr1 & \4\\
+% 	attr2 & \4[attr3 & val3\\
+% 	attr4 & val4] ]}
+%   \end{minipage}
+% \end{function}
+% 
+% \begin{function}{\type,\type*} 
+%   \begin{syntax}
+%     \cs{type}\meta{*} \marg{type}
+%   \end{syntax}
+%   Will typeset the \meta{type} in the |types| font (roman italics by default). The starred variant \cs{type*} will span the complete (sub-)structure and \emph{can only be placed in the first column} of this structure. After the starred \cs{type*}, a |\\| is recommended, but can be omitted in ``normal'' cases.\bigskip\\   
+%   \noindent\begin{minipage}{.6\linewidth}
+% \begin{verbatim}
+% \avm{[ \type*{A type spanning a line}
+%        attr & [\type{type}] ]}
+% \end{verbatim}
+%   \end{minipage}\begin{minipage}{.4\linewidth}
+%   	\avm{[
+%   		\type*{A type spanning a line}
+%   		attr & [\type{type}]
+%   		]}
+%   \end{minipage}
+% \end{function}
+% 
+% \begin{function}{\punk}
+% \begin{syntax}
+%   \cs{punk} \marg{attribute}\marg{type}
+% \end{syntax}
+% Some \meta{attributes} think that the layout of the other attributes in their community leaves no space for them to express their individuality. They desire a life outside the confines of the alignment defined by the others, while still remaining a member of the matrix.
+%    
+% Technically, this is a line with no snapping to the column layout, but with spacing between the \meta{attribute} and \meta{type}. After \cs{punk}, a |\\| is recommended, but can be omitted in ``normal'' cases.\bigskip\\   
+% \noindent\begin{minipage}{.6\linewidth}
+% \begin{verbatim}
+% \avm{[ attr1 & val1\\
+%       \punk{a quite long attr2}{val2} ]}
+%        attr3 & val3\\
+%        attr4 & val4\\
+% \end{verbatim}
+% \end{minipage}\begin{minipage}{.4\linewidth}
+%    \avm{[
+%    	attr1 & val1\\
+%    	\punk{a quite long attr2}{val2}
+%       attr3 & val3\\
+%       attr4 & val4\\
+%    	]}
+%    \end{minipage}
+% \end{function}
+% 
+% \begin{function}{+}
+%   In the scope of \cs{avm}, \cmd{+} comes out as ``$\oplus$''. To obtain ``+'', please use the escape mode, as in |!+!|.
+% \end{function}
+% 
+% \section{Applications}
+% 
+% \subsection{Disjunctions and other relations}
+% Sometimes AMVs are placed beside other content to express disjunctions or other relations. In \pkg{langsci-avm} this is done naturally:\bigskip\\
+% \noindent\begin{minipage}[c]{.5\textwidth}
+% \begin{verbatim}
+% \avm{ [attr1 & val1\\
+%        attr2 & val2\\
+%        attr3 & val3] } $\lor$ 
+% \avm{ [attr1' & val1'\\
+%        attr2' & val2'\\
+%        attr3' & val3'\\] }
+% \end{verbatim}
+% \end{minipage}\begin{minipage}[c]{.5\textwidth}
+%  \avm{ [attr1 & val1\\
+%          attr2 & val2\\
+%          attr3 & val3] } $\lor$ 
+%  \avm{ [attr1' & val1'\\
+%         attr2' & val2'\\
+%         attr3' & val3'\\] }
+% \end{minipage}\bigskip\\
+% \noindent\begin{minipage}[c]{.5\textwidth}
+% \begin{verbatim}
+% \textit{sign} $\to$ 
+% \avm{ [ attribute1 & value1\\
+%         attribute2 & value2\\
+%         attribute3 & value3 ] }
+% \end{verbatim}
+% \end{minipage}\begin{minipage}[c]{.5\textwidth}
+%   \textit{sign} $\to$ 
+% \avm{ [ attribute1 & value1\\
+% 	attribute2 & value2\\
+% 	attribute3 & value3 ] }
+% \end{minipage}
+% 
+% \subsection{Use as a vector}
+% It's possible to use \pkg{langsci-avm} for feature vectors rather than matrices, as may be useful in generative grammar.\medskip\\
+% \noindent\begin{minipage}[c]{.8\textwidth}
+% \begin{verbatim}
+% \avm[attributes=\normalfont]{[v1\\v2\\v3]}$\varphi$
+% \end{verbatim}
+% \end{minipage}\begin{minipage}[c]{.2\textwidth}
+% \avm[attributes=\normalfont]{[v1\\v2\\v3]}$\varphi$
+% \end{minipage}
+% 
+% \subsection{Combinations with \pkg{gb4e} and \pkg{expex}}
+% 
+% This package works fine with \pkg{gb4e} and its fork \pkg{langsci-gb4e}. To align the example number at the top of your structure, please use \cs{attop} from \pkg{gb4e}:\bigskip\\
+% \noindent\begin{minipage}[c]{.5\textwidth}
+% \begin{verbatim}
+% \begin{exe}
+%     \ex\attop{
+%     \avm{[ attr1 & val1\\
+%            attr2 & val2\\
+%            attr3 & val3]}
+%     }
+%   \end{exe}
+% \end{verbatim}
+% \end{minipage}\begin{minipage}[c]{.5\textwidth}
+%   \begin{exe}
+% 	\ex\attop{
+% 		\avm{[ attr1 & val1\\
+% 			attr2 & val2\\
+% 			attr3 & val3]}
+% 	}
+% \end{exe}
+% \end{minipage}\bigskip\\
+% 
+% \noindent The same can be achieved with \pkg{expex} using an \emph{experimental} syntax:
+% 
+% \begin{verbatim}
+% \ex \vtop{\strut\vskip-\baselineskip{
+%   \avm{[ attr1 & val1\\
+%          attr2 & val2\\
+%          attr3 & val3]} 
+% }}
+% \xe
+% \end{verbatim}
+% 
+% \noindent A future version of \pkg{langsci-avm} will include a more user-friendly approach. There is currently no known way of adjusting the alignment with \pkg{linguex}.
+% 
+% \subsection{Combinations with \pkg{forest}}
+% This package also works fine with \pkg{forest}. As per the \pkg{forest} documentation, it is recommended to protect any \cs{avm}-statements with |{}| in nodes:\bigskip\\
+% \noindent\begin{minipage}[c]{.6\textwidth}
+% \begin{verbatim}
+% \begin{forest}
+%  [A [B] [{\avm{[attr1 & val1\\
+%                 attr2 & val2\\
+%                 attr3 & val3]}} ] ]
+% \end{forest}
+% \end{verbatim}
+% \end{minipage}\begin{minipage}[c]{.4\textwidth}
+% \begin{forest}
+% 	[A [B] [{\avm{[attr1 & val1\\
+% 			attr2 & val2\\
+% 			attr3 & val3]}} ] ]
+% \end{forest}
+% \end{minipage}
+% 
+% \subsection{Switching from Christopher Manning's \pkg{avm} package}\label{sec:switching}
+% Switching from \pkg{avm} to \pkg{langsci-avm} will require some, though hopefully minimal, changes to the code. In particular, the ``active mode'' has disappeared, there is now a single way of sorting (see \cs{type}), and tags are now produced without |@| (\cs{4} instead of \cmd{@4}, etc.). Please refer to Section~\ref{sec:caveats} for features known from \pkg{avm} that are not yet available in \pkg{langsci-avm}.
+% 
+% \subsection{Tweaking the \texttt{attribute} font with with \pkg{fontspec}}
+% The attributes in your structure are usually type set in \textsc{small caps}. That means that your input should usually be lowercase, unless capitals along small capitals in that attribute's description make sense. Some fonts also provide ``old style'' figures (also known as ``text'' or ``medieval'' figures). Those can be enabled with \pkg{fontspec}'s |Numbers=OldStyle| feature. 
+% 
+% 
+% \textit{The following example is output in Libertinus, since the font for this documentation does not support the necessary font features.}\bigskip\\
+% \begin{minipage}[c]{.7\linewidth}
+% \begin{verbatim}
+% % Preamble 
+%  \usepackage{fontspec}
+%  \usepackage{libertinus}
+% % Document
+%  \avm[attributes={\addfontfeatures{
+%       Numbers=OldStyle,
+%       Letters=SmallCaps}
+%       } 
+%       ] { [attr1 & val2] }
+% 	\end{verbatim}
+% \end{minipage}\begin{minipage}[c]{.3\linewidth}
+% 	\includegraphics{include/smallcaps-standalone.pdf}
+% \end{minipage}
+% 
+% \subsection{Spanning both columns}
+% You can use the \pkg{multicol} package to span both columns in a (sub-)structure. Please remember that every structure has two columns, so the only sensible usage is 
+% 
+% \begin{verbatim}
+% \multicolumn{2}{l}{...}
+% \end{verbatim}
+% 
+% \noindent but only in the first column of a (sub-)structure. For a special usage case, see \cs{type} and \cs{type*} (which do not depend on \pkg{multicol}).
+% 
+% \section{Caveats and planned features}\label{sec:caveats}
+% \begin{enumerate}
+% \item There are currently no error messages. If you do not receive the intended output, please make sure that your code fits the syntax described in this documentation. If your code is fine but the output is not, please submit a bug report or feature request at \url{https://github.com/langsci/langsci-avm/issues}.
+% \item The package currently assumes that it is called in text mode.
+% \item[] These features are planned for the future:
+% \item A check whether the delimiters are balanced, i.e. whether all (sub-)structures are closed by a \verb+]+, \verb+}+, etc.
+% \item Introduce the ability to draw (curved) lines between structures and elements.
+% \item Improve the appearance of angle brackets so that they vertically span the complete structure they enclose, maybe using \pkg{scalerel}.
+% \end{enumerate}
+% 
+% \section{Feedback and bug reports}
+% Comments, usage reports, and feature requests are welcome! Please open an issue for any of these at \url{https://github.com/langsci/langsci-avm/issues}, or write to me at \url{mailto:felix.kopecky@langsci-press.org} if you feel the need for a feature not listed here, big or small.
+% \end{documentation}
+% 
+% \begin{implementation}
+% 
+% \section{Implementation}
+%    \begin{macrocode}
+%<*package>
+%    \end{macrocode}
+%    \begin{macrocode}
+%<@@=avm>
+%    \end{macrocode}
+%    \begin{macrocode}
+\RequirePackage{xparse,array}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\ProvidesExplPackage {langsci-avm} 
+  {2020-03-11} {0.1.0-beta}
+  {AVMs and feature structures in LaTeX3}
+%    \end{macrocode}
+%    \begin{macro}{\avm}
+% This document command initialises an AVM. The first, optional argumet is a key-value list of settings (see \cs{keys_define:nn} below) and the second is the AVM itself, given in the syntax described in this documentation.
+% 
+% \cs{avm} enters a group so that keys- and macro-assignemts remain local. It then initialises the commands and shortcuts made locally available, sets its mode to |true| and assigns the keys as given in the optional argument (if any). After the wrapper \cs{avm_wrap:n} is called, the group is closed.
+%
+%    \begin{macrocode}
+\NewDocumentCommand{\avm}{ O{} +m }
+  {
+    \c_group_begin_token
+    \__avm_initialise_document_commands:
+    \bool_set_true:N \l__avm_mode_bool
+    \keys_set:nn { avm } { #1 }
+    \__avm_wrap:n { #2 }
+    \c_group_end_token
+  }
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\avmsetup}
+% Forward the key-value settings given as the optional argument to \cs{avm} to the keys defined in |\keys_define:nn { avm }|. For the meaning of these keys and initial values, see Section~\ref{sec:options}.
+% 
+%    \begin{macrocode}
+\NewDocumentCommand{\avmsetup}{ m } 
+  { \keys_set:nn { avm } { #1 } }
+
+\keys_define:nn { avm }
+  {
+    stretch .code:n        = {\def\arraystretch{#1}},
+    stretch .initial:n     = {1.15},
+    columnsep .dim_set:N   = \arraycolsep,
+    columnsep .initial:n   = {.5ex},
+    delimfactor .int_set:N = \delimiterfactor,
+    delimfactor .initial:n = {1000},
+    delimfall .dim_set:N   = \delimitershortfall,
+    delimfall .initial:n   = {0pt},
+    attributes .code:n     = {\cs_set:Nn \__avm_font_attribute: {#1}},
+    attributes .initial:n  = {\scshape},
+    types .code:n          = {\cs_set:Nn \__avm_font_type: {#1}},
+    types .initial:n       = {\itshape},
+    values .code:n         = {\cs_set:Nn \__avm_font_value: {#1}},
+    values .initial:n      = {\itshape},
+    tags .code:n           = {\cs_set:Nn \__avm_font_tag: {#1}},
+    tags .initial:n        = {\footnotesize},  
+    switch .code:n         = {\tl_set:Nn \__avm_mode_switch_character {#1}},
+    switch .initial:n      = { ! }
+  }
+%    \end{macrocode}
+%    \end{macro}
+  
+%    \begin{variable}{\l__avm_math_bool, \l__avm_mode_bool, \l__avm_parens_tracker}
+% We need an auxiliary variable to store the current mode. The math mode boolean is already created, but it will have an effect only in a later version which will include a check whether \cs{avm} is called in math mode. \cs{l__avm_parens_tracker} is a stack for a future check whether the delimiters given to \cs{avm} are balanced.
+%    \begin{macrocode}
+\bool_new:N \l__avm_math_bool
+\bool_new:N \l__avm_mode_bool
+\seq_new:N \l__avm_parens_tracker
+%    \end{macrocode}
+%    \end{variable}
+
+%    \begin{macro}[int]{\seq_set_split:NVn}
+% In preparation for \cs{avm_wrap:n}, we need to split the user input at each occurrence of the escape character. Since the character is given in a variable, we need a variant of the sequence splitter that takes the \emph{evaluation} of the variable, rather than the variable itself, as its second argument.
+%    \begin{macrocode}
+\cs_generate_variant:Nn \seq_set_split:Nnn { NVn }
+%    \end{macrocode}
+%    \end{macro}
+
+
+%    \begin{macro}[int]{\__avm_module_begin:,\__avm_module_end:,etc.}
+% The replacement instructions for \cs{__avm_parse:n}
+%    \begin{macrocode}
+\cs_new:Nn \__avm_module_begin: 
+  { 
+    \begin{array}{ 
+      >{\c_math_toggle_token\normalfont\__avm_font_attribute:}l
+      <\c_math_toggle_token
+      >{\c_math_toggle_token\normalfont\__avm_font_value:}l
+      <\c_math_toggle_token} 
+  }
+\cs_new:Nn \__avm_module_end:
+  { \end{array} }
+\cs_new:Nn \__avm_replace_lbrace: 
+  { 
+    \__avm_parse_output:nw 
+      { \c_math_toggle_token\left\lbrace\__avm_module_begin: } 
+  }
+\cs_new:Nn \__avm_replace_rbrace: 
+  { 
+    \__avm_parse_output:nw 
+      { \__avm_module_end:\right\rbrace\c_math_toggle_token  } 
+  }
+\cs_new:Nn \__avm_replace_lbrack: 
+  { 
+    \__avm_parse_output:nw 
+      { \c_math_toggle_token\left\lbrack\__avm_module_begin: } 
+  }     
+\cs_new:Nn \__avm_replace_rbrack: 
+  { 
+    \__avm_parse_output:nw 
+      { \__avm_module_end:\right\rbrack\c_math_toggle_token } 
+  }
+\cs_new:Nn \__avm_replace_lparen: 
+  { 
+    \__avm_parse_output:nw 
+      { \c_math_toggle_token\left(\__avm_module_begin: } 
+  } 
+\cs_new:Nn \__avm_replace_rparen: 
+  { 
+    \__avm_parse_output:nw 
+      { \__avm_module_end:\right)\c_math_toggle_token  } 
+  } 
+\cs_new:Nn \__avm_replace_langle: 
+  { 
+    \__avm_parse_output:nw 
+      { \c_math_toggle_token\left<\__avm_module_begin: } 
+  } 
+\cs_new:Nn \__avm_replace_rangle: 
+  { 
+    \__avm_parse_output:nw 
+      { \__avm_module_end:\right>\c_math_toggle_token  } 
+  }
+\cs_new:Nn \__avm_replace_plus:
+  { 
+    \__avm_parse_output:nw { \ensuremath { \oplus } } 
+  }
+%    \end{macrocode}
+%    \end{macro}
+
+%    \begin{macro}{\tag,\type,\punk}
+%    \begin{macrocode}
+\cs_new:Npn \__avm_controls_tag:n #1 
+  { \fboxsep.25ex\fbox{\normalfont\__avm_font_tag: #1} } 
+\cs_new:Npn \__avm_controls_type:n #1 
+  {\normalfont\__avm_font_type: #1}
+\cs_new_protected:Npn \__avm_controls_type_starred:n #1 
+  {
+    \normalfont\__avm_font_type: #1\span                                                
+    \peek_meaning_ignore_spaces:NTF \\ {} {\\} 
+  }
+\cs_new_protected:Npn \__avm_controls_punk:nn #1 #2 
+  {  
+     \normalfont\c_group_begin_token\__avm_font_attribute:#1%
+     \c_group_end_token\hspace{2\arraycolsep}%
+     \c_group_begin_token\__avm_font_type: #2\c_group_end_token%
+     \span\peek_meaning_ignore_spaces:NTF \\ {} {\\}                                               
+  }
+
+\cs_new:Nn \__avm_initialise_document_commands: 
+  {
+    \cs_if_exist:NTF \tag 
+      {  \RenewDocumentCommand{\tag}{m}{ \__avm_controls_tag:n {##1} } }
+      {  \NewDocumentCommand{\tag}{m}{   \__avm_controls_tag:n {##1} } }
+    \cs_if_exist:NTF \1   
+      {  \RenewDocumentCommand{\1}{}{    \__avm_controls_tag:n {1} } }
+      {  \NewDocumentCommand{\1}{}{      \__avm_controls_tag:n {1} } }
+    \cs_if_exist:NTF \2
+      {  \RenewDocumentCommand{\2}{}{    \__avm_controls_tag:n {2} } }
+      {  \NewDocumentCommand{\2}{}{      \__avm_controls_tag:n {2} } }
+    \cs_if_exist:NTF \3
+      {  \RenewDocumentCommand{\3}{}{    \__avm_controls_tag:n {3} } }
+      {  \NewDocumentCommand{\3}{}{      \__avm_controls_tag:n {3} } }
+    \cs_if_exist:NTF \4
+      {  \RenewDocumentCommand{\4}{}{    \__avm_controls_tag:n {4} } }
+      {  \NewDocumentCommand{\4}{}{      \__avm_controls_tag:n {4} } }
+    \cs_if_exist:NTF \5
+      {  \RenewDocumentCommand{\5}{}{    \__avm_controls_tag:n {5} } }
+      {  \NewDocumentCommand{\5}{}{      \__avm_controls_tag:n {5} } }
+    \cs_if_exist:NTF \6
+      {  \RenewDocumentCommand{\6}{}{    \__avm_controls_tag:n {6} } }
+      {  \NewDocumentCommand{\6}{}{      \__avm_controls_tag:n {6} } }
+    \cs_if_exist:NTF \7
+      {  \RenewDocumentCommand{\7}{}{    \__avm_controls_tag:n {7} } }
+      {  \NewDocumentCommand{\7}{}{      \__avm_controls_tag:n {7} } }
+    \cs_if_exist:NTF \8
+      {  \RenewDocumentCommand{\8}{}{    \__avm_controls_tag:n {8} } }
+      {  \NewDocumentCommand{\8}{}{      \__avm_controls_tag:n {8} } }
+    \cs_if_exist:NTF \9
+      {  \RenewDocumentCommand{\9}{}{    \__avm_controls_tag:n {9} } }
+      {  \NewDocumentCommand{\9}{}{      \__avm_controls_tag:n {9} } }
+    \cs_if_exist:NTF \type 
+      {  \RenewDocumentCommand{\type}{s m}
+        {  
+          \IfBooleanTF { ##1 } 
+            {  \__avm_controls_type_starred:n {##2}  }
+            {  \__avm_controls_type:n {##2} }
+         } 
+       }
+       {  \NewDocumentCommand{\type}{s m}
+         {
+           \IfBooleanTF { ##1 }
+             {  \__avm_controls_type_starred:n {##2}  }
+             {  \__avm_controls_type:n {##2}  }
+          } 
+        }
+    \cs_if_exist:NTF \punk 
+      {  \RenewDocumentCommand{\punk}{m m}
+        { \__avm_controls_punk:nn {##1}{##2} } }
+      {  \NewDocumentCommand{\punk}{m m}
+        {  \__avm_controls_punk:nn {##1}{##2} } }
+  }
+%    \end{macrocode}
+%    \end{macro}
+
+%    \begin{macro}{\__avm_wrap:n}
+% The wrapper that first splits the input to \cs{avm} at each occurrence of \cs{__avm_mode_switch_character} and then inverses \cs{l__avm_mode_bool}. It then calls the parser (\cs{__avm_parse:n}) for each splitted sequence. This wrapping is necessary because there is no known expandable way to switch a boolean.
+%    \begin{macrocode}
+\cs_new_protected:Npn \__avm_wrap:n #1
+  {
+    \seq_set_split:NVn \l__avm_wrapper_seq 
+    \__avm_mode_switch_character { #1 }
+    \seq_map_inline:Nn \l__avm_wrapper_seq 
+      {  
+        \exp_args:No \exp_not:o 
+          {  \__avm_parse:n {##1} }  
+        \bool_set_inverse:N \l__avm_mode_bool 
+      }
+  }
+%    \end{macrocode}
+%    \end{macro}
+
+%    \begin{macro}{\__avm_parse:n}
+% Finnaly, the parser. It is build on \cs{@@_act:NNNnn} from \cmd{l3tl} (see the sub-section \emph{Token by token changes}). Many thanks to Phelype Oleinik for help on this, and in particular on help with expansion. 
+%    \begin{macrocode}
+\cs_new:Npn \__avm_parse:n #1
+  {
+      \exp:w
+      \group_align_safe_begin:
+        \__avm_parse_loop:w #1 
+        \q_recursion_tail \q_recursion_stop 
+        \__avm_result:n { }
+  }
+
+\cs_new:Npn \__avm_end:w \__avm_result:n #1
+  {
+    \group_align_safe_end:
+    \exp_end:
+    #1
+  }
+
+\cs_new:Npn \__avm_parse_loop:w #1 \q_recursion_stop
+  {
+    \tl_if_head_is_N_type:nTF {#1}
+      {
+        \__avm_N_type:N #1 \q_recursion_stop 
+      }
+      {
+        \tl_if_head_is_group:nTF {#1}
+          { \__avm_replace_group:nw #1 \q_recursion_stop }
+          { \__avm_replace_space:w #1 \q_recursion_stop }
+      }
+  }
+  
+\cs_new:Npn \__avm_N_type:N #1
+  {
+    \quark_if_recursion_tail_stop_do:Nn #1 { \__avm_end:w }
+    \bool_if:NTF \l__avm_mode_bool 
+      { \__avm_replace:N #1 } 
+      { \__avm_replace_none:N #1 } 
+  }
+  
+\cs_new:Npn \__avm_replace_none:N #1 
+  { 
+    \__avm_parse_output:nw {#1}
+  }
+
+\cs_new:Npn \__avm_replace:N #1
+  {
+    \str_case:nnF {#1}
+      {
+        { +  }{ \__avm_replace_plus: }
+        { [  }{ \__avm_replace_lbrack: }
+        { ]  }{ \__avm_replace_rbrack: }
+        { (  }{ \__avm_replace_lparen: }
+        { )  }{ \__avm_replace_rparen: }
+        { \{ }{ \__avm_replace_lbrace: }        
+        { \} }{ \__avm_replace_rbrace: }                
+        { <  }{ \__avm_replace_langle: } 
+        { >  }{ \__avm_replace_rangle: } 
+      }
+      { \__avm_replace_none:N #1 }
+  }
+
+\cs_new:Npn \__avm_replace_group:nw #1
+  { \exp_args:NNo \exp_args:No \__avm_replace_group:n { \__avm_parse:n {#1} } }
+
+\cs_new:Npn \__avm_replace_group:n #1 { \__avm_parse_output:nw { {#1} } }
+
+\exp_last_unbraced:NNo
+\cs_new:Npn \__avm_replace_space:w \c_space_tl { \__avm_parse_output:nw { ~ } }
+
+\cs_new:Npn \__avm_parse_output:nw #1 #2 \q_recursion_stop \__avm_result:n #3
+  { \__avm_parse_loop:w #2 \q_recursion_stop \__avm_result:n {#3  #1 } }
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+%</package>
+%    \end{macrocode}
+%
+% \end{implementation}
+
+% \PrintIndex
diff --git a/macros/latex/contrib/langsci-avm/langsci-avm.ins b/macros/latex/contrib/langsci-avm/langsci-avm.ins
new file mode 100644
index 0000000000..23df5f5846
--- /dev/null
+++ b/macros/latex/contrib/langsci-avm/langsci-avm.ins
@@ -0,0 +1,57 @@
+%%
+%% This is file `langsci-avm.ins',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% langsci-avm.dtx  (with options: `install')
+%% 
+\input{l3docstrip.tex}
+\keepsilent
+\askforoverwritefalse
+\preamble
+------------------------------------------------------------------------------
+
+langsci-avm: Attribute-value matrices (AVMs) and feature structures in LaTeX3.
+
+Copyright (C) 2020 by Felix Kopecky, Language Science Press
+
+This work consists of the file  langsci-avm.dtx &
+                                include/smallcaps-standalone.pdf.
+          and the derived files langsci-avm.ins,
+                                langsci-avm.pdf,
+                                langsci-avm.sty.
+
+It may be distributed and/or modified under the conditions of the
+LaTeX Project Public License (LPPL), either version 1.3c of this
+license or (at your option) any later version. The latest version
+of this license is at <http://www.latex-project.org/lppl.txt>.
+
+This work is ``maintained'' (per LPPL maintenance status) by
+Felix Kopecky <felix.kopecky@langsci-press.org>.
+
+The development version of the bundle can be found at
+
+   https://github.com/langsci/langsci-avm
+
+for those people who are interested. Pull requests are welcome.
+
+Please report any bugs or feature requests to
+
+   https://github.com/langsci/langsci-avm/issues
+
+------------------------------------------------------------------------------
+\endpreamble
+\declarepreamble\minimalpreamble
+\endpreamble
+\postamble
+\endpostamble
+\usedir{tex/latex/langsci-avm}
+\generate{
+  \file{\jobname.sty}{\from{\jobname.dtx}{package}}
+}
+\endbatchfile
+
+%% 
+%%
+%% End of file `langsci-avm.ins'.
diff --git a/macros/latex/contrib/langsci-avm/langsci-avm.pdf b/macros/latex/contrib/langsci-avm/langsci-avm.pdf
new file mode 100644
index 0000000000..406d81e3f7
--- /dev/null
+++ b/macros/latex/contrib/langsci-avm/langsci-avm.pdf
diff --git a/macros/latex/contrib/oops/README.md b/macros/latex/contrib/oops/README.md
new file mode 100644
index 0000000000..c7907f4b51
--- /dev/null
+++ b/macros/latex/contrib/oops/README.md
@@ -0,0 +1,9 @@
+----------------------------------------------------------------
+#### oops --- An object oriented practical scribe's package,
+#### typically for typesetting math
+- Source repository: https://github.com/rogard/oops
+- Released under the LaTeX Project Public License v1.3c or later
+- See http://www.latex-project.org/lppl.txt
+----------------------------------------------------------------
+
+
diff --git a/macros/latex/contrib/oops/oops.dtx b/macros/latex/contrib/oops/oops.dtx
new file mode 100644
index 0000000000..bc79a5dea8
--- /dev/null
+++ b/macros/latex/contrib/oops/oops.dtx
@@ -0,0 +1,789 @@
+% \iffalse meta-comment
+% !TEX program  = pdfLaTeX
+%<*internal> 
+\iffalse
+%</internal> 
+%<*readme> 
+----------------------------------------------------------------
+#### oops --- An object oriented practical scribe's package,
+#### typically for typesetting math
+- Source repository: https://github.com/rogard/oops
+- Released under the LaTeX Project Public License v1.3c or later
+- See http://www.latex-project.org/lppl.txt
+----------------------------------------------------------------
+
+%</readme> 
+%<*internal> 
+\fi
+\def\nameofplainTeX{plain}
+\ifx\fmtname\nameofplainTeX\else
+\expandafter\begingroup
+\fi
+%</internal> 
+%<*install> 
+\input docstrip.tex
+\keepsilent
+\askforoverwritefalse
+\preamble
+----------------------------------------------------------------
+oops --- An object oriented practical scribe's package,
+typically for typesetting math
+Released under the LaTeX Project Public License v1.3c or later
+See http://www.latex-project.org/lppl.txt
+----------------------------------------------------------------
+
+\endpreamble
+\postamble
+
+Copyright (C) 2020 by Erwann Rogard
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License (LPPL), either
+version 1.3c of this license or (at your option) any later
+version.  The latest version of this license is in the file:
+
+http://www.latex-project.org/lppl.txt
+
+This work is "maintained" (as per LPPL maintenance status) by
+Erwann Rogard.
+
+This work consists of the file  oops.dtx
+and the derived files   oops.ins,
+oops.pdf and
+oops.sty.
+
+\endpostamble
+\generate{
+  \file{\jobname.sty}{\from{\jobname.dtx}{package}}
+}
+%</install> 
+%<install> \endbatchfile
+%<*internal> 
+\generate{
+  \file{\jobname.ins}{\from{\jobname.dtx}{install}}
+}
+\nopreamble\nopostamble
+\generate{
+  \file{README.txt}{\from{\jobname.dtx}{readme}}
+}
+\nopreamble\nopostamble
+\generate{
+  \file{README.md}{\from{\jobname.dtx}{readme}}
+}
+\ifx\fmtname\nameofplainTeX
+\expandafter\endbatchfile
+\else
+\expandafter\endgroup
+\fi
+%</internal> 
+%<package> \RequirePackage{xparse}[2019/05/28]
+%<package> \ProvidesExplPackage
+%<package> {oops}                                                               % Package name
+%<package> {2020/03/11}                                                         % Release date
+%<package> {1.0}                                                                % Release version
+%<package> {An object oriented practical scribe's package}                      % Description
+% 
+%<*driver> 
+\documentclass[full]{l3doc}
+\usepackage{oops}
+\usepackage{tcolorbox}
+\tcbuselibrary{listings,breakable}
+\ExplSyntaxOn
+\tl_gset:Nn \partname {Part}
+\ExplSyntaxOff
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+% \AtEndDocument { \PrintChanges \PrintIndex } % TODO
+\providecommand\pkgdata{\texttt{\meta{data}}}
+\providecommand\pkgoptions{\texttt{\meta{kvl0}}}
+\providecommand\pkgkey{\dockey{Key}}
+\providecommand\pkgvalue{\dockey{Value}}
+\providecommand\pkggenobjdefault{\texttt{Math}}
+\providecommand\pkgobj[1]{object identified by #1}
+\providecommand\pkgsep[1]{\docmarg{\texttt{#1}}}
+\providecommand\pkgargobj{\texttt{\meta{tl1}}}
+\providecommand\pkgargexpi{\texttt{\meta{tl2}}}
+\providecommand\pkgarginneri{\texttt{\meta{code1}}}
+\providecommand\pkgargsep{\texttt{\pkgsep{\meta{tl3}}\pkgsep{\meta{tl4}}\pkgsep{\meta{tl5}}}}
+\providecommand\pkgargouter{\texttt{\meta{code2}}}
+\providecommand\pkgargdefi{\texttt{\meta{kvl1}}}
+\providecommand\pkgarginnerii{\texttt{\meta{code3}}}
+\providecommand\pkgargdefii{\texttt{\meta{kvl2}}}
+\providecommand\pkgargexpii{\texttt{\meta{tl6}}}
+\providecommand\docConv[1]{Convention~\ref{#1}}
+\providecommand\docconv[1]{convention~\ref{#1}}
+\providecommand\docmarg[1]{\texttt{\char`\{#1\char`\}}}
+\providecommand\docopto[1]{\texttt{[}#1\texttt{]}}
+\providecommand\docopte[2]{#1\docmarg{#2}}
+\providecommand\docinlcode{\textit{inline code}}
+\providecommand\docInlcode{\textit{Inline code}}
+\providecommand\docbody{\textit{body}}
+\providecommand\docemptyarg{\textit{empty}}
+\providecommand\dockey[1]{\texttt{#1}}
+\providecommand\dockeyval[2]{\texttt{#1=#2}}
+\providecommand\docnovalue{\textit{no value}}
+\providecommand\docpreamb{\textit{preamble}}
+\providecommand\doctl{\textit{token list}}
+\providecommand\docTl{\textit{Token list}}
+\providecommand\dockvl{\textit{keyval list}}
+\providecommand\docKvl{\textit{Keyval list}}
+\providecommand\dockl{\textit{key list}}
+\providecommand\doclist[1]{Listing~\autoref{listing:#1}}
+\begin{document}
+\DocInput{\jobname.dtx}
+\end{document}
+%</driver> 
+% \fi
+% 
+% \GetFileInfo{\jobname.sty}
+% 
+% 
+% \title{^^A
+% \pkg{oops}, an object oriented practical scribe's package.\thanks{^^A
+% This file describes version \fileversion, last revised \filedate.^^A
+% }^^A
+% }
+%   \author{Erwann Rogard\thanks{firstname dot lastname AusTria gmail dot com}}
+%   
+%   \date{Released \filedate}
+%   
+%   \maketitle
+%   
+%   \begin{abstract}\pkg{oops}~is a package for \LaTeX~(hence ``scribe'') that organizes (typically mathematical) definitions
+%     along two dimensions: functions and objects, hence ``OO''. Such definitions are made \textit{inline} thanks to a minimalist interface built upon \pkg{xparse}\cite{xparse}. To make a definition, use \cs{OopsNew}\docmarg{\pkgargobj}, where \pkgargobj~identifies an object, followed by input that alternates between `text' and instructions.
+%     The latter create and expand definitions using rules that can be modified at the package level or themselves inline.
+%     This framework is suitable for instance where \pkgargobj~ is either of \texttt{ModelA} and \texttt{ModelB},
+%     and each requires its own definition of, say, a \textit{space}. In this case, they would be encoded respectively as \cs{Space}\docmarg{\texttt{ModelA}} and \cs{Space}\docmarg{\texttt{ModelB}}. However, this would be verbose if most functions applied to just one object, so the package provides a generic one that is set by default to \pkggenobjdefault. For example, \verb|\OopsNew{Math}[Let~]{Space=\Omega}[~denote the sample space]{}|, followed by \verb|$\Space$|, expand to:
+%     ``\OopsNew{Math}[Let~]{Space=\Omega}[~denote the sample space]{}'' and ``$\Space$''.
+%     Other features automate repetitive formatting tasks. Altogether, ``practical''. 
+%   \end{abstract}
+%   
+%   \tableofcontents 
+%   
+%   \part{Usage}\label{part:usage}
+%   
+%   \addtocounter{section}{1}
+%   \addcontentsline{toc}{section}{\protect\numberline{\thesection}Convention}
+%   \section*{Convention}%\label{usage:conv}
+%   
+%   \begin{enumerate}[label=\alph*)]
+%   \item By default, all commands are declared in the \docbody~of \cs{documentclass}.
+%   \item Arguments expecting a \doctl\cite{tex.stack:104023}, \dockvl\cite[l3keys]{interface3}, a character, and \docinlcode, are denoted respectively
+%     \meta{tl}, \meta{kvl}, \meta{char}, and \meta{code}.
+%   \item \marg{arg} is either \texttt{m} or \texttt{g} options\cite{xparse}, and \docopto{\meta{arg}} and \docopte{\meta{char}}{\meta{arg}} are \texttt{o} and \texttt{e} options\cite{xparse}.
+%   \item If we say that \meta{option} can be used to override \meta{default}, and \meta{option} is \docnovalue\cite{xparse}, we will treat it as though \meta{option}$=$\meta{default}.
+%   \item We say ``set the key to'' as shorthand for ``set the value associated with the key to''
+%   \item We call \cs{code}\marg{arg}, \meta{code} with \verb|#1| replaced by \marg{arg}
+%   \end{enumerate}
+%   
+%   The template for the description of functions and arguments is, where applicable:
+%   \begin{description}
+%   \item[Use it to]
+%   \item[Requirement]
+%   \item[Side effect]
+%   \item[Expands to]
+%   \item[Default]
+%   \item[Example]
+%   \item[Other]  
+%   \end{description}Only the items that cannot be deduced from other information, are given. For instance, the requirement that \pkgargobj~be a \doctl~is ommited.
+%   
+%   
+%   \addtocounter{section}{1}
+%   \addcontentsline{toc}{section}{\protect\numberline{\thesection}Loading the package}
+%   
+%   \begin{function}{\usepackage}
+%     \begin{syntax}
+%       \cs{usepackage}\docopto{\pkgoptions}\docmarg{\pkg{oops}}
+%     \end{syntax}
+%     \begin{description}
+%     \item[Use it to] Load the package
+%     \item[Requirement]\begin{enumerate}
+%       \item \file{oops.sty} is in the path of the \LaTeX~engine. See \autoref{part:other}, \autoref{other:support}.
+%       \item Declared in the \docpreamb~of \cs{documentclass}
+%       \end{enumerate}      
+%     \item[Side effect] That of \cs{OopsOptions}\docmarg{\pkgoptions}
+%     \end{description}  
+%   \end{function}
+%   
+%   \addtocounter{section}{1}
+%   \addcontentsline{toc}{section}{\protect\numberline{\thesection}\cs{OopsOptions}}
+%   \begin{function}{\OopsOptions}
+%     \begin{syntax}
+%       \cs{OopsOptions}\docmarg{\pkgoptions}
+%     \end{syntax} 
+%     \begin{description}
+%     \item[Use it to] Set default options for \cs{OopsNew}
+%     \item[Other] Also works in the \docpreamb
+%     \end{description}  
+%   \end{function}
+%   
+%   \DescribeOption{\meta{kvl}}
+%   \begin{description}
+%   \item[Requirement] Keys listed below.
+%   \end{description}
+%   
+%   \addtocounter{subsection}{1}
+%   \addcontentsline{toc}{subsection}{\protect\numberline{\thesubsection}\dockey{GenericObject}}
+%   \DescribeOption{GenericObject}
+%   \begin{description}
+%   \item[Requirement] See \cs{OopsNew}, \pkgargobj
+%   \item[Default] \verb|Math|
+%   \end{description} 
+%   
+%   \addtocounter{subsection}{1}
+%   \addcontentsline{toc}{subsection}{\protect\numberline{\thesubsection}\dockey{Inner}}
+%   \DescribeOption{Inner}
+%   \begin{description}
+%   \item[Requirement]  See \cs{OopsNew}, \pkgarginneri
+%   \item[Default] \verb|{#1}|
+%   \end{description} 
+%   
+%   \addtocounter{subsection}{1}
+%   \addcontentsline{toc}{subsection}{\protect\numberline{\thesubsection}\dockey{Separators}}
+%   \DescribeOption{Separators}
+%   \begin{description}
+%   \item[Requirement]  See \cite[Section 8 of \pkg{l3seq}]{interface3}  
+%   \item[Default] \verb|{\text{~and~}{\text{,~}}{\text{,~and~}}|
+%   \end{description}
+%   
+%   \addtocounter{subsection}{1}
+%   \addcontentsline{toc}{subsection}{\protect\numberline{\thesubsection}\dockey{Outer}}
+%   \DescribeOption{Outer}
+%   \begin{description}
+%   \item[Requirement] See \cs{OopsNew}, \pkgargouter
+%   \item[Default] \verb|\ensuremath{#1}|
+%   \end{description}
+%   
+%   \addtocounter{section}{1}
+%   \addcontentsline{toc}{section}{\protect\numberline{\thesection}\cs{OopsClear}}
+%   \begin{function}{\OopsClear}
+%     \begin{syntax}
+%       \cs{OopsClear}\docmarg{\pkgargobj}
+%     \end{syntax}
+%   \end{function}
+%   
+%   \begin{description}
+%   \item[Side effect] Clears \pkgargobj~of any \pkgdata
+%   \end{description}
+%   
+%   \addtocounter{section}{1}
+%   \addcontentsline{toc}{section}{\protect\numberline{\thesection}\cs{OopsNew}}
+%   \setcounter{subsection}{0}
+%   \begin{function}{\OopsNew}
+%     \begin{syntax}
+%       \cs{OopsNew}\docmarg{\pkgargobj}
+%       \docopto{\pkgargexpi}
+%       \docopte{i}{\pkgarginneri}
+%       \docopte{s}{\pkgargsep}
+%       \docopte{o}{\pkgargouter}
+%       \docmarg{\pkgargdefi}
+%       \docopte{i}{\pkgarginnerii}
+%       \docmarg{\pkgargdefii}
+%       \docopto{\pkgargexpii}
+%     \end{syntax}
+%     \begin{description}
+%     \item[Requirement] Only \pkgargobj~and \pkgargdefi~are mandatory
+%     \end{description}
+%   \end{function}
+%   
+%   \addtocounter{subsection}{1}
+%   \addcontentsline{toc}{subsection}{\protect\numberline{\thesubsection}\docmarg{\pkgargobj}}
+%   \DescribeOption{\pkgargobj}
+%   
+%   \begin{description}
+%   \item[Use it to] Identify an object
+%   \item[Side effect] Registers \pkgargobj~ as a new object, if applicable
+%   \item[Example] \pkggenobjdefault, \verb|ModelA|, \verb|ModelB|
+%   \end{description}
+%   
+%   \addtocounter{subsection}{1}
+%   \addcontentsline{toc}{subsection}{\protect\numberline{\thesubsection}\docopto{\pkgargexpi}}
+%   \DescribeOption{\pkgargexpi}
+%   
+%   \begin{description}
+%   \item[Use it to] Bring about a definition
+%   \item[Expands to] \pkgargexpi
+%   \item[Example]\verb|Let~|
+%   \end{description}
+%   
+%   \addtocounter{subsection}{1}
+%   \phantomsection\addcontentsline{toc}{subsection}{\protect\numberline{\thesubsection}\docopte{i}{\pkgarginneri}}
+%   \DescribeOption{\pkgarginneri}
+%   
+%   \begin{description}
+%   \item[Use it to] Override \dockey{Inner}.
+%   \item[Example] \verb|\mathbb{#1}| 
+%   \end{description}
+%   
+%   \addtocounter{subsection}{1}
+%   \phantomsection\addcontentsline{toc}{subsection}{\protect\numberline{\thesubsection}\docopte{s}{\pkgargsep}}
+%   \DescribeOption{\pkgargsep}
+%   
+%   \begin{description}
+%   \item[Use it to] Override \dockey{Separators}
+%   \item[Example] \verb|{~\&~}{,~}{~\&~}|
+%   \end{description}
+%   
+%   \addtocounter{subsection}{1}
+%   \phantomsection\addcontentsline{toc}{subsection}{\protect\numberline{\thesubsection}\docopte{o}{\pkgargouter}}
+%   \DescribeOption{\pkgargouter}
+%   
+%   \begin{description}
+%   \item[Use it to] Override \dockey{Outer}
+%   \item[Example] \verb|\text{#1}| 
+%   \end{description}
+%   
+%   \addtocounter{subsection}{1}
+%   \phantomsection\addcontentsline{toc}{subsection}{\protect\numberline{\thesubsection}\docmarg{\pkgargdefi}}
+%   \DescribeOption{\pkgargdefi}
+%   
+%   \begin{description} 
+%   \item[Side effect] If \pkgkey~is a new key, attaches to it \pkgdata=\cs{\pkgarginneri}\docmarg{\pkgvalue}
+%   \item[Expands to] If \pkgargexpi~is \docnovalue, none, otherwise,
+%     \begin{enumerate}
+%     \item
+%       For each \pkgkey, calls \cs{\pkgkey}\pkgargobj. Call it \meta{seq}.
+%     \item
+%       Concatenates \meta{seq} using \pkgargsep. Call it \meta{tmp}.
+%     \item Expands \cs{\pkgargouter}\marg{tmp}
+%     \end{enumerate}
+%   \item[Example] \verb|Sample=\Omega|
+%   \end{description}
+%   
+%   The remaining options taken together forward to:
+%   
+%   \cs{OopsNew}\docmarg{\pkgargobj}
+%   \docopte{o}{\pkgarginnerii}
+%   \docmarg{\pkgargdefii}
+%   \docopto{\pkgargexpii}
+%   
+%   \addtocounter{subsection}{1}
+%   \phantomsection\addcontentsline{toc}{subsection}{\protect\numberline{\thesubsection}\docopte{i}{\pkgarginnerii}}
+%   \DescribeOption{\pkgarginnerii}
+%   
+%   \addtocounter{subsection}{1}
+%   \phantomsection\addcontentsline{toc}{subsection}{\protect\numberline{\thesubsection}\docmarg{\pkgargdefii}}
+%   \DescribeOption{\pkgargdefii}
+%   
+%   \addtocounter{subsection}{1}
+%   \addcontentsline{toc}{subsection}{\protect\numberline{\thesubsection}\docopto{\pkgargexpii}}
+%   \DescribeOption{\pkgargexpii}
+%   
+%   \addtocounter{section}{1}
+%   \addcontentsline{toc}{section}{\protect\numberline{\thesection}\cs{\meta{Key}}}
+%   \setcounter{subsection}{0}
+%   
+%   \begin{function}{\<Key>}
+%     \begin{syntax}
+%       \cs{\meta{Key}}\docopto{\pkgargobj}
+%     \end{syntax}
+%     \begin{description}
+%     \item[Side effect] Expands to \pkgdata~associated with \pkgargobj~and \dockey{\meta{Key}}, if applicable.
+%     \end{description}  
+%   \end{function}
+%   
+%   \clearpage
+%   \part{Listings}\label{part:listing}
+%   
+%   \newtcblisting[auto counter]
+%   {listing}[2][]{
+%   noparskip,
+%   breakable,
+%   colback=white,
+%   colframe=black,
+%   opacitybacktitle=.8,%
+%   fonttitle=\bfseries,
+%   title=Listing~\thetcbcounter. #1,
+%   arc=0pt,
+%   outer arc=0pt,
+%   boxrule=1pt,
+%   #2
+% }
+%   
+%   \phantomsection\addcontentsline{toc}{section}{\doclist{options:i}.}
+%   \begin{listing}[]
+%     {label=listing:options:i}
+%     \OopsOptions
+%     {
+%     Inner = {#1},
+%     Outer = {#1}
+%   }
+%   \end{listing}
+%   
+%   \phantomsection\addcontentsline{toc}{section}{\doclist{foo:i}.}
+%   \begin{listing}[]{label=listing:foo:i}
+%     \OopsNew{Foo}{ Barr = { a }, Baz = { b } }{ Qux = { c } } 
+%     \textless(\Barr[Foo]), (\Baz[Foo]) \& (\Qux[Foo])\textgreater 
+%   \end{listing}
+%   
+%   \phantomsection\addcontentsline{toc}{section}{\doclist{foo:ii}.}
+%   \begin{listing}[]{label=listing:foo:ii}
+%     \OopsNew{Foo}[]i{(#1)}s{{~\&~}{,~}{~\&~}}o{\textless#1\textgreater}{ Barr = { a }, Baz = { b }, Qux = { c } } 
+%   \end{listing}
+%   
+%   \phantomsection\addcontentsline{toc}{section}{\doclist{foo:iii}.}
+%   \begin{listing}[]{label=listing:foo:iii}
+%     \OopsOptions
+%     {
+%     Inner = {(#1)},
+%     Separators = { {~\&~}{~,~}{~\&~} },
+%     Outer = {\textless#1\textgreater}
+%   }
+%     \OopsNew{Foo}[]{ Barr = { a }, Baz = { b }, Qux = { c } } 
+%   \end{listing}
+%   
+%   \phantomsection\addcontentsline{toc}{section}{\doclist{foo:iv}.}
+%   \begin{listing}[]
+%     {label=listing:foo:iv}
+%     \OopsOptions
+%     {
+%     Inner,
+%     Separators,
+%     Outer
+%   }
+%   \end{listing}
+%   
+%   \phantomsection\addcontentsline{toc}{section}{\doclist{math:i}.}
+%   \begin{listing}[]
+%     {label=listing:math:i}
+%     \OopsNew{Math}[We call~]{Elems={\omega_1, \dots, \omega_n}}
+%     [~the elementary events, and ]{}{Space=\Omega}
+%     [\begin{equation*}\Space=(\Elems)\end{equation*}~the sample space.]
+%     {}
+%   \end{listing}
+%   
+%   
+%   \phantomsection\addcontentsline{toc}{section}{Listing~\autoref{listing:math:ii}.}
+%   \begin{listing}[]
+%     {label=listing:math:ii}
+%     \OopsClear{Math}
+%     \OopsNew{Math}[Let ]s{{,}{,}{,}}o{\ensuremath{\{#1\}}}
+%     {Space=\Omega, SigmaField=\mathcal{F}, Measure=\mathcal{P}}
+%     [~denote the probability space, where $\SigmaField\subset 2^{\Space}$.]
+%     {}
+%   \end{listing}
+%   \phantomsection\addcontentsline{toc}{section}{Listing~\autoref{listing:mvt}.}
+%   \begin{listing}[]{label=listing:mvt}
+%     \newtheorem{theorem}{Theorem}
+%     \OopsNew{Math}
+%     i{\mathbb{#1}}{ N = { N } , R = { R } }
+%     [\begin{theorem}[Mittelwertsatz f\"ur $n$ Variable]Es sei~]
+%       {}
+%       {
+%       OffeneMenge={D},
+%       Ci={C^{1}},
+%       Strecke={[x_0,x]}
+%^^A     %Strecke={\char`[x_0,x\char`]}     % Also works
+%^^A     %Strecke={\[x_0,x\]} % BUG
+% }
+%   [$n\in\N$, $\OffeneMenge\subseteq\N^n$ eine offene Menge und $f\in \Ci(\OffeneMenge,\R)$.
+%   Dann gibt es auf jeder Strecke $\Strecke\subset\OffeneMenge$ einen Punkt $\xi\in\Strecke$, ]
+%   {}
+%   {
+%   yDifferenz={f(x)-f(x_0)},
+%   xDifferenz={x-x_0},
+%   Steigung={\frac{\yDifferenz}{\xDifferenz}}
+% }
+%   [so dass gilt \begin{equation*}\Steigung = \operatorname{grad} f(\xi)^{\top}\end{equation*}
+% \end{theorem}]
+% {}
+% \end{listing}
+% 
+% \StopEventually{^^A
+% \PrintChanges
+% \PrintIndex
+% }
+% \part{Other}\label{part:other}
+% \section{Acknowledgment} 
+% 
+% This work has benefited from Q\&A's from the \LaTeX community. For specifics, see here: \url{https://tex.stackexchange.com/users/112708/erwann?tab=questions}
+% \doclist{math:i} and \doclist{math:ii} are from \cite{shir95}. \doclist{mvt} is from \pkg{tcolbox}\cite[17.3]{tcolbox}.
+% 
+% \begin{thebibliography}{1}
+% \bibitem{shir95} A.N. Shiryaev  {\em Probability} Springer, 1995
+% \bibitem{interface3} The \LaTeX3 Project Team {\em The \LaTeX3 interfaces} 
+%   \url{http://ftp.math.purdue.edu/mirrors/ctan.org/macros/latex/contrib/l3kernel/interface3.pdf}
+% \bibitem{xparse} The \LaTeX3 Project Team {\em The \pkg{xparse} package} 
+%   \url{http://ftp.math.purdue.edu/mirrors/ctan.org/macros/latex/contrib/l3packages/xparse.pdf}
+% \bibitem{tcolbox} Thomas F. Sturm {\em The \pkg{tcolorbox} package} 
+%   \url{http://www.texdoc.net/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf}
+% \bibitem{tex.stack:104023} \url{https://tex.stackexchange.com/questions/104023/what-is-a-token#104025}
+% \end{thebibliography}
+%
+% \section{Bug}\label{other:bug}
+% 
+% See \doclist{math:ii}. Low priority as there are workarounds.
+%
+% \section{Disclaimer}\label{other:discl}
+% 
+% This package has not been tested beyond \autoref{part:listing}.
+%
+% Option type \texttt{G} is supported but not recommended by \pkg{xparse}\cite{xparse}, but it's really practical in this case.
+
+% \section{Support}\label{other:support}
+% 
+% This package is available from \url{https://www.ctan.org/pkg/oops} (release) or \url{https://github.com/rogard/oops} (development) where you can report issues. 
+% 
+% \section{To do}\label{other:todo}
+% 
+% \begin{enumerate}
+% \item Continue \autoref{part:listing} based on \cite[Section 17.3]{tcolbox}
+% \end{enumerate}
+%
+%^^A \section{Changes}
+%
+% \changes{v1.0}{2019/03/08}{Initial version}
+%
+%   \clearpage
+%   \part{Implementation}\label{part:impl}
+%   
+%   \iffalse
+%<*package>   
+%   \fi
+%   \section{Back end}
+%   \subsection{Aux}
+%   \subsubsection{Msg}
+%    \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[2019/10/01]
+\ExplSyntaxOn
+\msg_new:nnn
+{Oops}
+{generic}
+{#1}
+%    \end{macrocode}
+% \subsubsection{Variables}
+%    \begin{macrocode}
+\seq_new:N \__erw_oops_seq
+%    \end{macrocode}
+% \subsubsection{Options}
+%    \begin{macrocode}
+\keys_define:nn { Oops }
+{
+  GenericObject .tl_gset:N = \__erw_oops_object_default_tl,
+  GenericObject .value_required:n = false,
+  GenericObject .default:n = {Math},
+  GenericObject .initial:n = {Math},
+  Inner .code:n =
+  {
+    \cs_gset:Npn \__erw_oops_inner_default:n ##1{#1}
+  },
+  Inner .value_required:n = false,
+  Inner .default:n = {#1}, 
+  Inner .initial:n = {#1}, 
+  Separators .tl_gset:N = \__erw_oops_separators_default_tl,
+  Separators .value_required:n = false,
+  Separators .default:n = {{ \text{~and~}}{\text{,~}}{\text{,~and~}}},
+  Separators .initial:n = {{ \text{~and~}}{\text{,~}}{\text{,~and~}}},
+  Outer .code:n =
+  {
+    \cs_gset:Npn \__erw_oops_outer_default:n ##1{#1}
+  },
+  Outer .value_required:n = false,
+  Outer .default:n = {\ensuremath{#1}},
+  Outer .initial:n = {\ensuremath{#1}}
+}
+%    \end{macrocode}
+% \subsection{Prop}
+% \subsubsection{name}
+%    \begin{macrocode}
+\cs_new:Npn \__erw_oops_name:n #1{__erw_oops_#1}  
+%    \end{macrocode}
+% \subsubsection{new}
+%    \begin{macrocode}
+\cs_new_protected:Nn \__erw_oops_new:n 
+{
+  \prop_new:c{\__erw_oops_name:n { #1 }}  
+}
+\cs_new_protected:Nn \__erw_oops_clear_new:n
+{
+  \prop_clear_new:c{\__erw_oops_name:n { #1 }}  
+}
+%    \end{macrocode}
+% \subsubsection{put}
+%    \begin{macrocode}
+\cs_new_protected:Nn \__erw_oops_put:nnn
+{
+  \prop_put:cnn { \__erw_oops_name:n { #1 } } { #2 } { #3 }
+}
+\cs_new_protected:Nn \__erw_oops_putinner:nnn
+{
+  \__erw_oops_put:nnn{#1}
+  {#2}
+  {\__erw_oops_inner:n{#3}}
+}
+%    \end{macrocode}
+% \subsubsection{item}
+%    \begin{macrocode}
+\cs_new:Nn \__erw_oops_item:nn
+{
+  \prop_item:cn { \__erw_oops_name:n { #1 } } { #2 }
+}
+\cs_new:Npn \__erw_oops_item:nnn #1 #2 #3
+{
+  \__erw_oops_item:nn{#1}{#2}
+}
+\cs_new:Nn \__erw_oops_itemcmd:Nn
+{
+  \ProvideDocumentCommand{#1}
+  {O{\__erw_oops_object_default_tl}}
+  {
+    \__erw_oops_item:nn {##1}{ #2 }
+  }
+}
+\cs_generate_variant:Nn \__erw_oops_itemcmd:Nn {c}
+\cs_new:Npn \__erw_oops_itemcmd:nnn
+#1
+#2
+#3
+{
+  \__erw_oops_itemcmd:cn{#2}{#2}
+}
+\cs_new:Npn \__erw_oops_itemto_seq:nnn #1 #2 #3
+{
+  \seq_put_right:Nn
+  \__erw_oops_seq
+  {\__erw_oops_item:nn{#1}{#2}}
+}
+%    \end{macrocode}
+% \subsubsection{conditional}
+%    \begin{macrocode}
+\cs_new:Nn \__erw_oops_if_exist:nTF 
+{
+  \prop_if_exist:cTF{\__erw_oops_name:n { #1 }}{#2}{#3}
+}
+%    \end{macrocode}
+% \subsubsection{parse}
+%    \begin{macrocode}
+\cs_set:Npn \__erw_oops_parse:Nnn
+#1 % fun
+#2 % prop name
+#3 % clist
+{
+  
+  \tl_if_blank:nTF{#3}
+  {\c_empty_tl}
+  {
+    \seq_set_split:Nnn \l_tmpa_seq {,}{#3} 
+    \cs_set:Npn \__erw_oops_parse:w ##1 = ##2 \q_stop
+    {
+      #1
+      {#2}
+      {\tl_trim_spaces:n{##1}} % key
+      {\tl_trim_spaces:n{##2}} % value
+    }
+    \cs_set:Npn \__erw_oops_parse:n ##1
+    {
+      \__erw_oops_parse:w ##1 \q_stop
+    }
+    \seq_map_function:NN \l_tmpa_seq \__erw_oops_parse:n
+  }
+}  
+%    \end{macrocode}
+% \section{Front end}
+% \subsection{\cs{OopsOptions}}
+%    \begin{macrocode}
+\NewDocumentCommand{\OopsOptions}
+{m}
+{
+  \keys_set:nn { Oops } {#1}
+}
+% \ProcessKeysPackageOptions{ Oops }
+%    \end{macrocode}
+% \subsection{\cs{OopsClear}}
+%    \begin{macrocode}
+\NewDocumentCommand{\OopsClear}
+{m}
+{
+  \__erw_oops_clear_new:n{#1}
+}  
+%    \end{macrocode}
+% \subsection{\cs{OopsNew}}
+%    \begin{macrocode}
+\NewDocumentCommand{\OopsNew}
+{
+  m
+  +o
+  E{iso}
+  {
+    {\__erw_oops_inner_default:n{##1}}
+    {\__erw_oops_separators_default_tl}
+    {\__erw_oops_outer_default:n{##1}}
+  }
+  m
+  E{i}
+  {
+    {\__erw_oops_inner_default:n{##1}}
+  }                                           
+  g
+  +o
+}
+{
+  \__erw_oops_if_exist:nTF{#1}
+  {\c_empty_tl}
+  {\__erw_oops_new:n{#1}}
+
+  \IfValueTF{#2}
+  {#2}
+  {\c_empty_tl}
+  \cs_gset:Npn
+
+  \__erw_oops_inner:n ##1
+  {#3}
+  \__erw_oops_parse:Nnn
+  \__erw_oops_putinner:nnn
+  {#1}
+  {#6}
+
+  \__erw_oops_parse:Nnn
+  \__erw_oops_itemcmd:nnn
+  {#1}
+  {#6}
+  
+  \IfValueTF{#2}
+  {
+    \seq_clear:N \__erw_oops_seq 
+    \__erw_oops_parse:Nnn
+    \__erw_oops_itemto_seq:nnn
+    {#1}
+    {#6}
+    \cs_gset:Npn
+    \__erw_oops_outer:n ##1
+    {#5}
+    \__erw_oops_outer:n
+    {\exp_last_unbraced:NNo
+      \seq_use:Nnnn
+      \__erw_oops_seq
+      {#4}
+    }
+  }
+  {\c_empty_tl}
+  
+  \IfValueTF{#8}
+  {
+    \IfValueTF{#9}
+    {
+      \exp_not:n{\OopsNew{#1}i{#7}{#8}[#9]}
+    }
+    {
+      \exp_not:n{\OopsNew{#1}i{#7}{#8}}
+    }
+  }
+  {
+    \IfValueTF{#9}
+    {
+      \exp_not:n{\OopsNew{#1}[#9]}
+    }
+    {\c_empty_tl}
+  }
+}
+%    \end{macrocode}
+%    \begin{macrocode}
+\ExplSyntaxOff
+%    \end{macrocode}
+%
+% \iffalse
+%</package>
+% \fi
+% \Finale
+\endinput
\ No newline at end of file
diff --git a/macros/latex/contrib/oops/oops.pdf b/macros/latex/contrib/oops/oops.pdf
new file mode 100644
index 0000000000..aeffddaf4d
--- /dev/null
+++ b/macros/latex/contrib/oops/oops.pdf
diff --git a/macros/latex/contrib/unicode-alphabets/README.md b/macros/latex/contrib/unicode-alphabets/README.md
index 998681de05..347049456b 100644
--- a/macros/latex/contrib/unicode-alphabets/README.md
+++ b/macros/latex/contrib/unicode-alphabets/README.md
@@ -7,7 +7,7 @@ See [unicode-alphabets.pdf](docs/unicode-alphabets.pdf) for the documentation.
 
 See [specimen.pdf](docs/specimen.pdf) for examples.
 
-Contents last updated 2019-07-23.
+Contents last updated 2020-03-11.
 
 Package available via CTAN at https://www.ctan.org/pkg/unicode-alphabets
 
diff --git a/macros/latex/contrib/unicode-alphabets/docs/example.pdf b/macros/latex/contrib/unicode-alphabets/docs/example.pdf
deleted file mode 100644
index 995cffa52a..0000000000
--- a/macros/latex/contrib/unicode-alphabets/docs/example.pdf
+++ /dev/null
diff --git a/macros/latex/contrib/unicode-alphabets/docs/example.tex b/macros/latex/contrib/unicode-alphabets/docs/example.tex
deleted file mode 100644
index 7c7d774d05..0000000000
--- a/macros/latex/contrib/unicode-alphabets/docs/example.tex
+++ /dev/null
@@ -1,91 +0,0 @@
-% !TEX TS-program = lualatex
-\documentclass{article}
-
-\usepackage{fontspec}
-\newfontfamily\mufifont{Palemonas MUFI}
-\newfontfamily\titusfont{TITUS Cyberbit Basic}
-
-\usepackage[
-	CYFI,
-	MUFI,
-	TITUS,
-%	disable entity macros,
-	fonts={
-		CYFI=\titusfont,
-		MUFI=\mufifont,
-		TITUS=\titusfont,
-	},
-]{unicode-alphabets}
-
-\setlength{\parindent}{0pt}
-
-\newcommand\display[1]{%
-	\texttt{\ignorespaces\detokenize{#1}}: \fbox{#1}%
-}
-
-\begin{document}
-
-\section{Normal Unicode characters}
-\display{Ā} --- 
-\display{B} --- 
-\display{Ċ} --- 
-\display{ā} --- 
-\display{b} --- 
-\display{ċ} --- 
-
-\section{MUFI 3.0 characters}
-\display{\mufi{FLOURISHED SMALL LETTER M SIGN}}\\
-\display{\msignflour{}} --- 
-\display{\mufi{msignflour}} --- 
-\display{\mufi{F2F3}}
-
-\vspace{8pt}
-\display{\mufi{LATIN SMALL LETTER Y WITH RIGHT MAIN STROKE}}\\
-\display{\yrgmainstrok{}} --- 
-\display{\mufi{yrgmainstrok}} --- 
-\display{\mufi{F233}}
-
-\section{MUFI 4.0 characters}
-Note that the currently installed Palemonas MUFI font on this machine does not have the OEligogon character.
-
-\vspace{12pt}
-\display{\mufi{LATIN CAPITAL LIGATURE OE WITH OGONEK}}\\ 
-\display{\OEligogon{}} --- 
-\display{\mufi{OEligogon}} --- 
-\display{\mufi{E262}}
-
-\vspace{8pt}
-\display{\mufi{LATIN CAPITAL LIGATURE UU}}\\
-\display{\UUlig{}} --- 
-\display{\mufi{UUlig}} --- 
-\display{\mufi{E8C6}}
-
-\vspace{8pt}
-\display{\mufi{HELBING SIGN}}\\
-\display{\helbing{}} --- 
-\display{\mufi{helbing}} --- 
-\display{\mufi{F2FB}}
-
-
-\section{Starred vs. unstarred}
-The unstarred commands use the configured font, whereas the starred version simply uses the current document font. Note the difference in the \@ signs as well as the missing \texttt{msignflour} in the document font.
-
-\vspace{12pt}
-\display{\mufi{0040}} --- 
-\display{\mufi*{0040}}
-
-\display{\mufi{0041}} --- 
-\display{\mufi*{0041}}
-
-\display{\msignflour{}} --- 
-\display{\msignflour*{}}
-
-\section{CYFI characters}
-\display{\cyfi{CYRILLIC CAPITAL LETTER REVERSED A}}\\
-\display{\cyfi{F330}}
-
-\section{TITUS characters}
-\display{\titus{LATIN CAPITAL LETTER SCHWA WITH MACRON}}\\
-\display{\titus{E3EC}}
-
-\end{document}
diff --git a/macros/latex/contrib/unicode-alphabets/docs/specimen.pdf b/macros/latex/contrib/unicode-alphabets/docs/specimen.pdf
index 94386650f8..e9c191c990 100644
--- a/macros/latex/contrib/unicode-alphabets/docs/specimen.pdf
+++ b/macros/latex/contrib/unicode-alphabets/docs/specimen.pdf
diff --git a/macros/latex/contrib/unicode-alphabets/docs/specimen.tex b/macros/latex/contrib/unicode-alphabets/docs/specimen.tex
index 9962b8a81b..3f52b09cd2 100644
--- a/macros/latex/contrib/unicode-alphabets/docs/specimen.tex
+++ b/macros/latex/contrib/unicode-alphabets/docs/specimen.tex
@@ -24,7 +24,7 @@
 \newfontfamily\mufifont{Palemonas MUFI}
 \newfontfamily\silfont{Doulos SIL}
 \newfontfamily\titusfont{TITUS Cyberbit Basic}
-\newfontfamily\unzfont{LUC.EnsisheimU1A}
+\newfontfamily\unzfont{LOB.Ensisheim}
 
 \usepackage[
 %	CYFI,
@@ -125,4 +125,4 @@
 \catcode`\_=8
 \endgroup
 
-\end{document}
\ No newline at end of file
+\end{document}
diff --git a/macros/latex/contrib/unicode-alphabets/docs/unicode-alphabets.pdf b/macros/latex/contrib/unicode-alphabets/docs/unicode-alphabets.pdf
index cd9afaaa8a..29907ed86e 100644
--- a/macros/latex/contrib/unicode-alphabets/docs/unicode-alphabets.pdf
+++ b/macros/latex/contrib/unicode-alphabets/docs/unicode-alphabets.pdf
diff --git a/macros/latex/contrib/unicode-alphabets/docs/unicode-alphabets.tex b/macros/latex/contrib/unicode-alphabets/docs/unicode-alphabets.tex
index ada84e780f..3969d13260 100644
--- a/macros/latex/contrib/unicode-alphabets/docs/unicode-alphabets.tex
+++ b/macros/latex/contrib/unicode-alphabets/docs/unicode-alphabets.tex
@@ -93,7 +93,7 @@ Additionally, one may configure different fonts for each character set, as in th
 
 If no fonts are configured, the document font will be used (note that this may give undesirable results, as few fonts support multiple character sets\footnote{I believe Andreas Stötzner's \emph{Andron Mega} does, albeit I haven't tried it as it is somewhat expensive.}).
 
-Finally, the \verb|MUFI| and \verb|UNZ| character sets have defined entity names, which result in the creation of macros for each character (see \verb|msignfour| in the following example). These can be suppressed with the \verb|disableentitymacros| option.
+Finally, the \verb|MUFI| and \verb|UNZ| character sets have defined entity names, which result in the creation of macros for each character (see \verb|msignflour| in the following example). These can be suppressed with the \verb|disableentitymacros| option.
 
 \section{Usage}
 
diff --git a/macros/latex/contrib/unicode-alphabets/latex/unicode-alphabets.sty b/macros/latex/contrib/unicode-alphabets/latex/unicode-alphabets.sty
index 9195bab402..898fa9d4d9 100644
--- a/macros/latex/contrib/unicode-alphabets/latex/unicode-alphabets.sty
+++ b/macros/latex/contrib/unicode-alphabets/latex/unicode-alphabets.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{unicode-alphabets}[2019/07/23 Unicode alphabets in the Private Use Area]
+\ProvidesPackage{unicode-alphabets}[2020/03/11 Unicode alphabets in the Private Use Area]
 
 % License: CC-BY-SA 4.0
 % Author: Mikkel Eide Eriksen <mikkel.eriksen@gmail.com>
diff --git a/macros/latex/contrib/unicode-alphabets/latex/unicode-alphabets.unz.csv b/macros/latex/contrib/unicode-alphabets/latex/unicode-alphabets.unz.csv
index 0feb1ad1e6..9dc9f50859 100644
--- a/macros/latex/contrib/unicode-alphabets/latex/unicode-alphabets.unz.csv
+++ b/macros/latex/contrib/unicode-alphabets/latex/unicode-alphabets.unz.csv
@@ -31,7 +31,7 @@ F4FF,longs_longs_t,Kleine Latein-sst-Ligatur,LATIN SMALL LIGATURE LONG S LONG S
 FB05,longs_t,Kleine Latein-st-Ligatur,LATIN SMALL LIGATURE LONG S T
 EED9,t_t,Kleine Latein-tt-Ligatur,LATIN SMALL LIGATURE TT
 EEDC,t_z,Kleine Latein-tz-Ligatur,LATIN SMALL LIGATURE TZ
-F4F7,prestroke,Vorstrich, auf der Grundlinie ansetzend,BASE-LINE STROKE PLACED BEFORE
+F4F7,prestroke,Vorstrich auf der Grundlinie ansetzend,BASE-LINE STROKE PLACED BEFORE
 F4F8,S_t,Verbindung aus großem Lat.-S/kleinem Lat.-t,LATIN LIGATURE CAPITAL LETTER S SMALL LETTER T
 F500,a_,Anstrichloses kleines Latein-a,LATIN SMALL LETTER A WITHOUT STROKE PLACED BEFORE
 F501,adieresis_,Anstrichloses kleines Latein-ä,LATIN SMALL LETTER ADIERESIS WITHOUT STROKE PLACED BEFORE