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

[jhagewood at FreeBSD.org]

Author: jhagewood
Date: Sat Jun  2 06:51:27 2012
New Revision: 236919
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=236919

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	Sat Jun  2 06:24:37 2012	(r236918)
+++ soc2012/jhagewood/mdocml/hagewood-mdocml.patch	Sat Jun  2 06:51:27 2012	(r236919)
@@ -11,7 +11,7 @@
  
 diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/man_html.c jhagewood/mdocml/mdocml-1.12.1/man_html.c
 --- jhagewood/mdocml/mdocml-1.12.1-orig/man_html.c	2012-06-01 05:35:15.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/man_html.c	2012-06-02 06:13:49.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/man_html.c	2012-06-02 06:45:04.000000000 -0400
 @@ -27,6 +27,7 @@
  #include <string.h>
  
@@ -32,7 +32,7 @@
  
 diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c jhagewood/mdocml/mdocml-1.12.1/man_term.c
 --- jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c	2012-06-01 05:35:15.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/man_term.c	2012-06-02 06:14:07.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/man_term.c	2012-06-02 06:51:05.000000000 -0400
 @@ -28,6 +28,7 @@
  #include <string.h>
  
@@ -65,7 +65,7 @@
  
 diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_html.c jhagewood/mdocml/mdocml-1.12.1/mdoc_html.c
 --- jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_html.c	2012-06-01 05:35:15.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/mdoc_html.c	2012-06-02 06:08:47.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/mdoc_html.c	2012-06-02 06:46:47.000000000 -0400
 @@ -28,6 +28,7 @@
  #include <unistd.h>
  
@@ -74,35 +74,31 @@
  #include "out.h"
  #include "html.h"
  #include "mdoc.h"
-@@ -1614,27 +1615,29 @@ mdoc_pp_pre(MDOC_ARGS)
+@@ -1614,27 +1615,27 @@ mdoc_pp_pre(MDOC_ARGS)
  static int
  mdoc_sp_pre(MDOC_ARGS)
  {
 -	struct roffsu	 su;
 -	struct htmlpair	 tag;
-+	if (!REG_ns)
-+	{
 +		struct roffsu	 su;
 +		struct htmlpair	 tag;
-+
-+		SCALE_VS_INIT(&su, 1);
-+
-+		if (MDOC_sp == n->tok) {
-+			if (NULL != (n = n->child))
-+				if ( ! a2roffsu(n->string, &su, SCALE_VS))
-+					SCALE_VS_INIT(&su, atoi(n->string));
-+		} else
-+			su.scale = 0;
  
 -	SCALE_VS_INIT(&su, 1);
--
++		SCALE_VS_INIT(&su, 1);
+ 
 -	if (MDOC_sp == n->tok) {
 -		if (NULL != (n = n->child))
 -			if ( ! a2roffsu(n->string, &su, SCALE_VS))
 -				SCALE_VS_INIT(&su, atoi(n->string));
 -	} else
 -		su.scale = 0;
--
++		if (MDOC_sp == n->tok) {
++			if (NULL != (n = n->child))
++				if ( ! a2roffsu(n->string, &su, SCALE_VS))
++					SCALE_VS_INIT(&su, atoi(n->string));
++		} else
++			su.scale = 0;
+ 
 -	bufinit(h);
 -	bufcat_su(h, "height", &su);
 -	PAIR_STYLE_INIT(&tag, h);
@@ -113,19 +109,19 @@
 +		bufinit(h);
 +		bufcat_su(h, "height", &su);
 +		PAIR_STYLE_INIT(&tag, h);
-+		print_otag(h, TAG_DIV, 1, &tag);
++		if (!REG_ns)
++			print_otag(h, TAG_DIV, 1, &tag);
  
 -	return(0);
 +		/* So the div isn't empty: */
 +		print_text(h, "\\~");
-+	}
 +		return(0);
  
  }
  
 diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_term.c jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c
 --- jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_term.c	2012-06-01 05:35:15.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c	2012-06-02 06:05:44.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c	2012-06-02 06:47:03.000000000 -0400
 @@ -29,6 +29,7 @@
  #include <string.h>
  
@@ -156,7 +152,7 @@
  
 diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/roff.c jhagewood/mdocml/mdocml-1.12.1/roff.c
 --- jhagewood/mdocml/mdocml-1.12.1-orig/roff.c	2012-06-01 05:35:15.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/roff.c	2012-06-02 06:18:39.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/roff.c	2012-06-02 06:51:16.000000000 -0400
 @@ -55,6 +55,7 @@ enum	rofft {
  	ROFF_ns,
  	ROFF_ps,

Modified: soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_html.c
==============================================================================
--- soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_html.c	Sat Jun  2 06:24:37 2012	(r236918)
+++ soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_html.c	Sat Jun  2 06:51:27 2012	(r236919)
@@ -1615,8 +1615,6 @@
 static int
 mdoc_sp_pre(MDOC_ARGS)
 {
-	if (!REG_ns)
-	{
 		struct roffsu	 su;
 		struct htmlpair	 tag;
 
@@ -1632,11 +1630,11 @@
 		bufinit(h);
 		bufcat_su(h, "height", &su);
 		PAIR_STYLE_INIT(&tag, h);
-		print_otag(h, TAG_DIV, 1, &tag);
+		if (!REG_ns)
+			print_otag(h, TAG_DIV, 1, &tag);
 
 		/* So the div isn't empty: */
 		print_text(h, "\\~");
-	}
 		return(0);
 
 }