diff options
| -rw-r--r-- | usr.bin/mandoc/libman.h | 5 | ||||
| -rw-r--r-- | usr.bin/mandoc/main.c | 6 | ||||
| -rw-r--r-- | usr.bin/mandoc/man.c | 5 | ||||
| -rw-r--r-- | usr.bin/mandoc/man.h | 3 |
4 files changed, 13 insertions, 6 deletions
diff --git a/usr.bin/mandoc/libman.h b/usr.bin/mandoc/libman.h index 299b2134a68..40a9bf7661b 100644 --- a/usr.bin/mandoc/libman.h +++ b/usr.bin/mandoc/libman.h @@ -1,4 +1,4 @@ -/* $Id: libman.h,v 1.3 2009/06/23 22:05:42 schwarze Exp $ */ +/* $Id: libman.h,v 1.4 2009/07/07 00:54:46 schwarze Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -47,7 +47,8 @@ enum merr { WTSPACE, WTQUOTE, WNODATA, - WNOTITLE + WNOTITLE, + WESCAPE }; __BEGIN_DECLS diff --git a/usr.bin/mandoc/main.c b/usr.bin/mandoc/main.c index c141acea5cc..74d2d5bee27 100644 --- a/usr.bin/mandoc/main.c +++ b/usr.bin/mandoc/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.10 2009/07/07 00:16:21 schwarze Exp $ */ +/* $Id: main.c,v 1.11 2009/07/07 00:54:46 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -219,12 +219,14 @@ man_init(struct curparse *curp) /* Defaults from mandoc.1. */ - pflags = MAN_IGN_MACRO | MAN_IGN_CHARS; + pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE | MAN_IGN_CHARS; if (curp->fflags & NO_IGN_MACRO) pflags &= ~MAN_IGN_MACRO; if (curp->fflags & NO_IGN_CHARS) pflags &= ~MAN_IGN_CHARS; + if (curp->fflags & NO_IGN_ESCAPE) + pflags &= ~MAN_IGN_ESCAPE; if (NULL == (man = man_alloc(curp, pflags, &mancb))) warnx("memory exhausted"); diff --git a/usr.bin/mandoc/man.c b/usr.bin/mandoc/man.c index cfa06a08604..5e0a1c4133c 100644 --- a/usr.bin/mandoc/man.c +++ b/usr.bin/mandoc/man.c @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.5 2009/06/23 22:31:26 schwarze Exp $ */ +/* $Id: man.c,v 1.6 2009/07/07 00:54:46 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -472,6 +472,9 @@ man_err(struct man *m, int line, int pos, case (WNOTITLE): p = "document has no title/section"; break; + case (WESCAPE): + p = "invalid escape sequence"; + break; } assert(p); diff --git a/usr.bin/mandoc/man.h b/usr.bin/mandoc/man.h index 4b966542839..4e747ba98d0 100644 --- a/usr.bin/mandoc/man.h +++ b/usr.bin/mandoc/man.h @@ -1,4 +1,4 @@ -/* $Id: man.h,v 1.4 2009/06/23 22:31:26 schwarze Exp $ */ +/* $Id: man.h,v 1.5 2009/07/07 00:54:46 schwarze Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -76,6 +76,7 @@ struct man_node { #define MAN_IGN_MACRO (1 << 0) #define MAN_IGN_CHARS (1 << 1) +#define MAN_IGN_ESCAPE (1 << 2) extern const char *const *man_macronames; |