support negative horizontal widths in man(7);

minus twenty lines of code in spite of enhanced functionality

10 files changed, 175 insertions, 38 deletions

diff --git a/regress/usr.bin/mandoc/man/HP/spacing.in b/regress/usr.bin/mandoc/man/HP/spacing.in
index 5a9614f1b01..485fae9a97f 100644
--- a/regress/usr.bin/mandoc/man/HP/spacing.in
+++ b/regress/usr.bin/mandoc/man/HP/spacing.in
@@ -1,28 +1,37 @@
-.TH HP-SPACING 1 "November 20, 2014" OpenBSD
+.TH HP-SPACING 1 "December 23, 2014" OpenBSD
 .SH NAME
 HP-spacing \- spacing in hanged lists
 .SH DESCRIPTION
 Normal text.
 .HP
-tag
-Indented text.
-.HP
-four
-Indented text.
-.HP
-ffive
-Indented text.
-.HP
-sixsix
-Indented text.
-.HP
-seseven
-Indented text.
-.HP
-a much longer tag
-Indented text.
+Each hanged paragraph gets a sufficient amount of text
+to wrap to the next line.
+.HP -10n
+Each hanged paragraph gets a sufficient amount of text
+to wrap to the next line.
+.HP -4n
+Each hanged paragraph gets a sufficient amount of text
+to wrap to the next line.
+.HP 0n
+Each hanged paragraph gets a sufficient amount of text
+to wrap to the next line.
+.HP 1n
+Each hanged paragraph gets a sufficient amount of text
+to wrap to the next line.
+.HP 2n
+Each hanged paragraph gets a sufficient amount of text
+to wrap to the next line.
+.HP 4n
+Each hanged paragraph gets a sufficient amount of text
+to wrap to the next line.
+.HP 8n
+Each hanged paragraph gets a sufficient amount of text
+to wrap to the next line.
+.HP 16n
+Each hanged paragraph gets a sufficient amount of text
+to wrap to the next line.
 .HP 78n
-Testing a hanged paragraph with a large indentation width,
-in this case 78n, requires more text.
+Each hanged paragraph gets a sufficient amount of text
+to wrap to the next line.
 .LP
 Normal text.
diff --git a/regress/usr.bin/mandoc/man/HP/spacing.out_ascii b/regress/usr.bin/mandoc/man/HP/spacing.out_ascii
index d4f50d42b54..7697cffcfea 100644
--- a/regress/usr.bin/mandoc/man/HP/spacing.out_ascii
+++ b/regress/usr.bin/mandoc/man/HP/spacing.out_ascii
@@ -8,26 +8,39 @@ NNAAMMEE
 DDEESSCCRRIIPPTTIIOONN
        Normal text.
 
-       tag Indented text.
+       Each hanged paragraph gets a sufficient amount of text to wrap to the
+              next line.
 
-       four Indented text.
+       Each hanged paragraph gets a sufficient amount of text to wrap to the
+next line.
 
-       ffive Indented text.
+       Each hanged paragraph gets a sufficient amount of text to wrap to the
+   next line.
 
-       sixsix Indented text.
+       Each hanged paragraph gets a sufficient amount of text to wrap to the
+       next line.
 
-       seseven Indented text.
+       Each hanged paragraph gets a sufficient amount of text to wrap to the
+        next line.
 
-       a much longer tag Indented text.
+       Each hanged paragraph gets a sufficient amount of text to wrap to the
+         next line.
 
-       Testing a hanged paragraph with a large indentation width, in this case
-                                                                                     78n,
-                                                                                     requires
-                                                                                     more
-                                                                                     text.
+       Each hanged paragraph gets a sufficient amount of text to wrap to the
+           next line.
+
+       Each hanged paragraph gets a sufficient amount of text to wrap to the
+               next line.
+
+       Each hanged paragraph gets a sufficient amount of text to wrap to the
+                       next line.
+
+       Each hanged paragraph gets a sufficient amount of text to wrap to the
+                                                                                     next
+                                                                                     line.
 
        Normal text.
 
 
 
-OpenBSD                        November 20, 2014                 HP-SPACING(1)
+OpenBSD                        December 23, 2014                 HP-SPACING(1)
diff --git a/regress/usr.bin/mandoc/man/IP/width.in b/regress/usr.bin/mandoc/man/IP/width.in
index 8c30b93b15e..1c919a386f6 100644
--- a/regress/usr.bin/mandoc/man/IP/width.in
+++ b/regress/usr.bin/mandoc/man/IP/width.in
@@ -3,6 +3,18 @@
 IP-width \- indentation width of indented paragraphs
 .SH DESCRIPTION
 Regular mode:
+.IP tag -10n
+indented
+.br
+text
+.IP tag -4n
+indented
+.br
+text
+.IP tag 0n
+indented
+.br
+text
 .IP tag 1n
 indented
 .br
@@ -34,6 +46,15 @@ text
 .PP
 Literal mode:
 .nf
+.IP tag -10n
+indented
+text
+.IP tag -4n
+indented
+text
+.IP tag 0n
+indented
+text
 .IP tag 1n
 indented
 text
diff --git a/regress/usr.bin/mandoc/man/IP/width.out_ascii b/regress/usr.bin/mandoc/man/IP/width.out_ascii
index 83a6e32229c..a867ba70471 100644
--- a/regress/usr.bin/mandoc/man/IP/width.out_ascii
+++ b/regress/usr.bin/mandoc/man/IP/width.out_ascii
@@ -9,6 +9,18 @@ DDEESSCCRRIIPPTTIIOONN
        Regular mode:
 
        tag
+indented
+text
+
+       tag
+   indented
+   text
+
+       tag
+       indented
+       text
+
+       tag
         indented
         text
 
@@ -35,6 +47,18 @@ DDEESSCCRRIIPPTTIIOONN
        Literal mode:
 
        tag
+indented
+text
+
+       tag
+   indented
+   text
+
+       tag
+       indented
+       text
+
+       tag
         indented
         text
 
diff --git a/regress/usr.bin/mandoc/man/RS/width.in b/regress/usr.bin/mandoc/man/RS/width.in
index 7dc19dad9e8..c6b1dbf5e2c 100644
--- a/regress/usr.bin/mandoc/man/RS/width.in
+++ b/regress/usr.bin/mandoc/man/RS/width.in
@@ -1,9 +1,21 @@
-.TH RS-WIDTH 1 "February 16, 2014" OpenBSD
+.TH RS-WIDTH 1 "December 23, 2014" OpenBSD
 .SH NAME
-RS-width \- excessive indentation
+RS-width \- negative and excessive indentation
 .SH DESCRIPTION
 regular
 text
+.RS -4n
+indented
+text
+.RE
+regular
+text
+.RS 4n
+indented
+text
+.RE
+regular
+text
 .RS 100n
 indented
 text
diff --git a/regress/usr.bin/mandoc/man/RS/width.out_ascii b/regress/usr.bin/mandoc/man/RS/width.out_ascii
index 35efea8094e..95951e55956 100644
--- a/regress/usr.bin/mandoc/man/RS/width.out_ascii
+++ b/regress/usr.bin/mandoc/man/RS/width.out_ascii
@@ -3,14 +3,18 @@ RS-WIDTH(1)                 General Commands Manual                RS-WIDTH(1)
 
 
 NNAAMMEE
-       RS-width - excessive indentation
+       RS-width - negative and excessive indentation
 
 DDEESSCCRRIIPPTTIIOONN
        regular text
+   indented text
+       regular text
+           indented text
+       regular text
                                                                                                            indented
                                                                                                            text
        regular text
 
 
 
-OpenBSD                        February 16, 2014                   RS-WIDTH(1)
+OpenBSD                        December 23, 2014                   RS-WIDTH(1)
diff --git a/regress/usr.bin/mandoc/man/TP/width.in b/regress/usr.bin/mandoc/man/TP/width.in
index d57aa0049b5..1ba99e402b7 100644
--- a/regress/usr.bin/mandoc/man/TP/width.in
+++ b/regress/usr.bin/mandoc/man/TP/width.in
@@ -1,8 +1,23 @@
-.TH TP-WIDTH 1 "February 16, 2014" OpenBSD
+.TH TP-WIDTH 1 "December 23, 2014" OpenBSD
 .SH NAME
 TP-width \- indentation width of indented paragraphs
 .SH DESCRIPTION
 Regular mode:
+.TP -10n
+tag
+indented
+.br
+text
+.TP -4n
+tag
+indented
+.br
+text
+.TP 0n
+tag
+indented
+.br
+text
 .TP 1n
 tag
 indented
@@ -36,6 +51,18 @@ text
 .PP
 Literal mode:
 .nf
+.TP -10n
+tag
+indented
+text
+.TP -4n
+tag
+indented
+text
+.TP 0n
+tag
+indented
+text
 .TP 1n
 tag
 indented
diff --git a/regress/usr.bin/mandoc/man/TP/width.out_ascii b/regress/usr.bin/mandoc/man/TP/width.out_ascii
index f726f8fca30..fea6388394f 100644
--- a/regress/usr.bin/mandoc/man/TP/width.out_ascii
+++ b/regress/usr.bin/mandoc/man/TP/width.out_ascii
@@ -9,6 +9,18 @@ DDEESSCCRRIIPPTTIIOONN
        Regular mode:
 
        tag
+indented
+text
+
+       tag
+   indented
+   text
+
+       tag
+       indented
+       text
+
+       tag
         indented
         text
 
@@ -32,6 +44,18 @@ DDEESSCCRRIIPPTTIIOONN
        Literal mode:
 
        tag
+indented
+text
+
+       tag
+   indented
+   text
+
+       tag
+       indented
+       text
+
+       tag
         indented
         text
 
@@ -54,4 +78,4 @@ DDEESSCCRRIIPPTTIIOONN
 
 
 
-OpenBSD                        February 16, 2014                   TP-WIDTH(1)
+OpenBSD                        December 23, 2014                   TP-WIDTH(1)
diff --git a/regress/usr.bin/mandoc/roff/scale/horiz.in b/regress/usr.bin/mandoc/roff/scale/horiz.in
index f3b36652019..edba2f755f9 100644
--- a/regress/usr.bin/mandoc/roff/scale/horiz.in
+++ b/regress/usr.bin/mandoc/roff/scale/horiz.in
@@ -25,5 +25,7 @@ initial text
 79n
 .in 1.5ix
 1.5ix
+.in -6n
+-6n
 .PP
 final text
diff --git a/regress/usr.bin/mandoc/roff/scale/horiz.out_ascii b/regress/usr.bin/mandoc/roff/scale/horiz.out_ascii
index 8db827eb1e3..75e12a4f323 100644
--- a/regress/usr.bin/mandoc/roff/scale/horiz.out_ascii
+++ b/regress/usr.bin/mandoc/roff/scale/horiz.out_ascii
@@ -18,6 +18,7 @@ DDEESSCCRRIIPPTTIIOONN
      5m
                                                                                79n
                1.5ix
+         -6n
 
        final text