Tidy up www page: remove all sorts of DIV crap, superfluous CSS, in-line

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index bcfcbacfa40b7ebf4d4f21852e2628bce328b76f..e744ed3cf37bca3477a4ce4ed9b9b7db119b6cea 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,6 +1,7 @@
-/*     $Id: man_validate.c,v 1.57 2011/01/01 12:59:17 kristaps Exp $ */
+/*     $Id: man_validate.c,v 1.68 2011/04/09 15:29:40 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 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


@@ -29,6 +30,7 @@
 #include <string.h>
 #include <time.h>
 
 #include <string.h>
 #include <time.h>
 

+#include "man.h"

 #include "mandoc.h"
 #include "libman.h"
 #include "libmandoc.h"
 #include "mandoc.h"
 #include "libman.h"
 #include "libmandoc.h"


@@ -52,8 +54,7 @@ static        int       check_par(CHKARGS);
 static int       check_part(CHKARGS);
 static int       check_root(CHKARGS);
 static int       check_sec(CHKARGS);
 static int       check_part(CHKARGS);
 static int       check_root(CHKARGS);
 static int       check_sec(CHKARGS);

-static int       check_text(CHKARGS);
-static int       check_title(CHKARGS);
+static void      check_text(CHKARGS);

 
 static int       post_AT(CHKARGS);
 static int       post_fi(CHKARGS);
 
 static int       post_AT(CHKARGS);
 static int       post_fi(CHKARGS);


@@ -70,7 +71,7 @@ static        v_check   posts_nf[] = { check_eq0, post_nf, NULL };
 static v_check   posts_par[] = { check_par, NULL };
 static v_check   posts_part[] = { check_part, NULL };
 static v_check   posts_sec[] = { check_sec, NULL };
 static v_check   posts_par[] = { check_par, NULL };
 static v_check   posts_part[] = { check_part, NULL };
 static v_check   posts_sec[] = { check_sec, NULL };

-static v_check   posts_th[] = { check_ge2, check_le5, check_title, post_TH, NULL };
+static v_check   posts_th[] = { check_ge2, check_le5, post_TH, NULL };

 static v_check   posts_uc[] = { post_UC, NULL };
 static v_check   pres_bline[] = { check_bline, NULL };
 
 static v_check   posts_uc[] = { post_UC, NULL };
 static v_check   pres_bline[] = { check_bline, NULL };
 


@@ -80,12 +81,12 @@ static      const struct man_valid man_valids[MAN_MAX] = {
        { pres_bline, posts_th }, /* TH */
        { pres_bline, posts_sec }, /* SH */
        { pres_bline, posts_sec }, /* SS */
        { pres_bline, posts_th }, /* TH */
        { pres_bline, posts_sec }, /* SH */
        { pres_bline, posts_sec }, /* SS */

-       { pres_bline, posts_par }, /* TP */
+       { pres_bline, NULL }, /* TP */

        { pres_bline, posts_par }, /* LP */
        { pres_bline, posts_par }, /* PP */
        { pres_bline, posts_par }, /* P */
        { pres_bline, posts_par }, /* LP */
        { pres_bline, posts_par }, /* PP */
        { pres_bline, posts_par }, /* P */

-       { pres_bline, posts_par }, /* IP */
-       { pres_bline, posts_par }, /* HP */
+       { pres_bline, NULL }, /* IP */
+       { pres_bline, NULL }, /* HP */

        { NULL, NULL }, /* SM */
        { NULL, NULL }, /* SB */
        { NULL, NULL }, /* BI */
        { NULL, NULL }, /* SM */
        { NULL, NULL }, /* SB */
        { NULL, NULL }, /* BI */


@@ -122,6 +123,8 @@ man_valid_pre(struct man *m, struct man_node *n)
                /* FALLTHROUGH */
        case (MAN_ROOT):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case (MAN_ROOT):
                /* FALLTHROUGH */

+       case (MAN_EQN):
+               /* FALLTHROUGH */

        case (MAN_TBL):
                return(1);
        default:
        case (MAN_TBL):
                return(1);
        default:


@@ -148,9 +151,12 @@ man_valid_post(struct man *m)
 
        switch (m->last->type) {
        case (MAN_TEXT): 
 
        switch (m->last->type) {
        case (MAN_TEXT): 

-               return(check_text(m, m->last));
+               check_text(m, m->last);
+               return(1);

        case (MAN_ROOT):
                return(check_root(m, m->last));
        case (MAN_ROOT):
                return(check_root(m, m->last));

+       case (MAN_EQN):
+               /* FALLTHROUGH */

        case (MAN_TBL):
                return(1);
        default:
        case (MAN_TBL):
                return(1);
        default:


@@ -191,85 +197,67 @@ check_root(CHKARGS)
                 */
 
                m->meta.title = mandoc_strdup("unknown");
                 */
 
                m->meta.title = mandoc_strdup("unknown");

-               m->meta.date = time(NULL);

                m->meta.msec = mandoc_strdup("1");
                m->meta.msec = mandoc_strdup("1");

+               m->meta.date = mandoc_normdate
+                       (m->parse, NULL, n->line, n->pos);

        }
 
        return(1);
 }
 
        }
 
        return(1);
 }
 

-
-static int
-check_title(CHKARGS) 
-{
-       const char      *p;
-
-       assert(n->child);
-       /* FIXME: is this sufficient? */
-       if ('\0' == *n->child->string) {
-               man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);
-               return(0);
-       }
-
-       for (p = n->child->string; '\0' != *p; p++)
-               /* Only warn about this once... */
-               if (isalpha((u_char)*p) && ! isupper((u_char)*p)) {
-                       man_nmsg(m, n, MANDOCERR_UPPERCASE);
-                       break;
-               }
-
-       return(1);
-}
-
-
-static int
+static void

 check_text(CHKARGS) 
 {
 check_text(CHKARGS) 
 {

-       char            *p;
-       int              pos, c;
+       char            *p, *pp, *cpp;
+       int              pos;

        size_t           sz;
 
        size_t           sz;
 

-       for (p = n->string, pos = n->pos + 1; *p; p++, pos++) {
+       p = n->string;
+       pos = n->pos + 1;
+
+       while ('\0' != *p) {

                sz = strcspn(p, "\t\\");
                sz = strcspn(p, "\t\\");

+

                p += (int)sz;
                p += (int)sz;

+               pos += (int)sz;

 
 

-               if ('\0' == *p)
+               if ('\t' == *p) {
+                       if ( ! (MAN_LITERAL & m->flags))
+                               man_pmsg(m, n->line, pos, MANDOCERR_BADTAB);
+                       p++;
+                       pos++;
+                       continue;
+               } else if ('\0' == *p)

                        break;
 
                        break;
 

-               pos += (int)sz;
+               pos++;
+               pp = ++p;

 
 

-               if ('\t' == *p) {
-                       if (MAN_LITERAL & m->flags)
-                               continue;
-                       if (man_pmsg(m, n->line, pos, MANDOCERR_BADTAB))
-                               continue;
-                       return(0);
+               if (ESCAPE_ERROR == mandoc_escape
+                               ((const char **)&pp, NULL, NULL)) {
+                       man_pmsg(m, n->line, pos, MANDOCERR_BADESCAPE);
+                       break;

                }
 
                }
 

-               /* Check the special character. */
+               cpp = p;
+               while (NULL != (cpp = memchr(cpp, ASCII_HYPH, pp - cpp)))
+                       *cpp = '-';

 
 

-               c = mandoc_special(p);
-               if (c) {
-                       p += c - 1;
-                       pos += c - 1;
-               } else
-                       man_pmsg(m, n->line, pos, MANDOCERR_BADESCAPE);
+               pos += pp - p;
+               p = pp;

        }
        }

-
-       return(1);

 }
 
 }
 

-

 #define        INEQ_DEFINE(x, ineq, name) \
 static int \
 check_##name(CHKARGS) \
 { \
        if (n->nchild ineq (x)) \
                return(1); \
 #define        INEQ_DEFINE(x, ineq, name) \
 static int \
 check_##name(CHKARGS) \
 { \
        if (n->nchild ineq (x)) \
                return(1); \

-       man_vmsg(m, MANDOCERR_SYNTARGCOUNT, n->line, n->pos, \
+       mandoc_vmsg(MANDOCERR_ARGCOUNT, m->parse, n->line, n->pos, \

                        "line arguments %s %d (have %d)", \
                        #ineq, (x), n->nchild); \
                        "line arguments %s %d (have %d)", \
                        #ineq, (x), n->nchild); \

-       return(0); \
+       return(1); \

 }
 
 INEQ_DEFINE(0, ==, eq0)
 }
 
 INEQ_DEFINE(0, ==, eq0)


@@ -318,14 +306,17 @@ check_ft(CHKARGS)
        }
 
        if (0 == ok) {
        }
 
        if (0 == ok) {

-               man_vmsg(m, MANDOCERR_BADFONT, 
-                               n->line, n->pos, "%s", cp);
+               mandoc_vmsg
+                       (MANDOCERR_BADFONT, m->parse,
+                        n->line, n->pos, "%s", cp);

                *cp = '\0';
        }
 
        if (1 < n->nchild)
                *cp = '\0';
        }
 
        if (1 < n->nchild)

-               man_vmsg(m, MANDOCERR_ARGCOUNT, n->line, n->pos,
-                               "want one child (have %d)", n->nchild);
+               mandoc_vmsg
+                       (MANDOCERR_ARGCOUNT, m->parse, n->line, 
+                        n->pos, "want one child (have %d)", 
+                        n->nchild);

 
        return(1);
 }
 
        return(1);
 }


@@ -338,7 +329,8 @@ check_sec(CHKARGS)
                man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);
                return(0);
        } else if (MAN_BODY == n->type && 0 == n->nchild)
                man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);
                return(0);
        } else if (MAN_BODY == n->type && 0 == n->nchild)

-               man_nmsg(m, n, MANDOCERR_NOBODY);
+               mandoc_msg(MANDOCERR_ARGCWARN, m->parse, n->line, 
+                               n->pos, "want children (have none)");

 
        return(1);
 }
 
        return(1);
 }


@@ -349,7 +341,8 @@ check_part(CHKARGS)
 {
 
        if (MAN_BODY == n->type && 0 == n->nchild)
 {
 
        if (MAN_BODY == n->type && 0 == n->nchild)

-               man_nmsg(m, n, MANDOCERR_NOBODY);
+               mandoc_msg(MANDOCERR_ARGCWARN, m->parse, n->line, 
+                               n->pos, "want children (have none)");

 
        return(1);
 }
 
        return(1);
 }


@@ -359,33 +352,22 @@ static int
 check_par(CHKARGS)
 {
 
 check_par(CHKARGS)
 {
 

-       if (MAN_BODY == n->type) 
-               switch (n->tok) {
-               case (MAN_IP):
-                       /* FALLTHROUGH */
-               case (MAN_HP):
-                       /* FALLTHROUGH */
-               case (MAN_TP):
-                       /* Body-less lists are ok. */
-                       break;
-               default:
-                       if (0 == n->nchild)
-                               man_nmsg(m, n, MANDOCERR_NOBODY);
-                       break;
-               }
-       if (MAN_HEAD == n->type)
-               switch (n->tok) {
-               case (MAN_PP):
-                       /* FALLTHROUGH */
-               case (MAN_P):
-                       /* FALLTHROUGH */
-               case (MAN_LP):
-                       if (n->nchild)
-                               man_nmsg(m, n, MANDOCERR_ARGSLOST);
-                       break;
-               default:
-                       break;
-               }
+       switch (n->type) {
+       case (MAN_BLOCK):
+               if (0 == n->body->nchild)
+                       man_node_delete(m, n);
+               break;
+       case (MAN_BODY):
+               if (0 == n->nchild)
+                       man_nmsg(m, n, MANDOCERR_IGNPAR);
+               break;
+       case (MAN_HEAD):
+               if (n->nchild)
+                       man_nmsg(m, n, MANDOCERR_ARGSLOST);
+               break;
+       default:
+               break;
+       }

 
        return(1);
 }
 
        return(1);
 }


@@ -407,6 +389,8 @@ check_bline(CHKARGS)
 static int
 post_TH(CHKARGS)
 {
 static int
 post_TH(CHKARGS)
 {

+       const char      *p;
+       int              line, pos;

 
        if (m->meta.title)
                free(m->meta.title);
 
        if (m->meta.title)
                free(m->meta.title);


@@ -416,44 +400,46 @@ post_TH(CHKARGS)
                free(m->meta.source);
        if (m->meta.msec)
                free(m->meta.msec);
                free(m->meta.source);
        if (m->meta.msec)
                free(m->meta.msec);

-       if (m->meta.rawdate)
-               free(m->meta.rawdate);
+       if (m->meta.date)
+               free(m->meta.date);

 
 

-       m->meta.title = m->meta.vol = m->meta.rawdate =
+       line = n->line;
+       pos = n->pos;
+       m->meta.title = m->meta.vol = m->meta.date =

                m->meta.msec = m->meta.source = NULL;
                m->meta.msec = m->meta.source = NULL;

-       m->meta.date = 0;

 
        /* ->TITLE<- MSEC DATE SOURCE VOL */
 
        n = n->child;
 
        /* ->TITLE<- MSEC DATE SOURCE VOL */
 
        n = n->child;

-       assert(n);
-       m->meta.title = mandoc_strdup(n->string);
+       if (n && n->string) {
+               for (p = n->string; '\0' != *p; p++) {
+                       /* Only warn about this once... */
+                       if (isalpha((u_char)*p) && ! isupper((u_char)*p)) {
+                               man_nmsg(m, n, MANDOCERR_UPPERCASE);
+                               break;
+                       }
+               }
+               m->meta.title = mandoc_strdup(n->string);
+       } else
+               m->meta.title = mandoc_strdup("");

 
        /* TITLE ->MSEC<- DATE SOURCE VOL */
 
 
        /* TITLE ->MSEC<- DATE SOURCE VOL */
 

-       n = n->next;
-       assert(n);
-       m->meta.msec = mandoc_strdup(n->string);
+       if (n)
+               n = n->next;
+       if (n && n->string)
+               m->meta.msec = mandoc_strdup(n->string);
+       else
+               m->meta.msec = mandoc_strdup("");

 
        /* TITLE MSEC ->DATE<- SOURCE VOL */
 
 
        /* TITLE MSEC ->DATE<- SOURCE VOL */
 

-       /*
-        * Try to parse the date.  If this works, stash the epoch (this
-        * is optimal because we can reformat it in the canonical form).
-        * If it doesn't parse, isn't specified at all, or is an empty
-        * string, then use the current date.
-        */
-
-       n = n->next;
-       if (n && n->string && *n->string) {
-               m->meta.date = mandoc_a2time
-                       (MTIME_ISO_8601, n->string);
-               if (0 == m->meta.date) {
-                       man_nmsg(m, n, MANDOCERR_BADDATE);
-                       m->meta.rawdate = mandoc_strdup(n->string);
-               }
-       } else
-               m->meta.date = time(NULL);
+       if (n)
+               n = n->next;
+       if (n)
+               pos = n->pos;
+       m->meta.date = mandoc_normdate
+               (m->parse, n ? n->string : NULL, line, pos);

 
        /* TITLE MSEC DATE ->SOURCE<- VOL */
 
 
        /* TITLE MSEC DATE ->SOURCE<- VOL */
 


@@ -489,7 +475,7 @@ post_fi(CHKARGS)
 {
 
        if ( ! (MAN_LITERAL & m->flags))
 {
 
        if ( ! (MAN_LITERAL & m->flags))

-               man_nmsg(m, n, MANDOCERR_NOSCOPE);
+               man_nmsg(m, n, MANDOCERR_WNOSCOPE);

 
        m->flags &= ~MAN_LITERAL;
        return(1);
 
        m->flags &= ~MAN_LITERAL;
        return(1);