texlive[41642] Master/texmf-dist: covington (6jul16)
commits+karl at tug.org
commits+karl at tug.org
Wed Jul 6 22:31:02 CEST 2016
Revision: 41642
http://tug.org/svn/texlive?view=revision&revision=41642
Author: karl
Date: 2016-07-06 22:31:01 +0200 (Wed, 06 Jul 2016)
Log Message:
-----------
covington (6jul16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/covington/covington.pdf
trunk/Master/texmf-dist/doc/latex/covington/covington.tex
trunk/Master/texmf-dist/tex/latex/covington/covington.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/covington/README
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/covington/covingtonGerm.pdf
trunk/Master/texmf-dist/doc/latex/covington/covingtonGerm.tex
Added: trunk/Master/texmf-dist/doc/latex/covington/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/covington/README (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/covington/README 2016-07-06 20:31:01 UTC (rev 41642)
@@ -0,0 +1,57 @@
+=========================================================================
+The covington package
+
+Numerous minor LaTeX enhancements for linguistics, including multiple
+accents on the same letter, interline glosses (word-by-word translations),
+Discourse Representation Structures, and example numbering.
+
+Copyright 1991--2016 Michael A. Covington
+ Robin Fairbairns
+ Jürgen Spitzmüller
+
+Current Maintainer: Jürgen Spitzmüller
+E-mail: juergen (at) spitzmueller (dot) org
+
+Released under the LaTeX Project Public License v1.3 or later
+See http://www.latex-project.org/lppl.txt
+=========================================================================
+
+== PURPOSE ==
+
+This package, initially a collection of Michael Covington's private macros, provides
+numerous minor LATEX enhancements for linguistics, including multiple accents on the
+same letter, interline glosses (word-by-word translations), Discourse Representation
+Structures, and example numbering.
+
+The package works both with LaTeX 2.09 and LaTeX2e.
+
+
+== CONTENTS ==
+
+The package consists of the following files:
+
+* covington.sty: the actual package
+* covington.tex: the documentation
+* README (this file)
+
+== CHANGES ==
+
+* Version 1.1 (2016-07-06):
+
+ - The package now uses PSNFSS font commands if available (fallback for LaTeX 2.09 is still provided).
+
+ - Work around clash with classes/packages that define their own example and examples environments
+ (most notably the beamer class) as well as execise environments. The covington package no longer
+ blindly attempts to define these environments. By default, it does not define them if they are
+ already defined (covington's own environments, however, are still available via aliases).
+ By means of a new package option, a redefinition can also be forced.
+
+ - New length \twoaccsep allows for the adjustment of the distance between stacked accents.
+
+ - Update manual.
+
+ - New maintainer: J. Spitzmüller.
+
+ - License has been changed to LPPL (in agreement with M. Covington)
+
+ - Introduce version numbers. Arbitrarily, we start with 1.1.
Property changes on: trunk/Master/texmf-dist/doc/latex/covington/README
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/covington/covington.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/covington/covington.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/covington/covington.tex 2016-07-06 20:08:57 UTC (rev 41641)
+++ trunk/Master/texmf-dist/doc/latex/covington/covington.tex 2016-07-06 20:31:01 UTC (rev 41642)
@@ -1,33 +1,134 @@
-% File: covington.tex (in LaTeX2e)
-% Documentation for covington.sty
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% File covington.tex
+%%
+%% Documentation of covington.sty
+%%
+%% This file is part of the covington LaTeX package
+%%
+%% Original author:
+%% ================
+%% Michael A. Covington
+%% Artificial Intelligence Programs
+%% The University of Georgia
+%% Athens, Georgia 30602-7415 USA
+%% mcovingt at aisun1.ai.uga.edu
+%%
+%% Current maintainer:
+%% ===================
+%% Juergen Spitzmueller <juergen at spitzmueller.org>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The Current Maintainer of this work is Juergen Spitzmueller.
+%%
+%% Code repository and issue tracker: https://github.com/jspitz/covington
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass{article}
+\documentclass[english]{article}
+
+\usepackage[libertine]{newtxmath}
+\usepackage[osf]{libertine}
+\usepackage[scaled=0.75]{beramono}
+\usepackage[T1]{fontenc}
+\usepackage[latin9]{inputenc}
+
\usepackage{covington}
-\title{\bf Typing Linguistics with {\tt covington.sty}}
+
+\usepackage{url}
+\usepackage{microtype}
+\usepackage{babel}
+
+\usepackage{listings}
+\lstset{language={[LaTeX]TeX},
+ basicstyle={\small\ttfamily},
+ frame=single}
+
+% markup
+\newcommand*\jmacro[1]{\textbf{\texttt{#1}}}
+\newcommand*\jenv[1]{\textbf{\texttt{#1}}}
+\newcommand*\jcsmacro[1]{\jmacro{\textbackslash{#1}}}
+\newcommand*\joption[1]{\textbf{\texttt{#1}}}
+\newcommand*\jfmacro[1]{\texttt{#1}}
+\newcommand*\jfenv[1]{\texttt{#1}}
+\newcommand*\jfcsmacro[1]{\jfmacro{\textbackslash{#1}}}
+
+\def\pversion{Version 1.1}
+\def\pdate{July 6, 2016}
+
+\title{\textbf{Typing Linguistics with \texttt{covington.sty}}}
\author{Michael A. Covington \\
\small Artificial Intelligence Center \\
\small The University of Georgia \\
- \small Athens, Georgia 30602 \sc u.s.a.\\
+ \small Athens, Georgia 30602 \textsc{u.\,s.\,a.}\\
mcovingt at ai.uga.edu\\
- http://www.ai.uga.edu/$\sim$mc}
-\date{2001 March 27}
+ \url{http://www.ai.uga.edu/~mc}}
+\date{\pversion, \pdate\thanks{Current maintainer: J\"urgen Spitzm\"uller.
+ Please report issues via \protect\url{https://github.com/jspitz/covington}}}
+
\begin{document}
+
\maketitle
+
+\begin{abstract}
+\noindent This package, initially a collection of Michael Covington's private macros, provides
+numer\xADous mi\xADnor \LaTeX\ en\xADhance\xADments for lin\xADguis\xADtics, in\xADclud\xADing mul\xADti\xADple ac\xADcents on the
+same let\xADter, in\xADter\xADline glosses (word-by-word trans\xADla\xADtions), Dis\xADcourse Rep\xADre\xADsen\xADta\xADtion
+Struc\xADtures, and ex\xADam\xADple num\xADber\xADing. 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}
+
+\section*{New in this version}
+
\begin{itemize}
-\item It is no longer necessary to type \verb"\it" to get proper italic type in feature structures.
+\item The package now uses \textsc{psnfss} 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}
+
+\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}
-\section*{New in Preceding Versions}
+\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 {\tt covington} (with the o)
-and is compatible with \LaTeXe\ and NFSS as well as \LaTeX\ 2.09.
+\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
@@ -34,44 +135,39 @@
the structures.
\end{itemize}
+
\section*{Introduction}
-This file, {\tt covington.tex}, is the documentation for the
-March 2001 version of {\tt covington.sty}, which is a \LaTeX\ style
-option for typing many of the special notations common in linguistics.
-{\footnotesize
-In em\TeX\ under MS-DOS, {\tt covington.sty} is called {\tt covingto.sty}.
-The missing $n$ has no effect.}
+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).}
-To use {\tt covington.sty}, you should have a copy of it in either your
-current directory or the directory where \LaTeX\ styles are kept on your
-system.
+To use \texttt{covington.sty} with \LaTeXe, simply add the command
+\lstinline"\usepackage{covington}" to your document preamble.
-Then, under \LaTeXe,
-include the command
-\verb"\usepackage{covington}"
-after your \verb"\documentclass" command.
+\begin{quote}
+ \footnotesize
+ In \LaTeX\ 2.09,
+ include \texttt{covington} 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 \texttt{covington} is loaded. See sec.~\ref{sec:ex}, \ref{sec:exs} and \ref{sec:exercises} for details.
+\end{itemize}
-{\footnotesize
-In \LaTeX\ 2.09,
-include {\tt covington} among the optional parameters of
-\verb"\documentstyle", like this: \hfill\\
-{\tt
-\verb"\documentstyle[12pt,"\underline{covington}\verb"]{article}"
-}\hfill\\
-Note the spelling {\tt covington} (9 letters).
-}
-
-In what follows I presume that you know how to use \LaTeX\ and have
-access to the \LaTeX\ manual. Note that {\tt covington.sty} does not
+In what follows we presume that you know how to use \LaTeX\ and have
+access to \LaTeX\ manuals. Note that \texttt{covington.sty} does not
provide any special fonts or character sets. However, it can be used in
combination with other style sheets that do.
-If you are using {\tt covington.sty} and {\tt uga.sty} (UGa thesis style)
-together, you should mention {\tt uga} before {\tt covington}.
+If you are using \texttt{covington.sty} and \texttt{uga.sty} (UGa thesis style)
+together, you should load \texttt{uga} before \texttt{covington}.
-\section{Accents}
+\section{Stacked accents}\label{sec:accents}
\LaTeX\ provides a generous range of accents that can be placed on any
letter, such as:
@@ -79,51 +175,65 @@
\`{x} \'{x} \^{x} \"{x} \~{x} \={x} \H{x} \t{xx} \c{x} \d{x} \b{x}
\end{flushleft}
which are typed, respectively, as:
-\begin{verbatim}
+\begin{lstlisting}
\`{x} \'{x} \^{x} \"{x} \~{x} \={x} \H{x} \t{xx} \c{x} \d{x} \b{x}
-\end{verbatim}
-\LaTeX also provides the foreign characters
+\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.}:
\begin{flushleft}\obeyspaces
\i \j \ae \AE \oe \OE \aa \AA \o \O \l \L \ss ?` !`
\end{flushleft}
-which are typed as:
-\begin{verbatim}
+via the macros:
+\begin{lstlisting}
\i \j \ae \AE \oe \OE \aa \AA \o \O \l \L \ss ?` !`
-\end{verbatim}
+\end{lstlisting}
-But by itself, \LaTeX\ doesn't give you a convenient way to put two
-accents on the same letter. To fill this gap, {\tt covington.sty} provides
+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, \texttt{covington.sty} provides
the following macros:
\begin{flushleft}
-\verb,\twoacc[...|...], \quad to combine any 2 accents, e.g.,
- \verb.\twoacc[\~|\={a}]. = \twoacc[\~|\={a}]\\[6pt]
-\verb,\acm{...}, \quad for acute over macron, e.g., \verb.\acm{a}. = \acm{a}\\
-\verb,\grm{...}, \quad for grave over macron, e.g., \verb.\grm{a}. = \grm{a}\\
-\verb,\cim{...}, \quad for circumflex over macron, e.g., \verb.\cim{a}. = \cim{a}
+ \jcsmacro{twoacc[\ldots|\ldots]} \quad to combine any two accents, e.\,g.,
+ \lstinline[moretexcs={twoacc}].\twoacc[\~|\={a}]. = \twoacc[\~|\={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
-cases that occur often in transcribing Greek. Now you can type
+cases that are often used in Greek transcription. Now you can type
\emph{Koin\acm{e}} with both accents in place.
-Note the peculiar syntax of \verb.\twoacc. --- its arguments are in
+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
+
+\setlength{\twoaccsep}{-1.05ex}
+\begin{flushleft}
+ \jcsmacro{twoacc[\ldots|\ldots]} \quad to combine any two accents, e.\,g.,
+ \lstinline[moretexcs={twoacc}].\twoacc[\~|\={a}]. = \twoacc[\~|\={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 {\tt tabbing} environment.
-Use {\tt tabular} or see the \LaTeX\ manual for workarounds.
+Note also that not all accents work in the \jfenv{tabbing} environment.
+Use \jfenv{tabular} or refer to \cite{pakin} for alternative solutions.
\section{Example numbers}
Linguistics papers often include numbered examples.
-The macro \verb"\exampleno" generates a new example number and can be
+The macro \jcsmacro{exampleno} generates a new example number and can be
used anywhere you want the number to appear. For example, to display a
sentence with a number at the extreme right, do this:
-\begin{verbatim}
+\begin{lstlisting}[moretexcs={exampleno}]
\begin{flushleft}
This is a sentence. \hfill (\exampleno)
\end{flushleft}
-\end{verbatim}
+\end{lstlisting}
Here's what you get:
\begin{flushleft}
This is a sentence. \hfill (\exampleno)
@@ -131,34 +241,41 @@
The example counter is actually the same as \LaTeX's equation counter,
so that if you use equations and numbered examples in the same
paper, you get a single continuous series of numbers. If you want to
-access the number without changing it, use \verb"\theequation".
+access the number without changing it, use \jfcsmacro{theequation}.
-Also, you can use \verb"\label" and \verb"\ref" with example numbers in
-exactly the same way as with equation numbers. See the \LaTeX\ manual for
-details. This applies to the {\tt example} and {\tt examples}
-environments, described next, as well as to \verb"\exampleno" itself.
+Also, you can use \jfcsmacro{label} and \jfcsmacro{ref} with example numbers in
+exactly the same way as with equation numbers. Refer to your \LaTeX\ manual for
+details. This applies to the \jenv{example} and \jenv{examples}
+environments, described next, as well as to \jcsmacro{exampleno} itself.
-\section{The {\tt example} environment}
+\section{The \jenv{example} environment}\label{sec:ex}
-The {\tt example} environment displays a single example
+The \jenv{example} environment (alias \jenv{covexample}) displays a single example
with a generated example number to the left of it.
If you type
-\begin{verbatim}
+\begin{lstlisting}
\begin{example}
This is a sentence.
\end{example}
-\end{verbatim}
+\end{lstlisting}
+or
+\begin{lstlisting}
+\begin{covexample}
+This is a sentence.
+\end{covexample}
+\end{lstlisting}
you get:
\begin{example}
This is a sentence.
\end{example}
-The {\tt example} environment is a lot like {\tt flushleft}. The example
-can be of any length; it can consist of many lines (separated by \verb"\\"),
-or even whole paragraphs.
+The example can be of any length; it can consist of many lines (separated by \verb"\\"), or even whole paragraphs.
-One way to number sub--examples is to use {\tt itemize} or {\tt
-enumerate} within an example, like this:
-\begin{verbatim}
+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:
+\begin{lstlisting}
\begin{example}
\begin{itemize}
\item[(a)] This is the first sentence.
@@ -165,7 +282,7 @@
\item[(b)] This is the second sentence.
\end{itemize}
\end{example}
-\end{verbatim}
+\end{lstlisting}
This prints as:
\begin{example}
\begin{itemize}
@@ -173,50 +290,58 @@
\item[(b)] This is the second sentence.
\end{itemize}
\end{example}
-However, the {\tt examples} environment, described next, is usually more
+However, the \jenv{examples} environment, described next, is usually more
convenient.
-\section{The {\tt examples} environment}
+\section{The \jenv{examples} environment}\label{sec:exs}
To display a series of examples together, each with its own example
-number, use {\tt examples} instead of {\tt example}. The only
+number, use \jenv{examples} (or \jenv{covexamples}) instead of \jenv{example} or \jenv{covexample}. The only
difference is that there can be more than one example, and each of them
-has to be introduced by \verb"\item", like this:
-\begin{verbatim}
+has to be introduced by \jfcsmacro{item}, like this:
+\begin{lstlisting}
\begin{examples}
\item This is the first sentence.
\item This is the second sentence.
\end{examples}
-\end{verbatim}
+\end{lstlisting}
+or, respectively:
+\begin{lstlisting}
+\begin{covexamples}
+\item This is the first sentence.
+\item This is the second sentence.
+\end{covexamples}
+\end{lstlisting}
This prints as:
\begin{examples}
\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.
-\section{Glossing sentences word--by--word}
+\section{Glossing sentences word-by-word}
-To gloss a sentence is to annotate it word--by--word. Most commonly, a
-sentence in a foreign language is followed by a word--for--word
+To gloss a sentence is to annotate it word-by-word. Most commonly, a
+sentence in a foreign language is followed by a word-for-word
translation (with the words lined up vertically) and then a smooth
translation (not lined up), like this:%
\footnote{The macros for handling glosses are adapted with permission
-from {\tt gloss.tex}, by Marcel R. van der Goot.}
+from \texttt{gloss.tex}, by Marcel R. van der Goot.}
\gll Dit is een Nederlands voorbeeld.
This is a Dutch example.
\glt `This is an example in Dutch.'
\glend
That particular example would be typed as:
-\begin{verbatim}
+\begin{lstlisting}[moretexcs={gll,glt,glend}]
\gll Dit is een Nederlands voorbeeld.
This is a Dutch example.
\glt `This is an example in Dutch.'
\glend
-\end{verbatim}
+\end{lstlisting}
Notice that the words do not have to be typed lining up; instead, \TeX\
counts them. If the words in the two languages do not correspond
-one--to--one, you can use curly brackets to show the intended grouping.
+one-to-one, you can use curly brackets to group words.
For example, to print
\gll Dit is een voorbeeldje in het Nederlands.
This is a {little example} in {} Dutch.
@@ -223,26 +348,26 @@
\glt `This is a little example in Dutch.'
\glend
you would type:
-\begin{verbatim}
+\begin{lstlisting}[moretexcs={gll,glt,glend}]
\gll Dit is een voorbeeldje in het Nederlands.
This is a {little example} in {} Dutch.
\glt `This is a little example in Dutch.'
\glend
-\end{verbatim}
-All together, {\tt covington.sty} gives you five macros for dealing with
+\end{lstlisting}
+All together, \texttt{covington.sty} provides five macros for dealing with
glosses:
\begin{itemize}
-\item \verb"\gll" introduces two lines of words vertically aligned, and
-activates an environment very similar to {\tt flushleft}.
-\item \verb"\glll" is like \verb"gll" except that it introduces {\em
-three} lines of lined--up words (useful for cited forms, morphology,
+\item \jcsmacro{gll} introduces two lines of words vertically aligned, and
+activates an environment very similar to \jfenv{flushleft}.
+\item \jcsmacro{glll} is like \jcsmacro{gll} except that it introduces
+\emph{three} lines of lined-up words (useful for cited forms, morphology,
and translation).
-\item \verb"\glt" ends the set of lined--up lines and introduces a line
+\item \jcsmacro{glt} ends the set of lined-up lines and introduces a line
(or more) of translation.
-\item \verb"\gln" is like \verb"\glt" but does not start a new line
+\item \jcsmacro{gln} is like \jcsmacro{glt} but does not start a new line
(useful when no translation follows but you want to put a number on the
right).
-\item \verb"\glend" ends the special {\tt flushleft}--like environment.
+\item \jcsmacro{glend} ends the special \jfenv{flushleft}-like environment.
\end{itemize}
Here are several examples. First, a sentence with three lines aligned,
instead of just two:
@@ -252,13 +377,13 @@
\glt `This is another example.'
\glend
This is typed as:
-\begin{verbatim}
+\begin{lstlisting}[moretexcs={glll,glt,glend}]
\glll Hoc est aliud exemplum.
n.sg.nom 3.sg n.sg.nom n.sg.nom
This is another example.
\glt `This is another example.'
\glend
-\end{verbatim}
+\end{lstlisting}
Next, an example with a gloss but no translation, with an example number
at the right:
\gll Hoc habet numerum.
@@ -266,13 +391,13 @@
\gln \hfill (\exampleno)
\glend
That one was typed as:
-\begin{verbatim}
+\begin{lstlisting}[moretexcs={gll,gln,glend,exampleno}]
\gll Hoc habet numerum.
This has number
\gln \hfill (\exampleno)
\glend
-\end{verbatim}
-Finally we'll put a glossed sentence inside the {\tt example}
+\end{lstlisting}
+Finally we'll put a glossed sentence inside the \texttt{example}
environment, which is a very common way of using it:
\begin{example}
\gll Hoc habet numerum praepositum.
@@ -281,7 +406,7 @@
\glend
\end{example}
This last example was, of course, typed as:
-\begin{verbatim}
+\begin{lstlisting}[moretexcs={gll,glt,glend}]
\begin{example}
\gll Hoc habet numerum praepositum.
This has number preposed
@@ -288,32 +413,32 @@
\glt `This one has a number in front of it.'
\glend
\end{example}
-\end{verbatim}
-Notice that every glossed sentence begins with either \verb"\gll" or
-\verb"\glll", then contains either \verb"\glt" or \verb"\gln", and ends
-with \verb"\glend". Layout is critical in the part preceding
-\verb"\glt" or \verb"\gln", and fairly free afterward.
+\end{lstlisting}
+Notice that every glossed sentence begins with either \jcsmacro{gll} or
+\jcsmacro{glll}, then contains either \jcsmacro{glt} or \jcsmacro{gln}, and ends
+with \jcsmacro{glend}. Layout is critical in the part preceding
+\jcsmacro{glt} or \jcsmacro{gln}, and fairly free afterward.
\section{Phrase structure rules}
-To print the phrase structure rule \psr{S}{NP~VP} you can type
-\verb"\psr{S}{NP~VP}", and likewise for other phrase structure rules.
+To print phrase structure rules such as \psr{S}{NP~VP} you can use \texttt{covington's} macro
+\lstinline[moretexcs={psr}]"\psr{<constituent>}{<sub-constituents>}" (for the given example,
+\lstinline[moretexcs={psr}]"\psr{S}{NP~VP}").
\section{Feature structures}
-To print a feature structure such as:
+To print a feature structure such as
\begin{flushleft}
-%\fs{\it case:nom \\ \it person:P}
-\fs{case:nom}
+\fs{case:nom \\ person:P}
\end{flushleft}
you can type:
-\begin{verbatim}
+\begin{lstlisting}[moretexcs={fs}]
\fs{case:nom \\ person:P}
-\end{verbatim}
+\end{lstlisting}
The feature structure can appear anywhere --- in continuous text, in a
-displayed environment such as {\tt flushleft}, or inside a
-phrase--structure rule, or even inside another feature structure.
+displayed environment such as \jfenv{flushleft}, or inside a
+phrase-structure rule, or even inside another feature structure.
To put a category label at the top of the feature structure, like this,
\begin{flushleft}
@@ -320,108 +445,134 @@
\lfs{N}{case:nom \\ person:P}
\end{flushleft}
here's what you type:
-\begin{verbatim}
+\begin{lstlisting}[moretexcs={lfs}]
\lfs{N}{case:nom \\ person:P}
-\end{verbatim}
-And here is an example of a PS--rule made of labeled feature structures:
+\end{lstlisting}
+And here is an example of a \textsc{ps}-rule made of labeled feature structures:
\begin{flushleft}
\psr{\lfs{S}{tense:T}}
{\lfs{NP}{case:nom \\ number:N}
\lfs{VP}{tense:T \\ number:N} }
\end{flushleft}
-which was of course typed as:
-\begin{verbatim}
+which was obviously coded as:
+\begin{lstlisting}[moretexcs={lfs,psr}]
\psr{\lfs{S}{tense:T}}
{\lfs{NP}{case:nom \\ number:N}
\lfs{VP}{tense:T \\ number:N} }
-\end{verbatim}
+\end{lstlisting}
-\section{Discourse representation structures}
+\section{Discourse Representation Structures}
-Several macros in {\tt covington.sty} facilitate display of discourse
-repsesentation structures (DRSes) in the box notation originally used by
-Hans Kamp. The simplest is \verb"\drs", which takes two arguments:
-a list of discourse variables joined by \verb"~", and a list of DRS
+Several macros in \texttt{covington.sty} facilitate display of discourse
+Representation Structures (\textsc{drs}es) in the box notation introduced by
+Hans Kamp. The simplest one is \jcsmacro{drs}, which takes two arguments:
+a list of discourse variables joined by \verb"~", and a list of \textsc{drs}
conditions separated by \verb"\\". Nesting is permitted. Note that the
-\verb"\drs" macro itself does not give you a displayed environment; you
-must use {\tt flushleft} or the like to display the DRS.
+\jcsmacro{drs} macro itself does not give you a displayed environment; you
+must use \jfenv{flushleft} or the like to display the \textsc{drs}.
Here are some examples:
-\begin{verbatim}
-\drs{X}{donkey(X)\\green(X)}
-\end{verbatim}
+
+\begin{minipage}{.5\textwidth}
+\begin{lstlisting}[moretexcs={drs}]
\begin{flushleft}
+ \drs{X}{donkey(X)\\green(X)}
+\end{flushleft}
+\end{lstlisting}
+\end{minipage}\hfill
+\begin{minipage}{.4\textwidth}
+\begin{flushleft}
\drs{X}{donkey(X)\\green(X)}
\end{flushleft}
-\begin{verbatim}
-\drs{X}
-{named(X,`Pedro') \\
-\drs{Y}{donkey(Y)\\owns(X,Y)}~~
- {\large $\Rightarrow$}~
- \drs{~}{feeds(X,Y)}
-}
-\end{verbatim}
+\end{minipage}
+
+\medskip
+
+\begin{minipage}{.5\textwidth}
+\begin{lstlisting}[moretexcs={drs}]
\begin{flushleft}
-\drs{X}
-{named(X,`Pedro') \\
-\drs{Y}{donkey(Y)\\owns(X,Y)}~~
- {\large $\Rightarrow$}~
- \drs{~}{feeds(X,Y)}
-}
+ \drs{X}
+ {named(X,`Pedro') \\
+ \drs{Y}{donkey(Y)\\owns(X,Y)}~~
+ {\large $\Rightarrow$}~
+ \drs{~}{feeds(X,Y)}
+ }
\end{flushleft}
-To display a sentence above the DRS, use \verb"\sdrs", like this:
-\begin{verbatim}
-\sdrs{A donkey is green.}{X}{donkey(X)\\green(X)}
-\end{verbatim}
+\end{lstlisting}
+\end{minipage}\hfill
+\begin{minipage}{.4\textwidth}
+ \begin{flushleft}
+ \drs{X}
+ {named(X,`Pedro') \\
+ \drs{Y}{donkey(Y)\\owns(X,Y)}~~
+ {\large $\Rightarrow$}~
+ \drs{~}{feeds(X,Y)}
+ }
+ \end{flushleft}
+\end{minipage}
+
+\medskip
+
+\noindent To display a sentence above the \textsc{drs}, use \jcsmacro{sdrs}, as in:
+
+\begin{lstlisting}[moretexcs={sdrs}]
\begin{flushleft}
-\sdrs{A donkey is green.}{X}{donkey(X)\\green(X)}
+ \sdrs{A donkey is green.}{X}{donkey(X)\\green(X)}
\end{flushleft}
-Some DRS connectives are also provided (normally for forming
-DRSes that are to be nested within other DRSes).
-The macro \verb"\negdrs" forms a DRS preceded by a negation symbol:
-\begin{verbatim}
+\end{lstlisting}
+which prints as:
+
+\begin{flushleft}
+ \sdrs{A donkey is green.}{X}{donkey(X)\\green(X)}
+\end{flushleft}
+
+Some \textsc{drs} connectives are also provided (normally for forming
+\textsc{drs}es that are to be nested within other \textsc{drs}es).
+The macro \jcsmacro{negdrs} forms a \textsc{drs} preceded by a negation symbol:
+\begin{lstlisting}[moretexcs={negdrs}]
\negdrs{X}{donkey(X)\\green(X)}
-\end{verbatim}
+\end{lstlisting}
\begin{flushleft}
\negdrs{X}{donkey(X)\\green(X)}
\end{flushleft}
-Finally, \verb"\ifdrs" forms a pair of DRSes joined by a big arrow,
+Finally, \jcsmacro{ifdrs} forms a pair of \textsc{drs}es joined by a big arrow,
like this:
-\begin{verbatim}
+\begin{lstlisting}[moretexcs={ifdrs}]
\ifdrs{X}{donkey(X)\\hungry(X)}
{~}{feeds(Pedro,X)}
-\end{verbatim}
+\end{lstlisting}
\begin{flushleft}
\ifdrs{X}{donkey(X)\\hungry(X)}
{~}{feeds(Pedro,X)}
\end{flushleft}
-If you have an ``if''--structure appearing among ordinary predicates
-inside a DRS, you may prefer to use \verb"\alifdrs", which is just like
-\verb"\ifdrs" but shifted slightly to the left for better alignment.
+If you have an ``if''-structure appearing among ordinary predicates
+inside a \textsc{drs}, you may prefer to use \jcsmacro{alifdrs}, which is just like
+\jcsmacro{ifdrs} but shifted slightly to the left for better alignment.
-\section{Exercises}
+\section{Exercises}\label{sec:exercises}
-The {\tt exercise} environment generates an exercise numbered according
+The \jenv{exercise} environment (alias \jenv{covexercise}) generates an exercise numbered according
to chapter, section, and subsection (suitable for use in a large book;
-in this example, the subsection number is going to come out as 0).
+in this example, the subsection number is going to come out as 0). Here is an example:
\begin{exercise}[Project]
Prove that the above assertion is true.
\end{exercise}
-This was typed as
-\begin{verbatim}
+This was coded as
+\begin{lstlisting}
\begin{exercise}[Project]
Prove that the above assertion is true.
\end{exercise}
-\end{verbatim}
-and the argument \verb"[Project]" is optional (actually, any word could
-go there).
+\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.
+
\section{Reference Lists}
-To type an LSA--style hanging--indented reference list, use the {\tt
-reflist} environment. ({\em Note:\/} {\tt reflist} is not presently
+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,
-\begin{verbatim}
+\begin{lstlisting}
\begin{reflist}
Barton, G. Edward; Berwick, Robert C.; and Ristad, Eric Sven. 1987.
Computational complexity and natural language. Cambridge,
@@ -431,9 +582,9 @@
Massachusetts: MIT Press.
Covington, Michael. 1993. Natural language processing for Prolog
-programmers. Englewood Cliffs, New Jersey: Prentice--Hall.
+programmers. Englewood Cliffs, New Jersey: Prentice-Hall.
\end{reflist}
-\end{verbatim}
+\end{lstlisting}
prints as:
\begin{reflist}
Barton, G. Edward; Berwick, Robert C.; and Ristad, Eric Sven. 1987.
@@ -444,7 +595,7 @@
Massachusetts: MIT Press.
Covington, Michael A. 1993. Natural--language processing for Prolog
-programmers. Englewood Cliffs, New Jersey: Prentice--Hall.
+programmers. Englewood Cliffs, New Jersey: Prentice-Hall.
\end{reflist}
Notice that within the reference list, ``French spacing'' is in effect
--- that is, spaces after periods are no wider than normal spaces. Thus
@@ -454,11 +605,11 @@
\section{Displayed sentences}
-The macro \verb"\sentence" displays an italicized sentence (it is a
-combination of {\tt flushleft} and \verb"\em"). If you type
-\begin{verbatim}
+The macro \jcsmacro{sentence} displays an italicized sentence (it is a
+combination of \jfenv{flushleft} and \jfmacro{itshape}). If you type
+\begin{lstlisting}[moretexcs={sentence}]
\sentence{This is a sentence.}
-\end{verbatim}
+\end{lstlisting}
you get:
\sentence{This is a sentence.}
@@ -465,20 +616,25 @@
\section{Big curly brackets (disjunctions)}
-Last of all, the 2--argument macro \verb"\either" expresses alternatives
-within a sentence or PS--rule:
+Last of all, the two-argument macro \jcsmacro{either} expresses alternatives
+within a sentence or \textsc{ps}-rule:
\begin{flushleft}
-\verb"the \either{big}{large} dog" $=$ the \either{big}{large} dog \\
+\lstinline[moretexcs={either}]"the \either{big}{large} dog" $=$ the \either{big}{large} dog \\
\end{flushleft}
\begin{flushleft}
-\verb"\psr{A}{B~\either{C}{D}~E} " $=$ \psr{A}{B~\either{C}{D}~E}
+\lstinline[moretexcs={either,psr}]"\psr{A}{B~\either{C}{D}~E} " $=$ \psr{A}{B~\either{C}{D}~E}
\end{flushleft}
-That's all there is.
-Suggestions for improving {\tt covington.sty} are welcome, and bug
-reports are actively solicited. Please note, however, that this is free
-software, and the author makes no commitment to do any further work on
+That's all there is for now.
+Suggestions for improving \texttt{covington.sty} are welcome, and bug
+reports are actively solicited (via \url{https://github.com/jspitz/covington}). Please note, however, that this is free
+software, and the authors make no commitment to do any further work on
it.
+\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}.
+\end{thebibliography}
+
\end{document}
Deleted: trunk/Master/texmf-dist/doc/latex/covington/covingtonGerm.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/covington/covingtonGerm.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/covington/covingtonGerm.tex 2016-07-06 20:08:57 UTC (rev 41641)
+++ trunk/Master/texmf-dist/doc/latex/covington/covingtonGerm.tex 2016-07-06 20:31:01 UTC (rev 41642)
@@ -1,491 +0,0 @@
-% File: covington.tex (in LaTeX2e)
-% Documentation in German for covington.sty
-
-\documentclass{article}
-\usepackage[ngerman]{babel}
-\usepackage[latin1]{inputenc}
-\setlength{\parindent}{0pt}
-\setlength{\parskip}{1ex plus 0.2ex minus 0.1ex}
-\usepackage{covington}
-\title{\bf Linguistisch editieren mit {\tt covington.sty}}
-\author{Michael A. Covington\footnote{Deutsche ?bersetzung von Robert Galow
-(Friedrich-Schiller-Universit?t Jena).}\\
- \small Artificial Intelligence Center \\
- \small The University of Georgia \\
- \small Athens, Georgia 30602 \sc u.s.a.\\
- mcovingt at ai.uga.edu\\
- http://www.ai.uga.edu/$\sim$mc}
-
-\date{29.03.2007}
-
-
-\begin{document}
-\maketitle
-{\footnotesize \tableofcontents}
-\typeout{Run LaTeX twice to get a correct table of contents.}
-
-\section*{Neues in dieser Version}
-\begin{itemize}
-\item Merkmalsstrukturen erfordern nicht l?nger den Befehl \verb"\it", um kursive Schrift anzeigen zu lassen.
-\item Die vorliegende Dokumentation wurde f?r \LaTeXe\ Benutzer redigiert.
-\end{itemize}
-
-\section*{Neues in ?lteren Versionen}
-\begin{itemize}
-\item Mehrere Akzente ?ber einem einzigen Graphem (Bsp.: \emph{\acm{a}}) werden unterst?tzt.
-\item Dieses Paket wurde in {\tt covington} (mit \textit{o}) umbenannt und ist sowohl mit \LaTeXe\ und NFSS
-als auch \LaTeX\ 2.09. kompatibel.
-\item Die vertikale Anordnung beschrifteter Merkmalsstrukturen wurde derart ver?ndert, dass die
-Kategoriebezeichnungen nun unabh?ngig von der Gr??e der Strukturdarstellung angeordnet werden.
-\end{itemize}
-
-\section*{Einf?hrung}
-Die Datei {\tt covington.tex} ist die Dokumentation der Version {\tt covington.sty} vom M?rz 2001.
-Mit dieser \LaTeX\ Style-Option wird es nun m?glich spezielle und f?r die Linguistik typische Anmerkungen
-sowie Strukturen darzustellen.
-
-{\footnotesize
-In em\TeX\ unter MS-DOS finden Sie {\tt covington.sty} mit der Bezeichnung {\tt covingto.sty}.
-Das fehlende $n$ hat keinerlei Auswirkungen.}
-
-Um {\tt covington.sty} nutzen zu k?nnen, sollten Sie entweder ?ber eine Kopie in ihrem aktuellen Ordner oder im \LaTeX\- Verzeichnis verf?gen, in dem ihre \LaTeX\ Style-Files gespeichert werden.
-
-Unter \LaTeXe\
-f?gen Sie nach \verb"\documentclass"
-den Befehl\\ \verb"\usepackage{covington}" hinzu.
-
-{\footnotesize
-Bei \LaTeX\ 2.09 f?gen Sie {\tt covington} unmittelbar in den \verb"\documentstyle" Befehl mit ein.
-Das Ergebnis: \hfill\\
-{\tt
-\verb"\documentstyle[12pt,"\underline{covington}\verb"]{article}"
-}\hfill\\
-Beachten Sie die richtige Schreibweise {\tt covington} (9 Buchstaben).
-}
-
-F?r diese Dokumentation wird vorausgesetzt, dass Sie wissen, wie Sie korrekt mit \LaTeX\ umgehen und dass
-Sie ?ber eine \LaTeX-Anleitung verf?gen. {\tt covington.sty} bietet Ihnen keine speziellen Fonts
-oder Grapheme, kann jedoch mit anderen passenden Stildateien verwendet werden.
-
-Falls Sie {\tt covington.sty} und {\tt uga.sty} (UGa thesis style)
-zusammen nutzen, sollten Sie {\tt uga} vor {\tt covington} erw?hnen.
-
-
-\section{Akzente}
-
-\LaTeX\ bietet eine gro?z?gige Auswahl von Akzenten, die ?ber jedem beliebigen Graphem platziert werden
-k?nnen.
-Beispiele:
-\begin{flushleft}
-\`{x} \'{x} \^{x} \"{x} \~{x} \={x} \H{x} \t{xx} \c{x} \d{x} \b{x}
-\end{flushleft}
-Die Eingabe erfolgt so:
-\begin{verbatim}
-\`{x} \'{x} \^{x} \"{x} \~{x} \={x} \H{x} \t{xx} \c{x} \d{x} \b{x}
-\end{verbatim}
-
-\LaTeX\ erm?glicht nat?rlich auch diese Grapheme:
-\begin{flushleft}\obeyspaces
-\i \j \ae \AE \oe \OE \aa \AA \o \O \l \L \ss ?` !`
-\end{flushleft}
-Die Eingabe daf?r:
-\begin{verbatim}
-\i \j \ae \AE \oe \OE \aa \AA \o \O \l \L \ss ?` !`
-\end{verbatim}
-
-\LaTeX\ bietet leider keine bequeme M?glichkeit zwei Akzente ?ber dem selben
-Graphem zu realisieren. Abhilfe schafft hier {\tt covington.sty} mit den folgenden
-Makros:
-\begin{flushleft}
-\verb,\twoacc[...|...], \quad um 2 beliebige Akzente zu kombinieren. Bsp.:
- \verb.\twoacc[\~|\={a}]. = \twoacc[\~|\={a}]\\[6pt]
-\verb,\acm{...}, \quad f?r einen Akut ?ber dem L?ngsstrich,Bsp.: \verb.\acm{a}. = \acm{a}\\
-\verb,\grm{...}, \quad f?r einen Gravis ?ber dem L?ngsstrich, Bsp.: \verb.\grm{a}. = \grm{a}\\
-\verb,\cim{...}, \quad f?r Zirkumflex ?ber dem L?ngsstrich, Bsp.: \verb.\cim{a}. = \cim{a}
-\end{flushleft}
-Der erste der obigen Beispiele ist der allgemeine Fall, die anderen drei sind spezielle. Diese
-entstehen oft beim Transkribieren aus dem Griechischen. Nun k?nnen sie mit beiden Akzenten an selber Stelle
-\emph{Koin\acm{e}} schreiben.
-
-Beachten sie die spezielle Syntax von \verb.\twoacc. --- dessen Argumente werden in eckigen, aber nicht
-geschwungenen Klammern gefasst. Die Argumente werden durch \verb.|. getrennt.
-Das erste Argument ist der obere Akzent (nur), das zweite das Graphem mit dem niedrigen Akzent.
-
-Bitte beachten Sie, dass Akzente nicht in der {\tt tabbing} Umgebung funktionieren.
-Nutzen Sie {\tt tabular} oder ihre \LaTeX\ Anleitung f?r L?sungsvorschl?ge.
-
-\section{Makros f?r nummerierte Satzbeispiele}
-
-Linguistische Aufs?tze beinhalten oft nummerierte Beispiele.
-Das Makro \verb"\exampleno" generiert eine neue Beispielnummer und kann an beliebiger Stelle genutzt werden.
-Um beispielsweise einen Satz mit einer rechtsb?ndigen Beispielnummer zu erhalten, geben Sie ein:
-\begin{verbatim}
-\begin{flushleft}
-Das ist ein Satz. \hfill (\exampleno)
-\end{flushleft}
-\end{verbatim}
-Das Resultat sieht so aus:
-\begin{flushleft}
-Das ist ein Satz. \hfill (\exampleno)
-\end{flushleft}
-Der Beispielz?hler funktioniert im Prinzip wie die \LaTeX-Nummerierung von Gleichungen.
-Sollten Sie also Gleichungen UND nummerierte Beispiele im selben Dokument nutzen,
-erhalten Sie eine fortlaufende Nummerierung von Beispielen. Um auf die
-Nummer zuzugreifen, ohne sie zu ?ndern, nutzen Sie \verb"\theequation".
-
-Sie k?nnen auch \verb"\label" und \verb"\ref" jeweils f?r Beispielnummern als auch f?r
-die Gleichungsnummerierung nutzen. Sehen Sie dazu in Ihren \LaTeX\ Unterlagen nach.
-Die dargestellte Situation trifft auch f?r die {\tt example} und {\tt examples}
-Umgebungen zu, die als n?chstes beschrieben werden sollen, aber auch f?r \verb"\exampleno" selbst.
-
-\section{Nummerierte Beispiele mit der {\tt example}-Umgebung}
-
-Die {\tt example}-Umgebung stellt ein einziges Beispiel mit einer linksb?ndig
-generierten Beispielnummer dar.
-
-Wenn Sie Nachfolgendes eingeben,
-\begin{verbatim}
-\begin{example}
-This is a sentence.
-\end{example}
-\end{verbatim}
-erhalten Sie als Resultat:
-\begin{example}
-Das ist ein Beispiel.
-\end{example}
-Die {\tt example}-Umgebung ?hnelt stark {\tt flushleft}. Dabei kann das Beispiel
-beliebiger L?nge sein und sowohl mehreren Zeilen (getrennt durch \verb"\\")
-oder sogar ganzen Abs?tzen bestehen.
-
-Eine M?glichkeit innerhalb untergeordneter Beispiele zu nummerieren, bietet {\tt itemize} oder {\tt
-enumerate}.
-
-Beispiel:
-\begin{verbatim}
-\begin{example}
-\begin{itemize}
-\item[(a)] Das ist der erste Satz.
-\item[(b)] Das ist der zweite Satz.
-\end{itemize}
-\end{example}
-\end{verbatim}
-Das Resultat:
-\begin{example}
-\begin{itemize}
-\item[(a)] Das ist der erste Satz.
-\item[(b)] Das ist der zweite Satz.
-\end{itemize}
-\end{example}
-Die im n?chsten Punkt beschriebene {\tt examples}-Umgebung ist ?blicher.
-
-\section{Nummerierte Beispiele mit der {\tt examples}-Umgebung}
-
-Um mehrere Beispiele mit jeweiliger Nummerierung zusammen anzeigen zu lassen,
-nutzen Sie {\tt examples} anstelle von {\tt example}. Der einzige Unterschied besteht darin,
-dass mehrere Beispiele angezeigt werden k?nnen, implementiert mit \verb"\item".
-
-Ein Beispiel:
-\begin{verbatim}
-\begin{examples}
-\item Das ist der erste Satz.
-\item Das ist der zweite Satz.
-\end{examples}
-\end{verbatim}
-Das Resultat:
-\begin{examples}
-\item Das ist der erste Satz.
-\item Das ist der zweite Satz.
-\end{examples}
-
-
-\section{S?tze glossieren und interlineares ?bersetzen}
-
-Einen Satz zu glossieren meint, ihn Lexem f?r Lexem zu "`erl?utern"'. In der Regel werden bei
-interlinearen ?bersetzungen zun?chst S?tze der Ausgangssprache Wort f?r Wort, also unter Verzicht auf
-syntaktisch-grammatikalische Regeln, in vertikaler Anordnung ?bersetzt. Danach folgt die philologische
-?bersetzung, die Lexeme nach syntaktischen und grammatischen Regeln der Zielsprache gliedert,
-Satzglieder also korrekt anordnet.
-
-Ein Beispiel:%
-\footnote{Die Makros zum Umgang mit Glossen wurden mit Erlaubnis von Marcel R. van der Goot von {\tt gloss.tex} angepasst.}
-\gll Dit is een Nederlands voorbeeld.
- Das ist ein niederl?ndisches Beispiel.
-\glt `Das ist ein Beispiel auf Niederl?ndisch.'
-\glend
-Dieses spezielle Beispiel wird so eingegeben:
-\begin{verbatim}
-\gll Dit is een Nederlands voorbeeld.
- Das ist ein niederl?ndisches Beispiel.
-\glt `Das ist ein Beispiel auf Niederl?ndisch.'
-\glend
-\end{verbatim}
-Da \TeX\ Lexeme z?hlt, m?ssen Sie diese nicht in einer Zeile entsprechend ihrer Anzahl ordnen. Wenn also
-Lexeme von Ausgangs- und Zielsprache nicht korrespondieren, k?nnen Sie zur Veranschaulichung der
-intendierten Reihenfolge geschweifte Klammern nutzen.
-M?chten Sie beispielsweise folgende S?tze darstellen
-\gll Dit is een voorbeeldje in het Nederlands.
- Das ist ein {kleines Beispiel} auf {} Niederl?ndisch.
-\glt `Das ist ein kleines Beispiel auf Niederl?ndisch.'
-\glend
-schreiben Sie:
-\begin{verbatim}
-\gll Dit is een voorbeeldje in het Nederlands.
- Das ist ein {kleines Beispiel} auf {} Niederl?ndisch.
-\glt `Das ist ein kleines Beispiel auf Niederl?ndisch.'
-\glend
-\end{verbatim}
-Insgesamt bietet Ihnen {\tt covington.sty} f?nf Makros zum Umgang mit Glossen:
-\begin{itemize}
-\item \verb"\gll" stellt zwei Zeilen vertikal zueinander angeordneter W?rter dar. Die damit verbundene
-Umgebung ?hnelt {\tt flushleft}.
-\item \verb"\glll" entspricht \verb"gll", nur gibt es
-{\em drei} Zeilen angeordneter W?rter (N?tzlich f?r Zitate, Morphologisches,
-und ?bersetzungen).
-\item \verb"\glt" beendet Zeilen mit aufeinander angeordneter W?rter und f?hrt eine Zeile
-(oder mehr) mit der ?bersetzung auf.
-\item \verb"\gln" entspricht \verb"\glt" , beginnt aber keine neue Zeile
-(n?tzlich, wenn keine ?bersetzung folgt, daf?r aber eine rechtsb?ndige Beispielnummerierung).
-\item \verb"\glend" beendet die \verb"\gll" Umgebung.
-\end{itemize}
-Hier sind weitere Beispiele. Erstens, einen Satz mit drei Zeilen in vertikaler Anordnung:
-\glll Hoc est aliud exemplum.
- n.sg.nom 3.sg n.sg.nom n.sg.nom
- Das ist ein anderes Beispiel.
-\glt `Das ist ein anderes Beispiel.'
-\glend
-Die Eingabe muss sein:
-\begin{verbatim}
-\glll Hoc est aliud exemplum.
- n.sg.nom 3.sg n.sg.nom n.sg.nom
- Das ist ein anderes Beispiel.
-\glt `Das ist ein anderes Beispiel.'
-\glend
-\end{verbatim}
-Jetzt ein Beispiel mit einer Glosse ohne philologische ?bersetzung. Auf der rechten Seite setzen wir
-au?erdem eine Beispielnummer:
-\gll Hoc habet numerum.
- Das hat Nummer.
-\gln \hfill (\exampleno)
-\glend
-Die Eingabe muss sein:
-\begin{verbatim}
-\gll Hoc habet numerum.
- Das hat Nummer
-\gln \hfill (\exampleno)
-\glend
-\end{verbatim}
-Hier noch eine sehr g?ngige Methode: Wir f?gen einen glossierten Satz in die {\tt example}
-Umgebung ein:
-\begin{example}
-\gll Hoc habet numerum praepositum.
- Das hat Nummer davor
-\glt `Dieses hat eine Nummer davor.'
-\glend
-\end{example}
-Die Eingabe muss sein:
-\begin{verbatim}
-\begin{example}
-\gll Hoc habet numerum praepositum.
- Das hat Nummer davor
-\glt `Dieses hat eine Nummer davor.'
-\glend
-\end{example}
-\end{verbatim}
-Bitte merken Sie sich, dass jeder glossierte Satz entweder mit \verb"\gll" oder
-\verb"\glll" beginnt, dann entweder \verb"\glt" oder \verb"\gln" enth?lt, und schlie?lich mit
-\verb"\glend" endet. Das Layout im Arbeitsschritt vor
-\verb"\glt" oder \verb"\gln" ist an feste Kriterien gebunden, danach aber wesentlich freier gestaltbar.
-
-\section{Satzstruktur-Regeln darstellen}
-
-Um die Satzstruktur-Regel \psr{S}{NP~VP} darzustellen, k?nnen Sie
-\verb"\psr{S}{NP~VP}" eingeben.
-Das gilt nat?rlich auch f?r alle anderen Satzstruktur-Regeln.
-
-\section{Repr?sentation von Merkmalsstrukturen}
-
-Um eine Merkmalsstrukur wie die nachfolgende zu erhalten,
-\begin{flushleft}
-%\fs{\it Kasus:nom \\ \it Persona:P}
-\fs{Kasus:nom}
-\end{flushleft}
-k?nnen Sie eingeben:
-\begin{verbatim}
-\fs{Kasus:nom \\ Persona:P}
-\end{verbatim}
-
-Merkmalstrukturen k?nnen ?berall integriert werden -- in Flie?texte, in spezielle
-Umgebungen wie {\tt flushleft}, in den Zusammenhang syntaktischer Regeln oder
-sogar in andere Merkmalstrukturen.
-
-Um Kategorienamen einer Merkmalstruktur ?ber diesselbe zu setzen, wie in
-dem nachfolgenden Beispiel zu sehen ist,
-\begin{flushleft}
-\lfs{N}{Kasus:nom \\ Persona:P}
-\end{flushleft}
-geben Sie Folgendes ein:
-\begin{verbatim}
-\lfs{N}{Kasus:nom \\ Persona:P}
-\end{verbatim}
-Hier noch ein Beispiel f?r eine Satzstrukturdarstellung mit Kategoriebezeichnung ?ber der jeweiligen
-Merkmalsstruktur:
-\begin{flushleft}
-\psr{\lfs{S}{Tempus:T}}
- {\lfs{NP}{Kasus:nom \\ Nummerus:N}
- \lfs{VP}{Tempus:T \\ Nummerus:N}}
-\end{flushleft}
-Die Eingabe daf?r ist:
-\begin{verbatim}
-\psr{\lfs{S}{Tempus:T}}
- {\lfs{NP}{Kasus:nom \\ Nummerus:N}
- \lfs{VP}{Tempus:T \\ Nummerus:N}}
-\end{verbatim}
-
-
-\section{Discourse Representation Structures nach H.Kamp setzen}
-
-Verschiedene Makros in {\tt covington.sty} erleichtern Diskurs Structures
-(Kurz DRS von \emph{Discourse representation structure}. Wir wollen uns im
-Folgenden auf die Verwendung
-dieser g?ngigen Abk?rzung festlegen). Konkret sind die K?stchen-Bezeichnungen von Hans Kamp gemeint.
-Das einfachste Makro ist \verb"\drs", welches zwei Argumente verlangt:
-Ein Verzeichnis der Diskursvariablen verbunden mit \verb"~", und ein
-Verzeichnis von DRS-Bedingungen
-getrennt durch \verb"\\". Verschachtelung ist dabei erlaubt. Beachten Sie jedoch, dass Ihnen das
-\verb"\drs" Makro an sich keine entfaltete Umgebung bietet. Sie m?ssen {\tt
-flushleft} oder ?hnliches nutzen,
-um eine DRS anzeigen zu lassen.
-Hier sind einige Beispiele:
-\begin{verbatim}
-\drs{X}{Esel(X)\\gr?n(X)}
-\end{verbatim}
-\begin{flushleft}
-\drs{X}{Esel(X)\\gr?n(X)}
-\end{flushleft}
-\begin{verbatim}
-\drs{X}
-{named(X,`Pedro') \\
-\drs{Y}{Esel(Y)\\besitzt(X,Y)}~~
- {\large $\Rightarrow$}~
- \drs{~}{f?ttert(X,Y)}
-}
-\end{verbatim}
-\begin{flushleft}
-\drs{X}
-{named(X,`Pedro') \\
-\drs{Y}{Esel(Y)\\besitzt(X,Y)}~~
- {\large $\Rightarrow$}~
- \drs{~}{f?ttert(X,Y)}
-}
-\end{flushleft}
-Um einen Satz oberhalb der DRS-Box zu platzieren, verwenden Sie \verb"\sdrs" wie im n?chsten Beispiel:
-\begin{verbatim}
-\sdrs{Ein Esel ist gr?n.}{X}{Esel(X)\\gr?n(X)}
-\end{verbatim}
-\begin{flushleft}
-\sdrs{Ein Esel ist gr?n.}{X}{Esel(X)\\gr?n(X)}
-\end{flushleft}
-Au?erdem werden Ihnen DRS-Verbindungen angeboten, die normalerweise zur Repr?sentation von einer DRS in
-einer anderen vorgesehen sind.
-Das Makro \verb"\negdrs" generiert eine DRS, vor der ein Negationssymbol steht:
-\begin{verbatim}
-\negdrs{X}{Esel(X)\\gr?n(X)}
-\end{verbatim}
-\begin{flushleft}
-\negdrs{X}{Esel(X)\\gr?n(X)}
-\end{flushleft}
-Als letztes ist \verb"\ifdrs" zu erw?hnen. Dabei handelt es sich um die Verbindung zweier DRS durch einen
-gro?en Pfeil.
-Beispiel:
-\begin{verbatim}
-\ifdrs{X}{Esel(X)\\hungrig(X)}
- {~}{f?ttert(Pedro,X)}
-\end{verbatim}
-\begin{flushleft}
-\ifdrs{X}{Esel(X)\\hungrig(X)}
- {~}{f?ttert(Pedro,X)}
-\end{flushleft}
-Bei Verbindungen von gew?hnlichen Pr?dikaten und Konditionals?tzen innerhalb
-einer DRS ist die Benutzung von \verb"\alifdrs" zu empfehlen. \verb"\alifdrs" ist
-\verb"\ifdrs" sehr ?hnlich, wird aber zwecks besserer Anordnung etwas weiter nach links ger?ckt.
-
-\section{?bungsbeispiele}
-
-Die {\tt exercise}-Umgebung generiert eine nach Kapitel, Absatz und
-Unterabschnitt nummerierte ?bung. Diese Option eignet sich beispielsweise f?r in B?chern auftretende ?bungen.
-Im folgenden Beispiel wird der Unterabschnitt als 0 angezeigt:
-\begin{exercise}[Projekt]
-Beweisen Sie die Richtigkeit der oben gestellten Hypothese.
-\end{exercise}
-Die notwendige Eingabe:
-\begin{verbatim}
-\begin{exercise}[Projekt]
-Beweisen Sie die Richtigkeit der oben gestellten Hypothese.
-\end{exercise}
-\end{verbatim}
-Das Argument \verb"[Projekt]" kann optional verwendet werden und ist durch jedes beliebige Lexem ersetzbar.
-
-\section{Literaturverweise nach LSA-Muster}
-
-Um Bibliographien im LSA-Stil zu verfassen, nutzen Sie bitte die {\tt
-reflist}-Umgebung. ({\em Anmerkung:\/} {\tt reflist} ist derzeit noch nicht
-in Bib\TeX\ integriert.) Beispielsweise sehen die kommenden Nachweise in der Ausgabe wie folgt aus:
-
-\begin{verbatim}
-\begin{reflist}
-Barton, G. Edward; Berwick, Robert C.; and Ristad, Eric Sven. 1987.
-Computational complexity and natural language. Cambridge,
-Massachusetts: MIT Press.
-
-Chomsky, Noam. 1965. Aspects of the theory of syntax. Cambridge,
-Massachusetts: MIT Press.
-
-Covington, Michael. 1993. Natural language processing for Prolog
-programmers. Englewood Cliffs, New Jersey: Prentice--Hall.
-\end{reflist}
-\end{verbatim}
-\begin{reflist}
-Barton, G. Edward; Berwick, Robert C.; and Ristad, Eric Sven. 1987.
-Computational complexity and natural language. Cambridge,
-Massachusetts: MIT Press.
-
-Chomsky, Noam. 1965. Aspects of the theory of syntax. Cambridge,
-Massachusetts: MIT Press.
-
-Covington, Michael A. 1993. Natural language processing for Prolog
-programmers. Englewood Cliffs, New Jersey: Prentice--Hall.
-\end{reflist}
-Beachten Sie, dass innerhalb dieser Bibliographien ``French spacing'' angewandt wird.
-Das bedeutet: Die Leerstellen nach Punkten sind nicht gr??er als das konventionelle Leerzeichen. Sie m?ssen
-also nichts gegen ?bergro?e Abst?nde nach Namen unternehmen.
-
-
-\section{Das Makro {\tt sentence}}
-
-Das Makro \verb"\sentence" hilft bei der Ausgabe von kursiven S?tzen, und ist eine
-Kombination von {\tt flushleft} und \verb"\em"). Bei der Eingabe von
-\begin{verbatim}
-\sentence{Das ist ein Satz.}
-\end{verbatim}
-ist das Resultat:
-\sentence{Das ist ein Satz.}
-
-
-\section{Geschwungene Klammern und Disjunktionen mit {\tt either}}
-
-Zu guter Letzt: Das 2-Argumente-Makro \verb"\either" repr?sentiert Alternativen
-innerhalb eines Satzes oder einer Satzstruktur:
-\begin{flushleft}
-\verb"the \either{schwer}{gro?e} dog" $=$ the \either{schwer}{gro?} dog \\
-\end{flushleft}
-\begin{flushleft}
-\verb"\psr{A}{B~\either{C}{D}~E} " $=$ \psr{A}{B~\either{C}{D}~E}
-\end{flushleft}
-
-Mehr gibt es nicht zu sagen.
-Vorschl?ge zur Verbesserung von {\tt covington.sty} sind willkommen und auf Bug-Reports wird gern
-eingegangen. Bitte beachten Sie, dass es sich um kostenlose Software handelt und der Autor nicht zu
-weiterer Arbeit an der Software verpflichtet ist.
-
-\end{document}
-
Modified: trunk/Master/texmf-dist/tex/latex/covington/covington.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/covington/covington.sty 2016-07-06 20:08:57 UTC (rev 41641)
+++ trunk/Master/texmf-dist/tex/latex/covington/covington.sty 2016-07-06 20:31:01 UTC (rev 41642)
@@ -1,22 +1,72 @@
-%%% File covington.sty
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% File covington.sty
+%%
+%% Some macros useful for linguistics
+%%
+%% Original author:
+%% ================
+%% Michael A. Covington
+%% Artificial Intelligence Programs
+%% The University of Georgia
+%% Athens, Georgia 30602-7415 USA
+%% mcovingt at aisun1.ai.uga.edu
+%%
+%% Contributors:
+%% =============
+%% Robin Fairbairns <rf10 at cl.cam.ac.uk> 2014-05-16: patched setting of \textfloatsep
+%% to use \setlength rather than \renewcommand; also converted to un*x line endings
+%%
+%% Current maintainer:
+%% ===================
+%% Juergen Spitzmueller <juergen at spitzmueller.org>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The Current Maintainer of this work is Juergen Spitzmueller.
+%%
+%% Code repository and issue tracker: https://github.com/jspitz/covington
+%%
+%% See covington.tex for documentation.
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%
-%%% Michael A. Covington
-%%% Artificial Intelligence Programs
-%%% The University of Georgia
-%%% Athens, Georgia 30602-7415 USA
-%%% mcovingt at aisun1.ai.uga.edu
+%%% Metadata
%%%
-%%% You may copy and distribute this file freely.
-%%% (If you modify it, please change its name and add your own comments.)
-%%%
-%%% See covington.tex for documentation.
-%%
-%% Robin Fairbairns: patched setting of \textfloatsep to use
-%% \setlength rather than \renewcommand; also converted to un*x line endings
-\typeout{* covington.sty : Covington's linguistic macros, 2001 March 27 *}
-%% patched 2014-05-16 (rf10 at cl.cam.ac.uk)
+\def\filedate{2016/07/06}
+\def\fileversion{1.1}
+\def\filename{covington.sty}
+% Force redefinition of environments?
+\newif\ifforceredef\forceredeffalse
+
+\@ifundefined{ProvidesPackage}{%
+\typeout{* covington.sty : Covington's linguistic macros, \fileversion\ \filedate *}
+}{%
+\ProvidesPackage{covington}
+ [\filedate\space v\fileversion\space Covington's linguistic macros]
+\DeclareOption{force}{\forceredeftrue}
+\ProcessOptions
+}
+
+% Macro to issue warnings
+\newcommand\cov at warning[1]{%
+ \@ifundefined{PackageWarning}{%
+ \typeout{* covington warning : #1 *}
+ }{%
+ \PackageWarning{covington}{#1}%
+ }
+}
+
%%%
%%% Preferences about how text is laid out
%%%
@@ -31,10 +81,15 @@
% This is adapted from the \diatop macro in wsuipa.sty, which was
% originally designed by Jean-Pierre Paillet.
+% Length to adjust accent distance
+% Introduced 2016-07-06 JSP.
+\newlength\twoaccsep
+\setlength{\twoaccsep}{-0.8ex}
+
\def\twoacc[#1|#2]{\leavevmode{\setbox1=\hbox{{#1{}}}%
\setbox2=\hbox{{#2{}}}%
\dimen0=\ifdim\wd1>\wd2\wd1\else\wd2\fi%
- \dimen1=\ht2\advance\dimen1by-0.8ex%
+ \dimen1=\ht2\advance\dimen1by\twoaccsep%
\setbox1=\hbox to1\dimen0{\hss#1\hss}%
\rlap{\raise1\dimen1\box1}%
\hbox to1\dimen0{\hss#2\hss}}}%
@@ -88,9 +143,30 @@
% \item[(b)] This is the second example.
% \end{itemize}
% \end{example}
+%
+% New in 1.1 (2016-07-06):
+% We provide a covexample environment and only (re)define
+% example if it does not yet exist or if redefinition is
+% forced by the "forced" option. This prevents clashes
+% with packages/classes that roll their own example environment
+% (such as beamer).
-\newenvironment{example}{\begin{examples}\item}{\end{examples}}
+\newenvironment{covexample}{\begin{covexamples}\item}{\end{covexamples}}
+\@ifundefined{example}{%
+ \newenvironment{example}{\begin{covexamples}\item}{\end{covexamples}}
+}{%
+\ifforceredef
+ \renewenvironment{example}{\begin{covexamples}\item}{\end{covexamples}}
+ \cov at warning{The example environment was already defined. Redefining it.}
+\else
+ \cov at warning{The example environment was already defined.^^J
+ Covington does not touch it.^^J
+ Use covexample if you want to access covington's^^J
+ version, or use the force package option.}
+\fi
+}
+
%%%
%%% The 'examples' environment
%%%
@@ -105,10 +181,17 @@
%
% Thanks to Darrel Hankerson of Auburn University, and numerous others
% across the net, for help with this macro.
+%
+% New in 1.1 (2016-07-06):
+% We provide a covexamples environment and only (re)define
+% examples if it does not yet exist or if redefinition is
+% forced by the "forced" option. This prevents clashes
+% with packages/classes that roll their own examples environment
+% (such as beamer).
\newcounter{equationsave} % used in trick with equation number
-\newenvironment{examples}% % define "example" environment
+\newenvironment{covexamples}% % define "example" environment
{%
\begin{list}{(\theequation)}%
{%
@@ -121,6 +204,20 @@
\raggedright}% % text is flushleft, not justified
{\end{list}}
+\@ifundefined{examples}{%
+ \newenvironment{examples}{\begin{covexamples}}{\end{covexamples}}
+}{%
+\ifforceredef
+ \renewenvironment{examples}{\begin{covexamples}}{\end{covexamples}}
+ \cov at warning{The examples environment was already defined. Redefining it.}
+\else
+ \cov at warning{The examples environment was already defined.^^J
+ Covington does not touch it.^^J
+ Use covexamples if you want to access covington's^^J
+ version, or use the force package option.}
+\fi
+}
+
%%%
%%% Sentences with word-by-word glosses
%%%
@@ -166,8 +263,8 @@
% baselinestretch.
\@ifundefined{new at fontshape}%
- {\def\@selfnt{\ifx\@currsize\normalsize\@normalsize\else\@currsize\fi}}
- {\def\@selfnt{\selectfont}}
+ {\def\cov at selfnt{\ifx\@currsize\normalsize\@normalsize\else\@currsize\fi}}
+ {\def\cov at selfnt{\selectfont}}
% Thanks to Hans-Peter Kolb for this macro.
\def\gll % Introduces 2-line text-and-gloss.
@@ -174,7 +271,7 @@
{\begin{flushleft}
\vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
\def\baselinestretch{1}%
-\@selfnt%
+\cov at selfnt%
\vskip-\baselineskip%
\bgroup
\catcode`\^^M=12
@@ -185,7 +282,7 @@
{\begin{flushleft}
\vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
\def\baselinestretch{1}%
-\@selfnt%
+\cov at selfnt%
\vskip-\baselineskip%
\bgroup
\catcode`\^^M=12
@@ -222,10 +319,19 @@
\glossglue = 5pt plus 2pt minus 1pt % allow stretch/shrink between words
\newif\ifnotdone
-\let\eachwordone=\it
-\let\eachwordtwo=\rm
-\let\eachwordthree=\rm
+% Add semantic markup (with latex 2.09 backwards support)
+\@ifundefined{selectfont}{%
+ \def\cov at emphasized{\it}%
+ \def\cov at normalfont{\rm}%
+}{%
+ \def\cov at emphasized{\normalfont\itshape}%
+ \def\cov at normalfont{\normalfont\rmfamily}%
+}
+\let\eachwordone=\cov at emphasized
+\let\eachwordtwo=\cov at normalfont
+\let\eachwordthree=\cov at normalfont
+
\def\lastword#1#2#3% #1 = \each, #2 = line box, #3 = word box
{\setbox#2=\vbox{\unvbox#2%
\global\setbox#3=\lastbox
@@ -311,7 +417,7 @@
% \psr To print S -> NP VP, use: \psr{S}{NP~VP}
-\newcommand{\psr}[2]{\mbox{\it #1 $\rightarrow$ #2}}
+\newcommand{\psr}[2]{\mbox{\cov at emphasized #1 $\rightarrow$ #2}}
%%%
@@ -329,9 +435,8 @@
% Modified 2001 Mar 27 so that italics are used without the user typing \it.
\newcommand{\fs}[1]
{
- \mbox{\small
+ \mbox{\small\cov at emphasized
$
- \it
\left[
\!\!
\begin{array}{l}
@@ -345,8 +450,8 @@
% Modified 1990 Dec 5 so that features are left aligned.
\newcommand{\lfs}[2]
{
- \mbox{$
- \it
+ \mbox{\cov at emphasized
+ $
\!\!
\begin{array}[t]{c}
#1
@@ -353,7 +458,6 @@
\\
\mbox{\small%
$
- \it
\left[
\!\!
\begin{array}{l}
@@ -411,7 +515,7 @@
\newcommand{\drs}[2]
{
{
- \it
+ \cov at emphasized
\begin{tabular}{|l|}
\hline
~ \vspace{-2ex} \\
@@ -430,7 +534,7 @@
\newcommand{\sdrs}[3]
{\begin{tabular}{l}
-\mbox{\it #1} \\
+\mbox{\cov at emphasized #1} \\
~ \\
\drs{#2}{#3}
\end{tabular}}
@@ -458,9 +562,15 @@
% exercise Environment for exercises, numbered by subsection.
% Optional argument for describing the exercise
% ("Project" or the like).
+%
+% New in 1.1 (2016-07-06):
+% We provide a covexercise environment and only (re)define
+% example if it does not yet exist or if redefinition is
+% forced by the "forced" option. This prevents clashes
+% with packages/classes that roll their own exercise environment.
-% \bx Abbreviation for \begin{exercise}
-% \ex Abbreviation for \end{exercise}
+% \bx Abbreviation for \begin{covexercise}
+% \ex Abbreviation for \end{covexercise}
% reflist Environment for hanging-indented list
% (suitable for LSA-style reference list).
@@ -472,17 +582,31 @@
% large curly brackets. Good for alternatives
% within sentences or PS-rules.
-\newtheorem{exercise}{Exercise}[subsection]
+\newtheorem{covexercise}{Exercise}[subsection]
% Exercise numbering resets to 0 not only at the start of
% a subsection, but also at the start of a section or chapter
% even if it is not divided into subsections.
-\@addtoreset{exercise}{section}
-\@addtoreset{exercise}{chapter}
+\@addtoreset{covexercise}{section}
+\@addtoreset{covexercise}{chapter}
-\newcommand{\bx}{\begin{exercise}}
-\newcommand{\ex}{\end{exercise}}
+\newcommand{\bx}{\begin{covexercise}}
+\newcommand{\ex}{\end{covexercise}}
+\@ifundefined{exercise}{%
+ \newenvironment{exercise}{\begin{covexercise}}{\end{covexercise}}
+}{%
+\ifforceredef
+ \renewenvironment{exercise}{\begin{covexercise}}{\end{covexercise}}
+ \cov at warning{The exercise environment was already defined. Redefining it.}
+\else
+ \cov at warning{The exercise environment was already defined.^^J
+ Covington does not touch it.^^J
+ Use covexercise if you want to access covington's^^J
+ version, or use the force package option.}
+\fi
+}
+
\@ifundefined{reflist}{
\newenvironment{reflist}{\begin{list}{}%
{\setlength{\labelwidth}{0pt}
@@ -496,7 +620,7 @@
% defined. Permits using uga.sty with covingtn.sty.
\newcommand{\sentence}[1]
- {\begin{flushleft}{\it #1}\end{flushleft}}
+ {\begin{flushleft}{\cov at emphasized #1}\end{flushleft}}
\newcommand{\either}[2]
{
More information about the tex-live-commits
mailing list