===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.41
retrieving revision 1.46
diff -u -p -r1.41 -r1.46
--- mandoc/man_term.c	2009/10/18 19:17:14	1.41
+++ mandoc/man_term.c	2009/10/27 08:49:44	1.46
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.41 2009/10/18 19:17:14 kristaps Exp $ */
+/*	$Id: man_term.c,v 1.46 2009/10/27 08:49:44 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -32,6 +32,8 @@
 #define	INDENT		  7
 #define	HALFINDENT	  3
 
+/* FIXME: have PD set the default vspace width. */
+
 struct	mtermp {
 	int		  fl;
 #define	MANT_LITERAL	 (1 << 0)
@@ -67,14 +69,14 @@ extern	size_t		  strlcpy(char *, const char *, size_t)
 extern	size_t		  strlcat(char *, const char *, size_t);
 #endif
 
-static	int		  arg2width(const struct man_node *);
-static	int		  arg2height(const struct man_node *);
+static	int		  a2width(const struct man_node *);
+static	int		  a2height(const struct man_node *);
 
-static	void		  print_head(struct termp *, 
+static	void		  print_man_head(struct termp *, 
 				const struct man_meta *);
-static	void		  print_body(DECL_ARGS);
-static	void		  print_node(DECL_ARGS);
-static	void		  print_foot(struct termp *, 
+static	void		  print_man_body(DECL_ARGS);
+static	void		  print_man_node(DECL_ARGS);
+static	void		  print_man_foot(struct termp *, 
 				const struct man_meta *);
 static	void		  print_bvspace(struct termp *, 
 				const struct man_node *);
@@ -141,6 +143,7 @@ static	const struct termact termacts[MAN_MAX] = {
 	{ pre_RS, post_RS }, /* RS */
 	{ pre_ign, NULL }, /* DT */
 	{ pre_ign, NULL }, /* UC */
+	{ pre_ign, NULL }, /* PD */
 };
 
 
@@ -168,7 +171,7 @@ terminal_man(void *arg, const struct man *man)
 	n = man_node(man);
 	m = man_meta(man);
 
-	print_head(p, m);
+	print_man_head(p, m);
 	p->flags |= TERMP_NOSPACE;
 
 	mt.fl = 0;
@@ -176,13 +179,13 @@ terminal_man(void *arg, const struct man *man)
 	mt.offset = INDENT;
 
 	if (n->child)
-		print_body(p, &mt, n->child, m);
-	print_foot(p, m);
+		print_man_body(p, &mt, n->child, m);
+	print_man_foot(p, m);
 }
 
 
 static int
-arg2height(const struct man_node *n)
+a2height(const struct man_node *n)
 {
 	struct roffsu	 su;
 
@@ -196,7 +199,7 @@ arg2height(const struct man_node *n)
 
 
 static int
-arg2width(const struct man_node *n)
+a2width(const struct man_node *n)
 {
 	struct roffsu	 su;
 
@@ -307,7 +310,7 @@ pre_IR(DECL_ARGS)
 			p->under++;
 		if (i > 0)
 			p->flags |= TERMP_NOSPACE;
-		print_node(p, mt, nn, m);
+		print_man_node(p, mt, nn, m);
 		if ( ! (i % 2))
 			p->under--;
 	}
@@ -331,7 +334,7 @@ pre_RB(DECL_ARGS)
 		if (i > 0)
 			p->flags |= TERMP_NOSPACE;
 
-		print_node(p, mt, nn, m);
+		print_man_node(p, mt, nn, m);
 
 		if (i % 2 && MAN_RB == n->tok)
 			p->bold--;
@@ -354,7 +357,7 @@ pre_RI(DECL_ARGS)
 			p->under++;
 		if (i > 0)
 			p->flags |= TERMP_NOSPACE;
-		print_node(p, mt, nn, m);
+		print_man_node(p, mt, nn, m);
 		if ( ! (i % 2))
 			p->under--;
 	}
@@ -381,7 +384,7 @@ pre_BI(DECL_ARGS)
 
 		if (i)
 			p->flags |= TERMP_NOSPACE;
-		print_node(p, mt, nn, m);
+		print_man_node(p, mt, nn, m);
 
 		if (i % 2 && MAN_BI == n->tok)
 			p->under--;
@@ -421,7 +424,7 @@ pre_sp(DECL_ARGS)
 {
 	int		 i, len;
 
-	len = n->child ? arg2height(n->child) : 1;
+	len = n->child ? a2height(n->child) : 1;
 
 	if (0 == len)
 		term_newln(p);
@@ -468,7 +471,7 @@ pre_HP(DECL_ARGS)
 	/* Calculate offset. */
 
 	if (NULL != (nn = n->parent->head->child))
-		if ((ival = arg2width(nn)) >= 0)
+		if ((ival = a2width(nn)) >= 0)
 			len = (size_t)ival;
 
 	if (0 == len)
@@ -558,7 +561,7 @@ pre_IP(DECL_ARGS)
 		if (NULL != (nn = nn->next)) {
 			for ( ; nn->next; nn = nn->next)
 				/* Do nothing. */ ;
-			if ((ival = arg2width(nn)) >= 0)
+			if ((ival = a2width(nn)) >= 0)
 				len = (size_t)ival;
 		}
 
@@ -578,7 +581,7 @@ pre_IP(DECL_ARGS)
 
 		/* Don't print the length value. */
 		for (nn = n->child; nn->next; nn = nn->next)
-			print_node(p, mt, nn, m);
+			print_man_node(p, mt, nn, m);
 		return(0);
 	case (MAN_BODY):
 		p->offset = mt->offset + len;
@@ -645,7 +648,7 @@ pre_TP(DECL_ARGS)
 
 	if (NULL != (nn = n->parent->head->child))
 		if (NULL != nn->next)
-			if ((ival = arg2width(nn)) >= 0)
+			if ((ival = a2width(nn)) >= 0)
 				len = (size_t)ival;
 
 	switch (n->type) {
@@ -660,7 +663,7 @@ pre_TP(DECL_ARGS)
 		/* Don't print same-line elements. */
 		for (nn = n->child; nn; nn = nn->next) 
 			if (nn->line > n->line)
-				print_node(p, mt, nn, m);
+				print_man_node(p, mt, nn, m);
 
 		if (ival >= 0)
 			mt->lmargin = (size_t)ival;
@@ -823,7 +826,7 @@ pre_RS(DECL_ARGS)
 		return(1);
 	}
 
-	if ((ival = arg2width(nn)) < 0)
+	if ((ival = a2width(nn)) < 0)
 		return(1);
 
 	mt->offset = INDENT + (size_t)ival;
@@ -851,7 +854,7 @@ post_RS(DECL_ARGS)
 
 
 static void
-print_node(DECL_ARGS)
+print_man_node(DECL_ARGS)
 {
 	int		 c, sz;
 
@@ -887,7 +890,7 @@ print_node(DECL_ARGS)
 	}
 
 	if (c && n->child)
-		print_body(p, mt, n->child, m);
+		print_man_body(p, mt, n->child, m);
 
 	if (MAN_TEXT != n->type)
 		if (termacts[n->tok].post)
@@ -896,27 +899,23 @@ print_node(DECL_ARGS)
 
 
 static void
-print_body(DECL_ARGS)
+print_man_body(DECL_ARGS)
 {
 
-	print_node(p, mt, n, m);
+	print_man_node(p, mt, n, m);
 	if ( ! n->next)
 		return;
-	print_body(p, mt, n->next, m);
+	print_man_body(p, mt, n->next, m);
 }
 
 
 static void
-print_foot(struct termp *p, const struct man_meta *meta)
+print_man_foot(struct termp *p, const struct man_meta *meta)
 {
-	struct tm	*tm;
-	char		 buf[BUFSIZ];
+	char		buf[DATESIZ];
 
-	tm = localtime(&meta->date);
+	time2a(meta->date, buf, DATESIZ);
 
-	if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-		(void)strlcpy(buf, "(invalid date)", BUFSIZ);
-
 	term_vspace(p);
 
 	p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
@@ -940,26 +939,19 @@ print_foot(struct termp *p, const struct man_meta *met
 
 
 static void
-print_head(struct termp *p, const struct man_meta *meta)
+print_man_head(struct termp *p, const struct man_meta *m)
 {
-	char		*buf, *title;
+	char		buf[BUFSIZ], title[BUFSIZ];
 
 	p->rmargin = p->maxrmargin;
 	p->offset = 0;
+	buf[0] = title[0] = '\0';
 
-	if (NULL == (buf = malloc(p->rmargin)))
-		err(EXIT_FAILURE, "malloc");
-	if (NULL == (title = malloc(p->rmargin)))
-		err(EXIT_FAILURE, "malloc");
+	if (m->vol)
+		strlcpy(buf, m->vol, BUFSIZ);
 
-	if (meta->vol)
-		(void)strlcpy(buf, meta->vol, p->rmargin);
-	else
-		*buf = 0;
+	snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec);
 
-	(void)snprintf(title, p->rmargin, "%s(%d)", 
-			meta->title, meta->msec);
-
 	p->offset = 0;
 	p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
 	p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
@@ -985,8 +977,4 @@ print_head(struct termp *p, const struct man_meta *met
 	p->rmargin = p->maxrmargin;
 	p->offset = 0;
 	p->flags &= ~TERMP_NOSPACE;
-
-	free(title);
-	free(buf);
 }
-