13 files changed, 99 insertions, 10 deletions
diff --git a/regress/usr.bin/mandoc/man/B/args.in b/regress/usr.bin/mandoc/man/B/args.in
index 817accfd133..57493d5d81c 100644
--- a/regress/usr.bin/mandoc/man/B/args.in
+++ b/regress/usr.bin/mandoc/man/B/args.in
@@ -6,8 +6,15 @@ This is
 .B bold
 text.
 It also works with
+.B several words on a line
+and with
 .B
 next line
 scope.
+.nf
+In no-fill mode:
+.B two words
+and another line.
+.fi
 It has no effect at the end of the file:
 .B
diff --git a/regress/usr.bin/mandoc/man/B/args.out_ascii b/regress/usr.bin/mandoc/man/B/args.out_ascii
index 51166dfa043..e510267551a 100644
--- a/regress/usr.bin/mandoc/man/B/args.out_ascii
+++ b/regress/usr.bin/mandoc/man/B/args.out_ascii
@@ -6,8 +6,12 @@ NNAAMMEE
        B-args - arguments to font macros
 
 DDEESSCCRRIIPPTTIIOONN
-       This is bboolldd text.  It also works with nneexxtt lliinnee scope.  It has no
-       effect at the end of the file:
+       This is bboolldd text.  It also works with sseevveerraall wwoorrddss oonn aa lliinnee and with
+       nneexxtt lliinnee scope.
+       In no-fill mode:
+       ttwwoo wwoorrddss
+       and another line.
+       It has no effect at the end of the file:
 
 
 
diff --git a/regress/usr.bin/mandoc/man/B/args.out_lint b/regress/usr.bin/mandoc/man/B/args.out_lint
index bc20485edb6..0239c0a3abb 100644
--- a/regress/usr.bin/mandoc/man/B/args.out_lint
+++ b/regress/usr.bin/mandoc/man/B/args.out_lint
@@ -1 +1 @@
-mandoc: args.in:13:2: WARNING: line scope broken: EOF breaks B
+mandoc: args.in:20:2: WARNING: line scope broken: EOF breaks B
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/Makefile b/regress/usr.bin/mandoc/mdoc/Bd/Makefile
index eefd98a2ad4..1971ec3f0a1 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Bd/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.16 2014/08/14 02:00:52 schwarze Exp $
+# $OpenBSD: Makefile,v 1.17 2014/11/10 20:59:41 schwarze Exp $
 
-REGRESS_TARGETS	 = blank centered nested spacing
+REGRESS_TARGETS	 = beforeNAME blank centered nested spacing
 REGRESS_TARGETS	+= badargs empty offset-empty
 REGRESS_TARGETS	+= break broken unclosed
 
-LINT_TARGETS	 = blank nested badargs break broken unclosed
+LINT_TARGETS	 = beforeNAME blank nested badargs break broken unclosed
 
-SKIP_TMAN	 = centered
+SKIP_TMAN	 = beforeNAME centered
 
 # groff-1.22.2 defect:
 # - a display breaking another block continues indefinitely
@@ -17,4 +17,8 @@ SKIP_GROFF	 = break
 
 SKIP_GROFF	+= centered
 
+# groff handles content before NAME differently
+
+SKIP_GROFF	+= beforeNAME
+
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/beforeNAME.in b/regress/usr.bin/mandoc/mdoc/Bd/beforeNAME.in
new file mode 100644
index 00000000000..f264471fc8b
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bd/beforeNAME.in
@@ -0,0 +1,15 @@
+.Dd July 28, 2014
+.Dt BD-BEFORENAME 1
+.Os OpenBSD
+.Bd -centered
+Building and Debugging NetBSD Kernels
+.br
+David A. Holland
+.br
+August 17, 2009
+.Ed
+.Sh NAME
+.Nm Bd-beforename
+.Nd title and author block before the NAME section
+.Sh DESCRIPTION
+some text
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/beforeNAME.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/beforeNAME.out_ascii
new file mode 100644
index 00000000000..50ec00d9b2a
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bd/beforeNAME.out_ascii
@@ -0,0 +1,14 @@
+BD-BEFORENAME(1)            General Commands Manual           BD-BEFORENAME(1)
+
+
+                    Building and Debugging NetBSD Kernels
+                               David A. Holland
+                               August 17, 2009
+
+NNAAMMEE
+     BBdd--bbeeffoorreennaammee - title and author block before the NAME section
+
+DDEESSCCRRIIPPTTIIOONN
+     some text
+
+OpenBSD                          July 28, 2014                         OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/beforeNAME.out_lint b/regress/usr.bin/mandoc/mdoc/Bd/beforeNAME.out_lint
new file mode 100644
index 00000000000..a5659948b18
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bd/beforeNAME.out_lint
@@ -0,0 +1 @@
+mandoc: beforeNAME.in:4:2: WARNING: content before first section header: Bd
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/tag.in b/regress/usr.bin/mandoc/mdoc/Bl/tag.in
index 14eefdbb0f9..a8ded58d901 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/tag.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/tag.in
@@ -67,6 +67,20 @@ text
 text
 .El
 .Pp
+Scaling units other than n:
+.Bl -tag -width 4m
+.It tag
+text
+.El
+.Bl -tag -width 800M
+.It tag
+text
+.El
+.Bl -tag -width 14
+.It tag
+text
+.El
+.Pp
 Indented list:
 .Bl -tag -offset 6n -width xxx
 .It one
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii
index 330bdcc1f62..c8f15374f09 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii
@@ -54,6 +54,15 @@ DDEESSCCRRIIPPTTIIOONN
 
      tag         text
 
+     Scaling units other than n:
+
+     tag   text
+
+     tag       text
+
+     tag
+         text
+
      Indented list:
 
            one  first text
diff --git a/regress/usr.bin/mandoc/roff/nr/Makefile b/regress/usr.bin/mandoc/roff/nr/Makefile
index fd5e2eb0723..e5b14f41098 100644
--- a/regress/usr.bin/mandoc/roff/nr/Makefile
+++ b/regress/usr.bin/mandoc/roff/nr/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.7 2014/07/06 19:08:57 schwarze Exp $
+# $OpenBSD: Makefile,v 1.8 2014/11/10 20:59:41 schwarze Exp $
 
-REGRESS_TARGETS = argc eval escname int predef rr
-LINT_TARGETS	= escname
+REGRESS_TARGETS = argc divzero eval escname int predef rr
+LINT_TARGETS	= divzero escname
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/roff/nr/divzero.in b/regress/usr.bin/mandoc/roff/nr/divzero.in
new file mode 100644
index 00000000000..d8983f133fa
--- /dev/null
+++ b/regress/usr.bin/mandoc/roff/nr/divzero.in
@@ -0,0 +1,7 @@
+.TH NR-DIVZERO 1 "October 19, 2014" OpenBSD
+.SH NAME
+nr-divzero \- division by zero in numerical expression
+.SH DESCRIPTION
+initial text
+.nr result 1/0
+final \n[result] text
diff --git a/regress/usr.bin/mandoc/roff/nr/divzero.out_ascii b/regress/usr.bin/mandoc/roff/nr/divzero.out_ascii
new file mode 100644
index 00000000000..fe0cbbb5d93
--- /dev/null
+++ b/regress/usr.bin/mandoc/roff/nr/divzero.out_ascii
@@ -0,0 +1,13 @@
+NR-DIVZERO(1)               General Commands Manual              NR-DIVZERO(1)
+
+
+
+NNAAMMEE
+       nr-divzero - division by zero in numerical expression
+
+DDEESSCCRRIIPPTTIIOONN
+       initial text final 0 text
+
+
+
+OpenBSD                        October 19, 2014                  NR-DIVZERO(1)
diff --git a/regress/usr.bin/mandoc/roff/nr/divzero.out_lint b/regress/usr.bin/mandoc/roff/nr/divzero.out_lint
new file mode 100644
index 00000000000..aa56502d79a
--- /dev/null
+++ b/regress/usr.bin/mandoc/roff/nr/divzero.out_lint
@@ -0,0 +1 @@
+mandoc: divzero.in:6:4: ERROR: divide by zero: 1/0