gbranden pushed a commit to branch master
in repository groff.
commit 391373f8dc059c03ca6e1362de2efb1c31d29259
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed May 7 07:05:38 2025 -0500
[mdoc]: Revise font customization feature.
groff's mdoc(7) package now expects the strings that designate font
names to be precisely that: font _names_ (or abstract styles, or
mounting positions), rather than arbitrary *roff syntax. This
undocumented customization feature is analogous to one in 4.4BSD mdoc(7)
but has no counterpart in mandoc(1).
This change also makes groff mdoc's (complex) internal logic easier to
follow in the `Nm`, `Pa`, `doc-bullet-list`, `doc-dash-list`, `Xr`,
`Ot`, `doc-do-func`, `Fn`, `Fo`, `Rv`, `doc-header`, and `doc-footer`
macro definitions.
* tmac/mdoc/doc-ditroff:
* tmac/mdoc/doc-nroff: Update default definitions of `doc-*-font`
strings to omit font selection escape sequence, leaving only font
names or string interpolations like `\*[MF]` and `\*[HF]` that are
themselves specified as naming fonts.
* tmac/doc.tmac (Fl, doc-generic-macro, Ar, Cd, Fd, In, Nm, Pa)
(Tn, Bf, Bd, doc-bullet-list, doc-dash-list, doc-diag-list, Xr)
(Vt, Ft, Ot, Fa, doc-do-func, Fn, Fo, %B, %I, %J, %T, Rv, Mt)
(Lk):
* tmac/mdoc/doc-common (doc-header, doc-footer, Sh, Ss):
* tmac/mdoc/doc-nroff (Dl): Bracket interpolations of `doc-*-font`
strings with font selection escape sequence syntax.
* NEWS: Add item warning of incompatible change.
---
ChangeLog | 31 ++++++++++++++++
NEWS | 7 ++++
tmac/doc.tmac | 100 +++++++++++++++++++++++++-------------------------
tmac/mdoc/doc-common | 26 ++++++-------
tmac/mdoc/doc-ditroff | 54 +++++++++++++--------------
tmac/mdoc/doc-nroff | 56 ++++++++++++++--------------
6 files changed, 156 insertions(+), 118 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7ced61c14..264b76d09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2025-05-07 G. Branden Robinson <[email protected]>
+
+ [mdoc]: Revise font customization feature.
+
+ groff's mdoc(7) package now expects the strings that designate
+ font names to be precisely that: font _names_ (or abstract
+ styles, or mounting positions), rather than arbitrary *roff
+ syntax. This undocumented customization feature is analogous to
+ one in 4.4BSD mdoc(7) but has no counterpart in mandoc(1).
+
+ This change also makes groff mdoc's (complex) internal logic
+ easier to follow in the `Nm`, `Pa`, `doc-bullet-list`,
+ `doc-dash-list`, `Xr`, `Ot`, `doc-do-func`, `Fn`, `Fo`, `Rv`,
+ `doc-header`, and `doc-footer` macro definitions.
+
+ * tmac/mdoc/doc-ditroff:
+ * tmac/mdoc/doc-nroff: Update default definitions of
+ `doc-*-font` strings to omit font selection escape sequence,
+ leaving only font names or string interpolations like `\*[MF]`
+ and `\*[HF]` that are themselves specified as naming fonts.
+
+ * tmac/doc.tmac (Fl, doc-generic-macro, Ar, Cd, Fd, In, Nm, Pa)
+ (Tn, Bf, Bd, doc-bullet-list, doc-dash-list, doc-diag-list, Xr)
+ (Vt, Ft, Ot, Fa, doc-do-func, Fn, Fo, %B, %I, %J, %T, Rv, Mt)
+ (Lk):
+ * tmac/mdoc/doc-common (doc-header, doc-footer, Sh, Ss):
+ * tmac/mdoc/doc-nroff (Dl): Bracket interpolations of
+ `doc-*-font` strings with font selection escape sequence syntax.
+
+ * NEWS: Add item warning of incompatible change.
+
2025-05-04 G. Branden Robinson <[email protected]>
[troff]: Implement new `pftr` request.
diff --git a/NEWS b/NEWS
index a5f448312..fede936aa 100644
--- a/NEWS
+++ b/NEWS
@@ -56,6 +56,13 @@ Noteworthy incompatible changes
to tell the formatter to read a file named '"5150".lrc', where the
neutral single quotes bracket the file name.
+* groff mdoc(7)'s font customization feature, undocumented but analogous
+ to that of 4.4BSD mdoc, now expects the strings that designate font
+ names to be precisely that: font _names_ (or abstract styles, or
+ mounting positions), rather than arbitrary *roff syntax. (String
+ interpolations remain acceptable, as long as what they interpolate is
+ a valid argument to the `\f[xxx]` escape sequence.)
+
troff
-----
diff --git a/tmac/doc.tmac b/tmac/doc.tmac
index 9f0973e5c..81a6f6441 100644
--- a/tmac/doc.tmac
+++ b/tmac/doc.tmac
@@ -3,7 +3,7 @@
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
-.\" Copyright (C) 2001-2024 Free Software Foundation, Inc.
+.\" Copyright (C) 2001-2025 Free Software Foundation, Inc.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -593,7 +593,7 @@
.eo
.de Fl
. nr doc-curr-font \n[.f]
-. nop \*[doc-Fl-font]\c
+. nop \f[\*[doc-Fl-font]]\c
.
. if !\n[doc-arg-count] \{\
. ds doc-macro-name Fl
@@ -809,7 +809,7 @@
. \}
.\" el \{\
. nr doc-curr-font \n[.f]
-. nop \*[doc-\$0-font]\c
+. nop \f[\*[doc-\$0-font]]\c
. doc-print-recursive
.\" \}
. \}
@@ -839,7 +839,7 @@
.eo
.de Ar
. nr doc-curr-font \n[.f]
-. nop \*[doc-Ar-font]\c
+. nop \f[\*[doc-Ar-font]]\c
.
. if !\n[doc-arg-count] \{\
. ds doc-macro-name Ar
@@ -938,17 +938,17 @@
. if !\n[doc-indent-synopsis-active] \
. in +\n[doc-indent-synopsis]u
. ti -\n[doc-indent-synopsis]u
-. nop \*[doc-Nm-font]\c
+. nop \f[\*[doc-Nm-font]]\c
. doc-print-recursive
. if !\n[doc-indent-synopsis-active] \
. in -\n[doc-indent-synopsis]u
. \}
. el \{\
-. nop \*[doc-Nm-font]\c
+. nop \f[\*[doc-Nm-font]]\c
. doc-print-recursive
. \}\}
. el \{\
-. nop \*[doc-Nm-font]\c
+. nop \f[\*[doc-Nm-font]]\c
. doc-print-recursive
. \}\}
. el \{\
@@ -1061,7 +1061,7 @@
.de Fd
. ie ((\n[.$] >= 1) & (\n[doc-arg-count] == 0)) \{\
. doc-do-func-decl
-. nop \*[doc-Fd-font]\$*
+. nop \f[\*[doc-Fd-font]]\$*
. br
. ft \n[doc-curr-font]
. \}
@@ -1109,7 +1109,7 @@
. ie \n[doc-in-synopsis-section] \{\
. ie "\*[doc-macro-name]"In" \{\
. doc-do-func-decl
-. nop \*[doc-Fd-font]#include <\*[doc-arg\n[doc-arg-ptr]]>
+. nop \f[\*[doc-Fd-font]]#include <\*[doc-arg\n[doc-arg-ptr]]>
. ft \n[doc-curr-font]
. br
. nr doc-arg-ptr +1
@@ -1119,12 +1119,12 @@
. doc-reset-args
. \}
. el \{\
-. ds doc-arg\n[doc-arg-ptr] "<\*[doc-Pa-font]\*[doc-arg\n[doc-arg-ptr]]
+. ds doc-arg\n[doc-arg-ptr]
"<\f[\*[doc-Pa-font]]\*[doc-arg\n[doc-arg-ptr]]
. as doc-arg\n[doc-arg-ptr] \f[\n[doc-curr-font]]>
. doc-print-recursive
. \}\}
. el \{\
-. ds doc-arg\n[doc-arg-ptr] "<\*[doc-Pa-font]\*[doc-arg\n[doc-arg-ptr]]
+. ds doc-arg\n[doc-arg-ptr]
"<\f[\*[doc-Pa-font]]\*[doc-arg\n[doc-arg-ptr]]
. as doc-arg\n[doc-arg-ptr] \f[\n[doc-curr-font]]>
. doc-print-recursive
. \}\}
@@ -1228,7 +1228,7 @@
. doc-reset-args
. \}
. el \{\
-. nop \*[doc-Nm-font]\*[doc-topic-name]\f[]\c
+. nop \f[\*[doc-Nm-font]]\*[doc-topic-name]\f[]\c
. doc-print-and-reset
. \}\}
. el \{\
@@ -1240,7 +1240,7 @@
. el \{\
. \" replace previous argument (Nm) with default value
. nr doc-arg-ptr -1
-. ds doc-arg\n[doc-arg-ptr] "\*[doc-Nm-font]\*[doc-topic-name]\f[]
+. ds doc-arg\n[doc-arg-ptr] "\f[\*[doc-Nm-font]]\*[doc-topic-name]\f[]
. nr doc-type\n[doc-arg-ptr] 2
. ds doc-space\n[doc-arg-ptr] "\*[doc-space]
.
@@ -1265,7 +1265,7 @@
. ti -\n[doc-indent-synopsis]u
. \}\}
.
-. nop \*[doc-Nm-font]\c
+. nop \f[\*[doc-Nm-font]]\c
. \}
. doc-print-recursive
. \}
@@ -1291,7 +1291,7 @@
.
. \" default value
. if !\n[.$] \
-. nop \*[doc-Pa-font]\[ti]\f[]
+. nop \f[\*[doc-Pa-font]]\[ti]\f[]
. \}
.
. if !\n[doc-arg-count] \
@@ -1301,7 +1301,7 @@
. doc-print-prefixes
. ie (\n[doc-arg-count] >= \n[doc-arg-ptr]) \{\
. nr doc-curr-font \n[.f]
-. nop \*[doc-Pa-font]\c
+. nop \f[\*[doc-Pa-font]]\c
. if !(\n[doc-type\n[doc-arg-ptr]] == 2) \{\
. \" replace previous argument (Pa) with default value
. nr doc-arg-ptr -1
@@ -1317,7 +1317,7 @@
. doc-print-recursive
. \}
. el \{\
-. nop \*[doc-Pa-font]\[ti]\f[]\c
+. nop \f[\*[doc-Pa-font]]\[ti]\f[]\c
. doc-print-and-reset
. \}
..
@@ -1371,7 +1371,7 @@
. nr doc-curr-font \n[.f]
. nop \)\c
. ie !\n[doc-is-reference] \{\
-. nop \)\*[doc-Tn-font]\c
+. nop \)\f[\*[doc-Tn-font]]\c
. doc-print-recursive
. \}
. el \
@@ -2834,17 +2834,17 @@
. nr doc-fontmode-size-stack\n[doc-fontmode-depth] \n[.ps]
.
. ie "\$1"Em" \
-. nop \*[doc-Em-font]\c
+. nop \f[\*[doc-Em-font]]\c
. el \{ .ie "\$1"Li" \
-. nop \*[doc-Li-font]\c
+. nop \f[\*[doc-Li-font]]\c
. el \{ .ie "\$1"Sy" \
-. nop \*[doc-Sy-font]\c
+. nop \f[\*[doc-Sy-font]]\c
. el \{ .ie "\$1"-emphasis" \
-. nop \*[doc-Em-font]\c
+. nop \f[\*[doc-Em-font]]\c
. el \{ .ie "\$1"-literal" \
-. nop \*[doc-Li-font]\c
+. nop \f[\*[doc-Li-font]]\c
. el \{ .ie "\$1"-symbolic" \
-. nop \*[doc-Sy-font]\c
+. nop \f[\*[doc-Sy-font]]\c
. el \{\
. doc-warn unknown keyword '\$1' in .Bf macro
. \}\}\}\}\}\}\}
@@ -3143,7 +3143,7 @@ macro
.\"
.\" if "\*[doc-display-type-stack\n[doc-display-depth]]"literal" \
.\" if t \
-.\" nop \*[doc-Li-font]\c
+.\" nop \f[\*[doc-Li-font]]\c
.
. if !\n[cR] \
. ne 2v
@@ -4301,7 +4301,7 @@ arguments
.eo
.de doc-bullet-list
. nr doc-in-list 1
-. nop \)\*[doc-Sy-font]\[bu]\f[]
+. nop \)\f[\*[doc-Sy-font]]\[bu]\f[]
. doc-do-list
..
.ec
@@ -4316,7 +4316,7 @@ arguments
.eo
.de doc-dash-list
. nr doc-in-list 1
-. nop \)\*[doc-Sy-font]\-\f[]
+. nop \)\f[\*[doc-Sy-font]]\-\f[]
. doc-do-list
..
.ec
@@ -4356,7 +4356,7 @@ arguments
. nr doc-diag-list-input-line-count \n[.c]
.
. nh
-. nop \*[doc-Sy-font]\c
+. nop \f[\*[doc-Sy-font]]\c
. if \n[doc-num-args] \
. doc-remaining-args
. nop \f[\n[doc-curr-font]]\*[doc-hard-space]\c
@@ -4716,7 +4716,7 @@ arguments
. \" The first argument is a man page identifier.
. nr doc-arg-ptr +1
. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
-. ds doc-visible-target-Xr "\*[doc-Xr-font]\*[doc-arg\n[doc-arg-ptr]]\f[]
+. ds doc-visible-target-Xr
"\f[\*[doc-Xr-font]]\*[doc-arg\n[doc-arg-ptr]]\f[]
. ds doc-target-identifier-Xr \*[doc-arg\n[doc-arg-ptr]]
. ds doc-target-section-Xr \" empty
. \}
@@ -5040,7 +5040,7 @@ arguments
. \}
.
. nr doc-curr-font \n[.f]
-. nop \*[doc-Ft-font]\c
+. nop \f[\*[doc-Ft-font]]\c
. doc-print-recursive
.
. if \n[doc-in-synopsis-section] \{\
@@ -5108,7 +5108,7 @@ arguments
. \}
.
. nr doc-curr-font \n[.f]
-. nop \*[doc-Ft-font]\c
+. nop \f[\*[doc-Ft-font]]\c
. doc-print-recursive
..
.ec
@@ -5151,7 +5151,7 @@ arguments
. \}
.
. if \n[.$] \
-. nop \*[doc-Ft-font]\$*\c
+. nop \f[\*[doc-Ft-font]]\$*\c
. nop \ \f[]\c
..
.ec
@@ -5184,7 +5184,7 @@ arguments
. nr doc-arg-ptr +1
. if (\n[doc-arg-count] >= \n[doc-arg-ptr]) \{\
. nr doc-curr-font \n[.f]
-. nop \*[doc-Fa-font]\c
+. nop \f[\*[doc-Fa-font]]\c
. doc-print-recursive
.
. if \n[doc-in-synopsis-section] \
@@ -5252,12 +5252,12 @@ arguments
. if !"\*[doc-arg\n[doc-arg-ptr]]"/*" \
. if !"\*[doc-arg\n[doc-arg-ptr]]"*/" \
. nop ,\)\c
-. nop \)\*[doc-space\n[doc-arg-ptr]]\*[doc-Fa-font]\c
+. nop \)\*[doc-space\n[doc-arg-ptr]]\f[\*[doc-Fa-font]]\c
. nop \)\*[doc-arg\n[doc-arg-ptr]]\f[]\c
. \}
.
. if (\n[doc-func-arg-count] == 1) \{\
-. nop \)\*[doc-Fa-font]\*[doc-arg\n[doc-arg-ptr]]\c
+. nop \)\f[\*[doc-Fa-font]]\*[doc-arg\n[doc-arg-ptr]]\c
. nop \f[]\c
. \}
. nr doc-func-arg-count +1
@@ -5346,13 +5346,13 @@ arguments
. \}
.
. nr doc-curr-font \n[.f]
-. nop \*[doc-Fn-font]\*[doc-arg\n[doc-arg-ptr]]\c
+. nop \f[\*[doc-Fn-font]]\*[doc-arg\n[doc-arg-ptr]]\c
. nop \f[]\*[lp]\)\c
.
. nr doc-arg-ptr +1
. if (\n[doc-arg-count] >= \n[doc-arg-ptr]) \{\
. if (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
-. nop \*[doc-Fa-font]\c
+. nop \f[\*[doc-Fa-font]]\c
. doc-do-func-args
. nop \f[\n[doc-curr-font]]\c
. \}\}
@@ -5514,7 +5514,7 @@ arguments
. nr doc-func-arg-count 1
. nr doc-curr-font \n[.f]
.
-. nop \*[doc-Fn-font]\*[doc-arg\n[doc-arg-ptr]]\c
+. nop \f[\*[doc-Fn-font]]\*[doc-arg\n[doc-arg-ptr]]\c
. nop \f[]\*[lp]\)\c
. doc-reset-args
. \}
@@ -6041,11 +6041,11 @@ arguments
. evc 0
. in 0
. nf
-. nop \*[doc-Em-font]\c
+. nop \f[\*[doc-Em-font]]\c
. doc-do-references
. \}
. el \{\
-. nop \*[doc-Em-font]\c
+. nop \f[\*[doc-Em-font]]\c
. doc-print-recursive
. \}
..
@@ -6209,7 +6209,7 @@ arguments
. evc 0
. in 0
. nf
-. nop \*[doc-Em-font]\c
+. nop \f[\*[doc-Em-font]]\c
. doc-do-references
..
.ec
@@ -6264,7 +6264,7 @@ arguments
. evc 0
. in 0
. nf
-. nop \*[doc-Em-font]\c
+. nop \f[\*[doc-Em-font]]\c
. doc-do-references
..
.ec
@@ -6598,7 +6598,7 @@ arguments
. evc 0
. in 0
. nf
-. nop \*[doc-No-font]\c
+. nop \f[\*[doc-No-font]]\c
. doc-do-references
.
. \" do it a second time with another font
@@ -6612,11 +6612,11 @@ arguments
. evc 0
. in 0
. nf
-. nop \*[doc-Em-font]\c
+. nop \f[\*[doc-Em-font]]\c
. doc-do-references
. \}
. el \{\
-. nop \*[doc-Em-font]\c
+. nop \f[\*[doc-Em-font]]\c
. doc-print-recursive
. \}
..
@@ -6872,19 +6872,19 @@ arguments
.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[]
+.as doc-str-Rv-std-suffix " the global variable \f[\*[doc-Va-font]]errno\f[]
.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[]
+.as doc-str-Rv-stds-suffix " the global variable \f[\*[doc-Va-font]]errno\f[]
.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[]
+.as doc-str-Rv-std0 " the global variable \f[\*[doc-Va-font]]errno\f[]
.as doc-str-Rv-std0 " is set to indicate the error.
.ec
.
@@ -7052,7 +7052,7 @@ arguments
.
. \" Format the link target.
. nr doc-curr-font \n[.f]
-. nop \*[doc-Mt-font]\*[doc-visible-target-Mt]\c
+. nop \f[\*[doc-Mt-font]]\*[doc-visible-target-Mt]\c
. nop \f[\n[doc-curr-font]]\c
.
. doc-end-hyperlink-\*[.T]
@@ -7149,7 +7149,7 @@ arguments
. \}
. \" If no link text, format the link target as its own link text.
. el \
-. nop \*[doc-Lk-font]\*[doc-target-Lk]\c
+. nop \f[\*[doc-Lk-font]]\*[doc-target-Lk]\c
. nop \f[\n[doc-curr-font]]\c
.
. doc-end-hyperlink-\*[.T]
diff --git a/tmac/mdoc/doc-common b/tmac/mdoc/doc-common
index 884b17df8..3e05449e5 100644
--- a/tmac/mdoc/doc-common
+++ b/tmac/mdoc/doc-common
@@ -1,7 +1,7 @@
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
-.\" Copyright (C) 1999-2024 Free Software Foundation, Inc.
+.\" Copyright (C) 1999-2025 Free Software Foundation, Inc.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -1034,23 +1034,23 @@
.
.eo
.de1 doc-header
-. ds doc-xref \*[doc-page-identifier-font]\*[doc-page-identifier]\f[]\"
-. as doc-xref \*[doc-page-section-font](\*[doc-section])\f[]\"
+. ds doc-xref \f[\*[doc-page-identifier-font]]\*[doc-page-identifier]\f[]\"
+. as doc-xref \f[\*[doc-page-section-font]](\*[doc-section])\f[]\"
. ds doc-abbv \*[doc-page-identifier]\"
. ev doc-env-dh
. doc-setup-page-layout
. ie \n[cR] .pl +1v
. el .sp |(.5i - .5m)
-. nr doc-reg-dh \w'\*[doc-page-identifier-font]\*[doc-xref]\f[]'
+. nr doc-reg-dh \w'\f[\*[doc-page-identifier-font]]\*[doc-xref]\f[]'
. nr doc-reg-dh1 \w'\*[doc-volume]'
. if (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\
. while (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\
-. ds doc-xref \*[doc-page-identifier-font]\*[doc-abbv]\f[]\"
-. as doc-xref \*[doc-page-section-font](\*[doc-section])\f[]\"
+. ds doc-xref \f[\*[doc-page-identifier-font]]\*[doc-abbv]\f[]\"
+. as doc-xref \f[\*[doc-page-section-font]](\*[doc-section])\f[]\"
. length doc-abbv-len-prev \*[doc-abbv]
. substring doc-abbv 0 -2
. length doc-abbv-len \*[doc-abbv]
-. nr doc-reg-dh \w'\*[doc-page-identifier-font]\*[doc-abbv]\|.\|.\|.\f[]'
+. nr doc-reg-dh
\w'\f[\*[doc-page-identifier-font]]\*[doc-abbv]\|.\|.\|.\f[]'
. \" If header string didn't actually get shorter, stop trying.
. if (\n[doc-abbv-len-prev] <= \n[doc-abbv-len]) \
. break
@@ -1090,8 +1090,8 @@
.
.eo
.de1 doc-footer
-. ds doc-xref \*[doc-page-identifier-font]\*[doc-page-identifier]\f[]\"
-. as doc-xref \*[doc-page-section-font](\*[doc-section])\f[]\"
+. ds doc-xref \f[\*[doc-page-identifier-font]]\*[doc-page-identifier]\f[]\"
+. as doc-xref \f[\*[doc-page-section-font]](\*[doc-section])\f[]\"
. ds doc-page-id \n[%]
. if r X \{\
. if (\n[%] > \n[X]) \{\
@@ -1427,7 +1427,7 @@
. nr doc-arg-ptr +1
. ie (\n[doc-arg-count] >= \n[doc-arg-ptr]) \{\
. nr doc-curr-font \n[.f]
-. nop \*[doc-Sh-font]\c
+. nop \f[\*[doc-Sh-font]]\c
. doc-print-recursive
. \}
. el \{\
@@ -1515,7 +1515,7 @@
.
. nr doc-arg-ptr +1
. nr doc-curr-font \n[.f]
-. nop \*[doc-Sh-font]\c
+. nop \f[\*[doc-Sh-font]]\c
. doc-print-recursive
.
. if t \
@@ -1557,7 +1557,7 @@
. nr doc-arg-ptr +1
. ie (\n[doc-arg-count] >= \n[doc-arg-ptr]) \{\
. nr doc-curr-font \n[.f]
-. nop \*[doc-Sh-font]\c
+. nop \f[\*[doc-Sh-font]]\c
. doc-print-recursive
. \}
. el \{\
@@ -1596,7 +1596,7 @@
.
. nr doc-arg-ptr +1
. nr doc-curr-font \n[.f]
-. nop \*[doc-Sh-font]\c
+. nop \f[\*[doc-Sh-font]]\c
. doc-print-recursive
.
. ss \n[doc-reg-Ss] \n[doc-reg-Ss1]
diff --git a/tmac/mdoc/doc-ditroff b/tmac/mdoc/doc-ditroff
index 9bc9418b6..cb6beb19b 100644
--- a/tmac/mdoc/doc-ditroff
+++ b/tmac/mdoc/doc-ditroff
@@ -1,7 +1,7 @@
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
-.\" Copyright (C) 1994-2024 Free Software Foundation, Inc.
+.\" Copyright (C) 1994-2025 Free Software Foundation, Inc.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -53,32 +53,32 @@
.
.\" the 'doc-xx-font' strings must not be empty!
.
-.ds doc-page-identifier-font \f[\*[MF]]
-.ds doc-page-section-font \f[R]
-.ds doc-Ad-font \f[I]
-.ds doc-Ar-font \f[I]
-.ds doc-Cm-font \f[B]
-.ds doc-Em-font \f[I]
-.ds doc-Er-font \f[R]
-.ds doc-Ev-font \f[I]
-.ds doc-Fa-font \f[I]
-.ds doc-Fd-font \f[B]
-.ds doc-Fl-font \f[B]
-.ds doc-Fn-font \f[B]
-.ds doc-Ft-font \f[I]
-.ds doc-Ic-font \f[B]
-.ds doc-Li-font \f[B]
-.ds doc-Lk-font \f[R]
-.ds doc-Me-font \f[B]
-.ds doc-Mt-font \f[R]
-.ds doc-Nm-font \f[B]
-.ds doc-No-font \f[R]
-.ds doc-Pa-font \f[I]
-.ds doc-Sh-font \f[\*[HF]]
-.ds doc-Sy-font \f[B]
-.ds doc-Tn-font \f[R]
-.ds doc-Va-font \f[I]
-.ds doc-Xr-font \f[\*[MF]]
+.ds doc-page-identifier-font \*[MF]\"
+.ds doc-page-section-font R\"
+.ds doc-Ad-font I\"
+.ds doc-Ar-font I\"
+.ds doc-Cm-font B\"
+.ds doc-Em-font I\"
+.ds doc-Er-font R\"
+.ds doc-Ev-font I\"
+.ds doc-Fa-font I\"
+.ds doc-Fd-font B\"
+.ds doc-Fl-font B\"
+.ds doc-Fn-font B\"
+.ds doc-Ft-font I\"
+.ds doc-Ic-font B\"
+.ds doc-Li-font B\"
+.ds doc-Lk-font R\"
+.ds doc-Me-font B\"
+.ds doc-Mt-font R\"
+.ds doc-Nm-font B\"
+.ds doc-No-font R\"
+.ds doc-Pa-font I\"
+.ds doc-Sh-font \*[HF]\"
+.ds doc-Sy-font B\"
+.ds doc-Tn-font R\"
+.ds doc-Va-font I\"
+.ds doc-Xr-font \*[MF]\"
.
.ds doc-left-parenthesis \f[R](\f[]
.ds doc-right-parenthesis \f[R])\f[]
diff --git a/tmac/mdoc/doc-nroff b/tmac/mdoc/doc-nroff
index 0f8663daf..56a0aa1d7 100644
--- a/tmac/mdoc/doc-nroff
+++ b/tmac/mdoc/doc-nroff
@@ -1,7 +1,7 @@
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
-.\" Copyright (C) 2001-2024 Free Software Foundation, Inc.
+.\" Copyright (C) 2001-2025 Free Software Foundation, Inc.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -45,32 +45,32 @@
.
.\" the 'doc-xx-font' strings must not be empty!
.
-.ds doc-page-identifier-font \f[\*[MF]]
-.ds doc-page-section-font \f[R]
-.ds doc-Ad-font \f[I]
-.ds doc-Ar-font \f[I]
-.ds doc-Cm-font \f[B]
-.ds doc-Em-font \f[I]
-.ds doc-Er-font \f[R]
-.ds doc-Ev-font \f[I]
-.ds doc-Fa-font \f[I]
-.ds doc-Fd-font \f[B]
-.ds doc-Fl-font \f[B]
-.ds doc-Fn-font \f[B]
-.ds doc-Ft-font \f[I]
-.ds doc-Ic-font \f[B]
-.ds doc-Li-font \f[B]
-.ds doc-Lk-font \f[R]
-.ds doc-Me-font \f[B]
-.ds doc-Mt-font \f[R]
-.ds doc-Nm-font \f[B]
-.ds doc-No-font \f[R]
-.ds doc-Pa-font \f[I]
-.ds doc-Sh-font \f[\*[HF]]
-.ds doc-Sy-font \f[B]
-.ds doc-Tn-font \f[R]
-.ds doc-Va-font \f[I]
-.ds doc-Xr-font \f[\*[MF]]
+.ds doc-page-identifier-font \*[MF]\"
+.ds doc-page-section-font R\"
+.ds doc-Ad-font I\"
+.ds doc-Ar-font I\"
+.ds doc-Cm-font B\"
+.ds doc-Em-font I\"
+.ds doc-Er-font R\"
+.ds doc-Ev-font I\"
+.ds doc-Fa-font I\"
+.ds doc-Fd-font B\"
+.ds doc-Fl-font B\"
+.ds doc-Fn-font B\"
+.ds doc-Ft-font I\"
+.ds doc-Ic-font B\"
+.ds doc-Li-font B\"
+.ds doc-Lk-font R\"
+.ds doc-Me-font B\"
+.ds doc-Mt-font R\"
+.ds doc-Nm-font B\"
+.ds doc-No-font R\"
+.ds doc-Pa-font I\"
+.ds doc-Sh-font \*[HF]\"
+.ds doc-Sy-font B\"
+.ds doc-Tn-font R\"
+.ds doc-Va-font I\"
+.ds doc-Xr-font \*[MF]\"
.
.ds doc-left-parenthesis \f[R](\f[]
.ds doc-right-parenthesis \f[R])\f[]
@@ -210,7 +210,7 @@
. doc-parse-args \$@
. nr doc-arg-ptr 1
. nr doc-curr-font \n[.f]
-. nop \*[doc-Li-font]\c
+. nop \f[\*[doc-Li-font]]\c
. doc-print-recursive
. \}
. el \
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
