* tmac/doc.tmac (doc-tag-list): Don't use \Z to assure that spaces

aren't stretched in a tag (this can fail with unformatted boxes).
Instead, insert a break and go back one line.

* src/roff/troff/input.cc (return_macro_request): If called with
argument pop macro twice.  We need this to trace `return'.

* tmac/trace.tmac: Handle `return'.
Fix typos.

* NEWS, man/groff_diff.man, man/groff.man, doc/groff.texinfo:
Document.

* tmac/groff_ms.man, doc/groff.texinfo: Improve documentation of
registers `FPS', `FVS', and `FPD'.

3 files changed, 25 insertions, 14 deletions

diff --git a/tmac/doc.tmac b/tmac/doc.tmac
index 290431a8..7dcfb660 100644
--- a/tmac/doc.tmac
+++ b/tmac/doc.tmac
@@ -3959,15 +3959,15 @@
 .  ti -\n[doc-reg-dtl]u
 .
 .  nh
-.  ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \{\
-.    doc-item-box\n[doc-list-depth]
+.  doc-item-box\n[doc-list-depth]
+.  ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \
 .    br
-.  \}
 .  el \{\
-.    chop doc-item-box\n[doc-list-depth]
-.    \" Using \Z prevents stretching of the spaces in the tag
-.    nop \Z'\*[doc-item-box\n[doc-list-depth]]'\c
-.    nop \h'\n[doc-reg-dtl]u'\c
+.    \" format the tag separately to prevent stretching of spaces
+.    vpt 0
+.    br
+.    sp -1
+.    vpt 1
 .    nr doc-have-space 1
 .  \}
 .
diff --git a/tmac/groff_ms.man b/tmac/groff_ms.man
index 5b3e9416..383126a1 100644
--- a/tmac/groff_ms.man
+++ b/tmac/groff_ms.man
@@ -1,6 +1,6 @@
 '\" t
 .ig
-Copyright (C) 1989-1995, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989-1995, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -197,9 +197,12 @@ cb cb cb cb
 afCW l l l .
 Reg.	Definition	Effective	Default
 _
-FL	Footnote length	next footnote	LL*5/6
+FL	Footnote length	next footnote	\[rs]n[LL]*5/6
 FI	Footnote indent	next footnote	2n
 FF	Footnote format	next footnote	0
+FPS	Point size	next footnote	\[rs]n[PS]-2
+FVS	Vert. spacing	next footnote	\[rs]n[FPS]+2
+FPD	Para. spacing	next footnote	\[rs]n[PD]/2
 _
 .TE
 .RE
diff --git a/tmac/trace.tmac b/tmac/trace.tmac
index c341b762..a67d9192 100644
--- a/tmac/trace.tmac
+++ b/tmac/trace.tmac
@@ -17,12 +17,12 @@
 .  ec
 .  do !!de \$1
 .    ie "\$1"\\$0" .do tm1 "\\*[!!sp]*** de trace enter: \\$0 \\$@
-.    el .do tm1 "\*[!!sp]*** trace enter \$1: \\$0 \\$@
+.    el .do tm1 "\\*[!!sp]*** trace enter \$1: \\$0 \\$@
 .    do as !!sp " \"
 .    do nop \\*[!!\$1]\\
 .    do substring !!sp 1
 .    ie "\$1"\\$0" .do tm1 "\\*[!!sp]*** trace exit: \\$0 \\$@
-.    el .do tm1 "\*[!!sp]*** trace exit \$1: \\$0 \\$@
+.    el .do tm1 "\\*[!!sp]*** trace exit \$1: \\$0 \\$@
 \..
 .
 .  do ds !!d1 !!\$1
@@ -34,17 +34,17 @@
 .
 .rn am !!am
 .
-.!!am am
+.!!de am
 .  do ecs
 .  ec
 .  do !!am \$1
 .    ie "\$1"\\$0" .do tm1 "\\*[!!sp]*** am trace enter: \\$0 \\$@
-.    el .do tm1 "\*[!!sp]*** am trace enter \$1: \\$0 \\$@
+.    el .do tm1 "\\*[!!sp]*** am trace enter \$1: \\$0 \\$@
 .    as !!sp " \"
 .    do nop \\*[!!\$1]\\
 .    substring !!sp 1
 .    ie "\$1"\\$0" .do tm1 "\\*[!!sp]*** trace exit: \\$0 \\$@
-.    el .do tm1 "\*[!!sp]*** trace exit \$1: \\$0 \\$@
+.    el .do tm1 "\\*[!!sp]*** trace exit \$1: \\$0 \\$@
 \..
 .
 .  do ds !!a1 !!\$1
@@ -54,6 +54,14 @@
 .  do ami !!a1 !!a2
 ..
 .
+.rn return !!return
+.
+.!!de return
+.  substring !!sp 1
+.  tm1 "\*[!!sp]*** return
+.  !!return twice
+..
+.
 .ec
 .
 .cp \n(_C