covington (7dec18

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

4 files changed, 57 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/covington/README b/Master/texmf-dist/doc/latex/covington/README
index 301331c6a81..06a4f4a1c31 100644
--- a/Master/texmf-dist/doc/latex/covington/README
+++ b/Master/texmf-dist/doc/latex/covington/README
@@ -31,6 +31,12 @@ The package consists of the following files:
 
 == CHANGES ==
 
+* Version 1.8 (2018-12-07):
+
+	- Fix font markup of second gloss line (do not force rm).
+	- Add possibility to customize gloss line font setting.
+	- Add possibility to customize example number display.
+
 * Version 1.7 (2018-09-08):
 
 	- Fix alignment in subexamples.
diff --git a/Master/texmf-dist/doc/latex/covington/covington.pdf b/Master/texmf-dist/doc/latex/covington/covington.pdf
index 1acf9058155..3480b145b29 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 c9c9ea7b0f8..c3e788a6fe2 100644
--- a/Master/texmf-dist/doc/latex/covington/covington.tex
+++ b/Master/texmf-dist/doc/latex/covington/covington.tex
@@ -92,8 +92,8 @@
 %
 % Titling
 %
-\def\pversion{Version 1.7}
-\def\pdate{September 8, 2018}
+\def\pversion{Version 1.8}
+\def\pdate{December 7, 2018}
 
 \title{\textbf{The \cvt\ Package\\Macros for Linguistics}}
 \author{Michael A. Covington \and J\"urgen Spitzm\"uller\thanks{Current maintainer.
@@ -344,8 +344,17 @@ and if this is the case, \cvt\ does not define its own one. The alias environmen
 is always available as a fallback. If you use the package option \joption{force}, \cvt\ will override
 existing \jenv{subexamples} environments. The package will issue a warning if \jenv{subexamples} is already defined.
 
-If you do not want the subexample letter in parentheses, you can redefine (via \jfcsmacro{renewcommand*}) the macro
-\jcsmacro{covsubexnumber} which has the following default definition:
+
+\subsection{Customizing the numbering}\label{sec:custno}
+
+You can change the display of the example number by redefining (via \jfcsmacro{renewcommand*}) the macro
+\jcsmacro{covexnumber} which has the following default definition:
+\begin{lstlisting}
+\newcommand*\covexnumber[1]{(#1)}
+\end{lstlisting}
+
+In the same vein, you can customize the display of the subexample letter by redefining (also via \jfcsmacro{renewcommand*})
+the macro \jcsmacro{covsubexnumber} which has the following default definition:
 \begin{lstlisting}
 \newcommand*\covsubexnumber[1]{(#1)}
 \end{lstlisting}
@@ -355,7 +364,7 @@ The distance between example number and subnumber (letter) can be changed via th
 \jcsmacro{subexamplenumbersep} (preset to \texttt{0pt} as well). In both cases, a positive value will increase, a negative
 value will decrease the respective distance.
 Doing 
-\begin{lstlisting}
+\begin{lstlisting}[moretexcs={setlength}]
 \setlength{\examplenumbersep}{-0.5em}
 \setlength{\subexamplenumbersep}{0.5em}
 \end{lstlisting}
@@ -380,7 +389,10 @@ The references do not have parentheses by default, i.\,e., a reference to the ex
 in section~\ref{sec:ex} would be printed as \ref{expl}, a reference to the sub-example
 in section~\ref{sec:subexs} as \ref{sbex}.
 For convenience, though, \cvt\ provides a command \jcsmacro{pxref} that also prints the parentheses,
-as in \pxref{expl} and \pxref{sbex}.
+as in \pxref{expl} and \pxref{sbex}. It is defined as followed:
+\begin{lstlisting}[moretexcs={providecommand}]
+\providecommand*\pxref[1]{(\ref{#1})}
+\end{lstlisting}
 
 
 \section{Glossing sentences word-by-word}\label{sec:gloss}
@@ -494,6 +506,15 @@ Notice that every glossed sentence begins with either \jcsmacro{gll}, \jcsmacro{
 with \jcsmacro{glend}.  Layout is critical in the part preceding 
 \jcsmacro{glt} or \jcsmacro{gln}, and fairly free afterward.
 
+The font settings of each gloss line can be customized by redefining these macros:
+\begin{lstlisting}
+\newcommand*\glosslineone{\normalfont\itshape}% font settings 1st gloss line
+\newcommand*\glosslinetwo{\normalfont\upshape}% font settings 2nd gloss line
+\newcommand*\glosslinethree{\normalfont\upshape}% font settings 3rd gloss line
+\end{lstlisting}
+The markup of the translation line has to be done manually.
+
+
 \section{Phrase structure rules}
 
 To print phrase structure rules such as \psr{S}{NP~VP} you can use \texttt{covington's} macro
@@ -728,6 +749,14 @@ it.
 
 \section{Release history}
 
+\subsection*{1.8 (2018 December 7)}
+
+\begin{itemize}
+	\item Fix font markup of second gloss line (do not force rm).
+	\item Add possibility to customize gloss line font setting. See sec.~\ref{sec:custno}.
+	\item Add possibility to customize example number display. See sec.~\ref{sec:custno}.
+\end{itemize}
+
 \subsection*{1.7 (2018 September 8)}
 
 \begin{itemize}
diff --git a/Master/texmf-dist/tex/latex/covington/covington.sty b/Master/texmf-dist/tex/latex/covington/covington.sty
index fe1d356f863..4d40d34bd4a 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{2018/09/08}
-\def\fileversion{1.7}
+\def\filedate{2018/12/07}
+\def\fileversion{1.8}
 \def\filename{covington.sty}
 
 % Force redefinition of environments?
@@ -204,15 +204,19 @@
 %            forced by the "force" option. This prevents clashes
 %            with packages/classes that roll their own examples environment
 %            (such as beamer).
+%
+% New in 1.8 (2018-12-07): Allow to redefine label (\covexnumber)
 
 \newcounter{equationsave}          % used in trick with equation number
 
 \newlength\examplenumbersep
 \setlength\examplenumbersep{0pt}
 
+\newcommand*\covexnumber[1]{(#1)}
+
 \newenvironment{covexamples}%         % define "example" environment
 {%
-\begin{list}{(\theequation)}%
+\begin{list}{\covexnumber{\theequation}}%
 {%
 \addtolength{\labelwidth}{\examplenumbersep}%
 \addtolength{\leftmargin}{\examplenumbersep}%
@@ -433,12 +437,17 @@
   \def\cov@normalfont{\rm}%
 }{%
   \def\cov@emphasized{\normalfont\itshape}%
-  \def\cov@normalfont{\normalfont\rmfamily}%
+  \def\cov@normalfont{\normalfont\upshape}%
 }
 
-\let\eachwordone=\cov@emphasized
-\let\eachwordtwo=\cov@normalfont
-\let\eachwordthree=\cov@normalfont
+% Font settings for gloss lines
+\newcommand*\glosslineone{\cov@emphasized}
+\newcommand*\glosslinetwo{\cov@normalfont}
+\newcommand*\glosslinethree{\cov@normalfont}
+
+\def\eachwordone{\glosslineone}
+\def\eachwordtwo{\glosslinetwo}
+\def\eachwordthree{\glosslinethree}
 
 \def\lastword#1#2#3% #1 = \each, #2 = line box, #3 = word box
    {\setbox#2=\vbox{\unvbox#2%