===================================================================
RCS file: /cvs/mandoc/Attic/terminal.c,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -p -r1.5 -r1.8
--- mandoc/Attic/terminal.c	2009/03/21 13:09:29	1.5
+++ mandoc/Attic/terminal.c	2009/03/25 21:46:24	1.8
@@ -1,4 +1,4 @@
-/* $Id: terminal.c,v 1.5 2009/03/21 13:09:29 kristaps Exp $ */
+/* $Id: terminal.c,v 1.8 2009/03/25 21:46:24 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -46,28 +46,12 @@ static	void		  term_nescape(struct termp *,
 static	void		  term_chara(struct termp *, char);
 static	void		  term_stringa(struct termp *, 
 				const char *, size_t);
-static	int		  term_isopendelim(const char *, size_t);
-static	int		  term_isclosedelim(const char *, size_t);
+static	int		  term_isopendelim(const char *, int);
+static	int		  term_isclosedelim(const char *, int);
 static	void		  sanity(const struct mdoc_node *); /* XXX */
 
 
 void *
-latin1_alloc(void)
-{
-
-	return(term_alloc(TERMENC_LATIN1));
-}
-
-
-void *
-utf8_alloc(void)
-{
-
-	return(term_alloc(TERMENC_UTF8));
-}
-
-
-void *
 ascii_alloc(void)
 {
 
@@ -76,10 +60,14 @@ ascii_alloc(void)
 
 
 int
-terminal_run(void *arg, const struct mdoc *mdoc)
+terminal_run(void *arg, const struct man *man,
+		const struct mdoc *mdoc)
 {
 	struct termp	*p;
 
+	if (NULL == mdoc)
+		return(1);
+
 	p = (struct termp *)arg;
 
 	if (NULL == p->symtab)
@@ -129,7 +117,7 @@ term_alloc(enum termenc enc)
 
 
 static int
-term_isclosedelim(const char *p, size_t len)
+term_isclosedelim(const char *p, int len)
 {
 
 	if (1 != len)
@@ -163,7 +151,7 @@ term_isclosedelim(const char *p, size_t len)
 
 
 static int
-term_isopendelim(const char *p, size_t len)
+term_isopendelim(const char *p, int len)
 {
 
 	if (1 != len)