[Groff-commit] groff ChangeLog tmac/eqnrc tmac/www.tmac

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     08/07/26 19:38:04

Modified files:
        .              : ChangeLog 
        tmac           : eqnrc www.tmac 

Log message:
        * tmac/eqnrc (.EQ, .EN): Provide default definitions.  Reported
        by Denis M. Wilson.
        
        * tmac/www.tmac (.EQ, .EN, .TS, .TE): Fix definitions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1134&r2=1.1135
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/eqnrc?cvsroot=groff&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/www.tmac?cvsroot=groff&r1=1.54&r2=1.55

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1134
retrieving revision 1.1135
diff -u -b -r1.1134 -r1.1135
--- ChangeLog   24 Jul 2008 12:06:24 -0000      1.1134
+++ ChangeLog   26 Jul 2008 19:38:04 -0000      1.1135
@@ -1,3 +1,10 @@
+2008-07-26  Werner LEMBERG  <address@hidden>
+
+       * tmac/eqnrc (.EQ, .EN): Provide default definitions.  Reported
+       by Denis M. Wilson.
+
+       * tmac/www.tmac (.EQ, .EN, .TS, .TE): Fix definitions.
+
 2008-07-24  Denis M. Wilson  <address@hidden>
 
        New options -f and -k for afmtodit.

Index: tmac/eqnrc
===================================================================
RCS file: /cvsroot/groff/groff/tmac/eqnrc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tmac/eqnrc  11 Dec 2002 14:26:22 -0000      1.7
+++ tmac/eqnrc  26 Jul 2008 19:38:04 -0000      1.8
@@ -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 > }%

Index: tmac/www.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/www.tmac,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- tmac/www.tmac       5 Apr 2008 20:56:40 -0000       1.54
+++ tmac/www.tmac       26 Jul 2008 19:38:04 -0000      1.55
@@ -1245,16 +1245,6 @@
 .  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 @@
 .  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 @@
 ..
 .
 .\" --------------------------------------------------------------------
+.\" 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.