enclosures sometimes cause bogus end-of-sentence

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index bf65d919351ccdd13e29a00ca52952225eb9383b..618aaf53e176604b1f75e1d852ec9118768b993d 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.85 2010/08/07 20:57:33 kristaps Exp $ */
+/*     $Id: man.c,v 1.87 2010/08/20 01:02:07 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -56,7 +56,6 @@ static        int              man_ptext(struct man *, 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 *
@@ -94,8 +93,7 @@ man_free(struct man *man)
 
 
 struct man *
-man_alloc(struct regset *regs, void *data, 
-               int pflags, mandocmsg msg)
+man_alloc(struct regset *regs, void *data, mandocmsg msg)
 {
        struct man      *p;
 
@@ -103,7 +101,6 @@ man_alloc(struct regset *regs, void *data,
 
        man_hash_init();
        p->data = data;
-       p->pflags = pflags;
        p->msg = msg;
        p->regs = regs;
 
@@ -435,19 +432,6 @@ 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, int ln, char *buf, int offs)
 {
@@ -480,25 +464,21 @@ man_pmacro(struct man *m, int ln, char *buf, int offs)
 
        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;
+       /*
+        * 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);
        }