Scaling factor made floating point (as per groff.7) and, e.g., gnu/usr.bin/cvs/man...

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 045fe792b0c19ac8628a1d1262f315971776f593..afc740db96a0558c9ccb158d76081b32a951a0ba 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.100 2009/08/18 14:27:16 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.107 2009/09/24 15:01:06 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
@@ -74,7 +76,8 @@ const char *const __mdoc_merrnames[MERRMAX] = {
        "unclosed explicit scope", /* EOPEN */
        "unterminated quoted phrase", /* EQUOTPHR */
        "closure macro without prior context", /* ENOCTX */
-       "no description found for library" /* ELIB */
+       "no description found for library", /* ELIB */
+       "bad child for parent context", /* EBADCHILD */
 };
 
 const  char *const __mdoc_macronames[MDOC_MAX] = {              
@@ -230,8 +233,6 @@ mdoc_free(struct mdoc *mdoc)
 {
 
        mdoc_free1(mdoc);
-       if (mdoc->htab)
-               mdoc_hash_free(mdoc->htab);
        free(mdoc);
 }
 
@@ -249,13 +250,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);
@@ -459,7 +459,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);
 }
 
 
@@ -474,7 +477,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);
 }
 
 
@@ -486,7 +492,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);
 }
 
 
@@ -502,7 +511,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);
 }
 
 
@@ -518,7 +530,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);
 }
 
 
@@ -543,7 +558,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);
 }
 
 
@@ -600,12 +618,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. */
 
@@ -630,7 +644,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. */ ;
@@ -669,7 +682,7 @@ macrowarn(struct mdoc *m, int ln, const char *buf)
 int
 parsemacro(struct mdoc *m, int ln, char *buf)
 {
-       int               i, j, c, ppos;
+       int               i, j, c;
        char              mac[5];
 
        /* Empty lines are ignored. */
@@ -689,8 +702,6 @@ parsemacro(struct mdoc *m, int ln, char *buf)
                        return(1);
        }
 
-       ppos = i;
-
        /* Copy the first word into a nil-terminated buffer. */
 
        for (j = 0; j < 4; j++, i++) {
@@ -698,6 +709,12 @@ parsemacro(struct mdoc *m, int ln, char *buf)
                        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[j] = 0;
@@ -708,7 +725,7 @@ parsemacro(struct mdoc *m, int ln, char *buf)
                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);
@@ -723,7 +740,7 @@ parsemacro(struct mdoc *m, int ln, char *buf)
         * 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, ppos, &i, buf)) 
+       if ( ! mdoc_macro(m, c, ln, 1, &i, buf)) 
                goto err;
 
        return(1);