From f32d0b8119092285f9a61491fe3cf85d61bb534c Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@cvs.openbsd.org>
Date: Sat, 3 Dec 2011 23:01:22 +0000
Subject: Remove an OpenBSD-specific tweak regarding .Xr spacing and make it
 compatible with bsd.lv mandoc and with groff-1.21. This tweak was originally
 added for compatibility with groff-1.15, which is no longer needed.

ok jmc@ kristaps@
---
 usr.bin/jot/jot.1           |  6 +++---
 usr.bin/mandoc/mdoc_macro.c | 15 +--------------
 2 files changed, 4 insertions(+), 17 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index 89533a814fa..b9ff5f40123 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: jot.1,v 1.16 2007/05/31 19:20:11 jmc Exp $
+.\"	$OpenBSD: jot.1,v 1.17 2011/12/03 23:01:21 schwarze Exp $
 .\"	$NetBSD: jot.1,v 1.2 1994/11/14 20:27:36 jtc Exp $
 .\"
 .\" Copyright (c) 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)jot.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: December 3 2011 $
 .Dt JOT 1
 .Os
 .Sh NAME
@@ -283,7 +283,7 @@ in the ASCII character set):
 .Dl "$ jot \-r \-c 160 a { | rs \-g0 0 8"
 .Pp
 Infinitely many
-.Xr yes 1 's
+.Xr yes 1 Ns 's
 may be obtained through:
 .Pp
 .Dl $ jot \-b yes 0
diff --git a/usr.bin/mandoc/mdoc_macro.c b/usr.bin/mandoc/mdoc_macro.c
index da05e3ac2f0..b8dd1b21f17 100644
--- a/usr.bin/mandoc/mdoc_macro.c
+++ b/usr.bin/mandoc/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.71 2011/12/03 22:47:27 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.72 2011/12/03 23:01:21 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -1565,19 +1565,6 @@ in_line_argn(MACRO_PROT_ARGS)
 			flushed = 1;
 		}
 
-		/* 
-		 * XXX: this is a hack to work around groff's ugliness
-		 * as regards `Xr' and extraneous arguments.  It should
-		 * ideally be deprecated behaviour, but because this is
-		 * code is no here, it's unlikely to be removed.
-		 */
-		if (MDOC_Xr == tok && j == maxargs) {
-			if ( ! mdoc_elem_alloc(m, line, la, MDOC_Ns, NULL))
-				return(0);
-			if ( ! rew_elem(m, MDOC_Ns))
-				return(0);
-		}
-
 		if ( ! dword(m, line, la, p, DELIM_MAX))
 			return(0);
 		j++;
-- 
cgit v1.2.3