Make out-of-context `fi' invocations not cause an error, but just a

warning.  From a TODO by schwarze@, originally noted by Brad Smith.

diff --git a/TODO b/TODO
index 19a98cbb271c7875c3e04a2126b2fb9ae182daa2..c4ecf365666d2162619253f34d44c252d568650a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -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

diff --git a/main.c b/main.c
index b6954da2d2aef1094112b81698425ffd8c5036d6..a83f8aeb2e133db9b8093766dc17dfcf37167712 100644 (file)
--- a/main.c
+++ b/main.c
@@ -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 bcfcbacfa40b7ebf4d4f21852e2628bce328b76f..136b63aae29edb66105362ea5523637ddca3d00d 100644 (file)
--- 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);

diff --git a/mandoc.h b/mandoc.h
index 9cfb350aa8a8dccb0648fced9232d96ffa43461d..f9c77487493f6ea9a9c9a86385da76e68ea66e87 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -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 */