linguex (29may13)

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

7 files changed, 59 insertions, 55 deletions

diff --git a/Master/texmf-dist/doc/latex/linguex/README b/Master/texmf-dist/doc/latex/linguex/README
index 0a681065fd0..70902eeb3ef 100644
--- a/Master/texmf-dist/doc/latex/linguex/README
+++ b/Master/texmf-dist/doc/latex/linguex/README
@@ -1,8 +1,6 @@
-This bundle comprises two packages:
+This bundle comprises three packages:
 
-    * The linguex package facilitates the formatting of linguist examples, 
-automatically taking care of example numbering, indentations, indexed 
-brackets, and the '*' in grammaticality judgments.
-    * The ps-trees package provides linguistic trees, building on the 
-macros of tree-dvips , but overcoming some of the older package's shortcomings.
+    * The linguex package facilitates the formatting of linguist examples, automatically taking care of example numbering, indentations, indexed brackets, and the '*' in grammaticality judgments.
+    * The linguho package facilitates making handouts from documents that use linguex for examples
+    * The ps-trees package provides linguistic trees, building on the macros of tree-dvips , but overcoming some of the older package's shortcomings.
 
diff --git a/Master/texmf-dist/doc/latex/linguex/README.TEXLIVE b/Master/texmf-dist/doc/latex/linguex/README.TEXLIVE
deleted file mode 100644
index 864be2f183a..00000000000
--- a/Master/texmf-dist/doc/latex/linguex/README.TEXLIVE
+++ /dev/null
@@ -1,7 +0,0 @@
-The following files have been removed in the TeX Live installation of
-the current package, typically due to duplication, lack of space, or
-missing source code.  You can find these files on CTAN at
-	http://mirror.ctan.org/macros/latex/contrib/linguex
-If questions or concerns, email tex-live@tug.org.
-
-	cgloss4e.sty
diff --git a/Master/texmf-dist/doc/latex/linguex/linguex-doc.pdf b/Master/texmf-dist/doc/latex/linguex/linguex-doc.pdf
index f34f1a0cf63..ec91a582cf2 100644
--- a/Master/texmf-dist/doc/latex/linguex/linguex-doc.pdf
+++ b/Master/texmf-dist/doc/latex/linguex/linguex-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/linguex/linguex-doc.tex b/Master/texmf-dist/doc/latex/linguex/linguex-doc.tex
index a44b7556a8e..ce358c6e023 100644
--- a/Master/texmf-dist/doc/latex/linguex/linguex-doc.tex
+++ b/Master/texmf-dist/doc/latex/linguex/linguex-doc.tex
@@ -1,19 +1,19 @@
-%% linguex-doc.tex version 2.0
-%% documentation of linguex.sty version 4.0
+%% linguex-doc.tex version 2.1
+%% documentation of linguex.sty version 4.3
 %% Author: Wolfgang.Sternefeld@uni-tuebingen.de
-%% filedate 2008/06/30
+%% Version number updated; minor typos fixed
+%% filedate 2013/05/28
 \documentclass{article}
-\usepackage{linguexVPagin}
+\usepackage{linguex}
 %\usepackage{linguho}
 %\usepackage[*]{linguho}
-%\documentstyle[linguex]{article}
 \sloppy\raggedbottom
 %\addtolength{\alignSubExnegindent}{.7em}
 %%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{document}           
 \title{linguex.sty Documentation}
 \author{Wolfgang Sternefeld\\
-Version 4.0 --- September 2009}
+Version 4.3 --- May 2013}
 \date{}
 \maketitle
 
@@ -134,10 +134,10 @@ necessary to split the command \verb-\footnote{...}- into
 \LaTeX-manual).  The footnotetext must be placed outside the 
 \verb-\ex.--environment of the main text.
 
-Some style files (e.g.  endnote.sty) modify the definition of 
-footnotes (as linguex.sty itself does so in order to let \verb|\ex.| know 
+Some style files (e.g.  {\tt endnote.sty}) modify the definition of 
+footnotes (as {\tt linguex.sty} itself does so in order to let \verb|\ex.| know 
 whether or not it is inside a footnote).  Such style files must be 
-accommodated to linguex.sty by making sure that \verb-\if@noftnote- is 
+accommodated to {\tt linguex.sty} by making sure that \verb-\if@noftnote- is 
 set false at the beginning of each footnote (by saying 
 \verb-\@noftnotefalse- in the modified footnote definition); otherwise 
 you will get the arabic style of example numberings (as being used in 
@@ -218,7 +218,7 @@ well.  Note also that a space is required before the grammaticality
 judgment, otherwise the beginning of subscripting cannot be properly 
 identified.
 
-As with the gloss macro, grouping surpresses subscripting. 
+As with the gloss macro, grouping suppresses subscripting. 
 Consider  the effects of spacing and grouping in \Next:
 \begin{verbatim}
 \exi.\a.  [[NP Fritz ][ snores ]]S
@@ -279,7 +279,7 @@ the begin-end-format, style files that suppress printing between the
 end and the beginning of certain environments (e.g.  {\tt 
 xcomment.sty}) could unfortunately not be adopted to produce a handout 
 (I didn't see a way of doing so, probably because I didn't understand 
-what goes on inside xcomment.sty).
+what goes on inside {\tt xcomment.sty}).
 
 This deficiency might be compensated for by using {\tt linguho.sty}, 
 which removes all examples and headings (of sections and subsections) 
@@ -296,17 +296,17 @@ instructions automatically go into \textit{jobname}.han and are
 executed only there.  (The main body of text before 
 \verb-\makehandout- is considered irrelevant, but I didn't find a way 
 to suppress writing it into the dvi-file.  Any help to solve this 
-problem will be appreciated; note that I am not a \TeX-wizzard, only a lazy 
+problem will be appreciated; note that I am not a \TeX-wizard, only a lazy 
 linguist).  
 
 In case you have defined \verb.\active.  characters (e.g.  Umlaut in 
 German) these will most likely turn out troublesome (i.e.  these 
-commands should normaly be protected).  For a general solution, 
-inspect the definition of \verb.\MkOthersSpecial.  in linguho.sty.  
+commands should normally be protected).  For a general solution, 
+inspect the definition of \verb.\MkOthersSpecial.  in {\tt linguho.sty}.  
 Uncommenting any of the lines there will solve the problem for the 
 active character contained in the respective line (sometimes it might 
-in addition be necessary to use t1enc.sty or germanb.sty instead of 
-german.sty).
+in addition be necessary to use {\tt t1enc.sty} or {\tt germanb.sty} instead of 
+{\tt german.sty}).
 
 
 \subsection*{Customizing Lengths and Margins}%
@@ -345,7 +345,7 @@ simultaneously, say \verb-\resetExdefaults-.  The exact behavior of
 standard fonts the default spacing can be defined only
 \verb.\AtBeginDocument.  (for reasons I do not understand), therefore
  the default values for the above lengths are declared  
- \verb.\AtBeginDocument..  In consequence, any
+ \verb.\AtBeginDocument..  Consequently, any
 deviation from the default must be specified  
 after \verb.\begin{document}.
 
@@ -366,7 +366,7 @@ subexamples, as shown in \Next and \NNext:
 \addtolength{\alignSubExnegindent}{-.5em}%
 By saying \verb.\alignSubExtrue. before \verb.\begin{document}., 
 the sublabels (a. and b. in \Last) 
-are given a negative indentation. This is controled by the lengths
+are given a negative indentation. This is controlled by the lengths
 \verb.\alignSubExnegindent.  and \verb.\Exlabelsep.,
 which can be customized by \verb-\setlength-.  after \verb.\begin{document}..
 
@@ -549,10 +549,10 @@ Since the space between the \verb.\Exlabelwidth.  and the text
 remains the same, the transition from (9) to (10) and from (99) 
 to (100) will cause a change of indentation, which might look 
 ugly, particularly  in handouts.  In order to 
-supress the default behavior of \verb|\Exlabelwidth|, it must be 
+suppress the default behavior of \verb|\Exlabelwidth|, it must be 
 assigned a particular length.  For example, saying 
 \verb.\settowidth{\Exlabelwidth}{(110)}.  will cause the labelwidth of 
-all examles from (1) to (99) to be identical.
+all examples from (1) to (99) to be identical.
 
 Since wide labels should still retain their natural size, the user's 
 specification of \verb|\Exlabelsep| should not be wider than (1100), 
@@ -565,10 +565,10 @@ than ``(1100)''.  (The default value of
 
 
 \subsection*{cgloss4e.sty}
-I found two problems with cgloss4e.sty.  The first relates to AMS-\TeX.
-Writing a translation immediated below the glossed material normally
-behaves as one would expect, but with AMS-Tex the translation becomes
-indented, for reasons I do not understand.  To remidy this, one has to
+I found two problems with {\tt cgloss4e.sty}.  The first relates to AMS-\TeX.
+Writing a translation immediately below the glossed material normally
+behaves as one would expect, but with AMS-\TeX the translation becomes
+indented, for reasons I do not understand.  To remedy this, one has to
 (re-)define the list indentation, e.g. as shown below (from \LaTeX):
 
 \begin{verbatim}
@@ -585,7 +585,7 @@ The second problem concerns the use of \verb.\gll.  at a position
 other than the beginning of a list.  Then the gloss starts a new
 paragraph and puts unwanted vspace above and below the list.  One way
 to suppress this is to change the flushleft commands used within
-cgloss4e.sty into raggedright by saying 
+{\tt cgloss4e.sty} into raggedright by saying 
 \verb.\renewenvironment{flushleft}{\raggedright}{}..
 
 
diff --git a/Master/texmf-dist/tex/latex/linguex/linguex.sty b/Master/texmf-dist/tex/latex/linguex/linguex.sty
index 97677285f9a..18e34222d8b 100644
--- a/Master/texmf-dist/tex/latex/linguex/linguex.sty
+++ b/Master/texmf-dist/tex/latex/linguex/linguex.sty
@@ -1,4 +1,4 @@
-%% Copyright 1996 by Wolfgang Sternefeld
+%% Copyright 1996-2013 by Wolfgang Sternefeld
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN
 %% archives in directory macros/latex/base/lppl.txt; either
@@ -24,9 +24,13 @@
 %% linguex.sty version 4.2 replaces \rm by \textrm in definition of 
 %% \stripoffbr; undoes the change in version 4.0 from .66\baselineskip to 
 %% \Extopsep; renews definition of \label AtBeginDocument
+%% linguex.sty version 4.3 removes code that caused problems with beamer; adds
+%% a \ProvidesPackage line to keep track of versions better
 %% Author: Wolfgang.Sternefeld@uni-tuebingen.de
-%% status: supported
-%% filedate April 14th 2010 
+%% status: maintained
+%% filedate May 28th 2013
+
+\ProvidesPackage{linguex}[2013/05/28 Example formatting for linguistics v. 4.3]
 \RequirePackage{xspace,cgloss4e}
 %%%%%%%%%%%%%%%%%%% FOOTNOTES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % to let \ex. know whether or not it is in a footnote 
@@ -418,9 +422,15 @@
             \if@noftnote\theExRBr\else\theFnExRBr\fi\xspace}}%hard 
                                        %wired bracket changed to \theExBr in version 4.0
 %%%%%%%%%%%%%%%%%%%%%%%%%%% compatibility with beamer class %%%%%%%%%%%%%%%%%%%%%%%%%%
-\@ifundefined{usetheme}{}{\AtBeginDocument{\def\label#1{\strut%strut added to definition 
-\@bsphack
-   \protected@write\@auxout{}%
- 	 {\string\newlabel{#1}{{\@currentlabel}{\thepage}}}%
-\@esphack}}}
+% This code has now been commented out in v 4.2 since it now causes problems with beamer
+% The original problem it solved was probably a beamer issue, not a linguex issue.
+% Users with old versions of beamer may need this code so let's leave it in the source for the moment
+% 
+%
+%\@ifundefined{usetheme}{}{\AtBeginDocument{\def\label#1{\strut%strut added to definition 
+%\@bsphack
+%   \protected@write\@auxout{}%
+% 	 {\string\newlabel{#1}{{\@currentlabel}{\thepage}}}%
+%\@esphack}}}
 %%%%%%%%%%%%%%%%%%%%%%%%%%% END %%%%%%%%%%%%%%%%%%%%%%%%%%
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/linguex/linguho.sty b/Master/texmf-dist/tex/latex/linguex/linguho.sty
index 9d11cbb14a3..6796f0fbd26 100644
--- a/Master/texmf-dist/tex/latex/linguex/linguho.sty
+++ b/Master/texmf-dist/tex/latex/linguex/linguho.sty
@@ -5,9 +5,11 @@
 %% version 1 of the License, or any later version.
 %% linguho.sty for linguex.sty
 %% Author: Wolfgang.Sternefeld@uni-tuebingen.de
+%% Status: maintained
 %% fileversion 2.0
 %% filedate 99/05/04
-
+%%
+\ProvidesPackage{lingo}[1999/04/05 Make linguistics handouts v. 2.0]
 \RequirePackage{linguex}
 \newif\ifcopytohandout
 \DeclareOption{*}{\copytohandouttrue}
@@ -34,13 +36,13 @@
 \newwrite\han\immediate\openout\han=\jobname.han
 \def\MakeOther #1{\catcode`#1 = 12}
 \def\MkOthersSpecial{%
-   %\MakeOther{\ง}%to be copied for all active characters
-   %\MakeOther{\Š}
-   %\MakeOther{\š}
-   %\MakeOther{\€}
-   %\MakeOther{\…}
-   %\MakeOther{\†}
-   %\MakeOther{\Ÿ}
+   %\MakeOther{\ยง}%to be copied for all active characters
+   %\MakeOther{\ยŠ}
+   %\MakeOther{\ยš}
+   %\MakeOther{\ย€}
+   %\MakeOther{\ย…}
+   %\MakeOther{\ย†}
+   %\MakeOther{\ยŸ}
    %\MakeOther{\"}
   }%This definition must be uncommented	if any of\
   %% the characters	in the above definition	are	\active
diff --git a/Master/texmf-dist/tex/latex/linguex/ps-trees.sty b/Master/texmf-dist/tex/latex/linguex/ps-trees.sty
index 00855bd4417..6f31dffcf9e 100644
--- a/Master/texmf-dist/tex/latex/linguex/ps-trees.sty
+++ b/Master/texmf-dist/tex/latex/linguex/ps-trees.sty
@@ -3,9 +3,10 @@
 %% of the LaTeX Project Public License Distributed from CTAN
 %% archives in directory macros/latex/base/lppl.txt; either
 %% version 1 of the License, or any later version.
-%% ps-trees.sty version 2 
+%% ps-trees.sty version 2.0
 %% Author: Wolfgang.Sternefeld@uni-tuebingen.de
 %% filedate 99/27/04
+\ProvidesPackage{ps-trees}[1999/04/27 Linguistic trees in tabular form v. 2.0]
 \RequirePackage{tree-dvips}
 \newtoks\AllNodes
 \newtoks\CollectedNodes