internal update

2 files changed, 49 insertions, 5 deletions

diff --git a/tmac/groff_mdoc.reference.man b/tmac/groff_mdoc.reference.man
index b020a99c..aea76027 100755
--- a/tmac/groff_mdoc.reference.man
+++ b/tmac/groff_mdoc.reference.man
@@ -3198,7 +3198,7 @@ A list with hanging tags.
 labels appear similar to tagged lists when the
 label is smaller than the label width.
 .It Em Longer hanged list labels
-blend in to the paragraph unlike
+blend into the paragraph unlike
 tagged paragraph labels.
 .El
 .Pp
@@ -3210,7 +3210,7 @@ And the unformatted text which created it:
 labels appear similar to tagged lists when the
 label is smaller than the label width.
 \&.It Em Longer hanged list labels
-blend in to the paragraph unlike
+blend into the paragraph unlike
 tagged paragraph labels.
 \&.El
 .Ed
diff --git a/tmac/tmac.doc.new b/tmac/tmac.doc.new
index c171f8d7..635410df 100755
--- a/tmac/tmac.doc.new
+++ b/tmac/tmac.doc.new
@@ -2878,6 +2878,11 @@
 .\" NS
 .\" NS local variables:
 .\" NS   doc-reg-ddBa
+.\" NS   doc-reg-ddBa1
+.\" NS   doc-reg-ddBa2
+.\" NS   doc-reg-ddBa3
+.\" NS   doc-reg-ddBa4
+.\" NS   doc-str-ddBa
 .
 .de doc-do-Bd-args
 .  nr doc-reg-ddBa 1
@@ -2902,8 +2907,31 @@
 .    \" not a known keyword
 .    if (\n[doc-reg-ddBa] == 1) \{\
 .      nr doc-reg-ddBa 2
-.      \" test whether argument is a valid numeric expression
-.      ie \B\$2 \
+.
+.      nr doc-reg-ddBa1 0
+.      if \B(\$2) \{\
+.        \" disable warnings related to scaling indicators (32)
+.        nr doc-reg-ddBa2 \n[.warn]
+.        warn (\n[.warn] - (\n[.warn] / 32 % 2 * 32))
+.
+.        \" values without a scaling indicator are taken as strings;
+.        \" we test whether the parameter string with and without the last
+.        \" character yields identical numerical results (ignoring the
+.        \" scaling indicator)
+.        ds doc-str-ddBa "\$2
+.        substring doc-str-ddBa 1 -1
+.        if \B(\*[doc-str-ddBa]) \{\
+.          nr doc-reg-ddBa3 (;(\$2))
+.          nr doc-reg-ddBa4 (\*[doc-str-ddBa])
+.          if (\n[doc-reg-ddBa3] == \n[doc-reg-ddBa4]) \
+.            nr doc-reg-ddBa1 1
+.        \}
+.
+.        \" enable all warnings again
+.        warn \n[doc-reg-ddBa2]
+.      \}
+.
+.      ie \n[doc-reg-ddBa1] \
 .        nr doc-display-indent-stack\n[doc-display-depth] \$2
 .      el \{\
 .        doc-get-width "\$2"
@@ -3262,8 +3290,24 @@
 .        nr doc-list-offset-stack\n[doc-list-depth] \n[doc-display-indent]u
 .      el \{\
 .        ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]]
+.        nr doc-reg-dBla1 0
+.        if \B(\*[doc-str-dBla]) \{\
+.          nr doc-reg-dBla2 \n[.warn]
+.          warn (\n[.warn] - (\n[.warn] / 32 % 2 * 32))
+.
+.          ds doc-str-dBla1 "\*[doc-str-dBla]
+.          substring doc-str-dBla1 1 -1
+.          if \B(\*[doc-str-dBla1]) \{\
+.            nr doc-reg-dBla3 (;(\*[doc-str-dBla]))
+.            nr doc-reg-dBla4 (\*[doc-str-dBla1])
+.            if (\n[doc-reg-dBla3] == \n[doc-reg-dBla4]) \
+.              nr doc-reg-dBla1 1
+.          \}
+.
+.          warn \n[doc-reg-dBla2]
+.        \}
 .
-.        ie \B\*[doc-str-dBla] \
+.        ie \n[doc-reg-dBla1] \
 .          nr doc-list-offset-stack\n[doc-list-depth] \*[doc-str-dBla]
 .        el \{\
 .          doc-get-arg-width \n[doc-arg-ptr]