summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-12-11 21:09:04 +0000
committerKarl Berry <karl@freefriends.org>2023-12-11 21:09:04 +0000
commit0ffa79925cefdbed452c6cb4cd4b19e819829b06 (patch)
tree172480e99a3c83d0c49e56f4e261efc68368556c /Master
parente28be35f07ca196da80fab98ee4d4f7b3d2341cf (diff)
covington (11dec23)
git-svn-id: svn://tug.org/texlive/trunk@69091 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/covington/README5
-rw-r--r--Master/texmf-dist/doc/latex/covington/covington.pdfbin558128 -> 557927 bytes
-rw-r--r--Master/texmf-dist/doc/latex/covington/covington.tex32
-rw-r--r--Master/texmf-dist/tex/latex/covington/covington.sty10
4 files changed, 41 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/latex/covington/README b/Master/texmf-dist/doc/latex/covington/README
index ad9431e7cda..168f46b4500 100644
--- a/Master/texmf-dist/doc/latex/covington/README
+++ b/Master/texmf-dist/doc/latex/covington/README
@@ -31,6 +31,11 @@ The package consists of the following files:
== CHANGES ==
+* Version 2.14 (2023 December 11)
+ - Add \ownexcounterprep macro to add a prefix (e.g., the chapter)
+ to the (owncounter) example counter.
+ - Document how to (not) number examples per chapter.
+
* Version 2.13 (2023-12-02)
- Fix example numbering with chapters (#16).
diff --git a/Master/texmf-dist/doc/latex/covington/covington.pdf b/Master/texmf-dist/doc/latex/covington/covington.pdf
index d0963ed7ef9..d2187619ce4 100644
--- a/Master/texmf-dist/doc/latex/covington/covington.pdf
+++ b/Master/texmf-dist/doc/latex/covington/covington.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/covington/covington.tex b/Master/texmf-dist/doc/latex/covington/covington.tex
index 696bfe139cf..78861d588e5 100644
--- a/Master/texmf-dist/doc/latex/covington/covington.tex
+++ b/Master/texmf-dist/doc/latex/covington/covington.tex
@@ -97,8 +97,8 @@
%
% Titling
%
-\def\pversion{Version 2.13}
-\def\pdate{December 2, 2023}
+\def\pversion{Version 2.14}
+\def\pdate{December 11, 2023}
\title{\textbf{The \cvt\ Package\\\Large Macros for Linguistics}}
\author{Michael A. Covington \and J\"urgen Spitzm\"uller\thanks{Current maintainer.
@@ -163,7 +163,8 @@ to your document preamble. The package has the following options to customize it
By default, \cvt\ uses \LaTeX's equation counter for example numbering, so that if you use equations and numbered examples
in the same paper, you get a single continuous series of numbers. While some people (including the original author of this package)
consider this a feature, others might prefer to number equations and linguistic examples separately. If you count to the latter sort,
- use this option.
+ use this option. Note that the default appearance of the own counter and the equation counter differs if the document has chapters.
+ See sec.~\ref{sec:cbc} for details.
\item{\joption{fnexamplecounter=\jparam{main|own|own-reset}}} Default: \emph{main}.
Specifics of the counter for numbered examples in footnotes.
@@ -890,6 +891,24 @@ as in \pxref{expl} and \pxref{sbex}. It is defined as follows and can be redefin
\end{lstlisting}
+\subsection{Numbering per chapter or continuously}\label{sec:cbc}
+
+With the default (equation) counter which is used for examples, examples automatically get numbered
+per chapter if the document has chapters (e.g., (2.1) for the first example in chapter~2).
+If you want continuously numbered examples instead, use
+\begin{lstlisting}[moretexcs={counterwithout}]
+\counterwithout{equation}{chapter}
+\end{lstlisting}
+which also will change the equation numbering behavior.
+
+With \joption{owncounter}, on the other hand, examples are always continuously numbered by default.
+If you want examples numbered per chapter, do:
+\begin{lstlisting}[moretexcs={counterwithin,ownexcounterprep}]
+\counterwithin*{covex}{chapter}
+\renewcommand\ownexcounterprep{\thechapter.}
+\end{lstlisting}
+
+
\section{Glossing sentences word-by-word}\label{sec:gloss}
To gloss a sentence is to annotate it word-by-word. Most commonly, a
@@ -1647,6 +1666,13 @@ it.
\section{Release history}
+\subsection*{2.14 (2023 December 11)}
+\begin{itemize}
+ \item Add \jcsmacro{ownexcounterprep} macro to add a prefix (e.g., the chapter)
+ to the (owncounter) example counter. See sec.~\ref{sec:cbc}.
+ \item Document how to (not) number examples per chapter.
+\end{itemize}
+
\subsection*{2.13 (2023 December 2)}
\begin{itemize}
\item Fix example numbering with chapters.
diff --git a/Master/texmf-dist/tex/latex/covington/covington.sty b/Master/texmf-dist/tex/latex/covington/covington.sty
index cc17661c094..079d0eef9c6 100644
--- a/Master/texmf-dist/tex/latex/covington/covington.sty
+++ b/Master/texmf-dist/tex/latex/covington/covington.sty
@@ -42,8 +42,8 @@
%%% Metadata
%%%
-\def\filedate{2023/12/02}
-\def\fileversion{2.13}
+\def\filedate{2023/12/11}
+\def\fileversion{2.14}
\def\filename{covington.sty}
% Macro to issue warnings
@@ -189,8 +189,10 @@
% Counter to generate unique example ID
\newcounter{explid}
+\def\ownexcounterprep{}
\ifownexcounter
\newcounter{covex}
+ \renewcommand{\thecovex}{\ownexcounterprep\arabic{covex}}%
\newcommand{\@exampleno}{\stepcounter{explid}\refstepcounter{covex}\thecovex}
\else
\newcommand{\@exampleno}{\stepcounter{explid}\refstepcounter{equation}\theequation}
@@ -538,7 +540,9 @@
\setcounter{covfnex}{\arabic{covexsave}}%
\else
\ifownexcounter
- \renewcommand{\thecovex}{\exfmt{covex}}%
+ \ifexfmtchanged%
+ \renewcommand{\thecovex}{\ownexcounterprep\exfmt{covex}}%
+ \fi%
\setcounter{covexsave}{\arabic{covex}}%
\usecounter{covex}% % sets it to zero, unwantedly
\setcounter{covex}{\arabic{covexsave}}% % restores previous value