From cf62e0a822d36480a91d09794f1abb2892d98303 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 31 Dec 2009 01:29:16 +0000 Subject: gb4e update (29dec09) git-svn-id: svn://tug.org/texlive/trunk@16540 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/gb4e/README | 8 +++++ Master/texmf-dist/doc/latex/gb4e/gb4e-doc.pdf | Bin 166818 -> 166637 bytes Master/texmf-dist/doc/latex/gb4e/gb4e-doc.tex | 42 +++++++++++++--------- Master/texmf-dist/tex/latex/gb4e/cgloss4e.sty | 13 ++++--- Master/texmf-dist/tex/latex/gb4e/gb4e.sty | 49 +++++++++++++++++++++++--- 5 files changed, 86 insertions(+), 26 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/gb4e/README (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/gb4e/README b/Master/texmf-dist/doc/latex/gb4e/README new file mode 100644 index 00000000000..fc9332ccdf8 --- /dev/null +++ b/Master/texmf-dist/doc/latex/gb4e/README @@ -0,0 +1,8 @@ +The style file gb4e provides an environment for linguistic examples, a command for glossed sentences, and a grab-bag of various other goodies. + +Authors: Hans-Peter Kolb and Craig Thiersch + +The code was developed from the midnight and covington packages. It may be distributed and/or modified unter the conditions of the LaTeX Project Public License, either version 1.2 +of this license or (at your option) any later version. + +The latest version of the LaTeX Project Public License can be found at this URL: http://www.latex-project.org/lppl.txt diff --git a/Master/texmf-dist/doc/latex/gb4e/gb4e-doc.pdf b/Master/texmf-dist/doc/latex/gb4e/gb4e-doc.pdf index 1786e246ade..80da0f226cd 100644 Binary files a/Master/texmf-dist/doc/latex/gb4e/gb4e-doc.pdf and b/Master/texmf-dist/doc/latex/gb4e/gb4e-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/gb4e/gb4e-doc.tex b/Master/texmf-dist/doc/latex/gb4e/gb4e-doc.tex index d9293034a94..c88b5921e4e 100644 --- a/Master/texmf-dist/doc/latex/gb4e/gb4e-doc.tex +++ b/Master/texmf-dist/doc/latex/gb4e/gb4e-doc.tex @@ -6,15 +6,15 @@ %\documentstyle[a4,11pt,gb4e]{article} %% \def\bs{$\backslash$} -\parskip1.2ex +\frenchspacing\parskip1.2ex \parindent0pt \def\bit{\vskip.05\baselineskip\hspace*{1em}\hangindent4em\hangafter1} \title{Preliminary documentation for {\tt gb\gbVersion.sty}\thanks{% Parts of ``Government-Binding style'' {\tt gb\gbVersion.sty} are - loosely based on ideas and code by M.~Covington, M.~deGroot, + loosely based on ideas and code by M.~Covington, M.~van der Goot, J.~Frampton and L.~Holt. In particular it automatically includes {\tt cgloss\gbVersion.sty}, a (heavily adapted) version of M.~Covington's - \LaTeX-adaptation of M.~de Groot's plain\TeX{} Midnight gloss + \LaTeX-adaptation of M.~van der Goot's plain\TeX{} Midnight gloss macros.} and {\tt cgloss\gbVersion.sty}} \author{hans-peter kolb $<${\sf kolb@sfs.nphil.uni-tuebingen.de}$>$\\ Craig Thiersch $<${\sf thiersch@kub.nl}$>$} @@ -37,9 +37,9 @@ The file {\tt gb\gbVersion.sty}\footnote{% NB: Make sure to get {\tt cgloss\gbVersion.sty} together with {\tt gb\gbVersion.sty}. - As time permits, we'd like to revise the rest of {\tt - gb\gbVersion.sty}, so please experiment and let us know about - bugs and/or suggestions.} + This version of gb4e includes some \emph{minimal} bug-fixes and enhancements by + Alexis Dimitriadis, with emphasis on backward compatibility. +} allows \verb"_" (subscript) and \verb"^" (superscript) to be used in ordinary text, which is handy, but because it changes their definitions it must be loaded {\bf after} @@ -110,8 +110,8 @@ set the labelwidth to, e.g., the widest label to come (in the style of are ``{\tt m.}'' for {\tt xlist}, and ``{\tt iii.}'' for {\tt xlisti}. The default labelwidth for the {\tt exe}-environment can also be changed globally by issuing a \verb,\exewidth{}, command in the -preamble of your document (i.e.\ between the -\verb'documentstyle' and the \verb'\begin{document}' lines). +preamble of your document (i.e.\ between +\verb'\documentclass' and \verb'\begin{document}'). \subsection{Examples with running numbers} As just shown, every example with a running number @@ -159,8 +159,8 @@ sublist of examples follows). \bit\verb'\ex[]{}' $\Longrightarrow$ a numbered example with judgement. -The space reserved for judgements is governed by the -\verb,\judgewidth{}, command which sets it to the width of +The space reserved for judgements can be controlled by the command\break +\verb,\judgewidth{},, which sets it to the width of \verb,, (Default: ``{\tt ??}''). It can be issued in the preamble to change the default globally, or within an {\tt exe}-environment for a @@ -266,7 +266,7 @@ Again, these commands work exactly as \verb'\ex' or \pagebreak[2] \section{Glosses}\label{gloss} {\tt gb\gbVersion.sty} offers a set of commands for typesetting glosses based -on M.\ Covington's \LaTeX-adaptation of M.\ deGroot's Midnight gloss +on M.\ Covington's \LaTeX-adaptation of M.\ van der Goot's Midnight gloss \TeX-macros.\footnote{They are defined in the file {\tt cgloss\gbVersion.sty} which is automatically read by {\tt gb\gbVersion.sty}.}\\[5pt] A gloss basically contains two elements: @@ -359,9 +359,10 @@ respectively. By default the glosses appear in ``Linguistic Inquiry style'' with all lines in \verb"\rm". To change a line -(e.g.\ to \verb"\it" if required for a particular journal), just put +(e.g.\ to italics if required for a particular journal), just put the appropriate lines in the preamble of your document, e.g., -\verb"\let\eachwordone=\it". The same for +\verb"\let\eachwordone=\it".\footnote{Font commands that take an argument, such as {\tt \bs textit}, cannot be used with versions of gb4e before 2009/12/28. Upgrade to the latest version or use argument-less font commands, such as {\tt \bs it}.} + The same for \verb"\eachwordtwo" and \verb"\eachwordthree" (used by the three line glosses introduced by \verb'\glll'). Note that it will {\em not} work @@ -404,13 +405,20 @@ uses: yields \obar{X} \ibar{X} \iibar{X} \mbar{X}. With \verb,\primebars, in the preamble, the outcome is \obar{X} X^{'} XP \mbar{X}. \item Labelled bracketings: -\verb,\lb{NP}[1]\lb{D}[1] the]\lb{\ibar{N}} example]], yields +\verb,\lb{NP}[1]\lb{D}[1] the]\lb{\ibar{N}},\break \verb,example]], yields \lb{NP}[1]\lb{D}[1] the]\lb{\ibar{N}} example]]. An analogous right-bracket (\verb,\rb,) is also defined. \item Greek letters: the frequently used letters \al\be\ga\de\ and \th\ have abbreviations \verb,\al \be \ga \de \th, which also work outside mathmode. \item Sub- \& superscripts (\verb,_, and \verb,^,) work outside mathmode, too. +\\ +{\bf Note:} This feature is known to cause problems for a number of +other packages. It is retained for backward compatibility. In case of problems, +you can disable it by adding the command \verb|\noautomath| in your preamble +immediately after loading the gb4e package. You can also re-enable later with +the command \verb|\automath|. [Added 2009/12/28] + \end{itemize} At the very end of the style-file a couple of special accents for ``exotic'' languages are defined. Also, check out the \verb,\attop,-, @@ -429,8 +437,10 @@ movement-arrows: \begin{exe} \ex\atcenter{ \arrowalign{\fillright\pd&\link3&\fillleft{\vrule\hfil}\cr - Did&\ &John&\ &t_{\mathrm{Agr}}&\ appear &t&\ to be likely &t&\ to win.\cr - &&\fillright\pu&\link3&\centr{\vrule\spacer\pu}&\lf&\fillleft\vrule\cr} + Did&\ &John&\ &t_{\mathrm{Agr}}&\ appear &t&\ to be likely + &t&\ to win.\cr + &&\fillright\pu&\link3&\centr{\vrule\spacer\pu}&\lf + &\fillleft\vrule\cr} } \end{exe} \end{verbatim} diff --git a/Master/texmf-dist/tex/latex/gb4e/cgloss4e.sty b/Master/texmf-dist/tex/latex/gb4e/cgloss4e.sty index eedaf886e00..b066dbd9937 100644 --- a/Master/texmf-dist/tex/latex/gb4e/cgloss4e.sty +++ b/Master/texmf-dist/tex/latex/gb4e/cgloss4e.sty @@ -1,6 +1,6 @@ % -*- LaTeX -*- % Following borrows from Covington's style files inspired by Midnight by M. -% de Groot, adapted to be used with gb4e.sty: examples beginning with \ex can +% van der Goot, adapted to be used with gb4e.sty: examples beginning with \ex can % contain glosses directly. Default is % Linguistic Inquiry style with all lines in \rm; to change a line (eg. to % \it for a particular journal, change the appropriate line: e.g., @@ -86,9 +86,12 @@ %\glossglue = 5pt plus 2pt minus 1pt % allow stretch/shrink between words \newif\ifnotdone -\@ifundefined{eachwordone}{\let\eachwordone=\rm}{\relax} -\@ifundefined{eachwordtwo}{\let\eachwordtwo=\rm}{\relax} -\@ifundefined{eachwordthree}{\let\eachwordthree=\rm}{\relax} +% For any REALLY old distributions without \rmfamily +\@ifundefined{rmfamily}{\let\rmfamily=\rm} + +\@ifundefined{eachwordone}{\let\eachwordone=\rmfamily}{\relax} +\@ifundefined{eachwordtwo}{\let\eachwordtwo=\rmfamily}{\relax} +\@ifundefined{eachwordthree}{\let\eachwordthree=\rmfamily}{\relax} \def\lastword#1#2#3% #1 = \each, #2 = line box, #3 = word box {\setbox#2=\vbox{\unvbox#2% @@ -108,7 +111,7 @@ } \gdef\getwords(#1,#2)#3 #4\\% #1=linebox, #2=\each, #3=1st word, #4=remainder - {\setbox#1=\vbox{\hbox{#2\strut#3 }% adds space + {\setbox#1=\vbox{\hbox{#2{\strut#3} }% adds space \unvbox#1% }% \def\more{#4}% diff --git a/Master/texmf-dist/tex/latex/gb4e/gb4e.sty b/Master/texmf-dist/tex/latex/gb4e/gb4e.sty index b212ba00f61..b156829f61a 100644 --- a/Master/texmf-dist/tex/latex/gb4e/gb4e.sty +++ b/Master/texmf-dist/tex/latex/gb4e/gb4e.sty @@ -3,10 +3,13 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Version 4export (= v. 4 minus the compatibility code) % Based on hpk's gb.sty, revised for GM syllabus by ct, -% and incorporating macros adapted from J.Frampton, M. de Groot en M. -% Covington. Full documentation soon to come in gb4doc.tex. Bug-reports +% and incorporating macros adapted from J.Frampton, M. van der Goot en M. +% Covington. Full documentation soon to come in gb4e-doc.tex. Bug-reports % and suggestions for improvements, other used features, please! % +% The package gb4e may be distributed under the conditions of the LaTeX Project +% Public License (LPPL). See the README file for more details. +% % Notes: % % Various styles for X-bar levels; can be changed, but note that {picture} @@ -16,6 +19,11 @@ % This file allows _ and ^ to be used in ordinary text, hence must be % loaded AFTER any file that uses them in their TeX meaning. Hence % cgloss(n).sty is loaded early in this file. +% This feature is known to cause problems but is maintained for backward +% compatibility. If you have problems, you can try disabling it by +% placing the command \noautomath immediately after loading the gb4e package. +% [Added 2009/12/28] +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%% @@ -56,7 +64,7 @@ % \sn[jdgmt]{sentence} (unnumbered example with judgement) % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% For my own lazyness (HANDLE WITH CARE---this works only +% For my own laziness (HANDLE WITH CARE---this works only % in boringly normal cases.... ): % % \ea works like \begin{exe}\ex or \begin{xlist}\ex, @@ -65,7 +73,10 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\@ifundefined{new@fontshape}{\def\reset@font{}\let\mathrm\rm\let\mathit\mit}{} +% For any REALLY old distributions without \rmfamily +\@ifundefined{rmfamily}{\let\rmfamily=\rm} + +\@ifundefined{new@fontshape}{\def\reset@font{}\let\mathrm\rmfamily\let\mathit\mit}{} \let\prmbrs=0 \def\primebars{\let\prmbrs=1} @@ -94,12 +105,40 @@ %%% NEWSTUFF: \newcommand{\indexgroupmark}[1]{\item{\bf #1}} % ?? -CT -% this allows _ to be used in horizontal mode (from J.Frampton): \catcode`_=\active \def_#1{\ifmmode\mathit{\sb{#1}}\else${}\sb{#1}$\fi} \catcode`^=\active \def^#1{\ifmmode\mathit{\sp{#1}}\else${}\sp{#1}$\fi} +%%%%%%%%%%% AUTOMATH + +% this allows _ to be used in horizontal mode (from J.Frampton): +% Reimplemented to allow this feature to be turned on and off. +% The new version also combines sub- and superscripts properly. +% -Alexis + +% \automath Make _ and ^ work outside math mode +% \noautomath Restore normal sub/superscript behavior + +{ % Temporarily change catcodes + \catcode`\_=\active + \catcode`\^=\active + + \global\def\automath{% + \catcode`\_=\active + \catcode`\^=\active + \def_##1{\@ifnextchar^{\automath@two_{##1}}{\ensuremath{\sb{##1}}}}% + \def^##1{\@ifnextchar_{\automath@two^{##1}}{\ensuremath{\sp{##1}}}}} +} +\def\automath@two#1#2#3#4{\ensuremath{#1{#2}\relax #3{#4}}} +% Restore default catcodes for ^, _ +\def\noautomath{\catcode`\_=8 \catcode`\^=7 } + +\automath % On by default, for backward compatibility + +%%%%%%%%% + + \def\lb#1{\@ifnextchar [{\@glarph{#1}}{\@bl{#1}}} \def\@glarph#1[#2]{\ifmmode{[}\sb{{\mathrm{#1}}\sb{#2}}\else% ${[}\sb{{\mathrm{#1}}\sb{#2}}$\fi} -- cgit v1.2.3