summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2012-07-13 14:15:51 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2012-07-13 14:15:51 +0000
commit471853e866a06a0405fae2bddea713d60c0d6bc5 (patch)
tree80f1a48dcf37276189ee6c1938677544d51d8a60 /regress
parent64004de4dc30768b74215b739be4b61e63850620 (diff)
In -man -Tascii, support .sp with negative argument.
In -mdoc -Tman, improve the framework to control vertical spacing. Use both to support .Bl -compact (surprisingly hard to get right).
Diffstat (limited to 'regress')
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/bullet.in2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/bullet.out_ascii12
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/dash.in2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/dash.out_ascii12
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/enum.in2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/enum.out_ascii12
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/hang.in9
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/hang.out_ascii4
-rw-r--r--regress/usr.bin/mandoc/roff/sp/Makefile4
-rw-r--r--regress/usr.bin/mandoc/roff/sp/negative.in8
-rw-r--r--regress/usr.bin/mandoc/roff/sp/negative.out_ascii14
11 files changed, 40 insertions, 41 deletions
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/bullet.in b/regress/usr.bin/mandoc/mdoc/Bl/bullet.in
index 6893426ff6e..13a58f338af 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/bullet.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/bullet.in
@@ -37,7 +37,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
x x x x x x x x x x x x x x x x 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
+.Bl -bullet -compact
.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
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/bullet.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/bullet.out_ascii
index 37e77f59c24..5722099d36c 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/bullet.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/bullet.out_ascii
@@ -27,40 +27,28 @@ 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
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/dash.in b/regress/usr.bin/mandoc/mdoc/Bl/dash.in
index ea35e3f292b..92e36821f72 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/dash.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/dash.in
@@ -37,7 +37,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
x x x x x x x x x x x x x x x x 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
+.Bl -dash -compact
.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
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/dash.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/dash.out_ascii
index e1ef8e2f7f8..07f78523b66 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/dash.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/dash.out_ascii
@@ -27,40 +27,28 @@ 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
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/enum.in b/regress/usr.bin/mandoc/mdoc/Bl/enum.in
index 0f87afa2ce5..a2cc696f155 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/enum.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/enum.in
@@ -33,7 +33,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
x x x x x x x x x x x x x x x x 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
+.Bl -enum -compact
.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
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/enum.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/enum.out_ascii
index 1635beaebcf..49ba343bf5f 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/enum.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/enum.out_ascii
@@ -24,40 +24,28 @@ 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
-
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
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/hang.in b/regress/usr.bin/mandoc/mdoc/Bl/hang.in
index 2d32bf2bd7c..434f84d99cc 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/hang.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/hang.in
@@ -45,6 +45,15 @@ x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
x x x x x x x x x x x x x x x x 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
+Compact hanged list:
+.Bl -hang -width 6n -compact
+.It one
+first line
+.It second
+second line
+.It third_tag
+last line
+.El
Hanged list without a width:
.Bl -hang
.It tag
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/hang.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/hang.out_ascii
index ea1e58f483b..a9b378867a9 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/hang.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/hang.out_ascii
@@ -35,6 +35,10 @@ DDEESSCCRRIIPPTTIIOONN
zehn__zehn x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
x x x x x x x x x x x x x x x x
+ Compact hanged list:
+ one first line
+ second second line
+ third_tag last line
Hanged list without a width:
tag text
diff --git a/regress/usr.bin/mandoc/roff/sp/Makefile b/regress/usr.bin/mandoc/roff/sp/Makefile
index 79560a0c5d1..62e2b34001b 100644
--- a/regress/usr.bin/mandoc/roff/sp/Makefile
+++ b/regress/usr.bin/mandoc/roff/sp/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.2 2011/11/17 16:28:46 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2012/07/13 14:15:50 schwarze Exp $
-REGRESS_TARGETS=badargs-mdoc badargs-man
+REGRESS_TARGETS = badargs-mdoc badargs-man negative
.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/roff/sp/negative.in b/regress/usr.bin/mandoc/roff/sp/negative.in
new file mode 100644
index 00000000000..10c6edc98f1
--- /dev/null
+++ b/regress/usr.bin/mandoc/roff/sp/negative.in
@@ -0,0 +1,8 @@
+.TH SP-NEGATIVE 1 "July 12, 2012" OpenBSD
+.SH NAME
+sp-negative \- negative vertical spacing
+.SH DESCRIPTION
+first line
+.sp -1v
+.PP
+second line
diff --git a/regress/usr.bin/mandoc/roff/sp/negative.out_ascii b/regress/usr.bin/mandoc/roff/sp/negative.out_ascii
new file mode 100644
index 00000000000..30c19682a8f
--- /dev/null
+++ b/regress/usr.bin/mandoc/roff/sp/negative.out_ascii
@@ -0,0 +1,14 @@
+SP-NEGATIVE(1) OpenBSD Reference Manual SP-NEGATIVE(1)
+
+
+
+NNAAMMEE
+ sp-negative - negative vertical spacing
+
+DDEESSCCRRIIPPTTIIOONN
+ first line
+ second line
+
+
+
+OpenBSD July 12, 2012 SP-NEGATIVE(1)