From 04fbb99f8882e168f342303c8d92ac6c8c0d2ba9 Mon Sep 17 00:00:00 2001 From: schwarze Date: Sat, 10 Jun 2017 01:48:31 +0000 Subject: [PATCH] style message about missing blank before trailing delimiter; inspired by mdoclint(1), and jmc@ considers it useful --- regress/usr.bin/mandoc/mdoc/Ad/noarg.in | 4 +- .../usr.bin/mandoc/mdoc/Ad/noarg.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Ad/noarg.out_lint | 1 + .../usr.bin/mandoc/mdoc/Ad/noarg.out_markdown | 4 +- regress/usr.bin/mandoc/mdoc/An/break.in | 2 +- regress/usr.bin/mandoc/mdoc/An/break.out_lint | 1 + regress/usr.bin/mandoc/mdoc/Aq/Makefile | 3 +- regress/usr.bin/mandoc/mdoc/Aq/empty.in | 6 +- .../usr.bin/mandoc/mdoc/Aq/empty.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Aq/empty.out_lint | 2 + .../usr.bin/mandoc/mdoc/Aq/empty.out_markdown | 6 +- regress/usr.bin/mandoc/mdoc/Aq/empty.out_utf8 | 4 +- regress/usr.bin/mandoc/mdoc/Ar/Makefile | 3 +- regress/usr.bin/mandoc/mdoc/Ar/punct.in | 5 +- .../usr.bin/mandoc/mdoc/Ar/punct.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Ar/punct.out_lint | 1 + .../usr.bin/mandoc/mdoc/Ar/punct.out_markdown | 5 +- regress/usr.bin/mandoc/mdoc/Bl/breakingIt.in | 8 +- .../mandoc/mdoc/Bl/breakingIt.out_ascii | 8 +- .../mandoc/mdoc/Bl/breakingIt.out_markdown | 8 +- regress/usr.bin/mandoc/mdoc/Bl/noIt.in | 4 +- regress/usr.bin/mandoc/mdoc/Bl/noIt.out_ascii | 4 +- .../usr.bin/mandoc/mdoc/Bl/noIt.out_markdown | 4 +- regress/usr.bin/mandoc/mdoc/Brq/Makefile | 3 +- regress/usr.bin/mandoc/mdoc/Brq/empty.in | 6 +- .../usr.bin/mandoc/mdoc/Brq/empty.out_ascii | 4 +- .../usr.bin/mandoc/mdoc/Brq/empty.out_lint | 2 + .../mandoc/mdoc/Brq/empty.out_markdown | 6 +- regress/usr.bin/mandoc/mdoc/Bx/Makefile | 3 +- regress/usr.bin/mandoc/mdoc/Bx/args.in | 4 +- regress/usr.bin/mandoc/mdoc/Bx/args.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Bx/args.out_lint | 1 + .../usr.bin/mandoc/mdoc/Bx/args.out_markdown | 4 +- regress/usr.bin/mandoc/mdoc/Cm/noarg.in | 4 +- .../usr.bin/mandoc/mdoc/Cm/noarg.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Cm/noarg.out_lint | 1 + .../usr.bin/mandoc/mdoc/Cm/noarg.out_markdown | 4 +- regress/usr.bin/mandoc/mdoc/Dq/Makefile | 3 +- regress/usr.bin/mandoc/mdoc/Dq/empty.in | 6 +- .../usr.bin/mandoc/mdoc/Dq/empty.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Dq/empty.out_lint | 0 .../usr.bin/mandoc/mdoc/Dq/empty.out_markdown | 6 +- regress/usr.bin/mandoc/mdoc/Dv/noarg.in | 4 +- .../usr.bin/mandoc/mdoc/Dv/noarg.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Dv/noarg.out_lint | 1 + .../usr.bin/mandoc/mdoc/Dv/noarg.out_markdown | 4 +- regress/usr.bin/mandoc/mdoc/Em/punct.in | 5 +- .../usr.bin/mandoc/mdoc/Em/punct.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Em/punct.out_lint | 1 + .../usr.bin/mandoc/mdoc/Em/punct.out_markdown | 5 +- regress/usr.bin/mandoc/mdoc/Er/noarg.in | 3 +- .../usr.bin/mandoc/mdoc/Er/noarg.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Er/noarg.out_lint | 3 +- .../usr.bin/mandoc/mdoc/Er/noarg.out_markdown | 3 +- regress/usr.bin/mandoc/mdoc/Ev/noarg.in | 4 +- .../usr.bin/mandoc/mdoc/Ev/noarg.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Ev/noarg.out_lint | 1 + .../usr.bin/mandoc/mdoc/Ev/noarg.out_markdown | 4 +- regress/usr.bin/mandoc/mdoc/Fl/Makefile | 3 +- regress/usr.bin/mandoc/mdoc/Fl/punct.in | 5 +- .../usr.bin/mandoc/mdoc/Fl/punct.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Fl/punct.out_lint | 1 + .../usr.bin/mandoc/mdoc/Fl/punct.out_markdown | 5 +- regress/usr.bin/mandoc/mdoc/Fo/Makefile | 4 +- regress/usr.bin/mandoc/mdoc/Fo/punct.in | 6 +- .../usr.bin/mandoc/mdoc/Fo/punct.out_ascii | 6 +- regress/usr.bin/mandoc/mdoc/Fo/punct.out_lint | 3 + .../usr.bin/mandoc/mdoc/Fo/punct.out_markdown | 6 +- regress/usr.bin/mandoc/mdoc/Ic/noarg.in | 4 +- .../usr.bin/mandoc/mdoc/Ic/noarg.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Ic/noarg.out_lint | 1 + .../usr.bin/mandoc/mdoc/Ic/noarg.out_markdown | 4 +- regress/usr.bin/mandoc/mdoc/In/noarg.in | 2 +- .../usr.bin/mandoc/mdoc/In/noarg.out_ascii | 2 +- regress/usr.bin/mandoc/mdoc/In/noarg.out_lint | 1 + .../usr.bin/mandoc/mdoc/In/noarg.out_markdown | 2 +- regress/usr.bin/mandoc/mdoc/Lb/badargs.in | 6 +- .../usr.bin/mandoc/mdoc/Lb/badargs.out_ascii | 6 +- .../usr.bin/mandoc/mdoc/Lb/badargs.out_lint | 2 + .../mandoc/mdoc/Lb/badargs.out_markdown | 6 +- regress/usr.bin/mandoc/mdoc/Li/punct.in | 5 +- .../usr.bin/mandoc/mdoc/Li/punct.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Li/punct.out_lint | 1 + .../usr.bin/mandoc/mdoc/Li/punct.out_markdown | 5 +- regress/usr.bin/mandoc/mdoc/Lk/noarg.in | 6 +- .../usr.bin/mandoc/mdoc/Lk/noarg.out_ascii | 6 +- regress/usr.bin/mandoc/mdoc/Lk/noarg.out_lint | 2 + .../usr.bin/mandoc/mdoc/Lk/noarg.out_markdown | 6 +- regress/usr.bin/mandoc/mdoc/Ms/noarg.in | 8 +- .../usr.bin/mandoc/mdoc/Ms/noarg.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Ms/noarg.out_lint | 1 + .../usr.bin/mandoc/mdoc/Ms/noarg.out_markdown | 8 +- regress/usr.bin/mandoc/mdoc/Mt/Makefile | 3 +- regress/usr.bin/mandoc/mdoc/Mt/simple.in | 5 +- .../usr.bin/mandoc/mdoc/Mt/simple.out_ascii | 4 +- .../usr.bin/mandoc/mdoc/Mt/simple.out_lint | 1 + .../mandoc/mdoc/Mt/simple.out_markdown | 5 +- regress/usr.bin/mandoc/mdoc/Nm/Makefile | 4 +- regress/usr.bin/mandoc/mdoc/Nm/punct.in | 5 +- .../usr.bin/mandoc/mdoc/Nm/punct.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Nm/punct.out_lint | 1 + .../usr.bin/mandoc/mdoc/Nm/punct.out_markdown | 5 +- regress/usr.bin/mandoc/mdoc/No/punct.in | 5 +- .../usr.bin/mandoc/mdoc/No/punct.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/No/punct.out_lint | 1 + .../usr.bin/mandoc/mdoc/No/punct.out_markdown | 5 +- regress/usr.bin/mandoc/mdoc/Oo/Makefile | 3 +- regress/usr.bin/mandoc/mdoc/Oo/punct.in | 6 +- .../usr.bin/mandoc/mdoc/Oo/punct.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Oo/punct.out_lint | 1 + .../usr.bin/mandoc/mdoc/Oo/punct.out_markdown | 5 +- regress/usr.bin/mandoc/mdoc/Op/Makefile | 4 +- regress/usr.bin/mandoc/mdoc/Op/punct.in | 5 +- .../usr.bin/mandoc/mdoc/Op/punct.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Op/punct.out_lint | 1 + .../usr.bin/mandoc/mdoc/Op/punct.out_markdown | 5 +- regress/usr.bin/mandoc/mdoc/Pa/Makefile | 3 +- regress/usr.bin/mandoc/mdoc/Pa/punct.in | 5 +- .../usr.bin/mandoc/mdoc/Pa/punct.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Pa/punct.out_lint | 1 + .../usr.bin/mandoc/mdoc/Pa/punct.out_markdown | 5 +- regress/usr.bin/mandoc/mdoc/Qq/Makefile | 3 +- regress/usr.bin/mandoc/mdoc/Qq/empty.in | 6 +- .../usr.bin/mandoc/mdoc/Qq/empty.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Qq/empty.out_lint | 2 + .../usr.bin/mandoc/mdoc/Qq/empty.out_markdown | 6 +- regress/usr.bin/mandoc/mdoc/Sq/Makefile | 3 +- regress/usr.bin/mandoc/mdoc/Sq/empty.in | 6 +- .../usr.bin/mandoc/mdoc/Sq/empty.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Sq/empty.out_lint | 2 + .../usr.bin/mandoc/mdoc/Sq/empty.out_markdown | 6 +- regress/usr.bin/mandoc/mdoc/Sy/punct.in | 5 +- .../usr.bin/mandoc/mdoc/Sy/punct.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Sy/punct.out_lint | 1 + .../usr.bin/mandoc/mdoc/Sy/punct.out_markdown | 5 +- regress/usr.bin/mandoc/mdoc/Ux/Makefile | 5 +- regress/usr.bin/mandoc/mdoc/Ux/punct.in | 15 +++ .../usr.bin/mandoc/mdoc/Ux/punct.out_ascii | 11 ++ regress/usr.bin/mandoc/mdoc/Ux/punct.out_lint | 5 + .../usr.bin/mandoc/mdoc/Ux/punct.out_markdown | 18 +++ regress/usr.bin/mandoc/mdoc/Va/noarg.in | 4 +- .../usr.bin/mandoc/mdoc/Va/noarg.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Va/noarg.out_lint | 1 + .../usr.bin/mandoc/mdoc/Va/noarg.out_markdown | 4 +- regress/usr.bin/mandoc/mdoc/Vt/noarg.in | 4 +- .../usr.bin/mandoc/mdoc/Vt/noarg.out_ascii | 4 +- regress/usr.bin/mandoc/mdoc/Vt/noarg.out_lint | 1 + .../usr.bin/mandoc/mdoc/Vt/noarg.out_markdown | 4 +- regress/usr.bin/mandoc/mdoc/Xr/args.in | 8 +- regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii | 5 +- regress/usr.bin/mandoc/mdoc/Xr/args.out_lint | 9 +- .../usr.bin/mandoc/mdoc/Xr/args.out_markdown | 8 +- usr.bin/mandoc/mandoc.1 | 9 +- usr.bin/mandoc/mandoc.h | 3 +- usr.bin/mandoc/mdoc_validate.c | 114 ++++++++++++------ usr.bin/mandoc/read.c | 3 +- 156 files changed, 503 insertions(+), 258 deletions(-) create mode 100644 regress/usr.bin/mandoc/mdoc/Aq/empty.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Ar/punct.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Brq/empty.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Bx/args.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Dq/empty.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Fl/punct.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Fo/punct.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Mt/simple.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Nm/punct.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Oo/punct.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Op/punct.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Pa/punct.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Qq/empty.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Sq/empty.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Ux/punct.in create mode 100644 regress/usr.bin/mandoc/mdoc/Ux/punct.out_ascii create mode 100644 regress/usr.bin/mandoc/mdoc/Ux/punct.out_lint create mode 100644 regress/usr.bin/mandoc/mdoc/Ux/punct.out_markdown diff --git a/regress/usr.bin/mandoc/mdoc/Ad/noarg.in b/regress/usr.bin/mandoc/mdoc/Ad/noarg.in index 65f8167be6e..b0881dc7e44 100644 --- a/regress/usr.bin/mandoc/mdoc/Ad/noarg.in +++ b/regress/usr.bin/mandoc/mdoc/Ad/noarg.in @@ -1,4 +1,4 @@ -.Dd January 19, 2011 +.Dd June 9, 2017 .Dt AD-NOARG 1 .Os OpenBSD .Sh NAME @@ -6,7 +6,7 @@ .Nd address macro without an argument .Sh DESCRIPTION with address: -.Ad 0x3bc +.Ad 0x3bc. no address: .Ad end of test document diff --git a/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_ascii index 6ad60d8a210..b0703dd09fb 100644 --- a/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE AAdd--nnooaarrgg - address macro without an argument DDEESSCCRRIIPPTTIIOONN - with address: _0_x_3_b_c no address: end of test document + with address: _0_x_3_b_c_. no address: end of test document -OpenBSD January 19, 2011 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_lint b/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_lint index 180985aa919..01d37fa1e78 100644 --- a/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_lint @@ -1 +1,2 @@ mandoc: noarg.in:11:2: WARNING: skipping empty macro: Ad +mandoc: noarg.in:9:10: STYLE: no blank before trailing delimiter: Ad 0x3bc. diff --git a/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_markdown b/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_markdown index de7b6c64bb8..285a9711b39 100644 --- a/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_markdown @@ -7,8 +7,8 @@ AD-NOARG(1) - General Commands Manual # DESCRIPTION with address: -*0x3bc* +*0x3bc.* no address: end of test document -OpenBSD - January 19, 2011 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/An/break.in b/regress/usr.bin/mandoc/mdoc/An/break.in index ff96c5475e6..70f5b1b744d 100644 --- a/regress/usr.bin/mandoc/mdoc/An/break.in +++ b/regress/usr.bin/mandoc/mdoc/An/break.in @@ -40,7 +40,7 @@ trailing .Pp inline: .An Kristaps "," -.An Ingo , +.An Ingo, and .An Joerg . empty diff --git a/regress/usr.bin/mandoc/mdoc/An/break.out_lint b/regress/usr.bin/mandoc/mdoc/An/break.out_lint index 25622fd1db0..7c88ccea51e 100644 --- a/regress/usr.bin/mandoc/mdoc/An/break.out_lint +++ b/regress/usr.bin/mandoc/mdoc/An/break.out_lint @@ -8,5 +8,6 @@ mandoc: break.in:36:2: WARNING: skipping empty macro: An mandoc: break.in:38:2: WARNING: skipping empty macro: An mandoc: break.in:39:14: WARNING: skipping duplicate argument: An -split mandoc: break.in:39:21: ERROR: skipping excess arguments: An ... bogus +mandoc: break.in:43:9: STYLE: no blank before trailing delimiter: An Ingo, mandoc: break.in:47:2: WARNING: skipping empty macro: An mandoc: break.in:49:2: WARNING: skipping empty macro: An diff --git a/regress/usr.bin/mandoc/mdoc/Aq/Makefile b/regress/usr.bin/mandoc/mdoc/Aq/Makefile index 5031fbe6d8f..98201136310 100644 --- a/regress/usr.bin/mandoc/mdoc/Aq/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Aq/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.5 2017/03/08 22:53:35 schwarze Exp $ +# $OpenBSD: Makefile,v 1.6 2017/06/10 01:48:31 schwarze Exp $ REGRESS_TARGETS = author empty UTF8_TARGETS = author empty +LINT_TARGETS = empty .include diff --git a/regress/usr.bin/mandoc/mdoc/Aq/empty.in b/regress/usr.bin/mandoc/mdoc/Aq/empty.in index 1fa5a61b50e..7b2d1681495 100644 --- a/regress/usr.bin/mandoc/mdoc/Aq/empty.in +++ b/regress/usr.bin/mandoc/mdoc/Aq/empty.in @@ -1,4 +1,4 @@ -.Dd August 6, 2010 +.Dd June 9, 2017 .Dt AQ-EMPTY 1 .Os OpenBSD .Sh NAME @@ -8,7 +8,7 @@ An empty .Aq and a full -.Aq user@host +.Aq user@host: return path. And another -.Ao full Ac one "Sy" bold . +.Ao full: Ac one "Sy" bold . diff --git a/regress/usr.bin/mandoc/mdoc/Aq/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Aq/empty.out_ascii index 236c06253bf..15ef4e6deeb 100644 --- a/regress/usr.bin/mandoc/mdoc/Aq/empty.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Aq/empty.out_ascii @@ -4,7 +4,7 @@ NNAAMMEE AAqq--eemmppttyy - empty implicit enclosure macros DDEESSCCRRIIPPTTIIOONN - An empty <> and a full return path. And another one + An empty <> and a full return path. And another one bboolldd. -OpenBSD August 6, 2010 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Aq/empty.out_lint b/regress/usr.bin/mandoc/mdoc/Aq/empty.out_lint new file mode 100644 index 00000000000..78d88141233 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Aq/empty.out_lint @@ -0,0 +1,2 @@ +mandoc: empty.in:11:14: STYLE: no blank before trailing delimiter: Aq user@host: +mandoc: empty.in:14:9: STYLE: no blank before trailing delimiter: Ao full: diff --git a/regress/usr.bin/mandoc/mdoc/Aq/empty.out_markdown b/regress/usr.bin/mandoc/mdoc/Aq/empty.out_markdown index dc39648174f..752a723be7a 100644 --- a/regress/usr.bin/mandoc/mdoc/Aq/empty.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Aq/empty.out_markdown @@ -9,9 +9,9 @@ AQ-EMPTY(1) - General Commands Manual An empty <> and a full -<user@host> +<user@host:> return path. And another -<full> one **bold**. +<full:> one **bold**. -OpenBSD - August 6, 2010 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Aq/empty.out_utf8 b/regress/usr.bin/mandoc/mdoc/Aq/empty.out_utf8 index 0a81608b615..cb950c95b7d 100644 --- a/regress/usr.bin/mandoc/mdoc/Aq/empty.out_utf8 +++ b/regress/usr.bin/mandoc/mdoc/Aq/empty.out_utf8 @@ -4,7 +4,7 @@ NNAAMMEE AAqq--eemmppttyy – empty implicit enclosure macros DDEESSCCRRIIPPTTIIOONN - An empty ⟨⟩ and a full ⟨user@host⟩ return path. And another ⟨full⟩ one + An empty ⟨⟩ and a full ⟨user@host:⟩ return path. And another ⟨full:⟩ one bboolldd. -OpenBSD August 6, 2010 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Ar/Makefile b/regress/usr.bin/mandoc/mdoc/Ar/Makefile index a302fcea967..02416f9ed46 100644 --- a/regress/usr.bin/mandoc/mdoc/Ar/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Ar/Makefile @@ -1,5 +1,6 @@ -# $OpenBSD: Makefile,v 1.5 2017/03/08 22:53:35 schwarze Exp $ +# $OpenBSD: Makefile,v 1.6 2017/06/10 01:48:31 schwarze Exp $ REGRESS_TARGETS = punct font +LINT_TARGETS = punct .include diff --git a/regress/usr.bin/mandoc/mdoc/Ar/punct.in b/regress/usr.bin/mandoc/mdoc/Ar/punct.in index 51044001835..71abc258a1c 100644 --- a/regress/usr.bin/mandoc/mdoc/Ar/punct.in +++ b/regress/usr.bin/mandoc/mdoc/Ar/punct.in @@ -1,4 +1,4 @@ -.Dd August 21, 2014 +.Dd June 9, 2017 .Dt AR-PUNCT 1 .Os OpenBSD .Sh NAME @@ -40,3 +40,6 @@ op bracket .Pp quoted punctuation: .Ar a "(" b "|" c ")" d "," "Sy" bold . +.Pp +missing blank: +.Ar arg. diff --git a/regress/usr.bin/mandoc/mdoc/Ar/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Ar/punct.out_ascii index 01426c58ff2..e34b3fdc8e4 100644 --- a/regress/usr.bin/mandoc/mdoc/Ar/punct.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Ar/punct.out_ascii @@ -11,4 +11,6 @@ DDEESSCCRRIIPPTTIIOONN quoted punctuation: _a (_b | _c) _d, bboolldd. -OpenBSD August 21, 2014 OpenBSD + missing blank: _a_r_g_. + +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Ar/punct.out_lint b/regress/usr.bin/mandoc/mdoc/Ar/punct.out_lint new file mode 100644 index 00000000000..73e9ca6e56d --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Ar/punct.out_lint @@ -0,0 +1 @@ +mandoc: punct.in:45:8: STYLE: no blank before trailing delimiter: Ar arg. diff --git a/regress/usr.bin/mandoc/mdoc/Ar/punct.out_markdown b/regress/usr.bin/mandoc/mdoc/Ar/punct.out_markdown index 932b86601d9..ab03a7b549d 100644 --- a/regress/usr.bin/mandoc/mdoc/Ar/punct.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Ar/punct.out_markdown @@ -42,4 +42,7 @@ op bracket quoted punctuation: *a* (*b* | *c*) *d*, **bold**. -OpenBSD - August 21, 2014 +missing blank: +*arg.* + +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.in b/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.in index 025ea257ea6..6e75fcf411f 100644 --- a/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.in +++ b/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.in @@ -9,14 +9,14 @@ .Bl -tag -width Ds Stray text. .Ao -More stray text. +More stray text .It tag Tagged text. .El .Bl -bullet Stray text. .Ao -More stray text. +More stray text .It Bullet point. .El @@ -24,7 +24,7 @@ Bullet point. .It tag Tagged text. .Ao -More tagged text. +More tagged text .It tag2 Yet more tagged text. .El @@ -32,7 +32,7 @@ Yet more tagged text. .It Item text. .Ao -More item text. +More item text .It Bullet point. .El diff --git a/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.out_ascii index afb57973bb3..9c8fd7223fd 100644 --- a/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.out_ascii @@ -5,18 +5,18 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN BBrreeaakkiinngg ppaarrttiiaall eexxpplliicciitt mmaaccrrooss - Stray text. + Stray text. tag Tagged text. - Stray text. + Stray text. ++oo Bullet point. - tag Tagged text. + tag Tagged text. tag2 Yet more tagged text. - ++oo Item text. + ++oo Item text. ++oo Bullet point. diff --git a/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.out_markdown b/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.out_markdown index c6c3de6a95b..5739522d9ad 100644 --- a/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.out_markdown @@ -9,28 +9,28 @@ BL-BREAKINGIT(1) - General Commands Manual ## Breaking partial explicit macros Stray text. -<More stray text.> +<More stray text> tag > Tagged text. Stray text. -<More stray text.> +<More stray text> * Bullet point. tag > Tagged text. -> <More tagged text.> +> <More tagged text> tag2 > Yet more tagged text. * Item text. - <More item text.> + <More item text> * Bullet point. diff --git a/regress/usr.bin/mandoc/mdoc/Bl/noIt.in b/regress/usr.bin/mandoc/mdoc/Bl/noIt.in index 46d8c0d283c..05835b5de35 100644 --- a/regress/usr.bin/mandoc/mdoc/Bl/noIt.in +++ b/regress/usr.bin/mandoc/mdoc/Bl/noIt.in @@ -7,14 +7,14 @@ .Sh DESCRIPTION .Bl -tag -width Ds Stray text. -.Em More stray text. +.Em More stray text .It tag Tagged text. .El .Bl -bullet Stray text. .Sm off -.Em More Sy stray Em text. +.Em More Sy stray Em text .Sm on .It Bullet point. diff --git a/regress/usr.bin/mandoc/mdoc/Bl/noIt.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/noIt.out_ascii index 9f603f1cb0a..5b56cde54e7 100644 --- a/regress/usr.bin/mandoc/mdoc/Bl/noIt.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Bl/noIt.out_ascii @@ -4,10 +4,10 @@ NNAAMMEE BBll--nnooIItt - list missing item macros DDEESSCCRRIIPPTTIIOONN - Stray text. _M_o_r_e _s_t_r_a_y _t_e_x_t_. + Stray text. _M_o_r_e _s_t_r_a_y _t_e_x_t tag Tagged text. - Stray text. _M_o_r_essttrraayy_t_e_x_t_. + Stray text. _M_o_r_essttrraayy_t_e_x_t ++oo Bullet point. Stray text only. diff --git a/regress/usr.bin/mandoc/mdoc/Bl/noIt.out_markdown b/regress/usr.bin/mandoc/mdoc/Bl/noIt.out_markdown index a2fc0876d57..96d4b7af7fa 100644 --- a/regress/usr.bin/mandoc/mdoc/Bl/noIt.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Bl/noIt.out_markdown @@ -7,14 +7,14 @@ BL-NOIT(1) - General Commands Manual # DESCRIPTION Stray text. -*More stray text.* +*More stray text* tag > Tagged text. Stray text. -*More*‌**stray**‌*text.* +*More*‌**stray**‌*text* * Bullet point. diff --git a/regress/usr.bin/mandoc/mdoc/Brq/Makefile b/regress/usr.bin/mandoc/mdoc/Brq/Makefile index 6901b17ce4e..d6cfc10649c 100644 --- a/regress/usr.bin/mandoc/mdoc/Brq/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Brq/Makefile @@ -1,5 +1,6 @@ -# $OpenBSD: Makefile,v 1.3 2017/03/08 22:53:35 schwarze Exp $ +# $OpenBSD: Makefile,v 1.4 2017/06/10 01:48:31 schwarze Exp $ REGRESS_TARGETS = empty +LINT_TARGETS = empty .include diff --git a/regress/usr.bin/mandoc/mdoc/Brq/empty.in b/regress/usr.bin/mandoc/mdoc/Brq/empty.in index 5d3174746fb..4677820d9bb 100644 --- a/regress/usr.bin/mandoc/mdoc/Brq/empty.in +++ b/regress/usr.bin/mandoc/mdoc/Brq/empty.in @@ -1,4 +1,4 @@ -.Dd October 21, 2010 +.Dd June 9, 2017 .Dt BRQ-EMPTY 1 .Os OpenBSD .Sh NAME @@ -8,7 +8,7 @@ An empty .Brq and a full -.Brq "(" user@host +.Brq "(" user@host) quotation. And another -.Bro "(" full Brc one "Sy" bold . +.Bro "(" full) Brc one "Sy" bold . diff --git a/regress/usr.bin/mandoc/mdoc/Brq/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Brq/empty.out_ascii index 9d638d0cc2c..31cdd9e1850 100644 --- a/regress/usr.bin/mandoc/mdoc/Brq/empty.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Brq/empty.out_ascii @@ -4,7 +4,7 @@ NNAAMMEE BBrrqq--eemmppttyy - empty implicit enclosure macros DDEESSCCRRIIPPTTIIOONN - An empty {} and a full ({user@host} quotation. And another ({full} one + An empty {} and a full ({user@host)} quotation. And another ({full)} one bboolldd. -OpenBSD October 21, 2010 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Brq/empty.out_lint b/regress/usr.bin/mandoc/mdoc/Brq/empty.out_lint new file mode 100644 index 00000000000..15ca12f6bcd --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Brq/empty.out_lint @@ -0,0 +1,2 @@ +mandoc: empty.in:11:19: STYLE: no blank before trailing delimiter: Brq user@host) +mandoc: empty.in:14:14: STYLE: no blank before trailing delimiter: Bro full) diff --git a/regress/usr.bin/mandoc/mdoc/Brq/empty.out_markdown b/regress/usr.bin/mandoc/mdoc/Brq/empty.out_markdown index a335a57c61b..82b1dd7e3fe 100644 --- a/regress/usr.bin/mandoc/mdoc/Brq/empty.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Brq/empty.out_markdown @@ -9,9 +9,9 @@ BRQ-EMPTY(1) - General Commands Manual An empty {} and a full -({user@host} +({user@host)} quotation. And another -({full} one **bold**. +({full)} one **bold**. -OpenBSD - October 21, 2010 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Bx/Makefile b/regress/usr.bin/mandoc/mdoc/Bx/Makefile index 7ffd13cb17e..1e36c8fb40c 100644 --- a/regress/usr.bin/mandoc/mdoc/Bx/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Bx/Makefile @@ -1,5 +1,6 @@ -# $OpenBSD: Makefile,v 1.4 2017/03/08 22:53:35 schwarze Exp $ +# $OpenBSD: Makefile,v 1.5 2017/06/10 01:48:31 schwarze Exp $ REGRESS_TARGETS = args +LINT_TARGETS = args .include diff --git a/regress/usr.bin/mandoc/mdoc/Bx/args.in b/regress/usr.bin/mandoc/mdoc/Bx/args.in index d44792755ea..d6f8ff5eede 100644 --- a/regress/usr.bin/mandoc/mdoc/Bx/args.in +++ b/regress/usr.bin/mandoc/mdoc/Bx/args.in @@ -1,4 +1,4 @@ -.Dd January 30, 2011 +.Dd June 9, 2017 .Dt BX-ARGS 1 .Os OpenBSD .Sh NAME @@ -12,7 +12,7 @@ one standard argument: .Bx 4.4 "." .Pp one non-standard argument: -.Bx nett +.Bx nett. .Pp one semi-standard argument: .Bx 4.1c diff --git a/regress/usr.bin/mandoc/mdoc/Bx/args.out_ascii b/regress/usr.bin/mandoc/mdoc/Bx/args.out_ascii index 24e03ffedf2..d7c1e769eee 100644 --- a/regress/usr.bin/mandoc/mdoc/Bx/args.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Bx/args.out_ascii @@ -8,7 +8,7 @@ DDEESSCCRRIIPPTTIIOONN one standard argument: 4.4BSD. - one non-standard argument: nettBSD + one non-standard argument: nett.BSD one semi-standard argument: 4.1cBSD @@ -18,4 +18,4 @@ DDEESSCCRRIIPPTTIIOONN end of test document -OpenBSD January 30, 2011 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Bx/args.out_lint b/regress/usr.bin/mandoc/mdoc/Bx/args.out_lint new file mode 100644 index 00000000000..4f5dbcd9851 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Bx/args.out_lint @@ -0,0 +1 @@ +mandoc: args.in:15:9: STYLE: no blank before trailing delimiter: Bx nett. diff --git a/regress/usr.bin/mandoc/mdoc/Bx/args.out_markdown b/regress/usr.bin/mandoc/mdoc/Bx/args.out_markdown index 5450ee5156c..e231662133f 100644 --- a/regress/usr.bin/mandoc/mdoc/Bx/args.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Bx/args.out_markdown @@ -13,7 +13,7 @@ one standard argument: 4\.4BSD. one non-standard argument: -nettBSD +nett.BSD one semi-standard argument: 4\.1cBSD @@ -26,4 +26,4 @@ more arguments: end of test document -OpenBSD - January 30, 2011 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Cm/noarg.in b/regress/usr.bin/mandoc/mdoc/Cm/noarg.in index 750ce84ca9b..8347997bd6d 100644 --- a/regress/usr.bin/mandoc/mdoc/Cm/noarg.in +++ b/regress/usr.bin/mandoc/mdoc/Cm/noarg.in @@ -1,4 +1,4 @@ -.Dd July 2, 2014 +.Dd June 9, 2017 .Dt CM-NOARG 1 .Os OpenBSD .Sh NAME @@ -9,4 +9,4 @@ end of line: .Nm mt Fl f Ar device Cm .Pp middle of line: -.Nm ps Fl x Cm Fl o Cm command +.Nm ps Fl x Cm Fl o Cm command. diff --git a/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_ascii index 83186d1c7f3..2b6dea57c70 100644 --- a/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_ascii @@ -6,6 +6,6 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN end of line: mmtt --ff _d_e_v_i_c_e - middle of line: ppss --xx --oo ccoommmmaanndd + middle of line: ppss --xx --oo ccoommmmaanndd.. -OpenBSD July 2, 2014 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_lint b/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_lint index 3a828e5a786..6568e68713f 100644 --- a/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_lint @@ -1,2 +1,3 @@ mandoc: noarg.in:9:23: WARNING: skipping empty macro: Cm mandoc: noarg.in:12:13: WARNING: skipping empty macro: Cm +mandoc: noarg.in:12:31: STYLE: no blank before trailing delimiter: Cm command. diff --git a/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_markdown b/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_markdown index 6aff635372b..05ceb960fbc 100644 --- a/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_markdown @@ -10,6 +10,6 @@ end of line: **mt** **-f** *device* middle of line: -**ps** **-x** **-o** **command** +**ps** **-x** **-o** **command.** -OpenBSD - July 2, 2014 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Dq/Makefile b/regress/usr.bin/mandoc/mdoc/Dq/Makefile index 6901b17ce4e..d6cfc10649c 100644 --- a/regress/usr.bin/mandoc/mdoc/Dq/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Dq/Makefile @@ -1,5 +1,6 @@ -# $OpenBSD: Makefile,v 1.3 2017/03/08 22:53:35 schwarze Exp $ +# $OpenBSD: Makefile,v 1.4 2017/06/10 01:48:31 schwarze Exp $ REGRESS_TARGETS = empty +LINT_TARGETS = empty .include diff --git a/regress/usr.bin/mandoc/mdoc/Dq/empty.in b/regress/usr.bin/mandoc/mdoc/Dq/empty.in index 1d072d5ec8f..2e0282e45af 100644 --- a/regress/usr.bin/mandoc/mdoc/Dq/empty.in +++ b/regress/usr.bin/mandoc/mdoc/Dq/empty.in @@ -1,4 +1,4 @@ -.Dd October 21, 2010 +.Dd June 9, 2017 .Dt DQ-EMPTY 1 .Os OpenBSD .Sh NAME @@ -8,7 +8,7 @@ An empty .Dq and a full -.Dq "(" user@host +.Dq "(" user@host) quotation. And another -.Do "(" full Dc one "Sy" bold . +.Do "(" full) Dc one "Sy" bold . diff --git a/regress/usr.bin/mandoc/mdoc/Dq/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Dq/empty.out_ascii index 9f7c8bbe4ba..a5614e9ea1c 100644 --- a/regress/usr.bin/mandoc/mdoc/Dq/empty.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Dq/empty.out_ascii @@ -4,7 +4,7 @@ NNAAMMEE DDqq--eemmppttyy - empty implicit enclosure macros DDEESSCCRRIIPPTTIIOONN - An empty "" and a full ("user@host" quotation. And another ("full" one + An empty "" and a full ("user@host)" quotation. And another ("full)" one bboolldd. -OpenBSD October 21, 2010 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Dq/empty.out_lint b/regress/usr.bin/mandoc/mdoc/Dq/empty.out_lint new file mode 100644 index 00000000000..e69de29bb2d diff --git a/regress/usr.bin/mandoc/mdoc/Dq/empty.out_markdown b/regress/usr.bin/mandoc/mdoc/Dq/empty.out_markdown index b6188f5cdc7..927dacc8c69 100644 --- a/regress/usr.bin/mandoc/mdoc/Dq/empty.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Dq/empty.out_markdown @@ -9,9 +9,9 @@ DQ-EMPTY(1) - General Commands Manual An empty "" and a full -("user@host" +("user@host)" quotation. And another -("full" one **bold**. +("full)" one **bold**. -OpenBSD - October 21, 2010 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Dv/noarg.in b/regress/usr.bin/mandoc/mdoc/Dv/noarg.in index 86155b3ad47..a2b54d865f1 100644 --- a/regress/usr.bin/mandoc/mdoc/Dv/noarg.in +++ b/regress/usr.bin/mandoc/mdoc/Dv/noarg.in @@ -1,4 +1,4 @@ -.Dd July 2, 2014 +.Dd June 9, 2017 .Dt DV-NOARG 1 .Os OpenBSD .Sh NAME @@ -6,7 +6,7 @@ .Nd defined variable macro without an argument .Sh DESCRIPTION with variable: -.Dv NULL +.Dv NULL. no variable: .Dv end of test document diff --git a/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_ascii index b40d6635fcf..7e934d63ed4 100644 --- a/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE DDvv--nnooaarrgg - defined variable macro without an argument DDEESSCCRRIIPPTTIIOONN - with variable: NULL no variable: end of test document + with variable: NULL. no variable: end of test document -OpenBSD July 2, 2014 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_lint b/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_lint index cac45101ebe..6e6ad765d25 100644 --- a/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_lint @@ -1 +1,2 @@ mandoc: noarg.in:11:2: WARNING: skipping empty macro: Dv +mandoc: noarg.in:9:9: STYLE: no blank before trailing delimiter: Dv NULL. diff --git a/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_markdown b/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_markdown index 7d1f29d1416..6cb859d1e43 100644 --- a/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_markdown @@ -7,8 +7,8 @@ DV-NOARG(1) - General Commands Manual # DESCRIPTION with variable: -`NULL` +`NULL.` no variable: end of test document -OpenBSD - July 2, 2014 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Em/punct.in b/regress/usr.bin/mandoc/mdoc/Em/punct.in index a8e012e703f..5d3cc5145b0 100644 --- a/regress/usr.bin/mandoc/mdoc/Em/punct.in +++ b/regress/usr.bin/mandoc/mdoc/Em/punct.in @@ -1,4 +1,4 @@ -.Dd November 17, 2014 +.Dd June 9, 2017 .Dt EM-PUNCT 1 .Os OpenBSD .Sh NAME @@ -81,3 +81,6 @@ Quoted: .Em "a . b Nm" "Sy" bold .Em ". b Nm" .Em "." +.Pp +Missing blank: +.Em a. diff --git a/regress/usr.bin/mandoc/mdoc/Em/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Em/punct.out_ascii index e0f60dbe2bf..7ab059cb40c 100644 --- a/regress/usr.bin/mandoc/mdoc/Em/punct.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Em/punct.out_ascii @@ -23,4 +23,6 @@ DDEESSCCRRIIPPTTIIOONN Quoted: _a _. _b _N_m bboolldd _. _b _N_m . -OpenBSD November 17, 2014 OpenBSD + Missing blank: _a_. + +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Em/punct.out_lint b/regress/usr.bin/mandoc/mdoc/Em/punct.out_lint index cfcc04a7985..6408d24035a 100644 --- a/regress/usr.bin/mandoc/mdoc/Em/punct.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Em/punct.out_lint @@ -23,3 +23,4 @@ mandoc: punct.in:71:7: WARNING: skipping empty macro: Em mandoc: punct.in:74:7: WARNING: skipping empty macro: Em mandoc: punct.in:75:7: WARNING: skipping empty macro: Em mandoc: punct.in:83:2: WARNING: skipping empty macro: Em +mandoc: punct.in:86:6: STYLE: no blank before trailing delimiter: Em a. diff --git a/regress/usr.bin/mandoc/mdoc/Em/punct.out_markdown b/regress/usr.bin/mandoc/mdoc/Em/punct.out_markdown index 6cf5402d30c..114a1ac2cb7 100644 --- a/regress/usr.bin/mandoc/mdoc/Em/punct.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Em/punct.out_markdown @@ -83,4 +83,7 @@ Quoted: *. b Nm* . -OpenBSD - November 17, 2014 +Missing blank: +*a.* + +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Er/noarg.in b/regress/usr.bin/mandoc/mdoc/Er/noarg.in index 6dc2aea6f8a..646d3d5476c 100644 --- a/regress/usr.bin/mandoc/mdoc/Er/noarg.in +++ b/regress/usr.bin/mandoc/mdoc/Er/noarg.in @@ -1,4 +1,4 @@ -.Dd January 19, 2011 +.Dd June 9, 2017 .Dt ER-NOARG 1 .Os OpenBSD .Sh NAME @@ -7,6 +7,7 @@ .Sh DESCRIPTION with error: .Er ENOENT ";" "Sy" bold ; +.Er EIO. no error: .Er end of test document diff --git a/regress/usr.bin/mandoc/mdoc/Er/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Er/noarg.out_ascii index cd8cc77b6db..ed7b16a966b 100644 --- a/regress/usr.bin/mandoc/mdoc/Er/noarg.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Er/noarg.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE EErr--nnooaarrgg - error constant macro without an argument DDEESSCCRRIIPPTTIIOONN - with error: ENOENT; bboolldd; no error: end of test document + with error: ENOENT; bboolldd; EIO. no error: end of test document -OpenBSD January 19, 2011 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Er/noarg.out_lint b/regress/usr.bin/mandoc/mdoc/Er/noarg.out_lint index b8594294129..46b3136389a 100644 --- a/regress/usr.bin/mandoc/mdoc/Er/noarg.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Er/noarg.out_lint @@ -1 +1,2 @@ -mandoc: noarg.in:11:2: WARNING: skipping empty macro: Er +mandoc: noarg.in:12:2: WARNING: skipping empty macro: Er +mandoc: noarg.in:10:8: STYLE: no blank before trailing delimiter: Er EIO. diff --git a/regress/usr.bin/mandoc/mdoc/Er/noarg.out_markdown b/regress/usr.bin/mandoc/mdoc/Er/noarg.out_markdown index 17dba3d4293..47d378d815c 100644 --- a/regress/usr.bin/mandoc/mdoc/Er/noarg.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Er/noarg.out_markdown @@ -8,7 +8,8 @@ ER-NOARG(1) - General Commands Manual with error: `ENOENT`; **bold**; +`EIO.` no error: end of test document -OpenBSD - January 19, 2011 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Ev/noarg.in b/regress/usr.bin/mandoc/mdoc/Ev/noarg.in index 84c1815d6ce..953986b778a 100644 --- a/regress/usr.bin/mandoc/mdoc/Ev/noarg.in +++ b/regress/usr.bin/mandoc/mdoc/Ev/noarg.in @@ -1,4 +1,4 @@ -.Dd July 2, 2014 +.Dd June 9, 2017 .Dt EV-NOARG 1 .Os OpenBSD .Sh NAME @@ -6,7 +6,7 @@ .Nd environment variable macro without an argument .Sh DESCRIPTION with variable: -.Ev HOME +.Ev HOME. no variable: .Ev end of test document diff --git a/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_ascii index 11705a38882..f5dc1ad423b 100644 --- a/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE EEvv--nnooaarrgg - environment variable macro without an argument DDEESSCCRRIIPPTTIIOONN - with variable: HOME no variable: end of test document + with variable: HOME. no variable: end of test document -OpenBSD July 2, 2014 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_lint b/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_lint index a41541b077b..c08c135b94a 100644 --- a/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_lint @@ -1 +1,2 @@ mandoc: noarg.in:11:2: WARNING: skipping empty macro: Ev +mandoc: noarg.in:9:9: STYLE: no blank before trailing delimiter: Ev HOME. diff --git a/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_markdown b/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_markdown index fbba3683444..aad020eb307 100644 --- a/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_markdown @@ -7,8 +7,8 @@ EV-NOARG(1) - General Commands Manual # DESCRIPTION with variable: -`HOME` +`HOME.` no variable: end of test document -OpenBSD - July 2, 2014 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Fl/Makefile b/regress/usr.bin/mandoc/mdoc/Fl/Makefile index b74056e0caa..ea9ed630c7f 100644 --- a/regress/usr.bin/mandoc/mdoc/Fl/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Fl/Makefile @@ -1,5 +1,6 @@ -# $OpenBSD: Makefile,v 1.11 2017/03/08 22:53:35 schwarze Exp $ +# $OpenBSD: Makefile,v 1.12 2017/06/10 01:48:31 schwarze Exp $ REGRESS_TARGETS = noarg multiarg parsed punct font +LINT_TARGETS = punct .include diff --git a/regress/usr.bin/mandoc/mdoc/Fl/punct.in b/regress/usr.bin/mandoc/mdoc/Fl/punct.in index 8cc4c2febc4..a4da35fb8b7 100644 --- a/regress/usr.bin/mandoc/mdoc/Fl/punct.in +++ b/regress/usr.bin/mandoc/mdoc/Fl/punct.in @@ -1,4 +1,4 @@ -.Dd August 21, 2014 +.Dd June 9, 2017 .Dt FL-PUNCT 1 .Os OpenBSD .Sh NAME @@ -40,3 +40,6 @@ op bracket .Pp quoted punctuation: .Fl a "(" b "|" c ")" d "," "Em" italic . +.Pp +trailing delimiter: +.Fl a. diff --git a/regress/usr.bin/mandoc/mdoc/Fl/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Fl/punct.out_ascii index 1ef60d4dfb7..cf8a15c2cd2 100644 --- a/regress/usr.bin/mandoc/mdoc/Fl/punct.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Fl/punct.out_ascii @@ -11,4 +11,6 @@ DDEESSCCRRIIPPTTIIOONN quoted punctuation: --aa (--bb | --cc) --dd, _i_t_a_l_i_c. -OpenBSD August 21, 2014 OpenBSD + trailing delimiter: --aa.. + +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Fl/punct.out_lint b/regress/usr.bin/mandoc/mdoc/Fl/punct.out_lint new file mode 100644 index 00000000000..a792bbf719c --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Fl/punct.out_lint @@ -0,0 +1 @@ +mandoc: punct.in:45:6: STYLE: no blank before trailing delimiter: Fl a. diff --git a/regress/usr.bin/mandoc/mdoc/Fl/punct.out_markdown b/regress/usr.bin/mandoc/mdoc/Fl/punct.out_markdown index 54d10ae59d8..562ff295658 100644 --- a/regress/usr.bin/mandoc/mdoc/Fl/punct.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Fl/punct.out_markdown @@ -42,4 +42,7 @@ op bracket quoted punctuation: **-a** (**-b** | **-c**) **-d**, *italic*. -OpenBSD - August 21, 2014 +trailing delimiter: +**-a.** + +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Fo/Makefile b/regress/usr.bin/mandoc/mdoc/Fo/Makefile index 059fa0e3b92..34be618d7cc 100644 --- a/regress/usr.bin/mandoc/mdoc/Fo/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Fo/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.15 2017/03/08 22:53:35 schwarze Exp $ +# $OpenBSD: Makefile,v 1.16 2017/06/10 01:48:31 schwarze Exp $ REGRESS_TARGETS = basic break eos font noarg nohead REGRESS_TARGETS += obsolete punct section warn -LINT_TARGETS = noarg nohead obsolete warn +LINT_TARGETS = noarg nohead obsolete punct warn # groff-1.22.3 defects: # - .Fo without an argument prints unbalanced parentheses diff --git a/regress/usr.bin/mandoc/mdoc/Fo/punct.in b/regress/usr.bin/mandoc/mdoc/Fo/punct.in index e1657ec7104..d17b5330c82 100644 --- a/regress/usr.bin/mandoc/mdoc/Fo/punct.in +++ b/regress/usr.bin/mandoc/mdoc/Fo/punct.in @@ -6,8 +6,8 @@ .Nd punctuation on function input lines .Sh DESCRIPTION .Ft double -.Fn sin "," cos "Em" italic +.Fn sin. "," cos "Em" italic .Pp -.Fa x "," y "Sy" bold +.Fa x "," y: "Sy" bold .Pp -.Ft int "," float "Sy" bold +.Ft int "," float: "Sy" bold diff --git a/regress/usr.bin/mandoc/mdoc/Fo/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Fo/punct.out_ascii index febf646e0dd..26c31776e8f 100644 --- a/regress/usr.bin/mandoc/mdoc/Fo/punct.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Fo/punct.out_ascii @@ -4,10 +4,10 @@ NNAAMMEE FFoo--ppuunncctt - punctuation on function input lines DDEESSCCRRIIPPTTIIOONN - _d_o_u_b_l_e ssiinn(), cos _i_t_a_l_i_c + _d_o_u_b_l_e ssiinn..(), cos _i_t_a_l_i_c - _x, _y bboolldd + _x, _y_: bboolldd - _i_n_t, _f_l_o_a_t bboolldd + _i_n_t, _f_l_o_a_t_: bboolldd OpenBSD May 20, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Fo/punct.out_lint b/regress/usr.bin/mandoc/mdoc/Fo/punct.out_lint new file mode 100644 index 00000000000..a39cf959210 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Fo/punct.out_lint @@ -0,0 +1,3 @@ +mandoc: punct.in:9:8: STYLE: no blank before trailing delimiter: Fn sin. +mandoc: punct.in:11:12: STYLE: no blank before trailing delimiter: Fa y: +mandoc: punct.in:13:18: STYLE: no blank before trailing delimiter: Ft float: diff --git a/regress/usr.bin/mandoc/mdoc/Fo/punct.out_markdown b/regress/usr.bin/mandoc/mdoc/Fo/punct.out_markdown index 88524f6fedf..6e9fe5ff340 100644 --- a/regress/usr.bin/mandoc/mdoc/Fo/punct.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Fo/punct.out_markdown @@ -7,10 +7,10 @@ FO-PUNCT(1) - General Commands Manual # DESCRIPTION *double* -**sin**(), cos *italic* +**sin.**(), cos *italic* -*x*, *y* **bold** +*x*, *y:* **bold** -*int*, *float* **bold** +*int*, *float:* **bold** OpenBSD - May 20, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Ic/noarg.in b/regress/usr.bin/mandoc/mdoc/Ic/noarg.in index 76c22e7b517..2c4bf670d4e 100644 --- a/regress/usr.bin/mandoc/mdoc/Ic/noarg.in +++ b/regress/usr.bin/mandoc/mdoc/Ic/noarg.in @@ -1,4 +1,4 @@ -.Dd January 19, 2011 +.Dd June 9, 2017 .Dt IC-NOARG 1 .Os OpenBSD .Sh NAME @@ -6,7 +6,7 @@ .Nd interactive command without an argument .Sh DESCRIPTION with command: -.Ic ls +.Ic ls. no command: .Ic end of test document diff --git a/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_ascii index c5dda265ffa..8899a951445 100644 --- a/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE IIcc--nnooaarrgg - interactive command without an argument DDEESSCCRRIIPPTTIIOONN - with command: llss no command: end of test document + with command: llss.. no command: end of test document -OpenBSD January 19, 2011 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_lint b/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_lint index 5ae495bd403..9520793e89a 100644 --- a/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_lint @@ -1 +1,2 @@ mandoc: noarg.in:11:2: WARNING: skipping empty macro: Ic +mandoc: noarg.in:9:7: STYLE: no blank before trailing delimiter: Ic ls. diff --git a/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_markdown b/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_markdown index de7e6143a60..38162de3b9a 100644 --- a/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_markdown @@ -7,8 +7,8 @@ IC-NOARG(1) - General Commands Manual # DESCRIPTION with command: -**ls** +**ls.** no command: end of test document -OpenBSD - January 19, 2011 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/In/noarg.in b/regress/usr.bin/mandoc/mdoc/In/noarg.in index f443637a6e5..1952e868939 100644 --- a/regress/usr.bin/mandoc/mdoc/In/noarg.in +++ b/regress/usr.bin/mandoc/mdoc/In/noarg.in @@ -12,7 +12,7 @@ .Ft double .Fn cos "double x" .Sh DESCRIPTION -.In math.h +.In math.h: .Ft double .Fn sin "double x" .In diff --git a/regress/usr.bin/mandoc/mdoc/In/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/In/noarg.out_ascii index 1a86acd619e..7a4bf1730f6 100644 --- a/regress/usr.bin/mandoc/mdoc/In/noarg.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/In/noarg.out_ascii @@ -13,6 +13,6 @@ SSYYNNOOPPSSIISS ccooss(_d_o_u_b_l_e _x); DDEESSCCRRIIPPTTIIOONN - <_m_a_t_h_._h> _d_o_u_b_l_e ssiinn(_d_o_u_b_l_e _x) _d_o_u_b_l_e ccooss(_d_o_u_b_l_e _x) + <_m_a_t_h_._h_:> _d_o_u_b_l_e ssiinn(_d_o_u_b_l_e _x) _d_o_u_b_l_e ccooss(_d_o_u_b_l_e _x) OpenBSD February 5, 2015 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/In/noarg.out_lint b/regress/usr.bin/mandoc/mdoc/In/noarg.out_lint index 3b4e6d2237a..17f8040410d 100644 --- a/regress/usr.bin/mandoc/mdoc/In/noarg.out_lint +++ b/regress/usr.bin/mandoc/mdoc/In/noarg.out_lint @@ -1,2 +1,3 @@ mandoc: noarg.in:11:2: WARNING: skipping empty macro: In mandoc: noarg.in:18:2: WARNING: skipping empty macro: In +mandoc: noarg.in:15:11: STYLE: no blank before trailing delimiter: In math.h: diff --git a/regress/usr.bin/mandoc/mdoc/In/noarg.out_markdown b/regress/usr.bin/mandoc/mdoc/In/noarg.out_markdown index 81970226bd2..8a39b83acc5 100644 --- a/regress/usr.bin/mandoc/mdoc/In/noarg.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/In/noarg.out_markdown @@ -16,7 +16,7 @@ IN-NOARG(2) - System Calls Manual # DESCRIPTION -<*math.h*> +<*math.h:*> *double* **sin**(*double x*) *double* diff --git a/regress/usr.bin/mandoc/mdoc/Lb/badargs.in b/regress/usr.bin/mandoc/mdoc/Lb/badargs.in index f1fea204577..558eef2f925 100644 --- a/regress/usr.bin/mandoc/mdoc/Lb/badargs.in +++ b/regress/usr.bin/mandoc/mdoc/Lb/badargs.in @@ -1,10 +1,10 @@ -.Dd January 2, 2011 +.Dd June 9, 2017 .Dt LB-BADARGS 3 .Os OpenBSD .Sh NAME .Nm Lb-badargs .Nd bad arguments to the library macro .Sh LIBRARY -.Lb murks +.Lb murks. .Lb -.Lb mylib another +.Lb mylib another. diff --git a/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_ascii b/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_ascii index cfc2b0ff0c6..db55ffd1d53 100644 --- a/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_ascii @@ -4,7 +4,7 @@ NNAAMMEE LLbb--bbaaddaarrggss - bad arguments to the library macro LLIIBBRRAARRYY - library "murks" - library "mylib" another + library "murks." + library "mylib" another. -OpenBSD January 2, 2011 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_lint b/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_lint index 52af647dee6..6ca4ed302d0 100644 --- a/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_lint @@ -1 +1,3 @@ mandoc: badargs.in:9:2: WARNING: skipping empty macro: Lb +mandoc: badargs.in:8:10: STYLE: no blank before trailing delimiter: Lb murks. +mandoc: badargs.in:10:18: STYLE: no blank before trailing delimiter: Lb ... another. diff --git a/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_markdown b/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_markdown index 132b2f9f2b4..9eebe89e216 100644 --- a/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_markdown @@ -6,7 +6,7 @@ LB-BADARGS(3) - Library Functions Manual # LIBRARY -library “murks” -library “mylib” another +library “murks.” +library “mylib” another. -OpenBSD - January 2, 2011 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Li/punct.in b/regress/usr.bin/mandoc/mdoc/Li/punct.in index 025657701ff..434b7e6f55c 100644 --- a/regress/usr.bin/mandoc/mdoc/Li/punct.in +++ b/regress/usr.bin/mandoc/mdoc/Li/punct.in @@ -1,4 +1,4 @@ -.Dd November 17, 2014 +.Dd June 9, 2017 .Dt LI-PUNCT 1 .Os OpenBSD .Sh NAME @@ -81,3 +81,6 @@ Quoted: .Li "a . b Nm" "Sy" bold .Li ". b Nm" .Li "." +.Pp +Missing blank: +.Li a. diff --git a/regress/usr.bin/mandoc/mdoc/Li/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Li/punct.out_ascii index d0de6c9aa71..da684890597 100644 --- a/regress/usr.bin/mandoc/mdoc/Li/punct.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Li/punct.out_ascii @@ -23,4 +23,6 @@ DDEESSCCRRIIPPTTIIOONN Quoted: a . b Nm bboolldd . b Nm . -OpenBSD November 17, 2014 OpenBSD + Missing blank: a. + +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Li/punct.out_lint b/regress/usr.bin/mandoc/mdoc/Li/punct.out_lint index bdce45c67d7..fc2a2110ae4 100644 --- a/regress/usr.bin/mandoc/mdoc/Li/punct.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Li/punct.out_lint @@ -23,3 +23,4 @@ mandoc: punct.in:71:7: WARNING: skipping empty macro: Li mandoc: punct.in:74:7: WARNING: skipping empty macro: Li mandoc: punct.in:75:7: WARNING: skipping empty macro: Li mandoc: punct.in:83:2: WARNING: skipping empty macro: Li +mandoc: punct.in:86:6: STYLE: no blank before trailing delimiter: Li a. diff --git a/regress/usr.bin/mandoc/mdoc/Li/punct.out_markdown b/regress/usr.bin/mandoc/mdoc/Li/punct.out_markdown index 97110e220d5..fde70399674 100644 --- a/regress/usr.bin/mandoc/mdoc/Li/punct.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Li/punct.out_markdown @@ -83,4 +83,7 @@ Quoted: `. b Nm` . -OpenBSD - November 17, 2014 +Missing blank: +`a.` + +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Lk/noarg.in b/regress/usr.bin/mandoc/mdoc/Lk/noarg.in index 910f641cb86..19d9d30c3c7 100644 --- a/regress/usr.bin/mandoc/mdoc/Lk/noarg.in +++ b/regress/usr.bin/mandoc/mdoc/Lk/noarg.in @@ -1,4 +1,4 @@ -.Dd January 19, 2011 +.Dd June 9, 2017 .Dt LK-NOARG 1 .Os OpenBSD .Sh NAME @@ -9,9 +9,9 @@ multiple arguments .Lk http://www.bsd.lv/ the bsd.lv project , .Lk http://www.gnu.org/software/groff/ GNU troff "," two arguments -.Lk http://mdocml.bsd.lv/ mandoc +.Lk http://mdocml.bsd.lv/ mandoc, one argument -.Lk http://www.openbsd.org/ +.Lk http://www.openbsd.org/, no argument .Lk .Pp diff --git a/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_ascii index a0cec52a012..5347cf7b540 100644 --- a/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_ascii @@ -6,9 +6,9 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN multiple arguments _t_h_e _b_s_d_._l_v _p_r_o_j_e_c_t: hhttttpp::////wwwwww..bbssdd..llvv//, _G_N_U _t_r_o_f_f: hhttttpp::////wwwwww..ggnnuu..oorrgg//ssooffttwwaarree//ggrrooffff//, - two arguments _m_a_n_d_o_c: hhttttpp::////mmddooccmmll..bbssdd..llvv// one argument - hhttttpp::////wwwwww..ooppeennbbssdd..oorrgg// no argument + two arguments _m_a_n_d_o_c_,: hhttttpp::////mmddooccmmll..bbssdd..llvv// one argument + hhttttpp::////wwwwww..ooppeennbbssdd..oorrgg//,, no argument end of test document -OpenBSD January 19, 2011 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_lint b/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_lint index ff99c3575bb..47c5b9ca1c9 100644 --- a/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_lint @@ -1 +1,3 @@ mandoc: noarg.in:16:2: WARNING: skipping empty macro: Lk +mandoc: noarg.in:12:33: STYLE: no blank before trailing delimiter: Lk ... mandoc, +mandoc: noarg.in:14:28: STYLE: no blank before trailing delimiter: Lk http://www.openbsd.org/, diff --git a/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_markdown b/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_markdown index 27aaec2c583..56964f69b94 100644 --- a/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_markdown @@ -10,11 +10,11 @@ multiple arguments [the bsd.lv project](http://www.bsd.lv/), [GNU troff](http://www.gnu.org/software/groff/), two arguments -[mandoc](http://mdocml.bsd.lv/) +[mandoc,](http://mdocml.bsd.lv/) one argument -[http://www.openbsd.org/](http://www.openbsd.org/) +[http://www.openbsd.org/,](http://www.openbsd.org/,) no argument end of test document -OpenBSD - January 19, 2011 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Ms/noarg.in b/regress/usr.bin/mandoc/mdoc/Ms/noarg.in index ae283587bd1..9c9d83f66f6 100644 --- a/regress/usr.bin/mandoc/mdoc/Ms/noarg.in +++ b/regress/usr.bin/mandoc/mdoc/Ms/noarg.in @@ -1,12 +1,12 @@ -.Dd January 19, 2011 +.Dd June 19, 2017 .Dt MS-NOARG 1 .Os OpenBSD .Sh NAME .Nm Ms-noarg .Nd mathematical symbol without an argument .Sh DESCRIPTION -with command: -.Ms alpha -no command: +with symbol: +.Ms alpha. +no symbol: .Ms end of test document diff --git a/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_ascii index fa90d0f38bd..7f219925542 100644 --- a/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE MMss--nnooaarrgg - mathematical symbol without an argument DDEESSCCRRIIPPTTIIOONN - with command: aallpphhaa no command: end of test document + with symbol: aallpphhaa.. no symbol: end of test document -OpenBSD January 19, 2011 OpenBSD +OpenBSD June 19, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_lint b/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_lint index 265fb3e677e..8535ec9c97f 100644 --- a/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_lint @@ -1 +1,2 @@ mandoc: noarg.in:11:2: WARNING: skipping empty macro: Ms +mandoc: noarg.in:9:10: STYLE: no blank before trailing delimiter: Ms alpha. diff --git a/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_markdown b/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_markdown index 5146653e989..65c8466d5ce 100644 --- a/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_markdown @@ -6,9 +6,9 @@ MS-NOARG(1) - General Commands Manual # DESCRIPTION -with command: -**alpha** -no command: +with symbol: +**alpha.** +no symbol: end of test document -OpenBSD - January 19, 2011 +OpenBSD - June 19, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Mt/Makefile b/regress/usr.bin/mandoc/mdoc/Mt/Makefile index 502ee03d023..382c03a7030 100644 --- a/regress/usr.bin/mandoc/mdoc/Mt/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Mt/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.7 2017/03/08 22:53:35 schwarze Exp $ +# $OpenBSD: Makefile,v 1.8 2017/06/10 01:48:31 schwarze Exp $ REGRESS_TARGETS = simple font +LINT_TARGETS = simple # it's unclear what font changes in link destinations should do diff --git a/regress/usr.bin/mandoc/mdoc/Mt/simple.in b/regress/usr.bin/mandoc/mdoc/Mt/simple.in index 16afb2da1e5..8e7a70ba7a9 100644 --- a/regress/usr.bin/mandoc/mdoc/Mt/simple.in +++ b/regress/usr.bin/mandoc/mdoc/Mt/simple.in @@ -1,4 +1,4 @@ -.Dd February 17, 2010 +.Dd June 9, 2017 .Dt MT-SIMPLE 1 .Os OpenBSD .Sh NAME @@ -8,5 +8,8 @@ Please send mail to .Mt schwarze@openbsd.org ";" "Sy" bold . .Pp +Pay attention to +.Mt punctuation@localhost. +.Pp Do not send mail to .Mt . diff --git a/regress/usr.bin/mandoc/mdoc/Mt/simple.out_ascii b/regress/usr.bin/mandoc/mdoc/Mt/simple.out_ascii index 7b2ea5458e0..364a6af6775 100644 --- a/regress/usr.bin/mandoc/mdoc/Mt/simple.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Mt/simple.out_ascii @@ -6,6 +6,8 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN Please send mail to _s_c_h_w_a_r_z_e_@_o_p_e_n_b_s_d_._o_r_g; bboolldd. + Pay attention to _p_u_n_c_t_u_a_t_i_o_n_@_l_o_c_a_l_h_o_s_t_. + Do not send mail to _~. -OpenBSD February 17, 2010 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Mt/simple.out_lint b/regress/usr.bin/mandoc/mdoc/Mt/simple.out_lint new file mode 100644 index 00000000000..d8e4a1e359f --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Mt/simple.out_lint @@ -0,0 +1 @@ +mandoc: simple.in:12:26: STYLE: no blank before trailing delimiter: Mt punctuation@localhost. diff --git a/regress/usr.bin/mandoc/mdoc/Mt/simple.out_markdown b/regress/usr.bin/mandoc/mdoc/Mt/simple.out_markdown index 9281fee5356..d00df48d548 100644 --- a/regress/usr.bin/mandoc/mdoc/Mt/simple.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Mt/simple.out_markdown @@ -9,7 +9,10 @@ MT-SIMPLE(1) - General Commands Manual Please send mail to [schwarze@openbsd.org](mailto:schwarze@openbsd.org); **bold**. +Pay attention to +[punctuation@localhost.](mailto:punctuation@localhost.) + Do not send mail to [~](mailto:~). -OpenBSD - February 17, 2010 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Nm/Makefile b/regress/usr.bin/mandoc/mdoc/Nm/Makefile index df69d0bc697..114bb2632a6 100644 --- a/regress/usr.bin/mandoc/mdoc/Nm/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Nm/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.16 2017/03/08 22:53:35 schwarze Exp $ +# $OpenBSD: Makefile,v 1.17 2017/06/10 01:48:31 schwarze Exp $ REGRESS_TARGETS = badNAME badNAMEuse break broken REGRESS_TARGETS += empty emptyNAME emptyNAMEuse REGRESS_TARGETS += font long par parns punct -LINT_TARGETS = badNAME badNAMEuse break broken +LINT_TARGETS = badNAME badNAMEuse break broken punct # groff-1.22.3/mandoc differences: # - When the head of an Nm block in the SYNOPSIS is broken by an diff --git a/regress/usr.bin/mandoc/mdoc/Nm/punct.in b/regress/usr.bin/mandoc/mdoc/Nm/punct.in index 254adfdf668..4cc3574b336 100644 --- a/regress/usr.bin/mandoc/mdoc/Nm/punct.in +++ b/regress/usr.bin/mandoc/mdoc/Nm/punct.in @@ -1,4 +1,4 @@ -.Dd August 21, 2014 +.Dd June 9, 2017 .Dt NM-PUNCT 1 .Os OpenBSD .Sh NAME @@ -37,3 +37,6 @@ op paren .Nm ( a op bracket .Nm [ a +.Pp +Missing blank: +.Nm Nm-punct. diff --git a/regress/usr.bin/mandoc/mdoc/Nm/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/punct.out_ascii index 74cb98f45f1..76d1c1f61ff 100644 --- a/regress/usr.bin/mandoc/mdoc/Nm/punct.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Nm/punct.out_ascii @@ -9,4 +9,6 @@ DDEESSCCRRIIPPTTIIOONN NNmm--ppuunncctt; z colon NNmm--ppuunncctt: z quest NNmm--ppuunncctt? z excl NNmm--ppuunncctt! z paren NNmm--ppuunncctt) z bracket NNmm--ppuunncctt] z bar | mm op paren (aa op bracket [aa -OpenBSD August 21, 2014 OpenBSD + Missing blank: NNmm--ppuunncctt.. + +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Nm/punct.out_lint b/regress/usr.bin/mandoc/mdoc/Nm/punct.out_lint new file mode 100644 index 00000000000..45f906b394b --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Nm/punct.out_lint @@ -0,0 +1 @@ +mandoc: punct.in:42:13: STYLE: no blank before trailing delimiter: Nm Nm-punct. diff --git a/regress/usr.bin/mandoc/mdoc/Nm/punct.out_markdown b/regress/usr.bin/mandoc/mdoc/Nm/punct.out_markdown index ad8482402c9..132275ab96a 100644 --- a/regress/usr.bin/mandoc/mdoc/Nm/punct.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Nm/punct.out_markdown @@ -39,4 +39,7 @@ op paren op bracket \[**a** -OpenBSD - August 21, 2014 +Missing blank: +**Nm-punct.** + +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/No/punct.in b/regress/usr.bin/mandoc/mdoc/No/punct.in index c952c7c4ae3..06615231bee 100644 --- a/regress/usr.bin/mandoc/mdoc/No/punct.in +++ b/regress/usr.bin/mandoc/mdoc/No/punct.in @@ -1,4 +1,4 @@ -.Dd November 17, 2014 +.Dd June 9, 2017 .Dt NO-PUNCT 1 .Os OpenBSD .Sh NAME @@ -81,3 +81,6 @@ Quoted: .No "a . b Nm" "Sy" bold .No ". b Nm" .No "." +.Pp +Missing blank: +.No a. diff --git a/regress/usr.bin/mandoc/mdoc/No/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/No/punct.out_ascii index 94252d88d06..0cf3d7f483c 100644 --- a/regress/usr.bin/mandoc/mdoc/No/punct.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/No/punct.out_ascii @@ -23,4 +23,6 @@ DDEESSCCRRIIPPTTIIOONN Quoted: a . b Nm bboolldd . b Nm . -OpenBSD November 17, 2014 OpenBSD + Missing blank: a. + +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/No/punct.out_lint b/regress/usr.bin/mandoc/mdoc/No/punct.out_lint index e46cd67fd5b..1543048690a 100644 --- a/regress/usr.bin/mandoc/mdoc/No/punct.out_lint +++ b/regress/usr.bin/mandoc/mdoc/No/punct.out_lint @@ -23,3 +23,4 @@ mandoc: punct.in:71:7: WARNING: skipping empty macro: No mandoc: punct.in:74:7: WARNING: skipping empty macro: No mandoc: punct.in:75:7: WARNING: skipping empty macro: No mandoc: punct.in:83:2: WARNING: skipping empty macro: No +mandoc: punct.in:86:6: STYLE: no blank before trailing delimiter: No a. diff --git a/regress/usr.bin/mandoc/mdoc/No/punct.out_markdown b/regress/usr.bin/mandoc/mdoc/No/punct.out_markdown index 6dd09c85d95..daa2f9237be 100644 --- a/regress/usr.bin/mandoc/mdoc/No/punct.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/No/punct.out_markdown @@ -83,4 +83,7 @@ a . b Nm **bold** . b Nm . -OpenBSD - November 17, 2014 +Missing blank: +a. + +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Oo/Makefile b/regress/usr.bin/mandoc/mdoc/Oo/Makefile index fad308c1f3c..f79a4d070fa 100644 --- a/regress/usr.bin/mandoc/mdoc/Oo/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Oo/Makefile @@ -1,5 +1,6 @@ -# $OpenBSD: Makefile,v 1.3 2017/03/08 22:53:35 schwarze Exp $ +# $OpenBSD: Makefile,v 1.4 2017/06/10 01:48:31 schwarze Exp $ REGRESS_TARGETS = punct +LINT_TARGETS = punct .include diff --git a/regress/usr.bin/mandoc/mdoc/Oo/punct.in b/regress/usr.bin/mandoc/mdoc/Oo/punct.in index 59ea4bb7cb1..80e2da6e15d 100644 --- a/regress/usr.bin/mandoc/mdoc/Oo/punct.in +++ b/regress/usr.bin/mandoc/mdoc/Oo/punct.in @@ -1,4 +1,4 @@ -.Dd July 6, 2012 +.Dd June 9, 2017 .Dt OO-PUNCT 1 .Os OpenBSD .Sh NAME @@ -21,3 +21,7 @@ at the end: .Oo Oo a ( .Oc | .Oc +.Pp +missing blank: +.Oo a. +.Oc diff --git a/regress/usr.bin/mandoc/mdoc/Oo/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Oo/punct.out_ascii index 68addf8d9db..23fabbcb344 100644 --- a/regress/usr.bin/mandoc/mdoc/Oo/punct.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Oo/punct.out_ascii @@ -10,4 +10,6 @@ DDEESSCCRRIIPPTTIIOONN at the end: [[a (] |] -OpenBSD July 6, 2012 OpenBSD + missing blank: [a.] + +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Oo/punct.out_lint b/regress/usr.bin/mandoc/mdoc/Oo/punct.out_lint new file mode 100644 index 00000000000..fa02f065575 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Oo/punct.out_lint @@ -0,0 +1 @@ +mandoc: punct.in:26:6: STYLE: no blank before trailing delimiter: Oo a. diff --git a/regress/usr.bin/mandoc/mdoc/Oo/punct.out_markdown b/regress/usr.bin/mandoc/mdoc/Oo/punct.out_markdown index e6525b1dcdc..6527e5e1a5b 100644 --- a/regress/usr.bin/mandoc/mdoc/Oo/punct.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Oo/punct.out_markdown @@ -20,4 +20,7 @@ at the end: \[\[a (] |] -OpenBSD - July 6, 2012 +missing blank: +\[a.] + +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Op/Makefile b/regress/usr.bin/mandoc/mdoc/Op/Makefile index 3cbaabc227c..6bac1ba857f 100644 --- a/regress/usr.bin/mandoc/mdoc/Op/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Op/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.5 2017/03/08 22:53:35 schwarze Exp $ +# $OpenBSD: Makefile,v 1.6 2017/06/10 01:48:31 schwarze Exp $ REGRESS_TARGETS = break broken punct -LINT_TARGETS = break broken +LINT_TARGETS = break broken punct SKIP_GROFF = break SKIP_ASCII = break diff --git a/regress/usr.bin/mandoc/mdoc/Op/punct.in b/regress/usr.bin/mandoc/mdoc/Op/punct.in index 7bc993320ad..7c09e574fc6 100644 --- a/regress/usr.bin/mandoc/mdoc/Op/punct.in +++ b/regress/usr.bin/mandoc/mdoc/Op/punct.in @@ -1,4 +1,4 @@ -.Dd June 24, 2011 +.Dd June 9, 2017 .Dt OP-PUNCT 1 .Os OpenBSD .Sh NAME @@ -29,3 +29,6 @@ more than one: .Op ( ( .Op | | .Op . . +.Pp +Missing blank: +.Op a. diff --git a/regress/usr.bin/mandoc/mdoc/Op/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Op/punct.out_ascii index 53251b526c9..3f5b22cd241 100644 --- a/regress/usr.bin/mandoc/mdoc/Op/punct.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Op/punct.out_ascii @@ -14,4 +14,6 @@ DDEESSCCRRIIPPTTIIOONN more than one: (([] [| |] [].. -OpenBSD June 24, 2011 OpenBSD + Missing blank: [a.] + +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Op/punct.out_lint b/regress/usr.bin/mandoc/mdoc/Op/punct.out_lint new file mode 100644 index 00000000000..fff31aea294 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Op/punct.out_lint @@ -0,0 +1 @@ +mandoc: punct.in:34:6: STYLE: no blank before trailing delimiter: Op a. diff --git a/regress/usr.bin/mandoc/mdoc/Op/punct.out_markdown b/regress/usr.bin/mandoc/mdoc/Op/punct.out_markdown index 114bd7af9bb..98ee2e72abc 100644 --- a/regress/usr.bin/mandoc/mdoc/Op/punct.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Op/punct.out_markdown @@ -31,4 +31,7 @@ more than one: \[| |] \[].. -OpenBSD - June 24, 2011 +Missing blank: +\[a.] + +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Pa/Makefile b/regress/usr.bin/mandoc/mdoc/Pa/Makefile index 535a2e75363..39ebf00cccb 100644 --- a/regress/usr.bin/mandoc/mdoc/Pa/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Pa/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.6 2017/03/08 22:53:35 schwarze Exp $ +# $OpenBSD: Makefile,v 1.7 2017/06/10 01:48:31 schwarze Exp $ REGRESS_TARGETS = font punct +LINT_TARGETS = punct # XXX The FILES target doesn't currently work. diff --git a/regress/usr.bin/mandoc/mdoc/Pa/punct.in b/regress/usr.bin/mandoc/mdoc/Pa/punct.in index c243d74286b..36dac9e5701 100644 --- a/regress/usr.bin/mandoc/mdoc/Pa/punct.in +++ b/regress/usr.bin/mandoc/mdoc/Pa/punct.in @@ -1,4 +1,4 @@ -.Dd August 21, 2014 +.Dd June 9, 2017 .Dt PA-PUNCT 1 .Os OpenBSD .Sh NAME @@ -40,3 +40,6 @@ op bracket .Pp quoted punctuation: .Pa a "(" b "|" c ")" d "," "Sy" bold . +.Pp +missing blank: +.Pa a. diff --git a/regress/usr.bin/mandoc/mdoc/Pa/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Pa/punct.out_ascii index ee2a7ed6b96..6dabc34882d 100644 --- a/regress/usr.bin/mandoc/mdoc/Pa/punct.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Pa/punct.out_ascii @@ -10,4 +10,6 @@ DDEESSCCRRIIPPTTIIOONN quoted punctuation: _a (_b | _c) _d, bboolldd. -OpenBSD August 21, 2014 OpenBSD + missing blank: _a_. + +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Pa/punct.out_lint b/regress/usr.bin/mandoc/mdoc/Pa/punct.out_lint new file mode 100644 index 00000000000..5c50094ff38 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Pa/punct.out_lint @@ -0,0 +1 @@ +mandoc: punct.in:45:6: STYLE: no blank before trailing delimiter: Pa a. diff --git a/regress/usr.bin/mandoc/mdoc/Pa/punct.out_markdown b/regress/usr.bin/mandoc/mdoc/Pa/punct.out_markdown index 3730d72401f..6c6883a673b 100644 --- a/regress/usr.bin/mandoc/mdoc/Pa/punct.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Pa/punct.out_markdown @@ -42,4 +42,7 @@ op bracket quoted punctuation: *a* (*b* | *c*) *d*, **bold**. -OpenBSD - August 21, 2014 +missing blank: +*a.* + +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Qq/Makefile b/regress/usr.bin/mandoc/mdoc/Qq/Makefile index f1a9f18311d..eb7b05b4397 100644 --- a/regress/usr.bin/mandoc/mdoc/Qq/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Qq/Makefile @@ -1,5 +1,6 @@ -# $OpenBSD: Makefile,v 1.3 2017/03/08 22:53:35 schwarze Exp $ +# $OpenBSD: Makefile,v 1.4 2017/06/10 01:48:31 schwarze Exp $ REGRESS_TARGETS = empty +LINT_TARGETS = empty .include diff --git a/regress/usr.bin/mandoc/mdoc/Qq/empty.in b/regress/usr.bin/mandoc/mdoc/Qq/empty.in index 81bd207e59e..b7550375ed7 100644 --- a/regress/usr.bin/mandoc/mdoc/Qq/empty.in +++ b/regress/usr.bin/mandoc/mdoc/Qq/empty.in @@ -1,4 +1,4 @@ -.Dd October 21, 2010 +.Dd June 9, 2017 .Dt QQ-EMPTY 1 .Os OpenBSD .Sh NAME @@ -8,7 +8,7 @@ An empty .Qq and a full -.Qq "(" user@host +.Qq "(" user@host) quotation. And another -.Qo "(" full Qc one "Sy" bold . +.Qo "(" full) Qc one "Sy" bold . diff --git a/regress/usr.bin/mandoc/mdoc/Qq/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Qq/empty.out_ascii index a191f455050..44f7960d132 100644 --- a/regress/usr.bin/mandoc/mdoc/Qq/empty.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Qq/empty.out_ascii @@ -4,7 +4,7 @@ NNAAMMEE QQqq--eemmppttyy - empty implicit enclosure macros DDEESSCCRRIIPPTTIIOONN - An empty "" and a full ("user@host" quotation. And another ("full" one + An empty "" and a full ("user@host)" quotation. And another ("full)" one bboolldd. -OpenBSD October 21, 2010 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Qq/empty.out_lint b/regress/usr.bin/mandoc/mdoc/Qq/empty.out_lint new file mode 100644 index 00000000000..4d0f7932d5f --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Qq/empty.out_lint @@ -0,0 +1,2 @@ +mandoc: empty.in:11:18: STYLE: no blank before trailing delimiter: Qq user@host) +mandoc: empty.in:14:13: STYLE: no blank before trailing delimiter: Qo full) diff --git a/regress/usr.bin/mandoc/mdoc/Qq/empty.out_markdown b/regress/usr.bin/mandoc/mdoc/Qq/empty.out_markdown index beb8cb30117..f6dd12e7c4b 100644 --- a/regress/usr.bin/mandoc/mdoc/Qq/empty.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Qq/empty.out_markdown @@ -9,9 +9,9 @@ QQ-EMPTY(1) - General Commands Manual An empty "" and a full -("user@host" +("user@host)" quotation. And another -("full" one **bold**. +("full)" one **bold**. -OpenBSD - October 21, 2010 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Sq/Makefile b/regress/usr.bin/mandoc/mdoc/Sq/Makefile index be5b7c537cc..d6cfc10649c 100644 --- a/regress/usr.bin/mandoc/mdoc/Sq/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Sq/Makefile @@ -1,5 +1,6 @@ -# $OpenBSD: Makefile,v 1.3 2017/03/08 22:53:36 schwarze Exp $ +# $OpenBSD: Makefile,v 1.4 2017/06/10 01:48:31 schwarze Exp $ REGRESS_TARGETS = empty +LINT_TARGETS = empty .include diff --git a/regress/usr.bin/mandoc/mdoc/Sq/empty.in b/regress/usr.bin/mandoc/mdoc/Sq/empty.in index 4a8cd1e17db..aa521d25f0b 100644 --- a/regress/usr.bin/mandoc/mdoc/Sq/empty.in +++ b/regress/usr.bin/mandoc/mdoc/Sq/empty.in @@ -1,4 +1,4 @@ -.Dd October 21, 2010 +.Dd June 9, 2017 .Dt SQ-EMPTY 1 .Os OpenBSD .Sh NAME @@ -8,7 +8,7 @@ An empty .Sq and a full -.Sq "(" user@host +.Sq "(" user@host) quotation. And another -.So "(" full Sc one "Sy" bold . +.So "(" full) Sc one "Sy" bold . diff --git a/regress/usr.bin/mandoc/mdoc/Sq/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Sq/empty.out_ascii index cf0144203cf..dc38a8fb429 100644 --- a/regress/usr.bin/mandoc/mdoc/Sq/empty.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Sq/empty.out_ascii @@ -4,7 +4,7 @@ NNAAMMEE SSqq--eemmppttyy - empty implicit enclosure macros DDEESSCCRRIIPPTTIIOONN - An empty `' and a full (`user@host' quotation. And another (`full' one + An empty `' and a full (`user@host)' quotation. And another (`full)' one bboolldd. -OpenBSD October 21, 2010 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Sq/empty.out_lint b/regress/usr.bin/mandoc/mdoc/Sq/empty.out_lint new file mode 100644 index 00000000000..450c70b9a99 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Sq/empty.out_lint @@ -0,0 +1,2 @@ +mandoc: empty.in:11:18: STYLE: no blank before trailing delimiter: Sq user@host) +mandoc: empty.in:14:13: STYLE: no blank before trailing delimiter: So full) diff --git a/regress/usr.bin/mandoc/mdoc/Sq/empty.out_markdown b/regress/usr.bin/mandoc/mdoc/Sq/empty.out_markdown index 1da780b41b2..76493a30392 100644 --- a/regress/usr.bin/mandoc/mdoc/Sq/empty.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Sq/empty.out_markdown @@ -9,9 +9,9 @@ SQ-EMPTY(1) - General Commands Manual An empty '' and a full -('user@host' +('user@host)' quotation. And another -('full' one **bold**. +('full)' one **bold**. -OpenBSD - October 21, 2010 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Sy/punct.in b/regress/usr.bin/mandoc/mdoc/Sy/punct.in index 764e8aba7ed..71094c81c8a 100644 --- a/regress/usr.bin/mandoc/mdoc/Sy/punct.in +++ b/regress/usr.bin/mandoc/mdoc/Sy/punct.in @@ -1,4 +1,4 @@ -.Dd November 17, 2014 +.Dd June 9, 2017 .Dt SY-PUNCT 1 .Os OpenBSD .Sh NAME @@ -81,3 +81,6 @@ Quoted: .Sy "a . b Nm" "Em" italic .Sy ". b Nm" .Sy "." +.Pp +Missing blank: +.Sy a. diff --git a/regress/usr.bin/mandoc/mdoc/Sy/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Sy/punct.out_ascii index 2f368573d1f..bb2a433eafc 100644 --- a/regress/usr.bin/mandoc/mdoc/Sy/punct.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Sy/punct.out_ascii @@ -23,4 +23,6 @@ DDEESSCCRRIIPPTTIIOONN Quoted: aa .. bb NNmm _i_t_a_l_i_c .. bb NNmm . -OpenBSD November 17, 2014 OpenBSD + Missing blank: aa.. + +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Sy/punct.out_lint b/regress/usr.bin/mandoc/mdoc/Sy/punct.out_lint index 31f1d56566d..af0021a15b2 100644 --- a/regress/usr.bin/mandoc/mdoc/Sy/punct.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Sy/punct.out_lint @@ -23,3 +23,4 @@ mandoc: punct.in:71:7: WARNING: skipping empty macro: Sy mandoc: punct.in:74:7: WARNING: skipping empty macro: Sy mandoc: punct.in:75:7: WARNING: skipping empty macro: Sy mandoc: punct.in:83:2: WARNING: skipping empty macro: Sy +mandoc: punct.in:86:6: STYLE: no blank before trailing delimiter: Sy a. diff --git a/regress/usr.bin/mandoc/mdoc/Sy/punct.out_markdown b/regress/usr.bin/mandoc/mdoc/Sy/punct.out_markdown index 5e3a0c1ca44..c198163ebb8 100644 --- a/regress/usr.bin/mandoc/mdoc/Sy/punct.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Sy/punct.out_markdown @@ -83,4 +83,7 @@ Quoted: **. b Nm** . -OpenBSD - November 17, 2014 +Missing blank: +**a.** + +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Ux/Makefile b/regress/usr.bin/mandoc/mdoc/Ux/Makefile index af02e3a965c..9e56c7eaf0e 100644 --- a/regress/usr.bin/mandoc/mdoc/Ux/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Ux/Makefile @@ -1,5 +1,6 @@ -# $OpenBSD: Makefile,v 1.4 2017/03/08 22:53:36 schwarze Exp $ +# $OpenBSD: Makefile,v 1.5 2017/06/10 01:48:31 schwarze Exp $ -REGRESS_TARGETS = spacing eos +REGRESS_TARGETS = eos punct spacing +LINT_TARGETS = punct .include diff --git a/regress/usr.bin/mandoc/mdoc/Ux/punct.in b/regress/usr.bin/mandoc/mdoc/Ux/punct.in new file mode 100644 index 00000000000..9cf2b5e4cf5 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Ux/punct.in @@ -0,0 +1,15 @@ +.Dd June 9, 2017 +.Dt UX-PUNCT 1 +.Os OpenBSD +.Sh NAME +.Nm Ux-punct +.Nd trailing delimiters in Unix macro arguments +.Sh DESCRIPTION +In June 2017, the latest release of various Unix-like +operating systems were +.Bsx 5.1, +.Dx 4.8.0, +.Fx 11.0, +.Nx 7.1, +and +.Ox 6.1. diff --git a/regress/usr.bin/mandoc/mdoc/Ux/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Ux/punct.out_ascii new file mode 100644 index 00000000000..123bc9b9bc4 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Ux/punct.out_ascii @@ -0,0 +1,11 @@ +UX-PUNCT(1) General Commands Manual UX-PUNCT(1) + +NNAAMMEE + UUxx--ppuunncctt - trailing delimiters in Unix macro arguments + +DDEESSCCRRIIPPTTIIOONN + In June 2017, the latest release of various Unix-like operating systems + were BSD/OS 5.1, DragonFly 4.8.0, FreeBSD 11.0, NetBSD 7.1, and + OpenBSD 6.1. + +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Ux/punct.out_lint b/regress/usr.bin/mandoc/mdoc/Ux/punct.out_lint new file mode 100644 index 00000000000..0c7c862230e --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Ux/punct.out_lint @@ -0,0 +1,5 @@ +mandoc: punct.in:10:9: STYLE: no blank before trailing delimiter: Bsx 5.1, +mandoc: punct.in:11:10: STYLE: no blank before trailing delimiter: Dx 4.8.0, +mandoc: punct.in:12:9: STYLE: no blank before trailing delimiter: Fx 11.0, +mandoc: punct.in:13:8: STYLE: no blank before trailing delimiter: Nx 7.1, +mandoc: punct.in:15:8: STYLE: no blank before trailing delimiter: Ox 6.1. diff --git a/regress/usr.bin/mandoc/mdoc/Ux/punct.out_markdown b/regress/usr.bin/mandoc/mdoc/Ux/punct.out_markdown new file mode 100644 index 00000000000..fd4df824178 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Ux/punct.out_markdown @@ -0,0 +1,18 @@ +UX-PUNCT(1) - General Commands Manual + +# NAME + +**Ux-punct** - trailing delimiters in Unix macro arguments + +# DESCRIPTION + +In June 2017, the latest release of various Unix-like +operating systems were +BSD/OS 5.1, +DragonFly 4.8.0, +FreeBSD 11.0, +NetBSD 7.1, +and +OpenBSD 6.1. + +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Va/noarg.in b/regress/usr.bin/mandoc/mdoc/Va/noarg.in index f5fadad67e2..92d35dadddd 100644 --- a/regress/usr.bin/mandoc/mdoc/Va/noarg.in +++ b/regress/usr.bin/mandoc/mdoc/Va/noarg.in @@ -1,4 +1,4 @@ -.Dd January 20, 2011 +.Dd June 9, 2017 .Dt VA-NOARG 1 .Os OpenBSD .Sh NAME @@ -7,7 +7,7 @@ .Sh DESCRIPTION with arguments .Vt int -.Va errno +.Va errno. no arguments .Va end of test document diff --git a/regress/usr.bin/mandoc/mdoc/Va/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Va/noarg.out_ascii index e7bec8c2f70..1992ade4e79 100644 --- a/regress/usr.bin/mandoc/mdoc/Va/noarg.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Va/noarg.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE VVaa--nnooaarrgg - variable name macro without arguments DDEESSCCRRIIPPTTIIOONN - with arguments _i_n_t _e_r_r_n_o no arguments end of test document + with arguments _i_n_t _e_r_r_n_o_. no arguments end of test document -OpenBSD January 20, 2011 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Va/noarg.out_lint b/regress/usr.bin/mandoc/mdoc/Va/noarg.out_lint index 7d24e446d2d..1541c742051 100644 --- a/regress/usr.bin/mandoc/mdoc/Va/noarg.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Va/noarg.out_lint @@ -1 +1,2 @@ mandoc: noarg.in:12:2: WARNING: skipping empty macro: Va +mandoc: noarg.in:10:10: STYLE: no blank before trailing delimiter: Va errno. diff --git a/regress/usr.bin/mandoc/mdoc/Va/noarg.out_markdown b/regress/usr.bin/mandoc/mdoc/Va/noarg.out_markdown index 323c5e2f2ba..157cc96f334 100644 --- a/regress/usr.bin/mandoc/mdoc/Va/noarg.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Va/noarg.out_markdown @@ -8,8 +8,8 @@ VA-NOARG(1) - General Commands Manual with arguments *int* -*errno* +*errno.* no arguments end of test document -OpenBSD - January 20, 2011 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Vt/noarg.in b/regress/usr.bin/mandoc/mdoc/Vt/noarg.in index 929dc05c44b..d849b877ec1 100644 --- a/regress/usr.bin/mandoc/mdoc/Vt/noarg.in +++ b/regress/usr.bin/mandoc/mdoc/Vt/noarg.in @@ -1,4 +1,4 @@ -.Dd January 20, 2011 +.Dd June 9, 2017 .Dt VT-NOARG 1 .Os OpenBSD .Sh NAME @@ -6,7 +6,7 @@ .Nd variable type macro without arguments .Sh DESCRIPTION with arguments -.Vt signed int +.Vt signed int. no arguments .Vt end of test document diff --git a/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_ascii index 04ca18dd5b6..5549bb87207 100644 --- a/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE VVtt--nnooaarrgg - variable type macro without arguments DDEESSCCRRIIPPTTIIOONN - with arguments _s_i_g_n_e_d _i_n_t no arguments end of test document + with arguments _s_i_g_n_e_d _i_n_t_. no arguments end of test document -OpenBSD January 20, 2011 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_lint b/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_lint index 4834a82a984..3774062e2ee 100644 --- a/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_lint @@ -1 +1,2 @@ mandoc: noarg.in:11:2: WARNING: skipping empty macro: Vt +mandoc: noarg.in:9:15: STYLE: no blank before trailing delimiter: Vt ... int. diff --git a/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_markdown b/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_markdown index 4ed95290b97..d47c129cd70 100644 --- a/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_markdown @@ -7,8 +7,8 @@ VT-NOARG(1) - General Commands Manual # DESCRIPTION with arguments -*signed int* +*signed int.* no arguments end of test document -OpenBSD - January 20, 2011 +OpenBSD - June 9, 2017 diff --git a/regress/usr.bin/mandoc/mdoc/Xr/args.in b/regress/usr.bin/mandoc/mdoc/Xr/args.in index 3124ed51f88..74b9e841c2c 100644 --- a/regress/usr.bin/mandoc/mdoc/Xr/args.in +++ b/regress/usr.bin/mandoc/mdoc/Xr/args.in @@ -1,4 +1,4 @@ -.Dd December 3, 2011 +.Dd June 9, 2017 .Dt XR-ARGS 1 .Os OpenBSD .Sh NAME @@ -18,8 +18,12 @@ A call, an another .Xr echo 1 . .Pp -Finally, half an +Finally, an +.Xr ( echo 1) +without a blank, half an .Xr echo , +no blank after half an +.Xr echo, no echo .Xr , and no diff --git a/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii b/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii index 67e8b712107..10d4b4680e6 100644 --- a/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii @@ -11,6 +11,7 @@ DDEESSCCRRIIPPTTIIOONN A call, an (echo(1)), and another echo(1). - Finally, half an echo, no echo and no echo at all. + Finally, an (echo(1)) without a blank, half an echo, no blank after half + an echo, no echo and no echo at all. -OpenBSD December 3, 2011 OpenBSD +OpenBSD June 9, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Xr/args.out_lint b/regress/usr.bin/mandoc/mdoc/Xr/args.out_lint index 8ade74883cc..672b87bb30a 100644 --- a/regress/usr.bin/mandoc/mdoc/Xr/args.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Xr/args.out_lint @@ -1,3 +1,6 @@ -mandoc: args.in:24:2: WARNING: skipping empty macro: Xr -mandoc: args.in:26:2: WARNING: skipping empty macro: Xr -mandoc: args.in:22:2: WARNING: missing section argument: Xr echo +mandoc: args.in:28:2: WARNING: skipping empty macro: Xr +mandoc: args.in:30:2: WARNING: skipping empty macro: Xr +mandoc: args.in:22:13: STYLE: no blank before trailing delimiter: Xr ... 1) +mandoc: args.in:24:2: WARNING: missing section argument: Xr echo +mandoc: args.in:26:2: WARNING: missing section argument: Xr echo, +mandoc: args.in:26:9: STYLE: no blank before trailing delimiter: Xr echo, diff --git a/regress/usr.bin/mandoc/mdoc/Xr/args.out_markdown b/regress/usr.bin/mandoc/mdoc/Xr/args.out_markdown index fdfaa8d3280..0efd2d7639b 100644 --- a/regress/usr.bin/mandoc/mdoc/Xr/args.out_markdown +++ b/regress/usr.bin/mandoc/mdoc/Xr/args.out_markdown @@ -19,10 +19,14 @@ A call, an another echo(1). -Finally, half an +Finally, an +(echo(1)) +without a blank, half an +echo, +no blank after half an echo, no echo and no echo at all. -OpenBSD - December 3, 2011 +OpenBSD - June 9, 2017 diff --git a/usr.bin/mandoc/mandoc.1 b/usr.bin/mandoc/mandoc.1 index 6751a91b198..ce487f7df8e 100644 --- a/usr.bin/mandoc/mandoc.1 +++ b/usr.bin/mandoc/mandoc.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mandoc.1,v 1.120 2017/06/08 00:21:23 schwarze Exp $ +.\" $OpenBSD: mandoc.1,v 1.121 2017/06/10 01:48:31 schwarze Exp $ .\" .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons .\" Copyright (c) 2012, 2014-2017 Ingo Schwarze @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 8 2017 $ +.Dd $Mdocdate: June 10 2017 $ .Dt MANDOC 1 .Os .Sh NAME @@ -798,6 +798,11 @@ number. Do not use punctuation at the end of an .Ic \&Nd block. +.It Sy "no blank before trailing delimiter" +The last argument of a macro that supports trailing delimiter +arguments is longer than one byte and ends with a trailing delimiter. +Consider inserting a blank such that the delimiter becomes a separate +argument, thus moving it out of the scope of the macro. .El .Ss Warnings related to the document prologue .Bl -ohang diff --git a/usr.bin/mandoc/mandoc.h b/usr.bin/mandoc/mandoc.h index d9860bf0dc3..b839b212061 100644 --- a/usr.bin/mandoc/mandoc.h +++ b/usr.bin/mandoc/mandoc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mandoc.h,v 1.168 2017/06/08 18:11:15 schwarze Exp $ */ +/* $OpenBSD: mandoc.h,v 1.169 2017/06/10 01:48:31 schwarze Exp $ */ /* * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons * Copyright (c) 2010-2017 Ingo Schwarze @@ -51,6 +51,7 @@ enum mandocerr { MANDOCERR_ER_ORDER, /* errnos out of order: Er ... */ MANDOCERR_ER_REP, /* duplicate errno: Er ... */ MANDOCERR_ND_DOT, /* description line ends with a full stop */ + MANDOCERR_DELIM, /* no blank before trailing delimiter: macro ... */ MANDOCERR_WARNING, /* ===== start of warnings ===== */ diff --git a/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c index fd3f38eddf5..ec5ff271814 100644 --- a/usr.bin/mandoc/mdoc_validate.c +++ b/usr.bin/mandoc/mdoc_validate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mdoc_validate.c,v 1.247 2017/06/07 23:29:31 schwarze Exp $ */ +/* $OpenBSD: mdoc_validate.c,v 1.248 2017/06/10 01:48:31 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010-2017 Ingo Schwarze @@ -73,6 +73,7 @@ static void post_bx(POST_ARGS); static void post_defaults(POST_ARGS); static void post_display(POST_ARGS); static void post_dd(POST_ARGS); +static void post_delim(POST_ARGS); static void post_dt(POST_ARGS); static void post_en(POST_ARGS); static void post_es(POST_ARGS); @@ -122,33 +123,33 @@ static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] = { post_bl, /* Bl */ NULL, /* El */ post_it, /* It */ - NULL, /* Ad */ + post_delim, /* Ad */ post_an, /* An */ NULL, /* Ap */ post_defaults, /* Ar */ NULL, /* Cd */ - NULL, /* Cm */ - NULL, /* Dv */ - NULL, /* Er */ - NULL, /* Ev */ + post_delim, /* Cm */ + post_delim, /* Dv */ + post_delim, /* Er */ + post_delim, /* Ev */ post_ex, /* Ex */ post_fa, /* Fa */ NULL, /* Fd */ - NULL, /* Fl */ + post_delim, /* Fl */ post_fn, /* Fn */ - NULL, /* Ft */ - NULL, /* Ic */ - NULL, /* In */ + post_delim, /* Ft */ + post_delim, /* Ic */ + post_delim, /* In */ post_defaults, /* Li */ post_nd, /* Nd */ post_nm, /* Nm */ - NULL, /* Op */ + post_delim, /* Op */ post_obsolete, /* Ot */ post_defaults, /* Pa */ post_rv, /* Rv */ post_st, /* St */ - NULL, /* Va */ - NULL, /* Vt */ + post_delim, /* Va */ + post_delim, /* Vt */ post_xr, /* Xr */ NULL, /* %A */ post_hyph, /* %B */ /* FIXME: can be used outside Rs/Re. */ @@ -162,12 +163,12 @@ static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] = { post_hyph, /* %T */ /* FIXME: can be used outside Rs/Re. */ NULL, /* %V */ NULL, /* Ac */ - NULL, /* Ao */ - NULL, /* Aq */ + post_delim, /* Ao */ + post_delim, /* Aq */ post_at, /* At */ NULL, /* Bc */ post_bf, /* Bf */ - NULL, /* Bo */ + post_delim, /* Bo */ NULL, /* Bq */ post_xx, /* Bsx */ post_bx, /* Bx */ @@ -177,50 +178,50 @@ static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] = { NULL, /* Dq */ NULL, /* Ec */ NULL, /* Ef */ - NULL, /* Em */ + post_delim, /* Em */ NULL, /* Eo */ post_xx, /* Fx */ - NULL, /* Ms */ - NULL, /* No */ + post_delim, /* Ms */ + post_delim, /* No */ post_ns, /* Ns */ post_xx, /* Nx */ post_xx, /* Ox */ NULL, /* Pc */ NULL, /* Pf */ - NULL, /* Po */ - NULL, /* Pq */ + post_delim, /* Po */ + post_delim, /* Pq */ NULL, /* Qc */ - NULL, /* Ql */ - NULL, /* Qo */ - NULL, /* Qq */ + post_delim, /* Ql */ + post_delim, /* Qo */ + post_delim, /* Qq */ NULL, /* Re */ post_rs, /* Rs */ NULL, /* Sc */ - NULL, /* So */ - NULL, /* Sq */ + post_delim, /* So */ + post_delim, /* Sq */ post_sm, /* Sm */ post_hyph, /* Sx */ - NULL, /* Sy */ + post_delim, /* Sy */ post_useless, /* Tn */ post_xx, /* Ux */ NULL, /* Xc */ NULL, /* Xo */ post_fo, /* Fo */ NULL, /* Fc */ - NULL, /* Oo */ + post_delim, /* Oo */ NULL, /* Oc */ post_bk, /* Bk */ NULL, /* Ek */ post_eoln, /* Bt */ - NULL, /* Hf */ + post_obsolete, /* Hf */ post_obsolete, /* Fr */ post_eoln, /* Ud */ post_lb, /* Lb */ post_par, /* Lp */ - NULL, /* Lk */ + post_delim, /* Lk */ post_defaults, /* Mt */ - NULL, /* Brq */ - NULL, /* Bro */ + post_delim, /* Brq */ + post_delim, /* Bro */ NULL, /* Brc */ NULL, /* %C */ post_es, /* Es */ @@ -405,6 +406,28 @@ check_bsd(struct roff_man *mdoc, int ln, int pos, char *p) ln, pos + (cp - p), "Dx"); } +static void +post_delim(POST_ARGS) +{ + const struct roff_node *nch; + const char *lc; + enum mdelim delim; + + nch = mdoc->last->last; + if (nch == NULL || nch->type != ROFFT_TEXT) + return; + lc = strchr(nch->string, '\0') - 1; + if (lc <= nch->string) + return; + delim = mdoc_isdelim(lc); + if (delim == DELIM_NONE || delim == DELIM_OPEN) + return; + mandoc_vmsg(MANDOCERR_DELIM, mdoc->parse, + nch->line, nch->pos + (lc - nch->string), + "%s%s %s", roff_name[mdoc->last->tok], + nch == mdoc->last->child ? "" : " ...", nch->string); +} + static void post_bl_norm(POST_ARGS) { @@ -779,6 +802,8 @@ post_lb(POST_ARGS) { struct roff_node *n; + post_delim(mdoc); + n = mdoc->last; assert(n->child->type == ROFFT_TEXT); mdoc->next = ROFF_NEXT_CHILD; @@ -1027,6 +1052,7 @@ post_fa(POST_ARGS) break; } } + post_delim(mdoc); } static void @@ -1049,6 +1075,9 @@ post_nm(POST_ARGS) mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse, n->line, n->pos, "Nm"); + if (n->type == ROFFT_ELEM) + post_delim(mdoc); + if ((n->type != ROFFT_ELEM && n->type != ROFFT_HEAD) || (n->child != NULL && n->child->type == ROFFT_TEXT) || mdoc->meta.name == NULL) @@ -1139,17 +1168,18 @@ post_defaults(POST_ARGS) { struct roff_node *nn; + if (mdoc->last->child != NULL) { + post_delim(mdoc); + return; + } + /* * The `Ar' defaults to "file ..." if no value is provided as an * argument; the `Mt' and `Pa' macros use "~"; the `Li' just * gets an empty string. */ - if (mdoc->last->child != NULL) - return; - nn = mdoc->last; - switch (nn->tok) { case MDOC_Ar: mdoc->next = ROFF_NEXT_CHILD; @@ -1213,6 +1243,8 @@ post_an(POST_ARGS) if (nch == NULL) mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, np->line, np->pos, "An"); + else + post_delim(mdoc); } else if (nch != NULL) mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, nch->line, nch->pos, "An ... %s", nch->string); @@ -1241,6 +1273,8 @@ post_xx(POST_ARGS) struct roff_node *n; const char *os; + post_delim(mdoc); + n = mdoc->last; switch (n->tok) { case MDOC_Bsx: @@ -2075,9 +2109,9 @@ post_xr(POST_ARGS) if (nch->next == NULL) { mandoc_vmsg(MANDOCERR_XR_NOSEC, mdoc->parse, n->line, n->pos, "Xr %s", nch->string); - return; - } - assert(nch->next == n->last); + } else + assert(nch->next == n->last); + post_delim(mdoc); } static void @@ -2326,6 +2360,8 @@ post_bx(POST_ARGS) struct roff_node *n, *nch; const char *macro; + post_delim(mdoc); + n = mdoc->last; nch = n->child; diff --git a/usr.bin/mandoc/read.c b/usr.bin/mandoc/read.c index 70d21328f80..6bd7ec794f4 100644 --- a/usr.bin/mandoc/read.c +++ b/usr.bin/mandoc/read.c @@ -1,4 +1,4 @@ -/* $OpenBSD: read.c,v 1.145 2017/06/08 00:21:23 schwarze Exp $ */ +/* $OpenBSD: read.c,v 1.146 2017/06/10 01:48:31 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010-2017 Ingo Schwarze @@ -89,6 +89,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "errnos out of order", "duplicate errno", "description line ends with a full stop", + "no blank before trailing delimiter", "generic warning", -- 2.20.1