===================================================================
RCS file: /cvs/mandoc/Attic/action.c,v
retrieving revision 1.14
retrieving revision 1.21
diff -u -p -r1.14 -r1.21
--- mandoc/Attic/action.c	2009/01/20 13:44:05	1.14
+++ mandoc/Attic/action.c	2009/02/27 09:39:40	1.21
@@ -1,4 +1,4 @@
-/* $Id: action.c,v 1.14 2009/01/20 13:44:05 kristaps Exp $ */
+/* $Id: action.c,v 1.21 2009/02/27 09:39:40 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -17,7 +17,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <time.h>
 
 #include "private.h"
@@ -34,6 +36,7 @@ struct	actions {
 
 /* Per-macro action routines. */
 
+static	int	 post_bl(struct mdoc *);
 static	int	 post_sh(struct mdoc *);
 static	int	 post_os(struct mdoc *);
 static	int	 post_dt(struct mdoc *);
@@ -56,7 +59,7 @@ const	struct actions mdoc_actions[MDOC_MAX] = {
 	{ NULL }, /* Dl */
 	{ NULL }, /* Bd */ 
 	{ NULL }, /* Ed */
-	{ NULL }, /* Bl */ 
+	{ post_bl }, /* Bl */ 
 	{ NULL }, /* El */
 	{ NULL }, /* It */
 	{ NULL }, /* Ad */ 
@@ -193,8 +196,8 @@ post_sh(struct mdoc *mdoc)
 		return(1);
 	if (xstrlcats(buf, mdoc->last->child, 64)) {
 		if (SEC_CUSTOM != (sec = mdoc_atosec(buf)))
-			mdoc->sec_lastn = sec;
-		mdoc->sec_last = sec;
+			mdoc->lastnamed = sec;
+		mdoc->lastsec = sec;
 		return(1);
 	}
 
@@ -217,6 +220,7 @@ post_dt(struct mdoc *mdoc)
 
 	assert(NULL == mdoc->meta.title);
 
+	/* LINTED */
 	for (i = 0, n = mdoc->last->child; n; n = n->next, i++) {
 		assert(MDOC_TEXT == n->type);
 		p = n->data.text.string;
@@ -244,8 +248,10 @@ post_dt(struct mdoc *mdoc)
 	}
 
 	if (NULL == mdoc->meta.title)
-		mdoc->meta.title = xstrdup("untitled");
+		mdoc->meta.title = xstrdup("UNTITLED");
 
+	mdoc_msg(mdoc, "title: %s", mdoc->meta.title);
+
 	return(post_prologue(mdoc));
 }
 
@@ -266,59 +272,79 @@ post_os(struct mdoc *mdoc)
 		return(mdoc_err(mdoc, "macro parameters too long")); 
 
 	mdoc->meta.os = xstrdup(buf[0] ? buf : "local");
-	mdoc->sec_lastn = mdoc->sec_last = SEC_BODY;
-	mdoc->flags |= MDOC_BODYPARSE;
+	mdoc->lastnamed = SEC_BODY;
 
 	return(post_prologue(mdoc));
 }
 
 
 /* 
+ * Transform -width MACRO values into real widths. 
+ */
+static int
+post_bl(struct mdoc *mdoc)
+{
+	struct mdoc_block *bl;
+	size_t		   width;
+	int		   tok, i;
+	char		   buf[32];
+
+	if (MDOC_BLOCK != mdoc->last->type)
+		return(1);
+
+	bl = &mdoc->last->data.block;
+
+	for (i = 0; i < (int)bl->argc; i++)
+		if (MDOC_Width == bl->argv[i].arg)
+			break;
+
+	if (i == (int)bl->argc)
+		return(1);
+
+	assert(1 == bl->argv[i].sz);
+	if (MDOC_MAX == (tok = mdoc_find(mdoc, *bl->argv[i].value)))
+		return(1);
+
+	if (0 == (width = mdoc_macro2len(tok))) 
+		return(mdoc_warn(mdoc, WARN_SYNTAX,
+					"-%s macro has no length", 
+					mdoc_argnames[MDOC_Width]));
+
+	mdoc_msg(mdoc, "re-writing %s argument: %s -> %zun", 
+			mdoc_argnames[MDOC_Width],
+			*bl->argv[i].value, width);
+
+	/* FIXME: silently truncates. */
+	(void)snprintf(buf, sizeof(buf), "%zun", width);
+
+	free(*bl->argv[i].value);
+	*bl->argv[i].value = strdup(buf);
+
+	return(1);
+}
+
+
+/* 
  * Prologue date must be parsed into document meta-data.
  */
 static int
 post_dd(struct mdoc *mdoc)
 {
-	char		  date[64];
-	size_t		  sz;
-	char		 *p;
-	struct mdoc_node *n;
+	char		  buf[64];
 
 	assert(MDOC_ELEM == mdoc->last->type);
 	assert(MDOC_Dd == mdoc->last->tok);
 
-	n = mdoc->last->child; 
 	assert(0 == mdoc->meta.date);
-	date[0] = 0;
 
-	sz = 64;
+	if ( ! xstrlcats(buf, mdoc->last->child, 64))
+		return(mdoc_err(mdoc, "macro parameters too long"));
+	if (0 == (mdoc->meta.date = mdoc_atotime(buf)))
+		return(mdoc_err(mdoc, "invalid parameter syntax"));
 
-	for ( ; 0 == mdoc->meta.date && n; n = n->next) {
-		assert(MDOC_TEXT == n->type);
-		p = n->data.text.string;
+	mdoc_msg(mdoc, "date: %u", mdoc->meta.date);
 
-		if (xstrcmp(p, "$Mdocdate: January 20 2009 $")) {
-			mdoc->meta.date = time(NULL);
-			continue;
-		} else if (xstrcmp(p, "$")) {
-			mdoc->meta.date = mdoc_atotime(date);
-			continue;
-		} else if (xstrcmp(p, "$Mdocdate:"))
-			continue;
-
-		if ( ! xstrlcat(date, n->data.text.string, sz))
-			return(mdoc_nerr(mdoc, n, "invalid parameter syntax"));
-		if (n->next && ! xstrlcat(date, " ", sz))
-			return(mdoc_nerr(mdoc, n, "invalid parameter syntax"));
-	}
-
-	if (mdoc->meta.date && NULL == n)
-		return(post_prologue(mdoc));
-	else if (n)
-		return(mdoc_err(mdoc, "invalid parameter syntax"));
-	if ((mdoc->meta.date = mdoc_atotime(date)))
-		return(post_prologue(mdoc));
-	return(mdoc_err(mdoc, "invalid parameter syntax"));
+	return(post_prologue(mdoc));
 }