merge OpenBSD commit by jmc@:

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index 525a0a62ffc607187e541f325cfe4f6a0ffcace1..dd3885c702b737dfc992d04a1eb5467ead161605 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,22 +1,23 @@
-/*     $Id: mdoc_macro.c,v 1.53 2010/05/07 05:34:56 kristaps Exp $ */
+/*     $Id: mdoc_macro.c,v 1.234 2020/01/19 18:02:00 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2012-2020 Ingo Schwarze <schwarze@openbsd.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.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif
+
+#include <sys/types.h>

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


@@ -25,733 +26,768 @@
 #include <string.h>
 #include <time.h>
 
 #include <string.h>
 #include <time.h>
 

+#include "mandoc.h"
+#include "roff.h"
+#include "mdoc.h"
+#include "libmandoc.h"
+#include "roff_int.h"

 #include "libmdoc.h"
 
 #include "libmdoc.h"
 

-enum   rew {
-       REWIND_REWIND,
-       REWIND_NOHALT,
-       REWIND_HALT
-};
-
-static int             blk_full(MACRO_PROT_ARGS);
-static int             blk_exp_close(MACRO_PROT_ARGS);
-static int             blk_part_exp(MACRO_PROT_ARGS);
-static int             blk_part_imp(MACRO_PROT_ARGS);
-static int             ctx_synopsis(MACRO_PROT_ARGS);
-static int             in_line_eoln(MACRO_PROT_ARGS);
-static int             in_line_argn(MACRO_PROT_ARGS);
-static int             in_line(MACRO_PROT_ARGS);
-static int             obsolete(MACRO_PROT_ARGS);
-
-static int             append_delims(struct mdoc *, 
+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_part_imp(MACRO_PROT_ARGS);
+static void            ctx_synopsis(MACRO_PROT_ARGS);
+static void            in_line_eoln(MACRO_PROT_ARGS);
+static void            in_line_argn(MACRO_PROT_ARGS);
+static void            in_line(MACRO_PROT_ARGS);
+static void            phrase_ta(MACRO_PROT_ARGS);
+
+static void            append_delims(struct roff_man *, int, int *, char *);
+static void            dword(struct roff_man *, int, int, const char *,
+                               enum mdelim, int);
+static int             find_pending(struct roff_man *, enum roff_tok,
+                               int, int, struct roff_node *);
+static int             lookup(struct roff_man *, int, int, int, const char *);
+static int             macro_or_word(MACRO_PROT_ARGS, char *, int);
+static void            break_intermediate(struct roff_node *,
+                               struct roff_node *);
+static int             parse_rest(struct roff_man *, enum roff_tok,

                                int, int *, char *);
                                int, int *, char *);

-static enum mdoct      lookup(int, const char *);
-static enum mdoct      lookup_raw(const char *);
-static int             phrase(struct mdoc *, int, int, char *);
-static enum mdoct      rew_alt(enum mdoct);
-static int             rew_dobreak(enum mdoct, 
-                               const struct mdoc_node *);
-static enum rew        rew_dohalt(enum mdoct, enum mdoc_type, 
-                               const struct mdoc_node *);
-static int             rew_elem(struct mdoc *, enum mdoct);
-static int             rew_last(struct mdoc *, 
-                               const struct mdoc_node *);
-static int             rew_sub(enum mdoc_type, struct mdoc *, 
-                               enum mdoct, int, int);
-static int             swarn(struct mdoc *, enum mdoc_type, int, 
-                               int, const struct mdoc_node *);
-
-const  struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
-       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ap */
-       { in_line_eoln, MDOC_PROLOGUE }, /* Dd */
+static enum roff_tok   rew_alt(enum roff_tok);
+static void            rew_elem(struct roff_man *, enum roff_tok);
+static void            rew_last(struct roff_man *, const struct roff_node *);
+static void            rew_pending(struct roff_man *,
+                               const struct roff_node *);
+
+static const struct mdoc_macro mdoc_macros[MDOC_MAX - MDOC_Dd] = {
+       { in_line_eoln, MDOC_PROLOGUE | MDOC_JOIN }, /* Dd */

        { in_line_eoln, MDOC_PROLOGUE }, /* Dt */
        { in_line_eoln, MDOC_PROLOGUE }, /* Os */
        { in_line_eoln, MDOC_PROLOGUE }, /* Dt */
        { in_line_eoln, MDOC_PROLOGUE }, /* Os */

-       { blk_full, 0 }, /* Sh */
-       { blk_full, 0 }, /* Ss */ 
-       { in_line_eoln, 0 }, /* Pp */ 
-       { blk_part_imp, MDOC_PARSED }, /* D1 */
-       { blk_part_imp, MDOC_PARSED }, /* Dl */
+       { blk_full, MDOC_PARSED | MDOC_JOIN }, /* Sh */
+       { blk_full, MDOC_PARSED | MDOC_JOIN }, /* Ss */
+       { in_line_eoln, 0 }, /* Pp */
+       { blk_part_imp, MDOC_PARSED | MDOC_JOIN }, /* D1 */
+       { blk_part_imp, MDOC_PARSED | MDOC_JOIN }, /* Dl */

        { blk_full, MDOC_EXPLICIT }, /* Bd */
        { blk_full, MDOC_EXPLICIT }, /* Bd */

-       { blk_exp_close, MDOC_EXPLICIT }, /* Ed */
+       { blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Ed */

        { blk_full, MDOC_EXPLICIT }, /* Bl */
        { blk_full, MDOC_EXPLICIT }, /* Bl */

-       { blk_exp_close, MDOC_EXPLICIT }, /* El */
-       { blk_full, MDOC_PARSED }, /* It */
-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ 
-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* An */
+       { blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* El */
+       { blk_full, MDOC_PARSED | MDOC_JOIN }, /* It */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* An */
+       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED |
+                       MDOC_IGNDELIM | MDOC_JOIN }, /* Ap */

        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */

-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cd */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Cd */

        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */

-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */ 
-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Er */ 
-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ev */ 
+       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Er */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ev */

        { in_line_eoln, 0 }, /* Ex */
        { in_line_eoln, 0 }, /* Ex */

-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fa */ 
-       { in_line_eoln, 0 }, /* Fd */ 
+       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fa */
+       { in_line_eoln, 0 }, /* Fd */

        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */

-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fn */ 
-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ft */ 
-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */ 
+       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fn */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ft */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ic */

        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* In */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* In */

-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Li */
-       { blk_full, 0 }, /* Nd */ 
-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */ 
+       { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Li */
+       { blk_full, MDOC_JOIN }, /* Nd */
+       { ctx_synopsis, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */

        { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Op */
        { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Op */

-       { obsolete, 0 }, /* Ot */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ot */

        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */
        { in_line_eoln, 0 }, /* Rv */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */
        { in_line_eoln, 0 }, /* Rv */

-       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* St */ 
+       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* St */

        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Va */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Va */

-       { ctx_synopsis, MDOC_CALLABLE | MDOC_PARSED }, /* Vt */ 
+       { ctx_synopsis, MDOC_CALLABLE | MDOC_PARSED }, /* Vt */

        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Xr */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Xr */

-       { in_line_eoln, 0 }, /* %A */
-       { in_line_eoln, 0 }, /* %B */
-       { in_line_eoln, 0 }, /* %D */
-       { in_line_eoln, 0 }, /* %I */
-       { in_line_eoln, 0 }, /* %J */
+       { in_line_eoln, MDOC_JOIN }, /* %A */
+       { in_line_eoln, MDOC_JOIN }, /* %B */
+       { in_line_eoln, MDOC_JOIN }, /* %D */
+       { in_line_eoln, MDOC_JOIN }, /* %I */
+       { in_line_eoln, MDOC_JOIN }, /* %J */

        { in_line_eoln, 0 }, /* %N */
        { in_line_eoln, 0 }, /* %N */

-       { in_line_eoln, 0 }, /* %O */
+       { in_line_eoln, MDOC_JOIN }, /* %O */

        { in_line_eoln, 0 }, /* %P */
        { in_line_eoln, 0 }, /* %P */

-       { in_line_eoln, 0 }, /* %R */
-       { in_line_eoln, 0 }, /* %T */
+       { in_line_eoln, MDOC_JOIN }, /* %R */
+       { in_line_eoln, MDOC_JOIN }, /* %T */

        { in_line_eoln, 0 }, /* %V */
        { in_line_eoln, 0 }, /* %V */

-       { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ac */
-       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Ao */
-       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Aq */
+       { blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |
+                        MDOC_EXPLICIT | MDOC_JOIN }, /* Ac */
+       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |
+                       MDOC_EXPLICIT | MDOC_JOIN }, /* Ao */
+       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Aq */

        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* At */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* At */

-       { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Bc */
-       { blk_full, MDOC_EXPLICIT }, /* Bf */ 
-       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bo */
-       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Bq */
+       { blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |
+                        MDOC_EXPLICIT | MDOC_JOIN }, /* Bc */
+       { blk_full, MDOC_EXPLICIT }, /* Bf */
+       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |
+                       MDOC_EXPLICIT | MDOC_JOIN }, /* Bo */
+       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Bq */

        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Bsx */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Bx */
        { in_line_eoln, 0 }, /* Db */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Bsx */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Bx */
        { in_line_eoln, 0 }, /* Db */

-       { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Dc */
-       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Do */
-       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Dq */
-       { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ec */
-       { blk_exp_close, MDOC_EXPLICIT }, /* Ef */
-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Em */ 
+       { blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |
+                        MDOC_EXPLICIT | MDOC_JOIN }, /* Dc */
+       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |
+                       MDOC_EXPLICIT | MDOC_JOIN }, /* Do */
+       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Dq */
+       { blk_exp_close, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Ec */
+       { blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Ef */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Em */

        { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */
        { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */

-       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* No */
-       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* No */
+       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED |
+                       MDOC_IGNDELIM | MDOC_JOIN }, /* Ns */

        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */

-       { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */
+       { blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |
+                        MDOC_EXPLICIT | MDOC_JOIN }, /* Pc */

        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_IGNDELIM }, /* Pf */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_IGNDELIM }, /* Pf */

-       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Po */
-       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Pq */
-       { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Qc */
-       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Ql */
-       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Qo */
-       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Qq */
-       { blk_exp_close, MDOC_EXPLICIT }, /* Re */
+       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |
+                       MDOC_EXPLICIT | MDOC_JOIN }, /* Po */
+       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Pq */
+       { blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |
+                        MDOC_EXPLICIT | MDOC_JOIN }, /* Qc */
+       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ql */
+       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |
+                       MDOC_EXPLICIT | MDOC_JOIN }, /* Qo */
+       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Qq */
+       { blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Re */

        { blk_full, MDOC_EXPLICIT }, /* Rs */
        { blk_full, MDOC_EXPLICIT }, /* Rs */

-       { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Sc */
-       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* So */
-       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Sq */
-       { in_line_eoln, 0 }, /* Sm */
-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Sx */
-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Sy */
+       { blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |
+                        MDOC_EXPLICIT | MDOC_JOIN }, /* Sc */
+       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |
+                       MDOC_EXPLICIT | MDOC_JOIN }, /* So */
+       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sq */
+       { in_line_argn, 0 }, /* Sm */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sx */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sy */

        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */

-       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ux */
+       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ux */

        { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Xc */
        { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Xo */
        { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Xc */
        { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Xo */

-       { blk_full, MDOC_EXPLICIT | MDOC_CALLABLE }, /* Fo */ 
-       { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Fc */ 
-       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Oo */
-       { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Oc */
+       { blk_full, MDOC_EXPLICIT | MDOC_CALLABLE }, /* Fo */
+       { blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |
+                        MDOC_EXPLICIT | MDOC_JOIN }, /* Fc */
+       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |
+                       MDOC_EXPLICIT | MDOC_JOIN }, /* Oo */
+       { blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |
+                        MDOC_EXPLICIT | MDOC_JOIN }, /* Oc */

        { blk_full, MDOC_EXPLICIT }, /* Bk */
        { blk_full, MDOC_EXPLICIT }, /* Bk */

-       { blk_exp_close, MDOC_EXPLICIT }, /* Ek */
+       { blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Ek */

        { in_line_eoln, 0 }, /* Bt */
        { in_line_eoln, 0 }, /* Hf */
        { in_line_eoln, 0 }, /* Bt */
        { in_line_eoln, 0 }, /* Hf */

-       { obsolete, 0 }, /* Fr */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fr */

        { in_line_eoln, 0 }, /* Ud */
        { in_line_eoln, 0 }, /* Ud */

-       { in_line_eoln, 0 }, /* Lb */
-       { in_line_eoln, 0 }, /* Lp */ 
-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Lk */ 
-       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Mt */ 
-       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Brq */
-       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bro */
-       { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Brc */
-       { in_line_eoln, 0 }, /* %C */
-       { obsolete, 0 }, /* Es */
-       { obsolete, 0 }, /* En */
+       { in_line, 0 }, /* Lb */
+       { in_line_eoln, 0 }, /* Lp */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Lk */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Mt */
+       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Brq */
+       { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |
+                       MDOC_EXPLICIT | MDOC_JOIN }, /* Bro */
+       { blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |
+                        MDOC_EXPLICIT | MDOC_JOIN }, /* Brc */
+       { in_line_eoln, MDOC_JOIN }, /* %C */
+       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Es */
+       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* En */

        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */

-       { in_line_eoln, 0 }, /* %Q */
-       { in_line_eoln, 0 }, /* br */
-       { in_line_eoln, 0 }, /* sp */
+       { in_line_eoln, MDOC_JOIN }, /* %Q */

        { in_line_eoln, 0 }, /* %U */
        { in_line_eoln, 0 }, /* %U */

+       { phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */
+       { in_line_eoln, 0 }, /* Tg */

 };
 
 };
 

-const  struct mdoc_macro * const mdoc_macros = __mdoc_macros;
-

 
 

-static int
-swarn(struct mdoc *mdoc, enum mdoc_type type, 
-               int line, int pos, const struct mdoc_node *p)
+const struct mdoc_macro *
+mdoc_macro(enum roff_tok tok)

 {
 {

-       const char      *n, *t, *tt;
-
-       n = t = "<root>";
-       tt = "block";
-
-       switch (type) {
-       case (MDOC_BODY):
-               tt = "multi-line";
-               break;
-       case (MDOC_HEAD):
-               tt = "line";
-               break;
-       default:
-               break;
-       }
-
-       switch (p->type) {
-       case (MDOC_BLOCK):
-               n = mdoc_macronames[p->tok];
-               t = "block";
-               break;
-       case (MDOC_BODY):
-               n = mdoc_macronames[p->tok];
-               t = "multi-line";
-               break;
-       case (MDOC_HEAD):
-               n = mdoc_macronames[p->tok];
-               t = "line";
-               break;
-       default:
-               break;
-       }
-
-       if ( ! (MDOC_IGN_SCOPE & mdoc->pflags))
-               return(mdoc_verr(mdoc, line, pos, 
-                               "%s scope breaks %s scope of %s", 
-                               tt, t, n));
-       return(mdoc_vwarn(mdoc, line, pos, 
-                               "%s scope breaks %s scope of %s", 
-                               tt, t, n));
+       assert(tok >= MDOC_Dd && tok < MDOC_MAX);
+       return mdoc_macros + (tok - MDOC_Dd);

 }
 
 }
 

-

 /*
  * This is called at the end of parsing.  It must traverse up the tree,
  * closing out open [implicit] scopes.  Obviously, open explicit scopes
  * are errors.
  */
 /*
  * This is called at the end of parsing.  It must traverse up the tree,
  * closing out open [implicit] scopes.  Obviously, open explicit scopes
  * are errors.
  */

-int
-mdoc_macroend(struct mdoc *m)
+void
+mdoc_endparse(struct roff_man *mdoc)

 {
 {

-       struct mdoc_node *n;
+       struct roff_node *n;

 
        /* Scan for open explicit scopes. */
 
 
        /* Scan for open explicit scopes. */
 

-       n = MDOC_VALID & m->last->flags ?  m->last->parent : m->last;
+       n = mdoc->last->flags & NODE_VALID ?
+           mdoc->last->parent : mdoc->last;

 
 

-       for ( ; n; n = n->parent) {
-               if (MDOC_BLOCK != n->type)
-                       continue;
-               if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags))
-                       continue;
-               return(mdoc_nerr(m, n, EOPEN));
-       }
+       for ( ; n; n = n->parent)
+               if (n->type == ROFFT_BLOCK &&
+                   mdoc_macro(n->tok)->flags & MDOC_EXPLICIT)
+                       mandoc_msg(MANDOCERR_BLK_NOEND,
+                           n->line, n->pos, "%s", roff_name[n->tok]);

 
        /* Rewind to the first. */
 
 
        /* Rewind to the first. */
 

-       return(rew_last(m, m->first));
+       rew_last(mdoc, mdoc->meta.first);

 }
 
 }
 

-

 /*
 /*

- * Look up a macro from within a subsequent context.
+ * Look up the macro at *p called by "from",
+ * or as a line macro if from == TOKEN_NONE.

  */
  */

-static enum mdoct
-lookup(int from, const char *p)
+static int
+lookup(struct roff_man *mdoc, int from, int line, int ppos, const char *p)

 {
 {

-       /* FIXME: make -diag lists be un-PARSED. */
+       enum roff_tok    res;

 
 

-       if ( ! (MDOC_PARSED & mdoc_macros[from].flags))
-               return(MDOC_MAX);
-       return(lookup_raw(p));
+       if (mdoc->flags & MDOC_PHRASEQF) {
+               mdoc->flags &= ~MDOC_PHRASEQF;
+               return TOKEN_NONE;
+       }
+       if (from == TOKEN_NONE || mdoc_macro(from)->flags & MDOC_PARSED) {
+               res = roffhash_find(mdoc->mdocmac, p, 0);
+               if (res != TOKEN_NONE) {
+                       if (mdoc_macro(res)->flags & MDOC_CALLABLE)
+                               return res;
+                       mandoc_msg(MANDOCERR_MACRO_CALL, line, ppos, "%s", p);
+               }
+       }
+       return TOKEN_NONE;

 }
 
 }
 

-

 /*
 /*

- * Lookup a macro following the initial line macro.
+ * Rewind up to and including a specific node.

  */
  */

-static enum mdoct
-lookup_raw(const char *p)
-{
-       int              res;
-
-       if (MDOC_MAX == (res = mdoc_hash_find(p)))
-               return(MDOC_MAX);
-       if (MDOC_CALLABLE & mdoc_macros[res].flags)
-               return(res);
-       return(MDOC_MAX);
-}
-
-
-static int
-rew_last(struct mdoc *mdoc, const struct mdoc_node *to)
+static void
+rew_last(struct roff_man *mdoc, const struct roff_node *to)

 {
 
 {
 

-       assert(to);
-       mdoc->next = MDOC_NEXT_SIBLING;
+       if (to->flags & NODE_VALID)
+               return;

 
 

-       /* LINTED */

        while (mdoc->last != to) {
        while (mdoc->last != to) {

-               if ( ! mdoc_valid_post(mdoc))
-                       return(0);
-               if ( ! mdoc_action_post(mdoc))
-                       return(0);
+               mdoc_state(mdoc, mdoc->last);
+               mdoc->last->flags |= NODE_VALID | NODE_ENDED;

                mdoc->last = mdoc->last->parent;
                mdoc->last = mdoc->last->parent;

-               assert(mdoc->last);

        }
        }

-
-       if ( ! mdoc_valid_post(mdoc))
-               return(0);
-       return(mdoc_action_post(mdoc));
+       mdoc_state(mdoc, mdoc->last);
+       mdoc->last->flags |= NODE_VALID | NODE_ENDED;
+       mdoc->next = ROFF_NEXT_SIBLING;

 }
 
 }
 

-

 /*
 /*

- * Return the opening macro of a closing one, e.g., `Ec' has `Eo' as its
- * matching pair.
+ * Rewind up to a specific block, including all blocks that broke it.

  */
  */

-static enum mdoct
-rew_alt(enum mdoct tok)
+static void
+rew_pending(struct roff_man *mdoc, const struct roff_node *n)

 {
 {

-       switch (tok) {
-       case (MDOC_Ac):
-               return(MDOC_Ao);
-       case (MDOC_Bc):
-               return(MDOC_Bo);
-       case (MDOC_Brc):
-               return(MDOC_Bro);
-       case (MDOC_Dc):
-               return(MDOC_Do);
-       case (MDOC_Ec):
-               return(MDOC_Eo);
-       case (MDOC_Ed):
-               return(MDOC_Bd);
-       case (MDOC_Ef):
-               return(MDOC_Bf);
-       case (MDOC_Ek):
-               return(MDOC_Bk);
-       case (MDOC_El):
-               return(MDOC_Bl);
-       case (MDOC_Fc):
-               return(MDOC_Fo);
-       case (MDOC_Oc):
-               return(MDOC_Oo);
-       case (MDOC_Pc):
-               return(MDOC_Po);
-       case (MDOC_Qc):
-               return(MDOC_Qo);
-       case (MDOC_Re):
-               return(MDOC_Rs);
-       case (MDOC_Sc):
-               return(MDOC_So);
-       case (MDOC_Xc):
-               return(MDOC_Xo);
-       default:
-               break;
+
+       for (;;) {
+               rew_last(mdoc, n);
+
+               if (mdoc->last == n) {
+                       switch (n->type) {
+                       case ROFFT_HEAD:
+                               roff_body_alloc(mdoc, n->line, n->pos,
+                                   n->tok);
+                               if (n->tok == MDOC_Ss)
+                                       mdoc->flags &= ~ROFF_NONOFILL;
+                               break;
+                       case ROFFT_BLOCK:
+                               break;
+                       default:
+                               return;
+                       }
+                       if ( ! (n->flags & NODE_BROKEN))
+                               return;
+               } else
+                       n = mdoc->last;
+
+               for (;;) {
+                       if ((n = n->parent) == NULL)
+                               return;
+
+                       if (n->type == ROFFT_BLOCK ||
+                           n->type == ROFFT_HEAD) {
+                               if (n->flags & NODE_ENDED)
+                                       break;
+                               else
+                                       return;
+                       }
+               }

        }
        }

-       abort();
-       /* NOTREACHED */

 }
 
 }
 

-
-/* 
- * Rewind rules.  This indicates whether to stop rewinding
- * (REWIND_HALT) without touching our current scope, stop rewinding and
- * close our current scope (REWIND_REWIND), or continue (REWIND_NOHALT).
- * The scope-closing and so on occurs in the various rew_* routines.
+/*
+ * For a block closing macro, return the corresponding opening one.
+ * Otherwise, return the macro itself.

  */
  */

-static enum rew
-rew_dohalt(enum mdoct tok, enum mdoc_type type, 
-               const struct mdoc_node *p)
+static enum roff_tok
+rew_alt(enum roff_tok tok)

 {
 {

-
-       if (MDOC_ROOT == p->type)
-               return(REWIND_HALT);
-       if (MDOC_VALID & p->flags)
-               return(REWIND_NOHALT);
-

        switch (tok) {
        switch (tok) {

-       case (MDOC_Aq):
-               /* FALLTHROUGH */
-       case (MDOC_Bq):
-               /* FALLTHROUGH */
-       case (MDOC_Brq):
-               /* FALLTHROUGH */
-       case (MDOC_D1):
-               /* FALLTHROUGH */
-       case (MDOC_Dl):
-               /* FALLTHROUGH */
-       case (MDOC_Dq):
-               /* FALLTHROUGH */
-       case (MDOC_Op):
-               /* FALLTHROUGH */
-       case (MDOC_Pq):
-               /* FALLTHROUGH */
-       case (MDOC_Ql):
-               /* FALLTHROUGH */
-       case (MDOC_Qq):
-               /* FALLTHROUGH */
-       case (MDOC_Sq):
-               /* FALLTHROUGH */
-       case (MDOC_Vt):
-               assert(MDOC_TAIL != type);
-               if (type == p->type && tok == p->tok)
-                       return(REWIND_REWIND);
-               break;
-       case (MDOC_It):
-               assert(MDOC_TAIL != type);
-               if (type == p->type && tok == p->tok)
-                       return(REWIND_REWIND);
-               if (MDOC_BODY == p->type && MDOC_Bl == p->tok)
-                       return(REWIND_HALT);
-               break;
-       case (MDOC_Sh):
-               if (type == p->type && tok == p->tok)
-                       return(REWIND_REWIND);
-               break;
-       case (MDOC_Nd):
-               /* FALLTHROUGH */
-       case (MDOC_Ss):
-               assert(MDOC_TAIL != type);
-               if (type == p->type && tok == p->tok)
-                       return(REWIND_REWIND);
-               if (MDOC_BODY == p->type && MDOC_Sh == p->tok)
-                       return(REWIND_HALT);
-               break;
-       case (MDOC_Ao):
-               /* FALLTHROUGH */
-       case (MDOC_Bd):
-               /* FALLTHROUGH */
-       case (MDOC_Bf):
-               /* FALLTHROUGH */
-       case (MDOC_Bk):
-               /* FALLTHROUGH */
-       case (MDOC_Bl):
-               /* FALLTHROUGH */
-       case (MDOC_Bo):
-               /* FALLTHROUGH */
-       case (MDOC_Bro):
-               /* FALLTHROUGH */
-       case (MDOC_Do):
-               /* FALLTHROUGH */
-       case (MDOC_Eo):
-               /* FALLTHROUGH */
-       case (MDOC_Fo):
-               /* FALLTHROUGH */
-       case (MDOC_Oo):
-               /* FALLTHROUGH */
-       case (MDOC_Po):
-               /* FALLTHROUGH */
-       case (MDOC_Qo):
-               /* FALLTHROUGH */
-       case (MDOC_Rs):
-               /* FALLTHROUGH */
-       case (MDOC_So):
-               /* FALLTHROUGH */
-       case (MDOC_Xo):
-               if (type == p->type && tok == p->tok)
-                       return(REWIND_REWIND);
-               break;
-       /* Multi-line explicit scope close. */
-       case (MDOC_Ac):
-               /* FALLTHROUGH */
-       case (MDOC_Bc):
-               /* FALLTHROUGH */
-       case (MDOC_Brc):
-               /* FALLTHROUGH */
-       case (MDOC_Dc):
-               /* FALLTHROUGH */
-       case (MDOC_Ec):
-               /* FALLTHROUGH */
-       case (MDOC_Ed):
-               /* FALLTHROUGH */
-       case (MDOC_Ek):
-               /* FALLTHROUGH */
-       case (MDOC_El):
-               /* FALLTHROUGH */
-       case (MDOC_Fc):
-               /* FALLTHROUGH */
-       case (MDOC_Ef):
-               /* FALLTHROUGH */
-       case (MDOC_Oc):
-               /* FALLTHROUGH */
-       case (MDOC_Pc):
-               /* FALLTHROUGH */
-       case (MDOC_Qc):
-               /* FALLTHROUGH */
-       case (MDOC_Re):
-               /* FALLTHROUGH */
-       case (MDOC_Sc):
-               /* FALLTHROUGH */
-       case (MDOC_Xc):
-               if (type == p->type && rew_alt(tok) == p->tok)
-                       return(REWIND_REWIND);
-               break;
+       case MDOC_Ac:
+               return MDOC_Ao;
+       case MDOC_Bc:
+               return MDOC_Bo;
+       case MDOC_Brc:
+               return MDOC_Bro;
+       case MDOC_Dc:
+               return MDOC_Do;
+       case MDOC_Ec:
+               return MDOC_Eo;
+       case MDOC_Ed:
+               return MDOC_Bd;
+       case MDOC_Ef:
+               return MDOC_Bf;
+       case MDOC_Ek:
+               return MDOC_Bk;
+       case MDOC_El:
+               return MDOC_Bl;
+       case MDOC_Fc:
+               return MDOC_Fo;
+       case MDOC_Oc:
+               return MDOC_Oo;
+       case MDOC_Pc:
+               return MDOC_Po;
+       case MDOC_Qc:
+               return MDOC_Qo;
+       case MDOC_Re:
+               return MDOC_Rs;
+       case MDOC_Sc:
+               return MDOC_So;
+       case MDOC_Xc:
+               return MDOC_Xo;

        default:
        default:

-               abort();
-               /* NOTREACHED */
+               return tok;

        }
        }

+}

 
 

-       return(REWIND_NOHALT);
+static void
+rew_elem(struct roff_man *mdoc, enum roff_tok tok)
+{
+       struct roff_node *n;
+
+       n = mdoc->last;
+       if (n->type != ROFFT_ELEM)
+               n = n->parent;
+       assert(n->type == ROFFT_ELEM);
+       assert(tok == n->tok);
+       rew_last(mdoc, n);

 }
 
 }
 

+static void
+break_intermediate(struct roff_node *n, struct roff_node *breaker)
+{
+       if (n != breaker &&
+           n->type != ROFFT_BLOCK && n->type != ROFFT_HEAD &&
+           (n->type != ROFFT_BODY || n->end != ENDBODY_NOT))
+               n = n->parent;
+       while (n != breaker) {
+               if ( ! (n->flags & NODE_VALID))
+                       n->flags |= NODE_BROKEN;
+               n = n->parent;
+       }
+}

 
 /*
 
 /*

- * See if we can break an encountered scope (the rew_dohalt has returned
- * REWIND_NOHALT). 
+ * If there is an open sub-block of the target requiring
+ * explicit close-out, postpone closing out the target until
+ * the rew_pending() call closing out the sub-block.

  */
 static int
  */
 static int

-rew_dobreak(enum mdoct tok, const struct mdoc_node *p)
+find_pending(struct roff_man *mdoc, enum roff_tok tok, int line, int ppos,
+       struct roff_node *target)

 {
 {

+       struct roff_node        *n;
+       int                      irc;

 
 

-       assert(MDOC_ROOT != p->type);
-       if (MDOC_ELEM == p->type)
-               return(1);
-       if (MDOC_TEXT == p->type)
-               return(1);
-       if (MDOC_VALID & p->flags)
-               return(1);
+       if (target->flags & NODE_VALID)
+               return 0;

 
 

-       switch (tok) {
-       case (MDOC_It):
-               return(MDOC_It == p->tok);
-       case (MDOC_Nd):
-               return(MDOC_Nd == p->tok);
-       case (MDOC_Ss):
-               return(MDOC_Ss == p->tok);
-       case (MDOC_Sh):
-               if (MDOC_Nd == p->tok)
-                       return(1);
-               if (MDOC_Ss == p->tok)
-                       return(1);
-               return(MDOC_Sh == p->tok);
-       case (MDOC_El):
-               if (MDOC_It == p->tok)
-                       return(1);
-               break;
-       case (MDOC_Oc):
-               if (MDOC_Op == p->tok)
-                       return(1);
-               break;
-       default:
-               break;
+       irc = 0;
+       for (n = mdoc->last; n != NULL && n != target; n = n->parent) {
+               if (n->flags & NODE_ENDED)
+                       continue;
+               if (n->type == ROFFT_BLOCK &&
+                   mdoc_macro(n->tok)->flags & MDOC_EXPLICIT) {
+                       irc = 1;
+                       break_intermediate(mdoc->last, target);
+                       if (target->type == ROFFT_HEAD)
+                               target->flags |= NODE_ENDED;
+                       else if ( ! (target->flags & NODE_ENDED)) {
+                               mandoc_msg(MANDOCERR_BLK_NEST,
+                                   line, ppos, "%s breaks %s",
+                                   roff_name[tok], roff_name[n->tok]);
+                               mdoc_endbody_alloc(mdoc, line, ppos,
+                                   tok, target);
+                       }
+               }

        }
        }

-
-       if (MDOC_EXPLICIT & mdoc_macros[tok].flags) 
-               return(p->tok == rew_alt(tok));
-       else if (MDOC_BLOCK == p->type)
-               return(1);
-
-       return(tok == p->tok);
+       return irc;

 }
 
 }
 

-
-static int
-rew_elem(struct mdoc *mdoc, enum mdoct tok)
+/*
+ * Allocate a word and check whether it's punctuation or not.
+ * Punctuation consists of those tokens found in mdoc_isdelim().
+ */
+static void
+dword(struct roff_man *mdoc, int line, int col, const char *p,
+               enum mdelim d, int may_append)

 {
 {

-       struct mdoc_node *n;

 
 

-       n = mdoc->last;
-       if (MDOC_ELEM != n->type)
-               n = n->parent;
-       assert(MDOC_ELEM == n->type);
-       assert(tok == n->tok);
-
-       return(rew_last(mdoc, n));
-}
+       if (d == DELIM_MAX)
+               d = mdoc_isdelim(p);

 
 

-
-static int
-rew_sub(enum mdoc_type t, struct mdoc *m, 
-               enum mdoct tok, int line, int ppos)
-{
-       struct mdoc_node *n;
-       enum rew          c;
-
-       /* LINTED */
-       for (n = m->last; n; n = n->parent) {
-               c = rew_dohalt(tok, t, n);
-               if (REWIND_HALT == c) {
-                       if (MDOC_BLOCK != t)
-                               return(1);
-                       if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags))
-                               return(1);
-                       return(mdoc_perr(m, line, ppos, ENOCTX));
-               }
-               if (REWIND_REWIND == c)
-                       break;
-               else if (rew_dobreak(tok, n))
-                       continue;
-               if ( ! swarn(m, t, line, ppos, n))
-                       return(0);
+       if (may_append &&
+           ! (mdoc->flags & (MDOC_SYNOPSIS | MDOC_KEEP | MDOC_SMOFF)) &&
+           d == DELIM_NONE && mdoc->last->type == ROFFT_TEXT &&
+           mdoc_isdelim(mdoc->last->string) == DELIM_NONE) {
+               roff_word_append(mdoc, p);
+               return;

        }
 
        }
 

-       assert(n);
-       if ( ! rew_last(m, n))
-               return(0);
+       roff_word_alloc(mdoc, line, col, p);

 
 

-#ifdef UGLY

        /*
        /*

-        * The current block extends an enclosing block beyond a line
-        * break.  Now that the current block ends, close the enclosing
-        * block, too.
+        * If the word consists of a bare delimiter,
+        * flag the new node accordingly,
+        * unless doing so was vetoed by the invoking macro.
+        * Always clear the veto, it is only valid for one word.

         */
         */

-       if (NULL != (n = n->pending)) {
-               assert(MDOC_HEAD == n->type);
-               if ( ! rew_last(m, n))
-                       return(0);
-               if ( ! mdoc_body_alloc(m, n->line, n->pos, n->tok))
-                       return(0);
-       }
-#endif

 
 

-       return(1);
+       if (d == DELIM_OPEN)
+               mdoc->last->flags |= NODE_DELIMO;
+       else if (d == DELIM_CLOSE &&
+           ! (mdoc->flags & MDOC_NODELIMC) &&
+           mdoc->last->parent->tok != MDOC_Fd)
+               mdoc->last->flags |= NODE_DELIMC;
+       mdoc->flags &= ~MDOC_NODELIMC;

 }
 
 }
 

-
-static int
-append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
+static void
+append_delims(struct roff_man *mdoc, int line, int *pos, char *buf)

 {
 {

-       int              lastarg;
-       enum margerr     ac;

        char            *p;
        char            *p;

+       int              la;
+       enum margserr    ac;

 
 

-       if (0 == buf[*pos])
-               return(1);
+       if (buf[*pos] == '\0')
+               return;

 
        for (;;) {
 
        for (;;) {

-               lastarg = *pos;
-               ac = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p);
-               assert(ARGS_PHRASE != ac);
-
-               if (ARGS_ERROR == ac)
-                       return(0);
-               else if (ARGS_EOLN == ac)
+               la = *pos;
+               ac = mdoc_args(mdoc, line, pos, buf, TOKEN_NONE, &p);
+               if (ac == ARGS_EOLN)

                        break;
                        break;

-               assert(mdoc_isdelim(p));
-               if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
-                       return(0);
-       }
+               dword(mdoc, line, la, p, DELIM_MAX, 1);

 
 

-       return(1);
-}
+               /*
+                * If we encounter end-of-sentence symbols, then trigger
+                * the double-space.
+                *
+                * XXX: it's easy to allow this to propagate outward to
+                * the last symbol, such that `. )' will cause the
+                * correct double-spacing.  However, (1) groff isn't
+                * smart enough to do this and (2) it would require
+                * knowing which symbols break this behaviour, for
+                * example, `.  ;' shouldn't propagate the double-space.
+                */

 
 

+               if (mandoc_eos(p, strlen(p)))
+                       mdoc->last->flags |= NODE_EOS;
+               if (ac == ARGS_ALLOC)
+                       free(p);
+       }
+}

 
 /*
 
 /*

- * Close out block partial/full explicit.  
+ * Parse one word.
+ * If it is a macro, call it and return 1.
+ * Otherwise, allocate it and return 0.

  */
 static int
  */
 static int

+macro_or_word(MACRO_PROT_ARGS, char *p, int parsed)
+{
+       int              ntok;
+
+       ntok = buf[ppos] == '"' || parsed == 0 ||
+           mdoc->flags & MDOC_PHRASELIT ? TOKEN_NONE :
+           lookup(mdoc, tok, line, ppos, p);
+
+       if (ntok == TOKEN_NONE) {
+               dword(mdoc, line, ppos, p, DELIM_MAX, tok == TOKEN_NONE ||
+                   mdoc_macro(tok)->flags & MDOC_JOIN);
+               return 0;
+       } else {
+               if (tok != TOKEN_NONE &&
+                   mdoc_macro(tok)->fp == in_line_eoln)
+                       rew_elem(mdoc, tok);
+               (*mdoc_macro(ntok)->fp)(mdoc, ntok, line, ppos, pos, buf);
+               if (tok == TOKEN_NONE)
+                       append_delims(mdoc, line, pos, buf);
+               return 1;
+       }
+}
+
+/*
+ * Close out block partial/full explicit.
+ */
+static void

 blk_exp_close(MACRO_PROT_ARGS)
 {
 blk_exp_close(MACRO_PROT_ARGS)
 {

-       int              j, lastarg, maxargs, flushed;
-       enum margerr     ac;
-       enum mdoct       ntok;
+       struct roff_node *body;         /* Our own body. */
+       struct roff_node *endbody;      /* Our own end marker. */
+       struct roff_node *itblk;        /* An It block starting later. */
+       struct roff_node *later;        /* A sub-block starting later. */
+       struct roff_node *n;            /* Search back to our block. */
+       struct roff_node *target;       /* For find_pending(). */
+
+       int              j, lastarg, maxargs, nl, pending;
+       enum margserr    ac;
+       enum roff_tok    atok, ntok;

        char            *p;
 
        char            *p;
 

+       nl = MDOC_NEWLINE & mdoc->flags;
+

        switch (tok) {
        switch (tok) {

-       case (MDOC_Ec):
+       case MDOC_Ec:

                maxargs = 1;
                break;
                maxargs = 1;
                break;

+       case MDOC_Ek:
+               mdoc->flags &= ~MDOC_KEEP;
+               /* FALLTHROUGH */

        default:
                maxargs = 0;
                break;
        }
 
        default:
                maxargs = 0;
                break;
        }
 

-       if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
-               if (buf[*pos]) 
-                       if ( ! mdoc_pwarn(m, line, ppos, ENOLINE))
-                               return(0);
+       /* Search backwards for the beginning of our own body. */

 
 

-               if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))
-                       return(0);
-               return(rew_sub(MDOC_BLOCK, m, tok, line, ppos));
+       atok = rew_alt(tok);
+       body = NULL;
+       for (n = mdoc->last; n; n = n->parent) {
+               if (n->flags & NODE_ENDED || n->tok != atok ||
+                   n->type != ROFFT_BODY || n->end != ENDBODY_NOT)
+                       continue;
+               body = n;
+               break;

        }
 
        }
 

-       if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))
-               return(0);
+       /*
+        * Search backwards for beginnings of blocks,
+        * both of our own and of pending sub-blocks.
+        */

 
 

-       if (maxargs > 0) 
-               if ( ! mdoc_tail_alloc(m, line, ppos, rew_alt(tok)))
-                       return(0);
+       endbody = itblk = later = NULL;
+       for (n = mdoc->last; n; n = n->parent) {
+               if (n->flags & NODE_ENDED)
+                       continue;

 
 

-       for (flushed = j = 0; ; j++) {
-               lastarg = *pos;
+               /*
+                * Mismatching end macros can never break anything
+                * and we only care about the breaking of BLOCKs.
+                */
+
+               if (body == NULL || n->type != ROFFT_BLOCK)
+                       continue;
+
+               /*
+                * SYNOPSIS name blocks can not be broken themselves,
+                * but they do get broken together with a broken child.
+                */

 
 

-               if (j == maxargs && ! flushed) {
-                       if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))
-                               return(0);
-                       flushed = 1;
+               if (n->tok == MDOC_Nm) {
+                       if (later != NULL)
+                               n->flags |= NODE_BROKEN | NODE_ENDED;
+                       continue;

                }
 
                }
 

-               ac = mdoc_args(m, line, pos, buf, tok, &p);
+               if (n->tok == MDOC_It) {
+                       itblk = n;
+                       continue;
+               }

 
 

-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_PUNCT == ac)
-                       break;
-               if (ARGS_EOLN == ac)
-                       break;
+               if (atok == n->tok) {

 
 

-               if (MDOC_MAX != (ntok = lookup(tok, p))) {
-                       if ( ! flushed) {
-                               if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))
-                                       return(0);
-                               flushed = 1;
-                       }
-                       if ( ! mdoc_macro(m, ntok, line, lastarg, pos, buf))
-                               return(0);
+                       /*
+                        * Found the start of our own block.
+                        * When there is no pending sub block,
+                        * just proceed to closing out.
+                        */
+
+                       if (later == NULL ||
+                           (tok == MDOC_El && itblk == NULL))
+                               break;
+
+                       /*
+                        * When there is a pending sub block, postpone
+                        * closing out the current block until the
+                        * rew_pending() closing out the sub-block.
+                        * Mark the place where the formatting - but not
+                        * the scope - of the current block ends.
+                        */
+
+                       mandoc_msg(MANDOCERR_BLK_NEST,
+                           line, ppos, "%s breaks %s",
+                           roff_name[atok], roff_name[later->tok]);
+
+                       endbody = mdoc_endbody_alloc(mdoc, line, ppos,
+                           atok, body);
+
+                       if (tok == MDOC_El)
+                               itblk->flags |= NODE_ENDED | NODE_BROKEN;
+
+                       /*
+                        * If a block closing macro taking arguments
+                        * breaks another block, put the arguments
+                        * into the end marker.
+                        */
+
+                       if (maxargs)
+                               mdoc->next = ROFF_NEXT_CHILD;

                        break;
                        break;

-               } 
+               }

 
 

-               if ( ! mdoc_word_alloc(m, line, lastarg, p))
-                       return(0);
+               /*
+                * Explicit blocks close out description lines, but
+                * even those can get broken together with a child.
+                */
+
+               if (n->tok == MDOC_Nd) {
+                       if (later != NULL)
+                               n->flags |= NODE_BROKEN | NODE_ENDED;
+                       else
+                               rew_last(mdoc, n);
+                       continue;
+               }
+
+               /* Breaking an open sub block. */
+
+               break_intermediate(mdoc->last, body);
+               n->flags |= NODE_BROKEN;
+               if (later == NULL)
+                       later = n;

        }
 
        }
 

-       if ( ! flushed && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))
-               return(0);
+       if (body == NULL) {
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, line, ppos,
+                   "%s", roff_name[tok]);
+               if (maxargs && endbody == NULL) {
+                       /*
+                        * Stray .Ec without previous .Eo:
+                        * Break the output line, keep the arguments.
+                        */
+                       roff_elem_alloc(mdoc, line, ppos, ROFF_br);
+                       rew_elem(mdoc, ROFF_br);
+               }
+       } else if (endbody == NULL) {
+               rew_last(mdoc, body);
+               if (maxargs)
+                       mdoc_tail_alloc(mdoc, line, ppos, atok);
+       }

 
 

-       if (ppos > 1)
-               return(1);
-       return(append_delims(m, line, pos, buf));
-}
+       if ((mdoc_macro(tok)->flags & MDOC_PARSED) == 0) {
+               if (buf[*pos] != '\0')
+                       mandoc_msg(MANDOCERR_ARG_SKIP, line, ppos,
+                           "%s %s", roff_name[tok], buf + *pos);
+               if (endbody == NULL && n != NULL)
+                       rew_pending(mdoc, n);

 
 

+               /*
+                * Restore the fill mode that was set before the display.
+                * This needs to be done here rather than during validation
+                * such that subsequent nodes get the right flags.
+                */

 
 

-static int
+               if (tok == MDOC_Ed && body != NULL) {
+                       if (body->flags & NODE_NOFILL)
+                               mdoc->flags |= ROFF_NOFILL;
+                       else
+                               mdoc->flags &= ~ROFF_NOFILL;
+               }
+               return;
+       }
+
+       if (endbody != NULL)
+               n = endbody;
+
+       ntok = TOKEN_NONE;
+       for (j = 0; ; j++) {
+               lastarg = *pos;
+
+               if (j == maxargs && n != NULL)
+                       rew_last(mdoc, n);
+
+               ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
+               if (ac == ARGS_PUNCT || ac == ARGS_EOLN)
+                       break;
+
+               ntok = lookup(mdoc, tok, line, lastarg, p);
+
+               if (ntok == TOKEN_NONE) {
+                       dword(mdoc, line, lastarg, p, DELIM_MAX,
+                           mdoc_macro(tok)->flags & MDOC_JOIN);
+                       if (ac == ARGS_ALLOC)
+                               free(p);
+                       continue;
+               }
+               if (ac == ARGS_ALLOC)
+                       free(p);
+
+               if (n != NULL)
+                       rew_last(mdoc, n);
+               mdoc->flags &= ~MDOC_NEWLINE;
+               (*mdoc_macro(ntok)->fp)(mdoc, ntok, line, lastarg, pos, buf);
+               break;
+       }
+
+       if (n != NULL) {
+               pending = 0;
+               if (ntok != TOKEN_NONE && n->flags & NODE_BROKEN) {
+                       target = n;
+                       do
+                               target = target->parent;
+                       while ( ! (target->flags & NODE_ENDED));
+                       pending = find_pending(mdoc, ntok, line, ppos, target);
+               }
+               if ( ! pending)
+                       rew_pending(mdoc, n);
+       }
+       if (nl)
+               append_delims(mdoc, line, pos, buf);
+}
+
+static void

 in_line(MACRO_PROT_ARGS)
 {
 in_line(MACRO_PROT_ARGS)
 {

-       int              la, lastpunct, c, cnt, d, nc;
-       enum mdoct       ntok;
-       enum margerr     ac;
+       int              la, scope, cnt, firstarg, mayopen, nc, nl;
+       enum roff_tok    ntok;
+       enum margserr    ac;
+       enum mdelim      d;

        struct mdoc_arg *arg;
        char            *p;
 
        struct mdoc_arg *arg;
        char            *p;
 

+       nl = MDOC_NEWLINE & mdoc->flags;
+

        /*
         * Whether we allow ignored elements (those without content,
         * usually because of reserved words) to squeak by.
         */
 
        switch (tok) {
        /*
         * Whether we allow ignored elements (those without content,
         * usually because of reserved words) to squeak by.
         */
 
        switch (tok) {

-       case (MDOC_An):
-               /* FALLTHROUGH */
-       case (MDOC_Ar):
-               /* FALLTHROUGH */
-       case (MDOC_Fl):
-               /* FALLTHROUGH */
-       case (MDOC_Lk):
-               /* FALLTHROUGH */
-       case (MDOC_Nm):
-               /* FALLTHROUGH */
-       case (MDOC_Pa):
+       case MDOC_An:
+       case MDOC_Ar:
+       case MDOC_Fl:
+       case MDOC_Mt:
+       case MDOC_Nm:
+       case MDOC_Pa:

                nc = 1;
                break;
        default:
                nc = 1;
                break;
        default:


@@ -759,102 +795,137 @@ in_line(MACRO_PROT_ARGS)
                break;
        }
 
                break;
        }
 

-       for (arg = NULL;; ) {
+       mdoc_argv(mdoc, line, tok, &arg, pos, buf);
+
+       d = DELIM_NONE;
+       firstarg = 1;
+       mayopen = 1;
+       for (cnt = scope = 0;; ) {

                la = *pos;
                la = *pos;

-               c = mdoc_argv(m, line, tok, &arg, pos, buf);
+               ac = mdoc_args(mdoc, line, pos, buf, tok, &p);

 
 

-               if (ARGV_WORD == c) {
-                       *pos = la;
-                       break;
-               } 
-               if (ARGV_EOLN == c)
-                       break;
-               if (ARGV_ARG == c)
-                       continue;
+               /*
+                * At the end of a macro line,
+                * opening delimiters do not suppress spacing.
+                */

 
 

-               mdoc_argv_free(arg);
-               return(0);
-       }
+               if (ac == ARGS_EOLN) {
+                       if (d == DELIM_OPEN)
+                               mdoc->last->flags &= ~NODE_DELIMO;
+                       break;
+               }

 
 

-       for (cnt = 0, lastpunct = 1;; ) {
-               la = *pos;
-               ac = mdoc_args(m, line, pos, buf, tok, &p);
+               /*
+                * The rest of the macro line is only punctuation,
+                * to be handled by append_delims().
+                * If there were no other arguments,
+                * do not allow the first one to suppress spacing,
+                * even if it turns out to be a closing one.
+                */

 
 

-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_EOLN == ac)
+               if (ac == ARGS_PUNCT) {
+                       if (cnt == 0 && (nc == 0 || tok == MDOC_An))
+                               mdoc->flags |= MDOC_NODELIMC;

                        break;
                        break;

-               if (ARGS_PUNCT == ac)
-                       break;
-
-               /* Quoted words shouldn't be looked-up. */
+               }

 
 

-               ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
+               ntok = (tok == MDOC_Fn && !cnt) ?
+                   TOKEN_NONE : lookup(mdoc, tok, line, la, p);

 
 

-               /* 
+               /*

                 * In this case, we've located a submacro and must
                 * execute it.  Close out scope, if open.  If no
                 * elements have been generated, either create one (nc)
                 * or raise a warning.
                 */
 
                 * In this case, we've located a submacro and must
                 * execute it.  Close out scope, if open.  If no
                 * elements have been generated, either create one (nc)
                 * or raise a warning.
                 */
 

-               if (MDOC_MAX != ntok) {
-                       if (0 == lastpunct && ! rew_elem(m, tok))
-                               return(0);
-                       if (nc && 0 == cnt) {
-                               if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))
-                                       return(0);
-                               if ( ! rew_last(m, m->last))
-                                       return(0);
-                       } else if ( ! nc && 0 == cnt) {
+               if (ntok != TOKEN_NONE) {
+                       if (scope)
+                               rew_elem(mdoc, tok);
+                       if (nc && ! cnt) {
+                               mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+                               rew_last(mdoc, mdoc->last);
+                       } else if ( ! nc && ! cnt) {

                                mdoc_argv_free(arg);
                                mdoc_argv_free(arg);

-                               if ( ! mdoc_pwarn(m, line, ppos, EIGNE))
-                                       return(0);
+                               mandoc_msg(MANDOCERR_MACRO_EMPTY,
+                                   line, ppos, "%s", roff_name[tok]);

                        }
                        }

-                       if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
-                               return(0);
-                       if (ppos > 1)
-                               return(1);
-                       return(append_delims(m, line, pos, buf));
-               } 
-
-               /* 
-                * Non-quote-enclosed punctuation.  Set up our scope, if
-                * a word; rewind the scope, if a delimiter; then append
-                * the word. 
-                */
+                       (*mdoc_macro(ntok)->fp)(mdoc, ntok,
+                           line, la, pos, buf);
+                       if (nl)
+                               append_delims(mdoc, line, pos, buf);
+                       if (ac == ARGS_ALLOC)
+                               free(p);
+                       return;
+               }

 
 

-               d = ARGS_QWORD == ac ? 0 : mdoc_isdelim(p);
+               /*
+                * Handle punctuation.  Set up our scope, if a word;
+                * rewind the scope, if a delimiter; then append the word.
+                */

 
 

-               if (ARGS_QWORD != ac && d) {
-                       if (0 == lastpunct && ! rew_elem(m, tok))
-                               return(0);
-                       lastpunct = 1;
-               } else if (lastpunct) {
-                       if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))
-                               return(0);
-                       lastpunct = 0;
+               if ((d = mdoc_isdelim(p)) != DELIM_NONE) {
+                       /*
+                        * If we encounter closing punctuation, no word
+                        * has been emitted, no scope is open, and we're
+                        * allowed to have an empty element, then start
+                        * a new scope.
+                        */
+                       if ((d == DELIM_CLOSE ||
+                            (d == DELIM_MIDDLE && tok == MDOC_Fl)) &&
+                           !cnt && !scope && nc && mayopen) {
+                               mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+                               scope = 1;
+                               cnt++;
+                               if (tok == MDOC_Nm)
+                                       mayopen = 0;
+                       }
+                       /*
+                        * Close out our scope, if one is open, before
+                        * any punctuation.
+                        */
+                       if (scope && tok != MDOC_Lk) {
+                               rew_elem(mdoc, tok);
+                               scope = 0;
+                               if (tok == MDOC_Fn)
+                                       mayopen = 0;
+                       }
+               } else if (mayopen && !scope) {
+                       mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+                       scope = 1;
+                       cnt++;

                }
 
                }
 

-               if ( ! d)
-                       cnt++;
-               if ( ! mdoc_word_alloc(m, line, la, p))
-                       return(0);
+               dword(mdoc, line, la, p, d,
+                   mdoc_macro(tok)->flags & MDOC_JOIN);
+
+               if (ac == ARGS_ALLOC)
+                       free(p);
+
+               /*
+                * If the first argument is a closing delimiter,
+                * do not suppress spacing before it.
+                */
+
+               if (firstarg && d == DELIM_CLOSE && !nc)
+                       mdoc->last->flags &= ~NODE_DELIMC;
+               firstarg = 0;

 
                /*
                 * `Fl' macros have their scope re-opened with each new
                 * word so that the `-' can be added to each one without
                 * having to parse out spaces.
                 */
 
                /*
                 * `Fl' macros have their scope re-opened with each new
                 * word so that the `-' can be added to each one without
                 * having to parse out spaces.
                 */

-               if (0 == lastpunct && MDOC_Fl == tok) {
-                       if ( ! rew_elem(m, tok))
-                               return(0);
-                       lastpunct = 1;
+               if (scope && tok == MDOC_Fl) {
+                       rew_elem(mdoc, tok);
+                       scope = 0;

                }
        }
 
                }
        }
 

-       if (0 == lastpunct && ! rew_elem(m, tok))
-               return(0);
+       if (scope && tok != MDOC_Lk) {
+               rew_elem(mdoc, tok);
+               scope = 0;
+       }

 
        /*
         * If no elements have been collected and we're allowed to have
 
        /*
         * If no elements have been collected and we're allowed to have


@@ -862,48 +933,122 @@ in_line(MACRO_PROT_ARGS)
         * raise a warning.
         */
 
         * raise a warning.
         */
 

-       if (nc && 0 == cnt) {
-               if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))
-                       return(0);
-               if ( ! rew_last(m, m->last))
-                       return(0);
-       } else if ( ! nc && 0 == cnt) {
-               mdoc_argv_free(arg);
-               if ( ! mdoc_pwarn(m, line, ppos, EIGNE))
-                       return(0);
+       if ( ! cnt) {
+               if (nc) {
+                       mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+                       rew_last(mdoc, mdoc->last);
+               } else {
+                       mdoc_argv_free(arg);
+                       mandoc_msg(MANDOCERR_MACRO_EMPTY,
+                           line, ppos, "%s", roff_name[tok]);
+               }

        }
        }

-
-       if (ppos > 1)
-               return(1);
-       return(append_delims(m, line, pos, buf));
+       if (nl)
+               append_delims(mdoc, line, pos, buf);
+       if (scope)
+               rew_elem(mdoc, tok);

 }
 
 }
 

-
-static int
+static void

 blk_full(MACRO_PROT_ARGS)
 {
 blk_full(MACRO_PROT_ARGS)
 {

-       int               c, la;

        struct mdoc_arg  *arg;
        struct mdoc_arg  *arg;

-       struct mdoc_node *head; /* save of head macro */
-       struct mdoc_node *body; /* save of body macro */
-#ifdef UGLY
-       struct mdoc_node *n;
-#endif
-       enum mdoct        ntok;
-       enum margerr      ac;
+       struct roff_node *blk; /* Our own or a broken block. */
+       struct roff_node *head; /* Our own head. */
+       struct roff_node *body; /* Our own body. */
+       struct roff_node *n;

        char             *p;
        char             *p;

+       size_t            iarg;
+       int               done, la, nl, parsed;
+       enum margserr     ac, lac;
+
+       nl = MDOC_NEWLINE & mdoc->flags;
+
+       if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY,
+                   line, ppos, "%s", roff_name[tok]);
+               return;
+       }
+
+       if ((mdoc_macro(tok)->flags & MDOC_EXPLICIT) == 0) {
+
+               /* Here, tok is one of Sh Ss Nm Nd It. */
+
+               blk = NULL;
+               for (n = mdoc->last; n != NULL; n = n->parent) {
+                       if (n->flags & NODE_ENDED) {
+                               if ( ! (n->flags & NODE_VALID))
+                                       n->flags |= NODE_BROKEN;
+                               continue;
+                       }
+                       if (n->type != ROFFT_BLOCK)
+                               continue;
+
+                       if (tok == MDOC_It && n->tok == MDOC_Bl) {
+                               if (blk != NULL) {
+                                       mandoc_msg(MANDOCERR_BLK_BROKEN,
+                                           line, ppos, "It breaks %s",
+                                           roff_name[blk->tok]);
+                                       rew_pending(mdoc, blk);
+                               }
+                               break;
+                       }
+
+                       if (mdoc_macro(n->tok)->flags & MDOC_EXPLICIT) {
+                               switch (tok) {
+                               case MDOC_Sh:
+                               case MDOC_Ss:
+                                       mandoc_msg(MANDOCERR_BLK_BROKEN,
+                                           line, ppos,
+                                           "%s breaks %s", roff_name[tok],
+                                           roff_name[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;
+                       }
+
+                       /* 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;

 
 

-       /* Close out prior implicit scope. */
+                       /* Item breaking an explicit block. */

 
 

-       if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
-               if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))
-                       return(0);
-               if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))
-                       return(0);
+                       if (blk != NULL) {
+                               mandoc_msg(MANDOCERR_BLK_BROKEN, line, ppos,
+                                   "It breaks %s", roff_name[blk->tok]);
+                               rew_pending(mdoc, blk);
+                               blk = NULL;
+                       }
+
+                       /* Close out prior implicit scopes. */
+
+                       rew_pending(mdoc, n);
+               }
+
+               /* Skip items outside lists. */
+
+               if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) {
+                       mandoc_msg(MANDOCERR_IT_STRAY,
+                           line, ppos, "It %s", buf + *pos);
+                       roff_elem_alloc(mdoc, line, ppos, ROFF_br);
+                       rew_elem(mdoc, ROFF_br);
+                       return;
+               }

        }
 
        /*
        }
 
        /*

-        * This routine accomodates implicitly- and explicitly-scoped
+        * This routine accommodates implicitly- and explicitly-scoped

         * macro openings.  Implicit ones first close out prior scope
         * (seen above).  Delay opening the head until necessary to
         * allow leading punctuation to print.  Special consideration
         * macro openings.  Implicit ones first close out prior scope
         * (seen above).  Delay opening the head until necessary to
         * allow leading punctuation to print.  Special consideration


@@ -911,144 +1056,203 @@ blk_full(MACRO_PROT_ARGS)
         * regular child nodes.
         */
 
         * regular child nodes.
         */
 

-       for (arg = NULL;; ) {
-               la = *pos;
-               c = mdoc_argv(m, line, tok, &arg, pos, buf);
-
-               if (ARGV_WORD == c) {
-                       *pos = la;
-                       break;
-               } 
-
-               if (ARGV_EOLN == c)
-                       break;
-               if (ARGV_ARG == c)
-                       continue;
-
-               mdoc_argv_free(arg);
-               return(0);
+       switch (tok) {
+       case MDOC_Sh:
+               mdoc->flags &= ~ROFF_NOFILL;
+               break;
+       case MDOC_Ss:
+               mdoc->flags |= ROFF_NONOFILL;
+               break;
+       default:
+               break;

        }
        }

+       mdoc_argv(mdoc, line, tok, &arg, pos, buf);
+       blk = mdoc_block_alloc(mdoc, line, ppos, tok, arg);
+       head = body = NULL;

 
 

-       if ( ! mdoc_block_alloc(m, line, ppos, tok, arg))
-               return(0);
+       /*
+        * Exception: Heads of `It' macros in `-diag' lists are not
+        * parsed, even though `It' macros in general are parsed.
+        */

 
 

-       head = body = NULL;
+       parsed = tok != MDOC_It ||
+           mdoc->last->parent->tok != MDOC_Bl ||
+           mdoc->last->parent->norm->Bl.type != LIST_diag;

 
        /*
         * The `Nd' macro has all arguments in its body: it's a hybrid
         * of block partial-explicit and full-implicit.  Stupid.
         */
 
 
        /*
         * The `Nd' macro has all arguments in its body: it's a hybrid
         * of block partial-explicit and full-implicit.  Stupid.
         */
 

-       if (MDOC_Nd == tok) {
-               if ( ! mdoc_head_alloc(m, line, ppos, tok))
-                       return(0);
-               head = m->last;
-               if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
-                       return(0);
-               if ( ! mdoc_body_alloc(m, line, ppos, tok))
-                       return(0);
-               body = m->last;
-       } 
+       if (tok == MDOC_Nd) {
+               head = roff_head_alloc(mdoc, line, ppos, tok);
+               rew_last(mdoc, head);
+               body = roff_body_alloc(mdoc, line, ppos, tok);
+       }
+
+       if (tok == MDOC_Bk)
+               mdoc->flags |= MDOC_KEEP;

 
 

+       ac = ARGS_EOLN;

        for (;;) {
        for (;;) {

+
+               /*
+                * If we are right after a tab character,
+                * do not parse the first word for macros.
+                */
+
+               if (mdoc->flags & MDOC_PHRASEQN) {
+                       mdoc->flags &= ~MDOC_PHRASEQN;
+                       mdoc->flags |= MDOC_PHRASEQF;
+               }
+

                la = *pos;
                la = *pos;

-               ac = mdoc_args(m, line, pos, buf, tok, &p);
+               lac = ac;
+               ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
+               if (ac == ARGS_EOLN) {
+                       if (lac != ARGS_PHRASE ||
+                           ! (mdoc->flags & MDOC_PHRASEQF))
+                               break;
+
+                       /*
+                        * This line ends in a tab; start the next
+                        * column now, with a leading blank.
+                        */
+
+                       if (body != NULL)
+                               rew_last(mdoc, body);
+                       body = roff_body_alloc(mdoc, line, ppos, tok);
+                       roff_word_alloc(mdoc, line, ppos, "\\&");
+                       break;
+               }

 
 

-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_EOLN == ac)
+               if (tok == MDOC_Bd || tok == MDOC_Bk) {
+                       mandoc_msg(MANDOCERR_ARG_EXCESS, line, la,
+                           "%s ... %s", roff_name[tok], buf + la);
+                       if (ac == ARGS_ALLOC)
+                               free(p);
+                       break;
+               }
+               if (tok == MDOC_Rs) {
+                       mandoc_msg(MANDOCERR_ARG_SKIP,
+                           line, la, "Rs %s", buf + la);
+                       if (ac == ARGS_ALLOC)
+                               free(p);
+                       break;
+               }
+               if (ac == ARGS_PUNCT)

                        break;
 
                        break;
 

-               /* Don't emit leading punct. for phrases. */
+               /*
+                * Emit leading punctuation (i.e., punctuation before
+                * the ROFFT_HEAD) for non-phrase types.
+                */

 
 

-               if (NULL == head && ARGS_PHRASE != ac &&
-                               ARGS_QWORD != ac &&
-                               1 == mdoc_isdelim(p)) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
-                               return(0);
+               if (head == NULL &&
+                   ac != ARGS_PHRASE &&
+                   mdoc_isdelim(p) == DELIM_OPEN) {
+                       dword(mdoc, line, la, p, DELIM_OPEN, 0);
+                       if (ac == ARGS_ALLOC)
+                               free(p);

                        continue;
                }
 
                        continue;
                }
 

-               /* Always re-open head for phrases. */
+               /* Open a head if one hasn't been opened. */

 
 

-               if (NULL == head || ARGS_PHRASE == ac) {
-                       if ( ! mdoc_head_alloc(m, line, ppos, tok))
-                               return(0);
-                       head = m->last;
-               }
+               if (head == NULL)
+                       head = roff_head_alloc(mdoc, line, ppos, tok);

 
 

-               if (ARGS_PHRASE == ac) {
-                       if ( ! phrase(m, line, la, buf))
-                               return(0);
-                       if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
-                               return(0);
-                       continue;
-               }
+               if (ac == ARGS_PHRASE) {
+
+                       /*
+                        * If we haven't opened a body yet, rewind the
+                        * head; if we have, rewind that instead.
+                        */

 
 

-               if (MDOC_MAX == (ntok = lookup(tok, p))) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
-                               return(0);
+                       rew_last(mdoc, body == NULL ? head : body);
+                       body = roff_body_alloc(mdoc, line, ppos, tok);
+
+                       /* Process to the tab or to the end of the line. */
+
+                       mdoc->flags |= MDOC_PHRASE;
+                       parse_rest(mdoc, TOKEN_NONE, line, &la, buf);
+                       mdoc->flags &= ~MDOC_PHRASE;
+
+                       /* There may have been `Ta' macros. */
+
+                       while (body->next != NULL)
+                               body = body->next;

                        continue;
                }
 
                        continue;
                }
 

-               if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
-                       return(0);
-               break;
+               done = macro_or_word(mdoc, tok, line, la, pos, buf, p, parsed);
+               if (ac == ARGS_ALLOC)
+                       free(p);
+               if (done)
+                       break;

        }
 
        }
 

-       if (NULL == head) {
-               if ( ! mdoc_head_alloc(m, line, ppos, tok))
-                       return(0);
-               head = m->last;
-       }
-       
-       if (1 == ppos && ! append_delims(m, line, pos, buf))
-               return(0);
+       if (blk->flags & NODE_VALID)
+               return;
+       if (head == NULL)
+               head = roff_head_alloc(mdoc, line, ppos, tok);
+       if (nl && tok != MDOC_Bd && tok != MDOC_Bl && tok != MDOC_Rs)
+               append_delims(mdoc, line, pos, buf);
+       if (body != NULL)
+               goto out;
+       if (find_pending(mdoc, tok, line, ppos, head))
+               return;

 
 

-       /* If we've already opened our body, exit now. */
+       /* Close out scopes to remain in a consistent state. */

 
 

-       if (NULL != body)
-               return(1);
+       rew_last(mdoc, head);
+       body = roff_body_alloc(mdoc, line, ppos, tok);
+       if (tok == MDOC_Ss)
+               mdoc->flags &= ~ROFF_NONOFILL;

 
 

-#ifdef UGLY

        /*
        /*

-        * If there is an open (i.e., unvalidated) sub-block requiring
-        * explicit close-out, postpone switching the current block from
-        * head to body until the rew_sub() call closing out that
-        * sub-block.
+        * Set up fill mode for display blocks.
+        * This needs to be done here up front rather than during
+        * validation such that child nodes get the right flags.

         */
         */

-       for (n = m->last; n && n != head; n = n->parent) {
-               if (MDOC_BLOCK == n->type && 
-                               MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
-                               ! (MDOC_VALID & n->flags)) {
-                       assert( ! (MDOC_ACTED & n->flags));
-                       n->pending = head;
-                       return(1);
+
+       if (tok == MDOC_Bd && arg != NULL) {
+               for (iarg = 0; iarg < arg->argc; iarg++) {
+                       switch (arg->argv[iarg].arg) {
+                       case MDOC_Unfilled:
+                       case MDOC_Literal:
+                               mdoc->flags |= ROFF_NOFILL;
+                               break;
+                       case MDOC_Filled:
+                       case MDOC_Ragged:
+                       case MDOC_Centred:
+                               mdoc->flags &= ~ROFF_NOFILL;
+                               break;
+                       default:
+                               continue;
+                       }
+                       break;

                }
        }
                }
        }

-#endif
-
-       /* Close out scopes to remain in a consistent state. */
-
-       if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
-               return(0);
-       if ( ! mdoc_body_alloc(m, line, ppos, tok))
-               return(0);
-
-       return(1);
+out:
+       if (mdoc->flags & MDOC_FREECOL) {
+               rew_last(mdoc, body);
+               rew_last(mdoc, blk);
+               mdoc->flags &= ~MDOC_FREECOL;
+       }

 }
 
 }
 

-
-static int
+static void

 blk_part_imp(MACRO_PROT_ARGS)
 {
 blk_part_imp(MACRO_PROT_ARGS)
 {

-       int               la;
-       enum mdoct        ntok;
-       enum margerr      ac;
+       int               done, la, nl;
+       enum margserr     ac;

        char             *p;
        char             *p;

-       struct mdoc_node *blk; /* saved block context */
-       struct mdoc_node *body; /* saved body context */
-       struct mdoc_node *n;
+       struct roff_node *blk; /* saved block context */
+       struct roff_node *body; /* saved body context */
+       struct roff_node *n;
+
+       nl = MDOC_NEWLINE & mdoc->flags;

 
        /*
         * A macro that spans to the end of the line.  This is generally
 
        /*
         * A macro that spans to the end of the line.  This is generally


@@ -1059,15 +1263,8 @@ blk_part_imp(MACRO_PROT_ARGS)
         * or more closing punctuation nodes.
         */
 
         * or more closing punctuation nodes.
         */
 

-       if ( ! mdoc_block_alloc(m, line, ppos, tok, NULL))
-               return(0);
-
-       blk = m->last;
-
-       if ( ! mdoc_head_alloc(m, line, ppos, tok))
-               return(0);
-       if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
-               return(0);
+       blk = mdoc_block_alloc(mdoc, line, ppos, tok, NULL);
+       rew_last(mdoc, roff_head_alloc(mdoc, line, ppos, tok));

 
        /*
         * Open the body scope "on-demand", that is, after we've
 
        /*
         * Open the body scope "on-demand", that is, after we've


@@ -1077,88 +1274,54 @@ blk_part_imp(MACRO_PROT_ARGS)
 
        for (body = NULL; ; ) {
                la = *pos;
 
        for (body = NULL; ; ) {
                la = *pos;

-               ac = mdoc_args(m, line, pos, buf, tok, &p);
-
-               assert(ARGS_PHRASE != ac);
-
-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_EOLN == ac)
+               ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
+               if (ac == ARGS_EOLN || ac == ARGS_PUNCT)

                        break;
                        break;

-               if (ARGS_PUNCT == ac)
-                       break;
-
-               if (NULL == body && ARGS_QWORD != ac &&
-                               1 == mdoc_isdelim(p)) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
-                               return(0);
-                       continue;
-               } 
-
-               if (NULL == body) {
-                      if ( ! mdoc_body_alloc(m, line, ppos, tok))
-                              return(0);
-                       body = m->last;
-               }

 
 

-               if (MDOC_MAX == (ntok = lookup(tok, p))) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
-                               return(0);
+               if (body == NULL && mdoc_isdelim(p) == DELIM_OPEN) {
+                       dword(mdoc, line, la, p, DELIM_OPEN, 0);
+                       if (ac == ARGS_ALLOC)
+                               free(p);

                        continue;
                }
 
                        continue;
                }
 

-               if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
-                       return(0);
-               break;
-       }
+               if (body == NULL)
+                       body = roff_body_alloc(mdoc, line, ppos, tok);

 
 

-       /* Clean-ups to leave in a consistent state. */
-
-       if (NULL == body) {
-               if ( ! mdoc_body_alloc(m, line, ppos, tok))
-                       return(0);
-               body = m->last;
-       }
-
-       /* 
-        * If we can't rewind to our body, then our scope has already
-        * been closed by another macro (like `Oc' closing `Op').  This
-        * is ugly behaviour nodding its head to OpenBSD's overwhelming
-        * crufty use of `Op' breakage.
-        */
-       for (n = m->last; n; n = n->parent)
-               if (body == n)
+               done = macro_or_word(mdoc, tok, line, la, pos, buf, p, 1);
+               if (ac == ARGS_ALLOC)
+                       free(p);
+               if (done)

                        break;
                        break;

+       }
+       if (body == NULL)
+               body = roff_body_alloc(mdoc, line, ppos, tok);

 
 

-       if (NULL == n && ! mdoc_nwarn(m, body, EIMPBRK))
-               return(0);
-
-       if (n && ! rew_last(m, body))
-               return(0);
-
-       /* Standard appending of delimiters. */
-
-       if (1 == ppos && ! append_delims(m, line, pos, buf))
-               return(0);
+       if (find_pending(mdoc, tok, line, ppos, body))
+               return;

 
 

-       /* Rewind scope, if applicable. */
+       rew_last(mdoc, body);
+       if (nl)
+               append_delims(mdoc, line, pos, buf);
+       rew_pending(mdoc, blk);

 
 

-       if (n && ! rew_last(m, blk))
-               return(0);
+       /* Move trailing .Ns out of scope. */

 
 

-       return(1);
+       for (n = body->child; n && n->next; n = n->next)
+               /* Do nothing. */ ;
+       if (n && n->tok == MDOC_Ns)
+               roff_node_relink(mdoc, n);

 }
 
 }
 

-
-static int
+static void

 blk_part_exp(MACRO_PROT_ARGS)
 {
 blk_part_exp(MACRO_PROT_ARGS)
 {

-       int               la;
-       enum margerr      ac;
-       struct mdoc_node *head; /* keep track of head */
-       struct mdoc_node *body; /* keep track of body */
+       int               done, la, nl;
+       enum margserr     ac;
+       struct roff_node *head; /* keep track of head */

        char             *p;
        char             *p;

-       enum mdoct        ntok;
+
+       nl = MDOC_NEWLINE & mdoc->flags;

 
        /*
         * The opening of an explicit macro having zero or more leading
 
        /*
         * The opening of an explicit macro having zero or more leading


@@ -1166,107 +1329,64 @@ blk_part_exp(MACRO_PROT_ARGS)
         * case of `Eo'); and a body that may be empty.
         */
 
         * case of `Eo'); and a body that may be empty.
         */
 

-       if ( ! mdoc_block_alloc(m, line, ppos, tok, NULL))
-               return(0); 
-
-       for (head = body = NULL; ; ) {
+       roff_block_alloc(mdoc, line, ppos, tok);
+       head = NULL;
+       for (;;) {

                la = *pos;
                la = *pos;

-               ac = mdoc_args(m, line, pos, buf, tok, &p);
-
-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_PUNCT == ac)
-                       break;
-               if (ARGS_EOLN == ac)
+               ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
+               if (ac == ARGS_PUNCT || ac == ARGS_EOLN)

                        break;
 
                        break;
 

-               assert(ARGS_PHRASE != ac);
-

                /* Flush out leading punctuation. */
 
                /* Flush out leading punctuation. */
 

-               if (NULL == head && ARGS_QWORD != ac &&
-                               1 == mdoc_isdelim(p)) {
-                       assert(NULL == body);
-                       if ( ! mdoc_word_alloc(m, line, la, p))
-                               return(0);
+               if (head == NULL && mdoc_isdelim(p) == DELIM_OPEN) {
+                       dword(mdoc, line, la, p, DELIM_OPEN, 0);
+                       if (ac == ARGS_ALLOC)
+                               free(p);

                        continue;
                        continue;

-               } 
-
-               if (NULL == head) {
-                       assert(NULL == body);
-                       if ( ! mdoc_head_alloc(m, line, ppos, tok))
-                               return(0);
-                       head = m->last;

                }
 
                }
 

-               /*
-                * `Eo' gobbles any data into the head, but most other
-                * macros just immediately close out and begin the body.
-                */
-
-               if (NULL == body) {
-                       assert(head);
-                       /* No check whether it's a macro! */
-                       if (MDOC_Eo == tok)
-                               if ( ! mdoc_word_alloc(m, line, la, p))
-                                       return(0);
-
-                       if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
-                               return(0);
-                       if ( ! mdoc_body_alloc(m, line, ppos, tok))
-                               return(0);
-                       body = m->last;
-
-                       if (MDOC_Eo == tok)
+               if (head == NULL) {
+                       head = roff_head_alloc(mdoc, line, ppos, tok);
+                       if (tok == MDOC_Eo)  /* Not parsed. */
+                               dword(mdoc, line, la, p, DELIM_MAX, 0);
+                       rew_last(mdoc, head);
+                       roff_body_alloc(mdoc, line, ppos, tok);
+                       if (tok == MDOC_Eo) {
+                               if (ac == ARGS_ALLOC)
+                                       free(p);

                                continue;
                                continue;

+                       }

                }
 
                }
 

-               assert(NULL != head && NULL != body);
-
-               if (MDOC_MAX == (ntok = lookup(tok, p))) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
-                               return(0);
-                       continue;
-               }
-
-               if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
-                       return(0);
-               break;
+               done = macro_or_word(mdoc, tok, line, la, pos, buf, p, 1);
+               if (ac == ARGS_ALLOC)
+                       free(p);
+               if (done)
+                       break;

        }
 
        /* Clean-up to leave in a consistent state. */
 
        }
 
        /* Clean-up to leave in a consistent state. */
 

-       if (NULL == head) {
-               if ( ! mdoc_head_alloc(m, line, ppos, tok))
-                       return(0);
-               head = m->last;
-       }
-
-       if (NULL == body) {
-               if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
-                       return(0);
-               if ( ! mdoc_body_alloc(m, line, ppos, tok))
-                       return(0);
-               body = m->last;
+       if (head == NULL) {
+               rew_last(mdoc, roff_head_alloc(mdoc, line, ppos, tok));
+               roff_body_alloc(mdoc, line, ppos, tok);

        }
        }

-
-       /* Standard appending of delimiters. */
-
-       if (ppos > 1)
-               return(1);
-
-       return(append_delims(m, line, pos, buf));
+       if (nl)
+               append_delims(mdoc, line, pos, buf);

 }
 
 }
 

-
-static int
+static void

 in_line_argn(MACRO_PROT_ARGS)
 {
 in_line_argn(MACRO_PROT_ARGS)
 {

-       int              la, flushed, j, c, maxargs;
-       enum margerr     ac;

        struct mdoc_arg *arg;
        char            *p;
        struct mdoc_arg *arg;
        char            *p;

-       enum mdoct       ntok;
+       enum margserr    ac;
+       enum roff_tok    ntok;
+       int              state; /* arg#; -1: not yet open; -2: closed */
+       int              la, maxargs, nl;
+
+       nl = mdoc->flags & MDOC_NEWLINE;

 
        /*
         * A line macro that has a fixed number of arguments (maxargs).
 
        /*
         * A line macro that has a fixed number of arguments (maxargs).


@@ -1277,16 +1397,14 @@ in_line_argn(MACRO_PROT_ARGS)
         */
 
        switch (tok) {
         */
 
        switch (tok) {

-       case (MDOC_Ap):
-               /* FALLTHROUGH */
-       case (MDOC_No):
-               /* FALLTHROUGH */
-       case (MDOC_Ns):
-               /* FALLTHROUGH */
-       case (MDOC_Ux):
+       case MDOC_Ap:
+       case MDOC_Ns:
+       case MDOC_Ux:

                maxargs = 0;
                break;
                maxargs = 0;
                break;

-       case (MDOC_Xr):
+       case MDOC_Bx:
+       case MDOC_Es:
+       case MDOC_Xr:

                maxargs = 2;
                break;
        default:
                maxargs = 2;
                break;
        default:


@@ -1294,239 +1412,189 @@ in_line_argn(MACRO_PROT_ARGS)
                break;
        }
 
                break;
        }
 

-       for (arg = NULL; ; ) {
-               la = *pos;
-               c = mdoc_argv(m, line, tok, &arg, pos, buf);
+       mdoc_argv(mdoc, line, tok, &arg, pos, buf);

 
 

-               if (ARGV_WORD == c) {
-                       *pos = la;
-                       break;
-               } 
-
-               if (ARGV_EOLN == c)
-                       break;
-               if (ARGV_ARG == c)
-                       continue;
-
-               mdoc_argv_free(arg);
-               return(0);
-       }
-
-       for (flushed = j = 0; ; ) {
+       state = -1;
+       p = NULL;
+       for (;;) {

                la = *pos;
                la = *pos;

-               ac = mdoc_args(m, line, pos, buf, tok, &p);
-
-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_PUNCT == ac)
-                       break;
-               if (ARGS_EOLN == ac)
-                       break;
-
-               if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && 
-                               ARGS_QWORD != ac &&
-                               0 == j && 1 == mdoc_isdelim(p)) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
-                               return(0);
+               ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
+
+               if ((ac == ARGS_WORD || ac == ARGS_ALLOC) && state == -1 &&
+                   (mdoc_macro(tok)->flags & MDOC_IGNDELIM) == 0 &&
+                   mdoc_isdelim(p) == DELIM_OPEN) {
+                       dword(mdoc, line, la, p, DELIM_OPEN, 0);
+                       if (ac == ARGS_ALLOC)
+                               free(p);

                        continue;
                        continue;

-               } else if (0 == j)
-                      if ( ! mdoc_elem_alloc(m, line, la, tok, arg))
-                              return(0);
-
-               if (j == maxargs && ! flushed) {
-                       if ( ! rew_elem(m, tok))
-                               return(0);
-                       flushed = 1;

                }
 
                }
 

-               if (MDOC_MAX != (ntok = lookup(tok, p))) {
-                       if ( ! flushed && ! rew_elem(m, tok))
-                               return(0);
-                       flushed = 1;
-                       if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
-                               return(0);
-                       j++;
+               if (state == -1 && tok != MDOC_In &&
+                   tok != MDOC_St && tok != MDOC_Xr) {
+                       mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+                       state = 0;
+               }
+
+               if (ac == ARGS_PUNCT || ac == ARGS_EOLN) {
+                       if (abs(state) < 2 && tok == MDOC_Pf)
+                               mandoc_msg(MANDOCERR_PF_SKIP,
+                                   line, ppos, "Pf %s",
+                                   p == NULL ? "at eol" : p);

                        break;
                }
 
                        break;
                }
 

-               if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) &&
-                               ARGS_QWORD != ac &&
-                               ! flushed && mdoc_isdelim(p)) {
-                       if ( ! rew_elem(m, tok))
-                               return(0);
-                       flushed = 1;
+               if (state == maxargs) {
+                       rew_elem(mdoc, tok);
+                       state = -2;

                }
 
                }
 

-               /* 
-                * XXX: this is a hack to work around groff's ugliness
-                * as regards `Xr' and extraneous arguments.  It should
-                * ideally be deprecated behaviour, but because this is
-                * code is no here, it's unlikely to be removed.
-                */
+               ntok = (tok == MDOC_Pf && state == 0) ?
+                   TOKEN_NONE : lookup(mdoc, tok, line, la, p);

 
 

-#ifdef __OpenBSD__
-               if (MDOC_Xr == tok && j == maxargs) {
-                       if ( ! mdoc_elem_alloc(m, line, la, MDOC_Ns, NULL))
-                               return(0);
-                       if ( ! rew_elem(m, MDOC_Ns))
-                               return(0);
+               if (ntok != TOKEN_NONE) {
+                       if (state >= 0) {
+                               rew_elem(mdoc, tok);
+                               state = -2;
+                       }
+                       (*mdoc_macro(ntok)->fp)(mdoc, ntok,
+                           line, la, pos, buf);
+                       if (ac == ARGS_ALLOC)
+                               free(p);
+                       break;

                }
                }

-#endif
-
-               if ( ! mdoc_word_alloc(m, line, la, p))
-                       return(0);
-               j++;
-       }

 
 

-       if (0 == j && ! mdoc_elem_alloc(m, line, la, tok, arg))
-              return(0);
+               if (mdoc_macro(tok)->flags & MDOC_IGNDELIM ||
+                   mdoc_isdelim(p) == DELIM_NONE) {
+                       if (state == -1) {
+                               mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+                               state = 1;
+                       } else if (state >= 0)
+                               state++;
+               } else if (state >= 0) {
+                       rew_elem(mdoc, tok);
+                       state = -2;
+               }

 
 

-       /* Close out in a consistent state. */
+               dword(mdoc, line, la, p, DELIM_MAX,
+                   mdoc_macro(tok)->flags & MDOC_JOIN);
+               if (ac == ARGS_ALLOC)
+                       free(p);
+               p = mdoc->last->string;
+       }

 
 

-       if ( ! flushed && ! rew_elem(m, tok))
-               return(0);
+       if (state == -1) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY,
+                   line, ppos, "%s", roff_name[tok]);
+               return;
+       }

 
 

-       if (ppos > 1)
-               return(1);
-       return(append_delims(m, line, pos, buf));
+       if (state == 0 && tok == MDOC_Pf)
+               append_delims(mdoc, line, pos, buf);
+       if (state >= 0)
+               rew_elem(mdoc, tok);
+       if (nl)
+               append_delims(mdoc, line, pos, buf);

 }
 
 }
 

-
-static int
+static void

 in_line_eoln(MACRO_PROT_ARGS)
 {
 in_line_eoln(MACRO_PROT_ARGS)
 {

-       int              c, la;
-       enum margerr     ac;
-       struct mdoc_arg *arg;
-       char            *p;
-       enum mdoct       ntok;
-
-       assert( ! (MDOC_PARSED & mdoc_macros[tok].flags));
-
-       /* Parse macro arguments. */
-
-       for (arg = NULL; ; ) {
-               la = *pos;
-               c = mdoc_argv(m, line, tok, &arg, pos, buf);
-
-               if (ARGV_WORD == c) {
-                       *pos = la;
-                       break;
-               }
-               if (ARGV_EOLN == c) 
-                       break;
-               if (ARGV_ARG == c)
-                       continue;
-
-               mdoc_argv_free(arg);
-               return(0);
+       struct roff_node        *n;
+       struct mdoc_arg         *arg;
+
+       if ((tok == MDOC_Pp || tok == MDOC_Lp) &&
+           ! (mdoc->flags & MDOC_SYNOPSIS)) {
+               n = mdoc->last;
+               if (mdoc->next == ROFF_NEXT_SIBLING)
+                       n = n->parent;
+               if (n->tok == MDOC_Nm)
+                       rew_last(mdoc, n->parent);

        }
 
        }
 

-       /* Open element scope. */
-
-       if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))
-               return(0);
-
-       /* Parse argument terms. */
-
-       for (;;) {
-               la = *pos;
-               ac = mdoc_args(m, line, pos, buf, tok, &p);
-
-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_EOLN == ac)
-                       break;
-
-               ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
-
-               if (MDOC_MAX == ntok) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
-                               return(0);
-                       continue;
-               }
-
-               if ( ! rew_elem(m, tok))
-                       return(0);
-               return(mdoc_macro(m, ntok, line, la, pos, buf));
+       if (buf[*pos] == '\0' &&
+           (tok == MDOC_Fd || *roff_name[tok] == '%')) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY,
+                   line, ppos, "%s", roff_name[tok]);
+               return;

        }
 
        }
 

-       /* Close out (no delimiters). */
-
-       return(rew_elem(m, tok));
+       mdoc_argv(mdoc, line, tok, &arg, pos, buf);
+       mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+       if (parse_rest(mdoc, tok, line, pos, buf))
+               return;
+       rew_elem(mdoc, tok);

 }
 
 }
 

-
-/* ARGSUSED */
+/*
+ * The simplest argument parser available: Parse the remaining
+ * words until the end of the phrase or line and return 0
+ * or until the next macro, call that macro, and return 1.
+ */

 static int
 static int

-ctx_synopsis(MACRO_PROT_ARGS)
+parse_rest(struct roff_man *mdoc, enum roff_tok tok,
+    int line, int *pos, char *buf)

 {
 {

+       char            *p;
+       int              done, la;
+       enum margserr    ac;

 
 

-       /* If we're not in the SYNOPSIS, go straight to in-line. */
-       if (SEC_SYNOPSIS != m->lastsec)
-               return(in_line(m, tok, line, ppos, pos, buf));
-
-       /* If we're a nested call, same place. */
-       if (ppos > 1)
-               return(in_line(m, tok, line, ppos, pos, buf));
-
-       /*
-        * XXX: this will open a block scope; however, if later we end
-        * up formatting the block scope, then child nodes will inherit
-        * the formatting.  Be careful.
-        */
-
-       return(blk_part_imp(m, tok, line, ppos, pos, buf));
+       for (;;) {
+               la = *pos;
+               ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
+               if (ac == ARGS_EOLN)
+                       return 0;
+               done = macro_or_word(mdoc, tok, line, la, pos, buf, p, 1);
+               if (ac == ARGS_ALLOC)
+                       free(p);
+               if (done)
+                       return 1;
+       }

 }
 
 }
 

-
-/* ARGSUSED */
-static int
-obsolete(MACRO_PROT_ARGS)
+static void
+ctx_synopsis(MACRO_PROT_ARGS)

 {
 
 {
 

-       return(mdoc_pwarn(m, line, ppos, EOBS));
+       if (~mdoc->flags & (MDOC_SYNOPSIS | MDOC_NEWLINE))
+               in_line(mdoc, tok, line, ppos, pos, buf);
+       else if (tok == MDOC_Nm)
+               blk_full(mdoc, tok, line, ppos, pos, buf);
+       else {
+               assert(tok == MDOC_Vt);
+               blk_part_imp(mdoc, tok, line, ppos, pos, buf);
+       }

 }
 
 }
 

-

 /*
  * Phrases occur within `Bl -column' entries, separated by `Ta' or tabs.
  * They're unusual because they're basically free-form text until a
  * macro is encountered.
  */
 /*
  * Phrases occur within `Bl -column' entries, separated by `Ta' or tabs.
  * They're unusual because they're basically free-form text until a
  * macro is encountered.
  */

-static int
-phrase(struct mdoc *m, int line, int ppos, char *buf)
+static void
+phrase_ta(MACRO_PROT_ARGS)

 {
 {

-       int              la, pos;
-       enum margerr     ac;
-       enum mdoct       ntok;
-       char            *p;
-
-       for (pos = ppos; ; ) {
-               la = pos;
-
-               /* Note: no calling context! */
-               ac = mdoc_zargs(m, line, &pos, buf, 0, &p);
-
-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_EOLN == ac)
-                       break;
+       struct roff_node *body, *n;

 
 

-               ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p);
+       /* Make sure we are in a column list or ignore this macro. */

 
 

-               if (MDOC_MAX == ntok) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
-                               return(0);
+       body = NULL;
+       for (n = mdoc->last; n != NULL; n = n->parent) {
+               if (n->flags & NODE_ENDED)

                        continue;
                        continue;

-               }
-
-               if ( ! mdoc_macro(m, ntok, line, la, &pos, buf))
-                       return(0);
-               return(append_delims(m, line, &pos, buf));
+               if (n->tok == MDOC_It && n->type == ROFFT_BODY)
+                       body = n;
+               if (n->tok == MDOC_Bl && n->end == ENDBODY_NOT)
+                       break;

        }
 
        }
 

-       return(1);
-}
+       if (n == NULL || n->norm->Bl.type != LIST_column) {
+               mandoc_msg(MANDOCERR_TA_STRAY, line, ppos, "Ta");
+               return;
+       }

 
 

+       /* Advance to the next column. */

 
 

+       rew_last(mdoc, body);
+       roff_body_alloc(mdoc, line, ppos, MDOC_It);
+       parse_rest(mdoc, TOKEN_NONE, line, pos, buf);
+}