=================================================================== RCS file: /cvs/mandoc/Attic/man_action.c,v retrieving revision 1.30 retrieving revision 1.34 diff -u -p -r1.30 -r1.34 --- mandoc/Attic/man_action.c 2010/03/27 10:04:56 1.30 +++ mandoc/Attic/man_action.c 2010/05/15 22:44:04 1.34 @@ -1,6 +1,6 @@ -/* $Id: man_action.c,v 1.30 2010/03/27 10:04:56 kristaps Exp $ */ +/* $Id: man_action.c,v 1.34 2010/05/15 22:44:04 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -30,7 +30,6 @@ struct actions { }; static int post_TH(struct man *); -static int post_de(struct man *); static int post_fi(struct man *); static int post_nf(struct man *); @@ -70,12 +69,6 @@ const struct actions man_actions[MAN_MAX] = { { NULL }, /* Sp */ { post_nf }, /* Vb */ { post_fi }, /* Ve */ - { post_de }, /* de */ - { post_de }, /* dei */ - { post_de }, /* am */ - { post_de }, /* ami */ - { post_de }, /* ig */ - { NULL }, /* . */ }; @@ -115,20 +108,6 @@ post_fi(struct man *m) static int -post_de(struct man *m) -{ - - /* - * XXX: for the time being, we indiscriminately remove roff - * instructions from the parse stream. - */ - if (MAN_BLOCK == m->last->type) - man_node_delete(m, m->last); - return(1); -} - - -static int post_nf(struct man *m) { @@ -144,8 +123,6 @@ static int post_TH(struct man *m) { struct man_node *n; - char *ep; - long lval; if (m->meta.title) free(m->meta.title); @@ -153,9 +130,11 @@ post_TH(struct man *m) free(m->meta.vol); if (m->meta.source) free(m->meta.source); + if (m->meta.msec) + free(m->meta.msec); - m->meta.title = m->meta.vol = m->meta.source = NULL; - m->meta.msec = 0; + m->meta.title = m->meta.vol = + m->meta.msec = m->meta.source = NULL; m->meta.date = 0; /* ->TITLE<- MSEC DATE SOURCE VOL */ @@ -168,20 +147,14 @@ post_TH(struct man *m) n = n->next; assert(n); + m->meta.msec = mandoc_strdup(n->string); - 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); - /* TITLE MSEC ->DATE<- SOURCE VOL */ n = n->next; if (n) { m->meta.date = mandoc_a2time (MTIME_ISO_8601, n->string); - if (0 == m->meta.date) { if ( ! man_nwarn(m, n, WDATE)) return(0);