gbranden pushed a commit to branch master
in repository groff.
commit 852111fc657a98a15dd529579b9c76847d4d0af8
Author: G. Branden Robinson <[email protected]>
AuthorDate: Mon Jun 10 07:31:42 2024 -0500
[mm]: Align memorandum captions with DWB 3.3 mm.
* contrib/mm/mm/0.MT: Align memorandum captions with DWB 3.3 mm.
* contrib/mm/groff_mm.7.man <MT>: Document this. Also fix error;
omitting the argument implies memorandum type 1, not 0.
* contrib/mm/tests/cover-page-info-is-present.sh: Update test
expectations.
---
contrib/mm/ChangeLog | 7 +++++++
contrib/mm/groff_mm.7.man | 16 +++++++++-------
contrib/mm/mm/0.MT | 9 +++++----
contrib/mm/tests/cover-page-info-is-present.sh | 2 +-
4 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 946f7e3dc..4481ce9e1 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,10 @@
+2024-06-10 G. Branden Robinson <[email protected]>
+
+ * mm/0.MT: Align memorandum captions with DWB 3.3 mm.
+ * groff_mm.7.man <MT>: Document this. Also fix error; omitting
+ the argument implies memorandum type 1, not 0.
+ * tests/cover-page-info-is-present.sh: Update test expectations.
+
2024-06-10 G. Branden Robinson <[email protected]>
* m.tmac (AF): Drop unnecessary macro call. `AU` performs the
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.7.man
index beaa51bcd..54476e362 100644
--- a/contrib/mm/groff_mm.7.man
+++ b/contrib/mm/groff_mm.7.man
@@ -2763,11 +2763,10 @@ any other value of
.I type
is mapped to type\~6.
.
-If
+Omitting
.I type
-is omitted,
-.B 0
-is implied.
+implies
+.BR 1 .
.
.I addressee
sets a string analogous to one used by AT&T cover sheet macros that are
@@ -2782,11 +2781,14 @@ Lf(BI) Lb
L L.
type@Description
0@normal memorandum; no caption
-1@captioned \[lq]MEMORANDUM FOR FILE\[rq]
-2@captioned \[lq]PROGRAMMER'S NOTES\[rq]
-3@captioned \[lq]ENGINEER'S NOTES\[rq]
+1@captioned \[lq]TECHNICAL MEMORANDUM\[rq]
+2@captioned \[lq]INTERNAL MEMORANDUM\[rq]
+3@captioned \[lq]ADMINISTRATIVE MEMORANDUM\[rq]
4@released paper
5@external letter
+.T&
+LI L.
+string@captioned \fIstring\fP
.TE
.
.
diff --git a/contrib/mm/mm/0.MT b/contrib/mm/mm/0.MT
index 5dc19c22a..c8e719aab 100644
--- a/contrib/mm/mm/0.MT
+++ b/contrib/mm/mm/0.MT
@@ -141,10 +141,11 @@ TM
.\}
..
.\"-----------------
-.ds cov*mt0-txt!1 MEMORANDUM FOR FILE
-.ds cov*mt0-txt!2 PROGRAMMER'S NOTES
-.ds cov*mt0-txt!3 ENGINEER'S NOTES
-.if d cov*default-firm .if !d cov*firm .ds cov*firm \\*[cov*default-firm]
+.ds cov*mt0-txt!1 TECHNICAL MEMORANDUM\"
+.ds cov*mt0-txt!2 INTERNAL MEMORANDUM\"
+.ds cov*mt0-txt!3 ADMINISTRATIVE MEMORANDUM\"
+.if d cov*default-firm \
+. if !d cov*firm .ds cov*firm \\*[cov*default-firm]\"
.\"
.\" Note: The firm name (if any) is formatted _above_ the title and
.\" other data, but the `AF` macro call defining it might be stuffed
diff --git a/contrib/mm/tests/cover-page-info-is-present.sh
b/contrib/mm/tests/cover-page-info-is-present.sh
index 0748c2915..b5bc9de03 100755
--- a/contrib/mm/tests/cover-page-info-is-present.sh
+++ b/contrib/mm/tests/cover-page-info-is-present.sh
@@ -77,7 +77,7 @@ echo "checking for abstract content" >&2
echo "$output" | grep -q leverage || wail
echo "checking for memorandum type notation" >&2
-echo "$output" | grep -iq 'memorandum for file' || wail
+echo "$output" | grep -iq 'technical memorandum' || wail
test -z "$fail"
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
