gbranden pushed a commit to branch master in repository groff. commit 2b9f97a14cf3230e9d530bc2bb825777f59f4493 Author: G. Branden Robinson <g.branden.robin...@gmail.com> AuthorDate: Mon Mar 18 14:23:24 2024 -0500
[mdoc]: Keep font sane when `Ar` called w/o args. * tmac/doc.tmac (Ar): Don't reset the selected font to its previous value when formatting `doc-str-Ar-default`; the latter string already takes care of this. * tmac/groff_mdoc.7.man (Arguments) <Ar>: Add a case of an interstitial ellipsis in an argument list, to demonstrate that the typeface gets reset correctly after the ellipsis. Fixes a post-1.23.0 regression. Thanks to Lennart Jablonka for the report. Problem introduced by me in commit df1fc139af, 3 September. --- ChangeLog | 14 ++++++++++++++ tmac/doc.tmac | 2 +- tmac/groff_mdoc.7.man | 4 +++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca7963f2b..004c20227 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2024-03-18 G. Branden Robinson <g.branden.robin...@gmail.com> + + * tmac/doc.tmac (Ar): Don't reset the selected font to its + previous value when formatting `doc-str-Ar-default`; the latter + string already takes care of this. + + * tmac/groff_mdoc.7.man (Arguments) <Ar>: Add a case of an + interstitial ellipsis in an argument list, to demonstrate that + the typeface gets reset correctly after the ellipsis. + + Fixes a post-1.23.0 regression. Thanks to Lennart Jablonka for + the report. Problem introduced by me in commit df1fc139af, 3 + September. + 2024-03-18 G. Branden Robinson <g.branden.robin...@gmail.com> * tmac/mdoc/doc-common: Trivially refactor. Rename diff --git a/tmac/doc.tmac b/tmac/doc.tmac index 07799e433..ef9d5a048 100644 --- a/tmac/doc.tmac +++ b/tmac/doc.tmac @@ -831,7 +831,7 @@ . nr doc-arg-ptr +1 . doc-print-prefixes . ie (\n[doc-arg-count] < \n[doc-arg-ptr]) \{\ -. nop \)\*[doc-str-Ar-default]\&\f[]\c +. nop \)\*[doc-str-Ar-default]\&\c . doc-print-and-reset . \} . el \{\ diff --git a/tmac/groff_mdoc.7.man b/tmac/groff_mdoc.7.man index 79bd4e507..27dc71e52 100644 --- a/tmac/groff_mdoc.7.man +++ b/tmac/groff_mdoc.7.man @@ -1578,7 +1578,7 @@ is output. . . .Pp -.Bl -tag -width ".Li .Ar\ file1\ file2" -compact -offset 15n +.Bl -tag -width ".Li .Ar\ file\ ...\ dest-dir" -compact -offset 15n .It Li .Ar .Ar .It Li ".Ar file1" @@ -1587,6 +1587,8 @@ is output. .Ar file1 . .It Li ".Ar file1 file2" .Ar file1 file2 +.It Li ".Ar file ... dest-dir" +.Ar file ... dest-dir .It Li ".Ar f1 f2 f3 :" .Ar f1 f2 f3 : .It Li ".Ar file ) ) ," _______________________________________________ Groff-commit mailing list Groff-commit@gnu.org https://lists.gnu.org/mailman/listinfo/groff-commit