covington (27may17)

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

4 files changed, 76 insertions, 50 deletions

diff --git a/Master/texmf-dist/doc/latex/covington/README b/Master/texmf-dist/doc/latex/covington/README
index 12cbf42ab50..28f6477d9c9 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--2016 Michael A. Covington
+Copyright 1991--2017 Michael A. Covington
                      Robin Fairbairns
                      Juergen Spitzmueller
 
@@ -33,6 +33,19 @@ The package consists of the following files:
 
 == CHANGES ==
 
+* Version 1.4 (2017-05-23):
+
+	- Introduce a new macro \twodias that supersedes the rather odd \twoacc
+	  (which is kept for backwards compatibility).
+
+	- Introduce macro \SetDiaOffset for more convenient setting of vertical
+	  distance in stacked diacritics.
+
+	- LaTeX 2.09 is no longer officially supported (it might continue to work,
+	  but is not tested).
+
+	- Documentation file converted to un*x line endings.
+
 * Version 1.3 (2017-04-05):
 
         - Gloss variants \xgll and \xglll that work inside macros (such as footnotes)
diff --git a/Master/texmf-dist/doc/latex/covington/covington.pdf b/Master/texmf-dist/doc/latex/covington/covington.pdf
index 0b0540f506d..3a4c0e5651d 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 c242bbdae27..4ceae4a3cb1 100644
--- a/Master/texmf-dist/doc/latex/covington/covington.tex
+++ b/Master/texmf-dist/doc/latex/covington/covington.tex
@@ -89,8 +89,8 @@
 %
 % Titling
 %
-\def\pversion{Version 1.3}
-\def\pdate{April 5, 2017}
+\def\pversion{Version 1.4}
+\def\pdate{May 23, 2017}
 
 \title{\textbf{The \cvt\ Package\\Macros for Linguistics}}
 \author{Michael A. Covington \and J\"urgen Spitzm\"uller\thanks{Current maintainer.
@@ -104,9 +104,9 @@
 
 \begin{abstract}
 \noindent This package, initially a collection of Michael A. Covington's private macros, provides
-numerous minor \LaTeX\ enhancements for linguistics, including multiple accents on the
-same letter, interlinear glosses (word-by-word translations), Discourse Represenation Structures,
-and example numbering. The package works both with \LaTeX\ 2.09 and \LaTeXe.
+numerous minor \LaTeX\ enhancements for linguistics, including multiple diacritics on the
+same letter, interlinear glosses (word-by-word translations), Discourse Representation Structures,
+and example numbering.
 \end{abstract}
 
 \tableofcontents
@@ -121,25 +121,19 @@ for typing some special notations common in linguistics.%
 \LaTeX\ 2.09 days and was initially released as \texttt{covingtn.sty} (following the old 8.3 \textsc{fat}
 file name limit). In em\TeX\ under \textsc{ms-dos}, the file was distributed as \texttt{covingto.sty}.
 Eventually, it has been renamed to \cvt\ and adapted to \LaTeXe. Its \LaTeX\ 2.09 traces
-are however still visible, and the style should actually still work with \LaTeX\ 2.09 (if not, drop us a note).}
+are however still visible, and the style might actually still work with \LaTeX\ 2.09 (which is however not guaranteed).}
 
-To use \cvt\ with \LaTeXe, simply add the command
+To use \cvt\ with \LaTeXe, load the package as usual by adding the command
 \lstinline"\usepackage{covington}" to your document preamble.
-
-\begin{quote}
-	\footnotesize
-	In \LaTeX\ 2.09,
-	include \cvt\ among the optional parameters of 
-	\lstinline"\documentstyle", as in:\\
-		\lstinline"\documentstyle[12pt,"\underline{covington}\verb"]{article}"
-\end{quote}
-The package has the following options:
-\begin{itemize}
-	\item \joption{force}: Force the redefinition of environments that are already defined. This applies to
-the \jenv{example}, \jenv{examples} and \jenv{exercise} environments, which are by default not touched if they
-are already defined before \cvt\ is loaded. See sec.~\ref{sec:ex}, \ref{sec:exs} and \ref{sec:exercises}
-for details.
-\end{itemize}
+The package has the following option:
+\begin{description}
+	\item{\joption{force}:} Force the redefinition of environments that have already been
+	defined by other packages or the class.
+	
+	This applies to the \jenv{example}, \jenv{examples} and \jenv{exercise} environments,
+	which are by default not touched if they are already defined before \cvt\ is loaded.
+	See sec.~\ref{sec:ex}, \ref{sec:exs} and \ref{sec:exercises} for details.
+\end{description}
 %
 In what follows we presume that you know how to use \LaTeX\ and have 
 access to \LaTeX\ manuals. Note that \cvt\ does not 
@@ -150,9 +144,9 @@ If you are using \cvt\ and \texttt{uga.sty} (UGa thesis style)
 together, you should load \texttt{uga} before \cvt.
 
  
-\section{Stacked accents}\label{sec:accents}
+\section{Stacked diacritics}\label{sec:accents}
 
-\LaTeX\ provides a generous range of accents that can be placed on any
+\LaTeX\ provides a generous range of diacritics that can be placed on or below any
 letter, such as:
 \begin{flushleft}
 \`{x} \'{x} \^{x} \"{x} \~{x} \={x} \H{x} \t{xx} \c{x} \d{x} \b{x}
@@ -170,42 +164,40 @@ via the macros:
 \begin{lstlisting}
 \i \j \ae \AE \oe \OE \aa \AA \o \O \l \L \ss ?` !`
 \end{lstlisting}
-
-But out of the box, \LaTeX\ doesn't give you a convenient way to put \emph{two}
-accents on the same letter.  To fill this gap, \cvt\ provides
+%
+Out of the box, however, \LaTeX\ doesn't give you a convenient way to put \emph{two}
+diacritical marks on the same letter.  To fill this gap, \cvt\ provides
 the following macros:
 \begin{flushleft}
-	\jcsmacro{twoacc[\ldots|\ldots]} \quad to combine any two accents, e.\,g.,
-	               \lstinline[moretexcs={twoacc}].\twoacc[\~|\={a}]. = \twoacc[\~|\={a}]\\[6pt]
+	\jcsmacro{twodias\{<upper diac.>\}\{<lower diac.>\}\{<char>\}}\\to combine any two diacritics, e.\,g.,
+	               \lstinline[moretexcs={twodias}].\twodias{\~}{\=}{a}. = \twodias{\~}{\=}{a}\\[6pt]
 	\jcsmacro{acm\{\ldots\}} \quad for acute over macron, e.\,g., \lstinline[moretexcs={acm}].\acm{a}. = \acm{a}\\
 	\jcsmacro{grm\{\ldots\}} \quad for grave over macron, e.\,g., \lstinline[moretexcs={grm}].\grm{a}. = \grm{a}\\
 	\jcsmacro{cim\{\ldots\}} \quad for circumflex over macron, e.\,g., \lstinline[moretexcs={cim}].\cim{a}. = \cim{a}
 \end{flushleft}
-The first of these is the general case and the latter three are special
+The first of these is the general case\footnote{%
+	Alternatively, there's also the old syntax \jcsmacro{twoacc[<upper diac.>|<char with lower diacr.>],}
+	e.\,g. \jfcsmacro{twoacc[\textbackslash\textasciitilde|\textbackslash=\{a\}]} to the same effect, which is however discouraged
+	due to its rather odd form.} and the latter three are special
 cases that are often used in Greek transcription. Now you can type
 \emph{Koin\acm{e}} with both accents in place.
 
-The distance between the two accents can be adjusted via the length
-\verb"\twoaccsep", which is preset to \texttt{-0.8ex}.
-For instance, if you use \verb"\setlength{\twoaccsep}{-1.05ex}", the above examples will come out as
+The vertical distance between the two diacritics can be adjusted via the macro \jcsmacro{SetDiaOffset\{<length>\}}
+which lets you increase or decrease the vertical space that is currently in effect.
+If you'd use \verb"\SetDiaOffset{-0.25ex}", the above examples would come out as
 
-\setlength{\twoaccsep}{-1.05ex}
+\SetDiaOffset{-.25ex}
 \begin{flushleft}
-	\jcsmacro{twoacc[\ldots|\ldots]} \quad to combine any two accents, e.\,g.,
-	\lstinline[moretexcs={twoacc}].\twoacc[\~|\={a}]. = \twoacc[\~|\={a}]\\[6pt]
+	\jcsmacro{twodias\{<upper diac.>\}\{<lower diac.>\}\{<char>\}}\\to combine any two diacritics, e.\,g.,
+	\lstinline[moretexcs={twodias}].\twodias{\~}{\=}{a}. = \twodias{\~}{\=}{a}\\[6pt]
 	\jcsmacro{acm\{\ldots\}} \quad for acute over macron, e.\,g., \lstinline[moretexcs={acm}].\acm{a}. = \acm{a}\\
 	\jcsmacro{grm\{\ldots\}} \quad for grave over macron, e.\,g., \lstinline[moretexcs={grm}].\grm{a}. = \grm{a}\\
 	\jcsmacro{cim\{\ldots\}} \quad for circumflex over macron, e.\,g., \lstinline[moretexcs={cim}].\cim{a}. = \cim{a}
 \end{flushleft}
 with a slightly better matching distance for the font used here.
 
-Note the peculiar syntax of \jcsmacro{twoacc} --- its arguments are in
-square brackets, not curly brackets, and are separated by \verb.|..
-The first argument is the upper accent (only) and the second argument
-is the letter with the lower accent indicated.
-
-Note also that not all accents work in the \jfenv{tabbing} environment.
-Use \jfenv{tabular} or refer to \cite{pakin} for alternative solutions.
+Note that not all accent macros work in the \jfenv{tabbing} environment.
+Use the \jfenv{Tabbing} package or refer to \cite{pakin} for alternative solutions.
 
 \section{Example numbers}
 
@@ -661,6 +653,17 @@ it.
 
 \section{Release history}
 
+\subsection*{1.4 (2017 May 23)}
+
+\begin{itemize}
+	\item Introduce a new macro \jcsmacro{twodias} that supersedes the rather odd \jcsmacro{twoacc}
+	      (which is kept for backwards compatibility). See sec.~\ref{sec:accents} for details.
+	\item Introduce macro \jcsmacro{SetDiaOffset} for more convenient setting of vertical distance
+	      in stacked diacritics. See sec.~\ref{sec:accents} for details.
+	\item \LaTeX\ 2.09 is no longer officially supported (it might continue to work, but is not
+	      tested).
+\end{itemize}
+
 \subsection*{1.3 (2017 April 5)}
 
 \begin{itemize}
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