covington (27may17)

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

1 files changed, 16 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/latex/covington/covington.sty b/Master/texmf-dist/tex/latex/covington/covington.sty
index 9baf62e69f9..4c0c728ae64 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{2017/04/05}
-\def\fileversion{1.3}
+\def\filedate{2017/05/23}
+\def\fileversion{1.4}
 \def\filename{covington.sty}
 
 % Force redefinition of environments?
@@ -85,6 +85,7 @@
 % Introduced 2016-07-06 JSP. 
 \newlength\twoaccsep
 \setlength{\twoaccsep}{-0.8ex}
+\newcommand*\SetDiaOffset[1]{\addtolength{\twoaccsep}{#1}}
 
 \def\twoacc[#1|#2]{\leavevmode{\setbox1=\hbox{{#1{}}}%
                      \setbox2=\hbox{{#2{}}}%
@@ -95,11 +96,20 @@
                      \hbox to1\dimen0{\hss#2\hss}}}%
 
 % Example of usage: \twoacc[\^|\={a}]
-% Special cases:
 
-\def\acm#1{\twoacc[\'|\={#1}]}   % acute over macron
-\def\grm#1{\twoacc[\`|\={#1}]}   % grave over macron
-\def\cim#1{\twoacc[\^|\={#1}]}   % circumflex over macron
+% 2017-05-21: Introduce a less odd syntax: \twodias{\^}{\=}{a}
+\newcommand*\twodias[3]{\leavevmode{\setbox1=\hbox{{#1{}}}%
+                     \setbox2=\hbox{{#2{#3}}}%
+                     \dimen0=\ifdim\wd1>\wd2\wd1\else\wd2\fi%
+                     \dimen1=\ht2\advance\dimen1by\twoaccsep%
+                     \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
 
 %%%
 %%% Example numbering