summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2012-11-18 23:10:59 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2012-11-18 23:10:59 +0000
commitab967b8a4034d267332594432e09010652b4d239 (patch)
treebea3579bbe181e1e451a8d90b6e9e0578c232b5b /regress
parentd6d1c553d854b2f3f00ccfd2d3a6e18af360dfce (diff)
Check that mandoc handles non-numeric width arguments
to .Bl -tag and .TP the same way as groff, even via -Tman. Some time ago, millert@ reported issues with these; apparently, those issues were fixed since then.
Diffstat (limited to 'regress')
-rw-r--r--regress/usr.bin/mandoc/man/TP/Makefile4
-rw-r--r--regress/usr.bin/mandoc/man/TP/badarg.in20
-rw-r--r--regress/usr.bin/mandoc/man/TP/badarg.out_ascii22
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/tag.in15
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii10
5 files changed, 66 insertions, 5 deletions
diff --git a/regress/usr.bin/mandoc/man/TP/Makefile b/regress/usr.bin/mandoc/man/TP/Makefile
index afa42cd64f6..1a130724ed1 100644
--- a/regress/usr.bin/mandoc/man/TP/Makefile
+++ b/regress/usr.bin/mandoc/man/TP/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.3 2011/11/17 16:28:45 schwarze Exp $
+# $OpenBSD: Makefile,v 1.4 2012/11/18 23:10:58 schwarze Exp $
-REGRESS_TARGETS=literal width manyargs macrotag
+REGRESS_TARGETS = literal width manyargs badarg macrotag
.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/man/TP/badarg.in b/regress/usr.bin/mandoc/man/TP/badarg.in
new file mode 100644
index 00000000000..d40759e2f03
--- /dev/null
+++ b/regress/usr.bin/mandoc/man/TP/badarg.in
@@ -0,0 +1,20 @@
+.TH TP-BADARG 1 "November 18, 2012" OpenBSD
+.SH NAME
+TP-badarg \- invalid width specification for tagged paragraph
+.SH DESCRIPTION
+Non-numeric width specifications are ignored:
+.TP x
+tag
+indented
+.br
+text
+.TP xxxxx
+tag
+indented
+.br
+text
+.TP xxxxxxxxxx
+tag
+indented
+.br
+text
diff --git a/regress/usr.bin/mandoc/man/TP/badarg.out_ascii b/regress/usr.bin/mandoc/man/TP/badarg.out_ascii
new file mode 100644
index 00000000000..2ee4517f98d
--- /dev/null
+++ b/regress/usr.bin/mandoc/man/TP/badarg.out_ascii
@@ -0,0 +1,22 @@
+TP-BADARG(1) OpenBSD Reference Manual TP-BADARG(1)
+
+
+
+NNAAMMEE
+ TP-badarg - invalid width specification for tagged paragraph
+
+DDEESSCCRRIIPPTTIIOONN
+ Non-numeric width specifications are ignored:
+
+ tag indented
+ text
+
+ tag indented
+ text
+
+ tag indented
+ text
+
+
+
+OpenBSD November 18, 2012 TP-BADARG(1)
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/tag.in b/regress/usr.bin/mandoc/mdoc/Bl/tag.in
index cf7afeaa0f2..a211ec8e020 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/tag.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/tag.in
@@ -1,4 +1,4 @@
-.Dd October 28, 2009
+.Dd November 18, 2012
.Dt BL-TAG 1
.Os OpenBSD
.Sh NAME
@@ -37,7 +37,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
.It 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
.El
-.\" Trailing white space in the head.
+.Pp
+Trailing white space in the head:
.Bl -tag -width 5n
.It "a"
b
@@ -46,3 +47,13 @@ b
.It "a "
b
.El
+.Pp
+Non-numeric with specification:
+.Bl -tag -width xxx
+.It tag
+text
+.El
+.Bl -tag -width xxxxxxxxxx
+.It tag
+text
+.El
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii
index e90a9a50fd3..340c5d3af87 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii
@@ -33,10 +33,18 @@ 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
+ Trailing white space in the head:
+
a b
a b
a b
-OpenBSD October 28, 2009 OpenBSD
+ Non-numeric with specification:
+
+ tag text
+
+ tag text
+
+OpenBSD November 18, 2012 OpenBSD