===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/html.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/mandoc/html.c	2010/12/27 21:44:30	1.21
--- src/usr.bin/mandoc/html.c	2011/01/16 19:41:16	1.22
***************
*** 1,6 ****
! /*	$Id: html.c,v 1.21 2010/12/27 21:44:30 schwarze Exp $ */
  /*
!  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
--- 1,6 ----
! /*	$Id: html.c,v 1.22 2011/01/16 19:41:16 schwarze Exp $ */
  /*
!  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
***************
*** 86,91 ****
--- 86,92 ----
  	"id", /* ATTR_ID */
  	"summary", /* ATTR_SUMMARY */
  	"align", /* ATTR_ALIGN */
+ 	"colspan", /* ATTR_COLSPAN */
  };
  
  static	void		  print_spec(struct html *, enum roffdeco,
***************
*** 577,584 ****
--- 578,591 ----
  	struct tag	*tag;
  
  	while ((tag = h->tags.head) != NULL) {
+ 		/* 
+ 		 * Remember to close out and nullify the current
+ 		 * meta-font and table, if applicable.
+ 		 */
  		if (tag == h->metaf)
  			h->metaf = NULL;
+ 		if (tag == h->tblt)
+ 			h->tblt = NULL;
  		print_ctag(h, tag->tag);
  		h->tags.head = tag->next;
  		free(tag);
***************
*** 596,603 ****
--- 603,616 ----
  	while ((tag = h->tags.head) != NULL) {
  		if (suntil && tag == suntil)
  			return;
+ 		/* 
+ 		 * Remember to close out and nullify the current
+ 		 * meta-font and table, if applicable.
+ 		 */
  		if (tag == h->metaf)
  			h->metaf = NULL;
+ 		if (tag == h->tblt)
+ 			h->tblt = NULL;
  		print_ctag(h, tag->tag);
  		h->tags.head = tag->next;
  		free(tag);