===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff_term.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/mandoc/roff_term.c	2018/12/14 01:17:46	1.16
--- src/usr.bin/mandoc/roff_term.c	2018/12/15 23:33:20	1.17
***************
*** 1,4 ****
! /*	$OpenBSD: roff_term.c,v 1.16 2018/12/14 01:17:46 schwarze Exp $ */
  /*
   * Copyright (c) 2010,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: roff_term.c,v 1.17 2018/12/15 23:33:20 schwarze Exp $ */
  /*
   * Copyright (c) 2010,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
   *
***************
*** 18,23 ****
--- 18,24 ----
  
  #include <assert.h>
  #include <stdio.h>
+ #include <string.h>
  
  #include "mandoc.h"
  #include "roff.h"
***************
*** 113,137 ****
  {
  	const char	*cp;
  
! 	if (*(cp = n->child->string) == 'C')
! 		cp++;
! 
! 	switch (*cp) {
! 	case '4':
! 	case '3':
! 	case 'B':
  		term_fontrepl(p, TERMFONT_BOLD);
  		break;
! 	case '2':
! 	case 'I':
  		term_fontrepl(p, TERMFONT_UNDER);
  		break;
! 	case 'P':
  		term_fontlast(p);
  		break;
! 	case '1':
! 	case 'C':
! 	case 'R':
  		term_fontrepl(p, TERMFONT_NONE);
  		break;
  	default:
--- 114,135 ----
  {
  	const char	*cp;
  
! 	cp = n->child->string;
! 	switch (mandoc_font(cp, (int)strlen(cp))) {
! 	case ESCAPE_FONTBOLD:
  		term_fontrepl(p, TERMFONT_BOLD);
  		break;
! 	case ESCAPE_FONTITALIC:
  		term_fontrepl(p, TERMFONT_UNDER);
  		break;
! 	case ESCAPE_FONTBI:
! 		term_fontrepl(p, TERMFONT_BI);
! 		break;
! 	case ESCAPE_FONTPREV:
  		term_fontlast(p);
  		break;
! 	case ESCAPE_FONTROMAN:
! 	case ESCAPE_FONTCW:
  		term_fontrepl(p, TERMFONT_NONE);
  		break;
  	default: