From c5229a1040262fbfa34adb8a912bb5cd1681e69d Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Wed, 11 Jul 2012 16:57:43 +0000
Subject: fix position and formatting of %U; OpenBSD rev. 1.104 and 1.145,
 respectively

---
 mdoc_term.c     | 4 ++--
 mdoc_validate.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mdoc_term.c b/mdoc_term.c
index eeda5537..49bd6d82 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.242 2012/07/10 14:38:51 schwarze Exp $ */
+/*	$Id: mdoc_term.c,v 1.243 2012/07/11 16:57:43 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -242,7 +242,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/mdoc_validate.c b/mdoc_validate.c
index 0e31ee06..eb7af226 100644
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.185 2012/07/10 14:38:51 schwarze Exp $ */
+/*	$Id: mdoc_validate.c,v 1.186 2012/07/11 16:57:43 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -314,12 +314,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] = {
-- 
cgit v1.2.3