diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2018-12-04 02:53:51 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2018-12-04 02:53:51 +0000 |
| commit | b8c7224b007d9673c637669ba26ff55f38effe12 (patch) | |
| tree | 27d1ed6e0ae499cceea05feaef09d6f683d86fdd /mdoc_macro.c | |
| parent | 820b4d56427ff6a0f1e3399ac7e4aea447dd5c20 (diff) | |
| download | mandoc-b8c7224b007d9673c637669ba26ff55f38effe12.tar.gz mandoc-b8c7224b007d9673c637669ba26ff55f38effe12.tar.zst mandoc-b8c7224b007d9673c637669ba26ff55f38effe12.zip | |
Clean up the validation of .Pp, .PP, .sp, and .br. Make sure all
combinations are handled, and are handled in a systematic manner.
This resolves some erratic duplicate handling, handles a number of
missing cases, and improves diagnostics in various respects.
Move validation of .br and .sp to the roff validation module
rather than doing that twice in the mdoc and man validation modules.
Move the node relinking function to the roff library where it belongs.
In validation functions, only look at the node itself, at previous
nodes, and at descendants, not at following nodes or ancestors,
such that only nodes are inspected which are already validated.
Diffstat (limited to 'mdoc_macro.c')
| -rw-r--r-- | mdoc_macro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c index 3b3bc81d..31a70896 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.225 2018/08/17 20:33:37 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.226 2018/12/04 02:53:51 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org> @@ -1243,7 +1243,7 @@ blk_part_imp(MACRO_PROT_ARGS) for (n = body->child; n && n->next; n = n->next) /* Do nothing. */ ; if (n && n->tok == MDOC_Ns) - mdoc_node_relink(mdoc, n); + roff_node_relink(mdoc, n); } static void |