merge from OpenBSD mdoc_term.c rev. 1.100:

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 0bdff79085bd7f4d4555de26d3e461e69e2f5443..b35d7e079a90e4f5b631c04114d62f594b697407 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,6 +1,6 @@
-/*     $Id: man.c,v 1.79 2010/06/27 15:52:41 kristaps Exp $ */
+/*     $Id: man.c,v 1.84 2010/07/22 23:03:15 kristaps 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
@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "mandoc.h"
-#include "regs.h"
 #include "libman.h"
 #include "libmandoc.h"
 
@@ -42,6 +41,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;
@@ -95,8 +95,8 @@ man_free(struct man *man)
 
 
 struct man *
-man_alloc(const struct regset *regs,
-               void *data, int pflags, mandocmsg msg)
+man_alloc(struct regset *regs, void *data, 
+               int pflags, mandocmsg msg)
 {
        struct man      *p;
 
@@ -410,7 +410,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: