aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/roff.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2018-12-04 02:53:51 +0000
committerIngo Schwarze <schwarze@openbsd.org>2018-12-04 02:53:51 +0000
commitb8c7224b007d9673c637669ba26ff55f38effe12 (patch)
tree27d1ed6e0ae499cceea05feaef09d6f683d86fdd /roff.c
parent820b4d56427ff6a0f1e3399ac7e4aea447dd5c20 (diff)
downloadmandoc-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 'roff.c')
-rw-r--r--roff.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/roff.c b/roff.c
index 0fca8b9d..6f54a9a8 100644
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.343 2018/11/26 17:44:34 schwarze Exp $ */
+/* $Id: roff.c,v 1.344 2018/12/04 02:53:51 schwarze Exp $ */
/*
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -1067,6 +1067,14 @@ roff_node_unlink(struct roff_man *man, struct roff_node *n)
}
void
+roff_node_relink(struct roff_man *man, struct roff_node *n)
+{
+ roff_node_unlink(man, n);
+ n->prev = n->next = NULL;
+ roff_node_append(man, n);
+}
+
+void
roff_node_free(struct roff_node *n)
{