The CommonMark specification allows list markers fo the form "number) "

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index 59baf88a718a27b1057f8dbf047c9b1f6697dca1..16d996355eb769af9460f1ebe36ec49f1bd72c12 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,7 +1,7 @@
 /*     $OpenBSD$ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2016 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -48,9 +48,7 @@ static        void      check_text(CHKARGS);
 static void      post_AT(CHKARGS);
 static void      post_IP(CHKARGS);
 static void      post_vs(CHKARGS);
-static void      post_fi(CHKARGS);
 static void      post_ft(CHKARGS);
-static void      post_nf(CHKARGS);
 static void      post_OP(CHKARGS);
 static void      post_TH(CHKARGS);
 static void      post_UC(CHKARGS);
@@ -79,8 +77,8 @@ static        v_check man_valids[MAN_MAX] = {
        NULL,       /* IR */
        NULL,       /* RI */
        post_vs,    /* sp */
-       post_nf,    /* nf */
-       post_fi,    /* fi */
+       NULL,       /* nf */
+       NULL,       /* fi */
        NULL,       /* RE */
        check_part, /* RS */
        NULL,       /* DT */
@@ -90,8 +88,8 @@ static        v_check man_valids[MAN_MAX] = {
        NULL,       /* in */
        post_ft,    /* ft */
        post_OP,    /* OP */
-       post_nf,    /* EX */
-       post_fi,    /* EE */
+       NULL,       /* EX */
+       NULL,       /* EE */
        post_UR,    /* UR */
        NULL,       /* UE */
        NULL,       /* ll */
@@ -99,16 +97,23 @@ static      v_check man_valids[MAN_MAX] = {
 
 
 void
-man_valid_post(struct roff_man *man)
+man_node_validate(struct roff_man *man)
 {
        struct roff_node *n;
        v_check         *cp;
 
        n = man->last;
-       if (n->flags & MAN_VALID)
-               return;
-       n->flags |= MAN_VALID;
+       man->last = man->last->child;
+       while (man->last != NULL) {
+               man_node_validate(man);
+               if (man->last == n)
+                       man->last = man->last->child;
+               else
+                       man->last = man->last->next;
+       }
 
+       man->last = n;
+       man->next = ROFF_NEXT_SIBLING;
        switch (n->type) {
        case ROFFT_TEXT:
                check_text(man, n);
@@ -117,13 +122,14 @@ man_valid_post(struct roff_man *man)
                check_root(man, n);
                break;
        case ROFFT_EQN:
-               /* FALLTHROUGH */
        case ROFFT_TBL:
                break;
        default:
                cp = man_valids + n->tok;
                if (*cp)
                        (*cp)(man, n);
+               if (man->last == n)
+                       man_state(man, n);
                break;
        }
 }
@@ -174,10 +180,10 @@ static void
 post_OP(CHKARGS)
 {
 
-       if (n->nchild == 0)
+       if (n->child == NULL)
                mandoc_msg(MANDOCERR_OP_EMPTY, man->parse,
                    n->line, n->pos, "OP");
-       else if (n->nchild > 2) {
+       else if (n->child->next != NULL && n->child->next->next != NULL) {
                n = n->child->next->next;
                mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse,
                    n->line, n->pos, "OP ... %s", n->string);
@@ -200,24 +206,18 @@ post_ft(CHKARGS)
        char    *cp;
        int      ok;
 
-       if (0 == n->nchild)
+       if (n->child == NULL)
                return;
 
        ok = 0;
        cp = n->child->string;
        switch (*cp) {
        case '1':
-               /* FALLTHROUGH */
        case '2':
-               /* FALLTHROUGH */
        case '3':
-               /* FALLTHROUGH */
        case '4':
-               /* FALLTHROUGH */
        case 'I':
-               /* FALLTHROUGH */
        case 'P':
-               /* FALLTHROUGH */
        case 'R':
                if ('\0' == cp[1])
                        ok = 1;
@@ -256,22 +256,22 @@ check_par(CHKARGS)
 
        switch (n->type) {
        case ROFFT_BLOCK:
-               if (0 == n->body->nchild)
+               if (n->body->child == NULL)
                        roff_node_delete(man, n);
                break;
        case ROFFT_BODY:
-               if (0 == n->nchild)
+               if (n->child == NULL)
                        mandoc_vmsg(MANDOCERR_PAR_SKIP,
                            man->parse, n->line, n->pos,
                            "%s empty", man_macronames[n->tok]);
                break;
        case ROFFT_HEAD:
-               if (n->nchild)
+               if (n->child != NULL)
                        mandoc_vmsg(MANDOCERR_ARG_SKIP,
                            man->parse, n->line, n->pos,
                            "%s %s%s", man_macronames[n->tok],
                            n->child->string,
-                           n->nchild > 1 ? " ..." : "");
+                           n->child->next != NULL ? " ..." : "");
                break;
        default:
                break;
@@ -284,11 +284,11 @@ post_IP(CHKARGS)
 
        switch (n->type) {
        case ROFFT_BLOCK:
-               if (0 == n->head->nchild && 0 == n->body->nchild)
+               if (n->head->child == NULL && n->body->child == NULL)
                        roff_node_delete(man, n);
                break;
        case ROFFT_BODY:
-               if (0 == n->parent->head->nchild && 0 == n->nchild)
+               if (n->parent->head->child == NULL && n->child == NULL)
                        mandoc_vmsg(MANDOCERR_PAR_SKIP,
                            man->parse, n->line, n->pos,
                            "%s empty", man_macronames[n->tok]);
@@ -392,28 +392,6 @@ post_TH(CHKARGS)
        roff_node_delete(man, man->last);
 }
 
-static void
-post_nf(CHKARGS)
-{
-
-       if (man->flags & MAN_LITERAL)
-               mandoc_msg(MANDOCERR_NF_SKIP, man->parse,
-                   n->line, n->pos, "nf");
-
-       man->flags |= MAN_LITERAL;
-}
-
-static void
-post_fi(CHKARGS)
-{
-
-       if ( ! (MAN_LITERAL & man->flags))
-               mandoc_msg(MANDOCERR_FI_SKIP, man->parse,
-                   n->line, n->pos, "fi");
-
-       man->flags &= ~MAN_LITERAL;
-}
-
 static void
 post_UC(CHKARGS)
 {
@@ -499,7 +477,6 @@ post_vs(CHKARGS)
 
        switch (n->parent->tok) {
        case MAN_SH:
-               /* FALLTHROUGH */
        case MAN_SS:
                mandoc_vmsg(MANDOCERR_PAR_SKIP, man->parse, n->line, n->pos,
                    "%s after %s", man_macronames[n->tok],