summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-08-24 20:18:16 +0000
committerKarl Berry <karl@freefriends.org>2023-08-24 20:18:16 +0000
commitf1b9b4783cb4fbbb47f0f27b2c9d2147970a9888 (patch)
treea9b35330193d229551dd838af8229d6a230e0e01
parent61c741afb9193a369192220c31511fa91f0c2f8f (diff)
expex-acro (24aug23)
git-svn-id: svn://tug.org/texlive/trunk@68046 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/expex-acro/README.md2
-rw-r--r--Master/texmf-dist/doc/generic/expex-acro/expex-acro.pdfbin87971 -> 88970 bytes
-rw-r--r--Master/texmf-dist/source/generic/expex-acro/expex-acro.dtx27
-rw-r--r--Master/texmf-dist/tex/generic/expex-acro/expex-acro.sty21
4 files changed, 35 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/generic/expex-acro/README.md b/Master/texmf-dist/doc/generic/expex-acro/README.md
index b1ef6962b46..5bafc46b169 100644
--- a/Master/texmf-dist/doc/generic/expex-acro/README.md
+++ b/Master/texmf-dist/doc/generic/expex-acro/README.md
@@ -1,6 +1,6 @@
# expex-acro
This package is a small wrapper for the excellent [expex](https://ctan.org/pkg/expex), adding ways to define, use, and summarize glossing abbreviations. It also provides commands to refer to examples, as well as some inline formatting commands commonly used in linguistics.
-e-mail: florianmatter@gmail.com
+e-mail: fmatter@mailbox.org
Released under the LaTeX Project Public License v1.3c or later, see [https://www.latex-project.org/lppl.txt](https://www.latex-project.org/lppl.txt). \ No newline at end of file
diff --git a/Master/texmf-dist/doc/generic/expex-acro/expex-acro.pdf b/Master/texmf-dist/doc/generic/expex-acro/expex-acro.pdf
index 6f14251f810..99a1da51c7d 100644
--- a/Master/texmf-dist/doc/generic/expex-acro/expex-acro.pdf
+++ b/Master/texmf-dist/doc/generic/expex-acro/expex-acro.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/generic/expex-acro/expex-acro.dtx b/Master/texmf-dist/source/generic/expex-acro/expex-acro.dtx
index e5d5d5d9f24..6eda6ef051d 100644
--- a/Master/texmf-dist/source/generic/expex-acro/expex-acro.dtx
+++ b/Master/texmf-dist/source/generic/expex-acro/expex-acro.dtx
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1994/06/01]
%<package>\ProvidesPackage{expex-acro}
-%<package> [2022/05/17 v0.0.2 ]
+%<package> [2023/08/23 v0.0.3 ]
%<*package>
%</package>
%<*driver>
@@ -47,6 +47,7 @@
%\CheckSum{0}
+%\changes{v0.0.3}{2023/08/23}{More versatile exref command in LaTeX label mode; removed underscores from abbreviations.}
%\changes{v0.0.2}{2022/05/17}{Options for predefined abbreviations and exref modes.}
%\changes{v0.0.1}{2022/04/28}{Initial release}
@@ -144,7 +145,7 @@ To use \LaTeX{} |\label|s:
%\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}.
+% The corresponding usage is |\exref|\oarg{range}\oarg{id2}\marg{id}.
% In this mode, one can directly refer to subexamples:
% \iffalse
%<*example>
@@ -155,7 +156,7 @@ To use \LaTeX{} |\label|s:
% \iffalse
%</example>
% \fi
-%The optional argument is simply inserted after the mandatory argument; ranges of subexamples can be done this way.
+%The first optional argument is simply inserted after the mandatory argument; ranges of subexamples can be done this way.
% \iffalse
%<*example>
% \fi
@@ -165,6 +166,7 @@ To use \LaTeX{} |\label|s:
% \iffalse
%</example>
% \fi
+% The second optional argument is interpreted as the start of an example range, ending with the mandatory argument.
%\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}
@@ -582,8 +584,8 @@ or
\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{sa}{short=S\textsubscript{A},long=S~marked~like~A,short-format=\scshape}
+\DeclareAcronym{sp}{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}
@@ -633,11 +635,20 @@ or
}
}
} {
- \ProvideDocumentCommand{\exref}{ o m }{
+ \ProvideDocumentCommand{\exref}{ o o m }{
\IfValueTF{#1} {
- (\ref{#2}#1)
+ \IfValueTF{#2} {
+ (\ref{#3}-\ref{#2}#1)
+ }{
+ (\ref{#3}#1)
+ }
}{
- (\ref{#2})
+ \IfValueTF{#2} {
+ (\ref{#3}-\ref{#2})
+ }{
+ (\ref{#3})
+ }
+
}
}
diff --git a/Master/texmf-dist/tex/generic/expex-acro/expex-acro.sty b/Master/texmf-dist/tex/generic/expex-acro/expex-acro.sty
index 6f87bef9552..1370ca4fe39 100644
--- a/Master/texmf-dist/tex/generic/expex-acro/expex-acro.sty
+++ b/Master/texmf-dist/tex/generic/expex-acro/expex-acro.sty
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/06/01]
\ProvidesPackage{expex-acro}
- [2022/05/17 v0.0.2 ]
+ [2023/08/23 v0.0.3 ]
@@ -379,8 +379,8 @@
\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{sa}{short=S\textsubscript{A},long=S~marked~like~A,short-format=\scshape}
+\DeclareAcronym{sp}{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}
@@ -425,11 +425,20 @@
}
}
} {
- \ProvideDocumentCommand{\exref}{ o m }{
+ \ProvideDocumentCommand{\exref}{ o o m }{
\IfValueTF{#1} {
- (\ref{#2}#1)
+ \IfValueTF{#2} {
+ (\ref{#3}-\ref{#2}#1)
+ }{
+ (\ref{#3}#1)
+ }
}{
- (\ref{#2})
+ \IfValueTF{#2} {
+ (\ref{#3}-\ref{#2})
+ }{
+ (\ref{#3})
+ }
+
}
}