summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwlemb <wlemb>2003-07-05 08:27:38 +0000
committerwlemb <wlemb>2003-07-05 08:27:38 +0000
commita68cafe64305eba528186b1c6d59a77e34b9fa05 (patch)
tree028e4ac96049f2f2093b8120800a0f035f162adb
parenta344b42475b6763a4af5b1f376c2ce0895c22e13 (diff)
downloadgroff-a68cafe64305eba528186b1c6d59a77e34b9fa05.tar.gz
* tmac/doc.tmac (Bd): Change to doc-Li-font later.
* tmac/an-old.tmac [cR]: Redefine `bp' to avoid empty lines.
-rw-r--r--ChangeLog8
-rw-r--r--doc/groff.texinfo3
-rw-r--r--tmac/an-old.tmac15
-rw-r--r--tmac/doc.tmac8
4 files changed, 28 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 06cbfa45..021a4199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-04 Ruslan Ermilov <ru@FreeBSD.org>
+
+ * tmac/doc.tmac (Bd): Change to doc-Li-font later.
+
+2003-07-03 Werner LEMBERG <wl@gnu.org>
+
+ * tmac/an-old.tmac [cR]: Redefine `bp' to avoid empty lines.
+
2003-07-01 Ruslan Ermilov <ru@FreeBSD.org>
* tmac/doc.tmac (doc-do-func, doc-do-func-args): Don't print a comma
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index ec30a5bb..834692dd 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -8104,6 +8104,9 @@ them.
@endDefreq
@Defreg {nl}
+@cindex current vertical position (@code{nl})
+@cindex vertical position, current (@code{nl})
+@cindex position, vertical, current (@code{nl})
This register contains the current vertical position. If the vertical
position is zero and the top of page transition hasn't happened yet,
@code{nl} is set to negative value. @code{gtroff} itself does this at
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
.