summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-09-03 18:03:06 +0000
committerKarl Berry <karl@freefriends.org>2009-09-03 18:03:06 +0000
commit571d635dc27595303cb4b2a9ef61d2b0918e517a (patch)
treeb40d879a781b7bed3a2bbe8c7f274abcb8ce7ed9
parent33059d76042f5296eda13a6d0e3bbb3c69658534 (diff)
linguex 3.7a (2sep09)
git-svn-id: svn://tug.org/texlive/trunk@15026 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/linguex/README.TEXLIVE2
-rw-r--r--Master/texmf-dist/doc/latex/linguex/linguex-doc.pdfbin88255 -> 100736 bytes
-rw-r--r--Master/texmf-dist/doc/latex/linguex/linguex-doc.tex28
-rw-r--r--Master/texmf-dist/tex/latex/linguex/linguex.sty75
4 files changed, 66 insertions, 39 deletions
diff --git a/Master/texmf-dist/doc/latex/linguex/README.TEXLIVE b/Master/texmf-dist/doc/latex/linguex/README.TEXLIVE
index c788188a6ad..c178cc9025b 100644
--- a/Master/texmf-dist/doc/latex/linguex/README.TEXLIVE
+++ b/Master/texmf-dist/doc/latex/linguex/README.TEXLIVE
@@ -1,6 +1,6 @@
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. If questions or
-concerns, email tex-live.org.
+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 6d26d3ff03c..def722ac69a 100644
--- a/Master/texmf-dist/doc/latex/linguex/linguex-doc.pdf
+++ b/Master/texmf-dist/doc/latex/linguex/linguex-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/linguex/linguex-doc.tex b/Master/texmf-dist/doc/latex/linguex/linguex-doc.tex
index 7d4734392c0..fa96f12d607 100644
--- a/Master/texmf-dist/doc/latex/linguex/linguex-doc.tex
+++ b/Master/texmf-dist/doc/latex/linguex/linguex-doc.tex
@@ -1,7 +1,7 @@
-%% linguex-doc.tex version 3.4
-%% documentation of linguex.sty
+%% linguex-doc.tex version 2.0
+%% documentation of linguex.sty version 3.7
%% Author: Wolfgang.Sternefeld@uni-tuebingen.de
-%% filedate 02/01/26
+%% filedate 2008/06/30
\documentclass{article}
\usepackage{linguex}
%\usepackage{linguho}
@@ -13,7 +13,7 @@
\begin{document}
\title{linguex.sty Documentation}
\author{Wolfgang Sternefeld\\
-Version 3.4 --- January 2002}
+Version 3.7 --- June 2008}
\date{}
\maketitle
@@ -487,17 +487,23 @@ references from eg. \Last[b] to \renewcommand{\refdash}{}\Last[b].
\subsection*{$\backslash$\tt Exlabelwidth}%
By default, the value of \verb.\Exlabelwidth. is determined by the
width of the example numbering. More precisely, for labels between
-(1) and (9) the labelwidth is by default that of (11); accordingly, the
-actual labelwidth is a bit larger than the natural size of the label.
-Similarly, \verb.\Exlabelwidth. has the width of (110) for
+(1) and (9) the labelwidth is by default the width of the narrowest
+number with two digits plus brackets; accordingly, the
+actual labelwidth is a bit larger than the natural size of the
+label. Digits may differ in size depending on the font in use, so
+the calculation is done on the fly.
+Similarly, \verb.\Exlabelwidth. has the width of three digits for
\verb-\theExNo-'s between (10) and (99). Finally,
-\verb,\Exlabelwidth, has the width of (1100) for example numbers
+\verb,\Exlabelwidth, has the width of four digits for example numbers
between (100) and (999). For even wider labels (usually specified by
-an optional argument, cf. above), the label retains its natural size.
+an optional argument, cf. above), the label retains its natural
+size. I hope that fonts are cooperative by keeping the difference
+between the width of digits minimal. Otherwise you might experience
+weird behavior of \verb.\Exlabelwidth.
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 small change of indentation, which might look
+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
assigned a particular length. For example, saying
@@ -540,4 +546,4 @@ cgloss4e.sty into raggedright by saying
%\makehandout
-\end{document} \ No newline at end of file
+\end{document}
diff --git a/Master/texmf-dist/tex/latex/linguex/linguex.sty b/Master/texmf-dist/tex/latex/linguex/linguex.sty
index df1ad62f9da..2e4abbe80c5 100644
--- a/Master/texmf-dist/tex/latex/linguex/linguex.sty
+++ b/Master/texmf-dist/tex/latex/linguex/linguex.sty
@@ -11,10 +11,15 @@
%% \alignSubEx
%% linguex.sty version 3.6, revised 2008/03/20, \lessthanten,
%% \lessthanhundred, and \lessthanthousand redefined due to problems
-%% with kerning in garamond
+%% with kerning in fonts
+%% linguex.sty version 3.7, revised 2008/06/30, \lessthanten,
+%% \lessthanhundred, and \lessthanthousand redefined due to problems
+%% with kerning in fonts
+%% linguex.sty version 3.7a, revised 2009/09/02, replaced hard-coded
+%% example format with \theExNo
%% Author: Wolfgang.Sternefeld@uni-tuebingen.de
%% status: supported
-%% filedate 2008/03/20
+%% filedate 2008/06/30
\RequirePackage{xspace,cgloss4e}
%%%%%%%%%%%%%%%%%%% FOOTNOTES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% to let \ex. know whether or not it is in a footnote
@@ -69,6 +74,11 @@
\addtolength{\alignSubExnegindent}{.7em}\fi
}
\AtBeginDocument{\resetExdefaults}
+%%%
+\newlength\digitwidth%added-3.7
+\newlength\mindigitwidth%added-3.7
+\newcommand{\minimalwidth}[1]{\settowidth{\digitwidth}{#1}%added-3.7
+\ifdim\digitwidth<\mindigitwidth\mindigitwidth\digitwidth\fi}%added-3.7
%%%%%%%%%%%%%%%%%%% DEFINITION OF \ex. %%%%%%%%%%%%%%%%%%%%%%%%%%
\newif\ifembedded
\newif\ifExWarning
@@ -97,7 +107,7 @@
check number of empty lines at end of examples.
Detected}\fi\ExWarningtrue
\if@noftnote\refstepcounter{ExNo}%
- \Exformat[(\arabic{ExNo})]%
+ \Exformat[(\theExNo)]%
\else
\refstepcounter{FnExNo}\Exformat[(\roman{FnExNo})]%
\fi}
@@ -106,29 +116,40 @@
\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{\lessthanthousand}{(0000)}%
- \ifdim\currentlabel<\lessthanthousand\leftmargin\Exlabelsep
- \ifdim\lessthanthousand<\Exlabelwidth\Exlabelwidth\Exlabelsep%
- \settowidth{\lessthanten}{(00)}%
- \settowidth{\lessthanhundred}{(000)}%
- \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}%
-}
+ \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}{(\hbox to 4\mindigitwidth{})}%modified-3.7
+ \ifdim\currentlabel<\lessthanthousand\leftmargin\Exlabelsep
+ \ifdim\lessthanthousand<\Exlabelwidth\Exlabelwidth\Exlabelsep%
+ \settowidth{\lessthanten}{(\hbox to 2\mindigitwidth{})}%modified-3.7
+ \settowidth{\lessthanhundred}{(\hbox to 3\mindigitwidth{})}%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}%
+ }
\def\Exformat[#1]{%
\settowidth{\currentlabel}{#1}%
\begin{list}{\makebox[\labelwidth][l]{#1}}{%
@@ -351,4 +372,4 @@
\fi}
\def\complexExNo[#1]{\hbox{(\thetmpaEx\refdash#1)}}
\newcommand{\printExNo}{\@ifnextchar[{\complexExNo}{(\thetmpaEx)\xspace}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%% END %%%%%%%%%%%%%%%%%%%%%%%%%% \ No newline at end of file
+%%%%%%%%%%%%%%%%%%%%%%%%%%% END %%%%%%%%%%%%%%%%%%%%%%%%%%