diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2011-01-12 15:50:42 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-01-12 15:50:42 +0000 |
| commit | 6e11d260e2b32511ddba61c5233b2ac3068e1118 (patch) | |
| tree | 5f1ab304404ce42398e4cd8bbda9188835544a18 | |
| parent | 5f6cfc51841517a03c234988b077d265f7bfcf38 (diff) | |
| download | mandoc-6e11d260e2b32511ddba61c5233b2ac3068e1118.tar.gz mandoc-6e11d260e2b32511ddba61c5233b2ac3068e1118.tar.zst mandoc-6e11d260e2b32511ddba61c5233b2ac3068e1118.zip | |
Make out-of-context `fi' invocations not cause an error, but just a
warning. From a TODO by schwarze@, originally noted by Brad Smith.
| -rw-r--r-- | TODO | 6 | ||||
| -rw-r--r-- | main.c | 3 | ||||
| -rw-r--r-- | man_validate.c | 4 | ||||
| -rw-r--r-- | mandoc.h | 3 |
4 files changed, 7 insertions, 9 deletions
@@ -1,6 +1,6 @@ ************************************************************************ * Official mandoc TODO. -* $Id: TODO,v 1.76 2011/01/12 15:31:17 kristaps Exp $ +* $Id: TODO,v 1.77 2011/01/12 15:50:42 kristaps Exp $ ************************************************************************ ************************************************************************ @@ -172,10 +172,6 @@ * error reporting issues ************************************************************************ -- .fi without preceding .nf need not be an ERROR, - a warning is sufficient; occurs in all postfix manuals - reported by brad@ Sun, Jan 09, 2011 at 09:45:58PM -0500 - - downgrade "ERROR: macro requires body argument(s)" to WARNING for the typical man(7) cases, it keeps confusing people reminded by brad@ Sun, Jan 09, 2011 at 09:45:58PM -0500 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.137 2011/01/11 00:11:45 schwarze Exp $ */ +/* $Id: main.c,v 1.138 2011/01/12 15:50:42 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -158,6 +158,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "list type must come first", "tag lists require a width argument", "missing font type", + "skipping end of block that is not open", /* related to bad macro arguments */ "skipping argument", diff --git a/man_validate.c b/man_validate.c index bcfcbacf..136b63aa 100644 --- a/man_validate.c +++ b/man_validate.c @@ -1,4 +1,4 @@ -/* $Id: man_validate.c,v 1.57 2011/01/01 12:59:17 kristaps Exp $ */ +/* $Id: man_validate.c,v 1.58 2011/01/12 15:50:42 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -489,7 +489,7 @@ post_fi(CHKARGS) { if ( ! (MAN_LITERAL & m->flags)) - man_nmsg(m, n, MANDOCERR_NOSCOPE); + man_nmsg(m, n, MANDOCERR_WNOSCOPE); m->flags &= ~MAN_LITERAL; return(1); @@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.52 2011/01/11 00:11:45 schwarze Exp $ */ +/* $Id: mandoc.h,v 1.53 2011/01/12 15:50:42 kristaps Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -80,6 +80,7 @@ enum mandocerr { MANDOCERR_LISTFIRST, /* list type must come first */ MANDOCERR_NOWIDTHARG, /* tag lists require a width argument */ MANDOCERR_FONTTYPE, /* missing font type */ + MANDOCERR_WNOSCOPE, /* skipping end of block that is not open */ /* related to bad macro arguments */ MANDOCERR_IGNARGV, /* skipping argument */ |