catch up with the changed interface of mparse_alloc(), see mandoc.h rev 1.100

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 2f0cc8b8338f766b05ba021a04c9667cc9a27b10..ee7c36ddd4288690b2b33fb804f81ced7e174e0d 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,6 +1,7 @@
-/*     $Id: mdoc.c,v 1.142 2010/05/31 15:42:09 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.197 2012/05/27 17:48:57 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -21,13 +22,13 @@
 #include <sys/types.h>
 
 #include <assert.h>
 #include <sys/types.h>
 
 #include <assert.h>

-#include <ctype.h>

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 

+#include "mdoc.h"

 #include "mandoc.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"
 #include "libmandoc.h"


@@ -96,17 +97,18 @@ static      struct mdoc_node *node_alloc(struct mdoc *, int, int,
                                enum mdoct, enum mdoc_type);
 static int               node_append(struct mdoc *, 
                                struct mdoc_node *);
                                enum mdoct, enum mdoc_type);
 static int               node_append(struct mdoc *, 
                                struct mdoc_node *);

+#if 0
+static int               mdoc_preptext(struct mdoc *, int, char *, int);
+#endif

 static int               mdoc_ptext(struct mdoc *, int, char *, int);
 static int               mdoc_pmacro(struct mdoc *, int, char *, int);
 static int               mdoc_ptext(struct mdoc *, int, char *, int);
 static int               mdoc_pmacro(struct mdoc *, int, char *, int);

-static int               macrowarn(struct mdoc *, int, 
-                               const char *, int);
-

 
 const struct mdoc_node *
 mdoc_node(const struct mdoc *m)
 {
 
 
 const struct mdoc_node *
 mdoc_node(const struct mdoc *m)
 {
 

-       return(MDOC_HALT & m->flags ? NULL : m->first);
+       assert( ! (MDOC_HALT & m->flags));
+       return(m->first);

 }
 
 
 }
 
 


@@ -114,7 +116,8 @@ const struct mdoc_meta *
 mdoc_meta(const struct mdoc *m)
 {
 
 mdoc_meta(const struct mdoc *m)
 {
 

-       return(MDOC_HALT & m->flags ? NULL : &m->meta);
+       assert( ! (MDOC_HALT & m->flags));
+       return(&m->meta);

 }
 
 
 }
 
 


@@ -139,6 +142,8 @@ mdoc_free1(struct mdoc *mdoc)
                free(mdoc->meta.vol);
        if (mdoc->meta.msec)
                free(mdoc->meta.msec);
                free(mdoc->meta.vol);
        if (mdoc->meta.msec)
                free(mdoc->meta.msec);

+       if (mdoc->meta.date)
+               free(mdoc->meta.date);

 }
 
 
 }
 
 


@@ -155,6 +160,7 @@ mdoc_alloc1(struct mdoc *mdoc)
        mdoc->last = mandoc_calloc(1, sizeof(struct mdoc_node));
        mdoc->first = mdoc->last;
        mdoc->last->type = MDOC_ROOT;
        mdoc->last = mandoc_calloc(1, sizeof(struct mdoc_node));
        mdoc->first = mdoc->last;
        mdoc->last->type = MDOC_ROOT;

+       mdoc->last->tok = MDOC_MAX;

        mdoc->next = MDOC_NEXT_CHILD;
 }
 
        mdoc->next = MDOC_NEXT_CHILD;
 }
 


@@ -191,15 +197,15 @@ mdoc_free(struct mdoc *mdoc)
  * Allocate volatile and non-volatile parse resources.  
  */
 struct mdoc *
  * Allocate volatile and non-volatile parse resources.  
  */
 struct mdoc *

-mdoc_alloc(void *data, int pflags, mandocmsg msg)
+mdoc_alloc(struct roff *roff, struct mparse *parse, char *defos)

 {
        struct mdoc     *p;
 
        p = mandoc_calloc(1, sizeof(struct mdoc));
 
 {
        struct mdoc     *p;
 
        p = mandoc_calloc(1, sizeof(struct mdoc));
 

-       p->msg = msg;
-       p->data = data;
-       p->pflags = pflags;
+       p->parse = parse;
+       p->defos = defos;
+       p->roff = roff;

 
        mdoc_hash_init();
        mdoc_alloc1(p);
 
        mdoc_hash_init();
        mdoc_alloc1(p);


@@ -215,78 +221,125 @@ int
 mdoc_endparse(struct mdoc *m)
 {
 
 mdoc_endparse(struct mdoc *m)
 {
 

-       if (MDOC_HALT & m->flags)
-               return(0);
-       else if (mdoc_macroend(m))
+       assert( ! (MDOC_HALT & m->flags));
+       if (mdoc_macroend(m))

                return(1);
        m->flags |= MDOC_HALT;
        return(0);
 }
 
                return(1);
        m->flags |= MDOC_HALT;
        return(0);
 }
 

+int
+mdoc_addeqn(struct mdoc *m, const struct eqn *ep)
+{
+       struct mdoc_node *n;
+
+       assert( ! (MDOC_HALT & m->flags));
+
+       /* No text before an initial macro. */
+
+       if (SEC_NONE == m->lastnamed) {
+               mdoc_pmsg(m, ep->ln, ep->pos, MANDOCERR_NOTEXT);
+               return(1);
+       }
+
+       n = node_alloc(m, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN);
+       n->eqn = ep;
+
+       if ( ! node_append(m, n))
+               return(0);
+
+       m->next = MDOC_NEXT_SIBLING;
+       return(1);
+}

 
 

-/*
- * Main parse routine.  Parses a single line -- really just hands off to
- * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).
- */

 int
 int

-mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)
+mdoc_addspan(struct mdoc *m, const struct tbl_span *sp)

 {
 {

+       struct mdoc_node *n;
+
+       assert( ! (MDOC_HALT & m->flags));
+
+       /* No text before an initial macro. */
+
+       if (SEC_NONE == m->lastnamed) {
+               mdoc_pmsg(m, sp->line, 0, MANDOCERR_NOTEXT);
+               return(1);
+       }

 
 

-       if (MDOC_HALT & m->flags)
+       n = node_alloc(m, sp->line, 0, MDOC_MAX, MDOC_TBL);
+       n->span = sp;
+
+       if ( ! node_append(m, n))

                return(0);
 
                return(0);
 

-       m->flags |= MDOC_NEWLINE;
-       return(('.' == buf[offs] || '\'' == buf[offs]) ? 
-                       mdoc_pmacro(m, ln, buf, offs) :
-                       mdoc_ptext(m, ln, buf, offs));
+       m->next = MDOC_NEXT_SIBLING;
+       return(1);

 }
 
 
 }
 
 

+/*
+ * Main parse routine.  Parses a single line -- really just hands off to
+ * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).
+ */

 int
 int

-mdoc_vmsg(struct mdoc *mdoc, enum mandocerr t, 
-               int ln, int pos, const char *fmt, ...)
+mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)

 {
 {

-       char             buf[256];
-       va_list          ap;

 
 

-       va_start(ap, fmt);
-       vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-       va_end(ap);
+       assert( ! (MDOC_HALT & m->flags));

 
 

-       return((*mdoc->msg)(t, mdoc->data, ln, pos, buf));
-}
+       m->flags |= MDOC_NEWLINE;

 
 

+       /*
+        * Let the roff nS register switch SYNOPSIS mode early,
+        * such that the parser knows at all times
+        * whether this mode is on or off.
+        * Note that this mode is also switched by the Sh macro.
+        */
+       if (roff_regisset(m->roff, REG_nS)) {
+               if (roff_regget(m->roff, REG_nS))
+                       m->flags |= MDOC_SYNOPSIS;
+               else
+                       m->flags &= ~MDOC_SYNOPSIS;
+       }
+
+       return(mandoc_getcontrol(buf, &offs) ?
+                       mdoc_pmacro(m, ln, buf, offs) :
+                       mdoc_ptext(m, ln, buf, offs));
+}

 
 int
 
 int

-mdoc_macro(struct mdoc *m, enum mdoct tok, 
-               int ln, int pp, int *pos, char *buf)
+mdoc_macro(MACRO_PROT_ARGS)

 {
        assert(tok < MDOC_MAX);
 
        /* If we're in the body, deny prologue calls. */
 
        if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
 {
        assert(tok < MDOC_MAX);
 
        /* If we're in the body, deny prologue calls. */
 
        if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 

-                       MDOC_PBODY & m->flags)
-               return(mdoc_pmsg(m, ln, pp, MANDOCERR_BADBODY));
+                       MDOC_PBODY & m->flags) {
+               mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY);
+               return(1);
+       }

 
        /* If we're in the prologue, deny "body" macros.  */
 
        if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
                        ! (MDOC_PBODY & m->flags)) {
 
        /* If we're in the prologue, deny "body" macros.  */
 
        if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
                        ! (MDOC_PBODY & m->flags)) {

-               if ( ! mdoc_pmsg(m, ln, pp, MANDOCERR_BADPROLOG))
-                       return(0);
+               mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG);
+               if (NULL == m->meta.msec)
+                       m->meta.msec = mandoc_strdup("1");

                if (NULL == m->meta.title)
                        m->meta.title = mandoc_strdup("UNKNOWN");
                if (NULL == m->meta.vol)
                        m->meta.vol = mandoc_strdup("LOCAL");
                if (NULL == m->meta.os)
                        m->meta.os = mandoc_strdup("LOCAL");
                if (NULL == m->meta.title)
                        m->meta.title = mandoc_strdup("UNKNOWN");
                if (NULL == m->meta.vol)
                        m->meta.vol = mandoc_strdup("LOCAL");
                if (NULL == m->meta.os)
                        m->meta.os = mandoc_strdup("LOCAL");

-               if (0 == m->meta.date)
-                       m->meta.date = time(NULL);
+               if (NULL == m->meta.date)
+                       m->meta.date = mandoc_normdate
+                               (m->parse, NULL, line, ppos);

                m->flags |= MDOC_PBODY;
        }
 
                m->flags |= MDOC_PBODY;
        }
 

-       return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf));
+       return((*mdoc_macros[tok].fp)(m, tok, line, ppos, pos, buf));

 }
 
 
 }
 
 


@@ -315,10 +368,25 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
 
        p->parent->nchild++;
 
 
        p->parent->nchild++;
 

+       /*
+        * Copy over the normalised-data pointer of our parent.  Not
+        * everybody has one, but copying a null pointer is fine.
+        */
+
+       switch (p->type) {
+       case (MDOC_BODY):
+               /* FALLTHROUGH */
+       case (MDOC_TAIL):
+               /* FALLTHROUGH */
+       case (MDOC_HEAD):
+               p->norm = p->parent->norm;
+               break;
+       default:
+               break;
+       }
+

        if ( ! mdoc_valid_pre(mdoc, p))
                return(0);
        if ( ! mdoc_valid_pre(mdoc, p))
                return(0);

-       if ( ! mdoc_action_pre(mdoc, p))
-               return(0);

 
        switch (p->type) {
        case (MDOC_HEAD):
 
        switch (p->type) {
        case (MDOC_HEAD):


@@ -330,6 +398,8 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
                p->parent->tail = p;
                break;
        case (MDOC_BODY):
                p->parent->tail = p;
                break;
        case (MDOC_BODY):

+               if (p->end)
+                       break;

                assert(MDOC_BLOCK == p->parent->type);
                p->parent->body = p;
                break;
                assert(MDOC_BLOCK == p->parent->type);
                p->parent->body = p;
                break;


@@ -340,11 +410,11 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
        mdoc->last = p;
 
        switch (p->type) {
        mdoc->last = p;
 
        switch (p->type) {

+       case (MDOC_TBL):
+               /* FALLTHROUGH */

        case (MDOC_TEXT):
                if ( ! mdoc_valid_post(mdoc))
                        return(0);
        case (MDOC_TEXT):
                if ( ! mdoc_valid_post(mdoc))
                        return(0);

-               if ( ! mdoc_action_post(mdoc))
-                       return(0);

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


@@ -366,9 +436,17 @@ node_alloc(struct mdoc *m, int line, int pos,
        p->pos = pos;
        p->tok = tok;
        p->type = type;
        p->pos = pos;
        p->tok = tok;
        p->type = type;

+
+       /* Flag analysis. */
+
+       if (MDOC_SYNOPSIS & m->flags)
+               p->flags |= MDOC_SYNPRETTY;
+       else
+               p->flags &= ~MDOC_SYNPRETTY;

        if (MDOC_NEWLINE & m->flags)
                p->flags |= MDOC_LINE;
        m->flags &= ~MDOC_NEWLINE;
        if (MDOC_NEWLINE & m->flags)
                p->flags |= MDOC_LINE;
        m->flags &= ~MDOC_NEWLINE;

+

        return(p);
 }
 
        return(p);
 }
 


@@ -415,6 +493,22 @@ mdoc_body_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
 }
 
 
 }
 
 

+int
+mdoc_endbody_alloc(struct mdoc *m, int line, int pos, enum mdoct tok,
+               struct mdoc_node *body, enum mdoc_endbody end)
+{
+       struct mdoc_node *p;
+
+       p = node_alloc(m, line, pos, tok, MDOC_BODY);
+       p->pending = body;
+       p->end = end;
+       if ( ! node_append(m, p))
+               return(0);
+       m->next = MDOC_NEXT_SIBLING;
+       return(1);
+}
+
+

 int
 mdoc_block_alloc(struct mdoc *m, int line, int pos, 
                enum mdoct tok, struct mdoc_arg *args)
 int
 mdoc_block_alloc(struct mdoc *m, int line, int pos, 
                enum mdoct tok, struct mdoc_arg *args)


@@ -425,6 +519,21 @@ mdoc_block_alloc(struct mdoc *m, int line, int pos,
        p->args = args;
        if (p->args)
                (args->refcnt)++;
        p->args = args;
        if (p->args)
                (args->refcnt)++;

+
+       switch (tok) {
+       case (MDOC_Bd):
+               /* FALLTHROUGH */
+       case (MDOC_Bf):
+               /* FALLTHROUGH */
+       case (MDOC_Bl):
+               /* FALLTHROUGH */
+       case (MDOC_Rs):
+               p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
+               break;
+       default:
+               break;
+       }
+

        if ( ! node_append(m, p))
                return(0);
        m->next = MDOC_NEXT_CHILD;
        if ( ! node_append(m, p))
                return(0);
        m->next = MDOC_NEXT_CHILD;


@@ -442,27 +551,28 @@ mdoc_elem_alloc(struct mdoc *m, int line, int pos,
        p->args = args;
        if (p->args)
                (args->refcnt)++;
        p->args = args;
        if (p->args)
                (args->refcnt)++;

+
+       switch (tok) {
+       case (MDOC_An):
+               p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
+               break;
+       default:
+               break;
+       }
+

        if ( ! node_append(m, p))
                return(0);
        m->next = MDOC_NEXT_CHILD;
        return(1);
 }
 
        if ( ! node_append(m, p))
                return(0);
        m->next = MDOC_NEXT_CHILD;
        return(1);
 }
 

-

 int
 mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
 {
        struct mdoc_node *n;
 int
 mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
 {
        struct mdoc_node *n;

-       size_t            sv, len;
-
-       len = strlen(p);

 
        n = node_alloc(m, line, pos, MDOC_MAX, MDOC_TEXT);
 
        n = node_alloc(m, line, pos, MDOC_MAX, MDOC_TEXT);

-       n->string = mandoc_malloc(len + 1);
-       sv = strlcpy(n->string, p, len + 1);
-
-       /* Prohibit truncation. */
-       assert(sv < len + 1);
+       n->string = roff_strdup(m->roff, p);

 
        if ( ! node_append(m, n))
                return(0);
 
        if ( ! node_append(m, n))
                return(0);


@@ -472,10 +582,12 @@ mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
 }
 
 
 }
 
 

-void
+static void

 mdoc_node_free(struct mdoc_node *p)
 {
 
 mdoc_node_free(struct mdoc_node *p)
 {
 

+       if (MDOC_BLOCK == p->type || MDOC_ELEM == p->type)
+               free(p->norm);

        if (p->string)
                free(p->string);
        if (p->args)
        if (p->string)
                free(p->string);
        if (p->args)


@@ -501,6 +613,8 @@ mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n)
                n->parent->nchild--;
                if (n->parent->child == n)
                        n->parent->child = n->prev ? n->prev : n->next;
                n->parent->nchild--;
                if (n->parent->child == n)
                        n->parent->child = n->prev ? n->prev : n->next;

+               if (n->parent->last == n)
+                       n->parent->last = n->prev ? n->prev : NULL;

        }
 
        /* Adjust parse point, if applicable. */
        }
 
        /* Adjust parse point, if applicable. */


@@ -534,6 +648,59 @@ mdoc_node_delete(struct mdoc *m, struct mdoc_node *p)
        mdoc_node_free(p);
 }
 
        mdoc_node_free(p);
 }
 

+#if 0
+/*
+ * Pre-treat a text line.
+ * Text lines can consist of equations, which must be handled apart from
+ * the regular text.
+ * Thus, use this function to step through a line checking if it has any
+ * equations embedded in it.
+ * This must handle multiple equations AND equations that do not end at
+ * the end-of-line, i.e., will re-enter in the next roff parse.
+ */
+static int
+mdoc_preptext(struct mdoc *m, int line, char *buf, int offs)
+{
+       char            *start, *end;
+       char             delim;
+
+       while ('\0' != buf[offs]) {
+               /* Mark starting position if eqn is set. */
+               start = NULL;
+               if ('\0' != (delim = roff_eqndelim(m->roff)))
+                       if (NULL != (start = strchr(buf + offs, delim)))
+                               *start++ = '\0';
+
+               /* Parse text as normal. */
+               if ( ! mdoc_ptext(m, line, buf, offs))
+                       return(0);
+
+               /* Continue only if an equation exists. */
+               if (NULL == start)
+                       break;
+
+               /* Read past the end of the equation. */
+               offs += start - (buf + offs);
+               assert(start == &buf[offs]);
+               if (NULL != (end = strchr(buf + offs, delim))) {
+                       *end++ = '\0';
+                       while (' ' == *end)
+                               end++;
+               }
+
+               /* Parse the equation itself. */
+               roff_openeqn(m->roff, NULL, line, offs, buf);
+
+               /* Process a finished equation? */
+               if (roff_closeeqn(m->roff))
+                       if ( ! mdoc_addeqn(m, roff_eqn(m->roff)))
+                               return(0);
+               offs += (end - (buf + offs));
+       } 
+
+       return(1);
+}
+#endif

 
 /*
  * Parse free-form text, that is, a line that does not begin with the
 
 /*
  * Parse free-form text, that is, a line that does not begin with the


@@ -545,29 +712,26 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
        char             *c, *ws, *end;
        struct mdoc_node *n;
 
        char             *c, *ws, *end;
        struct mdoc_node *n;
 

-       /* Ignore bogus comments. */
-
-       if ('\\' == buf[offs] && 
-                       '.' == buf[offs + 1] && 
-                       '"' == buf[offs + 2])
-               return(mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT));
-

        /* No text before an initial macro. */
 
        /* No text before an initial macro. */
 

-       if (SEC_NONE == m->lastnamed)
-               return(mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT));
+       if (SEC_NONE == m->lastnamed) {
+               mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT);
+               return(1);
+       }

 
        assert(m->last);
        n = m->last;
 
        /*
 
        assert(m->last);
        n = m->last;
 
        /*

-        * Diver directly into list processing if we're encountering a
+        * Divert directly to list processing if we're encountering a

         * columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry
         * columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry

-        * (if it's a MDOC_BODY that means it's open, in which case we
-        * should process within its context).
+        * (a MDOC_BODY means it's already open, in which case we should
+        * process within its context in the normal way).

         */
 
         */
 

-       if (MDOC_Bl == n->tok && LIST_column == n->data.list) {
+       if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
+                       LIST_column == n->norm->Bl.type) {
+               /* `Bl' is open without any children. */

                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
        }
                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
        }


@@ -575,7 +739,8 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
                        NULL != n->parent &&
                        MDOC_Bl == n->parent->tok &&
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
                        NULL != n->parent &&
                        MDOC_Bl == n->parent->tok &&

-                       LIST_column == n->parent->data.list) {
+                       LIST_column == n->parent->norm->Bl.type) {
+               /* `Bl' has block-level `It' children. */

                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
        }
                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
        }


@@ -589,10 +754,6 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
        ws = NULL;
        for (c = end = buf + offs; *c; c++) {
                switch (*c) {
        ws = NULL;
        for (c = end = buf + offs; *c; c++) {
                switch (*c) {

-               case '-':
-                       if (mandoc_hyph(buf + offs, c))
-                               *c = ASCII_HYPH;
-                       break;

                case ' ':
                        if (NULL == ws)
                                ws = c;
                case ' ':
                        if (NULL == ws)
                                ws = c;


@@ -626,19 +787,17 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
        *end = '\0';
 
        if (ws)
        *end = '\0';
 
        if (ws)

-               if ( ! mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE))
-                       return(0);
+               mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE);

 
        if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) {
 
        if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) {

-               if ( ! mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN))
-                       return(0);
+               mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN);

 
                /*
 
                /*

-                * Insert a `Pp' in the case of a blank line.  Technically,
+                * Insert a `sp' in the case of a blank line.  Technically,

                 * blank lines aren't allowed, but enough manuals assume this
                 * behaviour that we want to work around it.
                 */
                 * blank lines aren't allowed, but enough manuals assume this
                 * behaviour that we want to work around it.
                 */

-               if ( ! mdoc_elem_alloc(m, line, offs, MDOC_Pp, NULL))
+               if ( ! mdoc_elem_alloc(m, line, offs, MDOC_sp, NULL))

                        return(0);
 
                m->next = MDOC_NEXT_SIBLING;
                        return(0);
 
                m->next = MDOC_NEXT_SIBLING;


@@ -659,109 +818,119 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
 
        assert(buf < end);
 
 
        assert(buf < end);
 

-       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))
+       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs), 0))

                m->last->flags |= MDOC_EOS;
 
        return(1);
 }
 
 
                m->last->flags |= MDOC_EOS;
 
        return(1);
 }
 
 

-static int
-macrowarn(struct mdoc *m, int ln, const char *buf, int offs)
-{
-       int              rc;
-
-       rc = mdoc_vmsg(m, MANDOCERR_MACRO, ln, offs, 
-                       "unknown macro: %s%s", 
-                       buf, strlen(buf) > 3 ? "..." : "");
-
-       /* FIXME: logic should be in driver. */
-       return(MDOC_IGN_MACRO & m->pflags ? rc : 0);
-}
-
-

 /*
  * Parse a macro line, that is, a line beginning with the control
  * character.
  */
 /*
  * Parse a macro line, that is, a line beginning with the control
  * character.
  */

-int
+static int

 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 {
 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 {

-       enum mdoct      tok;
-       int             i, j, sv;
-       char            mac[5];
-
-       /* Empty lines are ignored. */
+       enum mdoct        tok;
+       int               i, sv;
+       char              mac[5];
+       struct mdoc_node *n;

 
 

-       offs++;
+       /* Empty post-control lines are ignored. */

 
 

-       if ('\0' == buf[offs])
+       if ('"' == buf[offs]) {
+               mdoc_pmsg(m, ln, offs, MANDOCERR_BADCOMMENT);
+               return(1);
+       } else if ('\0' == buf[offs])

                return(1);
 
                return(1);
 

-       i = offs;
+       sv = offs;
+
+       /* 
+        * Copy the first word into a nil-terminated buffer.
+        * Stop copying when a tab, space, or eoln is encountered.
+        */
+
+       i = 0;
+       while (i < 4 && '\0' != buf[offs] && 
+                       ' ' != buf[offs] && '\t' != buf[offs])
+               mac[i++] = buf[offs++];

 
 

-       /* Accept whitespace after the initial control char. */
+       mac[i] = '\0';

 
 

-       if (' ' == buf[i]) {
-               i++;
-               while (buf[i] && ' ' == buf[i])
-                       i++;
-               if ('\0' == buf[i])
-                       return(1);
+       tok = (i > 1 || i < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
+
+       if (MDOC_MAX == tok) {
+               mandoc_vmsg(MANDOCERR_MACRO, m->parse, 
+                               ln, sv, "%s", buf + sv - 1);
+               return(1);

        }
 
        }
 

-       sv = i;
+       /* Disregard the first trailing tab, if applicable. */

 
 

-       /* Copy the first word into a nil-terminated buffer. */
+       if ('\t' == buf[offs])
+               offs++;

 
 

-       for (j = 0; j < 4; j++, i++) {
-               if ('\0' == (mac[j] = buf[i]))
-                       break;
-               else if (' ' == buf[i])
-                       break;
+       /* Jump to the next non-whitespace word. */

 
 

-               /* Check for invalid characters. */
+       while (buf[offs] && ' ' == buf[offs])
+               offs++;

 
 

-               if (isgraph((u_char)buf[i]))
-                       continue;
-               if ( ! mdoc_pmsg(m, ln, i, MANDOCERR_BADCHAR))
-                       return(0);
-               i--;
-       }
+       /* 
+        * Trailing whitespace.  Note that tabs are allowed to be passed
+        * into the parser as "text", so we only warn about spaces here.
+        */

 
 

-       mac[j] = '\0';
+       if ('\0' == buf[offs] && ' ' == buf[offs - 1])
+               mdoc_pmsg(m, ln, offs - 1, MANDOCERR_EOLNSPACE);

 
 

-       if (j == 4 || j < 2) {
-               if ( ! macrowarn(m, ln, mac, sv))
-                       goto err;
-               return(1);
-       } 
-       
-       if (MDOC_MAX == (tok = mdoc_hash_find(mac))) {
-               if ( ! macrowarn(m, ln, mac, sv))
+       /*
+        * If an initial macro or a list invocation, divert directly
+        * into macro processing.
+        */
+
+       if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) {
+               if ( ! mdoc_macro(m, tok, ln, sv, &offs, buf)) 

                        goto err;
                return(1);
        }
 
                        goto err;
                return(1);
        }
 

-       /* The macro is sane.  Jump to the next word. */
-
-       while (buf[i] && ' ' == buf[i])
-               i++;
+       n = m->last;
+       assert(m->last);

 
 

-       /* 
-        * Trailing whitespace.  Note that tabs are allowed to be passed
-        * into the parser as "text", so we only warn about spaces here.
+       /*
+        * If the first macro of a `Bl -column', open an `It' block
+        * context around the parsed macro.

         */
 
         */
 

-       if ('\0' == buf[i] && ' ' == buf[i - 1])
-               if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE))
+       if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
+                       LIST_column == n->norm->Bl.type) {
+               m->flags |= MDOC_FREECOL;
+               if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf))

                        goto err;
                        goto err;

+               return(1);
+       }

 
 

-       /* 
-        * Begin recursive parse sequence.  Since we're at the start of
-        * the line, we don't need to do callable/parseable checks.
+       /*
+        * If we're following a block-level `It' within a `Bl -column'
+        * context (perhaps opened in the above block or in ptext()),
+        * then open an `It' block context around the parsed macro.

         */
         */

-       if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) 
+
+       if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
+                       NULL != n->parent &&
+                       MDOC_Bl == n->parent->tok &&
+                       LIST_column == n->parent->norm->Bl.type) {
+               m->flags |= MDOC_FREECOL;
+               if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
+                       goto err;
+               return(1);
+       }
+
+       /* Normal processing of a macro. */
+
+       if ( ! mdoc_macro(m, tok, ln, sv, &offs, buf)) 

                goto err;
 
        return(1);
                goto err;
 
        return(1);


@@ -772,4 +941,48 @@ err:       /* Error out. */
        return(0);
 }
 
        return(0);
 }
 

+enum mdelim
+mdoc_isdelim(const char *p)
+{
+
+       if ('\0' == p[0])
+               return(DELIM_NONE);
+
+       if ('\0' == p[1])
+               switch (p[0]) {
+               case('('):
+                       /* FALLTHROUGH */
+               case('['):
+                       return(DELIM_OPEN);
+               case('|'):
+                       return(DELIM_MIDDLE);
+               case('.'):
+                       /* FALLTHROUGH */
+               case(','):
+                       /* FALLTHROUGH */
+               case(';'):
+                       /* FALLTHROUGH */
+               case(':'):
+                       /* FALLTHROUGH */
+               case('?'):
+                       /* FALLTHROUGH */
+               case('!'):
+                       /* FALLTHROUGH */
+               case(')'):
+                       /* FALLTHROUGH */
+               case(']'):
+                       return(DELIM_CLOSE);
+               default:
+                       return(DELIM_NONE);
+               }
+
+       if ('\\' != p[0])
+               return(DELIM_NONE);
+
+       if (0 == strcmp(p + 1, "."))
+               return(DELIM_CLOSE);
+       if (0 == strcmp(p + 1, "*(Ba"))
+               return(DELIM_MIDDLE);

 
 

+       return(DELIM_NONE);
+}