===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_html.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -c -r1.132 -r1.133
*** src/usr.bin/mandoc/mdoc_html.c	2017/01/20 21:37:52	1.132
--- src/usr.bin/mandoc/mdoc_html.c	2017/01/20 23:50:59	1.133
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_html.c,v 1.132 2017/01/20 21:37:52 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.133 2017/01/20 23:50:59 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 68,73 ****
--- 68,74 ----
  static	int		  mdoc_bk_pre(MDOC_ARGS);
  static	int		  mdoc_bl_pre(MDOC_ARGS);
  static	int		  mdoc_cd_pre(MDOC_ARGS);
+ static	int		  mdoc_cm_pre(MDOC_ARGS);
  static	int		  mdoc_d1_pre(MDOC_ARGS);
  static	int		  mdoc_dv_pre(MDOC_ARGS);
  static	int		  mdoc_fa_pre(MDOC_ARGS);
***************
*** 133,139 ****
  	{mdoc_an_pre, NULL}, /* An */
  	{mdoc_ar_pre, NULL}, /* Ar */
  	{mdoc_cd_pre, NULL}, /* Cd */
! 	{mdoc_fl_pre, NULL}, /* Cm */
  	{mdoc_dv_pre, NULL}, /* Dv */
  	{mdoc_er_pre, NULL}, /* Er */
  	{mdoc_ev_pre, NULL}, /* Ev */
--- 134,140 ----
  	{mdoc_an_pre, NULL}, /* An */
  	{mdoc_ar_pre, NULL}, /* Ar */
  	{mdoc_cd_pre, NULL}, /* Cd */
! 	{mdoc_cm_pre, NULL}, /* Cm */
  	{mdoc_dv_pre, NULL}, /* Dv */
  	{mdoc_er_pre, NULL}, /* Er */
  	{mdoc_ev_pre, NULL}, /* Ev */
***************
*** 543,555 ****
  static int
  mdoc_fl_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "c", "flag");
! 
! 	/* `Cm' has no leading hyphen. */
! 
! 	if (MDOC_Cm == n->tok)
! 		return 1;
! 
  	print_text(h, "\\-");
  
  	if (!(n->child == NULL &&
--- 544,550 ----
  static int
  mdoc_fl_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "c", "Fl");
  	print_text(h, "\\-");
  
  	if (!(n->child == NULL &&
***************
*** 562,567 ****
--- 557,569 ----
  }
  
  static int
+ mdoc_cm_pre(MDOC_ARGS)
+ {
+ 	print_otag(h, TAG_B, "c", "Cm");
+ 	return 1;
+ }
+ 
+ static int
  mdoc_nd_pre(MDOC_ARGS)
  {
  	if (n->type != ROFFT_BODY)
***************
*** 584,590 ****
  		print_otag(h, TAG_TD, "");
  		/* FALLTHROUGH */
  	case ROFFT_ELEM:
! 		print_otag(h, TAG_B, "c", "name");
  		if (n->child == NULL && meta->name != NULL)
  			print_text(h, meta->name);
  		return 1;
--- 586,592 ----
  		print_otag(h, TAG_TD, "");
  		/* FALLTHROUGH */
  	case ROFFT_ELEM:
! 		print_otag(h, TAG_B, "c", "Nm");
  		if (n->child == NULL && meta->name != NULL)
  			print_text(h, meta->name);
  		return 1;
***************
*** 596,602 ****
  	}
  
  	synopsis_pre(h, n);
! 	print_otag(h, TAG_TABLE, "c", "synopsis");
  
  	for (len = 0, n = n->head->child; n; n = n->next)
  		if (n->type == ROFFT_TEXT)
--- 598,604 ----
  	}
  
  	synopsis_pre(h, n);
! 	print_otag(h, TAG_TABLE, "c", "Nm");
  
  	for (len = 0, n = n->head->child; n; n = n->next)
  		if (n->type == ROFFT_TEXT)
***************
*** 652,658 ****
  static int
  mdoc_ar_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_I, "c", "arg");
  	return 1;
  }
  
--- 654,660 ----
  static int
  mdoc_ar_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_I, "c", "Ar");
  	return 1;
  }
  
***************
*** 989,1002 ****
  static int
  mdoc_pa_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_I, "c", "file");
  	return 1;
  }
  
  static int
  mdoc_ad_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_I, "c", "addr");
  	return 1;
  }
  
--- 991,1004 ----
  static int
  mdoc_pa_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_I, "c", "Pa");
  	return 1;
  }
  
  static int
  mdoc_ad_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_I, "c", "Ad");
  	return 1;
  }
  
***************
*** 1020,1026 ****
  	if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT))
  		h->flags |= HTML_SPLIT;
  
! 	print_otag(h, TAG_SPAN, "c", "author");
  	return 1;
  }
  
--- 1022,1028 ----
  	if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT))
  		h->flags |= HTML_SPLIT;
  
! 	print_otag(h, TAG_SPAN, "c", "An");
  	return 1;
  }
  
***************
*** 1028,1055 ****
  mdoc_cd_pre(MDOC_ARGS)
  {
  	synopsis_pre(h, n);
! 	print_otag(h, TAG_B, "c", "config");
  	return 1;
  }
  
  static int
  mdoc_dv_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_SPAN, "c", "define");
  	return 1;
  }
  
  static int
  mdoc_ev_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_SPAN, "c", "env");
  	return 1;
  }
  
  static int
  mdoc_er_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_SPAN, "c", "errno");
  	return 1;
  }
  
--- 1030,1057 ----
  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;
  }
  
***************
*** 1060,1071 ****
  	struct tag		*t;
  
  	if (n->parent->tok != MDOC_Fo) {
! 		print_otag(h, TAG_I, "c", "farg");
  		return 1;
  	}
  
  	for (nn = n->child; nn; nn = nn->next) {
! 		t = print_otag(h, TAG_I, "c", "farg");
  		print_text(h, nn->string);
  		print_tagq(h, t);
  		if (nn->next) {
--- 1062,1073 ----
  	struct tag		*t;
  
  	if (n->parent->tok != MDOC_Fo) {
! 		print_otag(h, TAG_I, "c", "Fa");
  		return 1;
  	}
  
  	for (nn = n->child; nn; nn = nn->next) {
! 		t = print_otag(h, TAG_I, "c", "Fa");
  		print_text(h, nn->string);
  		print_tagq(h, t);
  		if (nn->next) {
***************
*** 1096,1106 ****
  	assert(n->type == ROFFT_TEXT);
  
  	if (strcmp(n->string, "#include")) {
! 		print_otag(h, TAG_B, "c", "macro");
  		return 1;
  	}
  
! 	print_otag(h, TAG_B, "c", "includes");
  	print_text(h, n->string);
  
  	if (NULL != (n = n->next)) {
--- 1098,1108 ----
  	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)) {
***************
*** 1114,1123 ****
  			cp = strchr(buf, '\0') - 1;
  			if (cp >= buf && (*cp == '>' || *cp == '"'))
  				*cp = '\0';
! 			t = print_otag(h, TAG_A, "chI", "link-includes", buf);
  			free(buf);
  		} else
! 			t = print_otag(h, TAG_A, "c", "link-includes");
  
  		print_text(h, n->string);
  		print_tagq(h, t);
--- 1116,1125 ----
  			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);
***************
*** 1144,1150 ****
  	} else if (n->type == ROFFT_HEAD)
  		return 0;
  
! 	print_otag(h, TAG_SPAN, "c", "type");
  	return 1;
  }
  
--- 1146,1152 ----
  	} else if (n->type == ROFFT_HEAD)
  		return 0;
  
! 	print_otag(h, TAG_I, "c", "Vt");
  	return 1;
  }
  
***************
*** 1152,1158 ****
  mdoc_ft_pre(MDOC_ARGS)
  {
  	synopsis_pre(h, n);
! 	print_otag(h, TAG_I, "c", "ftype");
  	return 1;
  }
  
--- 1154,1160 ----
  mdoc_ft_pre(MDOC_ARGS)
  {
  	synopsis_pre(h, n);
! 	print_otag(h, TAG_I, "c", "Ft");
  	return 1;
  }
  
***************
*** 1173,1179 ****
  
  	ep = strchr(sp, ' ');
  	if (NULL != ep) {
! 		t = print_otag(h, TAG_I, "c", "ftype");
  
  		while (ep) {
  			sz = MIN((int)(ep - sp), BUFSIZ - 1);
--- 1175,1181 ----
  
  	ep = strchr(sp, ' ');
  	if (NULL != ep) {
! 		t = print_otag(h, TAG_I, "c", "Ft");
  
  		while (ep) {
  			sz = MIN((int)(ep - sp), BUFSIZ - 1);
***************
*** 1186,1192 ****
  		print_tagq(h, t);
  	}
  
! 	t = print_otag(h, TAG_B, "c", "fname");
  
  	if (sp)
  		print_text(h, sp);
--- 1188,1194 ----
  		print_tagq(h, t);
  	}
  
! 	t = print_otag(h, TAG_B, "c", "Fn");
  
  	if (sp)
  		print_text(h, sp);
***************
*** 1199,1208 ****
  
  	for (n = n->child->next; n; n = n->next) {
  		if (NODE_SYNPRETTY & n->flags)
! 			t = print_otag(h, TAG_I, "css?", "farg",
  			    "white-space", "nowrap");
  		else
! 			t = print_otag(h, TAG_I, "c", "farg");
  		print_text(h, n->string);
  		print_tagq(h, t);
  		if (n->next) {
--- 1201,1210 ----
  
  	for (n = n->child->next; n; n = n->next) {
  		if (NODE_SYNPRETTY & n->flags)
! 			t = print_otag(h, TAG_I, "css?", "Fa",
  			    "white-space", "nowrap");
  		else
! 			t = print_otag(h, TAG_I, "c", "Fa");
  		print_text(h, n->string);
  		print_tagq(h, t);
  		if (n->next) {
***************
*** 1288,1294 ****
  
  	assert(n->type == ROFFT_TEXT);
  
! 	print_otag(h, TAG_A, "ch", "link-ext", n->string);
  
  	if (NULL == n->next)
  		print_text(h, n->string);
--- 1290,1296 ----
  
  	assert(n->type == ROFFT_TEXT);
  
! 	print_otag(h, TAG_A, "ch", "Lk", n->string);
  
  	if (NULL == n->next)
  		print_text(h, n->string);
***************
*** 1309,1315 ****
  		assert(n->type == ROFFT_TEXT);
  
  		mandoc_asprintf(&cp, "mailto:%s", n->string);
! 		t = print_otag(h, TAG_A, "ch", "link-mail", cp);
  		print_text(h, n->string);
  		print_tagq(h, t);
  		free(cp);
--- 1311,1317 ----
  		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);
***************
*** 1337,1343 ****
  		return 0;
  
  	assert(n->child->string);
! 	t = print_otag(h, TAG_B, "c", "fname");
  	print_text(h, n->child->string);
  	print_tagq(h, t);
  	return 0;
--- 1339,1345 ----
  		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;
***************
*** 1361,1367 ****
  	struct tag	*t;
  
  	synopsis_pre(h, n);
! 	print_otag(h, TAG_B, "c", "includes");
  
  	/*
  	 * The first argument of the `In' gets special treatment as
--- 1363,1369 ----
  	struct tag	*t;
  
  	synopsis_pre(h, n);
! 	print_otag(h, TAG_B, "c", "In");
  
  	/*
  	 * The first argument of the `In' gets special treatment as
***************
*** 1380,1389 ****
  		assert(n->type == ROFFT_TEXT);
  
  		if (h->base_includes)
! 			t = print_otag(h, TAG_A, "chI", "link-includes",
! 			    n->string);
  		else
! 			t = print_otag(h, TAG_A, "c", "link-includes");
  		print_text(h, n->string);
  		print_tagq(h, t);
  
--- 1382,1390 ----
  		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);
  
***************
*** 1404,1417 ****
  static int
  mdoc_ic_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "c", "cmd");
  	return 1;
  }
  
  static int
  mdoc_va_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "c", "var");
  	return 1;
  }
  
--- 1405,1418 ----
  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_I, "c", "Va");
  	return 1;
  }
  
***************
*** 1456,1462 ****
  static int
  mdoc_ms_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_SPAN, "c", "symb");
  	return 1;
  }
  
--- 1457,1463 ----
  static int
  mdoc_ms_pre(MDOC_ARGS)
  {
! 	print_otag(h, TAG_B, "c", "Ms");
  	return 1;
  }
  
***************
*** 1516,1522 ****
  	if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags && n->prev)
  		print_otag(h, TAG_BR, "");
  
! 	print_otag(h, TAG_SPAN, "c", "lib");
  	return 1;
  }
  
--- 1517,1523 ----
  	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;
  }
  
***************
*** 1655,1661 ****
  	case MDOC_Op:
  		print_text(h, "\\(lB");
  		h->flags |= HTML_NOSPACE;
! 		print_otag(h, TAG_SPAN, "c", "opt");
  		break;
  	case MDOC_En:
  		if (NULL == n->norm->Es ||
--- 1656,1662 ----
  	case MDOC_Op:
  		print_text(h, "\\(lB");
  		h->flags |= HTML_NOSPACE;
! 		print_otag(h, TAG_SPAN, "c", "Op");
  		break;
  	case MDOC_En:
  		if (NULL == n->norm->Es ||