===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_term.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -c -r1.135 -r1.136
*** src/usr.bin/mandoc/mdoc_term.c	2011/09/18 10:25:28	1.135
--- src/usr.bin/mandoc/mdoc_term.c	2011/09/19 22:36:11	1.136
***************
*** 1,4 ****
! /*	$Id: mdoc_term.c,v 1.135 2011/09/18 10:25:28 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mdoc_term.c,v 1.136 2011/09/19 22:36:11 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 431,437 ****
  
  	p->offset = p->rmargin;
  	p->rmargin = p->maxrmargin - term_strlen(p, m->os);
! 	p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
  
  	term_word(p, m->date);
  	term_flushln(p);
--- 431,437 ----
  
  	p->offset = p->rmargin;
  	p->rmargin = p->maxrmargin - term_strlen(p, m->os);
! 	p->flags |= TERMP_NOSPACE;
  
  	term_word(p, m->date);
  	term_flushln(p);
***************
*** 439,445 ****
  	p->offset = p->rmargin;
  	p->rmargin = p->maxrmargin;
  	p->flags &= ~TERMP_NOBREAK;
! 	p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
  
  	term_word(p, m->os);
  	term_flushln(p);
--- 439,445 ----
  	p->offset = p->rmargin;
  	p->rmargin = p->maxrmargin;
  	p->flags &= ~TERMP_NOBREAK;
! 	p->flags |= TERMP_NOSPACE;
  
  	term_word(p, m->os);
  	term_flushln(p);
***************
*** 495,501 ****
  
  	p->offset = p->rmargin;
  	p->rmargin = p->maxrmargin - term_strlen(p, title);
! 	p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
  
  	term_word(p, buf);
  	term_flushln(p);
--- 495,501 ----
  
  	p->offset = p->rmargin;
  	p->rmargin = p->maxrmargin - term_strlen(p, title);
! 	p->flags |= TERMP_NOSPACE;
  
  	term_word(p, buf);
  	term_flushln(p);
***************
*** 503,509 ****
  	p->offset = p->rmargin;
  	p->rmargin = p->maxrmargin;
  	p->flags &= ~TERMP_NOBREAK;
! 	p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
  
  	term_word(p, title);
  	term_flushln(p);
--- 503,509 ----
  	p->offset = p->rmargin;
  	p->rmargin = p->maxrmargin;
  	p->flags &= ~TERMP_NOBREAK;
! 	p->flags |= TERMP_NOSPACE;
  
  	term_word(p, title);
  	term_flushln(p);
***************
*** 783,798 ****
  	case (LIST_hyphen):
  		if (MDOC_HEAD == n->type)
  			p->flags |= TERMP_NOBREAK;
- 		else
- 			p->flags |= TERMP_NOLPAD;
  		break;
  	case (LIST_hang):
  		if (MDOC_HEAD == n->type)
  			p->flags |= TERMP_NOBREAK;
  		else
- 			p->flags |= TERMP_NOLPAD;
- 
- 		if (MDOC_HEAD != n->type)
  			break;
  
  		/*
--- 783,793 ----
***************
*** 803,819 ****
  		 */
  		if (n->next->child && 
  				(MDOC_Bl == n->next->child->tok ||
! 				 MDOC_Bd == n->next->child->tok)) {
  			p->flags &= ~TERMP_NOBREAK;
! 			p->flags &= ~TERMP_NOLPAD;
! 		} else
  			p->flags |= TERMP_HANG;
  		break;
  	case (LIST_tag):
  		if (MDOC_HEAD == n->type)
  			p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE;
- 		else
- 			p->flags |= TERMP_NOLPAD;
  
  		if (MDOC_HEAD != n->type)
  			break;
--- 798,811 ----
  		 */
  		if (n->next->child && 
  				(MDOC_Bl == n->next->child->tok ||
! 				 MDOC_Bd == n->next->child->tok))
  			p->flags &= ~TERMP_NOBREAK;
! 		else
  			p->flags |= TERMP_HANG;
  		break;
  	case (LIST_tag):
  		if (MDOC_HEAD == n->type)
  			p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE;
  
  		if (MDOC_HEAD != n->type)
  			break;
***************
*** 829,838 ****
  		else
  			p->flags |= TERMP_NOBREAK;
  
- 		assert(n->prev);
- 		if (MDOC_BODY == n->prev->type) 
- 			p->flags |= TERMP_NOLPAD;
- 
  		break;
  	case (LIST_diag):
  		if (MDOC_HEAD == n->type)
--- 821,826 ----
***************
*** 989,995 ****
  	p->flags &= ~TERMP_DANGLE;
  	p->flags &= ~TERMP_NOBREAK;
  	p->flags &= ~TERMP_TWOSPACE;
- 	p->flags &= ~TERMP_NOLPAD;
  	p->flags &= ~TERMP_HANG;
  }
  
--- 977,982 ----
***************
*** 1005,1011 ****
  	if (MDOC_BODY == n->type) {
  		if (NULL == n->child)
  			return(0);
! 		p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
  		p->offset += term_len(p, 1) +
  		    (NULL == n->prev->child ? term_strlen(p, m->name) :
  		     MDOC_TEXT == n->prev->child->type ?
--- 992,998 ----
  	if (MDOC_BODY == n->type) {
  		if (NULL == n->child)
  			return(0);
! 		p->flags |= TERMP_NOSPACE;
  		p->offset += term_len(p, 1) +
  		    (NULL == n->prev->child ? term_strlen(p, m->name) :
  		     MDOC_TEXT == n->prev->child->type ?
***************
*** 1050,1059 ****
  	if (MDOC_HEAD == n->type && n->next->child) {
  		term_flushln(p);
  		p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);
! 	} else if (MDOC_BODY == n->type && n->child) {
  		term_flushln(p);
- 		p->flags &= ~TERMP_NOLPAD;
- 	}
  }
  
  		
--- 1037,1044 ----
  	if (MDOC_HEAD == n->type && n->next->child) {
  		term_flushln(p);
  		p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);
! 	} else if (MDOC_BODY == n->type && n->child)
  		term_flushln(p);
  }