===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -c -r1.141 -r1.142
*** src/usr.bin/mandoc/term.c	2019/06/03 20:23:39	1.141
--- src/usr.bin/mandoc/term.c	2020/09/02 16:36:48	1.142
***************
*** 1,7 ****
! /*	$OpenBSD: term.c,v 1.141 2019/06/03 20:23:39 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2010-2019 Ingo Schwarze <schwarze@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
--- 1,7 ----
! /* $OpenBSD: term.c,v 1.142 2020/09/02 16:36:48 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2010-2020 Ingo Schwarze <schwarze@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
***************
*** 36,43 ****
  static	void		 encode(struct termp *, const char *, size_t);
  static	void		 encode1(struct termp *, int);
  static	void		 endline(struct termp *);
! static	void		 term_field(struct termp *, size_t, size_t,
! 				size_t, size_t);
  static	void		 term_fill(struct termp *, size_t *, size_t *,
  				size_t);
  
--- 36,42 ----
  static	void		 encode(struct termp *, const char *, size_t);
  static	void		 encode1(struct termp *, int);
  static	void		 endline(struct termp *);
! static	void		 term_field(struct termp *, size_t, size_t);
  static	void		 term_fill(struct termp *, size_t *, size_t *,
  				size_t);
  
***************
*** 125,132 ****
  		 * and with the BRNEVER flag, never break it at all.
  		 */
  
! 		vtarget = p->flags & TERMP_BRNEVER ? SIZE_MAX :
! 		    (p->flags & TERMP_NOBREAK) == 0 ? vfield :
  		    p->maxrmargin > p->viscol + vbl ?
  		    p->maxrmargin - p->viscol - vbl : 0;
  
--- 124,130 ----
  		 * and with the BRNEVER flag, never break it at all.
  		 */
  
! 		vtarget = (p->flags & TERMP_NOBREAK) == 0 ? vfield :
  		    p->maxrmargin > p->viscol + vbl ?
  		    p->maxrmargin - p->viscol - vbl : 0;
  
***************
*** 135,141 ****
  		 * If there is whitespace only, print nothing.
  		 */
  
! 		term_fill(p, &nbr, &vbr, vtarget);
  		if (nbr == 0)
  			break;
  
--- 133,140 ----
  		 * If there is whitespace only, print nothing.
  		 */
  
! 		term_fill(p, &nbr, &vbr,
! 		    p->flags & TERMP_BRNEVER ? SIZE_MAX : vtarget);
  		if (nbr == 0)
  			break;
  
***************
*** 154,160 ****
  
  		/* Finally, print the field content. */
  
! 		term_field(p, vbl, nbr, vbr, vtarget);
  
  		/*
  		 * If there is no text left in the field, exit the loop.
--- 153,159 ----
  
  		/* Finally, print the field content. */
  
! 		term_field(p, vbl, nbr);
  
  		/*
  		 * If there is no text left in the field, exit the loop.
***************
*** 343,354 ****
  /*
   * Print the contents of one field
   * with an indentation of	 vbl	  visual columns,
!  * an input string length of	 nbr	  characters,
!  * an output width of		 vbr	  visual columns,
!  * and a desired field width of	 vtarget  visual columns.
   */
  static void
! term_field(struct termp *p, size_t vbl, size_t nbr, size_t vbr, size_t vtarget)
  {
  	size_t	 ic;	/* Character position in the input buffer. */
  	size_t	 vis;	/* Visual position of the current character. */
--- 342,351 ----
  /*
   * Print the contents of one field
   * with an indentation of	 vbl	  visual columns,
!  * and an input string length of nbr	  characters.
   */
  static void
! term_field(struct termp *p, size_t vbl, size_t nbr)
  {
  	size_t	 ic;	/* Character position in the input buffer. */
  	size_t	 vis;	/* Visual position of the current character. */