fix position and formatting of %U

5 files changed, 71 insertions, 7 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Rs/Makefile b/regress/usr.bin/mandoc/mdoc/Rs/Makefile
index e6f777ef883..873550fb6f1 100644
--- a/regress/usr.bin/mandoc/mdoc/Rs/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Rs/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.3 2011/11/17 16:28:46 schwarze Exp $
+# $OpenBSD: Makefile,v 1.4 2012/07/11 16:55:29 schwarze Exp $
 
-REGRESS_TARGETS=break three_authors
+REGRESS_TARGETS=allch break three_authors
 
 SKIP_TMAN ?= ALL
 
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/allch.in b/regress/usr.bin/mandoc/mdoc/Rs/allch.in
new file mode 100644
index 00000000000..598a5404946
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Rs/allch.in
@@ -0,0 +1,44 @@
+.Dd July 12, 2012
+.Dt RS-ALLCH 1
+.Os OpenBSD
+.Sh NAME
+.Nm Rs-allch
+.Nd reference block using all supported child macros
+.Sh DESCRIPTION
+reference on the same line:
+.Rs
+.%A author name
+.%T title of article
+.%B book title
+.%I issuer name
+.%J journal name
+.%R report name
+.%N number of journal
+.%V volume number
+.%U uniform resource locator
+.%P page number
+.%Q institutional author
+.%D date of publication
+.%O optional information
+.\" not implemented yet in groff:
+.\" .%C city name
+.Re
+.Sh SEE ALSO
+reference after a blank line:
+.Rs
+.%A author name
+.%T title of article
+.%B book title
+.%I issuer name
+.%J journal name
+.%R report name
+.%N number of journal
+.%V volume number
+.%U uniform resource locator
+.%P page number
+.%Q institutional author
+.%D date of publication
+.%O optional information
+.\" not implemented yet in groff:
+.\" .%C city name
+.Re
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/allch.out_ascii b/regress/usr.bin/mandoc/mdoc/Rs/allch.out_ascii
new file mode 100644
index 00000000000..30d5953a0ea
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Rs/allch.out_ascii
@@ -0,0 +1,20 @@
+RS-ALLCH(1)                OpenBSD Reference Manual                RS-ALLCH(1)
+
+NNAAMMEE
+     RRss--aallllcchh - reference block using all supported child macros
+
+DDEESSCCRRIIPPTTIIOONN
+     reference on the same line: author name, "title of article", _b_o_o_k _t_i_t_l_e,
+     _i_s_s_u_e_r _n_a_m_e, _j_o_u_r_n_a_l _n_a_m_e, report name, number of journal, volume number,
+     uniform resource locator, page number, institutional author, date of
+     publication, optional information.
+
+SSEEEE AALLSSOO
+     reference after a blank line:
+
+     author name, "title of article", _b_o_o_k _t_i_t_l_e, _i_s_s_u_e_r _n_a_m_e, _j_o_u_r_n_a_l _n_a_m_e,
+     report name, number of journal, volume number, uniform resource locator,
+     page number, institutional author, date of publication, optional
+     information.
+
+OpenBSD                          July 12, 2012                         OpenBSD
diff --git a/usr.bin/mandoc/mdoc_term.c b/usr.bin/mandoc/mdoc_term.c
index ca3cfe56912..8a0f571d9c7 100644
--- a/usr.bin/mandoc/mdoc_term.c
+++ b/usr.bin/mandoc/mdoc_term.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.144 2012/07/10 14:35:57 schwarze Exp $ */
+/*	$Id: mdoc_term.c,v 1.145 2012/07/11 16:55:29 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -238,7 +238,7 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ NULL, termp____post }, /* %Q */ 
 	{ termp_sp_pre, NULL }, /* br */
 	{ termp_sp_pre, NULL }, /* sp */ 
-	{ termp_under_pre, termp____post }, /* %U */ 
+	{ NULL, termp____post }, /* %U */ 
 	{ NULL, NULL }, /* Ta */ 
 };
 
diff --git a/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c
index a068db9ae7a..e12a9b76ce9 100644
--- a/usr.bin/mandoc/mdoc_validate.c
+++ b/usr.bin/mandoc/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.103 2012/07/10 14:35:57 schwarze Exp $ */
+/*	$Id: mdoc_validate.c,v 1.104 2012/07/11 16:55:29 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -310,12 +310,12 @@ static	const enum mdoct rsord[RSORD_MAX] = {
 	MDOC__R,
 	MDOC__N,
 	MDOC__V,
+	MDOC__U,
 	MDOC__P,
 	MDOC__Q,
 	MDOC__D,
 	MDOC__O,
-	MDOC__C,
-	MDOC__U
+	MDOC__C
 };
 
 static	const char * const secnames[SEC__MAX] = {