linguex 4.3 (31may10)

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

1 files changed, 55 insertions, 42 deletions

diff --git a/Master/texmf-dist/tex/latex/linguex/linguex.sty b/Master/texmf-dist/tex/latex/linguex/linguex.sty
index 2176b63340d..97677285f9a 100644
--- a/Master/texmf-dist/tex/latex/linguex/linguex.sty
+++ b/Master/texmf-dist/tex/latex/linguex/linguex.sty
@@ -21,9 +21,12 @@
 %% predefined commands
 %% linguex.sty version 4.1 replaces \refstepcounter by \stepcounter 
 %% for internal counters
+%% 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
 %% Author: Wolfgang.Sternefeld@uni-tuebingen.de
 %% status: supported
-%% filedate Feb. 4th 2010 
+%% filedate April 14th 2010 
 \RequirePackage{xspace,cgloss4e}
 %%%%%%%%%%%%%%%%%%% FOOTNOTES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % to let \ex. know whether or not it is in a footnote 
@@ -59,11 +62,14 @@
 \newcommand{\Exroman}{\roman}%added in version 4.0
 % Modification in version 4.0: hard wired brackets replaced by 
 % commands defined above:
-\renewcommand{\theSubExNo}{\hbox{\if@noftnote\theExLBr\Exarabic{ExNo}\firstrefdash\Exalph{SubExNo}\theExRBr\else
+\renewcommand{\theSubExNo}{\hbox{\if@noftnote\theExLBr\Exarabic{ExNo}\firstrefdash
+     \Exalph{SubExNo}\theExRBr\else
 \theFnExLBr\Exroman{FnExNo}\firstrefdash\Exalph{SubExNo}\theFnExRBr\fi}}
 \renewcommand{\theSubSubExNo}{%
-     \hbox{\if@noftnote\theExLBr\Exarabic{ExNo}\firstrefdash\Exalph{SubExNo}\secondrefdash\Exroman{SubSubExNo}\theExRBr%
-	    \else\theFnExLBr\Exroman{FnExNo}\firstrefdash\Exalph{SubExNo}\secondrefdash\Exarabic{SubSubExNo}\theFnExRBr\fi}}%
+     \hbox{\if@noftnote\theExLBr\Exarabic{ExNo}\firstrefdash\Exalph{SubExNo}\secondrefdash
+        \Exroman{SubSubExNo}\theExRBr%
+	\else\theFnExLBr\Exroman{FnExNo}\firstrefdash
+              \Exalph{SubExNo}\secondrefdash\Exarabic{SubSubExNo}\theFnExRBr\fi}}%
 %
 %%%%%%%%%%%%%% LENGTHS FOR SPACING %%%%%%%%%%%%%%%%%%%%%%%%%%
 \newlength{\currentlabel}
@@ -104,7 +110,7 @@
 \newif\ifExWarning
 \newcounter{ExDepth}
 \newcounter{TempExDepth}\setcounter{TempExDepth}{0}
-\def\trivex.#1\par{\ifdim\lastskip=\Extopsep\vspace{\Exredux}\fi
+\def\trivex.#1\par{\ifdim\lastskip=.66\baselineskip\vspace{\Exredux}\fi
      \begin{list}{}{\leftmargin\z@%
      \labelwidth\z@\labelsep\z@\partopsep\z@\topsep\Extopsep}%
      \item{}#1%
@@ -114,7 +120,7 @@
         \setcounter{ExDepth}{0}
 		\embeddedtrue\fi
 	 \ifembedded\else
-        \ifdim\lastskip=\Extopsep\vspace{\Exredux}\fi
+        \ifdim\lastskip=.66\baselineskip\vspace{\Exredux}\fi
 	 \fi
      \stepcounter{ExDepth}%%refstepcounter replaced 
      \my@ifnextchar[{\OptArgEx}{\ifindex\expandafter\lookforwords\fi
@@ -148,41 +154,41 @@
 \newcommand{\ExEnd}{%
      \ifnum\theExDepth=0\global\unembeddedfalse\else%
           \end{list}\addtocounter{ExDepth}{-1}\ExEnd\fi}
-	  \newcommand{\listdecl}{\parsep\z@\itemsep\z@\partopsep\z@\labelsep\z@%
-		 \@Exleftmargin\z@%
-		 \settowidth{\digitwidth}{0}\mindigitwidth\digitwidth%modified-3.7
-		 \minimalwidth{1}%modified-3.7
-		 \minimalwidth{2}%
-		 \minimalwidth{3}%
-		 \minimalwidth{4}%
-		 \minimalwidth{5}%
-		 \minimalwidth{6}%
-		 \minimalwidth{7}%
-		 \minimalwidth{8}%
-		 \minimalwidth{9}%
-	  \settowidth{\lessthanthousand}{\ExLBr\hbox to \philarge{}\ExRBr}%modified-3.7,4.0
-		 \ifdim\currentlabel<\lessthanthousand\leftmargin\Exlabelsep
-			\ifdim\lessthanthousand<\Exlabelwidth\Exlabelwidth\Exlabelsep% 
-			\settowidth{\lessthanten}{\ExLBr\hbox 
+\newcommand{\listdecl}{\parsep\z@\itemsep\z@\partopsep\z@\labelsep\z@%
+   \@Exleftmargin\z@%
+   \settowidth{\digitwidth}{0}\mindigitwidth\digitwidth%modified-3.7
+   \minimalwidth{1}%modified-3.7
+   \minimalwidth{2}%
+   \minimalwidth{3}%
+   \minimalwidth{4}%
+   \minimalwidth{5}%
+   \minimalwidth{6}%
+   \minimalwidth{7}%
+   \minimalwidth{8}%
+   \minimalwidth{9}%
+   \settowidth{\lessthanthousand}{\ExLBr\hbox to \philarge{}\ExRBr}%modified-3.7,4.0
+   \ifdim\currentlabel<\lessthanthousand\leftmargin\Exlabelsep
+   \ifdim\lessthanthousand<\Exlabelwidth\Exlabelwidth\Exlabelsep% 
+   \settowidth{\lessthanten}{\ExLBr\hbox 
                                to \philsmall{}\ExRBr}%modified-3.7
-			\settowidth{\lessthanhundred}{\ExLBr\hbox to 
+   \settowidth{\lessthanhundred}{\ExLBr\hbox to 
                                   \philmiddle{}\ExRBr}%modified-3.7
-			\ifdim\currentlabel<\lessthanten\leftmargin\lessthanten%
-		   \else
-		   \ifdim\currentlabel<\lessthanhundred\leftmargin\lessthanhundred%
-			  \else 
-			  \ifdim\currentlabel<\lessthanthousand\leftmargin\lessthanthousand%
-			\fi\fi\fi\fi
-		 \else
-		 \Exlabelwidth\z@
-		 \fi%
-		 \@Exleftmargin\Exlabelwidth 
-		 \labelwidth\leftmargin
-		 \ifembedded\relax\else
-		 \addtolength{\Exlabelwidth}{\Exindent}
-		 \fi
-	\addtolength{\leftmargin}{\Exlabelwidth}%
-	\addtolength{\labelwidth}{\@Exleftmargin}%
+   \ifdim\currentlabel<\lessthanten\leftmargin\lessthanten%
+     \else
+     \ifdim\currentlabel<\lessthanhundred\leftmargin\lessthanhundred%
+     \else 
+     \ifdim\currentlabel<\lessthanthousand\leftmargin\lessthanthousand%
+   \fi\fi\fi\fi
+   \else
+   \Exlabelwidth\z@
+   \fi%
+   \@Exleftmargin\Exlabelwidth 
+   \labelwidth\leftmargin
+   \ifembedded\relax\else
+   \addtolength{\Exlabelwidth}{\Exindent}
+   \fi
+ \addtolength{\leftmargin}{\Exlabelwidth}%
+ \addtolength{\labelwidth}{\@Exleftmargin}%
 }
 \def\Exformat[#1]{%
    \settowidth{\currentlabel}{#1}%
@@ -334,7 +340,7 @@
                      {\@ifnextchar]{\recurseonbr}{}}}
 \newcommand{\recurseonbr}{\my@ifnextchar[{\stripoffbr}%
                        {\my@ifnextchar]{\stripoffbr}{\labelBr}}}
-\def\stripoffbr#1#2 {\rm #1\recurseonbr#2 }
+\def\stripoffbr#1#2 {\textrm{#1}\recurseonbr#2 }%\rm changed to \textrm
 %
 %%%%%%%%%%%%%%%%%%%% GLOSSES %%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \newif\ifgloss
@@ -405,9 +411,16 @@
            \setcounter{tmpaEx}{\value{FnExNo}}\def\thetmpaEx{\Exroman{tmpaEx}}%
            \fi}
 \def\complexExNo[#1]{\hbox{\if@noftnote\theExLBr\else\theFnExLBr\fi%
-            \thetmpaEx\firstrefdash#1\if@noftnote\theExRBr\else\theFnExRBr\fi}}%hard wired bracket changed to \theExBr in version 4.0
+            \thetmpaEx\firstrefdash#1\if@noftnote\theExRBr
+            \else\theFnExRBr\fi}}%hard wired bracket changed to \theExBr in version 4.0
 \newcommand{\printExNo}{\@ifnextchar[{\complexExNo}{%
             \if@noftnote\theExLBr\else\theFnExLBr\fi\thetmpaEx%
             \if@noftnote\theExRBr\else\theFnExRBr\fi\xspace}}%hard 
-                                                             %wired bracket changed to \theExBr in version 4.0
+                                       %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}}}
 %%%%%%%%%%%%%%%%%%%%%%%%%%% END %%%%%%%%%%%%%%%%%%%%%%%%%%