diff options
| -rw-r--r-- | main.c | 3 | ||||
| -rw-r--r-- | mandoc.h | 3 | ||||
| -rw-r--r-- | roff.c | 18 |
3 files changed, 17 insertions, 7 deletions
@@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.109 2010/11/29 15:45:15 kristaps Exp $ */ +/* $Id: main.c,v 1.110 2010/12/01 10:31:34 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -159,6 +159,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "no text in this context", "bad comment style", "unknown macro will be lost", + "NOT IMPLEMENTED: skipping request", "line scope broken", "argument count wrong", "request scope close w/none open", @@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.24 2010/11/29 15:45:15 kristaps Exp $ */ +/* $Id: mandoc.h,v 1.25 2010/12/01 10:31:35 kristaps Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -85,6 +85,7 @@ enum mandocerr { MANDOCERR_NOTEXT, /* no text in this context */ MANDOCERR_BADCOMMENT, /* bad comment style */ MANDOCERR_MACRO, /* unknown macro will be lost */ + MANDOCERR_REQUEST, /* NOT IMPLEMENTED: skipping request */ MANDOCERR_LINESCOPE, /* line scope broken */ MANDOCERR_ARGCOUNT, /* argument count wrong */ MANDOCERR_NOSCOPE, /* no such block is open */ @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.103 2010/12/01 10:21:25 kristaps Exp $ */ +/* $Id: roff.c,v 1.104 2010/12/01 10:31:35 kristaps Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -60,11 +60,11 @@ enum rofft { ROFF_ig, ROFF_ne, ROFF_nh, + ROFF_nr, ROFF_rm, ROFF_tr, ROFF_cblock, ROFF_ccond, /* FIXME: remove this. */ - ROFF_nr, ROFF_MAX }; @@ -135,6 +135,7 @@ static void roff_freestr(struct roff *); static const char *roff_getstrn(const struct roff *, const char *, size_t); static enum rofferr roff_line_ignore(ROFF_ARGS); +static enum rofferr roff_line_error(ROFF_ARGS); static enum rofferr roff_nr(ROFF_ARGS); static int roff_res(struct roff *, char **, size_t *, int); @@ -166,11 +167,11 @@ static struct roffmac roffs[ROFF_MAX] = { { "ig", roff_block, roff_block_text, roff_block_sub, 0, NULL }, { "ne", roff_line_ignore, NULL, NULL, 0, NULL }, { "nh", roff_line_ignore, NULL, NULL, 0, NULL }, - { "rm", roff_line_ignore, NULL, NULL, 0, NULL }, + { "nr", roff_nr, NULL, NULL, 0, NULL }, + { "rm", roff_line_error, NULL, NULL, 0, NULL }, { "tr", roff_line_ignore, NULL, NULL, 0, NULL }, { ".", roff_cblock, NULL, NULL, 0, NULL }, { "\\}", roff_ccond, NULL, NULL, 0, NULL }, - { "nr", roff_nr, NULL, NULL, 0, NULL }, }; static void roff_free1(struct roff *); @@ -846,7 +847,6 @@ roff_evalcond(const char *v, int *pos) return(ROFFRULE_DENY); } - /* ARGSUSED */ static enum rofferr roff_line_ignore(ROFF_ARGS) @@ -855,6 +855,14 @@ roff_line_ignore(ROFF_ARGS) return(ROFF_IGN); } +/* ARGSUSED */ +static enum rofferr +roff_line_error(ROFF_ARGS) +{ + + (*r->msg)(MANDOCERR_REQUEST, r->data, ln, ppos, roffs[tok].name); + return(ROFF_IGN); +} /* ARGSUSED */ static enum rofferr |