summaryrefslogtreecommitdiffstats
path: root/roff.c
diff options
context:
space:
mode:
Diffstat (limited to 'roff.c')
-rw-r--r--roff.c29
1 files changed, 18 insertions, 11 deletions
diff --git a/roff.c b/roff.c
index bc24a88f..caba9939 100644
--- a/roff.c
+++ b/roff.c
@@ -138,10 +138,10 @@ static char *roff_getname(struct roff *, char **, int, int);
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);
+static enum rofferr roff_rm(ROFF_ARGS);
static void roff_setstr(struct roff *,
const char *, const char *, int);
static enum rofferr roff_so(ROFF_ARGS);
@@ -175,7 +175,7 @@ static struct roffmac roffs[ROFF_MAX] = {
{ "ne", roff_line_ignore, NULL, NULL, 0, NULL },
{ "nh", roff_line_ignore, NULL, NULL, 0, NULL },
{ "nr", roff_nr, NULL, NULL, 0, NULL },
- { "rm", roff_line_error, NULL, NULL, 0, NULL },
+ { "rm", roff_rm, NULL, NULL, 0, NULL },
{ "so", roff_so, NULL, NULL, 0, NULL },
{ "tr", roff_line_ignore, NULL, NULL, 0, NULL },
{ "TS", roff_TS, NULL, NULL, 0, NULL },
@@ -940,15 +940,6 @@ roff_line_ignore(ROFF_ARGS)
/* 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
roff_cond(ROFF_ARGS)
{
int sv;
@@ -1095,6 +1086,22 @@ roff_nr(ROFF_ARGS)
/* ARGSUSED */
static enum rofferr
+roff_rm(ROFF_ARGS)
+{
+ const char *name;
+ char *cp;
+
+ cp = *bufp + pos;
+ while ('\0' != *cp) {
+ name = roff_getname(r, &cp, ln, cp - *bufp);
+ if ('\0' != *name)
+ roff_setstr(r, name, NULL, 0);
+ }
+ return(ROFF_IGN);
+}
+
+/* ARGSUSED */
+static enum rofferr
roff_TE(ROFF_ARGS)
{