===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_html.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/mandoc/man_html.c	2009/12/22 23:58:00	1.3
--- src/usr.bin/mandoc/man_html.c	2009/12/24 02:08:14	1.4
***************
*** 1,4 ****
! /*	$Id: man_html.c,v 1.3 2009/12/22 23:58:00 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: man_html.c,v 1.4 2009/12/24 02:08:14 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 183,190 ****
  		break;
  	case (MAN_TEXT):
  		print_text(h, n->string);
! 		break;
  	default:
  		if (mans[n->tok].pre)
  			child = (*mans[n->tok].pre)(m, n, h);
  		break;
--- 183,201 ----
  		break;
  	case (MAN_TEXT):
  		print_text(h, n->string);
! 		return;
  	default:
+ 		/* 
+ 		 * Close out scope of font prior to opening a macro
+ 		 * scope.  Assert that the metafont is on the top of the
+ 		 * stack (it's never nested).
+ 		 */
+ 		if (h->metaf) {
+ 			assert(h->metaf == t);
+ 			print_tagq(h, h->metaf);
+ 			assert(NULL == h->metaf);
+ 			t = h->tags.head;
+ 		}
  		if (mans[n->tok].pre)
  			child = (*mans[n->tok].pre)(m, n, h);
  		break;
***************
*** 193,198 ****
--- 204,210 ----
  	if (child && n->child)
  		print_man_nodelist(m, n->child, h);
  
+ 	/* This will automatically close out any font scope. */
  	print_stagq(h, t);
  
  	bufinit(h);
***************
*** 236,243 ****
  	if (m->vol)
  		(void)strlcat(b, m->vol, BUFSIZ);
  
! 	(void)snprintf(title, BUFSIZ - 1, 
! 			"%s(%d)", m->title, m->msec);
  
  	PAIR_CLASS_INIT(&tag[0], "header");
  	bufcat_style(h, "width", "100%");
--- 248,254 ----
  	if (m->vol)
  		(void)strlcat(b, m->vol, BUFSIZ);
  
! 	snprintf(title, BUFSIZ - 1, "%s(%d)", m->title, m->msec);
  
  	PAIR_CLASS_INIT(&tag[0], "header");
  	bufcat_style(h, "width", "100%");
***************
*** 328,333 ****
--- 339,345 ----
  	bufcat_su(h, "height", &su);
  	PAIR_STYLE_INIT(&tag, h);
  	print_otag(h, TAG_DIV, 1, &tag);
+ 
  	/* So the div isn't empty: */
  	print_text(h, "\\~");
  
***************
*** 379,408 ****
  	const struct man_node	*nn;
  	struct tag		*t;
  	int			 i;
! 	struct htmlpair		 tagi, tagb, *tagp;
  
- 	PAIR_CLASS_INIT(&tagi, "italic");
- 	PAIR_CLASS_INIT(&tagb, "bold");
- 
  	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
  		switch (n->tok) {
  		case (MAN_BI):
! 			tagp = i % 2 ? &tagi : &tagb;
  			break;
  		case (MAN_IB):
! 			tagp = i % 2 ? &tagb : &tagi;
  			break;
  		case (MAN_RI):
! 			tagp = i % 2 ? &tagi : NULL;
  			break;
  		case (MAN_IR):
! 			tagp = i % 2 ? NULL : &tagi;
  			break;
  		case (MAN_BR):
! 			tagp = i % 2 ? NULL : &tagb;
  			break;
  		case (MAN_RB):
! 			tagp = i % 2 ? &tagb : NULL;
  			break;
  		default:
  			abort();
--- 391,417 ----
  	const struct man_node	*nn;
  	struct tag		*t;
  	int			 i;
! 	enum htmlfont		 fp;
  
  	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
  		switch (n->tok) {
  		case (MAN_BI):
! 			fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_BOLD;
  			break;
  		case (MAN_IB):
! 			fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_ITALIC;
  			break;
  		case (MAN_RI):
! 			fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_NONE;
  			break;
  		case (MAN_IR):
! 			fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_ITALIC;
  			break;
  		case (MAN_BR):
! 			fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_BOLD;
  			break;
  		case (MAN_RB):
! 			fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_NONE;
  			break;
  		default:
  			abort();
***************
*** 412,423 ****
  		if (i)
  			h->flags |= HTML_NOSPACE;
  
! 		if (tagp) {
! 			t = print_otag(h, TAG_SPAN, 1, tagp);
! 			print_man_node(m, nn, h);
! 			print_tagq(h, t);
! 		} else
! 			print_man_node(m, nn, h);
  	}
  
  	return(0);
--- 421,434 ----
  		if (i)
  			h->flags |= HTML_NOSPACE;
  
! 		/* 
! 		 * Open and close the scope with each argument, so that
! 		 * internal \f escapes, which are common, are also
! 		 * closed out with the scope.
! 		 */
! 		t = print_ofont(h, fp);
! 		print_man_node(m, nn, h);
! 		print_tagq(h, t);
  	}
  
  	return(0);
***************
*** 430,435 ****
--- 441,447 ----
  {
  	struct htmlpair	 tag;
  	
+ 	/* FIXME: print_ofont(). */
  	PAIR_CLASS_INIT(&tag, "small bold");
  	print_otag(h, TAG_SPAN, 1, &tag);
  	return(1);
***************
*** 504,522 ****
  
  	i = 0;
  
! 	if (MAN_ROOT == n->parent->tok) {
  		SCALE_HS_INIT(&su, INDENT);
  		bufcat_su(h, "margin-left", &su);
! 		i++;
  	}
! 	if (n->next && n->next->child) {
  		SCALE_VS_INIT(&su, 1);
! 		bufcat_su(h, "margin-bottom", &su);
! 		i++;
  	}
  
  	PAIR_STYLE_INIT(&tag, h);
! 	print_otag(h, TAG_DIV, i ? 1 : 0, &tag);
  	return(1);
  }
  
--- 516,534 ----
  
  	i = 0;
  
! 	if (MAN_ROOT == n->parent->type) {
  		SCALE_HS_INIT(&su, INDENT);
  		bufcat_su(h, "margin-left", &su);
! 		i = 1;
  	}
! 	if (n->prev) {
  		SCALE_VS_INIT(&su, 1);
! 		bufcat_su(h, "margin-top", &su);
! 		i = 1;
  	}
  
  	PAIR_STYLE_INIT(&tag, h);
! 	print_otag(h, TAG_DIV, i, &tag);
  	return(1);
  }
  
***************
*** 643,652 ****
  static int
  man_B_pre(MAN_ARGS)
  {
- 	struct htmlpair	 tag;
  
! 	PAIR_CLASS_INIT(&tag, "bold");
! 	print_otag(h, TAG_SPAN, 1, &tag);
  	return(1);
  }
  
--- 655,662 ----
  static int
  man_B_pre(MAN_ARGS)
  {
  
! 	print_ofont(h, HTMLFONT_BOLD);
  	return(1);
  }
  
***************
*** 655,664 ****
  static int
  man_I_pre(MAN_ARGS)
  {
! 	struct htmlpair	 tag;
! 
! 	PAIR_CLASS_INIT(&tag, "italic");
! 	print_otag(h, TAG_SPAN, 1, &tag);
  	return(1);
  }
  
--- 665,672 ----
  static int
  man_I_pre(MAN_ARGS)
  {
! 	
! 	print_ofont(h, HTMLFONT_ITALIC);
  	return(1);
  }