===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term_ascii.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -c -r1.41 -r1.42
*** src/usr.bin/mandoc/term_ascii.c	2017/05/08 15:33:43	1.41
--- src/usr.bin/mandoc/term_ascii.c	2017/06/07 17:38:08	1.42
***************
*** 1,4 ****
! /*	$OpenBSD: term_ascii.c,v 1.41 2017/05/08 15:33:43 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: term_ascii.c,v 1.42 2017/06/07 17:38:08 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 55,66 ****
  	char		*v;
  	struct termp	*p;
  
! 	p = mandoc_calloc(1, sizeof(struct termp));
  
  	p->line = 1;
  	p->defrmargin = p->lastrmargin = 78;
  	p->fontq = mandoc_reallocarray(NULL,
! 	     (p->fontsz = 8), sizeof(enum termfont));
  	p->fontq[0] = p->fontl = TERMFONT_NONE;
  
  	p->begin = ascii_begin;
--- 55,68 ----
  	char		*v;
  	struct termp	*p;
  
! 	p = mandoc_calloc(1, sizeof(*p));
! 	p->tcol = p->tcols = mandoc_calloc(1, sizeof(*p->tcol));
! 	p->maxtcol = 1;
  
  	p->line = 1;
  	p->defrmargin = p->lastrmargin = 78;
  	p->fontq = mandoc_reallocarray(NULL,
! 	     (p->fontsz = 8), sizeof(*p->fontq));
  	p->fontq[0] = p->fontl = TERMFONT_NONE;
  
  	p->begin = ascii_begin;
***************
*** 136,142 ****
  {
  
  	width /= 24;
! 	p->rmargin = p->defrmargin;
  	if (iop > 0)
  		p->defrmargin += width;
  	else if (iop == 0)
--- 138,144 ----
  {
  
  	width /= 24;
! 	p->tcol->rmargin = p->defrmargin;
  	if (iop > 0)
  		p->defrmargin += width;
  	else if (iop == 0)
***************
*** 145,152 ****
  		p->defrmargin -= width;
  	else
  		p->defrmargin = 0;
! 	p->lastrmargin = p->rmargin;
! 	p->rmargin = p->maxrmargin = p->defrmargin;
  }
  
  void
--- 147,154 ----
  		p->defrmargin -= width;
  	else
  		p->defrmargin = 0;
! 	p->lastrmargin = p->tcol->rmargin;
! 	p->tcol->rmargin = p->maxrmargin = p->defrmargin;
  }
  
  void
***************
*** 203,209 ****
  {
  
  	p->line++;
! 	p->offset -= p->ti;
  	p->ti = 0;
  	putchar('\n');
  }
--- 205,211 ----
  {
  
  	p->line++;
! 	p->tcol->offset -= p->ti;
  	p->ti = 0;
  	putchar('\n');
  }
***************
*** 358,364 ****
  {
  
  	p->line++;
! 	p->offset -= p->ti;
  	p->ti = 0;
  	putwchar(L'\n');
  }
--- 360,366 ----
  {
  
  	p->line++;
! 	p->tcol->offset -= p->ti;
  	p->ti = 0;
  	putwchar(L'\n');
  }