Fixed body/divbody structure of html pages.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index ae7e663a9849c72bad0d80184f071519c04a3e7e..1d63fb837a75859f9f4536effa8e39b2a278d1bb 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.93 2009/07/17 10:56:57 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.105 2009/09/16 14:40:56 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -25,13 +25,10 @@
 
 const  char *const __mdoc_merrnames[MERRMAX] = {                
        "trailing whitespace", /* ETAILWS */
-       "empty last list column", /* ECOLEMPTY */
-       "argument-like parameter", /* EARGVPARM */
        "unexpected quoted parameter", /* EQUOTPARM */
        "unterminated quoted parameter", /* EQUOTTERM */
        "system: malloc error", /* EMALLOC */
        "argument parameter suggested", /* EARGVAL */
-       "macro not callable", /* ENOCALL */
        "macro disallowed in prologue", /* EBODYPROL */
        "macro disallowed in body", /* EPROLBODY */
        "text disallowed in prologue", /* ETEXTPROL */
@@ -72,13 +69,11 @@ const       char *const __mdoc_merrnames[MERRMAX] = {
        "superfluous width argument", /* ENOWIDTH */
        "system: utsname error", /* EUTSNAME */
        "obsolete macro", /* EOBS */
-       "macro-like parameter", /* EMACPARM */
        "end-of-line scope violation", /* EIMPBRK */
        "empty macro ignored", /* EIGNE */
        "unclosed explicit scope", /* EOPEN */
        "unterminated quoted phrase", /* EQUOTPHR */
        "closure macro without prior context", /* ENOCTX */
-       "invalid whitespace after control character", /* ESPACE */
        "no description found for library" /* ELIB */
 };
 
@@ -235,8 +230,6 @@ mdoc_free(struct mdoc *mdoc)
 {
 
        mdoc_free1(mdoc);
-       if (mdoc->htab)
-               mdoc_hash_free(mdoc->htab);
        free(mdoc);
 }
 
@@ -254,13 +247,12 @@ mdoc_alloc(void *data, int pflags, const struct mdoc_cb *cb)
        if (cb)
                (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
 
+       mdoc_hash_init();
+
        p->data = data;
        p->pflags = pflags;
 
-       if (NULL == (p->htab = mdoc_hash_alloc())) {
-               free(p);
-               return(NULL);
-       } else if (mdoc_alloc1(p))
+       if (mdoc_alloc1(p))
                return(p);
 
        free(p);
@@ -355,7 +347,10 @@ int
 mdoc_macro(struct mdoc *m, int tok, 
                int ln, int pp, int *pos, char *buf)
 {
-
+       /*
+        * If we're in the prologue, deny "body" macros.  Similarly, if
+        * we're in the body, deny prologue calls.
+        */
        if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
                        MDOC_PBODY & m->flags)
                return(mdoc_perr(m, ln, pp, EPROLBODY));
@@ -363,9 +358,6 @@ mdoc_macro(struct mdoc *m, int tok,
                        ! (MDOC_PBODY & m->flags))
                return(mdoc_perr(m, ln, pp, EBODYPROL));
 
-       if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))
-               return(mdoc_perr(m, ln, pp, ENOCALL));
-
        return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf));
 }
 
@@ -464,7 +456,10 @@ mdoc_tail_alloc(struct mdoc *m, int line, int pos, int tok)
        p = node_alloc(m, line, pos, tok, MDOC_TAIL);
        if (NULL == p)
                return(0);
-       return(node_append(m, p));
+       if ( ! node_append(m, p))
+               return(0);
+       m->next = MDOC_NEXT_CHILD;
+       return(1);
 }
 
 
@@ -479,7 +474,10 @@ mdoc_head_alloc(struct mdoc *m, int line, int pos, int tok)
        p = node_alloc(m, line, pos, tok, MDOC_HEAD);
        if (NULL == p)
                return(0);
-       return(node_append(m, p));
+       if ( ! node_append(m, p))
+               return(0);
+       m->next = MDOC_NEXT_CHILD;
+       return(1);
 }
 
 
@@ -491,7 +489,10 @@ mdoc_body_alloc(struct mdoc *m, int line, int pos, int tok)
        p = node_alloc(m, line, pos, tok, MDOC_BODY);
        if (NULL == p)
                return(0);
-       return(node_append(m, p));
+       if ( ! node_append(m, p))
+               return(0);
+       m->next = MDOC_NEXT_CHILD;
+       return(1);
 }
 
 
@@ -507,7 +508,10 @@ mdoc_block_alloc(struct mdoc *m, int line, int pos,
        p->args = args;
        if (p->args)
                (args->refcnt)++;
-       return(node_append(m, p));
+       if ( ! node_append(m, p))
+               return(0);
+       m->next = MDOC_NEXT_CHILD;
+       return(1);
 }
 
 
@@ -523,7 +527,10 @@ mdoc_elem_alloc(struct mdoc *m, int line, int pos,
        p->args = args;
        if (p->args)
                (args->refcnt)++;
-       return(node_append(m, p));
+       if ( ! node_append(m, p))
+               return(0);
+       m->next = MDOC_NEXT_CHILD;
+       return(1);
 }
 
 
@@ -548,7 +555,10 @@ pstring(struct mdoc *m, int line, int pos, const char *p, size_t len)
        /* Prohibit truncation. */
        assert(sv < len + 1);
 
-       return(node_append(m, n));
+       if ( ! node_append(m, n))
+               return(0);
+       m->next = MDOC_NEXT_SIBLING;
+       return(1);
 }
 
 
@@ -605,12 +615,8 @@ parsetext(struct mdoc *m, int line, char *buf)
         * back-end, as it should be preserved as a single term.
         */
 
-       if (MDOC_LITERAL & m->flags) {
-               if ( ! mdoc_word_alloc(m, line, 0, buf))
-                       return(0);
-               m->next = MDOC_NEXT_SIBLING;
-               return(1);
-       }
+       if (MDOC_LITERAL & m->flags)
+               return(mdoc_word_alloc(m, line, 0, buf));
 
        /* Disallow blank/white-space lines in non-literal mode. */
 
@@ -635,7 +641,6 @@ parsetext(struct mdoc *m, int line, char *buf)
                buf[i++] = 0;
                if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
                        return(0);
-               m->next = MDOC_NEXT_SIBLING;
 
                for ( ; ' ' == buf[i]; i++)
                        /* Skip trailing whitespace. */ ;
@@ -659,10 +664,10 @@ static int
 macrowarn(struct mdoc *m, int ln, const char *buf)
 {
        if ( ! (MDOC_IGN_MACRO & m->pflags))
-               return(mdoc_verr(m, ln, 1, 
+               return(mdoc_verr(m, ln, 0, 
                                "unknown macro: %s%s", 
                                buf, strlen(buf) > 3 ? "..." : ""));
-       return(mdoc_vwarn(m, ln, 1, "unknown macro: %s%s",
+       return(mdoc_vwarn(m, ln, 0, "unknown macro: %s%s",
                                buf, strlen(buf) > 3 ? "..." : ""));
 }
 
@@ -674,7 +679,7 @@ macrowarn(struct mdoc *m, int ln, const char *buf)
 int
 parsemacro(struct mdoc *m, int ln, char *buf)
 {
-       int               i, c;
+       int               i, j, c;
        char              mac[5];
 
        /* Empty lines are ignored. */
@@ -682,33 +687,42 @@ parsemacro(struct mdoc *m, int ln, char *buf)
        if (0 == buf[1])
                return(1);
 
-       if (' ' == buf[1]) {
-               i = 2;
+       i = 1;
+
+       /* Accept whitespace after the initial control char. */
+
+       if (' ' == buf[i]) {
+               i++;
                while (buf[i] && ' ' == buf[i])
                        i++;
                if (0 == buf[i])
                        return(1);
-               return(mdoc_perr(m, ln, 1, ESPACE));
        }
 
        /* Copy the first word into a nil-terminated buffer. */
 
-       for (i = 1; i < 5; i++) {
-               if (0 == (mac[i - 1] = buf[i]))
+       for (j = 0; j < 4; j++, i++) {
+               if (0 == (mac[j] = buf[i]))
                        break;
                else if (' ' == buf[i])
                        break;
+
+               /* Check for invalid characters. */
+
+               if (isgraph((u_char)buf[i]))
+                       continue;
+               return(mdoc_perr(m, ln, i, EPRINT));
        }
 
-       mac[i - 1] = 0;
+       mac[j] = 0;
 
-       if (i == 5 || i <= 2) {
+       if (j == 4 || j < 2) {
                if ( ! macrowarn(m, ln, mac))
                        goto err;
                return(1);
        } 
        
-       if (MDOC_MAX == (c = mdoc_hash_find(m->htab, mac))) {
+       if (MDOC_MAX == (c = mdoc_hash_find(mac))) {
                if ( ! macrowarn(m, ln, mac))
                        goto err;
                return(1);
@@ -719,8 +733,10 @@ parsemacro(struct mdoc *m, int ln, char *buf)
        while (buf[i] && ' ' == buf[i])
                i++;
 
-       /* Begin recursive parse sequence. */
-
+       /* 
+        * Begin recursive parse sequence.  Since we're at the start of
+        * the line, we don't need to do callable/parseable checks.
+        */
        if ( ! mdoc_macro(m, c, ln, 1, &i, buf)) 
                goto err;
 
@@ -731,3 +747,5 @@ err:        /* Error out. */
        m->flags |= MDOC_HALT;
        return(0);
 }
+
+