From 396853b526c3389a2b49063c0b63952f1e01deef Mon Sep 17 00:00:00 2001 From: schwarze Date: Tue, 20 Oct 2015 02:00:49 +0000 Subject: In order to become able to generate syntax tree nodes on the roff(7) level, validation must be separated from parsing and rewinding. This first big step moves calling of the mdoc(7) post_*() functions out of the parser loop into their own mdoc_validate() pass, while using a new mdoc_state() module to make syntax tree state handling available to both the parser loop and the validation pass. --- usr.bin/mandoc/cgi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'usr.bin/mandoc/cgi.c') diff --git a/usr.bin/mandoc/cgi.c b/usr.bin/mandoc/cgi.c index b2fc30caf16..f1e65e160e1 100644 --- a/usr.bin/mandoc/cgi.c +++ b/usr.bin/mandoc/cgi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgi.c,v 1.49 2015/10/13 22:57:49 schwarze Exp $ */ +/* $OpenBSD: cgi.c,v 1.50 2015/10/20 02:00:49 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2014, 2015 Ingo Schwarze @@ -31,6 +31,7 @@ #include "mandoc_aux.h" #include "mandoc.h" #include "roff.h" +#include "mdoc.h" #include "main.h" #include "manconf.h" #include "mansearch.h" @@ -854,9 +855,10 @@ format(const struct req *req, const char *file) vp = html_alloc(&conf); - if (man->macroset == MACROSET_MDOC) + if (man->macroset == MACROSET_MDOC) { + mdoc_validate(man); html_mdoc(vp, man); - else + } else html_man(vp, man); html_free(vp); -- cgit v1.2.3-59-g8ed1b