summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwlemb <wlemb>2001-02-19 00:32:14 +0000
committerwlemb <wlemb>2001-02-19 00:32:14 +0000
commit214d64beb0c65b2c5608385d0ecb471e7092f6d5 (patch)
tree8baa5bae92c7255e1b91148bbf2323b54259fc57
parentb9b46794ca34808e49986987a79c66429d66317b (diff)
downloadgroff-214d64beb0c65b2c5608385d0ecb471e7092f6d5.tar.gz
internal update
-rwxr-xr-xtmac/doc-common.new2
-rwxr-xr-xtmac/doc-ditroff.new2
-rwxr-xr-xtmac/doc-syms.new2
-rwxr-xr-xtmac/tmac.doc.new17
4 files changed, 14 insertions, 9 deletions
diff --git a/tmac/doc-common.new b/tmac/doc-common.new
index e93db290..1974ceac 100755
--- a/tmac/doc-common.new
+++ b/tmac/doc-common.new
@@ -759,7 +759,7 @@
. if t \{\
. nr doc-reg-Sh \n[.ss]
. nr doc-reg-Sh1 \n[.sss]
-. ss (\n[.ss] * 5 / 4) (\n[.sss] * 5 / 4)
+. ss (\n[.ss] * 5 / 3) (\n[.sss] * 5 / 3)
. \}
.
. nr doc-arg-ptr +1
diff --git a/tmac/doc-ditroff.new b/tmac/doc-ditroff.new
index ae4fef63..7d3fda22 100755
--- a/tmac/doc-ditroff.new
+++ b/tmac/doc-ditroff.new
@@ -179,7 +179,7 @@
.de doc-setup-header
. ds doc-header-string "\*[doc-document-title]
. if !"\*[doc-section]"Null" \
-. as doc-header-string \|(\|\*[doc-section]\|)
+. as doc-header-string \|(\*[doc-section])
.
. wh 0 doc-header
. wh -1.25i doc-footer
diff --git a/tmac/doc-syms.new b/tmac/doc-syms.new
index 291d043c..bc1d320c 100755
--- a/tmac/doc-syms.new
+++ b/tmac/doc-syms.new
@@ -53,7 +53,7 @@
. \}
.
. \" replace current argument with result
-. ds doc-arg\n[doc-arg-ptr] \&.\|.\|.\&
+. ds doc-arg\n[doc-arg-ptr] \|.\|.\|.\&
. nr doc-type\n[doc-arg-ptr] 2
. ds doc-space\n[doc-arg-ptr] "\*[doc-space]
.
diff --git a/tmac/tmac.doc.new b/tmac/tmac.doc.new
index 534af492..26e9e539 100755
--- a/tmac/tmac.doc.new
+++ b/tmac/tmac.doc.new
@@ -3059,7 +3059,7 @@
. nr doc-is-compact 0
. \}
. el \{\
-. tm1 "Usage: .Bd [-literal | -filled | -ragged | -centered | -unfilled]
+. tm1 "Usage: .Bd {-literal | -filled | -ragged | -centered | -unfilled}
. tm1 " [-offset [string]] [-compact] (#\n[.c])
. \}
..
@@ -3326,11 +3326,12 @@
.\" NS doc-Bl-usage macro
.
.de doc-Bl-usage
-. tm1 "Usage: .Bl [-hang | -ohang | -tag | -diag | -inset]
-. tm1 " [-width [string]] [-offset [string]] [-compact]
-. tm1 " .Bl [-column] [-offset [string]] [string1] [string2] ...
-. tm1 " .Bl [-item | -enum [-nested] | -bullet | -hyphen | -dash]
-. tm1 " [-offset [string]] [-compact] (#\n[.c])
+. tm1 "Usage: .Bl {-hang | -ohang | -tag | -diag | -inset}
+. tm1 " [-width <string>] [-xwidth <command>]
+. tm1 " [-offset <string>] [-compact]
+. tm1 " .Bl -column [-offset <string>] <string1> <string2> ...
+. tm1 " .Bl {-item | -enum [-nested] | -bullet | -hyphen | -dash}
+. tm1 " [-offset <string>] [-compact] (#\n[.c])
..
.
.
@@ -3372,6 +3373,7 @@
.
. ie "\*[doc-arg\n[doc-arg-ptr]]"-compact" \
. nr doc-compact-list-stack\n[doc-list-depth] 1
+.
. el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-nested" \{\
. ie (\n[doc-list-depth] > 1) \{\
. nr doc-reg-dBla1 (\n[doc-list-depth] - 1)
@@ -3383,6 +3385,7 @@
. el \
. tm mdoc warning: `-nested' allowed with nested .Bl requests only (#\n[.c])
. \}
+.
. el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-width" \{\
. nr doc-arg-ptr +1
. \" XXX: this code should be modified to handle nested lists
@@ -3431,6 +3434,7 @@
. el \
. nr doc-list-indent-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u)
. \}\}
+.
. el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-xwidth" \{\
. nr doc-arg-ptr +1
. \" XXX: this code should be modified to handle nested lists
@@ -3459,6 +3463,7 @@
. \}
. nr doc-list-indent-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u)
. \}
+.
. el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-offset" \{\
. nr doc-arg-ptr +1
.