===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/Attic/mdoc_action.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/mandoc/Attic/mdoc_action.c	2009/08/22 15:36:58	1.19
--- src/usr.bin/mandoc/Attic/mdoc_action.c	2009/08/22 22:50:17	1.20
***************
*** 1,4 ****
! /*	$Id: mdoc_action.c,v 1.19 2009/08/22 15:36:58 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: mdoc_action.c,v 1.20 2009/08/22 22:50:17 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 24,31 ****
  
  #include "libmdoc.h"
  
  #define	PRE_ARGS  struct mdoc *m, const struct mdoc_node *n
- #define	POST_ARGS struct mdoc *m
  
  struct	actions {
  	int	(*pre)(PRE_ARGS);
--- 24,31 ----
  
  #include "libmdoc.h"
  
+ #define	POST_ARGS struct mdoc *m, struct mdoc_node *n
  #define	PRE_ARGS  struct mdoc *m, const struct mdoc_node *n
  
  struct	actions {
  	int	(*pre)(PRE_ARGS);
***************
*** 71,77 ****
  	{ NULL, NULL }, /* Ad */ 
  	{ NULL, NULL }, /* An */
  	{ NULL, post_ar }, /* Ar */
! 	{ NULL, NULL }, /* Cd */ /* FIXME: tabs are accepted! */
  	{ NULL, NULL }, /* Cm */
  	{ NULL, NULL }, /* Dv */ 
  	{ NULL, NULL }, /* Er */ 
--- 71,77 ----
  	{ NULL, NULL }, /* Ad */ 
  	{ NULL, NULL }, /* An */
  	{ NULL, post_ar }, /* Ar */
! 	{ NULL, NULL }, /* Cd */
  	{ NULL, NULL }, /* Cm */
  	{ NULL, NULL }, /* Dv */ 
  	{ NULL, NULL }, /* Er */ 
***************
*** 218,224 ****
  
  	if (NULL == mdoc_actions[m->last->tok].post)
  		return(1);
! 	return((*mdoc_actions[m->last->tok].post)(m));
  }
  
  
--- 218,224 ----
  
  	if (NULL == mdoc_actions[m->last->tok].post)
  		return(1);
! 	return((*mdoc_actions[m->last->tok].post)(m, m->last));
  }
  
  
***************
*** 244,271 ****
  static int
  post_std(POST_ARGS)
  {
  
! 	/*
! 	 * If '-std' is invoked without an argument, fill it in with our
! 	 * name (if it's been set).
! 	 */
! 
! 	if (NULL == m->last->args)
  		return(1);
! 	if (m->last->args->argv[0].sz)
! 		return(1);
! 
  	assert(m->meta.name);
  
- 	m->last->args->argv[0].value = calloc(1, sizeof(char *));
- 	if (NULL == m->last->args->argv[0].value)
- 		return(mdoc_nerr(m, m->last, EMALLOC));
- 
- 	m->last->args->argv[0].sz = 1;
- 	m->last->args->argv[0].value[0] = strdup(m->meta.name);
- 	if (NULL == m->last->args->argv[0].value[0])
- 		return(mdoc_nerr(m, m->last, EMALLOC));
- 
  	return(1);
  }
  
--- 244,261 ----
  static int
  post_std(POST_ARGS)
  {
+ 	struct mdoc_node	*nn;
  
! 	if (n->child)
  		return(1);
! 	
! 	nn = n;
! 	m->next = MDOC_NEXT_CHILD;
  	assert(m->meta.name);
+ 	if ( ! mdoc_word_alloc(m, n->line, n->pos, m->meta.name))
+ 		return(0);
+ 	m->last = nn;
  
  	return(1);
  }
  
***************
*** 279,289 ****
  		return(1);
  
  	buf[0] = 0;
! 	if ( ! concat(m, m->last->child, buf, sizeof(buf)))
  		return(0);
- 
  	if (NULL == (m->meta.name = strdup(buf)))
! 		return(mdoc_nerr(m, m->last, EMALLOC));
  
  	return(1);
  }
--- 269,278 ----
  		return(1);
  
  	buf[0] = 0;
! 	if ( ! concat(m, n->child, buf, sizeof(buf)))
  		return(0);
  	if (NULL == (m->meta.name = strdup(buf)))
! 		return(mdoc_nerr(m, n, EMALLOC));
  
  	return(1);
  }
***************
*** 296,320 ****
  	char		*buf;
  	size_t		 sz;
  
! 	assert(MDOC_TEXT == m->last->child->type);
! 	p = mdoc_a2lib(m->last->child->string);
  	if (NULL == p) {
! 		sz = strlen(m->last->child->string) +
  			2 + strlen("\\(lqlibrary\\(rq");
  		buf = malloc(sz);
  		if (NULL == buf)
! 			return(mdoc_nerr(m, m->last, EMALLOC));
  		(void)snprintf(buf, sz, "library \\(lq%s\\(rq", 
! 				m->last->child->string);
! 		free(m->last->child->string);
! 		m->last->child->string = buf;
  		return(1);
  	}
  
! 	free(m->last->child->string);
! 	m->last->child->string = strdup(p);
! 	if (NULL == m->last->child->string)
! 		return(mdoc_nerr(m, m->last, EMALLOC));
  	return(1);
  }
  
--- 285,310 ----
  	char		*buf;
  	size_t		 sz;
  
! 	assert(MDOC_TEXT == n->child->type);
! 	p = mdoc_a2lib(n->child->string);
  	if (NULL == p) {
! 		sz = strlen(n->child->string) +
  			2 + strlen("\\(lqlibrary\\(rq");
  		buf = malloc(sz);
  		if (NULL == buf)
! 			return(mdoc_nerr(m, n, EMALLOC));
  		(void)snprintf(buf, sz, "library \\(lq%s\\(rq", 
! 				n->child->string);
! 		free(n->child->string);
! 		n->child->string = buf;
  		return(1);
  	}
  
! 	free(n->child->string);
! 	n->child->string = strdup(p);
! 	if (NULL == n->child->string)
! 		return(mdoc_nerr(m, n, EMALLOC));
! 
  	return(1);
  }
  
***************
*** 324,336 ****
  {
  	const char	*p;
  
! 	assert(MDOC_TEXT == m->last->child->type);
! 	p = mdoc_a2st(m->last->child->string);
  	assert(p);
! 	free(m->last->child->string);
! 	m->last->child->string = strdup(p);
! 	if (NULL == m->last->child->string)
! 		return(mdoc_nerr(m, m->last, EMALLOC));
  	return(1);
  }
  
--- 314,327 ----
  {
  	const char	*p;
  
! 	assert(MDOC_TEXT == n->child->type);
! 	p = mdoc_a2st(n->child->string);
  	assert(p);
! 	free(n->child->string);
! 	n->child->string = strdup(p);
! 	if (NULL == n->child->string)
! 		return(mdoc_nerr(m, n, EMALLOC));
! 
  	return(1);
  }
  
***************
*** 338,365 ****
  static int
  post_at(POST_ARGS)
  {
! 	struct mdoc_node *n;
! 	const char	 *p;
  
! 	if (m->last->child) {
! 		assert(MDOC_TEXT == m->last->child->type);
! 		p = mdoc_a2att(m->last->child->string);
  		assert(p);
! 		free(m->last->child->string);
! 		m->last->child->string = strdup(p);
! 		if (NULL == m->last->child->string)
! 			return(mdoc_nerr(m, m->last, EMALLOC));
  		return(1);
  	}
  
! 	n = m->last;
  	m->next = MDOC_NEXT_CHILD;
  
! 	if ( ! mdoc_word_alloc(m, n->line, n->pos, "AT&T UNIX"))
  		return(0);
  
- 	m->last = n;
- 	m->next = MDOC_NEXT_SIBLING;
  	return(1);
  }
  
--- 329,355 ----
  static int
  post_at(POST_ARGS)
  {
! 	struct mdoc_node	*nn;
! 	const char		*p;
  
! 	if (n->child) {
! 		assert(MDOC_TEXT == n->child->type);
! 		p = mdoc_a2att(n->child->string);
  		assert(p);
! 		free(n->child->string);
! 		n->child->string = strdup(p);
! 		if (NULL == n->child->string)
! 			return(mdoc_nerr(m, n, EMALLOC));
  		return(1);
  	}
  
! 	nn = n;
  	m->next = MDOC_NEXT_CHILD;
  
! 	if ( ! mdoc_word_alloc(m, nn->line, nn->pos, "AT&T UNIX"))
  		return(0);
+ 	m->last = nn;
  
  	return(1);
  }
  
***************
*** 376,386 ****
  	 * check ordering.
  	 */
  
! 	if (MDOC_HEAD != m->last->type)
  		return(1);
  
  	buf[0] = 0;
! 	if ( ! concat(m, m->last->child, buf, sizeof(buf)))
  		return(0);
  	if (SEC_CUSTOM != (sec = mdoc_atosec(buf)))
  		m->lastnamed = sec;
--- 366,376 ----
  	 * check ordering.
  	 */
  
! 	if (MDOC_HEAD != n->type)
  		return(1);
  
  	buf[0] = 0;
! 	if ( ! concat(m, n->child, buf, sizeof(buf)))
  		return(0);
  	if (SEC_CUSTOM != (sec = mdoc_atosec(buf)))
  		m->lastnamed = sec;
***************
*** 397,403 ****
  		case (9):
  			break;
  		default:
! 			return(mdoc_nwarn(m, m->last, EBADSEC));
  		}
  		break;
  	default:
--- 387,393 ----
  		case (9):
  			break;
  		default:
! 			return(mdoc_nwarn(m, n, EBADSEC));
  		}
  		break;
  	default:
***************
*** 410,416 ****
  static int
  post_dt(POST_ARGS)
  {
! 	struct mdoc_node *n;
  	const char	 *cp;
  	char		 *ep;
  	long		  lval;
--- 400,406 ----
  static int
  post_dt(POST_ARGS)
  {
! 	struct mdoc_node *nn;
  	const char	 *cp;
  	char		 *ep;
  	long		  lval;
***************
*** 429,453 ****
  	 *   --> title = unknown, volume = local, msec = 0, arch = NULL
  	 */
  
! 	if (NULL == (n = m->last->child)) {
  		if (NULL == (m->meta.title = strdup("unknown")))
! 			return(mdoc_nerr(m, m->last, EMALLOC));
  		if (NULL == (m->meta.vol = strdup("local")))
! 			return(mdoc_nerr(m, m->last, EMALLOC));
! 		return(post_prol(m));
  	}
  
  	/* Handles: `.Dt TITLE' 
  	 *   --> title = TITLE, volume = local, msec = 0, arch = NULL
  	 */
  
! 	if (NULL == (m->meta.title = strdup(n->string)))
! 		return(mdoc_nerr(m, m->last, EMALLOC));
  
! 	if (NULL == (n = n->next)) {
  		if (NULL == (m->meta.vol = strdup("local")))
! 			return(mdoc_nerr(m, m->last, EMALLOC));
! 		return(post_prol(m));
  	}
  
  	/* Handles: `.Dt TITLE SEC'
--- 419,443 ----
  	 *   --> title = unknown, volume = local, msec = 0, arch = NULL
  	 */
  
! 	if (NULL == (nn = n->child)) {
  		if (NULL == (m->meta.title = strdup("unknown")))
! 			return(mdoc_nerr(m, n, EMALLOC));
  		if (NULL == (m->meta.vol = strdup("local")))
! 			return(mdoc_nerr(m, n, EMALLOC));
! 		return(post_prol(m, n));
  	}
  
  	/* Handles: `.Dt TITLE' 
  	 *   --> title = TITLE, volume = local, msec = 0, arch = NULL
  	 */
  
! 	if (NULL == (m->meta.title = strdup(nn->string)))
! 		return(mdoc_nerr(m, n, EMALLOC));
  
! 	if (NULL == (nn = nn->next)) {
  		if (NULL == (m->meta.vol = strdup("local")))
! 			return(mdoc_nerr(m, n, EMALLOC));
! 		return(post_prol(m, n));
  	}
  
  	/* Handles: `.Dt TITLE SEC'
***************
*** 457,475 ****
  	 *       arch = NULL
  	 */
  
! 	cp = mdoc_a2msec(n->string);
  	if (cp) {
  		if (NULL == (m->meta.vol = strdup(cp)))
! 			return(mdoc_nerr(m, m->last, EMALLOC));
  		errno = 0;
! 		lval = strtol(n->string, &ep, 10);
! 		if (n->string[0] != '\0' && *ep == '\0')
  			m->meta.msec = (int)lval;
! 	} else if (NULL == (m->meta.vol = strdup(n->string)))
! 		return(mdoc_nerr(m, m->last, EMALLOC));
  
! 	if (NULL == (n = n->next))
! 		return(post_prol(m));
  
  	/* Handles: `.Dt TITLE SEC VOL'
  	 *   --> title = TITLE, volume = VOL is vol ?
--- 447,465 ----
  	 *       arch = NULL
  	 */
  
! 	cp = mdoc_a2msec(nn->string);
  	if (cp) {
  		if (NULL == (m->meta.vol = strdup(cp)))
! 			return(mdoc_nerr(m, n, EMALLOC));
  		errno = 0;
! 		lval = strtol(nn->string, &ep, 10);
! 		if (nn->string[0] != '\0' && *ep == '\0')
  			m->meta.msec = (int)lval;
! 	} else if (NULL == (m->meta.vol = strdup(nn->string)))
! 		return(mdoc_nerr(m, n, EMALLOC));
  
! 	if (NULL == (nn = nn->next))
! 		return(post_prol(m, n));
  
  	/* Handles: `.Dt TITLE SEC VOL'
  	 *   --> title = TITLE, volume = VOL is vol ?
***************
*** 478,501 ****
  	 *               VOL
  	 */
  
! 	cp = mdoc_a2vol(n->string);
  	if (cp) {
  		free(m->meta.vol);
  		if (NULL == (m->meta.vol = strdup(cp)))
! 			return(mdoc_nerr(m, m->last, EMALLOC));
  	} else {
! 		cp = mdoc_a2arch(n->string);
  		if (NULL == cp) {
  			free(m->meta.vol);
! 			if (NULL == (m->meta.vol = strdup(n->string)))
! 				return(mdoc_nerr(m, m->last, EMALLOC));
  		} else if (NULL == (m->meta.arch = strdup(cp)))
! 			return(mdoc_nerr(m, m->last, EMALLOC));
  	}	
  
  	/* Ignore any subsequent parameters... */
  
! 	return(post_prol(m));
  }
  
  
--- 468,491 ----
  	 *               VOL
  	 */
  
! 	cp = mdoc_a2vol(nn->string);
  	if (cp) {
  		free(m->meta.vol);
  		if (NULL == (m->meta.vol = strdup(cp)))
! 			return(mdoc_nerr(m, n, EMALLOC));
  	} else {
! 		cp = mdoc_a2arch(nn->string);
  		if (NULL == cp) {
  			free(m->meta.vol);
! 			if (NULL == (m->meta.vol = strdup(nn->string)))
! 				return(mdoc_nerr(m, n, EMALLOC));
  		} else if (NULL == (m->meta.arch = strdup(cp)))
! 			return(mdoc_nerr(m, n, EMALLOC));
  	}	
  
  	/* Ignore any subsequent parameters... */
  
! 	return(post_prol(m, n));
  }
  
  
***************
*** 509,532 ****
  		free(m->meta.os);
  
  	buf[0] = 0;
! 	if ( ! concat(m, m->last->child, buf, sizeof(buf)))
  		return(0);
  
  	if (0 == buf[0]) {
  		if (-1 == uname(&utsname))
! 			return(mdoc_nerr(m, m->last, EUTSNAME));
  		if (strlcat(buf, utsname.sysname, 64) >= 64)
! 			return(mdoc_nerr(m, m->last, ETOOLONG));
  		if (strlcat(buf, " ", 64) >= 64)
! 			return(mdoc_nerr(m, m->last, ETOOLONG));
  		if (strlcat(buf, utsname.release, 64) >= 64)
! 			return(mdoc_nerr(m, m->last, ETOOLONG));
  	}
  
  	if (NULL == (m->meta.os = strdup(buf)))
! 		return(mdoc_nerr(m, m->last, EMALLOC));
  
! 	return(post_prol(m));
  }
  
  
--- 499,522 ----
  		free(m->meta.os);
  
  	buf[0] = 0;
! 	if ( ! concat(m, n->child, buf, sizeof(buf)))
  		return(0);
  
  	if (0 == buf[0]) {
  		if (-1 == uname(&utsname))
! 			return(mdoc_nerr(m, n, EUTSNAME));
  		if (strlcat(buf, utsname.sysname, 64) >= 64)
! 			return(mdoc_nerr(m, n, ETOOLONG));
  		if (strlcat(buf, " ", 64) >= 64)
! 			return(mdoc_nerr(m, n, ETOOLONG));
  		if (strlcat(buf, utsname.release, 64) >= 64)
! 			return(mdoc_nerr(m, n, ETOOLONG));
  	}
  
  	if (NULL == (m->meta.os = strdup(buf)))
! 		return(mdoc_nerr(m, n, EMALLOC));
  
! 	return(post_prol(m, n));
  }
  
  
***************
*** 535,543 ****
   * Uses the first head macro.
   */
  static int
! post_bl_tagwidth(struct mdoc *m)
  {
! 	struct mdoc_node  *n;
  	int		   sz;
  	char		   buf[32];
  
--- 525,533 ----
   * Uses the first head macro.
   */
  static int
! post_bl_tagwidth(POST_ARGS)
  {
! 	struct mdoc_node  *nn;
  	int		   sz;
  	char		   buf[32];
  
***************
*** 546,620 ****
  	 * width if a macro.
  	 */
  
! 	n = m->last->body->child;
! 	if (n) {
! 		assert(MDOC_BLOCK == n->type);
! 		assert(MDOC_It == n->tok);
! 		n = n->head->child;
  	}
  
  	sz = 10; /* Default size. */
  
! 	if (n) {
! 		if (MDOC_TEXT != n->type) {
! 			if (0 == (sz = (int)mdoc_macro2len(n->tok)))
! 				if ( ! mdoc_nwarn(m, m->last, ENOWIDTH))
  					return(0);
  		} else
! 			sz = (int)strlen(n->string) + 1;
  	} 
  
  	if (-1 == snprintf(buf, sizeof(buf), "%dn", sz))
! 		return(mdoc_nerr(m, m->last, ENUMFMT));
  
  	/*
  	 * We have to dynamically add this to the macro's argument list.
  	 * We're guaranteed that a MDOC_Width doesn't already exist.
  	 */
  
! 	n = m->last;
! 	assert(n->args);
! 	sz = (int)(n->args->argc)++;
  
! 	n->args->argv = realloc(n->args->argv, 
! 			n->args->argc * sizeof(struct mdoc_argv));
  
! 	if (NULL == n->args->argv)
! 		return(mdoc_nerr(m, m->last, EMALLOC));
  
! 	n->args->argv[sz].arg = MDOC_Width;
! 	n->args->argv[sz].line = m->last->line;
! 	n->args->argv[sz].pos = m->last->pos;
! 	n->args->argv[sz].sz = 1;
! 	n->args->argv[sz].value = calloc(1, sizeof(char *));
  
! 	if (NULL == n->args->argv[sz].value)
! 		return(mdoc_nerr(m, m->last, EMALLOC));
! 	if (NULL == (n->args->argv[sz].value[0] = strdup(buf)))
! 		return(mdoc_nerr(m, m->last, EMALLOC));
  
  	return(1);
  }
  
  
  static int
! post_bl_width(struct mdoc *m)
  {
  	size_t		  width;
  	int		  i, tok;
  	char		  buf[32];
  	char		 *p;
  
! 	if (NULL == m->last->args)
  		return(1);
  
! 	for (i = 0; i < (int)m->last->args->argc; i++)
! 		if (MDOC_Width == m->last->args->argv[i].arg)
  			break;
  
! 	if (i == (int)m->last->args->argc)
  		return(1);
! 	p = m->last->args->argv[i].value[0];
  
  	/*
  	 * If the value to -width is a macro, then we re-write it to be
--- 536,610 ----
  	 * width if a macro.
  	 */
  
! 	nn = n->body->child;
! 	if (nn) {
! 		assert(MDOC_BLOCK == nn->type);
! 		assert(MDOC_It == nn->tok);
! 		nn = nn->head->child;
  	}
  
  	sz = 10; /* Default size. */
  
! 	if (nn) {
! 		if (MDOC_TEXT != nn->type) {
! 			if (0 == (sz = (int)mdoc_macro2len(nn->tok)))
! 				if ( ! mdoc_nwarn(m, n, ENOWIDTH))
  					return(0);
  		} else
! 			sz = (int)strlen(nn->string) + 1;
  	} 
  
  	if (-1 == snprintf(buf, sizeof(buf), "%dn", sz))
! 		return(mdoc_nerr(m, n, ENUMFMT));
  
  	/*
  	 * We have to dynamically add this to the macro's argument list.
  	 * We're guaranteed that a MDOC_Width doesn't already exist.
  	 */
  
! 	nn = n;
! 	assert(nn->args);
! 	sz = (int)(nn->args->argc)++;
  
! 	nn->args->argv = realloc(nn->args->argv, 
! 			nn->args->argc * sizeof(struct mdoc_argv));
  
! 	if (NULL == nn->args->argv)
! 		return(mdoc_nerr(m, n, EMALLOC));
  
! 	nn->args->argv[sz].arg = MDOC_Width;
! 	nn->args->argv[sz].line = n->line;
! 	nn->args->argv[sz].pos = n->pos;
! 	nn->args->argv[sz].sz = 1;
! 	nn->args->argv[sz].value = calloc(1, sizeof(char *));
  
! 	if (NULL == nn->args->argv[sz].value)
! 		return(mdoc_nerr(m, n, EMALLOC));
! 	if (NULL == (nn->args->argv[sz].value[0] = strdup(buf)))
! 		return(mdoc_nerr(m, n, EMALLOC));
  
  	return(1);
  }
  
  
  static int
! post_bl_width(POST_ARGS)
  {
  	size_t		  width;
  	int		  i, tok;
  	char		  buf[32];
  	char		 *p;
  
! 	if (NULL == n->args)
  		return(1);
  
! 	for (i = 0; i < (int)n->args->argc; i++)
! 		if (MDOC_Width == n->args->argv[i].arg)
  			break;
  
! 	if (i == (int)n->args->argc)
  		return(1);
! 	p = n->args->argv[i].value[0];
  
  	/*
  	 * If the value to -width is a macro, then we re-write it to be
***************
*** 626,669 ****
  	else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p)))
  		return(1);
  	else if (0 == (width = mdoc_macro2len(tok))) 
! 		return(mdoc_nwarn(m, m->last, ENOWIDTH));
  
  	/* The value already exists: free and reallocate it. */
  
  	if (-1 == snprintf(buf, sizeof(buf), "%zun", width))
! 		return(mdoc_nerr(m, m->last, ENUMFMT));
  
! 	free(m->last->args->argv[i].value[0]);
! 	m->last->args->argv[i].value[0] = strdup(buf);
! 	if (NULL == m->last->args->argv[i].value[0])
! 		return(mdoc_nerr(m, m->last, EMALLOC));
  
  	return(1);
  }
  
  
  static int
  post_bl_head(POST_ARGS)
  {
  	int			 i, c;
! 	struct mdoc_node	*n, *nn, *nnp;
  
! 	if (NULL == m->last->child)
  		return(1);
  
! 	n = m->last->parent;
! 	assert(n->args);
  
! 	for (c = 0; c < (int)n->args->argc; c++) 
! 		if (MDOC_Column == n->args->argv[c].arg)
  			break;
  
  	/* Only process -column. */
  
! 	if (c == (int)n->args->argc)
  		return(1);
  	
! 	assert(0 == n->args->argv[c].sz);
  
  	/*
  	 * Accomodate for new-style groff column syntax.  Shuffle the
--- 616,660 ----
  	else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p)))
  		return(1);
  	else if (0 == (width = mdoc_macro2len(tok))) 
! 		return(mdoc_nwarn(m, n, ENOWIDTH));
  
  	/* The value already exists: free and reallocate it. */
  
  	if (-1 == snprintf(buf, sizeof(buf), "%zun", width))
! 		return(mdoc_nerr(m, n, ENUMFMT));
  
! 	free(n->args->argv[i].value[0]);
! 	n->args->argv[i].value[0] = strdup(buf);
! 	if (NULL == n->args->argv[i].value[0])
! 		return(mdoc_nerr(m, n, EMALLOC));
  
  	return(1);
  }
  
  
+ /* ARGSUSED */
  static int
  post_bl_head(POST_ARGS)
  {
  	int			 i, c;
! 	struct mdoc_node	*np, *nn, *nnp;
  
! 	if (NULL == n->child)
  		return(1);
  
! 	np = n->parent;
! 	assert(np->args);
  
! 	for (c = 0; c < (int)np->args->argc; c++) 
! 		if (MDOC_Column == np->args->argv[c].arg)
  			break;
  
  	/* Only process -column. */
  
! 	if (c == (int)np->args->argc)
  		return(1);
  	
! 	assert(0 == np->args->argv[c].sz);
  
  	/*
  	 * Accomodate for new-style groff column syntax.  Shuffle the
***************
*** 671,690 ****
  	 * column field.  Then, delete the head children.
  	 */
  
! 	n->args->argv[c].sz = (size_t)m->last->nchild;
! 	n->args->argv[c].value = malloc
! 		((size_t)m->last->nchild * sizeof(char *));
  
! 	for (i = 0, nn = m->last->child; nn; i++) {
! 		n->args->argv[c].value[i] = nn->string;
  		nn->string = NULL;
  		nnp = nn;
  		nn = nn->next;
  		mdoc_node_free(nnp);
  	}
  
! 	m->last->nchild = 0;
! 	m->last->child = NULL;
  
  	return(1);
  }
--- 662,681 ----
  	 * column field.  Then, delete the head children.
  	 */
  
! 	np->args->argv[c].sz = (size_t)n->nchild;
! 	np->args->argv[c].value = malloc
! 		((size_t)n->nchild * sizeof(char *));
  
! 	for (i = 0, nn = n->child; nn; i++) {
! 		np->args->argv[c].value[i] = nn->string;
  		nn->string = NULL;
  		nnp = nn;
  		nn = nn->next;
  		mdoc_node_free(nnp);
  	}
  
! 	n->nchild = 0;
! 	n->child = NULL;
  
  	return(1);
  }
***************
*** 695,703 ****
  {
  	int		  i, r, len;
  
! 	if (MDOC_HEAD == m->last->type)
! 		return(post_bl_head(m));
! 	if (MDOC_BLOCK != m->last->type)
  		return(1);
  
  	/*
--- 686,694 ----
  {
  	int		  i, r, len;
  
! 	if (MDOC_HEAD == n->type)
! 		return(post_bl_head(m, n));
! 	if (MDOC_BLOCK != n->type)
  		return(1);
  
  	/*
***************
*** 708,727 ****
  	 * rewritten into real lengths).
  	 */
  
! 	len = (int)(m->last->args ? m->last->args->argc : 0);
  
  	for (r = i = 0; i < len; i++) {
! 		if (MDOC_Tag == m->last->args->argv[i].arg)
  			r |= 1 << 0;
! 		if (MDOC_Width == m->last->args->argv[i].arg)
  			r |= 1 << 1;
  	}
  
  	if (r & (1 << 0) && ! (r & (1 << 1))) {
! 		if ( ! post_bl_tagwidth(m))
  			return(0);
  	} else if (r & (1 << 1))
! 		if ( ! post_bl_width(m))
  			return(0);
  
  	return(1);
--- 699,718 ----
  	 * rewritten into real lengths).
  	 */
  
! 	len = (int)(n->args ? n->args->argc : 0);
  
  	for (r = i = 0; i < len; i++) {
! 		if (MDOC_Tag == n->args->argv[i].arg)
  			r |= 1 << 0;
! 		if (MDOC_Width == n->args->argv[i].arg)
  			r |= 1 << 1;
  	}
  
  	if (r & (1 << 0) && ! (r & (1 << 1))) {
! 		if ( ! post_bl_tagwidth(m, n))
  			return(0);
  	} else if (r & (1 << 1))
! 		if ( ! post_bl_width(m, n))
  			return(0);
  
  	return(1);
***************
*** 731,750 ****
  static int
  post_tilde(POST_ARGS)
  {
! 	struct mdoc_node *n;
  
! 	if (m->last->child)
  		return(1);
  	
! 	n = m->last;
  	m->next = MDOC_NEXT_CHILD;
  
  	/* XXX: not documented for `Lk'. */
! 	if ( ! mdoc_word_alloc(m, m->last->line, m->last->pos, "~"))
  		return(0);
  
- 	m->last = n;
- 	m->next = MDOC_NEXT_SIBLING;
  	return(1);
  }
  
--- 722,740 ----
  static int
  post_tilde(POST_ARGS)
  {
! 	struct mdoc_node *np;
  
! 	if (n->child)
  		return(1);
  	
! 	np = n;
  	m->next = MDOC_NEXT_CHILD;
  
  	/* XXX: not documented for `Lk'. */
! 	if ( ! mdoc_word_alloc(m, n->line, n->pos, "~"))
  		return(0);
+ 	m->last = np;
  
  	return(1);
  }
  
***************
*** 752,772 ****
  static int
  post_ar(POST_ARGS)
  {
! 	struct mdoc_node *n;
  
! 	if (m->last->child)
  		return(1);
  	
! 	n = m->last;
  	m->next = MDOC_NEXT_CHILD;
! 	if ( ! mdoc_word_alloc(m, m->last->line, m->last->pos, "file"))
  		return(0);
! 	m->next = MDOC_NEXT_SIBLING;
! 	if ( ! mdoc_word_alloc(m, m->last->line, m->last->pos, "..."))
  		return(0);
  
- 	m->last = n;
- 	m->next = MDOC_NEXT_SIBLING;
  	return(1);
  }
  
--- 742,760 ----
  static int
  post_ar(POST_ARGS)
  {
! 	struct mdoc_node *np;
  
! 	if (n->child)
  		return(1);
  	
! 	np = n;
  	m->next = MDOC_NEXT_CHILD;
! 	if ( ! mdoc_word_alloc(m, n->line, n->pos, "file"))
  		return(0);
! 	if ( ! mdoc_word_alloc(m, n->line, n->pos, "..."))
  		return(0);
+ 	m->last = np;
  
  	return(1);
  }
  
***************
*** 777,825 ****
  	char		  buf[64];
  
  	buf[0] = 0;
! 	if ( ! concat(m, m->last->child, buf, sizeof(buf)))
  		return(0);
  
  	if (0 == (m->meta.date = mdoc_atotime(buf))) {
! 		if ( ! mdoc_nwarn(m, m->last, EBADDATE))
  			return(0);
  		m->meta.date = time(NULL);
  	}
  
! 	return(post_prol(m));
  }
  
  
  static int
  post_prol(POST_ARGS)
  {
! 	struct mdoc_node *n;
  
! 	/* 
! 	 * The end document shouldn't have the prologue macros as part
! 	 * of the syntax tree (they encompass only meta-data).  
! 	 */
  
! 	if (m->last->parent->child == m->last)
! 		m->last->parent->child = m->last->prev;
! 	if (m->last->prev)
! 		m->last->prev->next = NULL;
  
! 	n = m->last;
! 	assert(NULL == m->last->next);
  
! 	if (m->last->prev) {
! 		m->last = m->last->prev;
  		m->next = MDOC_NEXT_SIBLING;
  	} else {
! 		m->last = m->last->parent;
  		m->next = MDOC_NEXT_CHILD;
  	}
  
! 	mdoc_node_freelist(n);
  
  	if (m->meta.title && m->meta.date && m->meta.os)
  		m->flags |= MDOC_PBODY;
  	return(1);
  }
  
--- 765,811 ----
  	char		  buf[64];
  
  	buf[0] = 0;
! 	if ( ! concat(m, n->child, buf, sizeof(buf)))
  		return(0);
  
  	if (0 == (m->meta.date = mdoc_atotime(buf))) {
! 		if ( ! mdoc_nwarn(m, n, EBADDATE))
  			return(0);
  		m->meta.date = time(NULL);
  	}
  
! 	return(post_prol(m, n));
  }
  
  
  static int
  post_prol(POST_ARGS)
  {
! 	struct mdoc_node *np;
  
! 	/* Remove prologue macros from AST.  */
  
! 	if (n->parent->child == n)
! 		n->parent->child = n->prev;
! 	if (n->prev)
! 		n->prev->next = NULL;
  
! 	np = n;
! 	assert(NULL == n->next);
  
! 	if (n->prev) {
! 		m->last = n->prev;
  		m->next = MDOC_NEXT_SIBLING;
  	} else {
! 		m->last = n->parent;
  		m->next = MDOC_NEXT_CHILD;
  	}
  
! 	mdoc_node_freelist(np);
  
  	if (m->meta.title && m->meta.date && m->meta.os)
  		m->flags |= MDOC_PBODY;
+ 
  	return(1);
  }
  
***************
*** 830,836 ****
  
  	if (MDOC_BODY == n->type)
  		m->flags |= MDOC_LITERAL;
- 
  	return(1);
  }
  
--- 816,821 ----
***************
*** 867,873 ****
  post_display(POST_ARGS)
  {
  
! 	if (MDOC_BODY == m->last->type)
  		m->flags &= ~MDOC_LITERAL;
  	return(1);
  }
--- 852,858 ----
  post_display(POST_ARGS)
  {
  
! 	if (MDOC_BODY == n->type)
  		m->flags &= ~MDOC_LITERAL;
  	return(1);
  }