[Groff-commit] groff ChangeLog NEWS tmac/trace.tmac

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     06/10/28 16:59:32

Modified files:
        .              : ChangeLog NEWS 
        tmac           : trace.tmac 

Log message:
        * tmac/trace.tmac: Improve tracing of `.nr'.
        Trace `.substring' also.
        
        * NEWS: Updated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.999&r2=1.1000
http://cvs.savannah.gnu.org/viewcvs/groff/NEWS?cvsroot=groff&r1=1.224&r2=1.225
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/trace.tmac?cvsroot=groff&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.999
retrieving revision 1.1000
diff -u -b -r1.999 -r1.1000
--- ChangeLog   28 Oct 2006 15:49:53 -0000      1.999
+++ ChangeLog   28 Oct 2006 16:59:32 -0000      1.1000
@@ -1,3 +1,10 @@
+2006-10-28  Werner LEMBERG  <address@hidden>
+
+       * tmac/trace.tmac: Improve tracing of `.nr'.
+       Trace `.substring' also.
+
+       * NEWS: Updated.
+
 2006-10-28  Bernd Warken
 
        * man/roff.man, src/roff/groff/groff.man: Add `chem', fix position

Index: NEWS
===================================================================
RCS file: /cvsroot/groff/groff/NEWS,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -b -r1.224 -r1.225
--- NEWS        28 Oct 2006 15:49:53 -0000      1.224
+++ NEWS        28 Oct 2006 16:59:32 -0000      1.225
@@ -90,8 +90,8 @@
 o A new macro `Dx' has been added to the mdoc package which identifies the
   DragonFly OS.
 
-o -mtrace now shows whether a macro has been called as .foo or as 'foo.
-  It also traces calls to the `nr', `ds', `ds1', `as', and `as1' requests.
+o -mtrace has been considerably improved, now showing number and string
+  register assignments, among other things.
 
 o The PSPIC macro now works with all devices (producing a hollow
   rectangle on devices which don't support inclusion of PS images) and

Index: tmac/trace.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/trace.tmac,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tmac/trace.tmac     26 Oct 2006 19:39:07 -0000      1.10
+++ tmac/trace.tmac     28 Oct 2006 16:59:32 -0000      1.11
@@ -12,8 +12,15 @@
 .rn nr !!nr
 .
 .de nr
+.  do !!ds !!!inc \$2
+.  do !!substring !!!inc 0 0
+.  do !!nr \$*
+.  do ie "\?\*[!!!inc]\?"\?-\?" \
+.    do tm1 "\*[!!!sp]*** .nr \$* (-> \n[\$1])
+.  el .do ie "\?\*[!!!inc]\?"\?+\?" \
+.    do tm1 "\*[!!!sp]*** .nr \$* (-> \n[\$1])
+.  el \
 .  do tm1 "\*[!!!sp]*** .nr \$*
-.  !!nr \$*
 ..
 .
 .rn ds !!ds
@@ -55,7 +62,7 @@
 .    do !!as !!!sp " \"
 .    do ie \\n[.br] .do !!\$1 \\$@
 .    el 'do !!\$1 \\$@
-.    do substring !!!sp 1
+.    do !!substring !!!sp 1
 .    do ie \\n[.br] .!!ds !!!br .\"
 .    el .do !!ds !!!br '\"
 .    ie "\$1"\\$0" .do tm1 "\\*[!!!sp]*** trace exit: \\*[!!!br]\\$0 \\$@
@@ -80,7 +87,7 @@
 .    do !!as !!!sp " \"
 .    do ie \\n[.br] .do !!\$1 \\$@
 .    el 'do !!\$1 \\$@
-.    do substring !!!sp 1
+.    do !!substring !!!sp 1
 .    do ie \\n[.br] .!!ds !!!br .\"
 .    el .do !!ds !!!br '\"
 .    ie "\$1"\\$0" .do tm1 "\\*[!!!sp]*** trace exit: \\*[!!!br]\\$0 \\$@
@@ -108,7 +115,7 @@
 .    do !!as !!!sp " \"
 .    do ie \\n[.br] .do !!\$1 \\$@
 .    el 'do !!\$1 \\$@
-.    do substring !!!sp 1
+.    do !!substring !!!sp 1
 .    do ie \\n[.br] .!!ds !!!br .\"
 .    el .do !!ds !!!br '\"
 .    ie "\$1"\\$0" .do tm1 "\\*[!!!sp]*** trace exit: \\*[!!!br]\\$0 \\$@
@@ -133,7 +140,7 @@
 .    do !!as !!!sp " \"
 .    do ie \\n[.br] .do !!\$1 \\$@
 .    el 'do !!\$1 \\$@
-.    do substring !!!sp 1
+.    do !!substring !!!sp 1
 .    do ie \\n[.br] .!!ds !!!br .\"
 .    el .do !!ds !!!br '\"
 .    ie "\$1"\\$0" .do tm1 "\\*[!!!sp]*** trace exit: \\*[!!!br]\\$0 \\$@
@@ -154,6 +161,13 @@
 .  !!return twice
 ..
 .
+.rn substring !!substring
+.
+.!!de1 substring
+.  !!substring \$*
+.  tm1 "\*[!!!sp]*** .substring \$* (-> `\*[\$1]')
+..
+.
 .ec
 .
 .cp \n(_C