enclosures sometimes cause bogus end-of-sentence

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 3c1dbdad3d97dcd18c3052a4e02186f1bdc3a103..618aaf53e176604b1f75e1d852ec9118768b993d 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,6 +1,6 @@
-/*     $Id: man.c,v 1.78 2010/06/26 16:07:08 kristaps Exp $ */
+/*     $Id: man.c,v 1.87 2010/08/20 01:02:07 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -21,14 +21,12 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "mandoc.h"
-#include "regs.h"
 #include "libman.h"
 #include "libmandoc.h"
 
@@ -42,6 +40,7 @@ const char *const __man_macronames[MAN_MAX] = {
        "nf",           "fi",           "r",            "RE",
        "RS",           "DT",           "UC",           "PD",
        "Sp",           "Vb",           "Ve",           "AT",
+       "in"
        };
 
 const  char * const *man_macronames = __man_macronames;
@@ -54,12 +53,9 @@ static       void             man_node_free(struct man_node *);
 static void             man_node_unlink(struct man *, 
                                struct man_node *);
 static int              man_ptext(struct man *, int, char *, int);
-static int              man_pmacro(struct man *, 
-                               const struct regset *regs,
-                               int, char *, int);
+static int              man_pmacro(struct man *, int, char *, int);
 static void             man_free1(struct man *);
 static void             man_alloc1(struct man *);
-static int              macrowarn(struct man *, int, const char *, int);
 
 
 const struct man_node *
@@ -97,7 +93,7 @@ man_free(struct man *man)
 
 
 struct man *
-man_alloc(void *data, int pflags, mandocmsg msg)
+man_alloc(struct regset *regs, void *data, mandocmsg msg)
 {
        struct man      *p;
 
@@ -105,8 +101,8 @@ man_alloc(void *data, int pflags, mandocmsg msg)
 
        man_hash_init();
        p->data = data;
-       p->pflags = pflags;
        p->msg = msg;
+       p->regs = regs;
 
        man_alloc1(p);
        return(p);
@@ -127,15 +123,14 @@ man_endparse(struct man *m)
 
 
 int
-man_parseln(struct man *m, const struct regset *regs,
-               int ln, char *buf, int offs)
+man_parseln(struct man *m, int ln, char *buf, int offs)
 {
 
        if (MAN_HALT & m->flags)
                return(0);
 
        return(('.' == buf[offs] || '\'' == buf[offs]) ? 
-                       man_pmacro(m, regs, ln, buf, offs) : 
+                       man_pmacro(m, ln, buf, offs) : 
                        man_ptext(m, ln, buf, offs));
 }
 
@@ -411,7 +406,7 @@ man_ptext(struct man *m, int line, char *buf, int offs)
         */
 
        assert(i);
-       if (mandoc_eos(buf, (size_t)i))
+       if (mandoc_eos(buf, (size_t)i, 0))
                m->last->flags |= MAN_EOS;
 
 descope:
@@ -437,22 +432,8 @@ descope:
 }
 
 
-static int
-macrowarn(struct man *m, int ln, const char *buf, int offs)
-{
-       int              rc;
-
-       rc = man_vmsg(m, MANDOCERR_MACRO, ln, offs, 
-                       "unknown macro: %s%s",
-                       buf, strlen(buf) > 3 ? "..." : "");
-
-       return(MAN_IGN_MACRO & m->pflags ? rc : 0);
-}
-
-
 int
-man_pmacro(struct man *m, const struct regset *regs,
-               int ln, char *buf, int offs)
+man_pmacro(struct man *m, int ln, char *buf, int offs)
 {
        int              i, j, ppos;
        enum mant        tok;
@@ -483,34 +464,21 @@ man_pmacro(struct man *m, const struct regset *regs,
 
        ppos = i;
 
-       /* Copy the first word into a nil-terminated buffer. */
-
-       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;
-               if ( ! man_pmsg(m, ln, i, MANDOCERR_BADCHAR))
-                       return(0);
-               i--;
-       }
+       /*
+        * Copy the first word into a nil-terminated buffer.
+        * Stop copying when a tab, space, or eoln is encountered.
+        */
 
+       j = 0;
+       while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i])
+               mac[j++] = buf[i++];
        mac[j] = '\0';
 
-       if (j == 4 || j < 1) {
-               if ( ! macrowarn(m, ln, mac, ppos))
-                       goto err;
-               return(1);
-       }
-       
-       if (MAN_MAX == (tok = man_hash_find(mac))) {
-               if ( ! macrowarn(m, ln, mac, ppos))
-                       goto err;
+       tok = (j > 0 && j < 4) ? man_hash_find(mac) : MAN_MAX;
+       if (MAN_MAX == tok) {
+               man_vmsg(m, MANDOCERR_MACRO, ln, ppos, 
+                   "unknown macro: %s%s",
+                   buf, strlen(buf) > 3 ? "..." : "");
                return(1);
        }
 
@@ -577,7 +545,7 @@ man_pmacro(struct man *m, const struct regset *regs,
        /* Call to handler... */
 
        assert(man_macros[tok].fp);
-       if ( ! (*man_macros[tok].fp)(m, regs, tok, ln, ppos, &i, buf))
+       if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &i, buf))
                goto err;
 
 out: