===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -p -r1.1 -r1.6
--- mandoc/out.c	2009/09/21 00:39:02	1.1
+++ mandoc/out.c	2009/10/22 18:55:32	1.6
@@ -1,4 +1,4 @@
-/*	$Id: out.c,v 1.1 2009/09/21 00:39:02 kristaps Exp $ */
+/*	$Id: out.c,v 1.6 2009/10/22 18:55:32 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -18,96 +18,147 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "mdoc.h"
-#include "man.h"
 #include "out.h"
 
+
+/* 
+ * Convert a `scaling unit' to a consistent form, or fail.  Scaling
+ * units are documented in groff.7, mdoc.7, man.7.
+ */
 int
-out_a2list(const struct mdoc_node *n)
+a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
 {
+	char		 buf[BUFSIZ], hasd;
 	int		 i;
+	enum roffscale	 unit;
 
-	assert(MDOC_BLOCK == n->type && MDOC_Bl == n->tok);
-	assert(n->args);
+	if ('\0' == *src)
+		return(0);
 
-	for (i = 0; i < (int)n->args->argc; i++) 
-		switch (n->args->argv[i].arg) {
-		case (MDOC_Enum):
-			/* FALLTHROUGH */
-		case (MDOC_Dash):
-			/* FALLTHROUGH */
-		case (MDOC_Hyphen):
-			/* FALLTHROUGH */
-		case (MDOC_Bullet):
-			/* FALLTHROUGH */
-		case (MDOC_Tag):
-			/* FALLTHROUGH */
-		case (MDOC_Hang):
-			/* FALLTHROUGH */
-		case (MDOC_Inset):
-			/* FALLTHROUGH */
-		case (MDOC_Diag):
-			/* FALLTHROUGH */
-		case (MDOC_Item):
-			/* FALLTHROUGH */
-		case (MDOC_Column):
-			/* FALLTHROUGH */
-		case (MDOC_Ohang):
-			return(n->args->argv[i].arg);
-		default:
-			break;
-		}
+	i = hasd = 0;
 
-	abort();
-	/* NOTREACHED */
-}
+	switch (*src) {
+	case ('+'):
+		src++;
+		break;
+	case ('-'):
+		buf[i++] = *src++;
+		break;
+	default:
+		break;
+	}
 
+	if ('\0' == *src)
+		return(0);
 
-int
-out_a2width(const char *p)
-{
-	int		 i, len;
+	while (i < BUFSIZ) {
+		if ( ! isdigit((u_char)*src)) {
+			if ('.' != *src)
+				break;
+			else if (hasd)
+				break;
+			else
+				hasd = 1;
+		}
+		buf[i++] = *src++;
+	}
 
-	if (0 == (len = (int)strlen(p)))
+	if (BUFSIZ == i || (*src && *(src + 1)))
 		return(0);
-	for (i = 0; i < len - 1; i++) 
-		if ( ! isdigit((u_char)p[i]))
-			break;
 
-	if (i == len - 1) 
-		if ('n' == p[len - 1] || 'm' == p[len - 1])
-			return(atoi(p) + 2);
+	buf[i] = '\0';
 
-	return(len + 2);
+	switch (*src) {
+	case ('c'):
+		unit = SCALE_CM;
+		break;
+	case ('i'):
+		unit = SCALE_IN;
+		break;
+	case ('P'):
+		unit = SCALE_PC;
+		break;
+	case ('p'):
+		unit = SCALE_PT;
+		break;
+	case ('f'):
+		unit = SCALE_FS;
+		break;
+	case ('v'):
+		unit = SCALE_VS;
+		break;
+	case ('m'):
+		unit = SCALE_EM;
+		break;
+	case ('\0'):
+		if (SCALE_MAX == def)
+			return(0);
+		unit = SCALE_BU;
+		break;
+	case ('u'):
+		unit = SCALE_BU;
+		break;
+	case ('M'):
+		unit = SCALE_MM;
+		break;
+	case ('n'):
+		unit = SCALE_EN;
+		break;
+	default:
+		return(0);
+	}
+
+	if ((dst->scale = atof(buf)) < 0)
+		dst->scale = 0;
+	dst->unit = unit;
+	dst->pt = hasd;
+
+	return(1);
 }
 
 
-int
-out_a2offs(const char *p, int indent)
+/*
+ * Correctly writes the time in nroff form, which differs from standard
+ * form in that a space isn't printed in lieu of the extra %e field for
+ * single-digit dates.
+ */
+void
+time2a(time_t t, char *dst, size_t sz)
 {
-	int		 len, i;
+	struct tm	 tm;
+	char		 buf[5];
+	char		*p;
+	size_t		 nsz;
 
-	if (0 == strcmp(p, "left"))
-		return(0);
-	if (0 == strcmp(p, "indent"))
-		return(indent + 1);
-	if (0 == strcmp(p, "indent-two"))
-		return((indent + 1) * 2);
+	assert(sz > 1);
+	localtime_r(&t, &tm);
 
-	if (0 == (len = (int)strlen(p)))
-		return(0);
+	p = dst;
+	nsz = 0;
 
-	for (i = 0; i < len - 1; i++) 
-		if ( ! isdigit((u_char)p[i]))
-			break;
+	dst[0] = '\0';
 
-	if (i == len - 1) 
-		if ('n' == p[len - 1] || 'm' == p[len - 1])
-			return(atoi(p));
+	if (0 == (nsz = strftime(p, sz, "%B ", &tm)))
+		return;
 
-	return(len);
+	p += (int)nsz;
+	sz -= nsz;
+
+	if (0 == strftime(buf, sizeof(buf), "%e, ", &tm))
+		return;
+
+	nsz = strlcat(p, buf + (' ' == buf[0] ? 1 : 0), sz);
+
+	if (nsz >= sz)
+		return;
+
+	p += (int)nsz;
+	sz -= nsz;
+
+	(void)strftime(p, sz, "%Y", &tm);
 }