===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tbl_layout.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/mandoc/tbl_layout.c	2015/01/30 04:08:37	1.24
--- src/usr.bin/mandoc/tbl_layout.c	2015/02/10 11:02:19	1.25
***************
*** 1,4 ****
! /*	$OpenBSD: tbl_layout.c,v 1.24 2015/01/30 04:08:37 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: tbl_layout.c,v 1.25 2015/02/10 11:02:19 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 95,106 ****
  
  	switch (tolower((unsigned char)p[(*pos)++])) {
  	case 'b':
! 		/* FALLTHROUGH */
! 	case 'i':
! 		/* FALLTHROUGH */
! 	case 'r':
! 		(*pos)--;
! 		break;
  	case 'd':
  		cp->flags |= TBL_CELL_BALIGN;
  		goto mod;
--- 95,102 ----
  
  	switch (tolower((unsigned char)p[(*pos)++])) {
  	case 'b':
! 		cp->flags |= TBL_CELL_BOLD;
! 		goto mod;
  	case 'd':
  		cp->flags |= TBL_CELL_BALIGN;
  		goto mod;
***************
*** 109,114 ****
--- 105,113 ----
  		goto mod;
  	case 'f':
  		break;
+ 	case 'i':
+ 		cp->flags |= TBL_CELL_ITALIC;
+ 		goto mod;
  	case 'm':
  		mandoc_msg(MANDOCERR_TBLLAYOUT_MOD, tbl->parse,
  		    ln, *pos, "m");
***************
*** 148,167 ****
  		goto mod;
  	}
  
! 	switch (tolower((unsigned char)p[(*pos)++])) {
  	case '3':
  		/* FALLTHROUGH */
! 	case 'b':
  		cp->flags |= TBL_CELL_BOLD;
  		goto mod;
  	case '2':
  		/* FALLTHROUGH */
! 	case 'i':
  		cp->flags |= TBL_CELL_ITALIC;
  		goto mod;
  	case '1':
  		/* FALLTHROUGH */
! 	case 'r':
  		goto mod;
  	default:
  		mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse,
--- 147,183 ----
  		goto mod;
  	}
  
! 	/* Ignore parenthised font names for now. */
! 
! 	if (p[*pos] == '(')
! 		goto mod;
! 
! 	/* Support only one-character font-names for now. */
! 
! 	if (p[*pos] == '\0' || (p[*pos + 1] != ' ' && p[*pos + 1] != '.')) {
! 		mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse,
! 		    ln, *pos, "TS %s", p + *pos - 1);
! 		if (p[*pos] != '\0')
! 			(*pos)++;
! 		if (p[*pos] != '\0')
! 			(*pos)++;
! 		goto mod;
! 	}
! 
! 	switch (p[(*pos)++]) {
  	case '3':
  		/* FALLTHROUGH */
! 	case 'B':
  		cp->flags |= TBL_CELL_BOLD;
  		goto mod;
  	case '2':
  		/* FALLTHROUGH */
! 	case 'I':
  		cp->flags |= TBL_CELL_ITALIC;
  		goto mod;
  	case '1':
  		/* FALLTHROUGH */
! 	case 'R':
  		goto mod;
  	default:
  		mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse,