improve rounding rules for scaling units

in horizontal orientation in the terminal formatter

16 files changed, 34 insertions, 26 deletions

diff --git a/regress/usr.bin/mandoc/man/HP/spacing.in b/regress/usr.bin/mandoc/man/HP/spacing.in
index 0faec1b599f..be511684775 100644
--- a/regress/usr.bin/mandoc/man/HP/spacing.in
+++ b/regress/usr.bin/mandoc/man/HP/spacing.in
@@ -17,7 +17,7 @@ Each hanged paragraph gets a sufficient amount of text
 to wrap to the next line.
 .br
 And a second line.
-.HP -4n
+.HP -0.36i
 Each hanged paragraph gets a sufficient amount of text
 to wrap to the next line.
 .br
@@ -42,7 +42,7 @@ Each hanged paragraph gets a sufficient amount of text
 to wrap to the next line.
 .br
 And a second line.
-.HP 8n
+.HP .76i
 Each hanged paragraph gets a sufficient amount of text
 to wrap to the next line.
 .br
diff --git a/regress/usr.bin/mandoc/man/IP/width.in b/regress/usr.bin/mandoc/man/IP/width.in
index 1c919a386f6..74372005af6 100644
--- a/regress/usr.bin/mandoc/man/IP/width.in
+++ b/regress/usr.bin/mandoc/man/IP/width.in
@@ -7,7 +7,7 @@ Regular mode:
 indented
 .br
 text
-.IP tag -4n
+.IP tag -0.36i
 indented
 .br
 text
@@ -61,7 +61,7 @@ text
 .IP tag 2n
 indented
 text
-.IP tag 3n
+.IP tag 0.26i
 indented
 text
 .IP tag 4n
diff --git a/regress/usr.bin/mandoc/man/RS/width.in b/regress/usr.bin/mandoc/man/RS/width.in
index e723b583e3b..bba4abc84ce 100644
--- a/regress/usr.bin/mandoc/man/RS/width.in
+++ b/regress/usr.bin/mandoc/man/RS/width.in
@@ -10,13 +10,13 @@ text
 .RE
 regular
 text
-.RS -4n
+.RS -0.36i
 indented
 text
 .RE
 regular
 text
-.RS 4n
+.RS 0.36i
 indented
 text
 .RE
diff --git a/regress/usr.bin/mandoc/man/TP/width.in b/regress/usr.bin/mandoc/man/TP/width.in
index 1ba99e402b7..2f4cb1f715d 100644
--- a/regress/usr.bin/mandoc/man/TP/width.in
+++ b/regress/usr.bin/mandoc/man/TP/width.in
@@ -8,7 +8,7 @@ tag
 indented
 .br
 text
-.TP -4n
+.TP -0.36i
 tag
 indented
 .br
@@ -23,7 +23,7 @@ tag
 indented
 .br
 text
-.TP 2n
+.TP 0.16i
 tag
 indented
 .br
@@ -51,7 +51,7 @@ text
 .PP
 Literal mode:
 .nf
-.TP -10n
+.TP -0.96i
 tag
 indented
 text
@@ -71,7 +71,7 @@ text
 tag
 indented
 text
-.TP 3n
+.TP 0.26i
 tag
 indented
 text
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/offset-neg.in b/regress/usr.bin/mandoc/mdoc/Bd/offset-neg.in
index 30f0fe73217..f1d0a2a114d 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/offset-neg.in
+++ b/regress/usr.bin/mandoc/mdoc/Bd/offset-neg.in
@@ -6,9 +6,9 @@
 .Nd indenting display blocks
 .Sh DESCRIPTION
 regular text
-.Bd -ragged -offset 8n
+.Bd -ragged -offset 0.76i
 outer display
-.Bd -ragged -offset -5n
+.Bd -ragged -offset -0.46i
 inner display
 .Ed
 outer display
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/offset.in b/regress/usr.bin/mandoc/mdoc/Bl/offset.in
index 9564b105ac2..923dd68f66b 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/offset.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/offset.in
@@ -57,9 +57,9 @@ Bl tag width Ds offset indent
 .It tag
 Bl tag width Ds offset indent-two
 .El
-.Bl -tag -width Ds -offset 4n
+.Bl -tag -width Ds -offset 0.36i
 .It tag
-Bl tag width Ds offset 4n
+Bl tag width Ds offset 0.36i
 .El
 .Bl -tag -width Ds -offset mystring
 .It tag
@@ -73,7 +73,7 @@ Bl tag width Ds offset Ds
 .It tag
 Bl tag width Ds offset 78n
 .El
-.Bl -tag -width Ds -offset -3n
+.Bl -tag -width Ds -offset -0.26i
 .It tag
-Bl tag width Ds offset -3n
+Bl tag width Ds offset -0.26i
 .El
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/offset.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/offset.out_ascii
index 8c871d44660..22474aa5538 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/offset.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/offset.out_ascii
@@ -33,7 +33,7 @@ DDEESSCCRRIIPPTTIIOONN
 
                tag     Bl tag width Ds offset indent-two
 
-         tag     Bl tag width Ds offset 4n
+         tag     Bl tag width Ds offset 0.36i
 
              tag     Bl tag width Ds offset mystring
 
@@ -46,6 +46,6 @@ DDEESSCCRRIIPPTTIIOONN
                                                                                            offset
                                                                                            78n
 
-  tag     Bl tag width Ds offset -3n
+  tag     Bl tag width Ds offset -0.26i
 
 OpenBSD                        December 25, 2014                       OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/offset.out_markdown b/regress/usr.bin/mandoc/mdoc/Bl/offset.out_markdown
index 807950be0e8..a58ce6bc3a9 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/offset.out_markdown
+++ b/regress/usr.bin/mandoc/mdoc/Bl/offset.out_markdown
@@ -42,7 +42,7 @@ tag
 
 tag
 
-> Bl tag width Ds offset 4n
+> Bl tag width Ds offset 0.36i
 
 tag
 
@@ -58,6 +58,6 @@ tag
 
 tag
 
-> Bl tag width Ds offset -3n
+> Bl tag width Ds offset -0.26i
 
 OpenBSD - December 25, 2014
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/tag.in b/regress/usr.bin/mandoc/mdoc/Bl/tag.in
index 49cc903ec43..c7b99822846 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/tag.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/tag.in
@@ -9,7 +9,7 @@
 .It tag
 x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
 .El
-.Bl -tag -width -3n
+.Bl -tag -width -0.26i
 .It tag
 x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
 .El
@@ -53,7 +53,7 @@ x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
 .It quint
 x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
 .El
-.Bl -tag -width 5n
+.Bl -tag -width 0.46i
 .It indent
 x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
 .El
diff --git a/regress/usr.bin/mandoc/roff/esc/h.in b/regress/usr.bin/mandoc/roff/esc/h.in
index 4bc1953e993..56e4275cd3c 100644
--- a/regress/usr.bin/mandoc/roff/esc/h.in
+++ b/regress/usr.bin/mandoc/roff/esc/h.in
@@ -7,6 +7,8 @@
 .Sh DESCRIPTION
 simple: >\h'0'<
 .br
+rounding: >\h'0.16i'<
+.br
 escape only: >\h'\w'\&'M'<
 .br
 escape at the end: >\h'0+\w'\&''<
diff --git a/regress/usr.bin/mandoc/roff/esc/h.out_ascii b/regress/usr.bin/mandoc/roff/esc/h.out_ascii
index 858dcf3235e..ae378a45e9c 100644
--- a/regress/usr.bin/mandoc/roff/esc/h.out_ascii
+++ b/regress/usr.bin/mandoc/roff/esc/h.out_ascii
@@ -5,6 +5,7 @@ NNAAMMEE
 
 DDEESSCCRRIIPPTTIIOONN
      simple: ><
+     rounding: >  <
      escape only: ><
      escape at the end: ><
      escape at the beginning: ><
diff --git a/regress/usr.bin/mandoc/roff/esc/h.out_lint b/regress/usr.bin/mandoc/roff/esc/h.out_lint
index 6e2eb342821..b7facfb1ebb 100644
--- a/regress/usr.bin/mandoc/roff/esc/h.out_lint
+++ b/regress/usr.bin/mandoc/roff/esc/h.out_lint
@@ -1,2 +1,2 @@
-mandoc: h.in:18:21: WARNING: invalid escape sequence: \h-
+mandoc: h.in:20:21: WARNING: invalid escape sequence: \h-
 mandoc: h.in:1:5: STYLE: Mdocdate missing: Dd May
diff --git a/regress/usr.bin/mandoc/roff/ta/basic-man.in b/regress/usr.bin/mandoc/roff/ta/basic-man.in
index f2f4641d540..db0644a7a73 100644
--- a/regress/usr.bin/mandoc/roff/ta/basic-man.in
+++ b/regress/usr.bin/mandoc/roff/ta/basic-man.in
@@ -17,3 +17,6 @@ none:
 default unit:
 .ta 3 +4 12
 1	2	3	4
+rounding:
+.ta 0.26i T 1c
+1	2	3	4	5	6	7	8	9
diff --git a/regress/usr.bin/mandoc/roff/ta/basic-man.out_ascii b/regress/usr.bin/mandoc/roff/ta/basic-man.out_ascii
index 3706224543b..659422f2b11 100644
--- a/regress/usr.bin/mandoc/roff/ta/basic-man.out_ascii
+++ b/regress/usr.bin/mandoc/roff/ta/basic-man.out_ascii
@@ -16,6 +16,8 @@ DDEESSCCRRIIPPTTIIOONN
        1  2     3   4 5   6 7   8 9
        default unit:
        1  2   3    4
+       rounding:
+       1  2   3   4   5   6   7   8   9
 
 
 
diff --git a/regress/usr.bin/mandoc/roff/ti/basic-man.in b/regress/usr.bin/mandoc/roff/ti/basic-man.in
index deb1542f040..d4f00a01e5c 100644
--- a/regress/usr.bin/mandoc/roff/ti/basic-man.in
+++ b/regress/usr.bin/mandoc/roff/ti/basic-man.in
@@ -3,14 +3,14 @@
 ti-basic-man \- temporary indentation in man(7)
 .SH DESCRIPTION
 initial text
-.ti 10n
+.ti 0.96i
 This text is indented.
 However, the indent is temporary,
 so as soon as the line wraps, it is gone.
 .ti +10n
 The temporary indent can be relative.
 All the same, it will expire in the usual way.
-.ti -3n
+.ti -0.26i
 It is also possible to temporarily reduce the indentation,
 but that will also last until the next line break only.
 .ti -10n
diff --git a/regress/usr.bin/mandoc/tbl/mod/width.in b/regress/usr.bin/mandoc/tbl/mod/width.in
index 702dd19e77e..46306089375 100644
--- a/regress/usr.bin/mandoc/tbl/mod/width.in
+++ b/regress/usr.bin/mandoc/tbl/mod/width.in
@@ -5,7 +5,7 @@ tbl-mod-width \- width modifier in table layout
 normal text
 .TS
 box tab(:);
-lw2 | lw(2n) | lw(0.2i) | lw2 .
+lw2 | lw(2n) | lw(0.16i) | lw2 .
 a:abcd:T{
 a
 T}:T{