===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_term.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/usr.bin/mandoc/mdoc_term.c	2009/07/18 21:16:49	1.34
--- src/usr.bin/mandoc/mdoc_term.c	2009/07/18 22:07:09	1.35
***************
*** 1,4 ****
! /*	$Id: mdoc_term.c,v 1.34 2009/07/18 21:16:49 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: mdoc_term.c,v 1.35 2009/07/18 22:07:09 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 922,933 ****
  		case (MDOC_Bullet):
  			p->flags |= TERMP_BOLD;
  			term_word(p, "\\[bu]");
  			break;
  		case (MDOC_Dash):
  			/* FALLTHROUGH */
  		case (MDOC_Hyphen):
  			p->flags |= TERMP_BOLD;
! 			term_word(p, "\\-");
  			break;
  		case (MDOC_Enum):
  			(pair->ppair->ppair->count)++;
--- 922,935 ----
  		case (MDOC_Bullet):
  			p->flags |= TERMP_BOLD;
  			term_word(p, "\\[bu]");
+ 			p->flags &= ~TERMP_BOLD;
  			break;
  		case (MDOC_Dash):
  			/* FALLTHROUGH */
  		case (MDOC_Hyphen):
  			p->flags |= TERMP_BOLD;
! 			term_word(p, "\\(hy");
! 			p->flags &= ~TERMP_BOLD;
  			break;
  		case (MDOC_Enum):
  			(pair->ppair->ppair->count)++;
***************
*** 1080,1092 ****
  {
  	int		 i;
  
! 	/* FIXME: mandated by parser. */
  
- 	if (-1 == (i = arg_getattr(MDOC_Std, node)))
- 		errx(1, "expected -std argument");
- 	if (1 != node->args->argv[i].sz)
- 		errx(1, "expected -std argument");
- 
  	term_newln(p);
  	term_word(p, "The");
  
--- 1082,1091 ----
  {
  	int		 i;
  
! 	i = arg_getattr(MDOC_Std, node);
! 	assert(-1 != i);
! 	assert(node->args->argv[i].sz);
  
  	term_newln(p);
  	term_word(p, "The");
  
***************
*** 1115,1127 ****
  {
  	int		 i;
  
! 	/* FIXME: mandated by parser? */
  
- 	if (-1 == (i = arg_getattr(MDOC_Std, node)))
- 		errx(1, "expected -std argument");
- 	if (1 != node->args->argv[i].sz)
- 		errx(1, "expected -std argument");
- 
  	term_word(p, "The");
  	p->flags |= ttypes[TTYPE_PROG];
  	term_word(p, *node->args->argv[i].value);
--- 1114,1123 ----
  {
  	int		 i;
  
! 	i = arg_getattr(MDOC_Std, node);
! 	assert(-1 != i);
! 	assert(node->args->argv[i].sz);
  
  	term_word(p, "The");
  	p->flags |= ttypes[TTYPE_PROG];
  	term_word(p, *node->args->argv[i].value);
***************
*** 1734,1747 ****
  termp_ss_post(DECL_ARGS)
  {
  
! 	switch (node->type) {
! 	case (MDOC_HEAD):
  		term_newln(p);
- 		p->offset = INDENT;
- 		break;
- 	default:
- 		break;
- 	}
  }
  
  
--- 1730,1737 ----
  termp_ss_post(DECL_ARGS)
  {
  
! 	if (MDOC_HEAD == node->type)
  		term_newln(p);
  }