summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwlemb <wlemb>2001-08-14 14:48:12 +0000
committerwlemb <wlemb>2001-08-14 14:48:12 +0000
commit280c04dc2fbc77f607bbd8a30e7ce066105e8238 (patch)
tree23e58fffe8229ca3892f2cfe81bc6774473663a2
parent0493a12cbdb350cbabb9286d10e8e085d4b747b5 (diff)
downloadgroff-280c04dc2fbc77f607bbd8a30e7ce066105e8238.tar.gz
* tmac/doc.tmac (Rv): Implement support for 0 or more than 1
argument. * tmac/groff_tmac.man: Updated.
-rw-r--r--ChangeLog6
-rw-r--r--tmac/doc.tmac61
-rw-r--r--tmac/groff_mdoc.man2
3 files changed, 55 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a2ced7a..6ff0851d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-13 Ruslan Ermilov <ru@FreeBSD.org>
+
+ * tmac/doc.tmac (Rv): Implement support for 0 or more than 1
+ argument.
+ * tmac/groff_tmac.man: Updated.
+
2001-08-13 Werner LEMBERG <wl@gnu.org>
* src/preproc/tbl/tbl.man: Minor documentation update.
diff --git a/tmac/doc.tmac b/tmac/doc.tmac
index 5b8ec418..db8029f2 100644
--- a/tmac/doc.tmac
+++ b/tmac/doc.tmac
@@ -6124,14 +6124,30 @@
.\" NS width register `Rv' set in doc-common
.\" NS
.\" NS local variables:
-.\" NS doc-str-Rv-prefix
-.\" NS doc-str-Rv-suffix
-.
-.ds doc-str-Rv-prefix "The
-.ds doc-str-Rv-suffix "function returns the value\~0 if successful;
-.as doc-str-Rv-suffix " otherwise the value\~-1 is returned and
-.as doc-str-Rv-suffix " the global variable \*[doc-Va-font]errno\f[P]
-.as doc-str-Rv-suffix " is set to indicate the error.
+.\" NS doc-str-Rv-std-prefix
+.\" NS doc-str-Rv-std-suffix
+.\" NS doc-str-Rv-stds-prefix
+.\" NS doc-str-Rv-stds-and
+.\" NS doc-str-Rv-stds-suffix
+.\" NS doc-str-Rv-std0
+.
+.ds doc-str-Rv-std-prefix "The
+.ds doc-str-Rv-std-suffix "function returns the value\~0 if successful;
+.as doc-str-Rv-std-suffix " otherwise the value\~-1 is returned and
+.as doc-str-Rv-std-suffix " the global variable \*[doc-Va-font]errno\f[P]
+.as doc-str-Rv-std-suffix " is set to indicate the error.
+.
+.ds doc-str-Rv-stds-prefix "The
+.ds doc-str-Rv-stds-and "and
+.ds doc-str-Rv-stds-suffix "functions return the value\~0 if successful;
+.as doc-str-Rv-stds-suffix " otherwise the value\~-1 is returned and
+.as doc-str-Rv-stds-suffix " the global variable \*[doc-Va-font]errno\f[P]
+.as doc-str-Rv-stds-suffix " is set to indicate the error.
+.
+.ds doc-str-Rv-std0 "Upon successful completion, the value\~0 is returned;
+.as doc-str-Rv-std0 " otherwise the value\~-1 is returned and
+.as doc-str-Rv-std0 " the global variable \*[doc-Va-font]errno\f[P]
+.as doc-str-Rv-std0 " is set to indicate the error.
.
.de Rv
.
@@ -6144,7 +6160,7 @@
. \}
.
. if !\n[.$] \{\
-. tm Usage: .Rv [-std] <function> (#\n[.c])
+. tm Usage: .Rv [-std] [<function> ...] (#\n[.c])
. return
. \}
.
@@ -6153,10 +6169,29 @@
. if ((\n[doc-reg-Rv] < 2) : (\n[doc-reg-Rv] > 3)) \
. tm Usage: .Rv -std in sections 2 and 3 only (#\n[.c])
. br
-. nop \)\*[doc-str-Rv-prefix]
-. Fn \$2
-. nop \)\*[doc-str-Rv-suffix]
-. \}
+. shift
+. ie (\n[.$] > 1) \{\
+. nop \)\*[doc-str-Rv-stds-prefix]
+. nr doc-reg-Rv 1
+. while (\n[doc-reg-Rv] < \n[.$]) \{\
+. ie (\n[.$] > 2) \
+. Fn \$\n[doc-reg-Rv] ,
+. el \
+. Fn \$\n[doc-reg-Rv]
+. nr doc-reg-Rv +1
+. \}
+. nop \)\*[doc-str-Rv-stds-and]
+. Fn \$\n[.$]
+. nop \)\*[doc-str-Rv-stds-suffix]
+. \}
+. el \{ .ie (\n[.$] == 1) \{\
+. nop \)\*[doc-str-Rv-std-prefix]
+. Fn \$1
+. nop \)\*[doc-str-Rv-std-suffix]
+. \}
+. el \{\
+. nop \)\*[doc-str-Rv-std0]
+. \}\}\}
..
.
.
diff --git a/tmac/groff_mdoc.man b/tmac/groff_mdoc.man
index b4182d11..17ef3d61 100644
--- a/tmac/groff_mdoc.man
+++ b/tmac/groff_mdoc.man
@@ -1515,7 +1515,7 @@ macro generates text for use in the
.Sx RETURN VALUES
section.
.Pp
-.Dl Usage: .Rv Oo -std Oc Ao function Ac
+.Dl Usage: .Rv Oo -std Oc Op Ao function Ac ...
.Pp
For example,
.Ql ".Rv -std atexit"