this file needs to #include "config.h" because it calls getprogname();

[mandoc.git] / roff_validate.c

diff --git a/roff_validate.c b/roff_validate.c
index 3a53022ac35bb13f961effa3a79b8b085d8ec14c..9080f28797afd247eac3c1ed2edf87559067c649 100644 (file)
--- a/roff_validate.c
+++ b/roff_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: roff_validate.c,v 1.13 2018/12/14 01:18:26 schwarze Exp $ */
+/*     $Id: roff_validate.c,v 1.18 2018/12/31 09:02:37 schwarze Exp $ */

 /*
  * Copyright (c) 2010, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
  *
 /*
  * Copyright (c) 2010, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
  *


@@ -30,15 +30,19 @@
 typedef        void    (*roff_valid_fp)(ROFF_VALID_ARGS);
 
 static void      roff_valid_br(ROFF_VALID_ARGS);
 typedef        void    (*roff_valid_fp)(ROFF_VALID_ARGS);
 
 static void      roff_valid_br(ROFF_VALID_ARGS);

+static void      roff_valid_fi(ROFF_VALID_ARGS);

 static void      roff_valid_ft(ROFF_VALID_ARGS);
 static void      roff_valid_ft(ROFF_VALID_ARGS);

+static void      roff_valid_nf(ROFF_VALID_ARGS);

 static void      roff_valid_sp(ROFF_VALID_ARGS);
 
 static const roff_valid_fp roff_valids[ROFF_MAX] = {
        roff_valid_br,  /* br */
        NULL,  /* ce */
 static void      roff_valid_sp(ROFF_VALID_ARGS);
 
 static const roff_valid_fp roff_valids[ROFF_MAX] = {
        roff_valid_br,  /* br */
        NULL,  /* ce */

+       roff_valid_fi,  /* fi */

        roff_valid_ft,  /* ft */
        NULL,  /* ll */
        NULL,  /* mc */
        roff_valid_ft,  /* ft */
        NULL,  /* ll */
        NULL,  /* mc */

+       roff_valid_nf,  /* nf */

        NULL,  /* po */
        NULL,  /* rj */
        roff_valid_sp,  /* sp */
        NULL,  /* po */
        NULL,  /* rj */
        roff_valid_sp,  /* sp */


@@ -63,13 +67,9 @@ roff_valid_br(ROFF_VALID_ARGS)
 {
        struct roff_node        *np;
 
 {
        struct roff_node        *np;
 

-       if (n->child != NULL)
-               mandoc_vmsg(MANDOCERR_ARG_SKIP, man->parse,
-                   n->line, n->pos, "br %s", n->child->string);
-

        if (n->next != NULL && n->next->type == ROFFT_TEXT &&
            *n->next->string == ' ') {
        if (n->next != NULL && n->next->type == ROFFT_TEXT &&
            *n->next->string == ' ') {

-               mandoc_msg(MANDOCERR_PAR_SKIP, man->parse, n->line, n->pos,
+               mandoc_msg(MANDOCERR_PAR_SKIP, n->line, n->pos,

                    "br before text line with leading blank");
                roff_node_delete(man, n);
                return;
                    "br before text line with leading blank");
                roff_node_delete(man, n);
                return;


@@ -82,7 +82,7 @@ roff_valid_br(ROFF_VALID_ARGS)
        case ROFF_br:
        case ROFF_sp:
        case MDOC_Pp:
        case ROFF_br:
        case ROFF_sp:
        case MDOC_Pp:

-               mandoc_vmsg(MANDOCERR_PAR_SKIP, man->parse,
+               mandoc_msg(MANDOCERR_PAR_SKIP,

                    n->line, n->pos, "br after %s", roff_name[np->tok]);
                roff_node_delete(man, n);
                break;
                    n->line, n->pos, "br after %s", roff_name[np->tok]);
                roff_node_delete(man, n);
                break;


@@ -91,6 +91,13 @@ roff_valid_br(ROFF_VALID_ARGS)
        }
 }
 
        }
 }
 

+static void
+roff_valid_fi(ROFF_VALID_ARGS)
+{
+       if ((n->flags & NODE_NOFILL) == 0)
+               mandoc_msg(MANDOCERR_FI_SKIP, n->line, n->pos, "fi");
+}
+

 static void
 roff_valid_ft(ROFF_VALID_ARGS)
 {
 static void
 roff_valid_ft(ROFF_VALID_ARGS)
 {


@@ -104,56 +111,35 @@ roff_valid_ft(ROFF_VALID_ARGS)
        }
 
        cp = n->child->string;
        }
 
        cp = n->child->string;

-       switch (*cp) {
-       case '1':
-       case '2':
-       case '3':
-       case '4':
-       case 'I':
-       case 'P':
-       case 'R':
-               if (cp[1] == '\0')
-                       return;
-               break;
-       case 'B':
-               if (cp[1] == '\0' || (cp[1] == 'I' && cp[2] == '\0'))
-                       return;
-               break;
-       case 'C':
-               if (cp[1] != '\0' && cp[2] == '\0' &&
-                   strchr("BIRW", cp[1]) != NULL)
-                       return;
-               break;
-       default:
-               break;
-       }
-
-       mandoc_vmsg(MANDOCERR_FT_BAD, man->parse,
-           n->line, n->pos, "ft %s", cp);
+       if (mandoc_font(cp, (int)strlen(cp)) != ESCAPE_ERROR)
+               return;
+       mandoc_msg(MANDOCERR_FT_BAD, n->line, n->pos, "ft %s", cp);

        roff_node_delete(man, n);
 }
 
        roff_node_delete(man, n);
 }
 

+static void
+roff_valid_nf(ROFF_VALID_ARGS)
+{
+       if (n->flags & NODE_NOFILL)
+               mandoc_msg(MANDOCERR_NF_SKIP, n->line, n->pos, "nf");
+}
+

 static void
 roff_valid_sp(ROFF_VALID_ARGS)
 {
        struct roff_node        *np;
 
 static void
 roff_valid_sp(ROFF_VALID_ARGS)
 {
        struct roff_node        *np;
 

-       if (n->child != NULL && n->child->next != NULL)
-               mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse,
-                   n->child->next->line, n->child->next->pos,
-                   "sp ... %s", n->child->next->string);
-

        if ((np = n->prev) == NULL)
                return;
 
        switch (np->tok) {
        case ROFF_br:
        if ((np = n->prev) == NULL)
                return;
 
        switch (np->tok) {
        case ROFF_br:

-               mandoc_msg(MANDOCERR_PAR_SKIP, man->parse,
+               mandoc_msg(MANDOCERR_PAR_SKIP,

                    np->line, np->pos, "br before sp");
                roff_node_delete(man, np);
                break;
        case MDOC_Pp:
                    np->line, np->pos, "br before sp");
                roff_node_delete(man, np);
                break;
        case MDOC_Pp:

-               mandoc_msg(MANDOCERR_PAR_SKIP, man->parse,
+               mandoc_msg(MANDOCERR_PAR_SKIP,

                    n->line, n->pos, "sp after Pp");
                roff_node_delete(man, n);
                break;
                    n->line, n->pos, "sp after Pp");
                roff_node_delete(man, n);
                break;