socsvn commit: r236800 - in soc2012/jhagewood/mdocml: . mdocml-1.12.1

[jhagewood at FreeBSD.org]

Author: jhagewood
Date: Thu May 31 07:56:41 2012
New Revision: 236800
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=236800

Log:

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

Modified: soc2012/jhagewood/mdocml/hagewood-mdocml.patch
==============================================================================
--- soc2012/jhagewood/mdocml/hagewood-mdocml.patch	Thu May 31 07:43:14 2012	(r236799)
+++ soc2012/jhagewood/mdocml/hagewood-mdocml.patch	Thu May 31 07:56:41 2012	(r236800)
@@ -11,8 +11,16 @@
  
 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:40:22.000000000 -0400
-@@ -767,10 +767,12 @@ mdoc_xr_pre(MDOC_ARGS)
++++ mdocml-1.12.1/mdoc_html.c	2012-05-31 07:55:41.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include <unistd.h>
+ 
+ #include "mandoc.h"
++#include "libmandoc.h"
+ #include "out.h"
+ #include "html.h"
+ #include "mdoc.h"
+@@ -767,10 +768,12 @@ mdoc_xr_pre(MDOC_ARGS)
  static int
  mdoc_ns_pre(MDOC_ARGS)
  {
@@ -20,7 +28,7 @@
 -	if ( ! (MDOC_LINE & n->flags))
 -		h->flags |= HTML_NOSPACE;
 -	return(1);
-+	if(!roff_regisset(m->roff, REG_ns))
++	if(!roff_regisset(n->type, REG_ns))
 +	{
 +		if ( ! (MDOC_LINE & n->flags))
 +			h->flags |= HTML_NOSPACE;
@@ -31,15 +39,23 @@
  
 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:40:22.000000000 -0400
-@@ -1147,9 +1147,12 @@ termp_an_post(DECL_ARGS)
++++ mdocml-1.12.1/mdoc_term.c	2012-05-31 07:56:00.000000000 -0400
+@@ -29,6 +29,7 @@
+ #include <string.h>
+ 
+ #include "mandoc.h"
++#include "libmandoc.h"
+ #include "out.h"
+ #include "term.h"
+ #include "mdoc.h"
+@@ -1147,9 +1148,12 @@ termp_an_post(DECL_ARGS)
  static int
  termp_ns_pre(DECL_ARGS)
  {
 -
 -	if ( ! (MDOC_LINE & n->flags))
 -		p->flags |= TERMP_NOSPACE;
-+	if (!roff_regisset(m->roff, REG_ns)) 
++	if (!roff_regisset(n->type, REG_ns)) 
 +	{
 +		if ( ! (MDOC_LINE & n->flags))
 +			p->flags |= TERMP_NOSPACE;

Modified: soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_html.c
==============================================================================
--- soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_html.c	Thu May 31 07:43:14 2012	(r236799)
+++ soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_html.c	Thu May 31 07:56:41 2012	(r236800)
@@ -28,6 +28,7 @@
 #include <unistd.h>
 
 #include "mandoc.h"
+#include "libmandoc.h"
 #include "out.h"
 #include "html.h"
 #include "mdoc.h"
@@ -767,7 +768,7 @@
 static int
 mdoc_ns_pre(MDOC_ARGS)
 {
-	if(!roff_regisset(m->roff, REG_ns))
+	if(!roff_regisset(n->type, REG_ns))
 	{
 		if ( ! (MDOC_LINE & n->flags))
 			h->flags |= HTML_NOSPACE;

Modified: soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c
==============================================================================
--- soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c	Thu May 31 07:43:14 2012	(r236799)
+++ soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c	Thu May 31 07:56:41 2012	(r236800)
@@ -29,6 +29,7 @@
 #include <string.h>
 
 #include "mandoc.h"
+#include "libmandoc.h"
 #include "out.h"
 #include "term.h"
 #include "mdoc.h"
@@ -1147,7 +1148,7 @@
 static int
 termp_ns_pre(DECL_ARGS)
 {
-	if (!roff_regisset(m->roff, REG_ns)) 
+	if (!roff_regisset(n->type, REG_ns)) 
 	{
 		if ( ! (MDOC_LINE & n->flags))
 			p->flags |= TERMP_NOSPACE;