===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -c -r1.129 -r1.130
*** src/usr.bin/mandoc/term.c	2017/06/12 18:55:42	1.129
--- src/usr.bin/mandoc/term.c	2017/06/14 01:31:19	1.130
***************
*** 1,4 ****
! /*	$OpenBSD: term.c,v 1.129 2017/06/12 18:55:42 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: term.c,v 1.130 2017/06/14 01:31:19 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 114,119 ****
--- 114,120 ----
  	size_t		 jhy;	/* last hyph before overflow w/r/t j */
  	size_t		 maxvis; /* output position of visible boundary */
  	int		 ntab;	/* number of tabs to prepend */
+ 	int		 breakline; /* after this word */
  
  	vbl = (p->flags & TERMP_NOPAD) || p->tcol->offset < p->viscol ?
  	    0 : p->tcol->offset - p->viscol;
***************
*** 153,159 ****
--- 154,166 ----
  		 */
  
  		jhy = 0;
+ 		breakline = 0;
  		for (j = p->tcol->col; j < p->tcol->lastcol; j++) {
+ 			if (p->tcol->buf[j] == '\n') {
+ 				if ((p->flags & TERMP_BRIND) == 0)
+ 					breakline = 1;
+ 				continue;
+ 			}
  			if (p->tcol->buf[j] == ' ' || p->tcol->buf[j] == '\t')
  				break;
  
***************
*** 219,224 ****
--- 226,233 ----
  		for ( ; p->tcol->col < p->tcol->lastcol; p->tcol->col++) {
  			if (vend > bp && jhy > 0 && p->tcol->col > jhy)
  				break;
+ 			if (p->tcol->buf[p->tcol->col] == '\n')
+ 				continue;
  			if (p->tcol->buf[p->tcol->col] == '\t')
  				break;
  			if (p->tcol->buf[p->tcol->col] == ' ') {
***************
*** 258,263 ****
--- 267,292 ----
  				    p->tcol->buf[p->tcol->col]);
  		}
  		vis = vend;
+ 
+ 		if (breakline == 0)
+ 			continue;
+ 
+ 		/* Explicitly requested output line break. */
+ 
+ 		if (p->flags & TERMP_MULTICOL)
+ 			return;
+ 
+ 		endline(p);
+ 		breakline = 0;
+ 		vis = vend = 0;
+ 
+ 		/* Re-establish indentation. */
+ 
+ 		vbl = p->tcol->offset;
+ 		maxvis = p->tcol->rmargin > vbl ?
+ 		    p->tcol->rmargin - vbl : 0;
+ 		bp = !(p->flags & TERMP_NOBREAK) ? maxvis :
+ 		    p->maxrmargin > vbl ?  p->maxrmargin - vbl : 0;
  	}
  
  	/*
***************
*** 484,489 ****
--- 513,521 ----
  			continue;
  		case ESCAPE_FONTPREV:
  			term_fontlast(p);
+ 			continue;
+ 		case ESCAPE_BREAK:
+ 			bufferc(p, '\n');
  			continue;
  		case ESCAPE_NOSPACE:
  			if (p->flags & TERMP_BACKAFTER)