From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (fantadrom.bsd.lv [local]);
	by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 640d084f;
	for <source@mdocml.bsd.lv>;
	Wed, 3 Dec 2014 21:05:42 -0500 (EST)
Date: Wed, 3 Dec 2014 21:05:42 -0500 (EST)
Message-Id: <1288114647782913296.enqueue@fantadrom.bsd.lv>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: fix handling of roff requests having a default scale other than 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
fix handling of roff requests having a default scale other than "n",
in particular .sp which uses "v", when the scale is not specified;
cures groff-mandoc differences in about a dozen Xenocara manuals

Modified Files:
--------------
    mdocml:
        man_html.c
        man_term.c
        out.c

Revision Data
-------------
Index: man_html.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/man_html.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -Lman_html.c -Lman_html.c -u -p -r1.106 -r1.107
--- man_html.c
+++ man_html.c
@@ -282,7 +282,7 @@ a2width(const struct man_node *n, struct
 
 	if (MAN_TEXT != n->type)
 		return(0);
-	if (a2roffsu(n->string, su, SCALE_BU))
+	if (a2roffsu(n->string, su, SCALE_EN))
 		return(1);
 
 	return(0);
Index: out.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/out.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -Lout.c -Lout.c -u -p -r1.53 -r1.54
--- out.c
+++ out.c
@@ -110,7 +110,7 @@ a2roffsu(const char *src, struct roffsu 
 	case '\0':
 		if (SCALE_MAX == def)
 			return(0);
-		unit = SCALE_EN;
+		unit = def;
 		break;
 	case 'u':
 		unit = SCALE_BU;
Index: man_term.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/man_term.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -Lman_term.c -Lman_term.c -u -p -r1.158 -r1.159
--- man_term.c
+++ man_term.c
@@ -201,7 +201,7 @@ a2width(const struct termp *p, const cha
 {
 	struct roffsu	 su;
 
-	if ( ! a2roffsu(cp, &su, SCALE_BU))
+	if ( ! a2roffsu(cp, &su, SCALE_EN))
 		return(-1);
 
 	return((int)term_hspan(p, &su));
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv