fixed bug in 2.6 caused by bizarre semantics of .am directive

SCCS-vsn: share/me/index.me 2.5
SCCS-vsn: share/me/tmac.orig_me 2.7

diff --git a/usr/src/share/me/index.me b/usr/src/share/me/index.me
index 40f9348..e546064 100644 (file)
--- a/usr/src/share/me/index.me
+++ b/usr/src/share/me/index.me
@@ -1,8 +1,14 @@
 .nr _0 \n(c.
 .nr _0 \n(c.

-.\"    @(#)index.me    2.4     %G%
+.\"    @(#)index.me    2.5     %G%

 .\"    %beginstrip%
 .de (x                 \" *** begin index entry
 .\"    %beginstrip%
 .de (x                 \" *** begin index entry

-.ie "\\n(.z"" \
+.\" please note these cases MUST be in this order
+.ie !"\\n(.z"" \
+\{\
+.      ev 2                    \" if in a diversion, save & process later
+\!.(x \\$1
+.\}
+.el \

 \{\
 .      ds |X x
 .      if \\n(.$ \
 \{\
 .      ds |X x
 .      if \\n(.$ \


@@ -10,11 +16,6 @@
 .      am %\\*(|X )x
 .      sp \\n(xsu
 .\}
 .      am %\\*(|X )x
 .      sp \\n(xsu
 .\}

-.el \
-\{\
-.      ev 2
-\!.(x \\$1
-.\}

 ..
 .de )x                 \" *** end index entry
 .ie "\\n(.z"" \
 ..
 .de )x                 \" *** end index entry
 .ie "\\n(.z"" \


@@ -34,7 +35,7 @@
 .\}
 .el \
 \{\
 .\}
 .el \
 \{\

-.      br
+.      br                      \" if in a diversion, save & process later

 \!.)x \\$1 \\$2
 .      ev
 .\}
 \!.)x \\$1 \\$2
 .      ev
 .\}

diff --git a/usr/src/share/me/tmac.orig_me b/usr/src/share/me/tmac.orig_me
index d0a06af..6da4678 100644 (file)
--- a/usr/src/share/me/tmac.orig_me
+++ b/usr/src/share/me/tmac.orig_me
@@ -8,14 +8,14 @@
 .\"*           Electronics Research Laboratory                         *
 .\"*           U.C. Berkeley.                                          *
 .\"*                                                                   *
 .\"*           Electronics Research Laboratory                         *
 .\"*           U.C. Berkeley.                                          *
 .\"*                                                                   *

-.\"*   VERSION 2.6     First Release: 11 Sept 1978                     *
+.\"*   VERSION 2.7     First Release: 11 Sept 1978                     *

 .\"*   See file \*(||/revisions for revision history                   *
 .\"*                                                                   *
 .\"*   Documentation is available.                                     *
 .\"*                                                                   *
 .\"**********************************************************************
 .\"
 .\"*   See file \*(||/revisions for revision history                   *
 .\"*                                                                   *
 .\"*   Documentation is available.                                     *
 .\"*                                                                   *
 .\"**********************************************************************
 .\"

-.\"    @(#)tmac.orig_me        2.6     %G%
+.\"    @(#)tmac.orig_me        2.7     %G%

 .\"    %beginstrip%
 .\"
 .\"    Code on .de commands:
 .\"    %beginstrip%
 .\"
 .\"    Code on .de commands: