* tmac/eqnrc (.EQ, .EN): Provide default definitions. Reported

by Denis M. Wilson.

* tmac/www.tmac (.EQ, .EN, .TS, .TE): Fix definitions.

2 files changed, 13 insertions, 10 deletions

diff --git a/tmac/eqnrc b/tmac/eqnrc
index 874d7356..5574e590 100644
--- a/tmac/eqnrc
+++ b/tmac/eqnrc
@@ -1,4 +1,6 @@
 .\" Startup file for eqn.
+.if !d EQ .ds EQ
+.if !d EN .ds EN
 .EQ
 sdefine << %{ < back 20 < }%
 sdefine >> %{ > back 20 > }%
diff --git a/tmac/www.tmac b/tmac/www.tmac
index 9533a62b..dbbe143d 100644
--- a/tmac/www.tmac
+++ b/tmac/www.tmac
@@ -1245,16 +1245,6 @@ HTML always denotes XHTML also.
 .  nop \\$2
 ..
 .
-.\" --------------------------------------------------------------------
-.\" Setup around HTML-IMAGE and friends
-.\"
-.\" now set up TS, TE, EQ, EN default macros
-.\"
-.do if !d TS .do ds TS HTML-IMAGE\"
-.do if !d TE .do ds TE HTML-IMAGE-END\"
-.do if !d EQ .do ds EQ EQN-HTML-IMAGE\"
-.do if !d EN .do ds EN EQN-HTML-IMAGE-END\"
-.
 .\"
 .\" supplementary macros used by other macro sets
 .\"
@@ -1342,6 +1332,7 @@ HTML always denotes XHTML also.
 .  www-make-unique-name
 .  EQN-HTML-DO-IMAGE \\*[www-unique-name] i
 ..
+.
 .\" --------------------------------------------------------------------
 .\" EQN-HTML-DO-IMAGE - tells troff to issue an image marker which can be
 .\"                     read back by pre-html
@@ -1374,6 +1365,16 @@ HTML always denotes XHTML also.
 ..
 .
 .\" --------------------------------------------------------------------
+.\" Setup around HTML-IMAGE and friends
+.\"
+.\" now set up TS, TE, EQ, EN default macros
+.\"
+.do if !d TS .do als TS HTML-IMAGE\"
+.do if !d TE .do als TE HTML-IMAGE-END\"
+.do if !d EQ .do als EQ EQN-HTML-IMAGE\"
+.do if !d EN .do als EN EQN-HTML-IMAGE-END\"
+.
+.\" --------------------------------------------------------------------
 .\" JOBNAME
 .\"
 .\"   Generate multiple output files containing the html.