sync with OpenBSD -current

regress/usr.bin/mandoc/roff/nr/predef.in

@@ -1,5 +1,5 @@
-.\" $OpenBSD: predef.in,v 1.4 2020/10/24 22:52:34 schwarze Exp $
-.TH NR-PREDEF 1 "August 29, 2015"
+.\" $OpenBSD: predef.in,v 1.5 2025/01/03 16:32:21 schwarze Exp $
+.TH NR-PREDEF 1 "January 3, 2025"
 .SH NAME
 nr-predef \- pre-defined read-only integer number registers
 .SH DESCRIPTION
@@ -11,15 +11,17 @@ user defined macro with \\n(.$ arguments: \\$*
 .nr .g 111
 .nr .H 111
 .nr .j 111
+.nr .l 111
 .nr .T 111
 .nr .V 111
 .nr .$ 111
-ascii mode: \n(.A
-groff mode: \n(.g
-horizontal resolution: \n(.H
-adjustment mode: \n(.j
-output device defined: \n(.T \n[.T]
-vertical resolution: \n(.V
+ascii mode: \n(.A = off
+groff mode: \n(.g = on
+horizontal resolution: \n(.H dots per character
+adjustment mode: \n(.j = flush left
+line width: \n(.l dots per line
+output device defined: \n(.T \n[.T] = yes
+vertical resolution: \n(.V dots per line
 .mym
 .mym one
 .mym one two

regress/usr.bin/mandoc/roff/nr/predef.out_ascii

@@ -4,14 +4,15 @@ NNAAMMEE
      nr-predef - pre-defined read-only integer number registers
 
 DDEESSCCRRIIPPTTIIOONN
-     ascii mode: 0
-     groff mode: 1
-     horizontal resolution: 24
-     adjustment mode: 0
-     output device defined: 1 1
-     vertical resolution: 40
+     ascii mode: 0 = off
+     groff mode: 1 = on
+     horizontal resolution: 24 dots per character
+     adjustment mode: 0 = flush left
+     line width: 1872 dots per line
+     output device defined: 1 1 = yes
+     vertical resolution: 40 dots per line
      user defined macro with 0 arguments:
      user defined macro with 1 arguments: one
      user defined macro with 2 arguments: one two
 
-OpenBSD                         August 29, 2015                   NR-PREDEF(1)
+OpenBSD                         January 3, 2025                   NR-PREDEF(1)

regress/usr.bin/mandoc/roff/nr/scale.in

@@ -1,5 +1,5 @@
-.\" $OpenBSD: scale.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
-.TH NR-INT 1 "January 23, 2015"
+.\" $OpenBSD: scale.in,v 1.3 2025/01/06 18:48:13 schwarze Exp $
+.TH NR-INT 1 "January 6, 2025"
 .SH NAME
 nr-scale \- scaling units in numeric expressions
 .SH DESCRIPTION
@@ -25,3 +25,21 @@ nr-scale \- scaling units in numeric expressions
 \nY
 .nr Y 1X+2
 \nY
+.PP
+.nr Y 0.001f
+0.001f = \nYu;
+.nr Y 0.1i
+0.1i = \nYu;
+.nr Y 0.1c
+0.1c = \nYu;
+.nr Y 0.25P
+0.25P = \nYu;
+.nr Y 0.6p
+0.6p = \nYu
+.PP
+.nr Y 3p
+3p = \nYu;
+.nr Y 1p+1p+1p
+1p+1p+1p = \nYu;
+.nr Y 1p*3
+1p*3 = \nYu

regress/usr.bin/mandoc/roff/nr/scale.out_ascii

@@ -6,4 +6,8 @@ NNAAMMEE
 DDEESSCCRRIIPPTTIIOONN
      65537 241 945 41 41 25 25 34 2 25 1
 
-OpenBSD                        January 23, 2015                      NR-INT(1)
+     0.001f = 65u; 0.1i = 24u; 0.1c = 9u; 0.25P = 10u; 0.6p = 2u
+
+     3p = 10u; 1p+1p+1p = 9u; 1p*3 = 9u
+
+OpenBSD                         January 6, 2025                      NR-INT(1)

regress/usr.bin/mandoc/tbl/mod/width.in

@@ -1,12 +1,76 @@
-.\" $OpenBSD: width.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
-.TH TBL-MOD-WIDTH 1 "June 8, 2017"
+.\" $OpenBSD: width.in,v 1.4 2025/01/05 18:03:51 schwarze Exp $
+.TH TBL-MOD-WIDTH 1 "January 4, 2025"
 .SH NAME
 tbl-mod-width \- width modifier in table layout
 .SH DESCRIPTION
-normal text
+Bare numbers without parentheses use EN units:
 .TS
 box tab(:);
-lw2 | lw(2n) | lw(0.16i) | lw2 .
+Lw2 | Lw3 .
+a:abcd
+.TE
+.PP
+Explicit scaling units and rounding \(en metric:
+.TS
+box tab(:);
+Lw(1c).
+1cm
+.TE
+.PP
+Explicit scaling units and rounding \(en pica:
+.TS
+box tab(:);
+Lw(1P).
+P
+.TE
+.TS
+box tab(:);
+Lw(2P).
+2P
+.TE
+.PP
+Explicit scaling units and rounding \(en points:
+.TS
+box tab(:);
+Lw(25p).
+25p
+.TE
+.TS
+box tab(:);
+Lw(26p).
+26p
+.TE
+.PP
+Explicit scaling units and rounding \(en basic units:
+.TS
+box tab(:);
+Lw(84u).
+84u
+.TE
+.TS
+box tab(:);
+Lw(85u).
+85u
+.TE
+.PP
+Multiplication:
+.TS
+box tab(:);
+Lw(3n*2u) | Lw(3u*2n) | Lw(3u*2) | Cw(3*2u).
+3n*2u:3u*2n:3u*2:3*2u
+.TE
+.PP
+Division:
+.TS
+box tab(:);
+Lw(14n/2u) | Lw(384n/2n) | Lw(12/2u) | Lw(288/2).
+14n/2u:384n/2n:12/2u:288/2
+.TE
+.PP
+Data section containing text blocks:
+.TS
+box tab(:);
+lw2 | lw(2n) | lw(2m) | lw2 .
 a:abcd:T{
 a
 T}:T{

regress/usr.bin/mandoc/tbl/mod/width.out_ascii

@@ -4,9 +4,53 @@ NNAAMMEE
      tbl-mod-width - width modifier in table layout
 
 DDEESSCCRRIIPPTTIIOONN
-     normal text
+     Bare numbers without parentheses use EN units:
+     +---+------+
+     |a  | abcd |
+     +---+------+
+
+     Explicit scaling units and rounding - metric:
+     +-----+
+     |1cm  |
+     +-----+
+
+     Explicit scaling units and rounding - pica:
+     +---+
+     |P  |
+     +---+
+     +----+
+     |2P  |
+     +----+
+
+     Explicit scaling units and rounding - points:
+     +----+
+     |25p |
+     +----+
+     +-----+
+     |26p  |
+     +-----+
+
+     Explicit scaling units and rounding - basic units:
+     +----+
+     |84u |
+     +----+
+     +-----+
+     |85u  |
+     +-----+
+
+     Multiplication:
+     +-------+--------+--------+--------+
+     |3n*2u  | 3u*2n  | 3u*2   |  3*2u  |
+     +-------+--------+--------+--------+
+
+     Division:
+     +--------+----------+--------+--------+
+     |14n/2u  | 384n/2n  | 12/2u  | 288/2  |
+     +--------+----------+--------+--------+
+
+     Data section containing text blocks:
      +---+------+----+------+
      |a  | abcd | a  | abcd |
      +---+------+----+------+
 
-OpenBSD                          June 8, 2017                 TBL-MOD-WIDTH(1)
+OpenBSD                         January 4, 2025               TBL-MOD-WIDTH(1)