`IP' and `TP' correctly handle width arguments.

[mandoc.git] / man_action.c

diff --git a/man_action.c b/man_action.c
index 6c7b1e42efb3904538bc07d041b3d38506a5ea25..c92e7ac59d9382de8797854cb2cabd5c340276fa 100644 (file)
--- a/man_action.c
+++ b/man_action.c
@@ -1,4 +1,4 @@
-/*     $Id: man_action.c,v 1.11 2009/06/10 20:18:43 kristaps Exp $ */
+/*     $Id: man_action.c,v 1.15 2009/08/13 11:45:29 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -36,7 +36,7 @@ static        int       post_TH(struct man *);
 static time_t    man_atotime(const char *);
 
 const  struct actions man_actions[MAN_MAX] = {
-       { NULL }, /* __ */
+       { NULL }, /* br */
        { post_TH }, /* TH */
        { NULL }, /* SH */
        { NULL }, /* SS */
@@ -57,9 +57,12 @@ const        struct actions man_actions[MAN_MAX] = {
        { NULL }, /* I */
        { NULL }, /* IR */
        { NULL }, /* RI */
-       { NULL }, /* br */
        { NULL }, /* na */
        { NULL }, /* i */
+       { NULL }, /* sp */
+       { NULL }, /* nf */
+       { NULL }, /* fi */
+       { NULL }, /* r*/
 };
 
 
@@ -109,8 +112,7 @@ post_TH(struct man *m)
        assert(n);
 
        if (NULL == (m->meta.title = strdup(n->string)))
-               return(man_verr(m, n->line, n->pos, 
-                                       "memory exhausted"));
+               return(man_nerr(m, n, WNMEM));
 
        /* TITLE ->MSEC<- DATE SOURCE VOL */
 
@@ -121,7 +123,7 @@ post_TH(struct man *m)
        lval = strtol(n->string, &ep, 10);
        if (n->string[0] != '\0' && *ep == '\0')
                m->meta.msec = (int)lval;
-       else if ( ! man_vwarn(m, n->line, n->pos, "invalid section"))
+       else if ( ! man_nwarn(m, n, WMSEC))
                return(0);
 
        /* TITLE MSEC ->DATE<- SOURCE VOL */
@@ -129,7 +131,7 @@ post_TH(struct man *m)
        if (NULL == (n = n->next))
                m->meta.date = time(NULL);
        else if (0 == (m->meta.date = man_atotime(n->string))) {
-               if ( ! man_vwarn(m, n->line, n->pos, "invalid date"))
+               if ( ! man_nwarn(m, n, WDATE))
                        return(0);
                m->meta.date = time(NULL);
        }
@@ -138,15 +140,13 @@ post_TH(struct man *m)
 
        if (n && (n = n->next))
                if (NULL == (m->meta.source = strdup(n->string)))
-                       return(man_verr(m, n->line, n->pos, 
-                                               "memory exhausted"));
+                       return(man_nerr(m, n, WNMEM));
 
        /* TITLE MSEC DATE SOURCE ->VOL<- */
 
        if (n && (n = n->next))
                if (NULL == (m->meta.vol = strdup(n->string)))
-                       return(man_verr(m, n->line, n->pos, 
-                                               "memory exhausted"));
+                       return(man_nerr(m, n, WNMEM));
 
        /* 
         * The end document shouldn't have the prologue macros as part
@@ -154,12 +154,10 @@ post_TH(struct man *m)
         */
 
        if (m->last->parent->child == m->last) {
-               assert(MAN_ROOT == m->last->parent->type);
                m->last->parent->child = NULL;
                n = m->last;
                m->last = m->last->parent;
                m->next = MAN_NEXT_CHILD;
-               assert(m->last == m->first);
        } else {
                assert(m->last->prev);
                m->last->prev->next = NULL;
@@ -179,7 +177,7 @@ man_atotime(const char *p)
        struct tm        tm;
        char            *pp;
 
-       (void)memset(&tm, 0, sizeof(struct tm));
+       bzero(&tm, sizeof(struct tm));
 
        if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp)
                return(mktime(&tm));