===================================================================
RCS file: /cvs/mandoc/roff_term.c,v
retrieving revision 1.22
retrieving revision 1.24
diff -u -p -r1.22 -r1.24
--- mandoc/roff_term.c	2020/09/03 20:43:15	1.22
+++ mandoc/roff_term.c	2021/09/19 18:07:09	1.24
@@ -1,4 +1,4 @@
-/* $OpenBSD: roff_term.c,v 1.22 2020/09/03 20:43:15 schwarze Exp $ */
+/* $OpenBSD: roff_term.c,v 1.24 2021/09/19 18:07:09 schwarze Exp $ */
 /*
  * Copyright (c) 2010,2014,2015,2017-2020 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -112,9 +112,11 @@ roff_term_pre_ft(ROFF_TERM_ARGS)
 	cp = n->child->string;
 	switch (mandoc_font(cp, (int)strlen(cp))) {
 	case ESCAPE_FONTBOLD:
+	case ESCAPE_FONTCB:
 		term_fontrepl(p, TERMFONT_BOLD);
 		break;
 	case ESCAPE_FONTITALIC:
+	case ESCAPE_FONTCI:
 		term_fontrepl(p, TERMFONT_UNDER);
 		break;
 	case ESCAPE_FONTBI:
@@ -124,7 +126,7 @@ roff_term_pre_ft(ROFF_TERM_ARGS)
 		term_fontlast(p);
 		break;
 	case ESCAPE_FONTROMAN:
-	case ESCAPE_FONTCW:
+	case ESCAPE_FONTCR:
 		term_fontrepl(p, TERMFONT_NONE);
 		break;
 	default:
@@ -179,7 +181,7 @@ roff_term_pre_po(ROFF_TERM_ARGS)
 
 	/* Truncate to the range [-offset, 60], remember, and apply it. */
 	pouse = po >= 60 ? 60 :
-	    po < -(int)p->tcol->offset ? -p->tcol->offset : po;
+	    po < -(int)p->tcol->offset ? -(int)p->tcol->offset : po;
 	p->tcol->offset += pouse;
 }