Correctly print `Lk' arguments in -Tascii. Issue raised by Aldis Berzoja.

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index b810735b9c6a41902dc4f6bcdf37ccce39e9b8df..d0e577a644ddd2c0d765f014cc121d3a4ed90a0a 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,6 +1,6 @@
-/*     $Id: man.c,v 1.76 2010/06/19 20:46:28 kristaps Exp $ */
+/*     $Id: man.c,v 1.86 2010/08/08 14:51:32 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,7 +21,6 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -41,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;
@@ -94,7 +94,8 @@ man_free(struct man *man)
 
 
 struct man *
-man_alloc(void *data, int pflags, mandocmsg msg)
+man_alloc(struct regset *regs, void *data, 
+               int pflags, mandocmsg msg)
 {
        struct man      *p;
 
@@ -104,6 +105,7 @@ man_alloc(void *data, int pflags, mandocmsg msg)
        p->data = data;
        p->pflags = pflags;
        p->msg = msg;
+       p->regs = regs;
 
        man_alloc1(p);
        return(p);
@@ -407,7 +409,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:
@@ -478,23 +480,14 @@ 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;
-
-               /* 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) {