Date: Fri, 01 Jun 2012 05:45:51 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r236852 - in soc2012/jhagewood/mdocml: . mdocml-1.12.1 Message-ID: <20120601054551.745CE1065796@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhagewood Date: Fri Jun 1 05:45:50 2012 New Revision: 236852 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=236852 Log: Modified: soc2012/jhagewood/mdocml/hagewood-mdocml.patch soc2012/jhagewood/mdocml/mdocml-1.12.1/roff.c Modified: soc2012/jhagewood/mdocml/hagewood-mdocml.patch ============================================================================== --- soc2012/jhagewood/mdocml/hagewood-mdocml.patch Fri Jun 1 05:35:47 2012 (r236851) +++ soc2012/jhagewood/mdocml/hagewood-mdocml.patch Fri Jun 1 05:45:50 2012 (r236852) @@ -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-31 07:34:22.000000000 -0400 -+++ mdocml-1.12.1/libmandoc.h 2012-05-31 07:34:23.000000000 -0400 +--- mdocml-1.12.1-orig/libmandoc.h 2012-06-01 05:35:15.000000000 -0400 ++++ mdocml-1.12.1/libmandoc.h 2012-06-01 05:35:16.000000000 -0400 @@ -31,6 +31,7 @@ enum rofferr { enum regs { @@ -10,8 +10,8 @@ }; 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 08:00:40.000000000 -0400 +--- 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 @@ -28,6 +28,7 @@ #include <unistd.h> @@ -28,7 +28,7 @@ - if ( ! (MDOC_LINE & n->flags)) - h->flags |= HTML_NOSPACE; - return(1); -+ if(!roff_regisset(m->roff, REG_ns)) ++ if(!REG_ns) + { + if ( ! (MDOC_LINE & n->flags)) + h->flags |= HTML_NOSPACE; @@ -38,8 +38,8 @@ 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 08:00:51.000000000 -0400 +--- 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 @@ -29,6 +29,7 @@ #include <string.h> @@ -55,7 +55,7 @@ - - if ( ! (MDOC_LINE & n->flags)) - p->flags |= TERMP_NOSPACE; -+ if (!roff_regisset(m->roff, REG_ns)) ++ if (!REG_ns) + { + if ( ! (MDOC_LINE & n->flags)) + p->flags |= TERMP_NOSPACE; @@ -65,8 +65,8 @@ } 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 +--- mdocml-1.12.1-orig/roff.c 2012-06-01 05:35:15.000000000 -0400 ++++ mdocml-1.12.1/roff.c 2012-06-01 05:43:57.000000000 -0400 @@ -55,6 +55,7 @@ enum rofft { ROFF_ns, ROFF_ps, @@ -111,7 +111,7 @@ +roff_ns(ROFF_ARGS) +{ + /* Sets no-space register to 1. (on) */ -+ REG_ns = 1; ++ r->regs[(int)REG_ns].set = 1; + return(ROFF_IGN); +} + @@ -126,7 +126,7 @@ +roff_rs(ROFF_ARGS) +{ + /* Sets no-space register to 0. */ -+ REG_ns = 0; ++ r->regs[(int)REG_ns].set = 0; + return(ROFF_IGN); +} + Modified: soc2012/jhagewood/mdocml/mdocml-1.12.1/roff.c ============================================================================== --- soc2012/jhagewood/mdocml/mdocml-1.12.1/roff.c Fri Jun 1 05:35:47 2012 (r236851) +++ soc2012/jhagewood/mdocml/mdocml-1.12.1/roff.c Fri Jun 1 05:45:50 2012 (r236852) @@ -1264,7 +1264,7 @@ roff_ns(ROFF_ARGS) { /* Sets no-space register to 1. (on) */ - REG_ns = 1; + r->regs[(int)REG_ns].set = 1; return(ROFF_IGN); } @@ -1288,7 +1288,7 @@ roff_rs(ROFF_ARGS) { /* Sets no-space register to 0. */ - REG_ns = 0; + r->regs[(int)REG_ns].set = 0; return(ROFF_IGN); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120601054551.745CE1065796>