Finally, represent the man(7) .PP and .HP macros by the natural

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 2f1558088e0827ebf32d3e7bb6376b5d70a9be75..f0e4002b2a2c99cc0039ef780913cdf72af724b0 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,19 +1,25 @@
-/*     $Id: man.c,v 1.32 2009/08/19 12:00:46 kristaps Exp $ */
+/*     $Id: man.c,v 1.187 2019/01/05 00:36:50 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR

  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#include "config.h"
+
+#include <sys/types.h>
+

 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>


@@ -21,576 +27,319 @@
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

+#include "mandoc_aux.h"
+#include "mandoc.h"
+#include "roff.h"
+#include "man.h"
+#include "libmandoc.h"
+#include "roff_int.h"

 #include "libman.h"
 
 #include "libman.h"
 

-const  char *const __man_merrnames[WERRMAX] = {                 
-       "invalid character", /* WNPRINT */
-       "system: malloc error", /* WNMEM */
-       "invalid manual section", /* WMSEC */
-       "invalid date format", /* WDATE */
-       "scope of prior line violated", /* WLNSCOPE */
-       "trailing whitespace", /* WTSPACE */
-       "unterminated quoted parameter", /* WTQUOTE */
-       "document has no body", /* WNODATA */
-       "document has no title/section", /* WNOTITLE */
-       "invalid escape sequence", /* WESCAPE */
-       "invalid number format", /* WNUMFMT */
-       "expected block head arguments", /* WHEADARGS */
-       "expected block body arguments", /* WBODYARGS */
-       "expected empty block head", /* WNHEADARGS */
-       "unknown macro", /* WMACRO */
-       "ill-formed macro", /* WMACROFORM */
-       "scope open on exit", /* WEXITSCOPE */
-       "no scope context" /* WNOSCOPE */
-};
-
-const  char *const __man_macronames[MAN_MAX] = {                
-       "br",           "TH",           "SH",           "SS",
-       "TP",           "LP",           "PP",           "P",
-       "IP",           "HP",           "SM",           "SB",
-       "BI",           "IB",           "BR",           "RB",
-       "R",            "B",            "I",            "IR",
-       "RI",           "na",           "i",            "sp",
-       "nf",           "fi",           "r",            "RE",
-       "RS"
-       };
-
-const  char * const *man_macronames = __man_macronames;
-
-static struct man_node *man_node_alloc(int, int, 
-                               enum man_type, int);
-static int              man_node_append(struct man *, 
-                               struct man_node *);
-static int              man_ptext(struct man *, int, char *);
-static int              man_pmacro(struct man *, int, char *);
-static void             man_free1(struct man *);
-static int              man_alloc1(struct man *);
-static int              pstring(struct man *, int, int, 
-                               const char *, size_t);
-
-#ifdef __linux__
-extern size_t            strlcpy(char *, const char *, size_t);
-#endif
-
-
-const struct man_node *
-man_node(const struct man *m)
-{
-
-       return(MAN_HALT & m->flags ? NULL : m->first);
-}
+static char            *man_hasc(char *);
+static int              man_ptext(struct roff_man *, int, char *, int);
+static int              man_pmacro(struct roff_man *, int, char *, int);

 
 
 
 

-const struct man_meta *
-man_meta(const struct man *m)
+int
+man_parseln(struct roff_man *man, int ln, char *buf, int offs)

 {
 
 {
 

-       return(MAN_HALT & m->flags ? NULL : &m->meta);
-}
+       if (man->last->type != ROFFT_EQN || ln > man->last->line)
+               man->flags |= MAN_NEWLINE;

 
 

+       return roff_getcontrol(man->roff, buf, &offs) ?
+           man_pmacro(man, ln, buf, offs) :
+           man_ptext(man, ln, buf, offs);
+}

 
 

-int
-man_reset(struct man *man)
+/*
+ * If the string ends with \c, return a pointer to the backslash.
+ * Otherwise, return NULL.
+ */
+static char *
+man_hasc(char *start)

 {
 {

+       char    *cp, *ep;

 
 

-       man_free1(man);
-       return(man_alloc1(man));
+       ep = strchr(start, '\0') - 2;
+       if (ep < start || ep[0] != '\\' || ep[1] != 'c')
+               return NULL;
+       for (cp = ep; cp > start; cp--)
+               if (cp[-1] != '\\')
+                       break;
+       return (ep - cp) % 2 ? NULL : ep;

 }
 
 }
 

-

 void
 void

-man_free(struct man *man)
+man_descope(struct roff_man *man, int line, int offs, char *start)

 {
 {

+       /* Trailing \c keeps next-line scope open. */

 
 

-       man_free1(man);
+       if (start != NULL && man_hasc(start) != NULL)
+               return;

 
 

-       if (man->htab)
-               man_hash_free(man->htab);
-       free(man);
-}
+       /*
+        * Co-ordinate what happens with having a next-line scope open:
+        * first close out the element scopes (if applicable),
+        * then close out the block scope (also if applicable).
+        */

 
 

+       if (man->flags & MAN_ELINE) {
+               while (man->last->parent->type != ROFFT_ROOT &&
+                   man_macro(man->last->parent->tok)->flags & MAN_ESCOPED)
+                       man_unscope(man, man->last->parent);
+               man->flags &= ~MAN_ELINE;
+       }
+       if ( ! (man->flags & MAN_BLINE))
+               return;
+       man_unscope(man, man->last->parent);
+       roff_body_alloc(man, line, offs, man->last->tok);
+       man->flags &= ~(MAN_BLINE | ROFF_NONOFILL);
+}

 
 

-struct man *
-man_alloc(void *data, int pflags, const struct man_cb *cb)
+static int
+man_ptext(struct roff_man *man, int line, char *buf, int offs)

 {
 {

-       struct man      *p;
+       int              i;
+       char            *ep;

 
 

-       if (NULL == (p = calloc(1, sizeof(struct man))))
-               return(NULL);
+       /* In no-fill mode, whitespace is preserved on text lines. */

 
 

-       if ( ! man_alloc1(p)) {
-               free(p);
-               return(NULL);
+       if (man->flags & ROFF_NOFILL) {
+               roff_word_alloc(man, line, offs, buf + offs);
+               man_descope(man, line, offs, buf + offs);
+               return 1;

        }
 
        }
 

-       p->data = data;
-       p->pflags = pflags;
-       (void)memcpy(&p->cb, cb, sizeof(struct man_cb));
-
-       if (NULL == (p->htab = man_hash_alloc())) {
-               free(p);
-               return(NULL);
-       }
-       return(p);
-}
-
+       for (i = offs; buf[i] == ' '; i++)
+               /* Skip leading whitespace. */ ;

 
 

-int
-man_endparse(struct man *m)
-{
+       /*
+        * Blank lines are ignored in next line scope
+        * and right after headings and cancel preceding \c,
+        * but add a single vertical space elsewhere.
+        */

 
 

-       if (MAN_HALT & m->flags)
-               return(0);
-       else if (man_macroend(m))
-               return(1);
-       m->flags |= MAN_HALT;
-       return(0);
-}
+       if (buf[i] == '\0') {
+               if (man->flags & (MAN_ELINE | MAN_BLINE)) {
+                       mandoc_msg(MANDOCERR_BLK_BLANK, line, 0, NULL);
+                       return 1;
+               }
+               if (man->last->tok == MAN_SH || man->last->tok == MAN_SS)
+                       return 1;
+               if (man->last->type == ROFFT_TEXT &&
+                   ((ep = man_hasc(man->last->string)) != NULL)) {
+                       *ep = '\0';
+                       return 1;
+               }
+               roff_elem_alloc(man, line, offs, ROFF_sp);
+               man->next = ROFF_NEXT_SIBLING;
+               return 1;
+       }

 
 

+       /*
+        * Warn if the last un-escaped character is whitespace. Then
+        * strip away the remaining spaces (tabs stay!).
+        */

 
 

-int
-man_parseln(struct man *m, int ln, char *buf)
-{
+       i = (int)strlen(buf);
+       assert(i);

 
 

-       return('.' == *buf ? 
-                       man_pmacro(m, ln, buf) : 
-                       man_ptext(m, ln, buf));
-}
+       if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
+               if (i > 1 && '\\' != buf[i - 2])
+                       mandoc_msg(MANDOCERR_SPACE_EOL, line, i - 1, NULL);

 
 

+               for (--i; i && ' ' == buf[i]; i--)
+                       /* Spin back to non-space. */ ;

 
 

-static void
-man_free1(struct man *man)
-{
+               /* Jump ahead of escaped whitespace. */
+               i += '\\' == buf[i] ? 2 : 1;

 
 

-       if (man->first)
-               man_node_freelist(man->first);
-       if (man->meta.title)
-               free(man->meta.title);
-       if (man->meta.source)
-               free(man->meta.source);
-       if (man->meta.vol)
-               free(man->meta.vol);
-}
+               buf[i] = '\0';
+       }
+       roff_word_alloc(man, line, offs, buf + offs);

 
 

+       /*
+        * End-of-sentence check.  If the last character is an unescaped
+        * EOS character, then flag the node as being the end of a
+        * sentence.  The front-end will know how to interpret this.
+        */

 
 

-static int
-man_alloc1(struct man *m)
-{
+       assert(i);
+       if (mandoc_eos(buf, (size_t)i))
+               man->last->flags |= NODE_EOS;

 
 

-       bzero(&m->meta, sizeof(struct man_meta));
-       m->flags = 0;
-       m->last = calloc(1, sizeof(struct man_node));
-       if (NULL == m->last)
-               return(0);
-       m->first = m->last;
-       m->last->type = MAN_ROOT;
-       m->next = MAN_NEXT_CHILD;
-       return(1);
+       man_descope(man, line, offs, buf + offs);
+       return 1;

 }
 
 }
 

-

 static int
 static int

-man_node_append(struct man *man, struct man_node *p)
+man_pmacro(struct roff_man *man, int ln, char *buf, int offs)

 {
 {

-
-       assert(man->last);
-       assert(man->first);
-       assert(MAN_ROOT != p->type);
-
-       switch (man->next) {
-       case (MAN_NEXT_SIBLING):
-               man->last->next = p;
-               p->prev = man->last;
-               p->parent = man->last->parent;
-               break;
-       case (MAN_NEXT_CHILD):
-               man->last->child = p;
-               p->parent = man->last;
-               break;
-       default:
-               abort();
-               /* NOTREACHED */
+       struct roff_node *n;
+       const char      *cp;
+       size_t           sz;
+       enum roff_tok    tok;
+       int              ppos;
+       int              bline;
+
+       /* Determine the line macro. */
+
+       ppos = offs;
+       tok = TOKEN_NONE;
+       for (sz = 0; sz < 4 && strchr(" \t\\", buf[offs]) == NULL; sz++)
+               offs++;
+       if (sz > 0 && sz < 4)
+               tok = roffhash_find(man->manmac, buf + ppos, sz);
+       if (tok == TOKEN_NONE) {
+               mandoc_msg(MANDOCERR_MACRO, ln, ppos, "%s", buf + ppos - 1);
+               return 1;

        }
        }

-       
-       p->parent->nchild++;

 
 

-       if ( ! man_valid_pre(man, p))
-               return(0);
+       /* Skip a leading escape sequence or tab. */

 
 

-       switch (p->type) {
-       case (MAN_HEAD):
-               assert(MAN_BLOCK == p->parent->type);
-               p->parent->head = p;
+       switch (buf[offs]) {
+       case '\\':
+               cp = buf + offs + 1;
+               mandoc_escape(&cp, NULL, NULL);
+               offs = cp - buf;

                break;
                break;

-       case (MAN_BODY):
-               assert(MAN_BLOCK == p->parent->type);
-               p->parent->body = p;
+       case '\t':
+               offs++;

                break;
        default:
                break;
        }
 
                break;
        default:
                break;
        }
 

-       man->last = p;
-
-       switch (p->type) {
-       case (MAN_TEXT):
-               if ( ! man_valid_post(man))
-                       return(0);
-               if ( ! man_action_post(man))
-                       return(0);
-               break;
-       default:
-               break;
-       }
-
-       return(1);
-}
-
-
-static struct man_node *
-man_node_alloc(int line, int pos, enum man_type type, int tok)
-{
-       struct man_node *p;
-
-       p = calloc(1, sizeof(struct man_node));
-       if (NULL == p)
-               return(NULL);
-
-       p->line = line;
-       p->pos = pos;
-       p->type = type;
-       p->tok = tok;
-       return(p);
-}
+       /* Jump to the next non-whitespace word. */

 
 

+       while (buf[offs] == ' ')
+               offs++;

 
 

-int
-man_elem_alloc(struct man *m, int line, int pos, int tok)
-{
-       struct man_node *p;
-
-       p = man_node_alloc(line, pos, MAN_ELEM, tok);
-       if (NULL == p)
-               return(0);
-       if ( ! man_node_append(m, p))
-               return(0);
-       m->next = MAN_NEXT_CHILD;
-       return(1);
-}
-
+       /*
+        * Trailing whitespace.  Note that tabs are allowed to be passed
+        * into the parser as "text", so we only warn about spaces here.
+        */

 
 

-int
-man_head_alloc(struct man *m, int line, int pos, int tok)
-{
-       struct man_node *p;
-
-       p = man_node_alloc(line, pos, MAN_HEAD, tok);
-       if (NULL == p)
-               return(0);
-       if ( ! man_node_append(m, p))
-               return(0);
-       m->next = MAN_NEXT_CHILD;
-       return(1);
-}
+       if (buf[offs] == '\0' && buf[offs - 1] == ' ')
+               mandoc_msg(MANDOCERR_SPACE_EOL, ln, offs - 1, NULL);

 
 

+       /*
+        * Some macros break next-line scopes; otherwise, remember
+        * whether we are in next-line scope for a block head.
+        */

 
 

-int
-man_body_alloc(struct man *m, int line, int pos, int tok)
-{
-       struct man_node *p;
-
-       p = man_node_alloc(line, pos, MAN_BODY, tok);
-       if (NULL == p)
-               return(0);
-       if ( ! man_node_append(m, p))
-               return(0);
-       m->next = MAN_NEXT_CHILD;
-       return(1);
-}
+       man_breakscope(man, tok);
+       bline = man->flags & MAN_BLINE;

 
 

+       /*
+        * If the line in next-line scope ends with \c, keep the
+        * next-line scope open for the subsequent input line.
+        * That is not at all portable, only groff >= 1.22.4
+        * does it, but *if* this weird idiom occurs in a manual
+        * page, that's very likely what the author intended.
+        */

 
 

-int
-man_block_alloc(struct man *m, int line, int pos, int tok)
-{
-       struct man_node *p;
-
-       p = man_node_alloc(line, pos, MAN_BLOCK, tok);
-       if (NULL == p)
-               return(0);
-       if ( ! man_node_append(m, p))
-               return(0);
-       m->next = MAN_NEXT_CHILD;
-       return(1);
-}
+       if (bline && man_hasc(buf + offs))
+               bline = 0;

 
 

+       /* Call to handler... */

 
 

-static int
-pstring(struct man *m, int line, int pos, 
-               const char *p, size_t len)
-{
-       struct man_node *n;
-       size_t           sv;
+       (*man_macro(tok)->fp)(man, tok, ln, ppos, &offs, buf);

 
 

-       n = man_node_alloc(line, pos, MAN_TEXT, -1);
-       if (NULL == n)
-               return(0);
+       /* In quick mode (for mandocdb), abort after the NAME section. */

 
 

-       n->string = malloc(len + 1);
-       if (NULL == n->string) {
-               free(n);
-               return(0);
+       if (man->quick && tok == MAN_SH) {
+               n = man->last;
+               if (n->type == ROFFT_BODY &&
+                   strcmp(n->prev->child->string, "NAME"))
+                       return 2;

        }
 
        }
 

-       sv = strlcpy(n->string, p, len + 1);
-
-       /* Prohibit truncation. */
-       assert(sv < len + 1);
-
-       if ( ! man_node_append(m, n))
-               return(0);
-       m->next = MAN_NEXT_SIBLING;
-       return(1);
-}
-
-
-int
-man_word_alloc(struct man *m, int line, int pos, const char *word)
-{
-
-       return(pstring(m, line, pos, word, strlen(word)));
-}
+       /*
+        * If we are in a next-line scope for a block head,
+        * close it out now and switch to the body,
+        * unless the next-line scope is allowed to continue.
+        */

 
 

+       if (bline == 0 ||
+           (man->flags & MAN_BLINE) == 0 ||
+           man->flags & MAN_ELINE ||
+           man_macro(tok)->flags & MAN_NSCOPED)
+               return 1;

 
 

-void
-man_node_free(struct man_node *p)
-{
-
-       if (p->string)
-               free(p->string);
-       if (p->parent)
-               p->parent->nchild--;
-       free(p);
+       man_unscope(man, man->last->parent);
+       roff_body_alloc(man, ln, ppos, man->last->tok);
+       man->flags &= ~(MAN_BLINE | ROFF_NONOFILL);
+       return 1;

 }
 
 }
 

-

 void
 void

-man_node_freelist(struct man_node *p)
-{
-
-       if (p->child)
-               man_node_freelist(p->child);
-       if (p->next)
-               man_node_freelist(p->next);
-
-       assert(0 == p->nchild);
-       man_node_free(p);
-}
-
-
-static int
-man_ptext(struct man *m, int line, char *buf)
+man_breakscope(struct roff_man *man, int tok)

 {
 {

-       int              i, j;
-
-       /* First de-chunk and allocate words. */
-
-       for (i = 0; ' ' == buf[i]; i++)
-               /* Skip leading whitespace. */ ;
-       if (0 == buf[i]) {
-               if ( ! pstring(m, line, 0, &buf[i], 0))
-                       return(0);
-               goto descope;
-       }
-
-       for (j = i; buf[i]; i++) {
-               if (' ' != buf[i])
-                       continue;
-
-               /* Escaped whitespace. */
-               if (i && ' ' == buf[i] && '\\' == buf[i - 1])
-                       continue;
-
-               buf[i++] = 0;
-               if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
-                       return(0);
-
-               for ( ; ' ' == buf[i]; i++)
-                       /* Skip trailing whitespace. */ ;
-
-               j = i;
-               if (0 == buf[i])
-                       break;
-       }
-
-       if (j != i && ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
-               return(0);
-
-descope:
+       struct roff_node *n;

 
        /*
 
        /*

-        * Co-ordinate what happens with having a next-line scope open:
-        * first close out the element scope (if applicable), then close
-        * out the block scope (also if applicable).
+        * An element next line scope is open,
+        * and the new macro is not allowed inside elements.
+        * Delete the element that is being broken.

         */
 
         */
 

-       /* XXX - this should be in man_action.c. */
-
-       if (MAN_ELINE & m->flags) {
-               m->flags &= ~MAN_ELINE;
-               if ( ! man_unscope(m, m->last->parent))
-                       return(0);
-       }
-
-       if ( ! (MAN_BLINE & m->flags))
-               return(1);
-       m->flags &= ~MAN_BLINE;
-
-       if ( ! man_unscope(m, m->last->parent))
-               return(0);
-       return(man_body_alloc(m, line, 0, m->last->tok));
-}
-
-
-int
-man_pmacro(struct man *m, int ln, char *buf)
-{
-       int               i, j, c, ppos, fl;
-       char              mac[5];
-
-       /* Comments and empties are quickly ignored. */
-
-       fl = m->flags;
-
-       if (0 == buf[1])
-               goto out;
-
-       i = 1;
-
-       if (' ' == buf[i]) {
-               i++;
-               while (buf[i] && ' ' == buf[i])
-                       i++;
-               if (0 == buf[i])
-                       goto out;
+       if (man->flags & MAN_ELINE && (tok < MAN_TH ||
+           (man_macro(tok)->flags & MAN_NSCOPED) == 0)) {
+               n = man->last;
+               if (n->type == ROFFT_TEXT)
+                       n = n->parent;
+               if (n->tok < MAN_TH ||
+                   (man_macro(n->tok)->flags & (MAN_NSCOPED | MAN_ESCOPED))
+                    == MAN_NSCOPED)
+                       n = n->parent;
+
+               mandoc_msg(MANDOCERR_BLK_LINE, n->line, n->pos,
+                   "%s breaks %s", roff_name[tok], roff_name[n->tok]);
+
+               roff_node_delete(man, n);
+               man->flags &= ~MAN_ELINE;

        }
 
        }
 

-       ppos = i;
-
-       /* Copy the first word into a nil-terminated buffer. */
-
-       for (j = 0; j < 4; j++, i++) {
-               if (0 == (mac[j] = buf[i]))
-                       break;
-               else if (' ' == buf[i])
-                       break;
-       }
-
-       mac[j] = 0;
+       /*
+        * Weird special case:
+        * Switching fill mode closes section headers.
+        */

 
 

-       if (j == 4 || j < 1) {
-               if ( ! (MAN_IGN_MACRO & m->pflags)) {
-                       (void)man_perr(m, ln, ppos, WMACROFORM);
-                       goto err;
-               } 
-               if ( ! man_pwarn(m, ln, ppos, WMACROFORM))
-                       goto err;
-               return(1);
-       }
-       
-       if (MAN_MAX == (c = man_hash_find(m->htab, mac))) {
-               if ( ! (MAN_IGN_MACRO & m->pflags)) {
-                       (void)man_perr(m, ln, ppos, WMACRO);
-                       goto err;
-               } 
-               if ( ! man_pwarn(m, ln, ppos, WMACRO))
-                       goto err;
-               return(1);
+       if (man->flags & MAN_BLINE &&
+           (tok == ROFF_nf || tok == ROFF_fi) &&
+           (man->last->tok == MAN_SH || man->last->tok == MAN_SS)) {
+               n = man->last;
+               man_unscope(man, n);
+               roff_body_alloc(man, n->line, n->pos, n->tok);
+               man->flags &= ~(MAN_BLINE | ROFF_NONOFILL);

        }
 
        }
 

-       /* The macro is sane.  Jump to the next word. */
-
-       while (buf[i] && ' ' == buf[i])
-               i++;
-
-       /* Begin recursive parse sequence. */
-
-       assert(man_macros[c].fp);
-
-       if ( ! (*man_macros[c].fp)(m, c, ln, ppos, &i, buf))
-               goto err;
-
-out:
-       if ( ! (MAN_BLINE & fl))
-               return(1);
-
-       /* 
-        * If we've opened a new next-line element scope, then return
-        * now, as the next line will close out the block scope.
+       /*
+        * A block header next line scope is open,
+        * and the new macro is not allowed inside block headers.
+        * Delete the block that is being broken.

         */
 
         */
 

-       if (MAN_ELINE & m->flags)
-               return(1);
-
-       /* Close out the block scope opened in the prior line.  */
-
-       /* XXX - this should be in man_action.c. */
-
-       assert(MAN_BLINE & m->flags);
-       m->flags &= ~MAN_BLINE;
-
-       if ( ! man_unscope(m, m->last->parent))
-               return(0);
-       return(man_body_alloc(m, ln, 0, m->last->tok));
-
-err:   /* Error out. */
-
-       m->flags |= MAN_HALT;
-       return(0);
-}
-
-
-int
-man_verr(struct man *man, int ln, int pos, const char *fmt, ...)
-{
-       char             buf[256];
-       va_list          ap;
-
-       if (NULL == man->cb.man_err)
-               return(0);
-
-       va_start(ap, fmt);
-       (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-       va_end(ap);
-       return((*man->cb.man_err)(man->data, ln, pos, buf));
-}
-
-
-int
-man_vwarn(struct man *man, int ln, int pos, const char *fmt, ...)
-{
-       char             buf[256];
-       va_list          ap;
-
-       if (NULL == man->cb.man_warn)
-               return(0);
-
-       va_start(ap, fmt);
-       (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-       va_end(ap);
-       return((*man->cb.man_warn)(man->data, ln, pos, buf));
-}
-
-
-int
-man_err(struct man *m, int line, int pos, int iserr, enum merr type)
-{
-       const char       *p;
-       
-       p = __man_merrnames[(int)type];
-       assert(p);
-
-       if (iserr)
-               return(man_verr(m, line, pos, p));
-
-       return(man_vwarn(m, line, pos, p));
+       if (man->flags & MAN_BLINE && tok != ROFF_nf && tok != ROFF_fi &&
+           (tok < MAN_TH || man_macro(tok)->flags & MAN_XSCOPE)) {
+               n = man->last;
+               if (n->type == ROFFT_TEXT)
+                       n = n->parent;
+               if (n->tok < MAN_TH ||
+                   (man_macro(n->tok)->flags & MAN_XSCOPE) == 0)
+                       n = n->parent;
+
+               assert(n->type == ROFFT_HEAD);
+               n = n->parent;
+               assert(n->type == ROFFT_BLOCK);
+               assert(man_macro(n->tok)->flags & MAN_BSCOPED);
+
+               mandoc_msg(MANDOCERR_BLK_LINE, n->line, n->pos,
+                   "%s breaks %s", roff_name[tok], roff_name[n->tok]);
+
+               roff_node_delete(man, n);
+               man->flags &= ~(MAN_BLINE | ROFF_NONOFILL);
+       }

 }
 }