diff options
author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2012-07-10 14:35:58 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2012-07-10 14:35:58 +0000 |
commit | bb6e89e166a4363b4d488f7e272310ceace30bcc (patch) | |
tree | db6d9d2c77dba10ed4eb5637614d5dc2cd9f4025 /regress | |
parent | abb090ad7def441d642abd6ad2ba2a0784d29642 (diff) |
* implement -Tman .Bl -item -inset -diag -ohang -dash -hyphen -enum .It
* fix -Tman .Bl -bullet .It
* adjust the -Tascii .Bl -bullet -dash -hyphen .It
default and minimum width to new groff standards,
it changed from 4n (in groff 1.15) to 2n (in groff 1.21)
* same for -Tascii -enum, it changed from 5n to 2n
* use -hang formatting for -Tascii -enum -width 2n
* for -Tascii -enum, the default is -width 3n
Diffstat (limited to 'regress')
-rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/Makefile | 7 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/bullet.in | 65 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/bullet.out_ascii | 67 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/dash.in | 65 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/dash.out_ascii | 67 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/enum.in | 61 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/enum.out_ascii | 64 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/item.in | 23 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/item.out_ascii | 16 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/ohang.in | 23 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/ohang.out_ascii | 22 |
11 files changed, 477 insertions, 3 deletions
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/Makefile b/regress/usr.bin/mandoc/mdoc/Bl/Makefile index 1c2fb8d01e7..176e65041fd 100644 --- a/regress/usr.bin/mandoc/mdoc/Bl/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Bl/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.8 2011/11/17 16:28:45 schwarze Exp $ +# $OpenBSD: Makefile,v 1.9 2012/07/10 14:35:57 schwarze Exp $ -REGRESS_TARGETS=tag inset hang diag column extend nested +REGRESS_TARGETS = item inset diag ohang bullet dash enum hang tag +REGRESS_TARGETS += column extend nested # mandoc still contains a compatibility hack with groff-1.15 # regarding hang list indentation. @@ -12,6 +13,6 @@ REGRESS_TARGETS+=multitype multitag empty unclosed SKIP_GROFF ?= hang empty -SKIP_TMAN ?= tag inset hang diag column extend nested multitype multitag empty +SKIP_TMAN ?= tag hang column extend nested multitype multitag empty .include <bsd.regress.mk> diff --git a/regress/usr.bin/mandoc/mdoc/Bl/bullet.in b/regress/usr.bin/mandoc/mdoc/Bl/bullet.in new file mode 100644 index 00000000000..6893426ff6e --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Bl/bullet.in @@ -0,0 +1,65 @@ +.Dd June 17, 2009 +.Dt BL-BULLET 1 +.Os OpenBSD +.Sh NAME +.Nm Bl-bullet +.Nd bullet lists +.Sh DESCRIPTION +.Bl -bullet -width 0n +.It +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 -bullet -width 1n +.It +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 -bullet -width 2n +.It +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 -bullet -width 3n +.It +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 -bullet -width 4n +.It +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 -bullet -width 5n +.It +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 -bullet -width 6n +.It +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 -bullet -width 7n +.It +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 -bullet +.It +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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/mdoc/Bl/bullet.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/bullet.out_ascii new file mode 100644 index 00000000000..37e77f59c24 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Bl/bullet.out_ascii @@ -0,0 +1,67 @@ +BL-BULLET(1) OpenBSD Reference Manual BL-BULLET(1) + +NNAAMMEE + BBll--bbuulllleett - bullet lists + +DDEESSCCRRIIPPTTIIOONN + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + + oo 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 + +OpenBSD June 17, 2009 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Bl/dash.in b/regress/usr.bin/mandoc/mdoc/Bl/dash.in new file mode 100644 index 00000000000..ea35e3f292b --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Bl/dash.in @@ -0,0 +1,65 @@ +.Dd June 17, 2009 +.Dt BL-DASH 1 +.Os OpenBSD +.Sh NAME +.Nm Bl-dash +.Nd dash and hyphen lists +.Sh DESCRIPTION +.Bl -dash -width 0n +.It +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 -hyphen -width 1n +.It +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 -dash -width 2n +.It +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 -dash -width 3n +.It +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 -hyphen -width 4n +.It +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 -hyphen -width 5n +.It +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 -dash -width 6n +.It +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 -dash -width 7n +.It +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 -dash +.It +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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/mdoc/Bl/dash.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/dash.out_ascii new file mode 100644 index 00000000000..e1ef8e2f7f8 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Bl/dash.out_ascii @@ -0,0 +1,67 @@ +BL-DASH(1) OpenBSD Reference Manual BL-DASH(1) + +NNAAMMEE + BBll--ddaasshh - dash and hyphen lists + +DDEESSCCRRIIPPTTIIOONN + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + + -- 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 + +OpenBSD June 17, 2009 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Bl/enum.in b/regress/usr.bin/mandoc/mdoc/Bl/enum.in new file mode 100644 index 00000000000..0f87afa2ce5 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Bl/enum.in @@ -0,0 +1,61 @@ +.Dd June 17, 2009 +.Dt BL-ENUM 1 +.Os OpenBSD +.Sh NAME +.Nm Bl-enum +.Nd enumerated lists +.Sh DESCRIPTION +.Bl -enum -width 1n +.It +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 -enum -width 2n +.It +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 -enum -width 3n +.It +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 -enum -width 4n +.It +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 -enum -width 5n +.It +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 -enum -width 6n +.It +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 -enum -width 7n +.It +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 -enum +.It +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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/mdoc/Bl/enum.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/enum.out_ascii new file mode 100644 index 00000000000..1635beaebcf --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Bl/enum.out_ascii @@ -0,0 +1,64 @@ +BL-ENUM(1) OpenBSD Reference Manual BL-ENUM(1) + +NNAAMMEE + BBll--eennuumm - enumerated lists + +DDEESSCCRRIIPPTTIIOONN + 1. 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 + + 1. 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 + + 1. 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 + + 1. 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 + + 1. 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 + + 1. 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 + + 1. 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 + + 1. 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 + + 2. 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 + + 3. 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 + + 4. 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 + + 5. 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 + + 6. 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 + + 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 + + 8. 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 + + 9. 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 + + 10. 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 + + 11. 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 + + 12. 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 + +OpenBSD June 17, 2009 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Bl/item.in b/regress/usr.bin/mandoc/mdoc/Bl/item.in new file mode 100644 index 00000000000..672e9dc794f --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Bl/item.in @@ -0,0 +1,23 @@ +.Dd July 10, 2012 +.Dt BL-ITEM 1 +.Os OpenBSD +.Sh NAME +.Nm Bl-item +.Nd itemized lists +.Sh DESCRIPTION +.Bl -item +.It +first line +.It ignore +second line +.It +third line +.El +.Bl -item -compact +.It +first line +.It ignore +second line +.It +third line +.El diff --git a/regress/usr.bin/mandoc/mdoc/Bl/item.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/item.out_ascii new file mode 100644 index 00000000000..3ad42d9a011 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Bl/item.out_ascii @@ -0,0 +1,16 @@ +BL-ITEM(1) OpenBSD Reference Manual BL-ITEM(1) + +NNAAMMEE + BBll--iitteemm - itemized lists + +DDEESSCCRRIIPPTTIIOONN + first line + + second line + + third line + first line + second line + third line + +OpenBSD July 10, 2012 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Bl/ohang.in b/regress/usr.bin/mandoc/mdoc/Bl/ohang.in new file mode 100644 index 00000000000..af4bdf6d01a --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Bl/ohang.in @@ -0,0 +1,23 @@ +.Dd July 10, 2012 +.Dt BL-OHANG 1 +.Os OpenBSD +.Sh NAME +.Nm Bl-ohang +.Nd over-hanging lists +.Sh DESCRIPTION +.Bl -ohang +.It first tag +first line +.It second tag +second line +.It third tag +third line +.El +.Bl -ohang -compact +.It first tag +first line +.It second tag +second line +.It third tag +third line +.El diff --git a/regress/usr.bin/mandoc/mdoc/Bl/ohang.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/ohang.out_ascii new file mode 100644 index 00000000000..99e73d7d6ba --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Bl/ohang.out_ascii @@ -0,0 +1,22 @@ +BL-OHANG(1) OpenBSD Reference Manual BL-OHANG(1) + +NNAAMMEE + BBll--oohhaanngg - over-hanging lists + +DDEESSCCRRIIPPTTIIOONN + first tag + first line + + second tag + second line + + third tag + third line + first tag + first line + second tag + second line + third tag + third line + +OpenBSD July 10, 2012 OpenBSD |