From afdbbbd16958008d56b50ffd60d6d77e934392d5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 26 Aug 2016 22:06:45 +0000 Subject: covington (26aug16) git-svn-id: svn://tug.org/texlive/trunk@41934 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/covington/README | 13 +- .../texmf-dist/doc/latex/covington/covington.pdf | Bin 427430 -> 441218 bytes .../texmf-dist/doc/latex/covington/covington.tex | 192 ++++++++++++++------- .../texmf-dist/tex/latex/covington/covington.sty | 13 +- 4 files changed, 151 insertions(+), 67 deletions(-) diff --git a/Master/texmf-dist/doc/latex/covington/README b/Master/texmf-dist/doc/latex/covington/README index c76bf6603c0..615411a72c9 100644 --- a/Master/texmf-dist/doc/latex/covington/README +++ b/Master/texmf-dist/doc/latex/covington/README @@ -5,9 +5,9 @@ LaTeX macros for Linguistics Copyright 1991--2016 Michael A. Covington Robin Fairbairns - Jürgen Spitzmüller + Juergen Spitzmueller -Current Maintainer: Jürgen Spitzmüller +Current Maintainer: Juergen Spitzmueller E-mail: juergen (at) spitzmueller (dot) org Released under the LaTeX Project Public License v1.3 or later @@ -33,6 +33,13 @@ The package consists of the following files: == CHANGES == +* Version 1.2 (2016-08-26): + + - New length \examplenumbersep to adjust (increase) the horizontal space + between example number and example text. + + - Add some more info about bibliography generation. + * Version 1.1a (2016-07-07): - Fix encoding problem in documentation and some typos. No change in functionality. @@ -54,7 +61,7 @@ The package consists of the following files: - Update manual. - - New maintainer: J. Spitzmüller. + - New maintainer: J. Spitzmueller. - License has been changed to LPPL (in agreement with M. Covington). diff --git a/Master/texmf-dist/doc/latex/covington/covington.pdf b/Master/texmf-dist/doc/latex/covington/covington.pdf index c5a344d7dee..ef680b4f428 100644 Binary files a/Master/texmf-dist/doc/latex/covington/covington.pdf and b/Master/texmf-dist/doc/latex/covington/covington.pdf differ diff --git a/Master/texmf-dist/doc/latex/covington/covington.tex b/Master/texmf-dist/doc/latex/covington/covington.tex index bea2515e8bf..93b5b6b972e 100644 --- a/Master/texmf-dist/doc/latex/covington/covington.tex +++ b/Master/texmf-dist/doc/latex/covington/covington.tex @@ -44,7 +44,29 @@ \usepackage{covington} \usepackage{url} +\usepackage[bookmarks=true, + bookmarksnumbered=false, + bookmarksopen=false, + breaklinks=false, + pdfborder={0 0 0}, + backref=false, + colorlinks=false +]{hyperref} +\hypersetup{% + pdftitle={The covington.sty manual}, + pdfauthor={Jürgen Spitzmüller}, + pdfkeywords={latex,linguistics} +} + \usepackage{microtype} + +% Tweak the TOC (make it more compact) +\usepackage{tocloft} +\setlength{\cftbeforesecskip}{0pt} +\renewcommand{\cfttoctitlefont}{\normalsize\bfseries} +\renewcommand{\cftsecfont}{\footnotesize} +\renewcommand{\cftsecpagefont}{\footnotesize} + \usepackage{babel} \usepackage{listings} @@ -61,8 +83,11 @@ \newcommand*\jfenv[1]{\texttt{#1}} \newcommand*\jfcsmacro[1]{\jfmacro{\textbackslash{#1}}} -\def\pversion{Version 1.1a} -\def\pdate{July 7, 2016} +% +% Titling +% +\def\pversion{Version 1.2} +\def\pdate{August 26, 2016} \title{\textbf{Typing Linguistics with \texttt{covington.sty}}} \author{Michael A. Covington \\ @@ -86,62 +111,19 @@ same letter, interlinear glosses (word-by-word translations), Discourse Represen and example numbering. The package works both with \LaTeX\ 2.09 and \LaTeXe. \end{abstract} -{\footnotesize \tableofcontents} -\typeout{Run LaTeX twice to get a correct table of contents.} - - -\section*{New in this version} - -\begin{itemize} -\item The package now uses \textsc{nfss} font commands if available (fallback for \LaTeX\ 2.09 is still provided). -\item Work around clash with classes\slash packages that define their own \jenv{example} and \jenv{examples} environments (most notably the \texttt{beamer} class) as well as \jenv{execise} environments. The \texttt{covington} package no longer blindly attempts to define these environments. By default, it does not define them if they are already defined (\texttt{covington's} own environments, however, are still available via aliases). By means of a new package option, a redefinition can also be forced. See sec.~\ref{sec:ex} and \ref{sec:exs} -for details. -\item New length \jcsmacro{twoaccsep} allows for the adjustment of the distance between stacked accents (see sec.~\ref{sec:accents}). -\item Update manual. -\item New maintainer: J. Spitzm\"uller. -\item License has been changed to \textsc{lppl} (in agreement with M. Covington) -\item Introduce version numbers. Arbitrarily, we start with 1.1. -\end{itemize} - - -\section*{New in preceding versions} - -\subsection*{2014 May 16} - -\begin{itemize} - \item Patches by Robin Fairbairns: - \begin{itemize} - \item Setting of \jfcsmacro{textfloatsep} uses \jfcsmacro{setlength} rather than \jfcsmacro{renewcommand} - \item Style file converted to un*x line endings - \end{itemize} -\end{itemize} - -\subsection*{2001 March 27} +\tableofcontents -\begin{itemize} -\item It is no longer necessary to type \jfcsmacro{it} to get proper italic type in feature structures. -\item Instructions have been rewritten with \LaTeXe\ users in mind. -\end{itemize} -\subsection*{Older versions} - -\begin{itemize} -\item Multiple accents on a single letter (e.\,g., \emph{\acm{a}}) are supported. -\item This package is now called \texttt{covington} (with the o) -and is compatible with \LaTeXe\ and \textsc{nfss} as well as \LaTeX\ 2.09. -\item The vertical placement of labeled feature structures has -been changed -so that the category labels line up regardless of the size of -the structures. -\end{itemize} - - -\section*{Introduction} +\section{Introduction} This file, \texttt{covington.tex}, is the documentation for \MakeLowercase{\pversion} of \texttt{covington.sty} (\pdate), which is a \LaTeX\ package providing macros for typing some special notations common in linguistics.% -\footnote{The package has a long history. It started off as a collection of private macros back in the \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 \texttt{covington.sty} 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).} +\footnote{The package has a long history. It started off as a collection of private macros back in the +\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 \texttt{covington.sty} 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).} To use \texttt{covington.sty} with \LaTeXe, simply add the command \lstinline"\usepackage{covington}" to your document preamble. @@ -155,7 +137,10 @@ To use \texttt{covington.sty} with \LaTeXe, simply add the command \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 \texttt{covington} is loaded. See sec.~\ref{sec:ex}, \ref{sec:exs} and \ref{sec:exercises} for details. + \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 \texttt{covington} is loaded. See sec.~\ref{sec:ex}, \ref{sec:exs} and \ref{sec:exercises} +for details. \end{itemize} In what follows we presume that you know how to use \LaTeX\ and have @@ -178,7 +163,8 @@ which are typed, respectively, as: \begin{lstlisting} \`{x} \'{x} \^{x} \"{x} \~{x} \={x} \H{x} \t{xx} \c{x} \d{x} \b{x} \end{lstlisting} -\LaTeX\ also provides support for many non-\textsc{ascii} characters, such as\footnote{Please refer to \cite{pakin} for a comprehensive list of special characters and symbols.}: +\LaTeX\ also provides support for many non-\textsc{ascii} characters, such as% +\footnote{Please refer to \cite{pakin} for a comprehensive list of special characters and symbols.}: \begin{flushleft}\obeyspaces \i \j \ae \AE \oe \OE \aa \AA \o \O \l \L \ss ?` !` \end{flushleft} @@ -270,8 +256,16 @@ This is a sentence. \end{example} The example can be of any length; it can consist of many lines (separated by \verb"\\"), or even whole paragraphs. -Note that, as of version 1.1, \texttt{covington} checks if there is already an \jenv{example} environment defined (e.\,g., by the class). If so, \texttt{covington} does not -define its own one. However, there is always the alias environment \jenv{covexample} which can be used in order to produce \texttt{covington's} example. If you use the package option \joption{force}, \texttt{covington} will override existing \jenv{example} environments. In any case, the package will issue a warning if \jenv{example} is already defined (this is the case, for instance, if you use \texttt{covington} with the \texttt{beamer} class). +If you need more space between the example number and the text, you can increase it by means of +the length \jcsmacro{examplenumbersep} (which is preset to \texttt{0pt}). Doing \lstinline|\setlength\examplenumbersep{1em}|, +for instance, will increase the space by 1\,em. + +Note that, as of version 1.1, \texttt{covington} checks if there is already an \jenv{example} environment defined +(e.\,g., by the class). If so, \texttt{covington} does not +define its own one. However, there is always the alias environment \jenv{covexample} which can be used in order to +produce \texttt{covington's} example. If you use the package option \joption{force}, \texttt{covington} will override +existing \jenv{example} environments. In any case, the package will issue a warning if \jenv{example} is already defined +(this is the case, for instance, if you use \texttt{covington} with the \texttt{beamer} class). One way to number sub-examples is to use \jfenv{itemize} or \jfenv{enumerate} within an example, like this: @@ -317,7 +311,12 @@ This prints as: \item This is the first sentence. \item This is the second sentence. \end{examples} -As for \jenv{example}, \texttt{covington} checks if there is already an \jenv{examples} environment defined, and if this is the case, \texttt{covington} does not define its own one. The alias environment \jenv{covexamples} is always available as a fallback. If you use the package option \joption{force}, \texttt{covington} will override existing \jenv{examples} environments. The package will issue a warning if \jenv{examples} is already defined (this is the case, for instance, if you use \texttt{covington} with the \texttt{beamer} class), telling you how it has dealt with the situation. +As for \jenv{example}, \texttt{covington} checks if there is already an \jenv{examples} environment defined, +and if this is the case, \texttt{covington} does not define its own one. The alias environment \jenv{covexamples} +is always available as a fallback. If you use the package option \joption{force}, \texttt{covington} will override +existing \jenv{examples} environments. The package will issue a warning if \jenv{examples} is already defined +(this is the case, for instance, if you use \texttt{covington} with the \texttt{beamer} class), telling you +how it has dealt with the situation. \section{Glossing sentences word-by-word} @@ -565,13 +564,25 @@ Prove that the above assertion is true. \end{lstlisting} The argument (\verb"[Project]" in the example) is optional. -Note that, as of version 1.1, \texttt{covington} checks if there is already an \jenv{exercise} environment defined (e.\,g., by the class). If so, \texttt{covington} does not define its own one. However, there is always the alias environment \jenv{covexercise} which can be used in order to produce \texttt{covington's} exercise. If you use the package option \joption{force}, \texttt{covington} will override existing \jenv{exercise} environments. In any case, the package will issue a warning if \jenv{exercise} is already defined. +Note that, as of version 1.1, \texttt{covington} checks if there is already an \jenv{exercise} environment +defined (e.\,g., by the class). If so, \texttt{covington} does not define its own one. However, there is always +the alias environment \jenv{covexercise} which can be used in order to produce \texttt{covington's} exercise. +If you use the package option \joption{force}, \texttt{covington} will override existing \jenv{exercise} +environments. In any case, the package will issue a warning if \jenv{exercise} is already defined. \section{Reference Lists} To type a simple \textsc{lsa}-style hanging-indented reference list, you can use the \jenv{reflist} -environment. (\emph{Note:} \jenv{reflist} is not presently -integrated with Bib\TeX\ in any way.) For example, +environment. (\emph{Note:} \jenv{reflist} is not integrated with Bib\TeX\ in any way.% +\footnote{For Bib\TeX, there are several options: the \textsc{lsa} style, as used in the journal \emph{Language}, +can be obtained by means of the style files \texttt{lsalike.bst} +(\url{http://www.icsi.berkeley.edu/ftp/pub/speech/jurafsky/lsalike.bst}) or \texttt{language.bst} +(\url{http://ron.artstein.org/resources/language.bst}); the latter uses \texttt{natbib}. +The so-called \emph{Unified Style Sheet for Linguistics}, as proposed by the \textsc{cel}x\textsc{j} +(\emph{Committee of Editors of Linguistics Journals}), which slightly differs from the \textsc{lsa} style, +is followed by the style file \texttt{unified.bst} (available at \url{http://celxj.org/downloads/unified.bst}). +A \texttt{biblatex} style file for the unified style is available at +\url{https://github.com/semprag/biblatex-sp-unified}.}) For example, \begin{lstlisting} \begin{reflist} Barton, G. Edward; Berwick, Robert C.; and Ristad, Eric Sven. 1987. @@ -631,6 +642,67 @@ reports are actively solicited (via \url{https://github.com/jspitz/covington}). software, and the authors make no commitment to do any further work on it. +\section{Release history} + +\subsection*{1.2 (2016 August 26)} + +\begin{itemize} + \item New length \jcsmacro{examplenumbersep} to adjust (increase) the horizontal space + between example number and example text. See sec.~\ref{sec:ex} for details. + \item Add some more info about bibliography generation. +\end{itemize} + +\subsection*{1.1a (2016 July 7)} + +\begin{itemize} + \item Fix encoding problem in documentation and some typos. No change in functionality. +\end{itemize} + +\subsection*{1.1 (2016 July 6)} + +\begin{itemize} + \item The package now uses \textsc{nfss} font commands if available (fallback for \LaTeX\ 2.09 is still provided). + \item Work around clash with classes\slash packages that define their own \jenv{example} and + \jenv{examples} environments (most notably the \texttt{beamer} class) as well as \jenv{execise} environments. + The \texttt{covington} package no longer blindly attempts to define these environments. By default, it does not + define them if they are already defined (\texttt{covington's} own environments, however, are still available via aliases). + By means of a new package option, a redefinition can also be forced. See sec.~\ref{sec:ex} and \ref{sec:exs} for details. + \item New length \jcsmacro{twoaccsep} allows for the adjustment of the distance between stacked accents (see sec.~\ref{sec:accents}). + \item Update manual. + \item New maintainer: J. Spitzm\"uller. + \item License has been changed to \textsc{lppl} (in agreement with M. Covington) + \item Introduce version numbers. Arbitrarily, we start with 1.1. +\end{itemize} + +\subsection*{2014 May 16} + +\begin{itemize} + \item Patches by Robin Fairbairns: + \begin{itemize} + \item Setting of \jfcsmacro{textfloatsep} uses \jfcsmacro{setlength} rather than \jfcsmacro{renewcommand} + \item Style file converted to un*x line endings + \end{itemize} +\end{itemize} + +\subsection*{2001 March 27} + +\begin{itemize} + \item It is no longer necessary to type \jfcsmacro{it} to get proper italic type in feature structures. + \item Instructions have been rewritten with \LaTeXe\ users in mind. +\end{itemize} + +\subsection*{Older versions} + +\begin{itemize} + \item Multiple accents on a single letter (e.\,g., \emph{\acm{a}}) are supported. + \item This package is now called \texttt{covington} (with the o) + and is compatible with \LaTeXe\ and \textsc{nfss} as well as \LaTeX\ 2.09. + \item The vertical placement of labeled feature structures has + been changed + so that the category labels line up regardless of the size of + the structures. +\end{itemize} + \begin{thebibliography}{99} \bibitem{pakin} Pakin, Scott. The Comprehensive \LaTeX\ Symbol List. 30 November 2015. \url{http://www.ctan.org/tex-archive/info/symbols/comprehensive}. diff --git a/Master/texmf-dist/tex/latex/covington/covington.sty b/Master/texmf-dist/tex/latex/covington/covington.sty index 0161ab5e728..a9993405f84 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{2016/07/07} -\def\fileversion{1.1a} +\def\filedate{2016/08/26} +\def\fileversion{1.2} \def\filename{covington.sty} % Force redefinition of environments? @@ -154,10 +154,10 @@ \newenvironment{covexample}{\begin{covexamples}\item}{\end{covexamples}} \@ifundefined{example}{% - \newenvironment{example}{\begin{covexamples}\item}{\end{covexamples}} + \newenvironment{example}{\begin{covexample}}{\end{covexample}} }{% \ifforceredef - \renewenvironment{example}{\begin{covexamples}\item}{\end{covexamples}} + \renewenvironment{example}{\begin{covexample}}{\end{covexample}} \cov@warning{The example environment was already defined. Redefining it.} \else \cov@warning{The example environment was already defined.^^J @@ -191,10 +191,15 @@ \newcounter{equationsave} % used in trick with equation number +\newlength\examplenumbersep +\setlength\examplenumbersep{0pt} + \newenvironment{covexamples}% % define "example" environment {% \begin{list}{(\theequation)}% {% +\addtolength{\labelwidth}{\examplenumbersep}% +\addtolength{\leftmargin}{\examplenumbersep}% \setcounter{equationsave}{\arabic{equation}}% \usecounter{equation}% % sets it to zero, unwantedly \setcounter{equation}{\arabic{equationsave}}% % restores previous value -- cgit v1.2.3