===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_html.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -c -r1.148 -r1.149
*** src/usr.bin/mandoc/mdoc_html.c	2017/03/03 13:55:06	1.148
--- src/usr.bin/mandoc/mdoc_html.c	2017/03/13 19:01:14	1.149
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_html.c,v 1.148 2017/03/03 13:55:06 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_html.c,v 1.149 2017/03/13 19:01:14 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 504,510 ****
  	switch (n->type) {
  	case ROFFT_HEAD:
  		id = make_id(n);
! 		print_otag(h, TAG_H1, "ci", "Sh", id);
  		free(id);
  		break;
  	case ROFFT_BODY:
--- 504,510 ----
  	switch (n->type) {
  	case ROFFT_HEAD:
  		id = make_id(n);
! 		print_otag(h, TAG_H1, "cTi", "Sh", id);
  		free(id);
  		break;
  	case ROFFT_BODY:
***************
*** 526,532 ****
  		return 1;
  
  	id = make_id(n);
! 	print_otag(h, TAG_H2, "ci", "Ss", id);
  	free(id);
  	return 1;
  }
--- 526,532 ----
  		return 1;
  
  	id = make_id(n);
! 	print_otag(h, TAG_H2, "cTi", "Ss", id);
  	free(id);
  	return 1;
  }
***************
*** 534,540 ****
  static int
  mdoc_fl_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "c", "Fl");
  	print_text(h, "\\-");
  
  	if (!(n->child == NULL &&
--- 534,540 ----
  static int
  mdoc_fl_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "cT", "Fl");
  	print_text(h, "\\-");
  
  	if (!(n->child == NULL &&
***************
*** 549,555 ****
  static int
  mdoc_cm_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "c", "Cm");
  	return 1;
  }
  
--- 549,555 ----
  static int
  mdoc_cm_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "cT", "Cm");
  	return 1;
  }
  
***************
*** 562,568 ****
  	/* XXX: this tag in theory can contain block elements. */
  
  	print_text(h, "\\(em");
! 	print_otag(h, TAG_SPAN, "c", "Nd");
  	return 1;
  }
  
--- 562,568 ----
  	/* XXX: this tag in theory can contain block elements. */
  
  	print_text(h, "\\(em");
! 	print_otag(h, TAG_SPAN, "cT", "Nd");
  	return 1;
  }
  
***************
*** 577,583 ****
  		print_otag(h, TAG_TD, "");
  		/* FALLTHROUGH */
  	case ROFFT_ELEM:
! 		print_otag(h, TAG_B, "c", "Nm");
  		return 1;
  	case ROFFT_BODY:
  		print_otag(h, TAG_TD, "");
--- 577,583 ----
  		print_otag(h, TAG_TD, "");
  		/* FALLTHROUGH */
  	case ROFFT_ELEM:
! 		print_otag(h, TAG_B, "cT", "Nm");
  		return 1;
  	case ROFFT_BODY:
  		print_otag(h, TAG_TD, "");
***************
*** 611,621 ****
  		return 0;
  
  	if (h->base_man)
! 		print_otag(h, TAG_A, "chM", "Xr",
  		    n->child->string, n->child->next == NULL ?
  		    NULL : n->child->next->string);
  	else
! 		print_otag(h, TAG_A, "c", "Xr");
  
  	n = n->child;
  	print_text(h, n->string);
--- 611,621 ----
  		return 0;
  
  	if (h->base_man)
! 		print_otag(h, TAG_A, "cThM", "Xr",
  		    n->child->string, n->child->next == NULL ?
  		    NULL : n->child->next->string);
  	else
! 		print_otag(h, TAG_A, "cT", "Xr");
  
  	n = n->child;
  	print_text(h, n->string);
***************
*** 644,650 ****
  static int
  mdoc_ar_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_VAR, "c", "Ar");
  	return 1;
  }
  
--- 644,650 ----
  static int
  mdoc_ar_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_VAR, "cT", "Ar");
  	return 1;
  }
  
***************
*** 893,906 ****
  static int
  mdoc_st_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_SPAN, "c", "St");
  	return 1;
  }
  
  static int
  mdoc_em_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_I, "c", "Em");
  	return 1;
  }
  
--- 893,906 ----
  static int
  mdoc_st_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_SPAN, "cT", "St");
  	return 1;
  }
  
  static int
  mdoc_em_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_I, "cT", "Em");
  	return 1;
  }
  
***************
*** 924,930 ****
  	char	*id;
  
  	id = make_id(n);
! 	print_otag(h, TAG_A, "chR", "Sx", id);
  	free(id);
  	return 1;
  }
--- 924,930 ----
  	char	*id;
  
  	id = make_id(n);
! 	print_otag(h, TAG_A, "cThR", "Sx", id);
  	free(id);
  	return 1;
  }
***************
*** 1020,1026 ****
  static int
  mdoc_pa_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_I, "c", "Pa");
  	return 1;
  }
  
--- 1020,1026 ----
  static int
  mdoc_pa_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_I, "cT", "Pa");
  	return 1;
  }
  
***************
*** 1051,1057 ****
  	if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT))
  		h->flags |= HTML_SPLIT;
  
! 	print_otag(h, TAG_SPAN, "c", "An");
  	return 1;
  }
  
--- 1051,1057 ----
  	if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT))
  		h->flags |= HTML_SPLIT;
  
! 	print_otag(h, TAG_SPAN, "cT", "An");
  	return 1;
  }
  
***************
*** 1059,1086 ****
  mdoc_cd_pre(MDOC_ARGS)
  {
  	synopsis_pre(h, n);
! 	print_otag(h, TAG_B, "c", "Cd");
  	return 1;
  }
  
  static int
  mdoc_dv_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_CODE, "c", "Dv");
  	return 1;
  }
  
  static int
  mdoc_ev_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_CODE, "c", "Ev");
  	return 1;
  }
  
  static int
  mdoc_er_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_CODE, "c", "Er");
  	return 1;
  }
  
--- 1059,1086 ----
  mdoc_cd_pre(MDOC_ARGS)
  {
  	synopsis_pre(h, n);
! 	print_otag(h, TAG_B, "cT", "Cd");
  	return 1;
  }
  
  static int
  mdoc_dv_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_CODE, "cT", "Dv");
  	return 1;
  }
  
  static int
  mdoc_ev_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_CODE, "cT", "Ev");
  	return 1;
  }
  
  static int
  mdoc_er_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_CODE, "cT", "Er");
  	return 1;
  }
  
***************
*** 1091,1102 ****
  	struct tag		*t;
  
  	if (n->parent->tok != MDOC_Fo) {
! 		print_otag(h, TAG_VAR, "c", "Fa");
  		return 1;
  	}
  
  	for (nn = n->child; nn; nn = nn->next) {
! 		t = print_otag(h, TAG_VAR, "c", "Fa");
  		print_text(h, nn->string);
  		print_tagq(h, t);
  		if (nn->next) {
--- 1091,1102 ----
  	struct tag		*t;
  
  	if (n->parent->tok != MDOC_Fo) {
! 		print_otag(h, TAG_VAR, "cT", "Fa");
  		return 1;
  	}
  
  	for (nn = n->child; nn; nn = nn->next) {
! 		t = print_otag(h, TAG_VAR, "cT", "Fa");
  		print_text(h, nn->string);
  		print_tagq(h, t);
  		if (nn->next) {
***************
*** 1127,1137 ****
  	assert(n->type == ROFFT_TEXT);
  
  	if (strcmp(n->string, "#include")) {
! 		print_otag(h, TAG_B, "c", "Fd");
  		return 1;
  	}
  
! 	print_otag(h, TAG_B, "c", "In");
  	print_text(h, n->string);
  
  	if (NULL != (n = n->next)) {
--- 1127,1137 ----
  	assert(n->type == ROFFT_TEXT);
  
  	if (strcmp(n->string, "#include")) {
! 		print_otag(h, TAG_B, "cT", "Fd");
  		return 1;
  	}
  
! 	print_otag(h, TAG_B, "cT", "In");
  	print_text(h, n->string);
  
  	if (NULL != (n = n->next)) {
***************
*** 1145,1154 ****
  			cp = strchr(buf, '\0') - 1;
  			if (cp >= buf && (*cp == '>' || *cp == '"'))
  				*cp = '\0';
! 			t = print_otag(h, TAG_A, "chI", "In", buf);
  			free(buf);
  		} else
! 			t = print_otag(h, TAG_A, "c", "In");
  
  		print_text(h, n->string);
  		print_tagq(h, t);
--- 1145,1154 ----
  			cp = strchr(buf, '\0') - 1;
  			if (cp >= buf && (*cp == '>' || *cp == '"'))
  				*cp = '\0';
! 			t = print_otag(h, TAG_A, "cThI", "In", buf);
  			free(buf);
  		} else
! 			t = print_otag(h, TAG_A, "cT", "In");
  
  		print_text(h, n->string);
  		print_tagq(h, t);
***************
*** 1175,1181 ****
  	} else if (n->type == ROFFT_HEAD)
  		return 0;
  
! 	print_otag(h, TAG_VAR, "c", "Vt");
  	return 1;
  }
  
--- 1175,1181 ----
  	} else if (n->type == ROFFT_HEAD)
  		return 0;
  
! 	print_otag(h, TAG_VAR, "cT", "Vt");
  	return 1;
  }
  
***************
*** 1183,1189 ****
  mdoc_ft_pre(MDOC_ARGS)
  {
  	synopsis_pre(h, n);
! 	print_otag(h, TAG_VAR, "c", "Ft");
  	return 1;
  }
  
--- 1183,1189 ----
  mdoc_ft_pre(MDOC_ARGS)
  {
  	synopsis_pre(h, n);
! 	print_otag(h, TAG_VAR, "cT", "Ft");
  	return 1;
  }
  
***************
*** 1204,1210 ****
  
  	ep = strchr(sp, ' ');
  	if (NULL != ep) {
! 		t = print_otag(h, TAG_VAR, "c", "Ft");
  
  		while (ep) {
  			sz = MIN((int)(ep - sp), BUFSIZ - 1);
--- 1204,1210 ----
  
  	ep = strchr(sp, ' ');
  	if (NULL != ep) {
! 		t = print_otag(h, TAG_VAR, "cT", "Ft");
  
  		while (ep) {
  			sz = MIN((int)(ep - sp), BUFSIZ - 1);
***************
*** 1217,1223 ****
  		print_tagq(h, t);
  	}
  
! 	t = print_otag(h, TAG_B, "c", "Fn");
  
  	if (sp)
  		print_text(h, sp);
--- 1217,1223 ----
  		print_tagq(h, t);
  	}
  
! 	t = print_otag(h, TAG_B, "cT", "Fn");
  
  	if (sp)
  		print_text(h, sp);
***************
*** 1230,1239 ****
  
  	for (n = n->child->next; n; n = n->next) {
  		if (NODE_SYNPRETTY & n->flags)
! 			t = print_otag(h, TAG_VAR, "css?", "Fa",
  			    "white-space", "nowrap");
  		else
! 			t = print_otag(h, TAG_VAR, "c", "Fa");
  		print_text(h, n->string);
  		print_tagq(h, t);
  		if (n->next) {
--- 1230,1239 ----
  
  	for (n = n->child->next; n; n = n->next) {
  		if (NODE_SYNPRETTY & n->flags)
! 			t = print_otag(h, TAG_VAR, "cTss?", "Fa",
  			    "white-space", "nowrap");
  		else
! 			t = print_otag(h, TAG_VAR, "cT", "Fa");
  		print_text(h, n->string);
  		print_tagq(h, t);
  		if (n->next) {
***************
*** 1319,1325 ****
  
  	assert(n->type == ROFFT_TEXT);
  
! 	print_otag(h, TAG_A, "ch", "Lk", n->string);
  
  	if (NULL == n->next)
  		print_text(h, n->string);
--- 1319,1325 ----
  
  	assert(n->type == ROFFT_TEXT);
  
! 	print_otag(h, TAG_A, "cTh", "Lk", n->string);
  
  	if (NULL == n->next)
  		print_text(h, n->string);
***************
*** 1340,1346 ****
  		assert(n->type == ROFFT_TEXT);
  
  		mandoc_asprintf(&cp, "mailto:%s", n->string);
! 		t = print_otag(h, TAG_A, "ch", "Mt", cp);
  		print_text(h, n->string);
  		print_tagq(h, t);
  		free(cp);
--- 1340,1346 ----
  		assert(n->type == ROFFT_TEXT);
  
  		mandoc_asprintf(&cp, "mailto:%s", n->string);
! 		t = print_otag(h, TAG_A, "cTh", "Mt", cp);
  		print_text(h, n->string);
  		print_tagq(h, t);
  		free(cp);
***************
*** 1368,1374 ****
  		return 0;
  
  	assert(n->child->string);
! 	t = print_otag(h, TAG_B, "c", "Fn");
  	print_text(h, n->child->string);
  	print_tagq(h, t);
  	return 0;
--- 1368,1374 ----
  		return 0;
  
  	assert(n->child->string);
! 	t = print_otag(h, TAG_B, "cT", "Fn");
  	print_text(h, n->child->string);
  	print_tagq(h, t);
  	return 0;
***************
*** 1392,1398 ****
  	struct tag	*t;
  
  	synopsis_pre(h, n);
! 	print_otag(h, TAG_B, "c", "In");
  
  	/*
  	 * The first argument of the `In' gets special treatment as
--- 1392,1398 ----
  	struct tag	*t;
  
  	synopsis_pre(h, n);
! 	print_otag(h, TAG_B, "cT", "In");
  
  	/*
  	 * The first argument of the `In' gets special treatment as
***************
*** 1411,1419 ****
  		assert(n->type == ROFFT_TEXT);
  
  		if (h->base_includes)
! 			t = print_otag(h, TAG_A, "chI", "In", n->string);
  		else
! 			t = print_otag(h, TAG_A, "c", "In");
  		print_text(h, n->string);
  		print_tagq(h, t);
  
--- 1411,1419 ----
  		assert(n->type == ROFFT_TEXT);
  
  		if (h->base_includes)
! 			t = print_otag(h, TAG_A, "cThI", "In", n->string);
  		else
! 			t = print_otag(h, TAG_A, "cT", "In");
  		print_text(h, n->string);
  		print_tagq(h, t);
  
***************
*** 1434,1447 ****
  static int
  mdoc_ic_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "c", "Ic");
  	return 1;
  }
  
  static int
  mdoc_va_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_VAR, "c", "Va");
  	return 1;
  }
  
--- 1434,1447 ----
  static int
  mdoc_ic_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "cT", "Ic");
  	return 1;
  }
  
  static int
  mdoc_va_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_VAR, "cT", "Va");
  	return 1;
  }
  
***************
*** 1486,1492 ****
  static int
  mdoc_ms_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "c", "Ms");
  	return 1;
  }
  
--- 1486,1492 ----
  static int
  mdoc_ms_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "cT", "Ms");
  	return 1;
  }
  
***************
*** 1515,1521 ****
  	if (n->prev && SEC_SEE_ALSO == n->sec)
  		print_paragraph(h);
  
! 	print_otag(h, TAG_CITE, "c", "Rs");
  	return 1;
  }
  
--- 1515,1521 ----
  	if (n->prev && SEC_SEE_ALSO == n->sec)
  		print_paragraph(h);
  
! 	print_otag(h, TAG_CITE, "cT", "Rs");
  	return 1;
  }
  
***************
*** 1536,1542 ****
  static int
  mdoc_sy_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "c", "Sy");
  	return 1;
  }
  
--- 1536,1542 ----
  static int
  mdoc_sy_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "cT", "Sy");
  	return 1;
  }
  
***************
*** 1546,1552 ****
  	if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags && n->prev)
  		print_otag(h, TAG_BR, "");
  
! 	print_otag(h, TAG_SPAN, "c", "Lb");
  	return 1;
  }
  
--- 1546,1552 ----
  	if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags && n->prev)
  		print_otag(h, TAG_BR, "");
  
! 	print_otag(h, TAG_SPAN, "cT", "Lb");
  	return 1;
  }