===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_term.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -c -r1.140 -r1.141
*** src/usr.bin/mandoc/man_term.c	2016/01/08 17:48:04	1.140
--- src/usr.bin/mandoc/man_term.c	2017/01/10 13:46:53	1.141
***************
*** 1,4 ****
! /*	$OpenBSD: man_term.c,v 1.140 2016/01/08 17:48:04 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: man_term.c,v 1.141 2017/01/10 13:46:53 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 317,323 ****
  			mt->fl |= MANT_LITERAL;
  		assert(nn->type == ROFFT_TEXT);
  		term_word(p, nn->string);
! 		if (nn->flags & MAN_EOS)
                  	p->flags |= TERMP_SENTENCE;
  		if (nn->next)
  			p->flags |= TERMP_NOSPACE;
--- 317,323 ----
  			mt->fl |= MANT_LITERAL;
  		assert(nn->type == ROFFT_TEXT);
  		term_word(p, nn->string);
! 		if (nn->flags & NODE_EOS)
                  	p->flags |= TERMP_SENTENCE;
  		if (nn->next)
  			p->flags |= TERMP_NOSPACE;
***************
*** 675,681 ****
  	/* Calculate offset. */
  
  	if ((nn = n->parent->head->child) != NULL &&
! 	    nn->string != NULL && ! (MAN_LINE & nn->flags) &&
  	    a2roffsu(nn->string, &su, SCALE_EN)) {
  		len = term_hspan(p, &su) / 24;
  		if (len < 0 && (size_t)(-len) > mt->offset)
--- 675,681 ----
  	/* Calculate offset. */
  
  	if ((nn = n->parent->head->child) != NULL &&
! 	    nn->string != NULL && ! (NODE_LINE & nn->flags) &&
  	    a2roffsu(nn->string, &su, SCALE_EN)) {
  		len = term_hspan(p, &su) / 24;
  		if (len < 0 && (size_t)(-len) > mt->offset)
***************
*** 696,702 ****
  
  		/* Don't print same-line elements. */
  		nn = n->child;
! 		while (NULL != nn && 0 == (MAN_LINE & nn->flags))
  			nn = nn->next;
  
  		while (NULL != nn) {
--- 696,702 ----
  
  		/* Don't print same-line elements. */
  		nn = n->child;
! 		while (NULL != nn && 0 == (NODE_LINE & nn->flags))
  			nn = nn->next;
  
  		while (NULL != nn) {
***************
*** 958,974 ****
  		if ('\0' == *n->string) {
  			term_vspace(p);
  			return;
! 		} else if (' ' == *n->string && MAN_LINE & n->flags)
  			term_newln(p);
  
  		term_word(p, n->string);
  		goto out;
  
  	case ROFFT_EQN:
! 		if ( ! (n->flags & MAN_LINE))
  			p->flags |= TERMP_NOSPACE;
  		term_eqn(p, n->eqn);
! 		if (n->next != NULL && ! (n->next->flags & MAN_LINE))
  			p->flags |= TERMP_NOSPACE;
  		return;
  	case ROFFT_TBL:
--- 958,974 ----
  		if ('\0' == *n->string) {
  			term_vspace(p);
  			return;
! 		} else if (' ' == *n->string && NODE_LINE & n->flags)
  			term_newln(p);
  
  		term_word(p, n->string);
  		goto out;
  
  	case ROFFT_EQN:
! 		if ( ! (n->flags & NODE_LINE))
  			p->flags |= TERMP_NOSPACE;
  		term_eqn(p, n->eqn);
! 		if (n->next != NULL && ! (n->next->flags & NODE_LINE))
  			p->flags |= TERMP_NOSPACE;
  		return;
  	case ROFFT_TBL:
***************
*** 1005,1011 ****
  	 */
  	if (mt->fl & MANT_LITERAL &&
  	    ! (p->flags & (TERMP_NOBREAK | TERMP_NONEWLINE)) &&
! 	    (n->next == NULL || n->next->flags & MAN_LINE)) {
  		rm = p->rmargin;
  		rmax = p->maxrmargin;
  		p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
--- 1005,1011 ----
  	 */
  	if (mt->fl & MANT_LITERAL &&
  	    ! (p->flags & (TERMP_NOBREAK | TERMP_NONEWLINE)) &&
! 	    (n->next == NULL || n->next->flags & NODE_LINE)) {
  		rm = p->rmargin;
  		rmax = p->maxrmargin;
  		p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
***************
*** 1021,1027 ****
  			p->rmargin = rm;
  		p->maxrmargin = rmax;
  	}
! 	if (MAN_EOS & n->flags)
  		p->flags |= TERMP_SENTENCE;
  }
  
--- 1021,1027 ----
  			p->rmargin = rm;
  		p->maxrmargin = rmax;
  	}
! 	if (NODE_EOS & n->flags)
  		p->flags |= TERMP_SENTENCE;
  }