=================================================================== RCS file: /cvs/mandoc/Attic/man_action.c,v retrieving revision 1.30 retrieving revision 1.43 diff -u -p -r1.30 -r1.43 --- mandoc/Attic/man_action.c 2010/03/27 10:04:56 1.30 +++ mandoc/Attic/man_action.c 2010/11/30 15:24:27 1.43 @@ -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.43 2010/11/30 15:24:27 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010 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 @@ -21,7 +21,9 @@ #include #include #include +#include +#include "mandoc.h" #include "libman.h" #include "libmandoc.h" @@ -29,14 +31,9 @@ struct actions { int (*post)(struct man *); }; -static int post_TH(struct man *); -static int post_de(struct man *); -static int post_fi(struct man *); -static int post_nf(struct man *); - const struct actions man_actions[MAN_MAX] = { { NULL }, /* br */ - { post_TH }, /* TH */ + { NULL }, /* TH */ { NULL }, /* SH */ { NULL }, /* SS */ { NULL }, /* TP */ @@ -59,8 +56,8 @@ const struct actions man_actions[MAN_MAX] = { { NULL }, /* na */ { NULL }, /* i */ { NULL }, /* sp */ - { post_nf }, /* nf */ - { post_fi }, /* fi */ + { NULL }, /* nf */ + { NULL }, /* fi */ { NULL }, /* r */ { NULL }, /* RE */ { NULL }, /* RS */ @@ -68,14 +65,10 @@ const struct actions man_actions[MAN_MAX] = { { NULL }, /* UC */ { NULL }, /* PD */ { NULL }, /* Sp */ - { post_nf }, /* Vb */ - { post_fi }, /* Ve */ - { post_de }, /* de */ - { post_de }, /* dei */ - { post_de }, /* am */ - { post_de }, /* ami */ - { post_de }, /* ig */ - { NULL }, /* . */ + { NULL }, /* Vb */ + { NULL }, /* Ve */ + { NULL }, /* AT */ + { NULL }, /* in */ }; @@ -102,108 +95,5 @@ man_action_post(struct man *m) } -static int -post_fi(struct man *m) -{ - if ( ! (MAN_LITERAL & m->flags)) - if ( ! man_nwarn(m, m->last, WNLITERAL)) - return(0); - m->flags &= ~MAN_LITERAL; - return(1); -} - -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) -{ - - if (MAN_LITERAL & m->flags) - if ( ! man_nwarn(m, m->last, WOLITERAL)) - return(0); - m->flags |= MAN_LITERAL; - return(1); -} - - -static int -post_TH(struct man *m) -{ - 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.source) - free(m->meta.source); - - m->meta.title = m->meta.vol = m->meta.source = NULL; - m->meta.msec = 0; - m->meta.date = 0; - - /* ->TITLE<- MSEC DATE SOURCE VOL */ - - n = m->last->child; - assert(n); - m->meta.title = mandoc_strdup(n->string); - - /* TITLE ->MSEC<- DATE SOURCE VOL */ - - n = n->next; - assert(n); - - 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); - m->meta.date = time(NULL); - } - } else - m->meta.date = time(NULL); - - /* TITLE MSEC DATE ->SOURCE<- VOL */ - - if (n && (n = n->next)) - m->meta.source = mandoc_strdup(n->string); - - /* TITLE MSEC DATE SOURCE ->VOL<- */ - - if (n && (n = n->next)) - m->meta.vol = mandoc_strdup(n->string); - - /* - * Remove the `TH' node after we've processed it for our - * meta-data. - */ - man_node_delete(m, m->last); - return(1); -}