Simplify the roff(7) .ce and .rj terminal formatter by using the

[mandoc.git] / roff_validate.c

diff --git a/roff_validate.c b/roff_validate.c
index e18f3c1a7607c77c20dd9763cc07a096d359b35e..9080f28797afd247eac3c1ed2edf87559067c649 100644 (file)
--- a/roff_validate.c
+++ b/roff_validate.c
@@ -1,6 +1,6 @@
-/*     $OpenBSD: roff_html.c,v 1.1 2017/05/04 22:07:44 schwarze Exp $ */
+/*     $Id: roff_validate.c,v 1.18 2018/12/31 09:02:37 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2010, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2017, 2018 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -17,7 +17,8 @@
 #include <sys/types.h>
 
 #include <assert.h>
 #include <sys/types.h>
 
 #include <assert.h>

-#include <stddef.h>
+#include <stdio.h>
+#include <string.h>

 
 #include "mandoc.h"
 #include "roff.h"
 
 #include "mandoc.h"
 #include "roff.h"


@@ -28,13 +29,25 @@
 
 typedef        void    (*roff_valid_fp)(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] = {
 
 static const roff_valid_fp roff_valids[ROFF_MAX] = {

-       NULL,  /* br */
+       roff_valid_br,  /* br */
+       NULL,  /* ce */
+       roff_valid_fi,  /* fi */

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

-       NULL,  /* sp */
+       NULL,  /* mc */
+       roff_valid_nf,  /* nf */
+       NULL,  /* po */
+       NULL,  /* rj */
+       roff_valid_sp,  /* sp */
+       NULL,  /* ta */
+       NULL,  /* ti */

 };
 
 
 };
 
 


@@ -49,10 +62,46 @@ roff_validate(struct roff_man *man)
                (*roff_valids[n->tok])(man, n);
 }
 
                (*roff_valids[n->tok])(man, n);
 }
 

+static void
+roff_valid_br(ROFF_VALID_ARGS)
+{
+       struct roff_node        *np;
+
+       if (n->next != NULL && n->next->type == ROFFT_TEXT &&
+           *n->next->string == ' ') {
+               mandoc_msg(MANDOCERR_PAR_SKIP, n->line, n->pos,
+                   "br before text line with leading blank");
+               roff_node_delete(man, n);
+               return;
+       }
+
+       if ((np = n->prev) == NULL)
+               return;
+
+       switch (np->tok) {
+       case ROFF_br:
+       case ROFF_sp:
+       case MDOC_Pp:
+               mandoc_msg(MANDOCERR_PAR_SKIP,
+                   n->line, n->pos, "br after %s", roff_name[np->tok]);
+               roff_node_delete(man, n);
+               break;
+       default:
+               break;
+       }
+}
+
+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)
 {

-       char    *cp;
+       const char              *cp;

 
        if (n->child == NULL) {
                man->next = ROFF_NEXT_CHILD;
 
        if (n->child == NULL) {
                man->next = ROFF_NEXT_CHILD;


@@ -62,30 +111,39 @@ 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;
+       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);
+}
+
+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;
+
+       if ((np = n->prev) == NULL)
+               return;
+
+       switch (np->tok) {
+       case ROFF_br:
+               mandoc_msg(MANDOCERR_PAR_SKIP,
+                   np->line, np->pos, "br before sp");
+               roff_node_delete(man, np);

                break;
                break;

-       case 'C':
-               if (cp[1] == 'W' && cp[2] == '\0')
-                       return;
+       case MDOC_Pp:
+               mandoc_msg(MANDOCERR_PAR_SKIP,
+                   n->line, n->pos, "sp after Pp");
+               roff_node_delete(man, n);

                break;
        default:
                break;
        }
                break;
        default:
                break;
        }

-
-       mandoc_vmsg(MANDOCERR_FT_BAD, man->parse,
-           n->line, n->pos, "ft %s", cp);
-       roff_node_delete(man, n);

 }
 }