From 61fd50e578d27516fdcf76b5b4ee61c1b95d2ae7 Mon Sep 17 00:00:00 2001
From: wlemb <wlemb>
Date: Wed, 30 Oct 2002 17:20:28 +0000
Subject: Fix computation of .trunc register.  Additionally, its value (and the
 value of the .ne register) is now always set before entering the trap.

* src/roff/troff/div.cc (diversion::need): Set `truncated_space' and
`needed_space' before calling `space'.
(top_level_diversion::space): Remove special code for 'sp before the
first page.
Call `begin_page' with the discarded space as a parameter.
(top_level_diversion::begin_page): Add optional parameter to set
`truncated_space'.
* src/roff/troff/div.h: Updated.

* doc/groff.texinfo: Improve documentation of .sp, \n[.trunc], and
\n[.ne].

* tmac/an-old.tmac (SH, SS, TP, IP, HP, TS): Undo change 2002-10-26.
(LP): Remove superfluous call to `br'.
* tmac/doc-common (doc-paragraph): Undo change 2002-10-26.
* tmac/doc.tmac (Bd, Bl, doc-set-vertical-and-indent): Ditto.
---
 tmac/doc.tmac | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'tmac/doc.tmac')

diff --git a/tmac/doc.tmac b/tmac/doc.tmac
index c872b093..589fcafe 100644
--- a/tmac/doc.tmac
+++ b/tmac/doc.tmac
@@ -2698,10 +2698,8 @@
 .  if \n[doc-display-indent-stack\n[doc-display-depth]] \
 .    in +\n[doc-display-indent-stack\n[doc-display-depth]]u
 .
-.  if !\n[doc-is-compact] \{\
-.    br
+.  if !\n[doc-is-compact] \
 .    sp \n[doc-display-vertical]u
-.  \}
 .
 .  if !\n[cR] \
 .    ne 2v
@@ -3000,10 +2998,8 @@
 .    if "\*[doc-list-type-stack\n[doc-list-depth]]"column-list" \{\
 .      doc-set-column-tab \n[doc-num-columns]
 '      in -\n[doc-column-indent-width]u
-.      if !\n[doc-compact-list-stack\n[doc-list-depth]] \{\
-.        br
+.      if !\n[doc-compact-list-stack\n[doc-list-depth]] \
 .        sp \n[doc-display-vertical]u
-.      \}
 .
 .      nf
 .      nr doc-num-columns 0
@@ -4015,10 +4011,8 @@
 .\" NS   doc-list-have-indent-stackXXX
 .
 .de doc-set-vertical-and-indent
-.  if !\n[doc-compact-list-stack\n[doc-list-depth]] \{\
-.    br
+.  if !\n[doc-compact-list-stack\n[doc-list-depth]] \
 .    sp \n[doc-display-vertical]u
-.  \}
 .
 .  if \n[doc-list-have-indent-stack\n[doc-list-depth]] \{\
 .    nr doc-list-have-indent-stack\n[doc-list-depth] 0
-- 
cgit v1.2.1