===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.36
retrieving revision 1.38
diff -u -p -r1.36 -r1.38
--- mandoc/mdoc_term.c	2009/07/12 20:30:35	1.36
+++ mandoc/mdoc_term.c	2009/07/13 07:23:07	1.38
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.36 2009/07/12 20:30:35 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.38 2009/07/13 07:23:07 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -147,7 +147,6 @@ static	int	  termp_ft_pre(DECL_ARGS);
 static	int	  termp_ic_pre(DECL_ARGS);
 static	int	  termp_in_pre(DECL_ARGS);
 static	int	  termp_it_pre(DECL_ARGS);
-static	int	  termp_lb_pre(DECL_ARGS);
 static	int	  termp_lk_pre(DECL_ARGS);
 static	int	  termp_ms_pre(DECL_ARGS);
 static	int	  termp_mt_pre(DECL_ARGS);
@@ -281,7 +280,7 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ NULL, NULL }, /* Hf */
 	{ NULL, NULL }, /* Fr */
 	{ termp_ud_pre, NULL }, /* Ud */
-	{ termp_lb_pre, termp_lb_post }, /* Lb */
+	{ NULL, termp_lb_post }, /* Lb */
 	{ termp_pp_pre, NULL }, /* Lp */ 
 	{ termp_lk_pre, NULL }, /* Lk */ 
 	{ termp_mt_pre, NULL }, /* Mt */ 
@@ -572,16 +571,15 @@ arg_listtype(const struct mdoc_node *n)
 			/* FALLTHROUGH */
 		case (MDOC_Column):
 			/* FALLTHROUGH */
+		case (MDOC_Hang):
+			/* FALLTHROUGH */
 		case (MDOC_Ohang):
 			return(n->args->argv[i].arg);
 		default:
 			break;
 		}
 
-	/* FIXME: mandated by parser. */
-
-	errx(1, "list type not supported");
-	/* NOTREACHED */
+	return(-1);
 }
 
 
@@ -727,6 +725,7 @@ termp_it_pre(DECL_ARGS)
 	(void)arg_getattrs(keys, vals, 3, bl);
 
 	type = arg_listtype(bl);
+	assert(-1 != type);
 
 	/* Calculate real width and offset. */
 
@@ -753,7 +752,7 @@ termp_it_pre(DECL_ARGS)
 	/* 
 	 * List-type can override the width in the case of fixed-head
 	 * values (bullet, dash/hyphen, enum).  Tags need a non-zero
-	 * offset.
+	 * offset.  FIXME: double-check that correct.
 	 */
 
 	switch (type) {
@@ -769,6 +768,8 @@ termp_it_pre(DECL_ARGS)
 		if (width < 5)
 			width = 5;
 		break;
+	case (MDOC_Hang):
+		/* FALLTHROUGH */
 	case (MDOC_Tag):
 		if (0 == width)
 			width = 10;
@@ -786,6 +787,8 @@ termp_it_pre(DECL_ARGS)
 	case (MDOC_Diag):
 		term_word(p, "\\ ");
 		/* FALLTHROUGH */
+	case (MDOC_Hang):
+		/* FALLTHROUGH */
 	case (MDOC_Inset):
 		if (MDOC_BODY == node->type) 
 			p->flags &= ~TERMP_NOSPACE;
@@ -827,11 +830,17 @@ termp_it_pre(DECL_ARGS)
 		/* FALLTHROUGH */
 	case (MDOC_Hyphen):
 		/* FALLTHROUGH */
+	case (MDOC_Hang):
+		/* FALLTHROUGH */
 	case (MDOC_Tag):
 		if (MDOC_HEAD == node->type)
 			p->flags |= TERMP_NOBREAK;
 		else
 			p->flags |= TERMP_NOLPAD;
+
+		if (MDOC_HEAD == node->type && MDOC_Hang == type)
+			p->flags |= TERMP_NONOBREAK;
+
 		if (MDOC_HEAD == node->type && MDOC_Tag == type)
 			if (NULL == node->next ||
 					NULL == node->next->child)
@@ -873,6 +882,8 @@ termp_it_pre(DECL_ARGS)
 		/* FALLTHROUGH */
 	case (MDOC_Hyphen):
 		/* FALLTHROUGH */
+	case (MDOC_Hang):
+		/* FALLTHROUGH */
 	case (MDOC_Tag):
 		if (MDOC_HEAD == node->type)
 			p->rmargin = p->offset + width;
@@ -955,6 +966,7 @@ termp_it_post(DECL_ARGS)
 		return;
 
 	type = arg_listtype(node->parent->parent->parent);
+	assert(-1 != type);
 
 	switch (type) {
 	case (MDOC_Diag):
@@ -1279,23 +1291,6 @@ termp_bt_pre(DECL_ARGS)
 {
 
 	term_word(p, "is currently in beta test.");
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_lb_pre(DECL_ARGS)
-{
-	const char	*lb;
-
-	assert(node->child && MDOC_TEXT == node->child->type);
-	lb = mdoc_a2lib(node->child->string);
-	if (lb) {
-		term_word(p, lb);
-		return(0);
-	}
-	term_word(p, "library");
 	return(1);
 }