===================================================================
RCS file: /cvs/mandoc/tbl_layout.c,v
retrieving revision 1.49
retrieving revision 1.51
diff -u -p -r1.49 -r1.51
--- mandoc/tbl_layout.c	2020/09/01 18:25:28	1.49
+++ mandoc/tbl_layout.c	2025/01/05 18:14:39	1.51
@@ -1,7 +1,8 @@
-/*	$Id: tbl_layout.c,v 1.49 2020/09/01 18:25:28 schwarze Exp $ */
+/*	$Id: tbl_layout.c,v 1.51 2025/01/05 18:14:39 schwarze Exp $ */
 /*
+ * Copyright (c) 2012, 2014, 2015, 2017, 2020, 2021, 2025
+ *               Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2012, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -66,7 +67,8 @@ mods(struct tbl_node *tbl, struct tbl_cell *cp,
 {
 	char		*endptr;
 	unsigned long	 spacing;
-	size_t		 sz;
+	int		 isz;
+	enum mandoc_esc	 fontesc;
 
 mod:
 	while (p[*pos] == ' ' || p[*pos] == '\t')
@@ -105,7 +107,7 @@ mod:
 
 	switch (tolower((unsigned char)p[(*pos)++])) {
 	case 'b':
-		cp->flags |= TBL_CELL_BOLD;
+		cp->font = ESCAPE_FONTBOLD;
 		goto mod;
 	case 'd':
 		cp->flags |= TBL_CELL_BALIGN;
@@ -116,7 +118,7 @@ mod:
 	case 'f':
 		break;
 	case 'i':
-		cp->flags |= TBL_CELL_ITALIC;
+		cp->font = ESCAPE_FONTITALIC;
 		goto mod;
 	case 'm':
 		mandoc_msg(MANDOCERR_TBLLAYOUT_MOD, ln, *pos, "m");
@@ -135,20 +137,27 @@ mod:
 		cp->flags |= TBL_CELL_UP;
 		goto mod;
 	case 'w':
-		sz = 0;
 		if (p[*pos] == '(') {
 			(*pos)++;
-			while (p[*pos + sz] != '\0' && p[*pos + sz] != ')')
-				sz++;
-		} else
-			while (isdigit((unsigned char)p[*pos + sz]))
-				sz++;
-		if (sz) {
-			free(cp->wstr);
-			cp->wstr = mandoc_strndup(p + *pos, sz);
-			*pos += sz;
-			if (p[*pos] == ')')
+			isz = 0;
+			if (roff_evalnum(ln, p, pos, &isz, 'n', 1) == 0 ||
+			    p[*pos] != ')')
+				mandoc_msg(MANDOCERR_TBLLAYOUT_WIDTH,
+				    ln, *pos, "%s", p + *pos);
+			else {
+				/* Convert from BU to EN and round. */
+				cp->width = (isz + 11) /24;
 				(*pos)++;
+			}
+		} else {
+			cp->width = 0;
+			while (isdigit((unsigned char)p[*pos])) {
+				cp->width *= 10;
+				cp->width += p[(*pos)++] - '0';
+			}
+			if (cp->width == 0)
+				mandoc_msg(MANDOCERR_TBLLAYOUT_WIDTH,
+				    ln, *pos, "%s", p + *pos);
 		}
 		goto mod;
 	case 'x':
@@ -170,40 +179,34 @@ mod:
 		goto mod;
 	}
 
+	while (p[*pos] == ' ' || p[*pos] == '\t')
+		(*pos)++;
+
 	/* Ignore parenthised font names for now. */
 
 	if (p[*pos] == '(')
 		goto mod;
 
-	/* Support only one-character font-names for now. */
+	isz = 0;
+	if (p[*pos] != '\0')
+		isz++;
+	if (strchr(" \t.", p[*pos + isz]) == NULL)
+		isz++;
+	
+	fontesc = mandoc_font(p + *pos, isz);
 
-	if (p[*pos] == '\0' || (p[*pos + 1] != ' ' && p[*pos + 1] != '.')) {
+	switch (fontesc) {
+	case ESCAPE_FONTPREV:
+	case ESCAPE_ERROR:
 		mandoc_msg(MANDOCERR_FT_BAD,
 		    ln, *pos, "TS %s", p + *pos - 1);
-		if (p[*pos] != '\0')
-			(*pos)++;
-		if (p[*pos] != '\0')
-			(*pos)++;
-		goto mod;
-	}
-
-	switch (p[(*pos)++]) {
-	case '3':
-	case 'B':
-		cp->flags |= TBL_CELL_BOLD;
-		goto mod;
-	case '2':
-	case 'I':
-		cp->flags |= TBL_CELL_ITALIC;
-		goto mod;
-	case '1':
-	case 'R':
-		goto mod;
+		break;
 	default:
-		mandoc_msg(MANDOCERR_FT_BAD,
-		    ln, *pos - 1, "TS f%c", p[*pos - 1]);
-		goto mod;
+		cp->font = fontesc;
+		break;
 	}
+	*pos += isz;
+	goto mod;
 }
 
 static void
@@ -362,6 +365,7 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e
 
 	p = mandoc_calloc(1, sizeof(*p));
 	p->spacing = SIZE_MAX;
+	p->font = ESCAPE_FONTROMAN;
 	p->pos = pos;
 
 	if ((pp = rp->last) != NULL) {