From abcca917dfacf8874e0a43e561cba05217c3be9c Mon Sep 17 00:00:00 2001 From: schwarze Date: Sun, 11 Jun 2017 14:10:24 +0000 Subject: [PATCH] Do not issue the message "no blank before trailing delimiter" for .No. In practice, that message only matters inside .Bf, and even there, it can occasionally be a false positive. In all other cases, it usually is a false positive, so it is better to drop it outright. Suggested by jmc@. --- regress/usr.bin/mandoc/mdoc/No/punct.out_lint | 1 - usr.bin/mandoc/mdoc_validate.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/regress/usr.bin/mandoc/mdoc/No/punct.out_lint b/regress/usr.bin/mandoc/mdoc/No/punct.out_lint index 1543048690a..e46cd67fd5b 100644 --- a/regress/usr.bin/mandoc/mdoc/No/punct.out_lint +++ b/regress/usr.bin/mandoc/mdoc/No/punct.out_lint @@ -23,4 +23,3 @@ 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/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c index 4fe4f25fb10..57ab101c1d5 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.249 2017/06/10 16:53:58 schwarze Exp $ */ +/* $OpenBSD: mdoc_validate.c,v 1.250 2017/06/11 14:10:24 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010-2017 Ingo Schwarze @@ -182,7 +182,7 @@ static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] = { NULL, /* Eo */ post_xx, /* Fx */ post_delim, /* Ms */ - post_delim, /* No */ + NULL, /* No */ post_ns, /* Ns */ post_xx, /* Nx */ post_xx, /* Ox */ @@ -479,8 +479,8 @@ post_delim(POST_ARGS) /* At least three alphabetic words with a sentence ending. */ if (strchr("!.:?", *lc) != NULL && (tok == MDOC_Em || - tok == MDOC_Li || tok == MDOC_No || tok == MDOC_Po || - tok == MDOC_Pq || tok == MDOC_Sy)) { + tok == MDOC_Li || tok == MDOC_Po || tok == MDOC_Pq || + tok == MDOC_Sy)) { nw = 0; for (cp = lc - 1; cp >= nch->string; cp--) { if (*cp == ' ') { -- 2.20.1