summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/expex/expex.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/expex/expex.tex')
-rw-r--r--Master/texmf-dist/tex/generic/expex/expex.tex31
1 files changed, 24 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/generic/expex/expex.tex b/Master/texmf-dist/tex/generic/expex/expex.tex
index a7a8647eaaf..7d6f1de5c9c 100644
--- a/Master/texmf-dist/tex/generic/expex/expex.tex
+++ b/Master/texmf-dist/tex/generic/expex/expex.tex
@@ -1,5 +1,5 @@
\def\ExPexMessage
- {2014/01/27 v5.0 ExPex linguistics example formatter (JF)}
+ {2014/03/10 v5.0b ExPex linguistics example formatter (JF)}
% -------------------------------------------------------
% jf 2011/12/09 (v4.0a)
% 1) fixed bug in how exceptional gla items are detected
@@ -30,10 +30,13 @@
% 2) removed w from the prefix in \glw@append, \glw@lop, and
% \glw@lopff since these will be used in other gloss styles
% jf 2013/10/10 fixed belowpreambleskip bug
-% jf 2014/01/27 MAJOR REVISIONS: vertical spacing in glosses,
-% introduction of nlevel style glosses (see User's Manual, also
-% revised at this time) for more detail about the changes
-% jf 2014/02/13 renamed setlist to ep@setlist
+% jf 2014/01/27 (v5.0)
+% MAJOR REVISIONS: vertical spacing in glosses, introduction of
+% nlevel style glosses (see User's Manual, also revised at this time)
+% for more detail about the changes
+% jf 2014/03/08 (v5.0b)
+% 1. restored allowing {} empty items in wrap glosses
+% 2. introduced <glossbreaking> parameter
% --------------------------------------------------------
\edef\resetatcatcode{\catcode`\noexpand\@\the\catcode`\@\relax}
\catcode`\@=11\relax
@@ -784,14 +787,23 @@
% are built. The vboxes are fed into Tex's regular paragraph
% building machinary.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%\def\glw@begingl{\@getoptionalarg\glw@begingl@a}
+% introduced "glossbreaking" boolean parameter
+\define@boolkey{ling}[ling@]{glossbreaking}{}
+\lingset{glossbreaking=false}
\def\glw@begingl{\glw@begingl@a}
\def\glw@begingl@a{%
\bgroup
\parindent0pt
\ep@setglstrut
\ifdim\ling@glwidth=0pt
- \bgroup
+ \ifling@glossbreaking
+ \bgroup
+ \else
+ \vtop\bgroup
+ \advance\hsize by -\leftskip
+ \advance\hsize by -\rightskip
+ \leftskip=0pt
+ \fi
\else
\vtop\bgroup
\hsize=\ling@glwidth
@@ -861,6 +873,11 @@
\def\glw@gla@d #1 {%
\def\temp{#1}%
\ifx\temp\empty
+% action for empty words added 2014/03/08
+ \glw@wordfalse
+ \@itemtype=0
+ \gl@append \\{\glstrut}\to\mainlist
+ \gl@eappend 0\to\itemtypelist
\else
\@setitemtype #1\@nil
\ifnum\@itemtype=0 \gl@append \\{\glstrut #1}\to\mainlist