=================================================================== RCS file: /cvs/mandoc/Attic/action.c,v retrieving revision 1.40 retrieving revision 1.42 diff -u -p -r1.40 -r1.42 --- mandoc/Attic/action.c 2009/03/11 00:39:58 1.40 +++ mandoc/Attic/action.c 2009/03/16 22:19:19 1.42 @@ -1,4 +1,4 @@ -/* $Id: action.c,v 1.40 2009/03/11 00:39:58 kristaps Exp $ */ +/* $Id: action.c,v 1.42 2009/03/16 22:19:19 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -59,9 +59,12 @@ static int post_dt(struct mdoc *); static int post_nm(struct mdoc *); static int post_os(struct mdoc *); static int post_sh(struct mdoc *); -static int post_ex(struct mdoc *); +static int post_std(struct mdoc *); static int post_prologue(struct mdoc *); +#define merr(m, t) nerr((m), (m)->last, (t)) +#define mwarn(m, t) nwarn((m), (m)->last, (t)) + const struct actions mdoc_actions[MDOC_MAX] = { { NULL }, /* \" */ { post_dd }, /* Dd */ @@ -85,7 +88,7 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL }, /* Dv */ { NULL }, /* Er */ { NULL }, /* Ev */ - { post_ex }, /* Ex */ + { post_std }, /* Ex */ { NULL }, /* Fa */ { NULL }, /* Fd */ { NULL }, /* Fl */ @@ -99,7 +102,7 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL }, /* Op */ { NULL }, /* Ot */ { NULL }, /* Pa */ - { NULL }, /* Rv */ + { post_std }, /* Rv */ { NULL }, /* St */ { NULL }, /* Va */ { NULL }, /* Vt */ @@ -177,10 +180,12 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL }, /* Brq */ { NULL }, /* Bro */ { NULL }, /* Brc */ + { NULL }, /* %C */ + { NULL }, /* Es */ + { NULL }, /* En */ }; -#define merr(m, t) nerr((m), (m)->last, (t)) static int nerr(struct mdoc *m, const struct mdoc_node *n, enum merr type) { @@ -199,7 +204,6 @@ nerr(struct mdoc *m, const struct mdoc_node *n, enum m } -#define mwarn(m, t) nwarn((m), (m)->last, (t)) static int nwarn(struct mdoc *m, const struct mdoc_node *n, enum mwarn type) { @@ -228,12 +232,12 @@ nwarn(struct mdoc *m, const struct mdoc_node *n, enum static int -post_ex(struct mdoc *mdoc) +post_std(struct mdoc *mdoc) { /* - * If `.Ex -std' is invoked without an argument, fill it in with - * our name (if it's been set). + * If '-std' is invoked without an argument, fill it in with our + * name (if it's been set). */ if (NULL == mdoc->last->args)