===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_term.c,v
retrieving revision 1.227
retrieving revision 1.228
diff -c -r1.227 -r1.228
*** src/usr.bin/mandoc/mdoc_term.c	2015/10/06 18:30:44	1.227
--- src/usr.bin/mandoc/mdoc_term.c	2015/10/12 00:07:27	1.228
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_term.c,v 1.227 2015/10/06 18:30:44 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_term.c,v 1.228 2015/10/12 00:07:27 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 623,633 ****
  
  	switch (type) {
  	case LIST_bullet:
- 		/* FALLTHROUGH */
  	case LIST_dash:
- 		/* FALLTHROUGH */
  	case LIST_hyphen:
- 		/* FALLTHROUGH */
  	case LIST_enum:
  		width = term_len(p, 2);
  		break;
--- 623,630 ----
***************
*** 635,641 ****
  		width = term_len(p, 8);
  		break;
  	case LIST_column:
- 		/* FALLTHROUGH */
  	case LIST_tag:
  		width = term_len(p, 10);
  		break;
--- 632,637 ----
***************
*** 760,775 ****
  
  	switch (type) {
  	case LIST_enum:
  		/*
  		 * Weird special case.
  		 * Some very narrow lists actually hang.
  		 */
- 		/* FALLTHROUGH */
- 	case LIST_bullet:
- 		/* FALLTHROUGH */
- 	case LIST_dash:
- 		/* FALLTHROUGH */
- 	case LIST_hyphen:
  		if (width <= (int)term_len(p, 2))
  			p->flags |= TERMP_HANG;
  		if (n->type != ROFFT_HEAD)
--- 756,768 ----
  
  	switch (type) {
  	case LIST_enum:
+ 	case LIST_bullet:
+ 	case LIST_dash:
+ 	case LIST_hyphen:
  		/*
  		 * Weird special case.
  		 * Some very narrow lists actually hang.
  		 */
  		if (width <= (int)term_len(p, 2))
  			p->flags |= TERMP_HANG;
  		if (n->type != ROFFT_HEAD)
***************
*** 852,864 ****
  			break;
  		/* FALLTHROUGH */
  	case LIST_bullet:
- 		/* FALLTHROUGH */
  	case LIST_dash:
- 		/* FALLTHROUGH */
  	case LIST_enum:
- 		/* FALLTHROUGH */
  	case LIST_hyphen:
- 		/* FALLTHROUGH */
  	case LIST_tag:
  		if (n->type == ROFFT_HEAD)
  			p->rmargin = p->offset + width;
--- 845,853 ----
***************
*** 894,900 ****
  			term_fontpop(p);
  			break;
  		case LIST_dash:
- 			/* FALLTHROUGH */
  		case LIST_hyphen:
  			term_fontpush(p, TERMFONT_BOLD);
  			term_word(p, "\\(hy");
--- 883,888 ----
***************
*** 916,928 ****
  
  	switch (type) {
  	case LIST_bullet:
- 		/* FALLTHROUGH */
  	case LIST_item:
- 		/* FALLTHROUGH */
  	case LIST_dash:
- 		/* FALLTHROUGH */
  	case LIST_hyphen:
- 		/* FALLTHROUGH */
  	case LIST_enum:
  		if (n->type == ROFFT_HEAD)
  			return 0;
--- 904,912 ----
***************
*** 950,958 ****
  
  	switch (type) {
  	case LIST_item:
- 		/* FALLTHROUGH */
  	case LIST_diag:
- 		/* FALLTHROUGH */
  	case LIST_inset:
  		if (n->type == ROFFT_BODY)
  			term_newln(p);
--- 934,940 ----
***************
*** 1291,1303 ****
  	 */
  	switch (n->prev->tok) {
  	case MDOC_Fd:
- 		/* FALLTHROUGH */
  	case MDOC_Fn:
- 		/* FALLTHROUGH */
  	case MDOC_Fo:
- 		/* FALLTHROUGH */
  	case MDOC_In:
- 		/* FALLTHROUGH */
  	case MDOC_Vt:
  		term_vspace(p);
  		break;
--- 1273,1281 ----
***************
*** 1615,1633 ****
  		 */
  		switch (nn->tok) {
  		case MDOC_Sm:
- 			/* FALLTHROUGH */
  		case MDOC_br:
- 			/* FALLTHROUGH */
  		case MDOC_sp:
- 			/* FALLTHROUGH */
  		case MDOC_Bl:
- 			/* FALLTHROUGH */
  		case MDOC_D1:
- 			/* FALLTHROUGH */
  		case MDOC_Dl:
- 			/* FALLTHROUGH */
  		case MDOC_Lp:
- 			/* FALLTHROUGH */
  		case MDOC_Pp:
  			continue;
  		default:
--- 1593,1604 ----
***************
*** 1864,1890 ****
  
  	switch (n->tok) {
  	case MDOC_Ao:
- 		/* FALLTHROUGH */
  	case MDOC_Aq:
  		term_word(p, n->nchild == 1 &&
  		    n->child->tok == MDOC_Mt ? "<" : "\\(la");
  		break;
  	case MDOC_Bro:
- 		/* FALLTHROUGH */
  	case MDOC_Brq:
  		term_word(p, "{");
  		break;
  	case MDOC_Oo:
- 		/* FALLTHROUGH */
  	case MDOC_Op:
- 		/* FALLTHROUGH */
  	case MDOC_Bo:
- 		/* FALLTHROUGH */
  	case MDOC_Bq:
  		term_word(p, "[");
  		break;
  	case MDOC_Do:
- 		/* FALLTHROUGH */
  	case MDOC_Dq:
  		term_word(p, "\\(Lq");
  		break;
--- 1835,1855 ----
***************
*** 1895,1915 ****
  		term_word(p, n->norm->Es->child->string);
  		break;
  	case MDOC_Po:
- 		/* FALLTHROUGH */
  	case MDOC_Pq:
  		term_word(p, "(");
  		break;
  	case MDOC__T:
- 		/* FALLTHROUGH */
  	case MDOC_Qo:
- 		/* FALLTHROUGH */
  	case MDOC_Qq:
  		term_word(p, "\"");
  		break;
  	case MDOC_Ql:
- 		/* FALLTHROUGH */
  	case MDOC_So:
- 		/* FALLTHROUGH */
  	case MDOC_Sq:
  		term_word(p, "\\(oq");
  		break;
--- 1860,1875 ----
***************
*** 1932,1958 ****
  
  	switch (n->tok) {
  	case MDOC_Ao:
- 		/* FALLTHROUGH */
  	case MDOC_Aq:
  		term_word(p, n->nchild == 1 &&
  		    n->child->tok == MDOC_Mt ? ">" : "\\(ra");
  		break;
  	case MDOC_Bro:
- 		/* FALLTHROUGH */
  	case MDOC_Brq:
  		term_word(p, "}");
  		break;
  	case MDOC_Oo:
- 		/* FALLTHROUGH */
  	case MDOC_Op:
- 		/* FALLTHROUGH */
  	case MDOC_Bo:
- 		/* FALLTHROUGH */
  	case MDOC_Bq:
  		term_word(p, "]");
  		break;
  	case MDOC_Do:
- 		/* FALLTHROUGH */
  	case MDOC_Dq:
  		term_word(p, "\\(Rq");
  		break;
--- 1892,1912 ----
***************
*** 1965,1985 ****
  			term_word(p, n->norm->Es->child->next->string);
  		break;
  	case MDOC_Po:
- 		/* FALLTHROUGH */
  	case MDOC_Pq:
  		term_word(p, ")");
  		break;
  	case MDOC__T:
- 		/* FALLTHROUGH */
  	case MDOC_Qo:
- 		/* FALLTHROUGH */
  	case MDOC_Qq:
  		term_word(p, "\"");
  		break;
  	case MDOC_Ql:
- 		/* FALLTHROUGH */
  	case MDOC_So:
- 		/* FALLTHROUGH */
  	case MDOC_Sq:
  		term_word(p, "\\(cq");
  		break;
--- 1919,1934 ----