=================================================================== RCS file: /cvs/mandoc/Attic/action.c,v retrieving revision 1.39 retrieving revision 1.43 diff -u -p -r1.39 -r1.43 --- mandoc/Attic/action.c 2009/03/09 14:19:59 1.39 +++ mandoc/Attic/action.c 2009/03/16 23:37:28 1.43 @@ -1,6 +1,6 @@ -/* $Id: action.c,v 1.39 2009/03/09 14:19:59 kristaps Exp $ */ +/* $Id: action.c,v 1.43 2009/03/16 23:37:28 kristaps Exp $ */ /* - * Copyright (c) 2008 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 @@ -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 */ @@ -174,10 +177,16 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL }, /* Lp */ { NULL }, /* Lk */ { NULL }, /* Mt */ + { NULL }, /* Brq */ + { NULL }, /* Bro */ + { NULL }, /* Brc */ + { NULL }, /* %C */ + { NULL }, /* Es */ + { NULL }, /* En */ + { NULL }, /* Dx */ }; -#define merr(m, t) nerr((m), (m)->last, (t)) static int nerr(struct mdoc *m, const struct mdoc_node *n, enum merr type) { @@ -196,7 +205,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) { @@ -225,12 +233,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)