summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2010-11-25 23:07:59 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2010-11-25 23:07:59 +0000
commit49295dab3dc856a6748dd182928913f923c43f31 (patch)
tree9b8198549ab2171b486259ed332b2223a6a85fa3
parent353d7187b2e7bc07f2586f4ba97dc042e340206e (diff)
Make .de1 a symnonym for .de, not .ig as it was before.
The .de1 instructions is a GNU extension not found in traditional roff and not even in old groff, defined as "define a macro that will be executed with traditional roff compatibility mode switched off during macro execution". Since we ran into it in the wild, we have been parsing and ignoring it for a long time. Now that we have proper .de support, we can as well use the contents, even though we don't implement compatibility mode at all.
-rw-r--r--usr.bin/mandoc/roff.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/mandoc/roff.c b/usr.bin/mandoc/roff.c
index fe1a2feb4b2..8c5973e7307 100644
--- a/usr.bin/mandoc/roff.c
+++ b/usr.bin/mandoc/roff.c
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.17 2010/11/25 22:41:51 schwarze Exp $ */
+/* $Id: roff.c,v 1.18 2010/11/25 23:07:58 schwarze Exp $ */
/*
* Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -538,8 +538,6 @@ roff_cblock(ROFF_ARGS)
/* FALLTHROUGH */
case (ROFF_dei):
/* FALLTHROUGH */
- case (ROFF_de1):
- /* FALLTHROUGH */
case (ROFF_ig):
break;
default:
@@ -626,6 +624,8 @@ roff_block(ROFF_ARGS)
(*r->msg)(MANDOCERR_NOARGS, r->data, ln, ppos, NULL);
return(ROFF_IGN);
}
+ if (ROFF_de1 == tok)
+ tok = ROFF_de;
if (ROFF_de == tok)
name = *bufp + pos;
while ((*bufp)[pos] && ' ' != (*bufp)[pos])