===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_term.c,v
retrieving revision 1.252
retrieving revision 1.253
diff -c -r1.252 -r1.253
*** src/usr.bin/mandoc/mdoc_term.c	2017/05/05 02:06:17	1.252
--- src/usr.bin/mandoc/mdoc_term.c	2017/05/05 13:17:04	1.253
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_term.c,v 1.252 2017/05/05 02:06:17 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_term.c,v 1.253 2017/05/05 13:17:04 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 104,110 ****
  static	int	  termp_in_pre(DECL_ARGS);
  static	int	  termp_it_pre(DECL_ARGS);
  static	int	  termp_li_pre(DECL_ARGS);
- static	int	  termp_ll_pre(DECL_ARGS);
  static	int	  termp_lk_pre(DECL_ARGS);
  static	int	  termp_nd_pre(DECL_ARGS);
  static	int	  termp_nm_pre(DECL_ARGS);
--- 104,109 ----
***************
*** 245,251 ****
  	{ termp_sp_pre, NULL }, /* sp */
  	{ NULL, termp____post }, /* %U */
  	{ NULL, NULL }, /* Ta */
- 	{ termp_ll_pre, NULL }, /* ll */
  };
  static	const struct termact *const termacts = __termacts - MDOC_Dd;
  
--- 244,249 ----
***************
*** 364,371 ****
  	default:
  		if (n->tok < ROFF_MAX) {
  			roff_term_pre(p, n);
! 			chld = 0;
! 			break;
  		}
  		assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
  		if (termacts[n->tok].pre != NULL &&
--- 362,368 ----
  	default:
  		if (n->tok < ROFF_MAX) {
  			roff_term_pre(p, n);
! 			return;
  		}
  		assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
  		if (termacts[n->tok].pre != NULL &&
***************
*** 389,397 ****
  	case ROFFT_EQN:
  		break;
  	default:
! 		if (n->tok < ROFF_MAX ||
! 		    termacts[n->tok].post == NULL ||
! 		    n->flags & NODE_ENDED)
  			break;
  		(void)(*termacts[n->tok].post)(p, &npair, meta, n);
  
--- 386,392 ----
  	case ROFFT_EQN:
  		break;
  	default:
! 		if (termacts[n->tok].post == NULL || n->flags & NODE_ENDED)
  			break;
  		(void)(*termacts[n->tok].post)(p, &npair, meta, n);
  
***************
*** 408,417 ****
  	if (NODE_EOS & n->flags)
  		p->flags |= TERMP_SENTENCE;
  
! 	if (MDOC_ll != n->tok) {
! 		p->offset = offset;
! 		p->rmargin = rmargin;
! 	}
  }
  
  static void
--- 403,410 ----
  	if (NODE_EOS & n->flags)
  		p->flags |= TERMP_SENTENCE;
  
! 	p->offset = offset;
! 	p->rmargin = rmargin;
  }
  
  static void
***************
*** 601,614 ****
  	term_vspace(p);
  }
  
- 
- static int
- termp_ll_pre(DECL_ARGS)
- {
- 
- 	term_setwidth(p, n->child != NULL ? n->child->string : NULL);
- 	return 0;
- }
  
  static int
  termp_it_pre(DECL_ARGS)
--- 594,599 ----