internal update

4 files changed, 44 insertions, 20 deletions

diff --git a/tmac/doc-common.new b/tmac/doc-common.new
index 0ad5a64c..5531d057 100755
--- a/tmac/doc-common.new
+++ b/tmac/doc-common.new
@@ -748,6 +748,8 @@
 .  while (\n[doc-reg-Rd] <= \n[doc-display-depth]) \{\
 .    tm doc-display-type-stack\n[doc-reg-Rd] == `\*[doc-display-type-stack\n[doc-reg-Rd]]'
 .    tm doc-display-indent-stack\n[doc-reg-Rd] == \n[doc-display-indent-stack\n[doc-reg-Rd]]
+.    tm doc-display-ad-stack\n[doc-reg-Rd] == \n[doc-display-ad-stack\n[doc-reg-Rd]]
+.    tm doc-display-fi-stack\n[doc-reg-Rd] == \n[doc-display-fi-stack\n[doc-reg-Rd]]
 .    nr doc-reg-Rd +1
 .  \}
 .
diff --git a/tmac/doc-ditroff.new b/tmac/doc-ditroff.new
index e43096a8..0eb9512a 100755
--- a/tmac/doc-ditroff.new
+++ b/tmac/doc-ditroff.new
@@ -90,7 +90,6 @@
 .nr doc-subheader-indent (\w\f[C],u * 5u)
 .nr doc-paragraph-space .5v
 .
-.ds doc-digit-string \0
 .nr doc-digit-width \w'\0'u
 .nr doc-fixed-width \w\f[C]0
 .
diff --git a/tmac/doc-nroff.new b/tmac/doc-nroff.new
index fe09f0e0..085b7c38 100755
--- a/tmac/doc-nroff.new
+++ b/tmac/doc-nroff.new
@@ -82,7 +82,6 @@
 .nr doc-paragraph-space 1v
 .
 .ec
-.ds doc-digit-string \0\0
 .nr doc-digit-width \w'\0\0'u
 .nr doc-fixed-width \w'0'
 .eo
diff --git a/tmac/tmac.doc.new b/tmac/tmac.doc.new
index fb49a65c..6fdae4ea 100755
--- a/tmac/tmac.doc.new
+++ b/tmac/tmac.doc.new
@@ -2947,7 +2947,9 @@
 .\" NS modifies:
 .\" NS   doc-curr-font
 .\" NS   doc-curr-size
-.\" NS   doc-display-depth,
+.\" NS   doc-display-depth
+.\" NS   doc-display-ad-stackXXX
+.\" NS   doc-display-fi-stackXXX
 .\" NS   doc-display-indent-stackXXX
 .\" NS   doc-display-type-stackXXX
 .\" NS   doc-is-compact
@@ -2991,6 +2993,11 @@
 .      na
 .      fi
 .    \}
+.    el \{ .ie "\$1"-centered" \{\
+.      ds doc-display-type-stack\n[doc-display-depth] centered
+.      ad c
+.      fi
+.    \}
 .    el \{ .ie "\$1"-unfilled" \{\
 .      ds doc-display-type-stack\n[doc-display-depth] unfilled
 .      nf
@@ -2998,7 +3005,7 @@
 .    el \{\
 .      tm mdoc warning: Unknown keyword `\$1' in .Bd request (#\n[.c])
 .      nr doc-reg-Bd 0
-.    \}\}\}\}
+.    \}\}\}\}\}
 .
 .    \" have we seen an argument?
 .    if \n[doc-reg-Bd] \{\
@@ -3029,7 +3036,7 @@
 .    nr doc-is-compact 0
 .  \}
 .  el \{\
-.    tm1 "Usage: .Bd [-literal | -filled | -ragged | -unfilled]
+.    tm1 "Usage: .Bd [-literal | -filled | -ragged | -centered | -unfilled]
 .    tm1 "           [-offset [string]] [-compact] (#\n[.c])
 .  \}
 ..
@@ -3653,8 +3660,8 @@
 .  while (\n[doc-reg-drgv] <= \n[doc-display-depth]) \{\
 .    ds doc-display-type-stack\n[doc-reg-drgv] "\*[doc-display-type-stack\n[doc-reg-drgv]-saved]
 .    nr doc-display-indent-stack\n[doc-reg-drgv] \n[doc-display-indent-stack\n[doc-reg-drgv]-saved]
-.    nr doc-display-ad-stack\n[doc-reg-dsgv] \n[doc-display-ad-stack\n[doc-reg-dsgv]-saved]
-.    nr doc-display-fi-stack\n[doc-reg-dsgv] \n[doc-display-fi-stack\n[doc-reg-dsgv]-saved]
+.    nr doc-display-ad-stack\n[doc-reg-drgv] \n[doc-display-ad-stack\n[doc-reg-drgv]-saved]
+.    nr doc-display-fi-stack\n[doc-reg-drgv] \n[doc-display-fi-stack\n[doc-reg-drgv]-saved]
 .    nr doc-reg-drgv +1
 .  \}
 .
@@ -4121,9 +4128,9 @@
 .  nop \*[doc-Sy-font]\c
 .  if \n[doc-num-args] \
 .    doc-remaining-args
-.  nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]]\*[doc-digit-string]\c
+.  nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]]\*[doc-hard-space]\c
 .
-.  doc-reset-args
+.  doc-print-and-reset
 '  fi
 ..
 .
@@ -4595,8 +4602,10 @@
 '  ta T .5i
 .  in +\n[doc-display-indent]u
 .
-.  ie \n[doc-arg-limit] \
+.  ie \n[doc-arg-limit] \{\
 .    tm Usage: .Dl not callable by other macros (#\n[.c])
+.    doc-reset-args
+.  \}
 .  el \{\
 .    ie \n[.$] \{\
 .      ds doc-macro-name Dl
@@ -4624,8 +4633,10 @@
 '  ta T .5i
 .  in +\n[doc-display-indent]u
 .
-.  ie \n[doc-arg-limit] \
+.  ie \n[doc-arg-limit] \{\
 .    tm Usage: .D1 not callable by other macros (#\n[.c])
+.    doc-reset-args
+.  \}
 .  el \{\
 .    ie \n[.$] \{\
 .      ds doc-macro-name D1
@@ -5171,16 +5182,20 @@
 .de Fc
 .  ie !\n[doc-in-func-enclosure] \
 .    tm mdoc warning: Extraneous .Fc (#\n[.c])
+.  el \{ .ie \n[doc-arg-limit] \{\
+.      tm Usage: .Fc is not callable (#\n[.c])
+.      doc-reset-args
+.  \}
 .  el \{\
+.    if \n[.$] \{\
+.      ds doc-macro-name Fc
+.      \" the first (dummy) argument is used to get the correct spacing
+.      doc-parse-args \) \$@
+.    \}
+.
 .    if !(\n[doc-saved-nesting-level] == \n[doc-nesting-level]) \
 .      tm mdoc warning: Unbalanced enclosure commands within .Fo/.Fc
 .
-.    if !\n[doc-arg-limit] \{\
-.      if \n[.$] \{\
-.        ds doc-macro-name Fc
-.        doc-parse-args \$@
-.    \}\}
-.
 .    nr doc-func-arg-count 0
 .    nr doc-in-func-enclosure 0
 .
@@ -5190,6 +5205,7 @@
 .    br
 .    ev
 .    box
+.    chop doc-func-box
 .    unformat doc-func-box
 .
 .    if \n[doc-in-synopsis-count] \{\
@@ -5198,12 +5214,20 @@
 .    \}
 .
 .    nh
-.    doc-func-box
-.    doc-reset-args
+.    nop \*[doc-func-box]\c
+.
+.    nr doc-arg-ptr +1
+.    ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.      nr doc-curr-font \n[.f]
+.      nr doc-curr-size \n[.s]
+.      doc-print-recursive
+.    \}
+.    el \
+.      doc-print-and-reset
 .
 .    if \n[doc-in-synopsis-count] \
 .      in -\n[doc-indent-synopsis]u
-.  \}
+.  \}\}
 ..
 .
 .