From 3b25faeb2fe6b2ff7384da9a80e6c535103db004 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 11 Mar 2014 22:16:14 +0000 Subject: expex (9mar14) git-svn-id: svn://tug.org/texlive/trunk@33152 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/expex/README | 50 --------------------------- Master/texmf-dist/tex/generic/expex/expex.sty | 2 +- Master/texmf-dist/tex/generic/expex/expex.tex | 31 +++++++++++++---- 3 files changed, 25 insertions(+), 58 deletions(-) delete mode 100644 Master/texmf-dist/doc/generic/expex/README diff --git a/Master/texmf-dist/doc/generic/expex/README b/Master/texmf-dist/doc/generic/expex/README deleted file mode 100644 index 3bc2eb476e9..00000000000 --- a/Master/texmf-dist/doc/generic/expex/README +++ /dev/null @@ -1,50 +0,0 @@ - -ExPex Jan 2014 - -------------------------------------------------------------- -ExPex is maintained by John Frampton -------------------------------------------------------------- - -ExPex is designed to assist linguists in typesetting examples and -glosses and in creating named reference to examples and parts of -examples. - -------------------------------------------------------------- - -COPYRIGHT 2006-2014 by John Frampton - -This program can be redistributed and/or modified under the terms -of the LaTeX Project Public License, which can be found in the CTAN -archives in directory macros/latex/base/lppl.txt. - -------------------------------------------------------------- - -The files in this distribution (v 5.0) are: - - README - expex.tex Main macro file - expex.sty Latex wrapper for expex.tex - expex-doc.pdf User's Guide - - eptexfn.tex Tex footnote macros - epltxfn.sty LaTex footnote package - epltxchapno.sty LaTex package for chapter.number example - numbering - - expex-demo.tex The code for most of the examples - expex-doc.zip The source code for the User's Guide - -------------------------------------------------------------- - -expex-demo.tex - -This file contains most of the examples in the documentation. It is -intended to facilitate user experimentation with ExPex typesetting. -Users can easily modify examples and see what the effect is. It can be -run under either Plain Tex or LaTex. Except for expex.tex and -expex.sty, all files needed to run expex-demo should be part of any -Tex installation. - -------------------------------------------------------------- -John Frampton (Jan 24, 2014) - diff --git a/Master/texmf-dist/tex/generic/expex/expex.sty b/Master/texmf-dist/tex/generic/expex/expex.sty index 5b55cb80649..b6de48cd48b 100644 --- a/Master/texmf-dist/tex/generic/expex/expex.sty +++ b/Master/texmf-dist/tex/generic/expex/expex.sty @@ -1,5 +1,5 @@ \ProvidesPackage{expex}% - [2014/01/27 v5.0 LaTex wrapper for expex.tex (JF)] + [2014/03/10 v5.0b LaTex wrapper for expex.tex (JF)] \RequirePackage{xkeyval} \input expex \endinput 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 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 -- cgit v1.2.3