Do not read past the end of the buffer if an "f" layout font modifier

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index 8a55ecdac34c59319d35ed45a8b569072529e41b..f04acb96e73bbbb43285a8ad3ad20b6590c30c8b 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_macro.c,v 1.167 2015/02/02 15:02:49 schwarze Exp $ */
+/*     $Id: mdoc_macro.c,v 1.180 2015/02/07 16:42:33 schwarze Exp $ */

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


@@ -31,13 +31,6 @@
 #include "libmdoc.h"
 #include "libmandoc.h"
 
 #include "libmdoc.h"
 #include "libmandoc.h"
 

-enum   rew {   /* see rew_dohalt() */
-       REWIND_NONE,
-       REWIND_THIS,
-       REWIND_MORE,
-       REWIND_FORCE
-};
-

 static void            blk_full(MACRO_PROT_ARGS);
 static void            blk_exp_close(MACRO_PROT_ARGS);
 static void            blk_part_exp(MACRO_PROT_ARGS);
 static void            blk_full(MACRO_PROT_ARGS);
 static void            blk_exp_close(MACRO_PROT_ARGS);
 static void            blk_part_exp(MACRO_PROT_ARGS);


@@ -54,18 +47,14 @@ static      void            append_delims(struct mdoc *, int, int *, char *);
 static enum mdoct      lookup(struct mdoc *, enum mdoct,
                                int, int, const char *);
 static int             macro_or_word(MACRO_PROT_ARGS, int);
 static enum mdoct      lookup(struct mdoc *, enum mdoct,
                                int, int, const char *);
 static int             macro_or_word(MACRO_PROT_ARGS, int);

-static int             make_pending(struct mdoc_node *, enum mdoct,
-                               struct mdoc *, int, int);
+static void            make_pending(struct mdoc *, struct mdoc_node *,
+                               struct mdoc_node *, int, int);

 static int             parse_rest(struct mdoc *, enum mdoct,
                                int, int *, char *);
 static enum mdoct      rew_alt(enum mdoct);
 static int             parse_rest(struct mdoc *, enum mdoct,
                                int, int *, char *);
 static enum mdoct      rew_alt(enum mdoct);

-static enum rew        rew_dohalt(enum mdoct, enum mdoc_type,
-                               const struct mdoc_node *);

 static void            rew_elem(struct mdoc *, enum mdoct);
 static void            rew_last(struct mdoc *, const struct mdoc_node *);
 static void            rew_pending(struct mdoc *, const struct mdoc_node *);
 static void            rew_elem(struct mdoc *, enum mdoct);
 static void            rew_last(struct mdoc *, const struct mdoc_node *);
 static void            rew_pending(struct mdoc *, const struct mdoc_node *);

-static void            rew_sub(enum mdoc_type, struct mdoc *,
-                               enum mdoct, int, int);

 
 const  struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ap */
 
 const  struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ap */


@@ -273,9 +262,6 @@ rew_last(struct mdoc *mdoc, const struct mdoc_node *to)
        assert(to);
        mdoc->next = MDOC_NEXT_SIBLING;
        while (mdoc->last != to) {
        assert(to);
        mdoc->next = MDOC_NEXT_SIBLING;
        while (mdoc->last != to) {

-               if ( ! (mdoc->last->flags & MDOC_VALID))
-                       mdoc->last->lastline = to->lastline -
-                           (mdoc->flags & MDOC_NEWLINE ? 1 : 0);

                /*
                 * Save the parent here, because we may delete the
                 * mdoc->last node in the post-validation phase and reset
                /*
                 * Save the parent here, because we may delete the
                 * mdoc->last node in the post-validation phase and reset


@@ -357,95 +343,6 @@ rew_alt(enum mdoct tok)
        /* NOTREACHED */
 }
 
        /* NOTREACHED */
 }
 

-/*
- * Rewinding to tok, how do we have to handle *p?
- * REWIND_NONE: *p would delimit tok, but no tok scope is open
- *   inside *p, so there is no need to rewind anything at all.
- * REWIND_THIS: *p matches tok, so rewind *p and nothing else.
- * REWIND_MORE: *p is implicit, rewind it and keep searching for tok.
- * REWIND_FORCE: *p is explicit, but tok is full, force rewinding *p.
- */
-static enum rew
-rew_dohalt(enum mdoct tok, enum mdoc_type type,
-               const struct mdoc_node *p)
-{
-
-       /*
-        * No matching token, no delimiting block, no broken block.
-        * This can happen when full implicit macros are called for
-        * the first time but try to rewind their previous
-        * instance anyway.
-        */
-       if (MDOC_ROOT == p->type)
-               return(REWIND_NONE);
-
-       /*
-        * When starting to rewind, skip plain text
-        * and nodes that have already been rewound.
-        */
-       if (p->type == MDOC_TEXT || p->flags & (MDOC_VALID | MDOC_BREAK))
-               return(REWIND_MORE);
-
-       /*
-        * The easiest case:  Found a matching token.
-        * This applies to both blocks and elements.
-        */
-       tok = rew_alt(tok);
-       if (tok == p->tok)
-               return(type == p->type ? REWIND_THIS : REWIND_MORE);
-
-       /*
-        * While elements do require rewinding for themselves,
-        * they never affect rewinding of other nodes.
-        */
-       if (MDOC_ELEM == p->type)
-               return(REWIND_MORE);
-
-       /*
-        * Blocks delimited by our target token get REWIND_MORE.
-        * Blocks delimiting our target token get REWIND_NONE.
-        */
-       switch (tok) {
-       case MDOC_It:
-               if (MDOC_BODY == p->type && MDOC_Bl == p->tok)
-                       return(REWIND_NONE);
-               break;
-       case MDOC_Nm:
-               return(REWIND_NONE);
-       case MDOC_Nd:
-               /* FALLTHROUGH */
-       case MDOC_Ss:
-               if (MDOC_BODY == p->type && MDOC_Sh == p->tok)
-                       return(REWIND_NONE);
-               /* FALLTHROUGH */
-       case MDOC_Sh:
-               if (MDOC_ROOT == p->parent->type)
-                       return(REWIND_THIS);
-               if (MDOC_Nd == p->tok || MDOC_Ss == p->tok ||
-                   MDOC_Sh == p->tok)
-                       return(REWIND_MORE);
-               break;
-       default:
-               break;
-       }
-
-       /*
-        * Default block rewinding rules.
-        * In particular, let all blocks rewind Nm children.
-        * Do not warn again when closing a block,
-        * since closing the body already warned.
-        */
-       if (MDOC_Nm == p->tok ||
-           MDOC_BLOCK == type || MDOC_BLOCK == p->type)
-               return(REWIND_MORE);
-
-       /*
-        * By default, closing out full blocks
-        * forces closing of broken explicit blocks.
-        */
-       return (REWIND_FORCE);
-}
-

 static void
 rew_elem(struct mdoc *mdoc, enum mdoct tok)
 {
 static void
 rew_elem(struct mdoc *mdoc, enum mdoct tok)
 {


@@ -460,131 +357,75 @@ rew_elem(struct mdoc *mdoc, enum mdoct tok)
 }
 
 /*
 }
 
 /*

- * We are trying to close a block identified by tok,
+ * We are trying to close the block *breaker,

  * but the child block *broken is still open.
  * but the child block *broken is still open.

- * Thus, postpone closing the tok block
+ * Thus, postpone closing the *breaker

  * until the rew_pending() call closing *broken.
  */
  * until the rew_pending() call closing *broken.
  */

-static int
-make_pending(struct mdoc_node *broken, enum mdoct tok,
-               struct mdoc *mdoc, int line, int ppos)
+static void
+make_pending(struct mdoc *mdoc, struct mdoc_node *breaker,
+       struct mdoc_node *broken, int line, int ppos)

 {
 {

-       struct mdoc_node *breaker;
+       struct mdoc_node *n;
+
+       mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse, line, ppos,
+           "%s breaks %s", mdoc_macronames[breaker->tok],
+           mdoc_macronames[broken->tok]);

 
        /*
 
        /*

-        * Iterate backwards, searching for the block matching tok,
-        * that is, the block breaking the *broken block.
+        * If the *broken block (Z) is already broken by a block (B)
+        * contained in the breaker (A), make the breaker pending
+        * on that inner breaker (B).  Graphically,
+        *
+        * breaker=[A! broken=n=[B!->A (old broken=)[Z->B B] A] Z]
+        *
+        * In these graphics, "->" indicates the "pending" pointer and
+        * "!" indicates the MDOC_BREAK flag.  Each of the cases gets
+        * one additional pointer (B->A) and one additional flag (A!).

         */
         */

-       for (breaker = broken->parent; breaker; breaker = breaker->parent) {
-
-               /*
-                * If the *broken block (Z) is already broken and we
-                * encounter its breaker (B), make the tok block (A)
-                * pending on that inner breaker (B).
-                * Graphically, [A breaker=[B! broken=[Z->B B] tok=A] Z]
-                * becomes breaker=[A broken=[B! [Z->B B] tok=A] Z]
-                * and finally [A! [B!->A [Z->B B] A] Z].
-                * In these graphics, "->" indicates the "pending"
-                * pointer and "!" indicates the MDOC_BREAK flag.
-                * Each of the cases gets one additional pointer (B->A)
-                * and one additional flag (A!).
-                */
-               if (breaker == broken->pending) {
-                       broken = breaker;
-                       continue;
-               }

 
 

-               if (REWIND_THIS != rew_dohalt(tok, MDOC_BLOCK, breaker))
-                       continue;
-               if (MDOC_BODY == broken->type)
-                       broken = broken->parent;
+       for (n = broken->parent; ; n = n->parent)
+               if (n == broken->pending)
+                       broken = n;
+               else if (n == breaker)
+                       break;

 
 

-               /*
-                * Found the breaker.
-                * If another, outer breaker (X) is already pending on
-                * the *broken block (B), we must not clobber the link
-                * to the outer breaker, but make it pending on the
-                * new, now inner breaker (A).
-                * Graphically, [X! breaker=[A broken=[B->X X] tok=A] B]
-                * becomes [X! breaker=[A->X broken=[B X] tok=A] B]
-                * and finally [X! [A!->X [B->A X] A] B].
-                */
-               if (broken->pending) {
-                       struct mdoc_node *taker;
+       /*
+        * Found the breaker.
+        *
+        * If another, outer breaker (X) is already pending on
+        * the *broken block (B), we must not clobber the link
+        * to the outer breaker, but make it pending on the new,
+        * now inner breaker (A).  Graphically,
+        *
+        * [X! n=breaker=[A!->X broken=[B(->X)->A X] A] B].
+        */

 
 

-                       /*
-                        * If the inner breaker (A) is already broken,
-                        * too, it cannot take on the outer breaker (X)
-                        * but must hand it on to its own breakers (Y):
-                        * [X! [Y! breaker=[A->Y Y] broken=[B->X X] tok=A] B]
-                        * [X! take=[Y!->X brea=[A->Y Y] brok=[B X] tok=A] B]
-                        * and finally [X! [Y!->X [A!->Y Y] [B->A X] A] B].
-                        */
-                       taker = breaker;
-                       while (taker->pending)
-                               taker = taker->pending;
-                       taker->pending = broken->pending;
-               }
+       if (broken->pending != NULL) {
+               n = breaker;

 
                /*
 
                /*

-                * Now we have reduced the situation to the simplest
-                * case, which is just breaker=[A broken=[B tok=A] B]
-                * and becomes [A! [B->A A] B].
+                * If the inner breaker (A) is already broken, too,
+                * it cannot take on the outer breaker (X) but must
+                * hand it on to its own breakers (Y).  Graphically,
+                *
+                * [X! n=[Y!->X breaker=[A!->Y Y] broken=[B(->X)->A X] A] B]

                 */
                 */

-               broken->pending = breaker;
-               breaker->flags |= MDOC_BREAK;
-               if (breaker->body != NULL)
-                       breaker->body->flags |= MDOC_BREAK;
-               mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse, line, ppos,
-                   "%s breaks %s", mdoc_macronames[tok],
-                   mdoc_macronames[broken->tok]);
-               return(1);
+
+               while (n->pending)
+                       n = n->pending;
+               n->pending = broken->pending;

        }
 
        /*
        }
 
        /*

-        * Found no matching block for tok.
-        * Are you trying to close a block that is not open?
+        * Now we have reduced the situation to the simplest case:
+        * breaker=[A! broken=[B->A A] B].

         */
         */

-       return(0);
-}

 
 

-static void
-rew_sub(enum mdoc_type t, struct mdoc *mdoc,
-               enum mdoct tok, int line, int ppos)
-{
-       struct mdoc_node *n, *to;
-
-       to = NULL;
-       n = mdoc->last;
-       while (n) {
-               switch (rew_dohalt(tok, t, n)) {
-               case REWIND_NONE:
-                       if (to == NULL)
-                               return;
-                       n = to;
-                       break;
-               case REWIND_THIS:
-                       n->lastline = line -
-                           (mdoc->flags & MDOC_NEWLINE &&
-                            ! (mdoc_macros[tok].flags & MDOC_EXPLICIT));
-                       break;
-               case REWIND_FORCE:
-                       mandoc_vmsg(MANDOCERR_BLK_BROKEN, mdoc->parse,
-                           line, ppos, "%s breaks %s",
-                           mdoc_macronames[tok],
-                           mdoc_macronames[n->tok]);
-                       /* FALLTHROUGH */
-               case REWIND_MORE:
-                       n->lastline = line -
-                           (mdoc->flags & MDOC_NEWLINE ? 1 : 0);
-                       to = n;
-                       n = n->parent;
-                       continue;
-               }
-               break;
-       }
-       assert(n);
-       rew_pending(mdoc, n);
+       broken->pending = breaker;
+       breaker->flags |= MDOC_BREAK;
+       if (breaker->body != NULL)
+               breaker->body->flags |= MDOC_BREAK;

 }
 
 /*
 }
 
 /*


@@ -697,10 +538,11 @@ blk_exp_close(MACRO_PROT_ARGS)
 {
        struct mdoc_node *body;         /* Our own body. */
        struct mdoc_node *endbody;      /* Our own end marker. */
 {
        struct mdoc_node *body;         /* Our own body. */
        struct mdoc_node *endbody;      /* Our own end marker. */

+       struct mdoc_node *itblk;        /* An It block starting later. */

        struct mdoc_node *later;        /* A sub-block starting later. */
        struct mdoc_node *n;            /* Search back to our block. */
 
        struct mdoc_node *later;        /* A sub-block starting later. */
        struct mdoc_node *n;            /* Search back to our block. */
 

-       int              have_it, j, lastarg, maxargs, nl;
+       int              j, lastarg, maxargs, nl;

        enum margserr    ac;
        enum mdoct       atok, ntok;
        char            *p;
        enum margserr    ac;
        enum mdoct       atok, ntok;
        char            *p;


@@ -724,9 +566,8 @@ blk_exp_close(MACRO_PROT_ARGS)
         * both of our own and of pending sub-blocks.
         */
 
         * both of our own and of pending sub-blocks.
         */
 

-       have_it = 0;

        atok = rew_alt(tok);
        atok = rew_alt(tok);

-       body = endbody = later = NULL;
+       body = endbody = itblk = later = NULL;

        for (n = mdoc->last; n; n = n->parent) {
                if (n->flags & (MDOC_VALID | MDOC_BREAK))
                        continue;
        for (n = mdoc->last; n; n = n->parent) {
                if (n->flags & (MDOC_VALID | MDOC_BREAK))
                        continue;


@@ -734,10 +575,8 @@ blk_exp_close(MACRO_PROT_ARGS)
                /* Remember the start of our own body. */
 
                if (n->type == MDOC_BODY && atok == n->tok) {
                /* Remember the start of our own body. */
 
                if (n->type == MDOC_BODY && atok == n->tok) {

-                       if (n->end == ENDBODY_NOT) {
+                       if (n->end == ENDBODY_NOT)

                                body = n;
                                body = n;

-                               n->lastline = line;
-                       }

                        continue;
                }
 
                        continue;
                }
 


@@ -745,12 +584,11 @@ blk_exp_close(MACRO_PROT_ARGS)
                        continue;
 
                if (n->tok == MDOC_It) {
                        continue;
 
                if (n->tok == MDOC_It) {

-                       have_it = 1;
+                       itblk = n;

                        continue;
                }
 
                if (atok == n->tok) {
                        continue;
                }
 
                if (atok == n->tok) {

-                       n->lastline = line;

                        assert(body);
 
                        /*
                        assert(body);
 
                        /*


@@ -760,7 +598,7 @@ blk_exp_close(MACRO_PROT_ARGS)
                         */
 
                        if (later == NULL ||
                         */
 
                        if (later == NULL ||

-                           (tok == MDOC_El && !have_it))
+                           (tok == MDOC_El && itblk == NULL))

                                break;
 
                        /*
                                break;
 
                        /*


@@ -769,7 +607,9 @@ blk_exp_close(MACRO_PROT_ARGS)
                         * rew_pending() closing out the sub-block.
                         */
 
                         * rew_pending() closing out the sub-block.
                         */
 

-                       make_pending(later, tok, mdoc, line, ppos);
+                       make_pending(mdoc, n, later, line, ppos);
+                       if (tok == MDOC_El)
+                               itblk->flags |= MDOC_BREAK;

 
                        /*
                         * Mark the place where the formatting - but not
 
                        /*
                         * Mark the place where the formatting - but not


@@ -824,7 +664,7 @@ blk_exp_close(MACRO_PROT_ARGS)
                            mdoc->parse, line, ppos,
                            "%s %s", mdoc_macronames[tok],
                            buf + *pos);
                            mdoc->parse, line, ppos,
                            "%s %s", mdoc_macronames[tok],
                            buf + *pos);

-               if (endbody == NULL)
+               if (endbody == NULL && n != NULL)

                        rew_pending(mdoc, n);
                return;
        }
                        rew_pending(mdoc, n);
                return;
        }


@@ -932,7 +772,7 @@ in_line(MACRO_PROT_ARGS)
                 */
 
                if (ac == ARGS_PUNCT) {
                 */
 
                if (ac == ARGS_PUNCT) {

-                       if (cnt == 0 && nc == 0)
+                       if (cnt == 0 && (nc == 0 || tok == MDOC_An))

                                mdoc->flags |= MDOC_NODELIMC;
                        break;
                }
                                mdoc->flags |= MDOC_NODELIMC;
                        break;
                }


@@ -1055,7 +895,7 @@ blk_full(MACRO_PROT_ARGS)
 {
        int               la, nl, parsed;
        struct mdoc_arg  *arg;
 {
        int               la, nl, parsed;
        struct mdoc_arg  *arg;

-       struct mdoc_node *blk; /* Our own block. */
+       struct mdoc_node *blk; /* Our own or a broken block. */

        struct mdoc_node *head; /* Our own head. */
        struct mdoc_node *body; /* Our own body. */
        struct mdoc_node *n;
        struct mdoc_node *head; /* Our own head. */
        struct mdoc_node *body; /* Our own body. */
        struct mdoc_node *n;


@@ -1064,14 +904,81 @@ blk_full(MACRO_PROT_ARGS)
 
        nl = MDOC_NEWLINE & mdoc->flags;
 
 
        nl = MDOC_NEWLINE & mdoc->flags;
 

-       /* Skip items outside lists. */
+       if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                   line, ppos, mdoc_macronames[tok]);
+               return;
+       }
+
+       if ( ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)) {
+
+               /* Here, tok is one of Sh Ss Nm Nd It. */
+
+               blk = NULL;
+               for (n = mdoc->last; n != NULL; n = n->parent) {
+                       if (n->flags & (MDOC_VALID | MDOC_BREAK) ||
+                           n->type != MDOC_BLOCK)
+                               continue;
+                       if (tok == MDOC_It && n->tok == MDOC_Bl) {
+                               if (blk != NULL) {
+                                       mandoc_vmsg(MANDOCERR_BLK_BROKEN,
+                                           mdoc->parse, line, ppos,
+                                           "It breaks %s",
+                                           mdoc_macronames[blk->tok]);
+                                       rew_pending(mdoc, blk);
+                               }
+                               break;
+                       }

 
 

-       if (tok == MDOC_It) {
-               for (n = mdoc->last; n; n = n->parent)
-                       if (n->tok == MDOC_Bl && n->type == MDOC_BLOCK &&
-                           ! (n->flags & (MDOC_VALID | MDOC_BREAK)))
+                       if (mdoc_macros[n->tok].flags & MDOC_EXPLICIT) {
+                               switch (tok) {
+                               case MDOC_Sh:
+                                       /* FALLTHROUGH */
+                               case MDOC_Ss:
+                                       mandoc_vmsg(MANDOCERR_BLK_BROKEN,
+                                           mdoc->parse, line, ppos,
+                                           "%s breaks %s",
+                                           mdoc_macronames[tok],
+                                           mdoc_macronames[n->tok]);
+                                       rew_pending(mdoc, n);
+                                       n = mdoc->last;
+                                       continue;
+                               case MDOC_It:
+                                       /* Delay in case it's astray. */
+                                       blk = n;
+                                       continue;
+                               default:
+                                       break;
+                               }

                                break;
                                break;

-               if (n == NULL) {
+                       }
+
+                       /* Here, n is one of Sh Ss Nm Nd It. */
+
+                       if (tok != MDOC_Sh && (n->tok == MDOC_Sh ||
+                           (tok != MDOC_Ss && (n->tok == MDOC_Ss ||
+                            (tok != MDOC_It && n->tok == MDOC_It)))))
+                               break;
+
+                       /* Item breaking an explicit block. */
+
+                       if (blk != NULL) {
+                               mandoc_vmsg(MANDOCERR_BLK_BROKEN,
+                                   mdoc->parse, line, ppos,
+                                   "It breaks %s",
+                                   mdoc_macronames[blk->tok]);
+                               rew_pending(mdoc, blk);
+                               blk = NULL;
+                       }
+
+                       /* Close out prior implicit scopes. */
+
+                       rew_last(mdoc, n);
+               }
+
+               /* Skip items outside lists. */
+
+               if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) {

                        mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse,
                            line, ppos, "It %s", buf + *pos);
                        mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL);
                        mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse,
                            line, ppos, "It %s", buf + *pos);
                        mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL);


@@ -1080,13 +987,6 @@ blk_full(MACRO_PROT_ARGS)
                }
        }
 
                }
        }
 

-       /* Close out prior implicit scope. */
-
-       if ( ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)) {
-               rew_sub(MDOC_BODY, mdoc, tok, line, ppos);
-               rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos);
-       }
-

        /*
         * This routine accommodates implicitly- and explicitly-scoped
         * macro openings.  Implicit ones first close out prior scope
        /*
         * This routine accommodates implicitly- and explicitly-scoped
         * macro openings.  Implicit ones first close out prior scope


@@ -1128,8 +1028,6 @@ blk_full(MACRO_PROT_ARGS)
                la = *pos;
                lac = ac;
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
                la = *pos;
                lac = ac;
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);

-               if (ac == ARGS_PUNCT)
-                       break;

                if (ac == ARGS_EOLN) {
                        if (lac != ARGS_PPHRASE && lac != ARGS_PHRASE)
                                break;
                if (ac == ARGS_EOLN) {
                        if (lac != ARGS_PPHRASE && lac != ARGS_PHRASE)
                                break;


@@ -1145,6 +1043,19 @@ blk_full(MACRO_PROT_ARGS)
                        body = mdoc_body_alloc(mdoc, line, ppos, tok);
                        break;
                }
                        body = mdoc_body_alloc(mdoc, line, ppos, tok);
                        break;
                }

+               if (tok == MDOC_Bd || tok == MDOC_Bk) {
+                       mandoc_vmsg(MANDOCERR_ARG_EXCESS,
+                           mdoc->parse, line, la, "%s ... %s",
+                           mdoc_macronames[tok], buf + la);
+                       break;
+               }
+               if (tok == MDOC_Rs) {
+                       mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse,
+                           line, la, "Rs %s", buf + la);
+                       break;
+               }
+               if (ac == ARGS_PUNCT)
+                       break;

 
                /*
                 * Emit leading punctuation (i.e., punctuation before
 
                /*
                 * Emit leading punctuation (i.e., punctuation before


@@ -1201,7 +1112,7 @@ blk_full(MACRO_PROT_ARGS)
                return;
        if (head == NULL)
                head = mdoc_head_alloc(mdoc, line, ppos, tok);
                return;
        if (head == NULL)
                head = mdoc_head_alloc(mdoc, line, ppos, tok);

-       if (nl)
+       if (nl && tok != MDOC_Bd && tok != MDOC_Bl && tok != MDOC_Rs)

                append_delims(mdoc, line, pos, buf);
        if (body != NULL)
                goto out;
                append_delims(mdoc, line, pos, buf);
        if (body != NULL)
                goto out;


@@ -1295,7 +1206,7 @@ blk_part_imp(MACRO_PROT_ARGS)
                if (n->type == MDOC_BLOCK &&
                    mdoc_macros[n->tok].flags & MDOC_EXPLICIT &&
                    ! (n->flags & MDOC_VALID)) {
                if (n->type == MDOC_BLOCK &&
                    mdoc_macros[n->tok].flags & MDOC_EXPLICIT &&
                    ! (n->flags & MDOC_VALID)) {

-                       make_pending(n, tok, mdoc, line, ppos);
+                       make_pending(mdoc, blk, n, line, ppos);

                        mdoc_endbody_alloc(mdoc, line, ppos,
                            tok, body, ENDBODY_NOSPACE);
                        return;
                        mdoc_endbody_alloc(mdoc, line, ppos,
                            tok, body, ENDBODY_NOSPACE);
                        return;


@@ -1463,6 +1374,11 @@ in_line_argn(MACRO_PROT_ARGS)
        }
 
        if (j == 0) {
        }
 
        if (j == 0) {

+               if (tok == MDOC_In || tok == MDOC_St || tok == MDOC_Xr) {
+                       mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                           line, ppos, mdoc_macronames[tok]);
+                       return;
+               }

                mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
                if (ac == ARGS_PUNCT && tok == MDOC_Pf)
                        append_delims(mdoc, line, pos, buf);
                mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
                if (ac == ARGS_PUNCT && tok == MDOC_Pf)
                        append_delims(mdoc, line, pos, buf);


@@ -1476,10 +1392,24 @@ in_line_argn(MACRO_PROT_ARGS)
 static void
 in_line_eoln(MACRO_PROT_ARGS)
 {
 static void
 in_line_eoln(MACRO_PROT_ARGS)
 {

-       struct mdoc_arg *arg;
+       struct mdoc_node        *n;
+       struct mdoc_arg         *arg;

 
 

-       if (tok == MDOC_Pp)
-               rew_sub(MDOC_BLOCK, mdoc, MDOC_Nm, line, ppos);
+       if ((tok == MDOC_Pp || tok == MDOC_Lp) &&
+           ! (mdoc->flags & MDOC_SYNOPSIS)) {
+               n = mdoc->last;
+               if (mdoc->next == MDOC_NEXT_SIBLING)
+                       n = n->parent;
+               if (n->tok == MDOC_Nm)
+                       rew_last(mdoc, mdoc->last->parent);
+       }
+
+       if (buf[*pos] == '\0' &&
+           (tok == MDOC_Fd || mdoc_macronames[tok][0] == '%')) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                   line, ppos, mdoc_macronames[tok]);
+               return;
+       }

 
        mdoc_argv(mdoc, line, tok, &arg, pos, buf);
        mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
 
        mdoc_argv(mdoc, line, tok, &arg, pos, buf);
        mdoc_elem_alloc(mdoc, line, ppos, tok, arg);