From owner-svn-soc-all@FreeBSD.ORG Thu May 31 07:42:59 2012 Return-Path: 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 595FD1065679 for ; Thu, 31 May 2012 07:42:57 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Thu, 31 May 2012 07:42:57 +0000 Date: Thu, 31 May 2012 07:42:57 +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: <20120531074257.595FD1065679@hub.freebsd.org> Cc: Subject: socsvn commit: r236798 - soc2012/jhagewood/mdocml 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 May 2012 07:42:59 -0000 Author: jhagewood Date: Thu May 31 07:42:57 2012 New Revision: 236798 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=236798 Log: Modified: soc2012/jhagewood/mdocml/hagewood-mdocml.patch Modified: soc2012/jhagewood/mdocml/hagewood-mdocml.patch ============================================================================== --- soc2012/jhagewood/mdocml/hagewood-mdocml.patch Thu May 31 07:24:01 2012 (r236797) +++ soc2012/jhagewood/mdocml/hagewood-mdocml.patch Thu May 31 07:42:57 2012 (r236798) @@ -1,6 +1,6 @@ -diff -rupN mdocml-1.12.1-orig//libmandoc.h mdocml-1.12.1//libmandoc.h ---- mdocml-1.12.1-orig//libmandoc.h 2012-05-30 13:45:57.251288839 -0400 -+++ mdocml-1.12.1//libmandoc.h 2012-05-31 03:01:28.836378241 -0400 +diff -rupN mdocml-1.12.1-orig/libmandoc.h mdocml-1.12.1/libmandoc.h +--- mdocml-1.12.1-orig/libmandoc.h 2012-05-31 07:34:22.000000000 -0400 ++++ mdocml-1.12.1/libmandoc.h 2012-05-31 07:34:23.000000000 -0400 @@ -31,6 +31,7 @@ enum rofferr { enum regs { @@ -9,9 +9,9 @@ REG__MAX }; -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-05-30 13:45:57.221288794 -0400 -+++ mdocml-1.12.1//mdoc_html.c 2012-05-31 03:21:44.956396839 -0400 +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-05-31 07:34:22.000000000 -0400 ++++ mdocml-1.12.1/mdoc_html.c 2012-05-31 07:37:11.000000000 -0400 @@ -767,10 +767,12 @@ mdoc_xr_pre(MDOC_ARGS) static int mdoc_ns_pre(MDOC_ARGS) @@ -20,7 +20,7 @@ - if ( ! (MDOC_LINE & n->flags)) - h->flags |= HTML_NOSPACE; - return(1); -+ if(!roff_regisset(m->roff, REG_ns)) ++ if(!roff_regisset(n->roff, REG_ns)) + { + if ( ! (MDOC_LINE & n->flags)) + h->flags |= HTML_NOSPACE; @@ -29,9 +29,9 @@ } -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-05-30 13:45:57.241288831 -0400 -+++ mdocml-1.12.1//mdoc_term.c 2012-05-31 03:19:48.736395055 -0400 +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-05-31 07:34:22.000000000 -0400 ++++ mdocml-1.12.1/mdoc_term.c 2012-05-31 07:37:36.000000000 -0400 @@ -1147,9 +1147,12 @@ termp_an_post(DECL_ARGS) static int termp_ns_pre(DECL_ARGS) @@ -39,7 +39,7 @@ - - if ( ! (MDOC_LINE & n->flags)) - p->flags |= TERMP_NOSPACE; -+ if (!roff_regisset(m->roff, REG_ns)) ++ if (!roff_regisset(n->roff, REG_ns)) + { + if ( ! (MDOC_LINE & n->flags)) + p->flags |= TERMP_NOSPACE; @@ -48,9 +48,9 @@ return(1); } -diff -rupN mdocml-1.12.1-orig//roff.c mdocml-1.12.1//roff.c ---- mdocml-1.12.1-orig//roff.c 2012-05-30 13:45:57.251288839 -0400 -+++ mdocml-1.12.1//roff.c 2012-05-31 03:06:10.196382542 -0400 +diff -rupN mdocml-1.12.1-orig/roff.c mdocml-1.12.1/roff.c +--- mdocml-1.12.1-orig/roff.c 2012-05-31 07:34:22.000000000 -0400 ++++ mdocml-1.12.1/roff.c 2012-05-31 07:34:23.000000000 -0400 @@ -55,6 +55,7 @@ enum rofft { ROFF_ns, ROFF_ps,