===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tbl_html.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/mandoc/tbl_html.c	2018/11/24 23:03:13	1.20
--- src/usr.bin/mandoc/tbl_html.c	2018/11/25 19:23:59	1.21
***************
*** 1,4 ****
! /*	$OpenBSD: tbl_html.c,v 1.20 2018/11/24 23:03:13 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: tbl_html.c,v 1.21 2018/11/25 19:23:59 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 99,108 ****
  void
  print_tbl(struct html *h, const struct tbl_span *sp)
  {
! 	const struct tbl_dat *dp;
! 	struct tag	*tt;
! 	const char	*halign, *valign;
! 	int		 ic;
  
  	/* Inhibit printing of spaces: we do padding ourselves. */
  
--- 99,108 ----
  void
  print_tbl(struct html *h, const struct tbl_span *sp)
  {
! 	const struct tbl_dat	*dp;
! 	struct tag		*tt;
! 	const char		*hspans, *vspans, *halign, *valign;
! 	char			 hbuf[4], vbuf[4];
  
  	/* Inhibit printing of spaces: we do padding ourselves. */
  
***************
*** 122,134 ****
  		print_otag(h, TAG_TD, "?", "colspan", "0");
  		break;
  	default:
! 		dp = sp->first;
! 		for (ic = 0; ic < sp->opts->cols; ic++) {
  			print_stagq(h, tt);
! 			if (dp == NULL || dp->layout->col > ic) {
! 				print_otag(h, TAG_TD, "");
  				continue;
  			}
  			switch (dp->layout->pos) {
  			case TBL_CELL_CENTRE:
  				halign = "center";
--- 122,152 ----
  		print_otag(h, TAG_TD, "?", "colspan", "0");
  		break;
  	default:
! 		for (dp = sp->first; dp != NULL; dp = dp->next) {
  			print_stagq(h, tt);
! 			switch (dp->layout->pos) {
! 			case TBL_CELL_SPAN:
! 			case TBL_CELL_DOWN:
  				continue;
+ 			default:
+ 				break;
  			}
+ 
+ 			/* Determine the attribute values. */
+ 
+ 			if (dp->hspans > 0) {
+ 				(void)snprintf(hbuf, sizeof(hbuf),
+ 				    "%d", dp->hspans + 1);
+ 				hspans = hbuf;
+ 			} else
+ 				hspans = NULL;
+ 			if (dp->vspans > 0) {
+ 				(void)snprintf(vbuf, sizeof(vbuf),
+ 				    "%d", dp->vspans + 1);
+ 				vspans = vbuf;
+ 			} else
+ 				vspans = NULL;
+ 
  			switch (dp->layout->pos) {
  			case TBL_CELL_CENTRE:
  				halign = "center";
***************
*** 147,168 ****
  				valign = "bottom";
  			else
  				valign = NULL;
  			if (halign == NULL && valign == NULL)
! 				print_otag(h, TAG_TD, "");
  			else if (halign == NULL)
! 				print_otag(h, TAG_TD, "s",
  				    "vertical-align", valign);
  			else if (valign == NULL)
! 				print_otag(h, TAG_TD, "s",
  				    "text-align", halign);
  			else
! 				print_otag(h, TAG_TD, "ss",
  				    "vertical-align", valign,
  				    "text-align", halign);
! 			if (dp->layout->pos != TBL_CELL_DOWN)
! 				if (dp->string != NULL)
! 					print_text(h, dp->string);
! 			dp = dp->next;
  		}
  		break;
  	}
--- 165,191 ----
  				valign = "bottom";
  			else
  				valign = NULL;
+ 
+ 			/* Print the element and the attributes. */
+ 
  			if (halign == NULL && valign == NULL)
! 				print_otag(h, TAG_TD, "??",
! 				    "colspan", hspans, "rowspan", vspans);
  			else if (halign == NULL)
! 				print_otag(h, TAG_TD, "??s",
! 				    "colspan", hspans, "rowspan", vspans,
  				    "vertical-align", valign);
  			else if (valign == NULL)
! 				print_otag(h, TAG_TD, "??s",
! 				    "colspan", hspans, "rowspan", vspans,
  				    "text-align", halign);
  			else
! 				print_otag(h, TAG_TD, "??ss",
! 				    "colspan", hspans, "rowspan", vspans,
  				    "vertical-align", valign,
  				    "text-align", halign);
! 			if (dp->string != NULL)
! 				print_text(h, dp->string);
  		}
  		break;
  	}