texlive[63319] Master/texmf-dist: expex-acro (17may22)

[commits+karl at tug.org]

Revision: 63319
          http://tug.org/svn/texlive?view=revision&revision=63319
Author:   karl
Date:     2022-05-17 22:09:38 +0200 (Tue, 17 May 2022)
Log Message:
-----------
expex-acro (17may22)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/generic/expex-acro/expex-acro.pdf
    trunk/Master/texmf-dist/source/generic/expex-acro/expex-acro.dtx
    trunk/Master/texmf-dist/tex/generic/expex-acro/expex-acro.sty

Modified: trunk/Master/texmf-dist/doc/generic/expex-acro/expex-acro.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/generic/expex-acro/expex-acro.dtx
===================================================================
--- trunk/Master/texmf-dist/source/generic/expex-acro/expex-acro.dtx	2022-05-17 13:08:34 UTC (rev 63318)
+++ trunk/Master/texmf-dist/source/generic/expex-acro/expex-acro.dtx	2022-05-17 20:09:38 UTC (rev 63319)
@@ -16,295 +16,26 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1994/06/01]
 %<package>\ProvidesPackage{expex-acro}
-%<package>    [2022/04/28 v0.0.1 Initial release]
-%<package>\RequirePackage{expex}
-%<package>\RequirePackage{ifthen}
-%<package>\RequirePackage{acro}
-%<package>\RequirePackage{xspace}
-%<package>\RequirePackage{enumitem}
-%<package>\PassOptionsToPackage{inline}{enumitem}
-%<package>\NewAcroTemplate[list]{glossinglist}{%
-%<package>  \acroheading
-%<package>  \acropreamble
-%<package>  \begin{description}[font=\normalfont]
-%<package>    \acronymsmapF{%
-%<package>      \item[\acrowrite{short}\acroifT{alt}{/\acrowrite{alt}}]
-%<package>      \acrowrite{list}%
-%<package>      \acroifanyT{foreign,extra}{ (}%
-%<package>      \acroifT{foreign}{\acrowrite{foreign}\acroifT{extra}{, }}%
-%<package>      \acroifT{extra}{\acrowrite{extra}}%
-%<package>      \acroifanyT{foreign,extra}{)}%
-%<package>      \acropagefill
-%<package>      \acropages
-%<package>      {\acrotranslate{page}\nobreakspace}
-%<package>      {\acrotranslate{pages}\nobreakspace}%
-%<package>    }
-%<package>    {\item\AcroRerun}
-%<package>  \end{description}
-%<package>}
-%<package>\DeclareAcronym{1}{short=1,long=first person,short-format=\scshape}
-%<package>\DeclareAcronym{1+2}{short=1+2,long=first and second person,short-format=\scshape}
-%<package>\DeclareAcronym{1+3}{short=1+3,long=first and third person,short-format=\scshape}
-%<package>\DeclareAcronym{2}{short=2,long=second person,short-format=\scshape}
-%<package>\DeclareAcronym{3}{short=3,long=third person,short-format=\scshape}
-%<package>\DeclareAcronym{a}{short=A,long=agentive transitive argument,short-format=\scshape}
-%<package>\DeclareAcronym{atten}{short=atten,long=attenuative,short-format=\scshape}
-%<package>\DeclareAcronym{abl}{short=abl,long=ablative,short-format=\scshape}
-%<package>\DeclareAcronym{abort}{short=abort,long=abortive,short-format=\scshape}
-%<package>\DeclareAcronym{abs}{short=abs,long=absolutive,short-format=\scshape}
-%<package>\DeclareAcronym{acc}{short=acc,long=accusative,short-format=\scshape}
-%<package>\DeclareAcronym{act}{short=act,long=Actor,short-format=\scshape}
-%<package>\DeclareAcronym{ade}{short=ade,long=adessive,short-format=\scshape}
-%<package>\DeclareAcronym{adj}{short=adj,long=adjective,short-format=\scshape}
-%<package>\DeclareAcronym{adjz}{short=adjz,long=adjectivizer,short-format=\scshape}
-%<package>\DeclareAcronym{adp}{short=adp,long=adposition,short-format=\scshape}
-%<package>\DeclareAcronym{adv}{short=adv,long=adverb(ial),short-format=\scshape}
-%<package>\DeclareAcronym{advz}{short=advz,long=adverbalizer,short-format=\scshape}
-%<package>\DeclareAcronym{aff}{short=aff,long=affirmative,short-format=\scshape}
-%<package>\DeclareAcronym{ptv}{short=ptv,long=partitive,short-format=\scshape}
-%<package>\DeclareAcronym{ela}{short=ela,long=elative,short-format=\scshape}
-%<package>\DeclareAcronym{ess}{short=ess,long=essive,short-format=\scshape}
-%<package>\DeclareAcronym{agr}{short=agr,long=agreement,short-format=\scshape}
-%<package>\DeclareAcronym{agt}{short=agt,long=agent,short-format=\scshape}
-%<package>\DeclareAcronym{all}{short=all,long=allative,short-format=\scshape}
-%<package>\DeclareAcronym{ana}{short=ana,long=anaphoric,short-format=\scshape}
-%<package>\DeclareAcronym{and}{short=and,long=andative,short-format=\scshape}
-%<package>\DeclareAcronym{plup}{short=plup,long=pluperfect,short-format=\scshape}
-%<package>\DeclareAcronym{imperf}{short=imperf,long=imperfect,short-format=\scshape}
-%<package>\DeclareAcronym{anim}{short=anim,long=animate,short-format=\scshape}
-%<package>\DeclareAcronym{antiappl}{short=antiappl,long=antiapplicative,short-format=\scshape}
-%<package>\DeclareAcronym{antic}{short=antic,long=anticausative,short-format=\scshape}
-%<package>\DeclareAcronym{antip}{short=antip,long=antipassive,short-format=\scshape}
-%<package>\DeclareAcronym{appl}{short=appl,long=applicative,short-format=\scshape}
-%<package>\DeclareAcronym{art}{short=art,long=article,short-format=\scshape}
-%<package>\DeclareAcronym{asp}{short=asp,long=aspect,short-format=\scshape}
-%<package>\DeclareAcronym{ass}{short=ass,long=associative,short-format=\scshape}
-%<package>\DeclareAcronym{attr}{short=attr,long=attributive,short-format=\scshape}
-%<package>\DeclareAcronym{attrz}{short=attrz,long=attributivizer,short-format=\scshape}
-%<package>\DeclareAcronym{aug}{short=aug,long=augmentative,short-format=\scshape}
-%<package>\DeclareAcronym{aux}{short=aux,long=auxiliary,short-format=\scshape}
-%<package>\DeclareAcronym{av}{short=av,long=actor voice,short-format=\scshape}
-%<package>\DeclareAcronym{ben}{short=ben,long=benefactive,short-format=\scshape}
-%<package>\DeclareAcronym{cap}{short=cap,long=(cap-)ability,short-format=\scshape}
-%<package>\DeclareAcronym{caus}{short=caus,long=causative,short-format=\scshape}
-%<package>\DeclareAcronym{cert}{short=cert,long=certainty,short-format=\scshape}
-%<package>\DeclareAcronym{cess}{short=cess,long=cessative,short-format=\scshape}
-%<package>\DeclareAcronym{circ}{short=circ,long=circumstantial,short-format=\scshape}
-%<package>\DeclareAcronym{cisl}{short=cisl,long=cislocative,short-format=\scshape}
-%<package>\DeclareAcronym{cit}{short=cit,long=citation form,short-format=\scshape}
-%<package>\DeclareAcronym{clf}{short=clf,long=classifier,short-format=\scshape}
-%<package>\DeclareAcronym{cntr}{short=cntr,long=contrastive,short-format=\scshape}
-%<package>\DeclareAcronym{col}{short=col,long=collective,short-format=\scshape}
-%<package>\DeclareAcronym{com}{short=com,long=comitative,short-format=\scshape}
-%<package>\DeclareAcronym{comp}{short=comp,long=complementizer,short-format=\scshape}
-%<package>\DeclareAcronym{compr}{short=compr,long=comparative,short-format=\scshape}
-%<package>\DeclareAcronym{conc}{short=conc,long=concessive,short-format=\scshape}
-%<package>\DeclareAcronym{cond}{short=cond,long=conditional,short-format=\scshape}
-%<package>\DeclareAcronym{cont}{short=cont,long=continuative,short-format=\scshape}
-%<package>\DeclareAcronym{narr}{short=narr,long=narrative,short-format=\scshape}
-%<package>\DeclareAcronym{cop}{short=cop,long=copula,short-format=\scshape}
-%<package>\DeclareAcronym{cor}{short=cor,long=coreference,short-format=\scshape}
-%<package>\DeclareAcronym{cpl}{short=cpl,long=completive,short-format=\scshape}
-%<package>\DeclareAcronym{cvb}{short=cvb,long=converb,short-format=\scshape}
-%<package>\DeclareAcronym{dat}{short=dat,long=dative,short-format=\scshape}
-%<package>\DeclareAcronym{decl}{short=decl,long=declarative,short-format=\scshape}
-%<package>\DeclareAcronym{prob}{short=prob,long=probability,short-format=\scshape}
-%<package>\DeclareAcronym{def}{short=def,long=definite,short-format=\scshape}
-%<package>\DeclareAcronym{dei}{short=dei,long=deixis/deictic,short-format=\scshape}
-%<package>\DeclareAcronym{dem}{short=dem,long=demonstrative,short-format=\scshape}
-%<package>\DeclareAcronym{denmlz}{short=denmlz,long=denominalizer,short-format=\scshape}
-%<package>\DeclareAcronym{dep}{short=dep,long=dependent,short-format=\scshape}
-%<package>\DeclareAcronym{des}{short=des,long=desiderative,short-format=\scshape}
-%<package>\DeclareAcronym{det}{short=det,long=determiner,short-format=\scshape}
-%<package>\DeclareAcronym{detrz}{short=detrz,long=detransitivizer,short-format=\scshape}
-%<package>\DeclareAcronym{dim}{short=dim,long=diminutive,short-format=\scshape}
-%<package>\DeclareAcronym{dir}{short=dir,long=direct,short-format=\scshape}
-%<package>\DeclareAcronym{dist}{short=dist,long=distal,short-format=\scshape}
-%<package>\DeclareAcronym{distr}{short=distr,long=distributive,short-format=\scshape}
-%<package>\DeclareAcronym{ditr}{short=ditr,long=ditransitive,short-format=\scshape}
-%<package>\DeclareAcronym{dm}{short=dm,long=discourse marker,short-format=\scshape}
-%<package>\DeclareAcronym{ds}{short=ds,long=different subject,short-format=\scshape}
-%<package>\DeclareAcronym{du}{short=du,long=dual,short-format=\scshape}
-%<package>\DeclareAcronym{dub}{short=dub,long=dubitative,short-format=\scshape}
-%<package>\DeclareAcronym{dur}{short=dur,long=durative,short-format=\scshape}
-%<package>\DeclareAcronym{emp}{short=emp,long=emphatic,short-format=\scshape}
-%<package>\DeclareAcronym{ep}{short=ep,long=epenthetic,short-format=\scshape}
-%<package>\DeclareAcronym{epis}{short=epis,long=epistemic mood,short-format=\scshape}
-%<package>\DeclareAcronym{erg}{short=erg,long=ergative,short-format=\scshape}
-%<package>\DeclareAcronym{evid}{short=evid,long=evidentiality,short-format=\scshape}
-%<package>\DeclareAcronym{excl}{short=excl,long=exclusive,short-format=\scshape}
-%<package>\DeclareAcronym{exist}{short=exist,long=existential,short-format=\scshape}
-%<package>\DeclareAcronym{exp}{short=exp,long=experiental or direct evidentiality,short-format=\scshape}
-%<package>\DeclareAcronym{eyewit}{short=eyewit,long=eyewitness,short-format=\scshape}
-%<package>\DeclareAcronym{f}{short=f,long=feminine,short-format=\scshape}
-%<package>\DeclareAcronym{fam}{short=fam,long=familiar register,short-format=\scshape}
-%<package>\DeclareAcronym{fin}{short=fin,long=finite,short-format=\scshape}
-%<package>\DeclareAcronym{foc}{short=foc,long=focus,short-format=\scshape}
-%<package>\DeclareAcronym{form}{short=form,long=formal register,short-format=\scshape}
-%<package>\DeclareAcronym{freq}{short=freq,long=frequentative,short-format=\scshape}
-%<package>\DeclareAcronym{frust}{short=frust,long=frustrative,short-format=\scshape}
-%<package>\DeclareAcronym{fut}{short=fut,long=future,short-format=\scshape}
-%<package>\DeclareAcronym{g}{short=g,long=gender,short-format=\scshape}
-%<package>\DeclareAcronym{gen}{short=gen,long=genitive,short-format=\scshape}
-%<package>\DeclareAcronym{ger}{short=ger,long=gerund,short-format=\scshape}
-%<package>\DeclareAcronym{gno}{short=gno,long=gnomic,short-format=\scshape}
-%<package>\DeclareAcronym{goal}{short=goal,long=goal,short-format=\scshape}
-%<package>\DeclareAcronym{hab}{short=hab,long=habitual,short-format=\scshape}
-%<package>\DeclareAcronym{hest}{short=hest,long=hesternal past,short-format=\scshape}
-%<package>\DeclareAcronym{hist}{short=hist,long=historical past,short-format=\scshape}
-%<package>\DeclareAcronym{hod}{short=hod,long=hodiernal past,short-format=\scshape}
-%<package>\DeclareAcronym{hon}{short=hon,long=honorative,short-format=\scshape}
-%<package>\DeclareAcronym{imm}{short=imm,long=immediate past,short-format=\scshape}
-%<package>\DeclareAcronym{hort}{short=hort,long=hortative,short-format=\scshape}
-%<package>\DeclareAcronym{hsy}{short=hsy,long=hearsay/indirect evidentiality,short-format=\scshape}
-%<package>\DeclareAcronym{hum}{short=hum,long=human,short-format=\scshape}
-%<package>\DeclareAcronym{ideo}{short=ideo,long=ideophone,short-format=\scshape}
-%<package>\DeclareAcronym{ill}{short=ill,long=illative,short-format=\scshape}
-%<package>\DeclareAcronym{adm}{short=adm,long=admonitive,short-format=\scshape}
-%<package>\DeclareAcronym{imp}{short=imp,long=imperative,short-format=\scshape}
-%<package>\DeclareAcronym{imprs}{short=imprs,long=impersonal,short-format=\scshape}
-%<package>\DeclareAcronym{inan}{short=inan,long=inanimate,short-format=\scshape}
-%<package>\DeclareAcronym{inch}{short=inch,long=inchoative,short-format=\scshape}
-%<package>\DeclareAcronym{incl}{short=incl,long=inclusive,short-format=\scshape}
-%<package>\DeclareAcronym{incpl}{short=incpl,long=incompletive,short-format=\scshape}
-%<package>\DeclareAcronym{ind}{short=ind,long=indicative,short-format=\scshape}
-%<package>\DeclareAcronym{indf}{short=indf,long=indefinite,short-format=\scshape}
-%<package>\DeclareAcronym{ine}{short=ine,long=inessive,short-format=\scshape}
-%<package>\DeclareAcronym{inf}{short=inf,long=infinitive,short-format=\scshape}
-%<package>\DeclareAcronym{infr}{short=infr,long=inferred/conjectured evidentiality,short-format=\scshape}
-%<package>\DeclareAcronym{ins}{short=ins,long=instrumental,short-format=\scshape}
-%<package>\DeclareAcronym{int}{short=int,long=intermediate past,short-format=\scshape}
-%<package>\DeclareAcronym{inten}{short=inten,long=intentional,short-format=\scshape}
-%<package>\DeclareAcronym{interj}{short=interj,long=interjection,short-format=\scshape}
-%<package>\DeclareAcronym{intr}{short=intr,long=intransitive,short-format=\scshape}
-%<package>\DeclareAcronym{ints}{short=ints,long=intensifier,short-format=\scshape}
-%<package>\DeclareAcronym{inv}{short=inv,long=inverse,short-format=\scshape}
-%<package>\DeclareAcronym{invis}{short=invis,long=invisible,short-format=\scshape}
-%<package>\DeclareAcronym{ipfv}{short=ipfv,long=imperfective,short-format=\scshape}
-%<package>\DeclareAcronym{irr}{short=irr,long=irrealis,short-format=\scshape}
-%<package>\DeclareAcronym{iter}{short=iter,long=iterative,short-format=\scshape}
-%<package>\DeclareAcronym{jus}{short=jus,long=jussive,short-format=\scshape}
-%<package>\DeclareAcronym{lat}{short=lat,long=lative,short-format=\scshape}
-%<package>\DeclareAcronym{lk}{short=lk,long=linker,short-format=\scshape}
-%<package>\DeclareAcronym{loc}{short=loc,long=locative,short-format=\scshape}
-%<package>\DeclareAcronym{m}{short=m,long=masculine,short-format=\scshape}
-%<package>\DeclareAcronym{med}{short=med,long=medial,short-format=\scshape}
-%<package>\DeclareAcronym{ignor}{short=ignor,long=ignorative,short-format=\scshape}
-%<package>\DeclareAcronym{mid}{short=mid,long=middle,short-format=\scshape}
-%<package>\DeclareAcronym{min}{short=min,long=minimal,short-format=\scshape}
-%<package>\DeclareAcronym{mir}{short=mir,long=(ad)mirative,short-format=\scshape}
-%<package>\DeclareAcronym{mod}{short=mod,long=modal,short-format=\scshape}
-%<package>\DeclareAcronym{motimp}{short=motimp,long=motional imperative,short-format=\scshape}
-%<package>\DeclareAcronym{mvt}{short=mvt,long=movement,short-format=\scshape}
-%<package>\DeclareAcronym{n}{short=n,long=neuter,short-format=\scshape}
-%<package>\DeclareAcronym{ncor}{short=ncor,long=non-coreference,short-format=\scshape}
-%<package>\DeclareAcronym{neg}{short=neg,long=negation,short-format=\scshape}
-%<package>\DeclareAcronym{nfut}{short=nfut,long=non-future,short-format=\scshape}
-%<package>\DeclareAcronym{nhum}{short=nhum,long=non-human,short-format=\scshape}
-%<package>\DeclareAcronym{nmlz}{short=nmlz,long=nominalizer,short-format=\scshape}
-%<package>\DeclareAcronym{rev}{short=rev,long=reversative,short-format=\scshape}
-%<package>\DeclareAcronym{nom}{short=nom,long=nominative,short-format=\scshape}
-%<package>\DeclareAcronym{nonf}{short=nonf,long=nonfinite,short-format=\scshape}
-%<package>\DeclareAcronym{npst}{short=npst,long=non-past,short-format=\scshape}
-%<package>\DeclareAcronym{nrec}{short=nrec,long=non-recent past,short-format=\scshape}
-%<package>\DeclareAcronym{nsg}{short=nsg,long=non-singular,short-format=\scshape}
-%<package>\DeclareAcronym{nspec}{short=nspec,long=non-specific,short-format=\scshape}
-%<package>\DeclareAcronym{obj}{short=obj,long=object,short-format=\scshape}
-%<package>\DeclareAcronym{obl}{short=obl,long=oblique,short-format=\scshape}
-%<package>\DeclareAcronym{obv}{short=obv,long=obviative,short-format=\scshape}
-%<package>\DeclareAcronym{p}{short=P,long=patientive transitive argument,short-format=\scshape}
-%<package>\DeclareAcronym{part}{short=part,long=particle,short-format=\scshape}
-%<package>\DeclareAcronym{pass}{short=pass,long=passive,short-format=\scshape}
-%<package>\DeclareAcronym{pat}{short=pat,long=patient,short-format=\scshape}
-%<package>\DeclareAcronym{pauc}{short=pauc,long=paucal,short-format=\scshape}
-%<package>\DeclareAcronym{pej}{short=pej,long=pejorativre,short-format=\scshape}
-%<package>\DeclareAcronym{per}{short=per,long=perlative,short-format=\scshape}
-%<package>\DeclareAcronym{pert}{short=pert,long=pertensive,short-format=\scshape}
-%<package>\DeclareAcronym{perm}{short=perm,long=permissive,short-format=\scshape}
-%<package>\DeclareAcronym{pfv}{short=pfv,long=perfective,short-format=\scshape}
-%<package>\DeclareAcronym{pl}{short=pl,long=plural,short-format=\scshape}
-%<package>\DeclareAcronym{pnct}{short=pnct,long=punctual,short-format=\scshape}
-%<package>\DeclareAcronym{pol}{short=pol,long=polite,short-format=\scshape}
-%<package>\DeclareAcronym{posimp}{short=posimp,long=positional imperative,short-format=\scshape}
-%<package>\DeclareAcronym{poss}{short=poss,long=possessive,short-format=\scshape}
-%<package>\DeclareAcronym{poste}{short=poste,long=postessive,short-format=\scshape}
-%<package>\DeclareAcronym{postp}{short=postp,long=postposition,short-format=\scshape}
-%<package>\DeclareAcronym{pot}{short=pot,long=potential,short-format=\scshape}
-%<package>\DeclareAcronym{pred}{short=pred,long=predicative,short-format=\scshape}
-%<package>\DeclareAcronym{prep}{short=prep,long=preposition,short-format=\scshape}
-%<package>\DeclareAcronym{prf}{short=prf,long=perfect,short-format=\scshape}
-%<package>\DeclareAcronym{priv}{short=priv,long=privative,short-format=\scshape}
-%<package>\DeclareAcronym{pro}{short=pro,long=pronoun,short-format=\scshape}
-%<package>\DeclareAcronym{prog}{short=prog,long=progressive,short-format=\scshape}
-%<package>\DeclareAcronym{proh}{short=proh,long=prohibitive,short-format=\scshape}
-%<package>\DeclareAcronym{pros}{short=pros,long=prosecutive,short-format=\scshape}
-%<package>\DeclareAcronym{prox}{short=prox,long=proximal,short-format=\scshape}
-%<package>\DeclareAcronym{tns}{short=tns,long=tense,short-format=\scshape}
-%<package>\DeclareAcronym{opt}{short=opt,long=optative,short-format=\scshape}
-%<package>\DeclareAcronym{nposs}{short=nposs,long=unpossessed,short-format=\scshape}
-%<package>\DeclareAcronym{hyp}{short=hyp,long=hypothetical,short-format=\scshape}
-%<package>\DeclareAcronym{prs}{short=prs,long=present,short-format=\scshape}
-%<package>\DeclareAcronym{pst}{short=pst,long=past,short-format=\scshape}
-%<package>\DeclareAcronym{ptcp}{short=ptcp,long=participle,short-format=\scshape}
-%<package>\DeclareAcronym{purp}{short=purp,long=purposive,short-format=\scshape}
-%<package>\DeclareAcronym{q}{short=q,long=question particle/marker,short-format=\scshape}
-%<package>\DeclareAcronym{quot}{short=quot,long=quotative,short-format=\scshape}
-%<package>\DeclareAcronym{r}{short=R,long=recipient-like argument in ditransitive clause,short-format=\scshape}
-%<package>\DeclareAcronym{real}{short=real,long=realis,short-format=\scshape}
-%<package>\DeclareAcronym{reas}{short=reas,long=reason,short-format=\scshape}
-%<package>\DeclareAcronym{rec}{short=rec,long=recent past,short-format=\scshape}
-%<package>\DeclareAcronym{recp}{short=recp,long=reciprocal,short-format=\scshape}
-%<package>\DeclareAcronym{ref}{short=ref,long=referential,short-format=\scshape}
-%<package>\DeclareAcronym{refl}{short=refl,long=reflexive,short-format=\scshape}
-%<package>\DeclareAcronym{reit}{short=reit,long=reiterative,short-format=\scshape}
-%<package>\DeclareAcronym{rel}{short=rel,long=relative,short-format=\scshape}
-%<package>\DeclareAcronym{rem}{short=rem,long=remote past,short-format=\scshape}
-%<package>\DeclareAcronym{rep}{short=rep,long=repetitive,short-format=\scshape}
-%<package>\DeclareAcronym{res}{short=res,long=resultative,short-format=\scshape}
-%<package>\DeclareAcronym{resum}{short=resum,long=resumptive,short-format=\scshape}
-%<package>\DeclareAcronym{inal}{short=inal,long=inalienable,short-format=\scshape}
-%<package>\DeclareAcronym{s}{short=S,long=intransitive argument,short-format=\scshape}
-%<package>\DeclareAcronym{sap}{short=sap,long=speech act participant,short-format=\scshape}
-%<package>\DeclareAcronym{sbj}{short=sbj,long=subject,short-format=\scshape}
-%<package>\DeclareAcronym{sbjv}{short=sbjv,long=subjunctive,short-format=\scshape}
-%<package>\DeclareAcronym{sem}{short=sem,long=semelfactive,short-format=\scshape}
-%<package>\DeclareAcronym{seq}{short=seq,long=sequential,short-format=\scshape}
-%<package>\DeclareAcronym{sg}{short=sg,long=singular,short-format=\scshape}
-%<package>\DeclareAcronym{sim}{short=sim,long=similative,short-format=\scshape}
-%<package>\DeclareAcronym{spec}{short=spec,long=specifier,short-format=\scshape}
-%<package>\DeclareAcronym{src}{short=src,long=source,short-format=\scshape}
-%<package>\DeclareAcronym{ss}{short=ss,long=same subject,short-format=\scshape}
-%<package>\DeclareAcronym{stat}{short=stat,long=stative,short-format=\scshape}
-%<package>\DeclareAcronym{subr}{short=subr,long=subordinator,short-format=\scshape}
-%<package>\DeclareAcronym{sup}{short=sup,long=supine,short-format=\scshape}
-%<package>\DeclareAcronym{supl}{short=supl,long=superlative,short-format=\scshape}
-%<package>\DeclareAcronym{s_a_}{short=S\textsubscript{A},long=S marked like A,short-format=\scshape}
-%<package>\DeclareAcronym{s_p_}{short=S\textsubscript{P},long=S marked like P,short-format=\scshape}
-%<package>\DeclareAcronym{t}{short=T,long=theme-like argument in ditransitive clause,short-format=\scshape}
-%<package>\DeclareAcronym{tel}{short=tel,long=telic,short-format=\scshape}
-%<package>\DeclareAcronym{temp}{short=temp,long=temporal,short-format=\scshape}
-%<package>\DeclareAcronym{term}{short=term,long=terminative,short-format=\scshape}
-%<package>\DeclareAcronym{top}{short=top,long=topic,short-format=\scshape}
-%<package>\DeclareAcronym{tr}{short=tr,long=transitive,short-format=\scshape}
-%<package>\DeclareAcronym{transl}{short=transl,long=translative,short-format=\scshape}
-%<package>\DeclareAcronym{trl}{short=trl,long=trial,short-format=\scshape}
-%<package>\DeclareAcronym{trz}{short=trz,long=transitivizer,short-format=\scshape}
-%<package>\DeclareAcronym{uncert}{short=uncert,long=uncertainty,short-format=\scshape}
-%<package>\DeclareAcronym{und}{short=und,long=Undergoer,short-format=\scshape}
-%<package>\DeclareAcronym{uv}{short=uv,long=undergoer voice,short-format=\scshape}
-%<package>\DeclareAcronym{v}{short=v,long=verb(al),short-format=\scshape}
-%<package>\DeclareAcronym{vbz}{short=vbz,long=verbalizer,short-format=\scshape}
-%<package>\DeclareAcronym{ven}{short=ven,long=venitive,short-format=\scshape}
-%<package>\DeclareAcronym{vis}{short=vis,long=visible,short-format=\scshape}
-%<package>\DeclareAcronym{voc}{short=voc,long=vocative,short-format=\scshape}
-%<package>\DeclareAcronym{do}{short=do,long=direct object,short-format=\scshape}
-%<package>\DeclareAcronym{io}{short=io,long=indirect object,short-format=\scshape}
-%<package>\DeclareAcronym{po}{short=po,long=primary object,short-format=\scshape}
-%<package>\DeclareAcronym{so}{short=so,long=secondary object,short-format=\scshape}
-%<package>\DeclareAcronym{vet}{short=vet,long=vetative,short-format=\scshape}
+%<package>    [2022/05/17 v0.0.2 ]
+%<*package>
+%</package>
 %<*driver>
+\ProvidesFile{expex-acro.dtx}
 \documentclass{ltxdoc}
-\usepackage{expex-acro}
+\usepackage{showexpl}
+\lstset{%
+  basicstyle=\ttfamily\small,
+  commentstyle=\itshape\ttfamily\small,
+  showspaces=false,
+  showstringspaces=false,
+  breaklines=true,
+  breakautoindent=true,
+  captionpos=t
+}
+\usepackage{fontspec}
+\usepackage[abbrevs=leipzig]{expex-acro}
+\lingset{belowglpreambleskip=0ex,aboveglftskip=-0.2ex,aboveexskip=-0.2ex,belowexskip=-1ex}
+\usepackage{hyperref}
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
@@ -316,6 +47,7 @@
 
 %\CheckSum{0}
 
+%\changes{v0.0.2}{2022/05/17}{Options for predefined abbreviations and exref modes.}
 %\changes{v0.0.1}{2022/04/28}{Initial release}
 
 %\GetFileInfo{expex-acro.sty}
@@ -324,7 +56,6 @@
 %\DoNotIndex{\@ne}
 %\DoNotIndex{\advance,\begingroup,\catcode,\closein}
 %\DoNotIndex{\closeout,\day,\def,\edef,\else,\empty,\endgroup}
-
 %\title{The \textsf{expex-acro} package\thanks{This document
 %corresponds to \textsf{expex-acro}~\fileversion,
 %dated~\filedate.}}
@@ -332,14 +63,560 @@
 %
 %\maketitle
 %\tableofcontents
-% \StopEventually{\PrintIndex}
 %\section{Introduction}
 %
-%\textsf{expex-acro}, as the name suggests, combines \textsf{expex} (for typesetting linguistic examples) with \textsf{acro} (for acronyms).
-%The two main functionalities are commands to refer to examples, and to handle glossing abbreviations.
+%\textsf{expex-acro}, as the name suggests, combines the \textsf{expex} (for typesetting linguistic examples) and \textsf{acro} (for acronyms) packages.
+%It provides commands for the following functionalities: referring to examples (Section \ref{sec:exref}), registering and using glossing abbreviations (Section \ref{sec:abbrevs}), and common notations in linguistics (Section \ref{sec:commands}).
+%For detailed instructions, refer to the respective documentations of \textsf{expex} and \textsf{acro}.
+%
+%Below is a multipart example typeset using \textsf{expex} and the |\gl{}| command.
+%Note that it uses two distinct labeling mechanisms, the native \textsf{expex} |<tag>| notation, and the \LaTeX{} |\label{tag}| notation.
+%Usually, you would use only one of the two in your examples.
+% \iffalse
+%<*example>
+% \fi
+\let\orilabel\label
+\begin{LTXexample}[preset=\let\label\orilabel]
+\pex<ex1> \label{ex:1}
+\a<bernese> \label{ex:bernese}
+\begingl
+\glpreamble Bernese German//
+\glpreamble \obj{üsne Vättere}//
+\gla üs-ne vätter-e//
+\glb our-\gl{dat}.\gl{pl} father.\gl{pl}-\gl{dat}.\gl{pl}//
+\glft \qu{to our fathers}//
+\endgl
+\a<latin> \label{ex:latin}
+\begingl
+\glpreamble Latin//
+\glpreamble \obj{insularum}//
+\gla insul-arum  //
+\glb island-\gl{gen};\gl{pl}//
+\glft \qu{of the islands}//
+\endgl
+\xe
+\end{LTXexample}
+% \iffalse
+%</example>
+% \fi
+%
+%\section{Referring to examples}\label{sec:exref}
+%\DescribeMacro{\exref} The |\exref| command can be used to refer to examples in text.
+%The package option |refmode| determines how |\exref| will behave:
+% \iffalse
+%<*example>
+% \fi
+To use the built-in tag system (default):
+\begin{lstlisting}
+\usepackage[refmode=expex]{expex-acro}
+\end{lstlisting}
+To use \LaTeX{} |\label|s:
+\begin{lstlisting}
+\usepackage[refmode=latex]{expex-acro}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
+%\subsection{Using native \texttt{expex} tags}
+% \textsf{expex} has its own tag system, e.g.\ |<ex1>| in \exref{ex1} above.
+% The corresponding usage is |\exref|\oarg{id1}\marg{id2}.
+% Note that when using the \textsf{expex} mechanism, subexamples need to be referred to by their |\pex|'s tag and a period:
+% \iffalse
+%<*example>
+% \fi
+\begin{LTXexample}
+\exref{ex1}, \exref{ex1.bernese}, and \exref{ex1.latin}.
+\end{LTXexample}
+% \iffalse
+%</example>
+% \fi
+% If an optional argument is given, |\exref| will assume that these are two examples in a range:
+% \iffalse
+%<*example>
+% \fi
+\begin{LTXexample}
+\exref[ex1.bernese]{ex1.latin}
+\end{LTXexample}
+% \iffalse
+%</example>
+% \fi
+%\subsection{Using \LaTeX{} labels}
+%\RenewDocumentCommand{\exref}{ o m }{
+%        \IfValueTF{#1} {(\ref{#2}#1)}{(\ref{#2})}}
+% The alternative is to use the usual \LaTeX{} |\label| commands in your examples, like |\label{ex:1}| in \exref{ex:1} above.
+% The corresponding usage is |\exref|\oarg{range}\marg{id}.
+% In this mode, one can directly refer to subexamples:
+% \iffalse
+%<*example>
+% \fi
+\begin{LTXexample}
+\exref{ex:1}, \exref{ex:bernese}, and \exref{ex:latin}.
+\end{LTXexample}
+% \iffalse
+%</example>
+% \fi
+%The optional argument is simply inserted after the mandatory argument; ranges of subexamples can be done this way.
+% \iffalse
+%<*example>
+% \fi
+\begin{LTXexample}
+\exref[a--b]{ex:1}
+\end{LTXexample}
+% \iffalse
+%</example>
+% \fi
+%\section{Glossing abbreviations}\label{sec:abbrevs}
+%\textsf{expex-acro} loads the \textsf{acro} package for defining glossing abbreviations, displaying them in running text, and printing a list of the ones used.
+%\subsection{Package options}
+%\DescribeMacro{abbrevs}
+% By default, \textsf{expex-acro} loads no pre-defined glossing abbreviations.
+% This can be changed by using either
+% \iffalse
+%<*example>
+% \fi
+\begin{lstlisting}
+\usepackage[abbrevs=leipzig]{expex-acro}
+\end{lstlisting}
+or
+\begin{lstlisting}
+\usepackage[abbrevs=all]{expex-acro}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
+%Note that the current version of \textsf{acro} becomes significantly slower when loading long abbreviation lists (\url{https://github.com/cgnieder/acro/issues/205}).
+%Thus, there is a trade-off between having to manually define every glossing abbreviation you use, and speed. 
+%\subsection{Commands}
+%\DescribeMacro{\newGlossingAbbrev} Define a new glossing abbreviation.
+% Usage: |\newGlossingAbbrev|\marg{key}\marg{meaning}.
+%Example: |\newGlossingAbbrev{occ}{occultive}|.\\
+%\DescribeMacro{\gl} Render a glossing abbreviation.
+% Usage: |\gl|\marg{key}.
+%Example: |\gl{occ}|.\\
+%\DescribeMacro{\glossingAbbrevsList} Print list of used glossing abbreviations.
+% Usage: |\glossingAbbrevsList|. Demo:
+% \iffalse
+%<*example>
+% \fi
+\begin{LTXexample}
+\glossingAbbrevsList
+\end{LTXexample}
+% \iffalse
+%</example>
+% \fi
+%\section{Semantic commands for linguistic texts}\label{sec:commands}
+%An oft-cited advantage of using \LaTeX{} is the separation of content and formatting.
+%That principle is broken by using things like |\textit| for object language.
+%Of course, italics are a wide-spread standard, but what if you need or want to change how object language is displayed for some reason?
+%Apart from |\gl| for glosses, the following commands are built into \textsf{expex-acro}:
+% \iffalse
+%<*example>
+% \fi
+\begin{LTXexample}
+\begin{enumerate}
+\item \obj{xats} (object language)
+\item \qu{cat} (free translation)
+\item \rc{katta} (reconstructed form)
+\item \ort{Chatz} (orthographic representation)
+\item \lxm{chatz} (lexeme)
+\end{enumerate}
+\end{LTXexample}
+% \iffalse
+%</example>
+% \fi
+% \StopEventually{^^A
+% \PrintChanges
+% \PrintIndex}
+% \section{Implementation}
+%    \begin{macrocode}
+\RequirePackage{expex}
+\RequirePackage{etoolbox}
+\RequirePackage{xspace}
+\RequirePackage{l3keys2e}
+\RequirePackage{acro}
+\RequirePackage{enumitem}
 
-%\section{Referring to examples}
+\NewAcroTemplate[list]{glossinglist}{%
+ \acroheading
+ \acropreamble
+ \begin{description}[font=\normalfont]
+   \acronymsmapF{%
+     \item[\acrowrite{short}\acroifT{alt}{/\acrowrite{alt}}]
+     \acrowrite{list}%
+     \acroifanyT{foreign,extra}{ (}%
+     \acroifT{foreign}{\acrowrite{foreign}\acroifT{extra}{, }}%
+     \acroifT{extra}{\acrowrite{extra}}%
+     \acroifanyT{foreign,extra}{)}%
+     \acropagefill
+     \acropages
+     {\acrotranslate{page}\nobreakspace}
+     {\acrotranslate{pages}\nobreakspace}%
+   }
+   {\item\AcroRerun}
+ \end{description}
+}
 
+\ExplSyntaxOn
+\keys_define:nn { expex-acro }{
+  abbrevs .tl_set:N = \l_abbrevs_tl,
+  abbrevs .initial:n = none,
+  refmode .tl_set:N = \l_refmode_tl,
+  refmode .initial:n = expex,
+}
+\ProcessKeysOptions{expex-acro}
+\str_if_eq:VnT \l_abbrevs_tl {leipzig} {
+\DeclareAcronym{1}{short=1,long=first~person,short-format=\scshape}
+\DeclareAcronym{2}{short=2,long=second~person,short-format=\scshape}
+\DeclareAcronym{3}{short=3,long=third~person,short-format=\scshape}
+\DeclareAcronym{a}{short=a,long=agent-like~argument~of~canonical~transitive~verb,short-format=\scshape}
+\DeclareAcronym{abl}{short=abl,long=ablative,short-format=\scshape}
+\DeclareAcronym{abs}{short=abs,long=absolutive,short-format=\scshape}
+\DeclareAcronym{acc}{short=acc,long=accusative,short-format=\scshape}
+\DeclareAcronym{adj}{short=adj,long=adjective,short-format=\scshape}
+\DeclareAcronym{adv}{short=adv,long=adverb(ial),short-format=\scshape}
+\DeclareAcronym{agr}{short=agr,long=agreement,short-format=\scshape}
+\DeclareAcronym{all}{short=all,long=allative,short-format=\scshape}
+\DeclareAcronym{antip}{short=antip,long=antipassive,short-format=\scshape}
+\DeclareAcronym{appl}{short=appl,long=applicative,short-format=\scshape}
+\DeclareAcronym{art}{short=art,long=article,short-format=\scshape}
+\DeclareAcronym{aux}{short=aux,long=auxiliary,short-format=\scshape}
+\DeclareAcronym{ben}{short=ben,long=benefactive,short-format=\scshape}
+\DeclareAcronym{caus}{short=caus,long=causative,short-format=\scshape}
+\DeclareAcronym{clf}{short=clf,long=classifier,short-format=\scshape}
+\DeclareAcronym{com}{short=com,long=comitative,short-format=\scshape}
+\DeclareAcronym{comp}{short=comp,long=complementizer,short-format=\scshape}
+\DeclareAcronym{compl}{short=compl,long=completive,short-format=\scshape}
+\DeclareAcronym{cond}{short=cond,long=conditional,short-format=\scshape}
+\DeclareAcronym{cop}{short=cop,long=copula,short-format=\scshape}
+\DeclareAcronym{cvb}{short=cvb,long=converb,short-format=\scshape}
+\DeclareAcronym{dat}{short=dat,long=dative,short-format=\scshape}
+\DeclareAcronym{decl}{short=decl,long=declarative,short-format=\scshape}
+\DeclareAcronym{def}{short=def,long=definite,short-format=\scshape}
+\DeclareAcronym{dem}{short=dem,long=demonstrative,short-format=\scshape}
+\DeclareAcronym{det}{short=det,long=determiner,short-format=\scshape}
+\DeclareAcronym{dist}{short=dist,long=distal,short-format=\scshape}
+\DeclareAcronym{distr}{short=distr,long=distributive,short-format=\scshape}
+\DeclareAcronym{du}{short=du,long=dual,short-format=\scshape}
+\DeclareAcronym{dur}{short=dur,long=durative,short-format=\scshape}
+\DeclareAcronym{erg}{short=erg,long=ergative,short-format=\scshape}
+\DeclareAcronym{excl}{short=excl,long=exclusive,short-format=\scshape}
+\DeclareAcronym{f}{short=f,long=feminine,short-format=\scshape}
+\DeclareAcronym{foc}{short=foc,long=focus,short-format=\scshape}
+\DeclareAcronym{fut}{short=fut,long=future,short-format=\scshape}
+\DeclareAcronym{gen}{short=gen,long=genitive,short-format=\scshape}
+\DeclareAcronym{imp}{short=imp,long=imperative,short-format=\scshape}
+\DeclareAcronym{incl}{short=incl,long=inclusive,short-format=\scshape}
+\DeclareAcronym{ind}{short=ind,long=indicative,short-format=\scshape}
+\DeclareAcronym{indf}{short=indf,long=indefinite,short-format=\scshape}
+\DeclareAcronym{inf}{short=inf,long=infinitive,short-format=\scshape}
+\DeclareAcronym{ins}{short=ins,long=instrumental,short-format=\scshape}
+\DeclareAcronym{intr}{short=intr,long=intransitive,short-format=\scshape}
+\DeclareAcronym{ipfv}{short=ipfv,long=imperfective,short-format=\scshape}
+\DeclareAcronym{irr}{short=irr,long=irrealis,short-format=\scshape}
+\DeclareAcronym{loc}{short=loc,long=locative,short-format=\scshape}
+\DeclareAcronym{m}{short=m,long=masculine,short-format=\scshape}
+\DeclareAcronym{n}{short=n,long=neuter,short-format=\scshape}
+\DeclareAcronym{neg}{short=neg,long=negation,short-format=\scshape}
+\DeclareAcronym{nmlz}{short=nmlz,long=nominalizer/nominalization,short-format=\scshape}
+\DeclareAcronym{nom}{short=nom,long=nominative,short-format=\scshape}
+\DeclareAcronym{obj}{short=obj,long=object,short-format=\scshape}
+\DeclareAcronym{obl}{short=obl,long=oblique,short-format=\scshape}
+\DeclareAcronym{p}{short=p,long=patient-like~argument~of~canonical~transitive~verb,short-format=\scshape}
+\DeclareAcronym{pass}{short=pass,long=passive,short-format=\scshape}
+\DeclareAcronym{pfv}{short=pfv,long=perfective,short-format=\scshape}
+\DeclareAcronym{pl}{short=pl,long=plural,short-format=\scshape}
+\DeclareAcronym{poss}{short=poss,long=possessive,short-format=\scshape}
+\DeclareAcronym{pred}{short=pred,long=predicative,short-format=\scshape}
+\DeclareAcronym{prf}{short=prf,long=perfect,short-format=\scshape}
+\DeclareAcronym{prs}{short=prs,long=present,short-format=\scshape}
+\DeclareAcronym{prog}{short=prog,long=progressive,short-format=\scshape}
+\DeclareAcronym{proh}{short=proh,long=prohibitive,short-format=\scshape}
+\DeclareAcronym{prox}{short=prox,long=proximal/proximate,short-format=\scshape}
+\DeclareAcronym{pst}{short=pst,long=past,short-format=\scshape}
+\DeclareAcronym{ptcp}{short=ptcp,long=participle,short-format=\scshape}
+\DeclareAcronym{purp}{short=purp,long=purposive,short-format=\scshape}
+\DeclareAcronym{q}{short=q,long=question~particle/marker,short-format=\scshape}
+\DeclareAcronym{quot}{short=quot,long=quotative,short-format=\scshape}
+\DeclareAcronym{recp}{short=recp,long=reciprocal,short-format=\scshape}
+\DeclareAcronym{refl}{short=refl,long=reflexive,short-format=\scshape}
+\DeclareAcronym{rel}{short=rel,long=relative,short-format=\scshape}
+\DeclareAcronym{res}{short=res,long=resultative,short-format=\scshape}
+\DeclareAcronym{s}{short=s,long=single~argument~of~canonical~intransitive~verb,short-format=\scshape}
+\DeclareAcronym{sbj}{short=sbj,long=subject,short-format=\scshape}
+\DeclareAcronym{sbjv}{short=sbjv,long=subjunctive,short-format=\scshape}
+\DeclareAcronym{sg}{short=sg,long=singular,short-format=\scshape}
+\DeclareAcronym{top}{short=top,long=topic,short-format=\scshape}
+\DeclareAcronym{tr}{short=tr,long=transitive,short-format=\scshape}
+\DeclareAcronym{voc}{short=voc,long=vocative,short-format=\scshape}
+} 
+\str_if_eq:VnT \l_abbrevs_tl {all} {
+\DeclareAcronym{1}{short=1,long=first~person,short-format=\scshape}
+\DeclareAcronym{2}{short=2,long=second~person,short-format=\scshape}
+\DeclareAcronym{3}{short=3,long=third~person,short-format=\scshape}
+\DeclareAcronym{a}{short=a,long=agent-like~argument~of~canonical~transitive~verb,short-format=\scshape}
+\DeclareAcronym{abl}{short=abl,long=ablative,short-format=\scshape}
+\DeclareAcronym{abs}{short=abs,long=absolutive,short-format=\scshape}
+\DeclareAcronym{acc}{short=acc,long=accusative,short-format=\scshape}
+\DeclareAcronym{adj}{short=adj,long=adjective,short-format=\scshape}
+\DeclareAcronym{adv}{short=adv,long=adverb(ial),short-format=\scshape}
+\DeclareAcronym{agr}{short=agr,long=agreement,short-format=\scshape}
+\DeclareAcronym{all}{short=all,long=allative,short-format=\scshape}
+\DeclareAcronym{antip}{short=antip,long=antipassive,short-format=\scshape}
+\DeclareAcronym{appl}{short=appl,long=applicative,short-format=\scshape}
+\DeclareAcronym{art}{short=art,long=article,short-format=\scshape}
+\DeclareAcronym{aux}{short=aux,long=auxiliary,short-format=\scshape}
+\DeclareAcronym{ben}{short=ben,long=benefactive,short-format=\scshape}
+\DeclareAcronym{caus}{short=caus,long=causative,short-format=\scshape}
+\DeclareAcronym{clf}{short=clf,long=classifier,short-format=\scshape}
+\DeclareAcronym{com}{short=com,long=comitative,short-format=\scshape}
+\DeclareAcronym{comp}{short=comp,long=complementizer,short-format=\scshape}
+\DeclareAcronym{compl}{short=compl,long=completive,short-format=\scshape}
+\DeclareAcronym{cond}{short=cond,long=conditional,short-format=\scshape}
+\DeclareAcronym{cop}{short=cop,long=copula,short-format=\scshape}
+\DeclareAcronym{cvb}{short=cvb,long=converb,short-format=\scshape}
+\DeclareAcronym{dat}{short=dat,long=dative,short-format=\scshape}
+\DeclareAcronym{decl}{short=decl,long=declarative,short-format=\scshape}
+\DeclareAcronym{def}{short=def,long=definite,short-format=\scshape}
+\DeclareAcronym{dem}{short=dem,long=demonstrative,short-format=\scshape}
+\DeclareAcronym{det}{short=det,long=determiner,short-format=\scshape}
+\DeclareAcronym{dist}{short=dist,long=distal,short-format=\scshape}
+\DeclareAcronym{distr}{short=distr,long=distributive,short-format=\scshape}
+\DeclareAcronym{du}{short=du,long=dual,short-format=\scshape}
+\DeclareAcronym{dur}{short=dur,long=durative,short-format=\scshape}
+\DeclareAcronym{erg}{short=erg,long=ergative,short-format=\scshape}
+\DeclareAcronym{excl}{short=excl,long=exclusive,short-format=\scshape}
+\DeclareAcronym{f}{short=f,long=feminine,short-format=\scshape}
+\DeclareAcronym{foc}{short=foc,long=focus,short-format=\scshape}
+\DeclareAcronym{fut}{short=fut,long=future,short-format=\scshape}
+\DeclareAcronym{gen}{short=gen,long=genitive,short-format=\scshape}
+\DeclareAcronym{imp}{short=imp,long=imperative,short-format=\scshape}
+\DeclareAcronym{incl}{short=incl,long=inclusive,short-format=\scshape}
+\DeclareAcronym{ind}{short=ind,long=indicative,short-format=\scshape}
+\DeclareAcronym{indf}{short=indf,long=indefinite,short-format=\scshape}
+\DeclareAcronym{inf}{short=inf,long=infinitive,short-format=\scshape}
+\DeclareAcronym{ins}{short=ins,long=instrumental,short-format=\scshape}
+\DeclareAcronym{intr}{short=intr,long=intransitive,short-format=\scshape}
+\DeclareAcronym{ipfv}{short=ipfv,long=imperfective,short-format=\scshape}
+\DeclareAcronym{irr}{short=irr,long=irrealis,short-format=\scshape}
+\DeclareAcronym{loc}{short=loc,long=locative,short-format=\scshape}
+\DeclareAcronym{m}{short=m,long=masculine,short-format=\scshape}
+\DeclareAcronym{n}{short=n,long=neuter,short-format=\scshape}
+\DeclareAcronym{neg}{short=neg,long=negation,short-format=\scshape}
+\DeclareAcronym{nmlz}{short=nmlz,long=nominalizer/nominalization,short-format=\scshape}
+\DeclareAcronym{nom}{short=nom,long=nominative,short-format=\scshape}
+\DeclareAcronym{obj}{short=obj,long=object,short-format=\scshape}
+\DeclareAcronym{obl}{short=obl,long=oblique,short-format=\scshape}
+\DeclareAcronym{p}{short=p,long=patient-like~argument~of~canonical~transitive~verb,short-format=\scshape}
+\DeclareAcronym{pass}{short=pass,long=passive,short-format=\scshape}
+\DeclareAcronym{pfv}{short=pfv,long=perfective,short-format=\scshape}
+\DeclareAcronym{pl}{short=pl,long=plural,short-format=\scshape}
+\DeclareAcronym{poss}{short=poss,long=possessive,short-format=\scshape}
+\DeclareAcronym{pred}{short=pred,long=predicative,short-format=\scshape}
+\DeclareAcronym{prf}{short=prf,long=perfect,short-format=\scshape}
+\DeclareAcronym{prs}{short=prs,long=present,short-format=\scshape}
+\DeclareAcronym{prog}{short=prog,long=progressive,short-format=\scshape}
+\DeclareAcronym{proh}{short=proh,long=prohibitive,short-format=\scshape}
+\DeclareAcronym{prox}{short=prox,long=proximal/proximate,short-format=\scshape}
+\DeclareAcronym{pst}{short=pst,long=past,short-format=\scshape}
+\DeclareAcronym{ptcp}{short=ptcp,long=participle,short-format=\scshape}
+\DeclareAcronym{purp}{short=purp,long=purposive,short-format=\scshape}
+\DeclareAcronym{q}{short=q,long=question~particle/marker,short-format=\scshape}
+\DeclareAcronym{quot}{short=quot,long=quotative,short-format=\scshape}
+\DeclareAcronym{recp}{short=recp,long=reciprocal,short-format=\scshape}
+\DeclareAcronym{refl}{short=refl,long=reflexive,short-format=\scshape}
+\DeclareAcronym{rel}{short=rel,long=relative,short-format=\scshape}
+\DeclareAcronym{res}{short=res,long=resultative,short-format=\scshape}
+\DeclareAcronym{s}{short=s,long=single~argument~of~canonical~intransitive~verb,short-format=\scshape}
+\DeclareAcronym{sbj}{short=sbj,long=subject,short-format=\scshape}
+\DeclareAcronym{sbjv}{short=sbjv,long=subjunctive,short-format=\scshape}
+\DeclareAcronym{sg}{short=sg,long=singular,short-format=\scshape}
+\DeclareAcronym{top}{short=top,long=topic,short-format=\scshape}
+\DeclareAcronym{tr}{short=tr,long=transitive,short-format=\scshape}
+\DeclareAcronym{voc}{short=voc,long=vocative,short-format=\scshape}
+%BREAK
+\DeclareAcronym{1+2}{short=1+2,long=first~and~second~person,short-format=\scshape}
+\DeclareAcronym{1+3}{short=1+3,long=first~and~third~person,short-format=\scshape}
+\DeclareAcronym{abort}{short=abort,long=abortive,short-format=\scshape}
+\DeclareAcronym{act}{short=act,long=Actor,short-format=\scshape}
+\DeclareAcronym{ade}{short=ade,long=adessive,short-format=\scshape}
+\DeclareAcronym{adjz}{short=adjz,long=adjectivizer,short-format=\scshape}
+\DeclareAcronym{adm}{short=adm,long=admonitive,short-format=\scshape}
+\DeclareAcronym{adp}{short=adp,long=adposition,short-format=\scshape}
+\DeclareAcronym{advz}{short=advz,long=adverbalizer,short-format=\scshape}
+\DeclareAcronym{aff}{short=aff,long=affirmative,short-format=\scshape}
+\DeclareAcronym{agt}{short=agt,long=agent,short-format=\scshape}
+\DeclareAcronym{ana}{short=ana,long=anaphoric,short-format=\scshape}
+\DeclareAcronym{and}{short=and,long=andative,short-format=\scshape}
+\DeclareAcronym{anim}{short=anim,long=animate,short-format=\scshape}
+\DeclareAcronym{antiappl}{short=antiappl,long=antiapplicative,short-format=\scshape}
+\DeclareAcronym{antic}{short=antic,long=anticausative,short-format=\scshape}
+\DeclareAcronym{asp}{short=asp,long=aspect,short-format=\scshape}
+\DeclareAcronym{ass}{short=ass,long=associative,short-format=\scshape}
+\DeclareAcronym{atten}{short=atten,long=attenuative,short-format=\scshape}
+\DeclareAcronym{attr}{short=attr,long=attributive,short-format=\scshape}
+\DeclareAcronym{attrz}{short=attrz,long=attributivizer,short-format=\scshape}
+\DeclareAcronym{aug}{short=aug,long=augmentative,short-format=\scshape}
+\DeclareAcronym{av}{short=av,long=actor~voice,short-format=\scshape}
+\DeclareAcronym{cap}{short=cap,long=(cap-)ability,short-format=\scshape}
+\DeclareAcronym{cert}{short=cert,long=certainty,short-format=\scshape}
+\DeclareAcronym{cess}{short=cess,long=cessative,short-format=\scshape}
+\DeclareAcronym{circ}{short=circ,long=circumstantial,short-format=\scshape}
+\DeclareAcronym{cisl}{short=cisl,long=cislocative,short-format=\scshape}
+\DeclareAcronym{cit}{short=cit,long=citation~form,short-format=\scshape}
+\DeclareAcronym{cntr}{short=cntr,long=contrastive,short-format=\scshape}
+\DeclareAcronym{col}{short=col,long=collective,short-format=\scshape}
+\DeclareAcronym{compr}{short=compr,long=comparative,short-format=\scshape}
+\DeclareAcronym{conc}{short=conc,long=concessive,short-format=\scshape}
+\DeclareAcronym{cont}{short=cont,long=continuative,short-format=\scshape}
+\DeclareAcronym{cor}{short=cor,long=coreference,short-format=\scshape}
+\DeclareAcronym{cpl}{short=cpl,long=completive,short-format=\scshape}
+\DeclareAcronym{dei}{short=dei,long=deixis/deictic,short-format=\scshape}
+\DeclareAcronym{denmlz}{short=denmlz,long=denominalizer,short-format=\scshape}
+\DeclareAcronym{dep}{short=dep,long=dependent,short-format=\scshape}
+\DeclareAcronym{des}{short=des,long=desiderative,short-format=\scshape}
+\DeclareAcronym{detrz}{short=detrz,long=detransitivizer,short-format=\scshape}
+\DeclareAcronym{dim}{short=dim,long=diminutive,short-format=\scshape}
+\DeclareAcronym{dir}{short=dir,long=direct,short-format=\scshape}
+\DeclareAcronym{ditr}{short=ditr,long=ditransitive,short-format=\scshape}
+\DeclareAcronym{dm}{short=dm,long=discourse~marker,short-format=\scshape}
+\DeclareAcronym{do}{short=do,long=direct~object,short-format=\scshape}
+\DeclareAcronym{ds}{short=ds,long=different~subject,short-format=\scshape}
+\DeclareAcronym{dub}{short=dub,long=dubitative,short-format=\scshape}
+\DeclareAcronym{ela}{short=ela,long=elative,short-format=\scshape}
+\DeclareAcronym{emp}{short=emp,long=emphatic,short-format=\scshape}
+\DeclareAcronym{ep}{short=ep,long=epenthetic,short-format=\scshape}
+\DeclareAcronym{epis}{short=epis,long=epistemic~mood,short-format=\scshape}
+\DeclareAcronym{ess}{short=ess,long=essive,short-format=\scshape}
+\DeclareAcronym{evid}{short=evid,long=evidentiality,short-format=\scshape}
+\DeclareAcronym{exist}{short=exist,long=existential,short-format=\scshape}
+\DeclareAcronym{exp}{short=exp,long=experiental~or~direct~evidentiality,short-format=\scshape}
+\DeclareAcronym{eyewit}{short=eyewit,long=eyewitness,short-format=\scshape}
+\DeclareAcronym{fam}{short=fam,long=familiar~register,short-format=\scshape}
+\DeclareAcronym{fin}{short=fin,long=finite,short-format=\scshape}
+\DeclareAcronym{form}{short=form,long=formal~register,short-format=\scshape}
+\DeclareAcronym{freq}{short=freq,long=frequentative,short-format=\scshape}
+\DeclareAcronym{frust}{short=frust,long=frustrative,short-format=\scshape}
+\DeclareAcronym{g}{short=g,long=gender,short-format=\scshape}
+\DeclareAcronym{ger}{short=ger,long=gerund,short-format=\scshape}
+\DeclareAcronym{gno}{short=gno,long=gnomic,short-format=\scshape}
+\DeclareAcronym{goal}{short=goal,long=goal,short-format=\scshape}
+\DeclareAcronym{hab}{short=hab,long=habitual,short-format=\scshape}
+\DeclareAcronym{hest}{short=hest,long=hesternal~past,short-format=\scshape}
+\DeclareAcronym{hist}{short=hist,long=historical~past,short-format=\scshape}
+\DeclareAcronym{hod}{short=hod,long=hodiernal~past,short-format=\scshape}
+\DeclareAcronym{hon}{short=hon,long=honorative,short-format=\scshape}
+\DeclareAcronym{hort}{short=hort,long=hortative,short-format=\scshape}
+\DeclareAcronym{hsy}{short=hsy,long=hearsay/indirect~evidentiality,short-format=\scshape}
+\DeclareAcronym{hum}{short=hum,long=human,short-format=\scshape}
+\DeclareAcronym{hyp}{short=hyp,long=hypothetical,short-format=\scshape}
+\DeclareAcronym{ideo}{short=ideo,long=ideophone,short-format=\scshape}
+\DeclareAcronym{ignor}{short=ignor,long=ignorative,short-format=\scshape}
+\DeclareAcronym{ill}{short=ill,long=illative,short-format=\scshape}
+\DeclareAcronym{imm}{short=imm,long=immediate~past,short-format=\scshape}
+\DeclareAcronym{imperf}{short=imperf,long=imperfect,short-format=\scshape}
+\DeclareAcronym{imprs}{short=imprs,long=impersonal,short-format=\scshape}
+\DeclareAcronym{inal}{short=inal,long=inalienable,short-format=\scshape}
+\DeclareAcronym{inan}{short=inan,long=inanimate,short-format=\scshape}
+\DeclareAcronym{inch}{short=inch,long=inchoative,short-format=\scshape}
+\DeclareAcronym{incpl}{short=incpl,long=incompletive,short-format=\scshape}
+\DeclareAcronym{ine}{short=ine,long=inessive,short-format=\scshape}
+\DeclareAcronym{infr}{short=infr,long=inferred/conjectured~evidentiality,short-format=\scshape}
+\DeclareAcronym{int}{short=int,long=intermediate~past,short-format=\scshape}
+\DeclareAcronym{inten}{short=inten,long=intentional,short-format=\scshape}
+\DeclareAcronym{interj}{short=interj,long=interjection,short-format=\scshape}
+\DeclareAcronym{ints}{short=ints,long=intensifier,short-format=\scshape}
+\DeclareAcronym{inv}{short=inv,long=inverse,short-format=\scshape}
+\DeclareAcronym{invis}{short=invis,long=invisible,short-format=\scshape}
+\DeclareAcronym{io}{short=io,long=indirect~object,short-format=\scshape}
+\DeclareAcronym{iter}{short=iter,long=iterative,short-format=\scshape}
+\DeclareAcronym{jus}{short=jus,long=jussive,short-format=\scshape}
+\DeclareAcronym{lat}{short=lat,long=lative,short-format=\scshape}
+\DeclareAcronym{lk}{short=lk,long=linker,short-format=\scshape}
+\DeclareAcronym{med}{short=med,long=medial,short-format=\scshape}
+\DeclareAcronym{mid}{short=mid,long=middle,short-format=\scshape}
+\DeclareAcronym{min}{short=min,long=minimal,short-format=\scshape}
+\DeclareAcronym{mir}{short=mir,long=(ad)mirative,short-format=\scshape}
+\DeclareAcronym{mod}{short=mod,long=modal,short-format=\scshape}
+\DeclareAcronym{motimp}{short=motimp,long=motional~imperative,short-format=\scshape}
+\DeclareAcronym{mvt}{short=mvt,long=movement,short-format=\scshape}
+\DeclareAcronym{narr}{short=narr,long=narrative,short-format=\scshape}
+\DeclareAcronym{ncor}{short=ncor,long=non-coreference,short-format=\scshape}
+\DeclareAcronym{nfut}{short=nfut,long=non-future,short-format=\scshape}
+\DeclareAcronym{nhum}{short=nhum,long=non-human,short-format=\scshape}
+\DeclareAcronym{nonf}{short=nonf,long=nonfinite,short-format=\scshape}
+\DeclareAcronym{nposs}{short=nposs,long=unpossessed,short-format=\scshape}
+\DeclareAcronym{npst}{short=npst,long=non-past,short-format=\scshape}
+\DeclareAcronym{nrec}{short=nrec,long=non-recent~past,short-format=\scshape}
+\DeclareAcronym{nsg}{short=nsg,long=non-singular,short-format=\scshape}
+\DeclareAcronym{nspec}{short=nspec,long=non-specific,short-format=\scshape}
+\DeclareAcronym{obv}{short=obv,long=obviative,short-format=\scshape}
+\DeclareAcronym{opt}{short=opt,long=optative,short-format=\scshape}
+\DeclareAcronym{part}{short=part,long=particle,short-format=\scshape}
+\DeclareAcronym{pat}{short=pat,long=patient,short-format=\scshape}
+\DeclareAcronym{pauc}{short=pauc,long=paucal,short-format=\scshape}
+\DeclareAcronym{pej}{short=pej,long=pejorativre,short-format=\scshape}
+\DeclareAcronym{per}{short=per,long=perlative,short-format=\scshape}
+\DeclareAcronym{perm}{short=perm,long=permissive,short-format=\scshape}
+\DeclareAcronym{pert}{short=pert,long=pertensive,short-format=\scshape}
+\DeclareAcronym{plup}{short=plup,long=pluperfect,short-format=\scshape}
+\DeclareAcronym{pnct}{short=pnct,long=punctual,short-format=\scshape}
+\DeclareAcronym{po}{short=po,long=primary~object,short-format=\scshape}
+\DeclareAcronym{pol}{short=pol,long=polite,short-format=\scshape}
+\DeclareAcronym{posimp}{short=posimp,long=positional~imperative,short-format=\scshape}
+\DeclareAcronym{poste}{short=poste,long=postessive,short-format=\scshape}
+\DeclareAcronym{postp}{short=postp,long=postposition,short-format=\scshape}
+\DeclareAcronym{pot}{short=pot,long=potential,short-format=\scshape}
+\DeclareAcronym{prep}{short=prep,long=preposition,short-format=\scshape}
+\DeclareAcronym{priv}{short=priv,long=privative,short-format=\scshape}
+\DeclareAcronym{pro}{short=pro,long=pronoun,short-format=\scshape}
+\DeclareAcronym{prob}{short=prob,long=probability,short-format=\scshape}
+\DeclareAcronym{pros}{short=pros,long=prosecutive,short-format=\scshape}
+\DeclareAcronym{ptv}{short=ptv,long=partitive,short-format=\scshape}
+\DeclareAcronym{r}{short=R,long=recipient-like~argument~in~ditransitive~clause,short-format=\scshape}
+\DeclareAcronym{real}{short=real,long=realis,short-format=\scshape}
+\DeclareAcronym{reas}{short=reas,long=reason,short-format=\scshape}
+\DeclareAcronym{rec}{short=rec,long=recent~past,short-format=\scshape}
+\DeclareAcronym{ref}{short=ref,long=referential,short-format=\scshape}
+\DeclareAcronym{reit}{short=reit,long=reiterative,short-format=\scshape}
+\DeclareAcronym{rem}{short=rem,long=remote~past,short-format=\scshape}
+\DeclareAcronym{rep}{short=rep,long=repetitive,short-format=\scshape}
+\DeclareAcronym{resum}{short=resum,long=resumptive,short-format=\scshape}
+\DeclareAcronym{rev}{short=rev,long=reversative,short-format=\scshape}
+\DeclareAcronym{s_a_}{short=S\textsubscript{A},long=S~marked~like~A,short-format=\scshape}
+\DeclareAcronym{s_p_}{short=S\textsubscript{P},long=S~marked~like~P,short-format=\scshape}
+\DeclareAcronym{sap}{short=sap,long=speech~act~participant,short-format=\scshape}
+\DeclareAcronym{sem}{short=sem,long=semelfactive,short-format=\scshape}
+\DeclareAcronym{seq}{short=seq,long=sequential,short-format=\scshape}
+\DeclareAcronym{sim}{short=sim,long=similative,short-format=\scshape}
+\DeclareAcronym{so}{short=so,long=secondary~object,short-format=\scshape}
+\DeclareAcronym{spec}{short=spec,long=specifier,short-format=\scshape}
+\DeclareAcronym{src}{short=src,long=source,short-format=\scshape}
+\DeclareAcronym{ss}{short=ss,long=same~subject,short-format=\scshape}
+\DeclareAcronym{stat}{short=stat,long=stative,short-format=\scshape}
+\DeclareAcronym{subr}{short=subr,long=subordinator,short-format=\scshape}
+\DeclareAcronym{sup}{short=sup,long=supine,short-format=\scshape}
+\DeclareAcronym{supl}{short=supl,long=superlative,short-format=\scshape}
+\DeclareAcronym{t}{short=T,long=theme-like~argument~in~ditransitive~clause,short-format=\scshape}
+\DeclareAcronym{tel}{short=tel,long=telic,short-format=\scshape}
+\DeclareAcronym{temp}{short=temp,long=temporal,short-format=\scshape}
+\DeclareAcronym{term}{short=term,long=terminative,short-format=\scshape}
+\DeclareAcronym{tns}{short=tns,long=tense,short-format=\scshape}
+\DeclareAcronym{transl}{short=transl,long=translative,short-format=\scshape}
+\DeclareAcronym{trl}{short=trl,long=trial,short-format=\scshape}
+\DeclareAcronym{trz}{short=trz,long=transitivizer,short-format=\scshape}
+\DeclareAcronym{uncert}{short=uncert,long=uncertainty,short-format=\scshape}
+\DeclareAcronym{und}{short=und,long=Undergoer,short-format=\scshape}
+\DeclareAcronym{uv}{short=uv,long=undergoer~voice,short-format=\scshape}
+\DeclareAcronym{v}{short=v,long=verb(al),short-format=\scshape}
+\DeclareAcronym{vbz}{short=vbz,long=verbalizer,short-format=\scshape}
+\DeclareAcronym{ven}{short=ven,long=venitive,short-format=\scshape}
+\DeclareAcronym{vet}{short=vet,long=vetative,short-format=\scshape}
+\DeclareAcronym{vis}{short=vis,long=visible,short-format=\scshape}
+}
+\ExplSyntaxOff
+%    \end{macrocode}
+
+
 \gathertags
 \lingset{everygla=}
 
@@ -346,11 +623,26 @@
 %\begin{macro}{\exref}
 %Refer to examples, e.g. |\exref{kwaza-3}|. Use |\exref[a]{b}| to get (Xa-b).
 %    \begin{macrocode}
-\providecommand{\exref}[2][]{%
-\ifthenelse{\equal{#1}{}}%
-{(\getfullref{#2})}%
-{(\getfullref{#1}--\getref{#2})}%
+\ExplSyntaxOn
+\str_if_eq:VnTF \l_refmode_tl {expex} {
+    \ProvideDocumentCommand{\exref}{ o m }{
+        \IfValueTF{#1} {
+            (\getfullref{#1}--\getref{#2})
+        }{
+            (\getfullref{#2})
+        }
+    }
+} {
+    \ProvideDocumentCommand{\exref}{ o m }{
+        \IfValueTF{#1} {
+            (\ref{#2}#1)
+        }{
+            (\ref{#2})
+        }
+        
+    }
 }
+
 %    \end{macrocode}
 %\end{macro}
 
@@ -357,9 +649,13 @@
 %\begin{macro}{\exrefnil}
 %Refer to examples without explicit numbers.
 %    \begin{macrocode}
-\providecommand{\exrefnil}[2][]{%
-\ifthenelse{\equal{#1}{}}{(\getref{#2})}{(\getref{#1}--\getref{#2})}%
+\ProvideDocumentCommand{\exrefnil}{ o m }{
+\IfValueTF{#1} {
+    (\getref{#1}--\getref{#2})
+}{
+    (\getref{#2})
 }
+}
 %    \end{macrocode}
 %\end{macro}
 
@@ -377,11 +673,7 @@
 %    \end{macrocode}
 %\end{macro}
 
-%\section{Glossing abbreviations}
-
 %\begin{macro}{\gl}
-%Glossing abbreviations (pre-defined or custom), which will occur in the list.
-%For example, |\gl{erg}| yields \gl{erg}.
 %    \begin{macrocode}
 \providecommand{\gl}[1]{\acs{#1}}
 %    \end{macrocode}
@@ -413,10 +705,6 @@
 %    \end{macrocode}
 %\end{macro}
 
-
-%\section{Other commands useful for linguistic documents}
-%The big advantage of using something like |\obj| rather than |\textit| is that you can change how object language is displayed at any time, instead of hardcoding italics.
-
 %\begin{macro}{\obj}
 %Object language.
 %    \begin{macrocode}
@@ -434,7 +722,7 @@
 %\begin{macro}{\rc}
 %Reconstructed forms.
 %    \begin{macrocode}
-\providecommand{\rc}[1]{*\textit{#1}}
+\newcommand{\rc}[1]{*\textit{#1}}
 %    \end{macrocode}
 %\end{macro}
 
@@ -486,12 +774,5 @@
 \providecommand{\lxm}[1]{\textsc{#1}}
 %    \end{macrocode}
 %\end{macro}
-
-%\begin{macro}{\glosstilde}
-%Nice-looking tildes for reduplication.
-%    \begin{macrocode}
-\providecommand{\glosstilde}{\char`~\kern-1ex}
-%    \end{macrocode}
-%\end{macro}
 % \Finale
 \endinput
\ No newline at end of file

Modified: trunk/Master/texmf-dist/tex/generic/expex-acro/expex-acro.sty
===================================================================
--- trunk/Master/texmf-dist/tex/generic/expex-acro/expex-acro.sty	2022-05-17 13:08:34 UTC (rev 63318)
+++ trunk/Master/texmf-dist/tex/generic/expex-acro/expex-acro.sty	2022-05-17 20:09:38 UTC (rev 63319)
@@ -22,311 +22,427 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
 \ProvidesPackage{expex-acro}
-    [2022/04/28 v0.0.1 Initial release]
+    [2022/05/17 v0.0.2 ]
+
+
+
+
 \RequirePackage{expex}
-\RequirePackage{ifthen}
+\RequirePackage{etoolbox}
+\RequirePackage{xspace}
+\RequirePackage{l3keys2e}
 \RequirePackage{acro}
-\RequirePackage{xspace}
 \RequirePackage{enumitem}
-\PassOptionsToPackage{inline}{enumitem}
+
 \NewAcroTemplate[list]{glossinglist}{%
-  \acroheading
-  \acropreamble
-  \begin{description}[font=\normalfont]
-    \acronymsmapF{%
-      \item[\acrowrite{short}\acroifT{alt}{/\acrowrite{alt}}]
-      \acrowrite{list}%
-      \acroifanyT{foreign,extra}{ (}%
-      \acroifT{foreign}{\acrowrite{foreign}\acroifT{extra}{, }}%
-      \acroifT{extra}{\acrowrite{extra}}%
-      \acroifanyT{foreign,extra}{)}%
-      \acropagefill
-      \acropages
-      {\acrotranslate{page}\nobreakspace}
-      {\acrotranslate{pages}\nobreakspace}%
-    }
-    {\item\AcroRerun}
-  \end{description}
+ \acroheading
+ \acropreamble
+ \begin{description}[font=\normalfont]
+   \acronymsmapF{%
+     \item[\acrowrite{short}\acroifT{alt}{/\acrowrite{alt}}]
+     \acrowrite{list}%
+     \acroifanyT{foreign,extra}{ (}%
+     \acroifT{foreign}{\acrowrite{foreign}\acroifT{extra}{, }}%
+     \acroifT{extra}{\acrowrite{extra}}%
+     \acroifanyT{foreign,extra}{)}%
+     \acropagefill
+     \acropages
+     {\acrotranslate{page}\nobreakspace}
+     {\acrotranslate{pages}\nobreakspace}%
+   }
+   {\item\AcroRerun}
+ \end{description}
 }
-\DeclareAcronym{1}{short=1,long=first person,short-format=\scshape}
-\DeclareAcronym{1+2}{short=1+2,long=first and second person,short-format=\scshape}
-\DeclareAcronym{1+3}{short=1+3,long=first and third person,short-format=\scshape}
-\DeclareAcronym{2}{short=2,long=second person,short-format=\scshape}
-\DeclareAcronym{3}{short=3,long=third person,short-format=\scshape}
-\DeclareAcronym{a}{short=A,long=agentive transitive argument,short-format=\scshape}
-\DeclareAcronym{atten}{short=atten,long=attenuative,short-format=\scshape}
+
+\ExplSyntaxOn
+\keys_define:nn { expex-acro }{
+  abbrevs .tl_set:N = \l_abbrevs_tl,
+  abbrevs .initial:n = none,
+  refmode .tl_set:N = \l_refmode_tl,
+  refmode .initial:n = expex,
+}
+\ProcessKeysOptions{expex-acro}
+\str_if_eq:VnT \l_abbrevs_tl {leipzig} {
+\DeclareAcronym{1}{short=1,long=first~person,short-format=\scshape}
+\DeclareAcronym{2}{short=2,long=second~person,short-format=\scshape}
+\DeclareAcronym{3}{short=3,long=third~person,short-format=\scshape}
+\DeclareAcronym{a}{short=a,long=agent-like~argument~of~canonical~transitive~verb,short-format=\scshape}
 \DeclareAcronym{abl}{short=abl,long=ablative,short-format=\scshape}
-\DeclareAcronym{abort}{short=abort,long=abortive,short-format=\scshape}
 \DeclareAcronym{abs}{short=abs,long=absolutive,short-format=\scshape}
 \DeclareAcronym{acc}{short=acc,long=accusative,short-format=\scshape}
+\DeclareAcronym{adj}{short=adj,long=adjective,short-format=\scshape}
+\DeclareAcronym{adv}{short=adv,long=adverb(ial),short-format=\scshape}
+\DeclareAcronym{agr}{short=agr,long=agreement,short-format=\scshape}
+\DeclareAcronym{all}{short=all,long=allative,short-format=\scshape}
+\DeclareAcronym{antip}{short=antip,long=antipassive,short-format=\scshape}
+\DeclareAcronym{appl}{short=appl,long=applicative,short-format=\scshape}
+\DeclareAcronym{art}{short=art,long=article,short-format=\scshape}
+\DeclareAcronym{aux}{short=aux,long=auxiliary,short-format=\scshape}
+\DeclareAcronym{ben}{short=ben,long=benefactive,short-format=\scshape}
+\DeclareAcronym{caus}{short=caus,long=causative,short-format=\scshape}
+\DeclareAcronym{clf}{short=clf,long=classifier,short-format=\scshape}
+\DeclareAcronym{com}{short=com,long=comitative,short-format=\scshape}
+\DeclareAcronym{comp}{short=comp,long=complementizer,short-format=\scshape}
+\DeclareAcronym{compl}{short=compl,long=completive,short-format=\scshape}
+\DeclareAcronym{cond}{short=cond,long=conditional,short-format=\scshape}
+\DeclareAcronym{cop}{short=cop,long=copula,short-format=\scshape}
+\DeclareAcronym{cvb}{short=cvb,long=converb,short-format=\scshape}
+\DeclareAcronym{dat}{short=dat,long=dative,short-format=\scshape}
+\DeclareAcronym{decl}{short=decl,long=declarative,short-format=\scshape}
+\DeclareAcronym{def}{short=def,long=definite,short-format=\scshape}
+\DeclareAcronym{dem}{short=dem,long=demonstrative,short-format=\scshape}
+\DeclareAcronym{det}{short=det,long=determiner,short-format=\scshape}
+\DeclareAcronym{dist}{short=dist,long=distal,short-format=\scshape}
+\DeclareAcronym{distr}{short=distr,long=distributive,short-format=\scshape}
+\DeclareAcronym{du}{short=du,long=dual,short-format=\scshape}
+\DeclareAcronym{dur}{short=dur,long=durative,short-format=\scshape}
+\DeclareAcronym{erg}{short=erg,long=ergative,short-format=\scshape}
+\DeclareAcronym{excl}{short=excl,long=exclusive,short-format=\scshape}
+\DeclareAcronym{f}{short=f,long=feminine,short-format=\scshape}
+\DeclareAcronym{foc}{short=foc,long=focus,short-format=\scshape}
+\DeclareAcronym{fut}{short=fut,long=future,short-format=\scshape}
+\DeclareAcronym{gen}{short=gen,long=genitive,short-format=\scshape}
+\DeclareAcronym{imp}{short=imp,long=imperative,short-format=\scshape}
+\DeclareAcronym{incl}{short=incl,long=inclusive,short-format=\scshape}
+\DeclareAcronym{ind}{short=ind,long=indicative,short-format=\scshape}
+\DeclareAcronym{indf}{short=indf,long=indefinite,short-format=\scshape}
+\DeclareAcronym{inf}{short=inf,long=infinitive,short-format=\scshape}
+\DeclareAcronym{ins}{short=ins,long=instrumental,short-format=\scshape}
+\DeclareAcronym{intr}{short=intr,long=intransitive,short-format=\scshape}
+\DeclareAcronym{ipfv}{short=ipfv,long=imperfective,short-format=\scshape}
+\DeclareAcronym{irr}{short=irr,long=irrealis,short-format=\scshape}
+\DeclareAcronym{loc}{short=loc,long=locative,short-format=\scshape}
+\DeclareAcronym{m}{short=m,long=masculine,short-format=\scshape}
+\DeclareAcronym{n}{short=n,long=neuter,short-format=\scshape}
+\DeclareAcronym{neg}{short=neg,long=negation,short-format=\scshape}
+\DeclareAcronym{nmlz}{short=nmlz,long=nominalizer/nominalization,short-format=\scshape}
+\DeclareAcronym{nom}{short=nom,long=nominative,short-format=\scshape}
+\DeclareAcronym{obj}{short=obj,long=object,short-format=\scshape}
+\DeclareAcronym{obl}{short=obl,long=oblique,short-format=\scshape}
+\DeclareAcronym{p}{short=p,long=patient-like~argument~of~canonical~transitive~verb,short-format=\scshape}
+\DeclareAcronym{pass}{short=pass,long=passive,short-format=\scshape}
+\DeclareAcronym{pfv}{short=pfv,long=perfective,short-format=\scshape}
+\DeclareAcronym{pl}{short=pl,long=plural,short-format=\scshape}
+\DeclareAcronym{poss}{short=poss,long=possessive,short-format=\scshape}
+\DeclareAcronym{pred}{short=pred,long=predicative,short-format=\scshape}
+\DeclareAcronym{prf}{short=prf,long=perfect,short-format=\scshape}
+\DeclareAcronym{prs}{short=prs,long=present,short-format=\scshape}
+\DeclareAcronym{prog}{short=prog,long=progressive,short-format=\scshape}
+\DeclareAcronym{proh}{short=proh,long=prohibitive,short-format=\scshape}
+\DeclareAcronym{prox}{short=prox,long=proximal/proximate,short-format=\scshape}
+\DeclareAcronym{pst}{short=pst,long=past,short-format=\scshape}
+\DeclareAcronym{ptcp}{short=ptcp,long=participle,short-format=\scshape}
+\DeclareAcronym{purp}{short=purp,long=purposive,short-format=\scshape}
+\DeclareAcronym{q}{short=q,long=question~particle/marker,short-format=\scshape}
+\DeclareAcronym{quot}{short=quot,long=quotative,short-format=\scshape}
+\DeclareAcronym{recp}{short=recp,long=reciprocal,short-format=\scshape}
+\DeclareAcronym{refl}{short=refl,long=reflexive,short-format=\scshape}
+\DeclareAcronym{rel}{short=rel,long=relative,short-format=\scshape}
+\DeclareAcronym{res}{short=res,long=resultative,short-format=\scshape}
+\DeclareAcronym{s}{short=s,long=single~argument~of~canonical~intransitive~verb,short-format=\scshape}
+\DeclareAcronym{sbj}{short=sbj,long=subject,short-format=\scshape}
+\DeclareAcronym{sbjv}{short=sbjv,long=subjunctive,short-format=\scshape}
+\DeclareAcronym{sg}{short=sg,long=singular,short-format=\scshape}
+\DeclareAcronym{top}{short=top,long=topic,short-format=\scshape}
+\DeclareAcronym{tr}{short=tr,long=transitive,short-format=\scshape}
+\DeclareAcronym{voc}{short=voc,long=vocative,short-format=\scshape}
+}
+\str_if_eq:VnT \l_abbrevs_tl {all} {
+\DeclareAcronym{1}{short=1,long=first~person,short-format=\scshape}
+\DeclareAcronym{2}{short=2,long=second~person,short-format=\scshape}
+\DeclareAcronym{3}{short=3,long=third~person,short-format=\scshape}
+\DeclareAcronym{a}{short=a,long=agent-like~argument~of~canonical~transitive~verb,short-format=\scshape}
+\DeclareAcronym{abl}{short=abl,long=ablative,short-format=\scshape}
+\DeclareAcronym{abs}{short=abs,long=absolutive,short-format=\scshape}
+\DeclareAcronym{acc}{short=acc,long=accusative,short-format=\scshape}
+\DeclareAcronym{adj}{short=adj,long=adjective,short-format=\scshape}
+\DeclareAcronym{adv}{short=adv,long=adverb(ial),short-format=\scshape}
+\DeclareAcronym{agr}{short=agr,long=agreement,short-format=\scshape}
+\DeclareAcronym{all}{short=all,long=allative,short-format=\scshape}
+\DeclareAcronym{antip}{short=antip,long=antipassive,short-format=\scshape}
+\DeclareAcronym{appl}{short=appl,long=applicative,short-format=\scshape}
+\DeclareAcronym{art}{short=art,long=article,short-format=\scshape}
+\DeclareAcronym{aux}{short=aux,long=auxiliary,short-format=\scshape}
+\DeclareAcronym{ben}{short=ben,long=benefactive,short-format=\scshape}
+\DeclareAcronym{caus}{short=caus,long=causative,short-format=\scshape}
+\DeclareAcronym{clf}{short=clf,long=classifier,short-format=\scshape}
+\DeclareAcronym{com}{short=com,long=comitative,short-format=\scshape}
+\DeclareAcronym{comp}{short=comp,long=complementizer,short-format=\scshape}
+\DeclareAcronym{compl}{short=compl,long=completive,short-format=\scshape}
+\DeclareAcronym{cond}{short=cond,long=conditional,short-format=\scshape}
+\DeclareAcronym{cop}{short=cop,long=copula,short-format=\scshape}
+\DeclareAcronym{cvb}{short=cvb,long=converb,short-format=\scshape}
+\DeclareAcronym{dat}{short=dat,long=dative,short-format=\scshape}
+\DeclareAcronym{decl}{short=decl,long=declarative,short-format=\scshape}
+\DeclareAcronym{def}{short=def,long=definite,short-format=\scshape}
+\DeclareAcronym{dem}{short=dem,long=demonstrative,short-format=\scshape}
+\DeclareAcronym{det}{short=det,long=determiner,short-format=\scshape}
+\DeclareAcronym{dist}{short=dist,long=distal,short-format=\scshape}
+\DeclareAcronym{distr}{short=distr,long=distributive,short-format=\scshape}
+\DeclareAcronym{du}{short=du,long=dual,short-format=\scshape}
+\DeclareAcronym{dur}{short=dur,long=durative,short-format=\scshape}
+\DeclareAcronym{erg}{short=erg,long=ergative,short-format=\scshape}
+\DeclareAcronym{excl}{short=excl,long=exclusive,short-format=\scshape}
+\DeclareAcronym{f}{short=f,long=feminine,short-format=\scshape}
+\DeclareAcronym{foc}{short=foc,long=focus,short-format=\scshape}
+\DeclareAcronym{fut}{short=fut,long=future,short-format=\scshape}
+\DeclareAcronym{gen}{short=gen,long=genitive,short-format=\scshape}
+\DeclareAcronym{imp}{short=imp,long=imperative,short-format=\scshape}
+\DeclareAcronym{incl}{short=incl,long=inclusive,short-format=\scshape}
+\DeclareAcronym{ind}{short=ind,long=indicative,short-format=\scshape}
+\DeclareAcronym{indf}{short=indf,long=indefinite,short-format=\scshape}
+\DeclareAcronym{inf}{short=inf,long=infinitive,short-format=\scshape}
+\DeclareAcronym{ins}{short=ins,long=instrumental,short-format=\scshape}
+\DeclareAcronym{intr}{short=intr,long=intransitive,short-format=\scshape}
+\DeclareAcronym{ipfv}{short=ipfv,long=imperfective,short-format=\scshape}
+\DeclareAcronym{irr}{short=irr,long=irrealis,short-format=\scshape}
+\DeclareAcronym{loc}{short=loc,long=locative,short-format=\scshape}
+\DeclareAcronym{m}{short=m,long=masculine,short-format=\scshape}
+\DeclareAcronym{n}{short=n,long=neuter,short-format=\scshape}
+\DeclareAcronym{neg}{short=neg,long=negation,short-format=\scshape}
+\DeclareAcronym{nmlz}{short=nmlz,long=nominalizer/nominalization,short-format=\scshape}
+\DeclareAcronym{nom}{short=nom,long=nominative,short-format=\scshape}
+\DeclareAcronym{obj}{short=obj,long=object,short-format=\scshape}
+\DeclareAcronym{obl}{short=obl,long=oblique,short-format=\scshape}
+\DeclareAcronym{p}{short=p,long=patient-like~argument~of~canonical~transitive~verb,short-format=\scshape}
+\DeclareAcronym{pass}{short=pass,long=passive,short-format=\scshape}
+\DeclareAcronym{pfv}{short=pfv,long=perfective,short-format=\scshape}
+\DeclareAcronym{pl}{short=pl,long=plural,short-format=\scshape}
+\DeclareAcronym{poss}{short=poss,long=possessive,short-format=\scshape}
+\DeclareAcronym{pred}{short=pred,long=predicative,short-format=\scshape}
+\DeclareAcronym{prf}{short=prf,long=perfect,short-format=\scshape}
+\DeclareAcronym{prs}{short=prs,long=present,short-format=\scshape}
+\DeclareAcronym{prog}{short=prog,long=progressive,short-format=\scshape}
+\DeclareAcronym{proh}{short=proh,long=prohibitive,short-format=\scshape}
+\DeclareAcronym{prox}{short=prox,long=proximal/proximate,short-format=\scshape}
+\DeclareAcronym{pst}{short=pst,long=past,short-format=\scshape}
+\DeclareAcronym{ptcp}{short=ptcp,long=participle,short-format=\scshape}
+\DeclareAcronym{purp}{short=purp,long=purposive,short-format=\scshape}
+\DeclareAcronym{q}{short=q,long=question~particle/marker,short-format=\scshape}
+\DeclareAcronym{quot}{short=quot,long=quotative,short-format=\scshape}
+\DeclareAcronym{recp}{short=recp,long=reciprocal,short-format=\scshape}
+\DeclareAcronym{refl}{short=refl,long=reflexive,short-format=\scshape}
+\DeclareAcronym{rel}{short=rel,long=relative,short-format=\scshape}
+\DeclareAcronym{res}{short=res,long=resultative,short-format=\scshape}
+\DeclareAcronym{s}{short=s,long=single~argument~of~canonical~intransitive~verb,short-format=\scshape}
+\DeclareAcronym{sbj}{short=sbj,long=subject,short-format=\scshape}
+\DeclareAcronym{sbjv}{short=sbjv,long=subjunctive,short-format=\scshape}
+\DeclareAcronym{sg}{short=sg,long=singular,short-format=\scshape}
+\DeclareAcronym{top}{short=top,long=topic,short-format=\scshape}
+\DeclareAcronym{tr}{short=tr,long=transitive,short-format=\scshape}
+\DeclareAcronym{voc}{short=voc,long=vocative,short-format=\scshape}
+\DeclareAcronym{1+2}{short=1+2,long=first~and~second~person,short-format=\scshape}
+\DeclareAcronym{1+3}{short=1+3,long=first~and~third~person,short-format=\scshape}
+\DeclareAcronym{abort}{short=abort,long=abortive,short-format=\scshape}
 \DeclareAcronym{act}{short=act,long=Actor,short-format=\scshape}
 \DeclareAcronym{ade}{short=ade,long=adessive,short-format=\scshape}
-\DeclareAcronym{adj}{short=adj,long=adjective,short-format=\scshape}
 \DeclareAcronym{adjz}{short=adjz,long=adjectivizer,short-format=\scshape}
+\DeclareAcronym{adm}{short=adm,long=admonitive,short-format=\scshape}
 \DeclareAcronym{adp}{short=adp,long=adposition,short-format=\scshape}
-\DeclareAcronym{adv}{short=adv,long=adverb(ial),short-format=\scshape}
 \DeclareAcronym{advz}{short=advz,long=adverbalizer,short-format=\scshape}
 \DeclareAcronym{aff}{short=aff,long=affirmative,short-format=\scshape}
-\DeclareAcronym{ptv}{short=ptv,long=partitive,short-format=\scshape}
-\DeclareAcronym{ela}{short=ela,long=elative,short-format=\scshape}
-\DeclareAcronym{ess}{short=ess,long=essive,short-format=\scshape}
-\DeclareAcronym{agr}{short=agr,long=agreement,short-format=\scshape}
 \DeclareAcronym{agt}{short=agt,long=agent,short-format=\scshape}
-\DeclareAcronym{all}{short=all,long=allative,short-format=\scshape}
 \DeclareAcronym{ana}{short=ana,long=anaphoric,short-format=\scshape}
 \DeclareAcronym{and}{short=and,long=andative,short-format=\scshape}
-\DeclareAcronym{plup}{short=plup,long=pluperfect,short-format=\scshape}
-\DeclareAcronym{imperf}{short=imperf,long=imperfect,short-format=\scshape}
 \DeclareAcronym{anim}{short=anim,long=animate,short-format=\scshape}
 \DeclareAcronym{antiappl}{short=antiappl,long=antiapplicative,short-format=\scshape}
 \DeclareAcronym{antic}{short=antic,long=anticausative,short-format=\scshape}
-\DeclareAcronym{antip}{short=antip,long=antipassive,short-format=\scshape}
-\DeclareAcronym{appl}{short=appl,long=applicative,short-format=\scshape}
-\DeclareAcronym{art}{short=art,long=article,short-format=\scshape}
 \DeclareAcronym{asp}{short=asp,long=aspect,short-format=\scshape}
 \DeclareAcronym{ass}{short=ass,long=associative,short-format=\scshape}
+\DeclareAcronym{atten}{short=atten,long=attenuative,short-format=\scshape}
 \DeclareAcronym{attr}{short=attr,long=attributive,short-format=\scshape}
 \DeclareAcronym{attrz}{short=attrz,long=attributivizer,short-format=\scshape}
 \DeclareAcronym{aug}{short=aug,long=augmentative,short-format=\scshape}
-\DeclareAcronym{aux}{short=aux,long=auxiliary,short-format=\scshape}
-\DeclareAcronym{av}{short=av,long=actor voice,short-format=\scshape}
-\DeclareAcronym{ben}{short=ben,long=benefactive,short-format=\scshape}
+\DeclareAcronym{av}{short=av,long=actor~voice,short-format=\scshape}
 \DeclareAcronym{cap}{short=cap,long=(cap-)ability,short-format=\scshape}
-\DeclareAcronym{caus}{short=caus,long=causative,short-format=\scshape}
 \DeclareAcronym{cert}{short=cert,long=certainty,short-format=\scshape}
 \DeclareAcronym{cess}{short=cess,long=cessative,short-format=\scshape}
 \DeclareAcronym{circ}{short=circ,long=circumstantial,short-format=\scshape}
 \DeclareAcronym{cisl}{short=cisl,long=cislocative,short-format=\scshape}
-\DeclareAcronym{cit}{short=cit,long=citation form,short-format=\scshape}
-\DeclareAcronym{clf}{short=clf,long=classifier,short-format=\scshape}
+\DeclareAcronym{cit}{short=cit,long=citation~form,short-format=\scshape}
 \DeclareAcronym{cntr}{short=cntr,long=contrastive,short-format=\scshape}
 \DeclareAcronym{col}{short=col,long=collective,short-format=\scshape}
-\DeclareAcronym{com}{short=com,long=comitative,short-format=\scshape}
-\DeclareAcronym{comp}{short=comp,long=complementizer,short-format=\scshape}
 \DeclareAcronym{compr}{short=compr,long=comparative,short-format=\scshape}
 \DeclareAcronym{conc}{short=conc,long=concessive,short-format=\scshape}
-\DeclareAcronym{cond}{short=cond,long=conditional,short-format=\scshape}
 \DeclareAcronym{cont}{short=cont,long=continuative,short-format=\scshape}
-\DeclareAcronym{narr}{short=narr,long=narrative,short-format=\scshape}
-\DeclareAcronym{cop}{short=cop,long=copula,short-format=\scshape}
 \DeclareAcronym{cor}{short=cor,long=coreference,short-format=\scshape}
 \DeclareAcronym{cpl}{short=cpl,long=completive,short-format=\scshape}
-\DeclareAcronym{cvb}{short=cvb,long=converb,short-format=\scshape}
-\DeclareAcronym{dat}{short=dat,long=dative,short-format=\scshape}
-\DeclareAcronym{decl}{short=decl,long=declarative,short-format=\scshape}
-\DeclareAcronym{prob}{short=prob,long=probability,short-format=\scshape}
-\DeclareAcronym{def}{short=def,long=definite,short-format=\scshape}
 \DeclareAcronym{dei}{short=dei,long=deixis/deictic,short-format=\scshape}
-\DeclareAcronym{dem}{short=dem,long=demonstrative,short-format=\scshape}
 \DeclareAcronym{denmlz}{short=denmlz,long=denominalizer,short-format=\scshape}
 \DeclareAcronym{dep}{short=dep,long=dependent,short-format=\scshape}
 \DeclareAcronym{des}{short=des,long=desiderative,short-format=\scshape}
-\DeclareAcronym{det}{short=det,long=determiner,short-format=\scshape}
 \DeclareAcronym{detrz}{short=detrz,long=detransitivizer,short-format=\scshape}
 \DeclareAcronym{dim}{short=dim,long=diminutive,short-format=\scshape}
 \DeclareAcronym{dir}{short=dir,long=direct,short-format=\scshape}
-\DeclareAcronym{dist}{short=dist,long=distal,short-format=\scshape}
-\DeclareAcronym{distr}{short=distr,long=distributive,short-format=\scshape}
 \DeclareAcronym{ditr}{short=ditr,long=ditransitive,short-format=\scshape}
-\DeclareAcronym{dm}{short=dm,long=discourse marker,short-format=\scshape}
-\DeclareAcronym{ds}{short=ds,long=different subject,short-format=\scshape}
-\DeclareAcronym{du}{short=du,long=dual,short-format=\scshape}
+\DeclareAcronym{dm}{short=dm,long=discourse~marker,short-format=\scshape}
+\DeclareAcronym{do}{short=do,long=direct~object,short-format=\scshape}
+\DeclareAcronym{ds}{short=ds,long=different~subject,short-format=\scshape}
 \DeclareAcronym{dub}{short=dub,long=dubitative,short-format=\scshape}
-\DeclareAcronym{dur}{short=dur,long=durative,short-format=\scshape}
+\DeclareAcronym{ela}{short=ela,long=elative,short-format=\scshape}
 \DeclareAcronym{emp}{short=emp,long=emphatic,short-format=\scshape}
 \DeclareAcronym{ep}{short=ep,long=epenthetic,short-format=\scshape}
-\DeclareAcronym{epis}{short=epis,long=epistemic mood,short-format=\scshape}
-\DeclareAcronym{erg}{short=erg,long=ergative,short-format=\scshape}
+\DeclareAcronym{epis}{short=epis,long=epistemic~mood,short-format=\scshape}
+\DeclareAcronym{ess}{short=ess,long=essive,short-format=\scshape}
 \DeclareAcronym{evid}{short=evid,long=evidentiality,short-format=\scshape}
-\DeclareAcronym{excl}{short=excl,long=exclusive,short-format=\scshape}
 \DeclareAcronym{exist}{short=exist,long=existential,short-format=\scshape}
-\DeclareAcronym{exp}{short=exp,long=experiental or direct evidentiality,short-format=\scshape}
+\DeclareAcronym{exp}{short=exp,long=experiental~or~direct~evidentiality,short-format=\scshape}
 \DeclareAcronym{eyewit}{short=eyewit,long=eyewitness,short-format=\scshape}
-\DeclareAcronym{f}{short=f,long=feminine,short-format=\scshape}
-\DeclareAcronym{fam}{short=fam,long=familiar register,short-format=\scshape}
+\DeclareAcronym{fam}{short=fam,long=familiar~register,short-format=\scshape}
 \DeclareAcronym{fin}{short=fin,long=finite,short-format=\scshape}
-\DeclareAcronym{foc}{short=foc,long=focus,short-format=\scshape}
-\DeclareAcronym{form}{short=form,long=formal register,short-format=\scshape}
+\DeclareAcronym{form}{short=form,long=formal~register,short-format=\scshape}
 \DeclareAcronym{freq}{short=freq,long=frequentative,short-format=\scshape}
 \DeclareAcronym{frust}{short=frust,long=frustrative,short-format=\scshape}
-\DeclareAcronym{fut}{short=fut,long=future,short-format=\scshape}
 \DeclareAcronym{g}{short=g,long=gender,short-format=\scshape}
-\DeclareAcronym{gen}{short=gen,long=genitive,short-format=\scshape}
 \DeclareAcronym{ger}{short=ger,long=gerund,short-format=\scshape}
 \DeclareAcronym{gno}{short=gno,long=gnomic,short-format=\scshape}
 \DeclareAcronym{goal}{short=goal,long=goal,short-format=\scshape}
 \DeclareAcronym{hab}{short=hab,long=habitual,short-format=\scshape}
-\DeclareAcronym{hest}{short=hest,long=hesternal past,short-format=\scshape}
-\DeclareAcronym{hist}{short=hist,long=historical past,short-format=\scshape}
-\DeclareAcronym{hod}{short=hod,long=hodiernal past,short-format=\scshape}
+\DeclareAcronym{hest}{short=hest,long=hesternal~past,short-format=\scshape}
+\DeclareAcronym{hist}{short=hist,long=historical~past,short-format=\scshape}
+\DeclareAcronym{hod}{short=hod,long=hodiernal~past,short-format=\scshape}
 \DeclareAcronym{hon}{short=hon,long=honorative,short-format=\scshape}
-\DeclareAcronym{imm}{short=imm,long=immediate past,short-format=\scshape}
 \DeclareAcronym{hort}{short=hort,long=hortative,short-format=\scshape}
-\DeclareAcronym{hsy}{short=hsy,long=hearsay/indirect evidentiality,short-format=\scshape}
+\DeclareAcronym{hsy}{short=hsy,long=hearsay/indirect~evidentiality,short-format=\scshape}
 \DeclareAcronym{hum}{short=hum,long=human,short-format=\scshape}
+\DeclareAcronym{hyp}{short=hyp,long=hypothetical,short-format=\scshape}
 \DeclareAcronym{ideo}{short=ideo,long=ideophone,short-format=\scshape}
+\DeclareAcronym{ignor}{short=ignor,long=ignorative,short-format=\scshape}
 \DeclareAcronym{ill}{short=ill,long=illative,short-format=\scshape}
-\DeclareAcronym{adm}{short=adm,long=admonitive,short-format=\scshape}
-\DeclareAcronym{imp}{short=imp,long=imperative,short-format=\scshape}
+\DeclareAcronym{imm}{short=imm,long=immediate~past,short-format=\scshape}
+\DeclareAcronym{imperf}{short=imperf,long=imperfect,short-format=\scshape}
 \DeclareAcronym{imprs}{short=imprs,long=impersonal,short-format=\scshape}
+\DeclareAcronym{inal}{short=inal,long=inalienable,short-format=\scshape}
 \DeclareAcronym{inan}{short=inan,long=inanimate,short-format=\scshape}
 \DeclareAcronym{inch}{short=inch,long=inchoative,short-format=\scshape}
-\DeclareAcronym{incl}{short=incl,long=inclusive,short-format=\scshape}
 \DeclareAcronym{incpl}{short=incpl,long=incompletive,short-format=\scshape}
-\DeclareAcronym{ind}{short=ind,long=indicative,short-format=\scshape}
-\DeclareAcronym{indf}{short=indf,long=indefinite,short-format=\scshape}
 \DeclareAcronym{ine}{short=ine,long=inessive,short-format=\scshape}
-\DeclareAcronym{inf}{short=inf,long=infinitive,short-format=\scshape}
-\DeclareAcronym{infr}{short=infr,long=inferred/conjectured evidentiality,short-format=\scshape}
-\DeclareAcronym{ins}{short=ins,long=instrumental,short-format=\scshape}
-\DeclareAcronym{int}{short=int,long=intermediate past,short-format=\scshape}
+\DeclareAcronym{infr}{short=infr,long=inferred/conjectured~evidentiality,short-format=\scshape}
+\DeclareAcronym{int}{short=int,long=intermediate~past,short-format=\scshape}
 \DeclareAcronym{inten}{short=inten,long=intentional,short-format=\scshape}
 \DeclareAcronym{interj}{short=interj,long=interjection,short-format=\scshape}
-\DeclareAcronym{intr}{short=intr,long=intransitive,short-format=\scshape}
 \DeclareAcronym{ints}{short=ints,long=intensifier,short-format=\scshape}
 \DeclareAcronym{inv}{short=inv,long=inverse,short-format=\scshape}
 \DeclareAcronym{invis}{short=invis,long=invisible,short-format=\scshape}
-\DeclareAcronym{ipfv}{short=ipfv,long=imperfective,short-format=\scshape}
-\DeclareAcronym{irr}{short=irr,long=irrealis,short-format=\scshape}
+\DeclareAcronym{io}{short=io,long=indirect~object,short-format=\scshape}
 \DeclareAcronym{iter}{short=iter,long=iterative,short-format=\scshape}
 \DeclareAcronym{jus}{short=jus,long=jussive,short-format=\scshape}
 \DeclareAcronym{lat}{short=lat,long=lative,short-format=\scshape}
 \DeclareAcronym{lk}{short=lk,long=linker,short-format=\scshape}
-\DeclareAcronym{loc}{short=loc,long=locative,short-format=\scshape}
-\DeclareAcronym{m}{short=m,long=masculine,short-format=\scshape}
 \DeclareAcronym{med}{short=med,long=medial,short-format=\scshape}
-\DeclareAcronym{ignor}{short=ignor,long=ignorative,short-format=\scshape}
 \DeclareAcronym{mid}{short=mid,long=middle,short-format=\scshape}
 \DeclareAcronym{min}{short=min,long=minimal,short-format=\scshape}
 \DeclareAcronym{mir}{short=mir,long=(ad)mirative,short-format=\scshape}
 \DeclareAcronym{mod}{short=mod,long=modal,short-format=\scshape}
-\DeclareAcronym{motimp}{short=motimp,long=motional imperative,short-format=\scshape}
+\DeclareAcronym{motimp}{short=motimp,long=motional~imperative,short-format=\scshape}
 \DeclareAcronym{mvt}{short=mvt,long=movement,short-format=\scshape}
-\DeclareAcronym{n}{short=n,long=neuter,short-format=\scshape}
+\DeclareAcronym{narr}{short=narr,long=narrative,short-format=\scshape}
 \DeclareAcronym{ncor}{short=ncor,long=non-coreference,short-format=\scshape}
-\DeclareAcronym{neg}{short=neg,long=negation,short-format=\scshape}
 \DeclareAcronym{nfut}{short=nfut,long=non-future,short-format=\scshape}
 \DeclareAcronym{nhum}{short=nhum,long=non-human,short-format=\scshape}
-\DeclareAcronym{nmlz}{short=nmlz,long=nominalizer,short-format=\scshape}
-\DeclareAcronym{rev}{short=rev,long=reversative,short-format=\scshape}
-\DeclareAcronym{nom}{short=nom,long=nominative,short-format=\scshape}
 \DeclareAcronym{nonf}{short=nonf,long=nonfinite,short-format=\scshape}
+\DeclareAcronym{nposs}{short=nposs,long=unpossessed,short-format=\scshape}
 \DeclareAcronym{npst}{short=npst,long=non-past,short-format=\scshape}
-\DeclareAcronym{nrec}{short=nrec,long=non-recent past,short-format=\scshape}
+\DeclareAcronym{nrec}{short=nrec,long=non-recent~past,short-format=\scshape}
 \DeclareAcronym{nsg}{short=nsg,long=non-singular,short-format=\scshape}
 \DeclareAcronym{nspec}{short=nspec,long=non-specific,short-format=\scshape}
-\DeclareAcronym{obj}{short=obj,long=object,short-format=\scshape}
-\DeclareAcronym{obl}{short=obl,long=oblique,short-format=\scshape}
 \DeclareAcronym{obv}{short=obv,long=obviative,short-format=\scshape}
-\DeclareAcronym{p}{short=P,long=patientive transitive argument,short-format=\scshape}
+\DeclareAcronym{opt}{short=opt,long=optative,short-format=\scshape}
 \DeclareAcronym{part}{short=part,long=particle,short-format=\scshape}
-\DeclareAcronym{pass}{short=pass,long=passive,short-format=\scshape}
 \DeclareAcronym{pat}{short=pat,long=patient,short-format=\scshape}
 \DeclareAcronym{pauc}{short=pauc,long=paucal,short-format=\scshape}
 \DeclareAcronym{pej}{short=pej,long=pejorativre,short-format=\scshape}
 \DeclareAcronym{per}{short=per,long=perlative,short-format=\scshape}
+\DeclareAcronym{perm}{short=perm,long=permissive,short-format=\scshape}
 \DeclareAcronym{pert}{short=pert,long=pertensive,short-format=\scshape}
-\DeclareAcronym{perm}{short=perm,long=permissive,short-format=\scshape}
-\DeclareAcronym{pfv}{short=pfv,long=perfective,short-format=\scshape}
-\DeclareAcronym{pl}{short=pl,long=plural,short-format=\scshape}
+\DeclareAcronym{plup}{short=plup,long=pluperfect,short-format=\scshape}
 \DeclareAcronym{pnct}{short=pnct,long=punctual,short-format=\scshape}
+\DeclareAcronym{po}{short=po,long=primary~object,short-format=\scshape}
 \DeclareAcronym{pol}{short=pol,long=polite,short-format=\scshape}
-\DeclareAcronym{posimp}{short=posimp,long=positional imperative,short-format=\scshape}
-\DeclareAcronym{poss}{short=poss,long=possessive,short-format=\scshape}
+\DeclareAcronym{posimp}{short=posimp,long=positional~imperative,short-format=\scshape}
 \DeclareAcronym{poste}{short=poste,long=postessive,short-format=\scshape}
 \DeclareAcronym{postp}{short=postp,long=postposition,short-format=\scshape}
 \DeclareAcronym{pot}{short=pot,long=potential,short-format=\scshape}
-\DeclareAcronym{pred}{short=pred,long=predicative,short-format=\scshape}
 \DeclareAcronym{prep}{short=prep,long=preposition,short-format=\scshape}
-\DeclareAcronym{prf}{short=prf,long=perfect,short-format=\scshape}
 \DeclareAcronym{priv}{short=priv,long=privative,short-format=\scshape}
 \DeclareAcronym{pro}{short=pro,long=pronoun,short-format=\scshape}
-\DeclareAcronym{prog}{short=prog,long=progressive,short-format=\scshape}
-\DeclareAcronym{proh}{short=proh,long=prohibitive,short-format=\scshape}
+\DeclareAcronym{prob}{short=prob,long=probability,short-format=\scshape}
 \DeclareAcronym{pros}{short=pros,long=prosecutive,short-format=\scshape}
-\DeclareAcronym{prox}{short=prox,long=proximal,short-format=\scshape}
-\DeclareAcronym{tns}{short=tns,long=tense,short-format=\scshape}
-\DeclareAcronym{opt}{short=opt,long=optative,short-format=\scshape}
-\DeclareAcronym{nposs}{short=nposs,long=unpossessed,short-format=\scshape}
-\DeclareAcronym{hyp}{short=hyp,long=hypothetical,short-format=\scshape}
-\DeclareAcronym{prs}{short=prs,long=present,short-format=\scshape}
-\DeclareAcronym{pst}{short=pst,long=past,short-format=\scshape}
-\DeclareAcronym{ptcp}{short=ptcp,long=participle,short-format=\scshape}
-\DeclareAcronym{purp}{short=purp,long=purposive,short-format=\scshape}
-\DeclareAcronym{q}{short=q,long=question particle/marker,short-format=\scshape}
-\DeclareAcronym{quot}{short=quot,long=quotative,short-format=\scshape}
-\DeclareAcronym{r}{short=R,long=recipient-like argument in ditransitive clause,short-format=\scshape}
+\DeclareAcronym{ptv}{short=ptv,long=partitive,short-format=\scshape}
+\DeclareAcronym{r}{short=R,long=recipient-like~argument~in~ditransitive~clause,short-format=\scshape}
 \DeclareAcronym{real}{short=real,long=realis,short-format=\scshape}
 \DeclareAcronym{reas}{short=reas,long=reason,short-format=\scshape}
-\DeclareAcronym{rec}{short=rec,long=recent past,short-format=\scshape}
-\DeclareAcronym{recp}{short=recp,long=reciprocal,short-format=\scshape}
+\DeclareAcronym{rec}{short=rec,long=recent~past,short-format=\scshape}
 \DeclareAcronym{ref}{short=ref,long=referential,short-format=\scshape}
-\DeclareAcronym{refl}{short=refl,long=reflexive,short-format=\scshape}
 \DeclareAcronym{reit}{short=reit,long=reiterative,short-format=\scshape}
-\DeclareAcronym{rel}{short=rel,long=relative,short-format=\scshape}
-\DeclareAcronym{rem}{short=rem,long=remote past,short-format=\scshape}
+\DeclareAcronym{rem}{short=rem,long=remote~past,short-format=\scshape}
 \DeclareAcronym{rep}{short=rep,long=repetitive,short-format=\scshape}
-\DeclareAcronym{res}{short=res,long=resultative,short-format=\scshape}
 \DeclareAcronym{resum}{short=resum,long=resumptive,short-format=\scshape}
-\DeclareAcronym{inal}{short=inal,long=inalienable,short-format=\scshape}
-\DeclareAcronym{s}{short=S,long=intransitive argument,short-format=\scshape}
-\DeclareAcronym{sap}{short=sap,long=speech act participant,short-format=\scshape}
-\DeclareAcronym{sbj}{short=sbj,long=subject,short-format=\scshape}
-\DeclareAcronym{sbjv}{short=sbjv,long=subjunctive,short-format=\scshape}
+\DeclareAcronym{rev}{short=rev,long=reversative,short-format=\scshape}
+\DeclareAcronym{s_a_}{short=S\textsubscript{A},long=S~marked~like~A,short-format=\scshape}
+\DeclareAcronym{s_p_}{short=S\textsubscript{P},long=S~marked~like~P,short-format=\scshape}
+\DeclareAcronym{sap}{short=sap,long=speech~act~participant,short-format=\scshape}
 \DeclareAcronym{sem}{short=sem,long=semelfactive,short-format=\scshape}
 \DeclareAcronym{seq}{short=seq,long=sequential,short-format=\scshape}
-\DeclareAcronym{sg}{short=sg,long=singular,short-format=\scshape}
 \DeclareAcronym{sim}{short=sim,long=similative,short-format=\scshape}
+\DeclareAcronym{so}{short=so,long=secondary~object,short-format=\scshape}
 \DeclareAcronym{spec}{short=spec,long=specifier,short-format=\scshape}
 \DeclareAcronym{src}{short=src,long=source,short-format=\scshape}
-\DeclareAcronym{ss}{short=ss,long=same subject,short-format=\scshape}
+\DeclareAcronym{ss}{short=ss,long=same~subject,short-format=\scshape}
 \DeclareAcronym{stat}{short=stat,long=stative,short-format=\scshape}
 \DeclareAcronym{subr}{short=subr,long=subordinator,short-format=\scshape}
 \DeclareAcronym{sup}{short=sup,long=supine,short-format=\scshape}
 \DeclareAcronym{supl}{short=supl,long=superlative,short-format=\scshape}
-\DeclareAcronym{s_a_}{short=S\textsubscript{A},long=S marked like A,short-format=\scshape}
-\DeclareAcronym{s_p_}{short=S\textsubscript{P},long=S marked like P,short-format=\scshape}
-\DeclareAcronym{t}{short=T,long=theme-like argument in ditransitive clause,short-format=\scshape}
+\DeclareAcronym{t}{short=T,long=theme-like~argument~in~ditransitive~clause,short-format=\scshape}
 \DeclareAcronym{tel}{short=tel,long=telic,short-format=\scshape}
 \DeclareAcronym{temp}{short=temp,long=temporal,short-format=\scshape}
 \DeclareAcronym{term}{short=term,long=terminative,short-format=\scshape}
-\DeclareAcronym{top}{short=top,long=topic,short-format=\scshape}
-\DeclareAcronym{tr}{short=tr,long=transitive,short-format=\scshape}
+\DeclareAcronym{tns}{short=tns,long=tense,short-format=\scshape}
 \DeclareAcronym{transl}{short=transl,long=translative,short-format=\scshape}
 \DeclareAcronym{trl}{short=trl,long=trial,short-format=\scshape}
 \DeclareAcronym{trz}{short=trz,long=transitivizer,short-format=\scshape}
 \DeclareAcronym{uncert}{short=uncert,long=uncertainty,short-format=\scshape}
 \DeclareAcronym{und}{short=und,long=Undergoer,short-format=\scshape}
-\DeclareAcronym{uv}{short=uv,long=undergoer voice,short-format=\scshape}
+\DeclareAcronym{uv}{short=uv,long=undergoer~voice,short-format=\scshape}
 \DeclareAcronym{v}{short=v,long=verb(al),short-format=\scshape}
 \DeclareAcronym{vbz}{short=vbz,long=verbalizer,short-format=\scshape}
 \DeclareAcronym{ven}{short=ven,long=venitive,short-format=\scshape}
+\DeclareAcronym{vet}{short=vet,long=vetative,short-format=\scshape}
 \DeclareAcronym{vis}{short=vis,long=visible,short-format=\scshape}
-\DeclareAcronym{voc}{short=voc,long=vocative,short-format=\scshape}
-\DeclareAcronym{do}{short=do,long=direct object,short-format=\scshape}
-\DeclareAcronym{io}{short=io,long=indirect object,short-format=\scshape}
-\DeclareAcronym{po}{short=po,long=primary object,short-format=\scshape}
-\DeclareAcronym{so}{short=so,long=secondary object,short-format=\scshape}
-\DeclareAcronym{vet}{short=vet,long=vetative,short-format=\scshape}
+}
+\ExplSyntaxOff
 
-
-
-
-
-
-
 \gathertags
 \lingset{everygla=}
 
-\providecommand{\exref}[2][]{%
-\ifthenelse{\equal{#1}{}}%
-{(\getfullref{#2})}%
-{(\getfullref{#1}--\getref{#2})}%
+\ExplSyntaxOn
+\str_if_eq:VnTF \l_refmode_tl {expex} {
+    \ProvideDocumentCommand{\exref}{ o m }{
+        \IfValueTF{#1} {
+            (\getfullref{#1}--\getref{#2})
+        }{
+            (\getfullref{#2})
+        }
+    }
+} {
+    \ProvideDocumentCommand{\exref}{ o m }{
+        \IfValueTF{#1} {
+            (\ref{#2}#1)
+        }{
+            (\ref{#2})
+        }
+
+    }
 }
 
-\providecommand{\exrefnil}[2][]{%
-\ifthenelse{\equal{#1}{}}{(\getref{#2})}{(\getref{#1}--\getref{#2})}%
+
+\ProvideDocumentCommand{\exrefnil}{ o m }{
+\IfValueTF{#1} {
+    (\getref{#1}--\getref{#2})
+}{
+    (\getref{#2})
 }
+}
 
 \providecommand{\mexref}[2][, ]{%
 (%
@@ -336,7 +452,6 @@
 )%
 }
 
-
 \providecommand{\gl}[1]{\acs{#1}}
 
 \providecommand{\newGlossingAbbrev}[2]{
@@ -355,12 +470,11 @@
         ]
     }
 
-
 \providecommand{\obj}[1]{\textit{#1}}
 
 \providecommand{\qu}[1]{‘#1’}
 
-\providecommand{\rc}[1]{*\textit{#1}}
+\newcommand{\rc}[1]{*\textit{#1}}
 
 \providecommand{\ort}[1]{$\langle$#1$\rangle$}
 
@@ -375,8 +489,6 @@
 \providecommand{\bad}[1]{?\textit{#1}}
 
 \providecommand{\lxm}[1]{\textsc{#1}}
-
-\providecommand{\glosstilde}{\char`~\kern-1ex}
 \endinput
 %%
 %% End of file `expex-acro.sty'.