From owner-svn-soc-all@FreeBSD.ORG  Fri Jun  1 05:55:00 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 94D21106564A
	for <svn-soc-all@FreeBSD.org>; Fri,  1 Jun 2012 05:54:58 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Fri, 01 Jun 2012 05:54:58 +0000
Date: Fri, 01 Jun 2012 05:54:58 +0000
From: jhagewood@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120601055458.94D21106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r236853 - in soc2012/jhagewood/mdocml: .
	mdocml-1.12.1
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Jun 2012 05:55:00 -0000

Author: jhagewood
Date: Fri Jun  1 05:54:57 2012
New Revision: 236853
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=236853

Log:

Modified:
  soc2012/jhagewood/mdocml/hagewood-mdocml.patch
  soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_html.c

Modified: soc2012/jhagewood/mdocml/hagewood-mdocml.patch
==============================================================================
--- soc2012/jhagewood/mdocml/hagewood-mdocml.patch	Fri Jun  1 05:45:50 2012	(r236852)
+++ soc2012/jhagewood/mdocml/hagewood-mdocml.patch	Fri Jun  1 05:54:57 2012	(r236853)
@@ -11,7 +11,7 @@
  
 diff -rupN mdocml-1.12.1-orig/mdoc_html.c mdocml-1.12.1/mdoc_html.c
 --- mdocml-1.12.1-orig/mdoc_html.c	2012-06-01 05:35:15.000000000 -0400
-+++ mdocml-1.12.1/mdoc_html.c	2012-06-01 05:35:16.000000000 -0400
++++ mdocml-1.12.1/mdoc_html.c	2012-06-01 05:54:40.000000000 -0400
 @@ -28,6 +28,7 @@
  #include <unistd.h>
  
@@ -20,23 +20,22 @@
  #include "out.h"
  #include "html.h"
  #include "mdoc.h"
-@@ -767,10 +768,12 @@ mdoc_xr_pre(MDOC_ARGS)
+@@ -767,9 +768,12 @@ mdoc_xr_pre(MDOC_ARGS)
  static int
  mdoc_ns_pre(MDOC_ARGS)
  {
 -
 -	if ( ! (MDOC_LINE & n->flags))
 -		h->flags |= HTML_NOSPACE;
--	return(1);
 +	if(!REG_ns)
 +	{
 +		if ( ! (MDOC_LINE & n->flags))
 +			h->flags |= HTML_NOSPACE;
 +		return(1);
 +	}
+ 	return(1);
  }
  
- 
 diff -rupN mdocml-1.12.1-orig/mdoc_term.c mdocml-1.12.1/mdoc_term.c
 --- mdocml-1.12.1-orig/mdoc_term.c	2012-06-01 05:35:15.000000000 -0400
 +++ mdocml-1.12.1/mdoc_term.c	2012-06-01 05:35:16.000000000 -0400

Modified: soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_html.c
==============================================================================
--- soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_html.c	Fri Jun  1 05:45:50 2012	(r236852)
+++ soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_html.c	Fri Jun  1 05:54:57 2012	(r236853)
@@ -774,6 +774,7 @@
 			h->flags |= HTML_NOSPACE;
 		return(1);
 	}
+	return(1);
 }