X-Git-Url: https://git.distorted.org.uk/~mdw/mdwtools/blobdiff_plain/eafdddad07cf0a91ba07cbd9309a0a46e3bd00ac..9cb5c64cc696cd59cf723021386b254ab8de5b13:/syntax.dtx

diff --git a/syntax.dtx b/syntax.dtx
index ee0f4e3..66ff4d5 100644
--- a/syntax.dtx
+++ b/syntax.dtx
@@ -1,41 +1,33 @@
-% \begin{meta-comment}
-%
-% syntax.dtx
-%
-% Syntax typesetting package for LaTeX 2e
-%
-% (c) 2003 Mark Wooding
-%
-% \end{meta-comment}
-%
 % \begin{meta-comment} <general public licence>
 %%
 %% syntax package -- typesetting syntax descriptions
-%% Copyright (c) 2003 Mark Wooding
+%% Copyright (c) 1996, 2002, 2015, 2020 Mark Wooding
+%%
+%% This file is part of the `mdwtools' LaTeX package collection.
 %%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the GNU General Public License as published by
-%% the Free Software Foundation; either version 2 of the License, or
-%% (at your option) any later version.
+%% `mdwtools' is free software: you can redistribute it and/or modify it
+%% under the terms of the GNU General Public License as published by the
+%% Free Software Foundation; either version 2 of the License, or (at your
+%% option) any later version.
 %%
-%% This program is distributed in the hope that it will be useful,
-%% but WITHOUT ANY WARRANTY; without even the implied warranty of
-%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%% GNU General Public License for more details.
+%% `mdwtools' is distributed in the hope that it will be useful, but
+%% WITHOUT ANY WARRANTY; without even the implied warranty of
+%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%% General Public License for more details.
 %%
 %% You should have received a copy of the GNU General Public License
-%% along with this program; if not, write to the Free Software
-%% Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+%% along with `mdwtools'.  If not, write to the Free Software Foundation,
+%% Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 %%
 % \end{meta-comment}
 %
 % \begin{meta-comment} <Package preamble>
 %<+package>\NeedsTeXFormat{LaTeX2e}
 %<+package>\ProvidesPackage{syntax}
-%<+package>                [2003/08/25 1.08 Syntax typesetting (MDW)]
+%<+package>                [2020/09/06 1.14.0 Syntax typesetting]
 % \end{meta-comment}
 %
-% \CheckSum{1627}
+% \CheckSum{1628}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -313,7 +305,7 @@
 %
 % You can modify the appearance of grammars using three length parameters:
 %
-% \begin{description} \def\makelabel{\hskip\labelsep\cmd}
+% \begin{description} \setdescriptionlabel{\cmd{#1}}
 %
 % \item [\grammarparsep] is the amount of space inserted between production
 %       rules.  It is a rubber length whose default value is 8\,pt, with
@@ -562,7 +554,7 @@
 %
 % The following length parameters may be altered:
 %
-% \begin{description} \def\makelabel{\hskip\labelsep\cmd}
+% \begin{description} \setdescriptionlabel{\cmd{#1}}
 %
 % \item [\sdstartspace] The length of the rule between the arrows which
 %       begin each line of the syntax diagram and the first item on the line.
@@ -778,7 +770,7 @@
 %
 % There's some extra cunningness here, because I'd like to be able to
 % hyphenate after underscores usually, but not when there's another one
-% following.  And then, because \env{tabbing} redefines |\_|, there's some
+% following.  And then, because \env{tabbing} redefines |\-|, there's some
 % more yukkiness to handle that: the usual |\@tabacckludge| mechanism doesn't
 % cope with this particular case.
 %
@@ -1102,6 +1094,7 @@
   \bgroup%
   \verb@eol@error%
   \let\do\@makeother\dospecials%
+  \@noligs%
   #2%
   \catcode`#1\active%
   \lccode`\~`#1%