* tmac/doc.tmac (Bd): Change to doc-Li-font later.

* tmac/an-old.tmac [cR]: Redefine `bp' to avoid empty lines.

2 files changed, 17 insertions, 6 deletions

diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 063ebce5..72d6e3e8 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -77,9 +77,12 @@
 .if \n[an-html] .nr C 1
 .if r ps4html .nr C 1
 .
-.\" we redefine .ne to avoid page breaks; instead, the page length is
-.\" increased to the necessary amount (this is needed for tables)
-.if n \{\
+.\" we redefine .ne to avoid page breaks if cR is set; instead, the page
+.\" length is increased to the necessary amount (this is needed for tables)
+.\"
+.\" similarly, we redefine .bp if cR is set, adjusting the page length to
+.\" the current position so that no empty lines are inserted
+.if \n[cR] \{\
 .  de1 ne
 .    ie \\n[.$] \
 .      nr an-ne \\$*
@@ -88,6 +91,12 @@
 .    if (\\n[an-ne] >= \\n[.t]) \
 .      pl +(\\n[an-ne]u - \\n[.t]u + 1v)
 .  .
+.
+.  rn bp an-bp
+.  de1 bp
+.    pl \\n[nl]u
+.    an-bp
+.  .
 .\}
 .
 .de set-an-margin
diff --git a/tmac/doc.tmac b/tmac/doc.tmac
index 7f4090f7..059534cd 100644
--- a/tmac/doc.tmac
+++ b/tmac/doc.tmac
@@ -2696,10 +2696,8 @@
 .    nr doc-display-ft-stack\n[doc-display-depth] \n[.f]
 .    nr doc-display-ps-stack\n[doc-display-depth] \n[.ps]
 .
-.    ie t \{\
-.      nop \*[doc-Li-font]\c
+.    ie t \
 .      ta T 9n
-.    \}
 .    el \
 .      ta T 8n
 .    nf
@@ -2747,6 +2745,10 @@
 .  if !\n[doc-is-compact] \
 .    sp \n[doc-display-vertical]u
 .
+.  if "\*[doc-display-type-stack\n[doc-display-depth]]"literal" \
+.    if t \
+.      nop \*[doc-Li-font]\c
+.
 .  if !\n[cR] \
 .    ne 2v
 .