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

[mandoc.git] / man_action.c

diff --git a/man_action.c b/man_action.c
index 547a819a24427d5bb79f5abc2e0157d6ae905389..c92e7ac59d9382de8797854cb2cabd5c340276fa 100644 (file)
--- a/man_action.c
+++ b/man_action.c
@@ -1,41 +1,43 @@
-/* $Id: man_action.c,v 1.1 2009/03/25 15:36:05 kristaps Exp $ */
+/*     $Id: man_action.c,v 1.15 2009/08/13 11:45:29 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>

  *
  * Permission to use, copy, modify, and distribute this software for any
  *
  * Permission to use, copy, modify, and distribute this software for any

- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.

  *
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */
 #include <sys/utsname.h>
 
 #include <assert.h>
  */
 #include <sys/utsname.h>
 
 #include <assert.h>

-#include <err.h>

 #include <errno.h>
 #include <errno.h>

-#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 
 #include "libman.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "libman.h"
 

+#ifdef __linux__
+extern char            *strptime(const char *, const char *, struct tm *);
+#endif

 
 struct actions {
        int     (*post)(struct man *);
 };
 
 
 
 struct actions {
        int     (*post)(struct man *);
 };
 
 

+static int       post_TH(struct man *);
+static time_t    man_atotime(const char *);
+

 const  struct actions man_actions[MAN_MAX] = {
 const  struct actions man_actions[MAN_MAX] = {

-       { NULL }, /* __ */
-       { NULL }, /* TH */
+       { NULL }, /* br */
+       { post_TH }, /* TH */

        { NULL }, /* SH */
        { NULL }, /* SS */
        { NULL }, /* TP */
        { NULL }, /* SH */
        { NULL }, /* SS */
        { NULL }, /* TP */


@@ -54,6 +56,13 @@ const        struct actions man_actions[MAN_MAX] = {
        { NULL }, /* B */
        { NULL }, /* I */
        { NULL }, /* IR */
        { NULL }, /* B */
        { NULL }, /* I */
        { NULL }, /* IR */

+       { NULL }, /* RI */
+       { NULL }, /* na */
+       { NULL }, /* i */
+       { NULL }, /* sp */
+       { NULL }, /* nf */
+       { NULL }, /* fi */
+       { NULL }, /* r*/

 };
 
 
 };
 
 


@@ -78,119 +87,106 @@ man_action_post(struct man *m)
        return(1);
 }
 
        return(1);
 }
 

-#if 0
+

 static int
 static int

-post_dt(POST_ARGS)
+post_TH(struct man *m)

 {
 {

-       struct mdoc_node *n;
-       const char       *cp;
-       char             *ep;
-       long              lval;
+       struct man_node *n;
+       char            *ep;
+       long             lval;

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

-       if (m->meta.arch)
-               free(m->meta.arch);
+       if (m->meta.source)
+               free(m->meta.source);

 
 

-       m->meta.title = m->meta.vol = m->meta.arch = NULL;
+       m->meta.title = m->meta.vol = m->meta.source = NULL;

        m->meta.msec = 0;
        m->meta.msec = 0;

+       m->meta.date = 0;

 
 

-       /* Handles: `.Dt' 
-        *   --> title = unknown, volume = local, msec = 0, arch = NULL
-        */
+       /* ->TITLE<- MSEC DATE SOURCE VOL */

 
 

-       if (NULL == (n = m->last->child)) {
-               m->meta.title = xstrdup("unknown");
-               m->meta.vol = xstrdup("local");
-               return(post_prol(m));
-       }
+       n = m->last->child;
+       assert(n);

 
 

-       /* Handles: `.Dt TITLE' 
-        *   --> title = TITLE, volume = local, msec = 0, arch = NULL
-        */
+       if (NULL == (m->meta.title = strdup(n->string)))
+               return(man_nerr(m, n, WNMEM));

 
 

-       m->meta.title = xstrdup(n->string);
+       /* TITLE ->MSEC<- DATE SOURCE VOL */

 
 

-       if (NULL == (n = n->next)) {
-               m->meta.vol = xstrdup("local");
-               return(post_prol(m));
-       }
+       n = n->next;
+       assert(n);

 
 

-       /* Handles: `.Dt TITLE SEC'
-        *   --> title = TITLE, volume = SEC is msec ? 
-        *           format(msec) : SEC,
-        *       msec = SEC is msec ? atoi(msec) : 0,
-        *       arch = NULL
-        */
+       errno = 0;
+       lval = strtol(n->string, &ep, 10);
+       if (n->string[0] != '\0' && *ep == '\0')
+               m->meta.msec = (int)lval;
+       else if ( ! man_nwarn(m, n, WMSEC))
+               return(0);

 
 

-       cp = mdoc_a2msec(n->string);
-       if (cp) {
-               m->meta.vol = xstrdup(cp);
-               errno = 0;
-               lval = strtol(n->string, &ep, 10);
-               if (n->string[0] != '\0' && *ep == '\0')
-                       m->meta.msec = (int)lval;
-       } else 
-               m->meta.vol = xstrdup(n->string);
+       /* TITLE MSEC ->DATE<- SOURCE VOL */

 
        if (NULL == (n = n->next))
 
        if (NULL == (n = n->next))

-               return(post_prol(m));
+               m->meta.date = time(NULL);
+       else if (0 == (m->meta.date = man_atotime(n->string))) {
+               if ( ! man_nwarn(m, n, WDATE))
+                       return(0);
+               m->meta.date = time(NULL);
+       }

 
 

-       /* Handles: `.Dt TITLE SEC VOL'
-        *   --> title = TITLE, volume = VOL is vol ?
-        *       format(VOL) : 
-        *           VOL is arch ? format(arch) : 
-        *               VOL
-        */
+       /* TITLE MSEC DATE ->SOURCE<- VOL */

 
 

-       cp = mdoc_a2vol(n->string);
-       if (cp) {
-               free(m->meta.vol);
-               m->meta.vol = xstrdup(cp);
-               n = n->next;
-       } else {
-               cp = mdoc_a2arch(n->string);
-               if (NULL == cp) {
-                       free(m->meta.vol);
-                       m->meta.vol = xstrdup(n->string);
-               } else
-                       m->meta.arch = xstrdup(cp);
-       }       
+       if (n && (n = n->next))
+               if (NULL == (m->meta.source = strdup(n->string)))
+                       return(man_nerr(m, n, WNMEM));

 
 

-       /* Ignore any subsequent parameters... */
+       /* TITLE MSEC DATE SOURCE ->VOL<- */

 
 

-       return(post_prol(m));
-}
-
-static int
-post_prol(POST_ARGS)
-{
-       struct mdoc_node *n;
+       if (n && (n = n->next))
+               if (NULL == (m->meta.vol = strdup(n->string)))
+                       return(man_nerr(m, n, WNMEM));

 
        /* 
         * The end document shouldn't have the prologue macros as part
         * of the syntax tree (they encompass only meta-data).  
         */
 
 
        /* 
         * The end document shouldn't have the prologue macros as part
         * of the syntax tree (they encompass only meta-data).  
         */
 

-       if (m->last->parent->child == m->last)
-               m->last->parent->child = m->last->prev;
-       if (m->last->prev)
+       if (m->last->parent->child == m->last) {
+               m->last->parent->child = NULL;
+               n = m->last;
+               m->last = m->last->parent;
+               m->next = MAN_NEXT_CHILD;
+       } else {
+               assert(m->last->prev);

                m->last->prev->next = NULL;
                m->last->prev->next = NULL;

-
-       n = m->last;
-       assert(NULL == m->last->next);
-
-       if (m->last->prev) {
+               n = m->last;

                m->last = m->last->prev;
                m->last = m->last->prev;

-               m->next = MDOC_NEXT_SIBLING;
-       } else {
-               m->last = m->last->parent;
-               m->next = MDOC_NEXT_CHILD;
+               m->next = MAN_NEXT_SIBLING;

        }
 
        }
 

-       mdoc_node_freelist(n);
+       man_node_freelist(n);

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

-#endif
+
+
+static time_t
+man_atotime(const char *p)
+{
+       struct tm        tm;
+       char            *pp;
+
+       bzero(&tm, sizeof(struct tm));
+
+       if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp)
+               return(mktime(&tm));
+       if ((pp = strptime(p, "%d %b %Y", &tm)) && 0 == *pp)
+               return(mktime(&tm));
+       if ((pp = strptime(p, "%b %d, %Y", &tm)) && 0 == *pp)
+               return(mktime(&tm));
+       if ((pp = strptime(p, "%b %Y", &tm)) && 0 == *pp)
+               return(mktime(&tm));
+
+       return(0);
+}