* 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'.

9 files changed, 98 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 48c26264..79a7c1d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2003-05-17  Werner LEMBERG  <wl@gnu.org>
+
+	* 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.
+
+2003-05-16  Werner LEMBERG  <wl@gnu.org>
+
+	* 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.
+
+2003-05-15  Larry Kollar  <kollar@alltel.net>
+
+	* tmac/groff_ms.man, doc/groff.texinfo: Improve documentation of
+	registers `FPS', `FVS', and `FPD'.
+
 2003-05-15  Werner LEMBERG  <wl@gnu.org>
 
 	* src/utils/pfbtops/pfbtops.c (get_text): Handle loop counter
diff --git a/NEWS b/NEWS
index d99f3a3a..edddf565 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,17 @@
 This file describes recent user-visible changes in groff.  Bug fixes are not
 described.  There are more details in the man and info pages.
 
+VERSION 1.19.1
+==============
+
+Troff
+-----
+
+o If the `return' request is called with an argument, it exits twice,
+  namely the current macro and the macro one level higher.  This is
+  used to define a wrapper macro for `return' in trace.tmac.
+
+
 VERSION 1.19
 ============
 
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index d3f9f63d..59f47858 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -2869,6 +2869,30 @@ Effective: next footnote.
 Default: 0.
 @endDefmpreg
 
+@Defmpreg {FPS, ms}
+Defines the footnote point size.
+
+Effective: next footnote.
+
+Default: @math{@code{@\n[PS]} - 2}.
+@endDefmpreg
+
+@Defmpreg {FVS, ms}
+Defines the footnote vertical spacing.
+
+Effective: next footnote.
+
+Default: @math{@code{@\n[FPS]} + 2}.
+@endDefmpreg
+
+@Defmpreg {FPD, ms}
+Defines the footnote paragraph spacing.
+
+Effective: next footnote.
+
+Default: @math{@code{@\n[PD]} / 2}.
+@endDefmpreg
+
 @unnumberedsubsubsec Miscellaneous Number Registers
 
 @Defmpreg {MINGW, ms}
@@ -10489,8 +10513,12 @@ if the name of the macro, diversion or string diversion is currently
 undefined or if it is defined to be a request; normally they modify the
 value of an existing object.
 
-@Defreq {return, }
+@Defreq {return, [@Var{anything}]}
 Exit a macro, immediately returning to the caller.
+
+If called with an argument, exit twice, namely the current macro and the
+macro one level higher.  This is used to define a wrapper macro for
+@code{return} in @file{trace.tmac}.
 @endDefreq
 
 @menu
diff --git a/man/groff.man b/man/groff.man
index 82387177..7ee821e6 100644
--- a/man/groff.man
+++ b/man/groff.man
@@ -2,7 +2,7 @@
 .ig
 groff.man
 
-Last update: 13 Feb 2003
+Last update: 15 May 2003
 
 This file is part of groff, the GNU roff type-setting system.
 
@@ -1963,6 +1963,10 @@ Read insertion.
 .REQ .return
 Return from a macro.
 .
+.REQ .return anything
+Return twice, namely from the macro at the current level and from the macro
+one level higher.
+.
 .REQ .rfschar f c1 c2 .\|.\|.\&
 Remove the definitions of characters
 .IR c1 ,
diff --git a/man/groff_diff.man b/man/groff_diff.man
index eb00b442..11b4efe7 100644
--- a/man/groff_diff.man
+++ b/man/groff_diff.man
@@ -3,7 +3,7 @@
 .ig
 groff_diff.man
 
-Last update : 1 Mar 2003
+Last update : 15 May 2003
 
 This file is part of groff, the GNU roff type-setting system.
 It is the source of the man-page groff_diff(7).
@@ -1890,6 +1890,9 @@ request.
 .B .return
 Within a macro, return immediately.
 .
+If called with an argument, return twice, namely from the current macro and
+from the macro one level higher.
+.
 No effect otherwise.
 .
 .TP
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 55178a2c..9e7bdd92 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -2398,6 +2398,8 @@ void exit_request()
 
 void return_macro_request()
 {
+  if (has_arg())
+    input_stack::pop_macro();
   input_stack::pop_macro();
   tok.next();
 }
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