Make (e.g.) `SM' before `B' be only a warning. In reality, this refers

to ELINE macros ("next-line", but not unbreakable like the next-line
paragraph macros) followed by other macros.  This addresses a report by
Christian Weisgerber, posted in the TODO by schwarze@, and aired on
discuss@ (22/03/2011) for whether a fix is warranted.

diff --git a/TODO b/TODO
index 9615a49916bb2c09070cd87cdb290527c2affad2..59a47906c030e8bd99243c10789e614a78c3fe4f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,6 @@
 ************************************************************************
 * Official mandoc TODO.
 ************************************************************************
 * Official mandoc TODO.

-* $Id: TODO,v 1.94 2011/03/22 15:30:30 kristaps Exp $
+* $Id: TODO,v 1.95 2011/03/23 09:47:13 kristaps Exp $

 ************************************************************************
 
 ************************************************************************
 ************************************************************************
 
 ************************************************************************


@@ -103,12 +103,6 @@
 
 --- missing man features -----------------------------------------------
 
 
 --- missing man features -----------------------------------------------
 

-- bashbug(1) complains "line scope broken" after
-  .SM
-  .B something
-  should either just work or be a warning
-  reported by naddy@
-

 - groff an-ext.tmac macros (.UR, .UE) occur in xine(5)
   reported by brad@  Sat, 15 Jan 2011 15:45:23 -0500
 
 - groff an-ext.tmac macros (.UR, .UE) occur in xine(5)
   reported by brad@  Sat, 15 Jan 2011 15:45:23 -0500
 

diff --git a/main.c b/main.c
index f6f52fda0c83bff0e7274a44836c5e168c9c7b44..0ea836041261b1e1d7730c753da9bee8a93144df 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.158 2011/03/22 10:35:26 kristaps Exp $ */
+/*     $Id: main.c,v 1.159 2011/03/23 09:47:13 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>


@@ -106,6 +106,7 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "child violates parent syntax",
        "nested displays are not portable",
        "already in literal mode",
        "child violates parent syntax",
        "nested displays are not portable",
        "already in literal mode",

+       "line scope broken",

 
        /* related to missing macro arguments */
        "skipping empty macro",
 
        /* related to missing macro arguments */
        "skipping empty macro",


@@ -153,7 +154,6 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "skipping text before the first section header",
        "skipping unknown macro",
        "NOT IMPLEMENTED, please use groff: skipping request",
        "skipping text before the first section header",
        "skipping unknown macro",
        "NOT IMPLEMENTED, please use groff: skipping request",

-       "line scope broken",

        "argument count wrong",
        "skipping end of block that is not open",
        "missing end of block",
        "argument count wrong",
        "skipping end of block that is not open",
        "missing end of block",

diff --git a/mandoc.h b/mandoc.h
index 694179d1bc64cad2e701188aac4da003fd51e2bf..cf20bfbc00ae5a171c5faed45794d03d95b45a8c 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.67 2011/03/22 14:05:45 kristaps Exp $ */
+/*     $Id: mandoc.h,v 1.68 2011/03/23 09:47:13 kristaps Exp $ */

 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -74,6 +74,7 @@ enum  mandocerr {
        MANDOCERR_CHILD, /* child violates parent syntax */
        MANDOCERR_NESTEDDISP, /* nested displays are not portable */
        MANDOCERR_SCOPEREP, /* already in literal mode */
        MANDOCERR_CHILD, /* child violates parent syntax */
        MANDOCERR_NESTEDDISP, /* nested displays are not portable */
        MANDOCERR_SCOPEREP, /* already in literal mode */

+       MANDOCERR_LINESCOPE, /* line scope broken */

 
        /* related to missing macro arguments */
        MANDOCERR_MACROEMPTY, /* skipping empty macro */
 
        /* related to missing macro arguments */
        MANDOCERR_MACROEMPTY, /* skipping empty macro */


@@ -121,7 +122,6 @@ enum        mandocerr {
        MANDOCERR_NOTEXT, /* skipping text before the first section header */
        MANDOCERR_MACRO, /* skipping unknown macro */
        MANDOCERR_REQUEST, /* NOT IMPLEMENTED: skipping request */
        MANDOCERR_NOTEXT, /* skipping text before the first section header */
        MANDOCERR_MACRO, /* skipping unknown macro */
        MANDOCERR_REQUEST, /* NOT IMPLEMENTED: skipping request */

-       MANDOCERR_LINESCOPE, /* line scope broken */

        MANDOCERR_ARGCOUNT, /* argument count wrong */
        MANDOCERR_NOSCOPE, /* skipping end of block that is not open */
        MANDOCERR_SCOPEBROKEN, /* missing end of block */
        MANDOCERR_ARGCOUNT, /* argument count wrong */
        MANDOCERR_NOSCOPE, /* skipping end of block that is not open */
        MANDOCERR_SCOPEBROKEN, /* missing end of block */