Multiple man(7) .IP and .TP fixes started during p2k10:

Affecting both -Tascii and -Thtml:
* The .IP HEAD uses the second argument as the width, not the last one.
* Only print the first .IP HEAD argument, not all but the last.

Affecting only -Tascii:
* The .IP and .TP HEADs must be printed without literal mode,
  but literal mode must be restored afterwards.
* After the .IP and .TP bodies, we only want term_newln(), not
  term_flushln(), or we would get two blank lines in literal mode.
* The .TP HEAD does not use TWOSPACE, just like .IP doesn't either.
* In literal mode, clear NOLPAD after each line, or subsequent lines
  would get no indentation whatsoever.

Affecting only -Thtml:
* Only print next-line .TP children, instead of all but the first.

OK kristaps@ on the -Tascii part; and:
"Can you work this into man_html.c, too?"

7 files changed, 31 insertions, 49 deletions

diff --git a/regress/usr.bin/mandoc/man/IP/Makefile b/regress/usr.bin/mandoc/man/IP/Makefile
index 1388679c2fd..8c6ca9d7279 100644
--- a/regress/usr.bin/mandoc/man/IP/Makefile
+++ b/regress/usr.bin/mandoc/man/IP/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2011/01/04 01:15:39 schwarze Exp $
+# $OpenBSD: Makefile,v 1.1 2011/01/04 01:15:39 schwarze Exp $
 
 REGRESS_TARGETS=literal width manyargs
 GROFF_TARGETS=literal width manyargs
diff --git a/regress/usr.bin/mandoc/man/IP/literal.in b/regress/usr.bin/mandoc/man/IP/literal.in
index 1774c7098eb..76ae8a64843 100644
--- a/regress/usr.bin/mandoc/man/IP/literal.in
+++ b/regress/usr.bin/mandoc/man/IP/literal.in
@@ -1,11 +1,10 @@
-.TH TP-LITERAL 1
+.TH IP-LITERAL 1
 .SH NAME
-TP-literal \- indented paragraphs in literal context
+IP-literal \- indented paragraphs in literal context
 .SH DESCRIPTION
 regular
 text
-.TP 10n
-tag
+.IP tag 10n
 indented
 text
 .PP
@@ -14,8 +13,7 @@ text
 .nf
 literal
 text
-.TP 10n
-tag
+.IP tag 10n
 indented
 text
 .PP
diff --git a/regress/usr.bin/mandoc/man/IP/literal.out_ascii b/regress/usr.bin/mandoc/man/IP/literal.out_ascii
index 29c09bf0d51..dbd82f6c918 100644
--- a/regress/usr.bin/mandoc/man/IP/literal.out_ascii
+++ b/regress/usr.bin/mandoc/man/IP/literal.out_ascii
@@ -1,9 +1,9 @@
-TP-LITERAL(1)                                                    TP-LITERAL(1)
+IP-LITERAL(1)                                                    IP-LITERAL(1)
 
 
 
 NNAAMMEE
-       TP-literal - indented paragraphs in literal context
+       IP-literal - indented paragraphs in literal context
 
 DDEESSCCRRIIPPTTIIOONN
        regular text
diff --git a/regress/usr.bin/mandoc/man/IP/manyargs.in b/regress/usr.bin/mandoc/man/IP/manyargs.in
index 6b6055c97f8..5d30fcc9df6 100644
--- a/regress/usr.bin/mandoc/man/IP/manyargs.in
+++ b/regress/usr.bin/mandoc/man/IP/manyargs.in
@@ -1,45 +1,39 @@
-.TH TP-MANYARGS 1
+.TH IP-MANYARGS 1
 .SH NAME
-TP-manyargs \- too many header args for indented blocks
+IP-manyargs \- too many header args for indented blocks
 .SH DESCRIPTION
 regular
 text
-.TP 10n
-tag1
+.IP tag1 10n
 indented
 text
 .PP
 regular
 text
-.TP 10n tag1
-tag2
+.IP tag2 10n tag1
 indented
 text
 .PP
 regular
 text
-.TP 10n tag2 tag1
-tag3
+.IP tag3 10n tag2 tag1
 indented
 text
 .nf
 literal
 text
-.TP 10n
-tag1
+.IP tag1 10n
 indented
 text
 .PP
 literal
 text
-.TP 10n tag1
-tag2
+.IP tag2 10n tag1
 indented
 text
 .PP
 literal
 text
-.TP 10n tag2 tag1
-tag3
+.IP tag3 10n tag2 tag1
 indented
 text
diff --git a/regress/usr.bin/mandoc/man/IP/manyargs.out_ascii b/regress/usr.bin/mandoc/man/IP/manyargs.out_ascii
index 658f29340b4..20b3c014d8d 100644
--- a/regress/usr.bin/mandoc/man/IP/manyargs.out_ascii
+++ b/regress/usr.bin/mandoc/man/IP/manyargs.out_ascii
@@ -1,9 +1,9 @@
-TP-MANYARGS(1)                                                  TP-MANYARGS(1)
+IP-MANYARGS(1)                                                  IP-MANYARGS(1)
 
 
 
 NNAAMMEE
-       TP-manyargs - too many header args for indented blocks
+       IP-manyargs - too many header args for indented blocks
 
 DDEESSCCRRIIPPTTIIOONN
        regular text
diff --git a/regress/usr.bin/mandoc/man/IP/width.in b/regress/usr.bin/mandoc/man/IP/width.in
index 47683a351d5..74499341c8d 100644
--- a/regress/usr.bin/mandoc/man/IP/width.in
+++ b/regress/usr.bin/mandoc/man/IP/width.in
@@ -1,53 +1,43 @@
-.TH TP-WIDTH 1
+.TH IP-WIDTH 1
 .SH NAME
-TP-width \- indentation width of indented paragraphs
+IP-width \- indentation width of indented paragraphs
 .SH DESCRIPTION
 Regular mode:
-.TP 1n
-tag
+.IP tag 1n
 indented
 .br
 text
-.TP 2n
-tag
+.IP tag 2n
 indented
 .br
 text
-.TP 3n
-tag
+.IP tag 3n
 indented
 .br
 text
-.TP 4n
-tag
+.IP tag 4n
 indented
 .br
 text
-.TP 5n
-tag
+.IP tag 5n
 indented
 .br
 text
 .PP
 Literal mode:
 .nf
-.TP 1n
-tag
+.IP tag 1n
 indented
 text
-.TP 2n
-tag
+.IP tag 2n
 indented
 text
-.TP 3n
-tag
+.IP tag 3n
 indented
 text
-.TP 4n
-tag
+.IP tag 4n
 indented
 text
-.TP 5n
-tag
+.IP tag 5n
 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 1b611d2866d..ee076a45c41 100644
--- a/regress/usr.bin/mandoc/man/IP/width.out_ascii
+++ b/regress/usr.bin/mandoc/man/IP/width.out_ascii
@@ -1,9 +1,9 @@
-TP-WIDTH(1)                                                        TP-WIDTH(1)
+IP-WIDTH(1)                                                        IP-WIDTH(1)
 
 
 
 NNAAMMEE
-       TP-width - indentation width of indented paragraphs
+       IP-width - indentation width of indented paragraphs
 
 DDEESSCCRRIIPPTTIIOONN
        Regular mode: