Handle nested, recursive mathematical subexpressions. This is

[mandoc.git] / man_action.c

diff --git a/man_action.c b/man_action.c
index 55fe11fdacf4bb7186991c0608b663d00c83fd31..474043bd09d1066e0fa01527b0c40e20738f1bca 100644 (file)
--- a/man_action.c
+++ b/man_action.c
@@ -1,6 +1,6 @@
-/*     $Id: man_action.c,v 1.36 2010/05/17 22:11:42 kristaps Exp $ */
+/*     $Id: man_action.c,v 1.41 2010/07/31 23:52:58 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -73,6 +73,7 @@ const struct actions man_actions[MAN_MAX] = {
        { post_nf }, /* Vb */
        { post_fi }, /* Ve */
        { post_AT }, /* AT */
+       { NULL }, /* in */
 };
 
 
@@ -136,8 +137,10 @@ post_TH(struct man *m)
                free(m->meta.source);
        if (m->meta.msec)
                free(m->meta.msec);
+       if (m->meta.rawdate)
+               free(m->meta.rawdate);
 
-       m->meta.title = m->meta.vol = 
+       m->meta.title = m->meta.vol = m->meta.rawdate =
                m->meta.msec = m->meta.source = NULL;
        m->meta.date = 0;
 
@@ -155,14 +158,21 @@ post_TH(struct man *m)
 
        /* 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) {
+       if (n && n->string && *n->string) {
                m->meta.date = mandoc_a2time
                        (MTIME_ISO_8601, n->string);
                if (0 == m->meta.date) {
                        if ( ! man_nmsg(m, n, MANDOCERR_BADDATE))
                                return(0);
-                       m->meta.date = time(NULL);
+                       m->meta.rawdate = mandoc_strdup(n->string);
                }
        } else
                m->meta.date = time(NULL);
@@ -219,6 +229,9 @@ post_AT(struct man *m)
                        p = unix_versions[0];
        }
 
+       if (m->meta.source)
+               free(m->meta.source);
+
        m->meta.source = mandoc_strdup(p);
 
        return(1);
@@ -259,6 +272,9 @@ post_UC(struct man *m)
                        p = bsd_versions[0];
        }
 
+       if (m->meta.source)
+               free(m->meta.source);
+
        m->meta.source = mandoc_strdup(p);
 
        return(1);