covington (21mar21)

git-svn-id: svn://tug.org/texlive/trunk@58589 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 30 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/covington/README b/Master/texmf-dist/doc/latex/covington/README
index 640a7325830..2ff405d3def 100644
--- a/Master/texmf-dist/doc/latex/covington/README
+++ b/Master/texmf-dist/doc/latex/covington/README
@@ -3,7 +3,7 @@ The covington package
 
 LaTeX macros for Linguistics
 
-Copyright 1991--2020 Michael A. Covington
+Copyright 1991--2021 Michael A. Covington
                      Robin Fairbairns
                      Juergen Spitzmueller
 
@@ -31,6 +31,9 @@ The package consists of the following files:
 
 == CHANGES ==
 
+* Version 2.5 (2021-03-21):
+	- Fix metrics of stacked diacritics with XeTeX/LuaTeX.
+
 * Version 2.4 (2020-01-02):
 	- Fix definition of covexercise if no subsection counter exists.
 
diff --git a/Master/texmf-dist/doc/latex/covington/covington.pdf b/Master/texmf-dist/doc/latex/covington/covington.pdf
index 601f8b4b9ad..dbb6f3caad3 100644
--- a/Master/texmf-dist/doc/latex/covington/covington.pdf
+++ b/Master/texmf-dist/doc/latex/covington/covington.pdf
diff --git a/Master/texmf-dist/doc/latex/covington/covington.tex b/Master/texmf-dist/doc/latex/covington/covington.tex
index 4ae06820075..e22796a1d84 100644
--- a/Master/texmf-dist/doc/latex/covington/covington.tex
+++ b/Master/texmf-dist/doc/latex/covington/covington.tex
@@ -94,8 +94,8 @@
 %
 % Titling
 %
-\def\pversion{Version 2.4}
-\def\pdate{January 2, 2020}
+\def\pversion{Version 2.5}
+\def\pdate{March 21, 2021}
 
 \title{\textbf{The \cvt\ Package\\Macros for Linguistics}}
 \author{Michael A. Covington \and J\"urgen Spitzm\"uller\thanks{Current maintainer.
@@ -1095,6 +1095,13 @@ it.
 
 \section{Release history}
 
+\subsection*{2.5 (2021 March 21)}
+
+\begin{itemize}
+	\item Fix metrics of stacked diacritics with XeTeX/LuaTeX.
+\end{itemize}
+
+
 \subsection*{2.4 (2020 January 2)}
 
 \begin{itemize}
diff --git a/Master/texmf-dist/tex/latex/covington/covington.sty b/Master/texmf-dist/tex/latex/covington/covington.sty
index 70edc42fb48..2bd80b03394 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{2020/01/02}
-\def\fileversion{2.4}
+\def\filedate{2021/03/21}
+\def\fileversion{2.5}
 \def\filename{covington.sty}
 
 % Force redefinition of environments?
@@ -71,6 +71,7 @@
 % Required packages
 %
 \RequirePackage{xkeyval}
+\RequirePackage{iftex}
 
 % Macro to issue warnings
 \newcommand\cov@warning[1]{%
@@ -95,8 +96,10 @@
 %%% Stacked accents
 %%%
 
-% This is adapted from the \diatop macro in wsuipa.sty, which was
-% originally designed by Jean-Pierre Paillet.
+% This is adapted from the \diatop macro (designed by
+% Mike Dunleavy, originally in cjlmac.sty, designed by
+% Jean-Pierre Paillet) and included in wsuipa.sty
+% (designed by Dean Guenther and Janene Winter).
 
 % Length to adjust accent distance
 % Introduced 2016-07-06 JSP. 
@@ -108,7 +111,7 @@
                      \setbox2=\hbox{{#2{}}}%
                      \dimen0=\ifdim\wd1>\wd2\wd1\else\wd2\fi%
                      \dimen1=\ht2\advance\dimen1by\twoaccsep%
-                     \setbox1=\hbox to1\dimen0{\hss#1\hss}%
+                     \setbox1=\hbox to1\dimen0{\hss#1{}\hss}%
                      \rlap{\raise1\dimen1\box1}%
                      \hbox to1\dimen0{\hss#2\hss}}}%
 
@@ -119,14 +122,19 @@
                      \setbox2=\hbox{{#2{#3}}}%
                      \dimen0=\ifdim\wd1>\wd2\wd1\else\wd2\fi%
                      \dimen1=\ht2\advance\dimen1by\twoaccsep%
-                     \setbox1=\hbox to1\dimen0{\hss#1\hss}%
+                     \setbox1=\hbox to1\dimen0{\hss#1{}\hss}%
                      \rlap{\raise1\dimen1\box1}%
                      \hbox to1\dimen0{\hss#2{#3}\hss}}}
 
 % Special cases:
-\def\acm#1{\twodias{\'}{\=}{#1}}   % acute over macron
-\def\grm#1{\twodias{\`}{\=}{#1}}   % grave over macron
-\def\cim#1{\twodias{\^}{\=}{#1}}   % circumflex over macron
+\def\acm#1{\twodias{\'}{\=}{#1}}          % acute over macron
+\def\grm#1{\twodias{\`}{\=}{#1}}          % grave over macron
+% Use MODIFIER LETTER CIRCUMFLEX ACCENT (U+2C6) with Xe/LuaTeX
+\iftutex
+  \def\cim#1{\twodias{\char"2C6}{\=}{#1}} % circumflex over macron
+\else
+  \def\cim#1{\twodias{\^}{\=}{#1}}        % circumflex over macron
+\fi
 
 %%%
 %%% Example numbering