===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.122
retrieving revision 1.124
diff -u -p -r1.122 -r1.124
--- mandoc/mdoc_validate.c	2010/11/29 12:22:28	1.122
+++ mandoc/mdoc_validate.c	2010/11/29 13:12:24	1.124
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.122 2010/11/29 12:22:28 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.124 2010/11/29 13:12:24 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -85,6 +85,8 @@ static	int	 post_at(POST_ARGS);
 static	int	 post_bf(POST_ARGS);
 static	int	 post_bl(POST_ARGS);
 static	int	 post_bl_head(POST_ARGS);
+static	int	 post_defaults(POST_ARGS);
+static	int	 post_eoln(POST_ARGS);
 static	int	 post_dt(POST_ARGS);
 static	int	 post_it(POST_ARGS);
 static	int	 post_lb(POST_ARGS);
@@ -95,7 +97,6 @@ static	int	 post_sh(POST_ARGS);
 static	int	 post_sh_body(POST_ARGS);
 static	int	 post_sh_head(POST_ARGS);
 static	int	 post_st(POST_ARGS);
-static	int	 post_eoln(POST_ARGS);
 static	int	 post_vt(POST_ARGS);
 static	int	 pre_an(PRE_ARGS);
 static	int	 pre_bd(PRE_ARGS);
@@ -105,7 +106,7 @@ static	int	 pre_display(PRE_ARGS);
 static	int	 pre_dt(PRE_ARGS);
 static	int	 pre_it(PRE_ARGS);
 static	int	 pre_os(PRE_ARGS);
-static	int	 pre_pp(PRE_ARGS);
+static	int	 pre_par(PRE_ARGS);
 static	int	 pre_rv(PRE_ARGS);
 static	int	 pre_sh(PRE_ARGS);
 static	int	 pre_ss(PRE_ARGS);
@@ -117,6 +118,7 @@ static	v_post	 posts_bf[] = { hwarn_le1, post_bf, NULL
 static	v_post	 posts_bl[] = { bwarn_ge1, post_bl, NULL };
 static	v_post	 posts_bool[] = { eerr_eq1, ebool, NULL };
 static	v_post	 posts_eoln[] = { post_eoln, NULL };
+static	v_post	 posts_defaults[] = { post_defaults, NULL };
 static	v_post	 posts_dt[] = { post_dt, NULL };
 static	v_post	 posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };
 static	v_post	 posts_it[] = { post_it, NULL };
@@ -135,8 +137,8 @@ static	v_post	 posts_vt[] = { post_vt, NULL };
 static	v_post	 posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
 static	v_post	 posts_wtext[] = { ewarn_ge1, NULL };
 static	v_pre	 pres_an[] = { pre_an, NULL };
-static	v_pre	 pres_bd[] = { pre_display, pre_bd, pre_pp, NULL };
-static	v_pre	 pres_bl[] = { pre_bl, pre_pp, NULL };
+static	v_pre	 pres_bd[] = { pre_display, pre_bd, pre_par, NULL };
+static	v_pre	 pres_bl[] = { pre_bl, pre_par, NULL };
 static	v_pre	 pres_d1[] = { pre_display, NULL };
 static	v_pre	 pres_dd[] = { pre_dd, NULL };
 static	v_pre	 pres_dt[] = { pre_dt, NULL };
@@ -145,7 +147,7 @@ static	v_pre	 pres_ex[] = { NULL, NULL };
 static	v_pre	 pres_fd[] = { NULL, NULL };
 static	v_pre	 pres_it[] = { pre_it, NULL };
 static	v_pre	 pres_os[] = { pre_os, NULL };
-static	v_pre	 pres_pp[] = { pre_pp, NULL };
+static	v_pre	 pres_pp[] = { pre_par, NULL };
 static	v_pre	 pres_rv[] = { pre_rv, NULL };
 static	v_pre	 pres_sh[] = { pre_sh, NULL };
 static	v_pre	 pres_ss[] = { pre_ss, NULL };
@@ -167,7 +169,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ pres_it, posts_it },			/* It */
 	{ NULL, posts_text },			/* Ad */ 
 	{ pres_an, posts_an },			/* An */ 
-	{ NULL, NULL },				/* Ar */
+	{ NULL, posts_defaults },		/* Ar */
 	{ NULL, posts_text },			/* Cd */ 
 	{ NULL, NULL },				/* Cm */
 	{ NULL, NULL },				/* Dv */ 
@@ -181,7 +183,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, posts_wtext },			/* Ft */ 
 	{ NULL, posts_text },			/* Ic */ 
 	{ NULL, posts_text1 },			/* In */ 
-	{ NULL, NULL },				/* Li */
+	{ NULL, posts_defaults },		/* Li */
 	{ NULL, posts_nd },			/* Nd */
 	{ NULL, posts_nm },			/* Nm */
 	{ NULL, posts_wline },			/* Op */
@@ -260,7 +262,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, posts_lb },			/* Lb */
 	{ NULL, posts_notext },			/* Lp */ 
 	{ NULL, posts_text },			/* Lk */ 
-	{ NULL, posts_text },			/* Mt */ 
+	{ NULL, posts_defaults },		/* Mt */ 
 	{ NULL, posts_wline },			/* Brq */ 
 	{ NULL, NULL },				/* Bro */ 
 	{ NULL, NULL },				/* Brc */ 
@@ -1133,7 +1135,47 @@ post_nm(POST_ARGS)
 	return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME));
 }
 
+static int
+post_defaults(POST_ARGS)
+{
+	struct mdoc_node *nn;
 
+	/*
+	 * The `Ar' defaults to "file ..." if no value is provided as an
+	 * argument; the `Mt' macro uses "~"; the `Li' just gets an
+	 * empty string.
+	 */
+
+	if (mdoc->last->child)
+		return(1);
+	
+	nn = mdoc->last;
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	switch (nn->tok) {
+	case (MDOC_Ar):
+		if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "file"))
+			return(0);
+		if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "..."))
+			return(0);
+		break;
+	case (MDOC_Li):
+		if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, ""))
+			return(0);
+		break;
+	case (MDOC_Mt):
+		if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "~"))
+			return(0);
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
+	} 
+
+	mdoc->last = nn;
+	return(1);
+}
+
 static int
 post_at(POST_ARGS)
 {
@@ -1580,15 +1622,17 @@ post_sh_head(POST_ARGS)
 	return(1);
 }
 
-
 static int
-pre_pp(PRE_ARGS)
+pre_par(PRE_ARGS)
 {
 
 	if (NULL == mdoc->last)
 		return(1);
 
-	/* Don't allow prior `Lp' or `Pp'. */
+	/* 
+	 * Don't allow prior `Lp' or `Pp' prior to a paragraph-type
+	 * block:  `Lp', `Pp', or non-compact `Bd' or `Bl'.
+	 */
 
 	if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok)
 		return(1);