===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tbl_term.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -c -r1.56 -r1.57
*** src/usr.bin/mandoc/tbl_term.c	2019/02/09 21:01:24	1.56
--- src/usr.bin/mandoc/tbl_term.c	2019/03/16 21:35:11	1.57
***************
*** 1,4 ****
! /*	$OpenBSD: tbl_term.c,v 1.56 2019/02/09 21:01:24 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011-2019 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: tbl_term.c,v 1.57 2019/03/16 21:35:11 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011-2019 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 44,50 ****
  static	void	tbl_fill_char(struct termp *, char, size_t);
  static	void	tbl_fill_string(struct termp *, const char *, size_t);
  static	void	tbl_hrule(struct termp *, const struct tbl_span *,
! 			const struct tbl_span *, int);
  static	void	tbl_literal(struct termp *, const struct tbl_dat *,
  			const struct roffcol *);
  static	void	tbl_number(struct termp *, const struct tbl_opts *,
--- 44,51 ----
  static	void	tbl_fill_char(struct termp *, char, size_t);
  static	void	tbl_fill_string(struct termp *, const char *, size_t);
  static	void	tbl_hrule(struct termp *, const struct tbl_span *,
! 			const struct tbl_span *, const struct tbl_span *,
! 			int);
  static	void	tbl_literal(struct termp *, const struct tbl_dat *,
  			const struct roffcol *);
  static	void	tbl_number(struct termp *, const struct tbl_opts *,
***************
*** 220,228 ****
  
  		if (tp->enc == TERMENC_ASCII &&
  		    sp->opts->opts & TBL_OPT_DBOX)
! 			tbl_hrule(tp, NULL, sp, TBL_OPT_DBOX);
  		if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX))
! 			tbl_hrule(tp, NULL, sp, TBL_OPT_BOX);
  	}
  
  	/* Set up the columns. */
--- 221,229 ----
  
  		if (tp->enc == TERMENC_ASCII &&
  		    sp->opts->opts & TBL_OPT_DBOX)
! 			tbl_hrule(tp, NULL, sp, sp, TBL_OPT_DBOX);
  		if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX))
! 			tbl_hrule(tp, NULL, sp, sp, TBL_OPT_BOX);
  	}
  
  	/* Set up the columns. */
***************
*** 340,346 ****
  
  		more = 0;
  		if (horiz)
! 			tbl_hrule(tp, sp->prev, sp, 0);
  		else {
  			cp = sp->layout->first;
  			cpn = sp->next == NULL ? NULL :
--- 341,347 ----
  
  		more = 0;
  		if (horiz)
! 			tbl_hrule(tp, sp->prev, sp, sp->next, 0);
  		else {
  			cp = sp->layout->first;
  			cpn = sp->next == NULL ? NULL :
***************
*** 555,566 ****
  	tp->tcol->rmargin = tp->maxrmargin;
  	if (sp->next == NULL) {
  		if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) {
! 			tbl_hrule(tp, sp, NULL, TBL_OPT_BOX);
  			tp->skipvsp = 1;
  		}
  		if (tp->enc == TERMENC_ASCII &&
  		    sp->opts->opts & TBL_OPT_DBOX) {
! 			tbl_hrule(tp, sp, NULL, TBL_OPT_DBOX);
  			tp->skipvsp = 2;
  		}
  		assert(tp->tbl.cols);
--- 556,567 ----
  	tp->tcol->rmargin = tp->maxrmargin;
  	if (sp->next == NULL) {
  		if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) {
! 			tbl_hrule(tp, sp, sp, NULL, TBL_OPT_BOX);
  			tp->skipvsp = 1;
  		}
  		if (tp->enc == TERMENC_ASCII &&
  		    sp->opts->opts & TBL_OPT_DBOX) {
! 			tbl_hrule(tp, sp, sp, NULL, TBL_OPT_DBOX);
  			tp->skipvsp = 2;
  		}
  		assert(tp->tbl.cols);
***************
*** 569,575 ****
  	} else if (horiz == 0 && sp->opts->opts & TBL_OPT_ALLBOX &&
  	    (sp->next == NULL || sp->next->pos == TBL_SPAN_DATA ||
  	     sp->next->next != NULL))
! 		tbl_hrule(tp, sp, sp->next, TBL_OPT_ALLBOX);
  
  	tp->tcol->offset = save_offset;
  	tp->flags &= ~TERMP_NONOSPACE;
--- 570,576 ----
  	} else if (horiz == 0 && sp->opts->opts & TBL_OPT_ALLBOX &&
  	    (sp->next == NULL || sp->next->pos == TBL_SPAN_DATA ||
  	     sp->next->next != NULL))
! 		tbl_hrule(tp, sp, sp, sp->next, TBL_OPT_ALLBOX);
  
  	tp->tcol->offset = save_offset;
  	tp->flags &= ~TERMP_NONOSPACE;
***************
*** 577,585 ****
  
  static void
  tbl_hrule(struct termp *tp, const struct tbl_span *spp,
!     const struct tbl_span *spn, int flags)
  {
  	const struct tbl_cell	*cpp;    /* Layout cell above this line. */
  	const struct tbl_cell	*cpn;    /* Layout cell below this line. */
  	const struct tbl_dat	*dpn;	 /* Data cell below this line. */
  	const struct roffcol	*col;    /* Contains width and spacing. */
--- 578,587 ----
  
  static void
  tbl_hrule(struct termp *tp, const struct tbl_span *spp,
!     const struct tbl_span *sp, const struct tbl_span *spn, int flags)
  {
  	const struct tbl_cell	*cpp;    /* Layout cell above this line. */
+ 	const struct tbl_cell	*cp;     /* Layout cell in this line. */
  	const struct tbl_cell	*cpn;    /* Layout cell below this line. */
  	const struct tbl_dat	*dpn;	 /* Data cell below this line. */
  	const struct roffcol	*col;    /* Contains width and spacing. */
***************
*** 590,595 ****
--- 592,598 ----
  	int			 uw, dw; /* Vertical line widths. */
  
  	cpp = spp == NULL ? NULL : spp->layout->first;
+ 	cp  = sp  == NULL ? NULL : sp->layout->first;
  	cpn = spn == NULL ? NULL : spn->layout->first;
  	dpn = NULL;
  	if (spn != NULL) {
***************
*** 598,608 ****
  		else if (spn->next != NULL)
  			dpn = spn->next->first;
  	}
! 	opts = spn == NULL ? spp->opts->opts : spn->opts->opts;
  	bw = opts & TBL_OPT_DBOX ? (tp->enc == TERMENC_UTF8 ? 2 : 1) :
  	    opts & (TBL_OPT_BOX | TBL_OPT_ALLBOX) ? 1 : 0;
  	hw = flags == TBL_OPT_DBOX || flags == TBL_OPT_BOX ? bw :
! 	    spn->pos == TBL_SPAN_DHORIZ ? 2 : 1;
  
  	/* Print the left end of the line. */
  
--- 601,611 ----
  		else if (spn->next != NULL)
  			dpn = spn->next->first;
  	}
! 	opts = sp->opts->opts;
  	bw = opts & TBL_OPT_DBOX ? (tp->enc == TERMENC_UTF8 ? 2 : 1) :
  	    opts & (TBL_OPT_BOX | TBL_OPT_ALLBOX) ? 1 : 0;
  	hw = flags == TBL_OPT_DBOX || flags == TBL_OPT_BOX ? bw :
! 	    sp->pos == TBL_SPAN_DHORIZ ? 2 : 1;
  
  	/* Print the left end of the line. */
  
***************
*** 618,624 ****
  		     cpn->pos != TBL_CELL_DOWN ? BRIGHT * hw : 0), 1);
  
  	for (;;) {
! 		col = tp->tbl.cols + (cpn == NULL ? cpp->col : cpn->col);
  
  		/* Print the horizontal line inside this column. */
  
--- 621,627 ----
  		     cpn->pos != TBL_CELL_DOWN ? BRIGHT * hw : 0), 1);
  
  	for (;;) {
! 		col = tp->tbl.cols + cp->col;
  
  		/* Print the horizontal line inside this column. */
  
***************
*** 644,649 ****
--- 647,654 ----
  			}
  			cpp = cpp->next;
  		}
+ 		if (cp != NULL)
+ 			cp = cp->next;
  		if (cpn != NULL) {
  			if (flags != TBL_OPT_DBOX) {
  				dw = cpn->vert;
***************
*** 654,660 ****
  			while (dpn != NULL && dpn->layout != cpn)
  				dpn = dpn->next;
  		}
! 		if (cpp == NULL && cpn == NULL)
  			break;
  
  		/* Vertical lines do not cross spanned cells. */
--- 659,665 ----
  			while (dpn != NULL && dpn->layout != cpn)
  				dpn = dpn->next;
  		}
! 		if (cpp == NULL && cp == NULL && cpn == NULL)
  			break;
  
  		/* Vertical lines do not cross spanned cells. */