===================================================================
RCS file: /cvs/mandoc/Attic/mdoc_action.c,v
retrieving revision 1.65
retrieving revision 1.68
diff -u -p -r1.65 -r1.68
--- mandoc/Attic/mdoc_action.c	2010/06/03 13:44:36	1.65
+++ mandoc/Attic/mdoc_action.c	2010/06/12 12:38:01	1.68
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_action.c,v 1.65 2010/06/03 13:44:36 kristaps Exp $ */
+/*	$Id: mdoc_action.c,v 1.68 2010/06/12 12:38:01 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -68,9 +68,7 @@ static	int	  post_st(POST_ARGS);
 static	int	  post_std(POST_ARGS);
 
 static	int	  pre_bd(PRE_ARGS);
-static	int	  pre_bl(PRE_ARGS);
 static	int	  pre_dl(PRE_ARGS);
-static	int	  pre_offset(PRE_ARGS);
 
 static	const struct actions mdoc_actions[MDOC_MAX] = {
 	{ NULL, NULL }, /* Ap */
@@ -84,7 +82,7 @@ static	const struct actions mdoc_actions[MDOC_MAX] = {
 	{ pre_dl, post_display }, /* Dl */
 	{ pre_bd, post_display }, /* Bd */ 
 	{ NULL, NULL }, /* Ed */
-	{ pre_bl, post_bl }, /* Bl */ 
+	{ NULL, post_bl }, /* Bl */ 
 	{ NULL, NULL }, /* El */
 	{ NULL, NULL }, /* It */
 	{ NULL, NULL }, /* Ad */ 
@@ -937,61 +935,17 @@ pre_dl(PRE_ARGS)
 }
 
 
-/* ARGSUSED */
 static int
-pre_offset(PRE_ARGS)
-{
-	int		 i;
-
-	/* 
-	 * Make sure that an empty offset produces an 8n length space as
-	 * stipulated by mdoc.samples. 
-	 */
-
-	for (i = 0; n->args && i < (int)n->args->argc; i++) {
-		if (MDOC_Offset != n->args->argv[i].arg) 
-			continue;
-		if (n->args->argv[i].sz)
-			break;
-		assert(1 == n->args->refcnt);
-		/* If no value set, length of <string>. */
-		n->args->argv[i].sz++;
-		n->args->argv[i].value = mandoc_malloc(sizeof(char *));
-		n->args->argv[i].value[0] = mandoc_strdup("8n");
-		break;
-	}
-
-	return(1);
-}
-
-
-static int
-pre_bl(PRE_ARGS)
-{
-
-	if (MDOC_BLOCK == n->type)
-		return(pre_offset(m, n));
-	return(1);
-}
-
-
-static int
 pre_bd(PRE_ARGS)
 {
-	int		 i;
 
-	if (MDOC_BLOCK == n->type)
-		return(pre_offset(m, n));
 	if (MDOC_BODY != n->type)
 		return(1);
 
-	/* Enter literal context if `Bd -literal' or `-unfilled'. */
-
-	for (n = n->parent, i = 0; i < (int)n->args->argc; i++)
-		if (MDOC_Literal == n->args->argv[i].arg)
-			m->flags |= MDOC_LITERAL;
-		else if (MDOC_Unfilled == n->args->argv[i].arg)
-			m->flags |= MDOC_LITERAL;
+	if (DISP_literal == n->data.Bd.type)
+		m->flags |= MDOC_LITERAL;
+	if (DISP_unfilled == n->data.Bd.type)
+		m->flags |= MDOC_LITERAL;
 
 	return(1);
 }