===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.124
retrieving revision 1.159
diff -u -p -r1.124 -r1.159
--- mandoc/term.c	2009/11/07 14:14:16	1.124
+++ mandoc/term.c	2010/07/04 22:04:04	1.159
@@ -1,6 +1,7 @@
-/*	$Id: term.c,v 1.124 2009/11/07 14:14:16 kristaps Exp $ */
+/*	$Id: term.c,v 1.159 2010/07/04 22:04:04 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,74 +15,78 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 
+#include "mandoc.h"
 #include "chars.h"
 #include "out.h"
+#include "regs.h"
 #include "term.h"
-#include "man.h"
-#include "mdoc.h"
 #include "main.h"
 
-/* FIXME: accomodate non-breaking, non-collapsing white-space. */
-/* FIXME: accomodate non-breaking, collapsing white-space. */
+static	void		  spec(struct termp *, const char *, size_t);
+static	void		  res(struct termp *, const char *, size_t);
+static	void		  buffera(struct termp *, const char *, size_t);
+static	void		  bufferc(struct termp *, char);
+static	void		  adjbuf(struct termp *p, size_t);
+static	void		  encode(struct termp *, const char *, size_t);
 
-static	struct termp	 *term_alloc(enum termenc);
-static	void		  term_free(struct termp *);
 
-static	void		  do_special(struct termp *,
-				const char *, size_t);
-static	void		  do_reserved(struct termp *,
-				const char *, size_t);
-static	void		  buffer(struct termp *, char);
-static	void		  encode(struct termp *, char);
-
-
-void *
-ascii_alloc(void)
+void
+term_free(struct termp *p)
 {
 
-	return(term_alloc(TERMENC_ASCII));
+	if (p->buf)
+		free(p->buf);
+	if (p->symtab)
+		chars_free(p->symtab);
+
+	free(p);
 }
 
 
 void
-terminal_free(void *arg)
+term_begin(struct termp *p, term_margin head, 
+		term_margin foot, const void *arg)
 {
 
-	term_free((struct termp *)arg);
+	p->headf = head;
+	p->footf = foot;
+	p->argf = arg;
+	(*p->begin)(p);
 }
 
 
-static void
-term_free(struct termp *p)
+void
+term_end(struct termp *p)
 {
 
-	if (p->buf)
-		free(p->buf);
-	if (p->symtab)
-		chars_free(p->symtab);
-
-	free(p);
+	(*p->end)(p);
 }
 
 
-static struct termp *
+struct termp *
 term_alloc(enum termenc enc)
 {
-	struct termp *p;
+	struct termp	*p;
 
 	p = calloc(1, sizeof(struct termp));
 	if (NULL == p) {
 		perror(NULL);
 		exit(EXIT_FAILURE);
 	}
-	p->maxrmargin = 78;
+
 	p->enc = enc;
 	return(p);
 }
@@ -91,13 +96,11 @@ term_alloc(enum termenc enc)
  * Flush a line of text.  A "line" is loosely defined as being something
  * that should be followed by a newline, regardless of whether it's
  * broken apart by newlines getting there.  A line can also be a
- * fragment of a columnar list.
+ * fragment of a columnar list (`Bl -tag' or `Bl -column'), which does
+ * not have a trailing newline.
  *
- * Specifically, a line is whatever's in p->buf of length p->col, which
- * is zeroed after this function returns.
+ * The following flags may be specified:
  *
- * The usage of termp:flags is as follows:
- *
  *  - TERMP_NOLPAD: when beginning to write the line, don't left-pad the
  *    offset value.  This is useful when doing columnar lists where the
  *    prior column has right-padded.
@@ -130,11 +133,12 @@ term_flushln(struct termp *p)
 	int		 i;     /* current input position in p->buf */
 	size_t		 vis;   /* current visual position on output */
 	size_t		 vbl;   /* number of blanks to prepend to output */
-	size_t		 vsz;   /* visual characters to write to output */
+	size_t		 vend;	/* end of word visual position on output */
 	size_t		 bp;    /* visual right border position */
-	int		 j;     /* temporary loop index */
-	size_t		 maxvis, mmax;
-	static int	 overstep = 0;
+	int		 j;     /* temporary loop index for p->buf */
+	int		 jhy;	/* last hyph before overflow w/r/t j */
+	size_t		 maxvis; /* output position of visible boundary */
+	size_t		 mmax; /* used in calculating bp */
 
 	/*
 	 * First, establish the maximum columns of "visible" content.
@@ -145,35 +149,36 @@ term_flushln(struct termp *p)
 
 	assert(p->offset < p->rmargin);
 
-	maxvis = (int)(p->rmargin - p->offset) - overstep < 0 ?
+	maxvis = (int)(p->rmargin - p->offset) - p->overstep < 0 ?
 		/* LINTED */ 
-		0 : p->rmargin - p->offset - overstep;
-	mmax = (int)(p->maxrmargin - p->offset) - overstep < 0 ?
+		0 : p->rmargin - p->offset - p->overstep;
+	mmax = (int)(p->maxrmargin - p->offset) - p->overstep < 0 ?
 		/* LINTED */
-		0 : p->maxrmargin - p->offset - overstep;
+		0 : p->maxrmargin - p->offset - p->overstep;
 
 	bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
 
-	/* 
-	 * FIXME: if bp is zero, we still output the first word before
-	 * breaking the line.
-	 */
-
-	vis = 0;
-
 	/*
-	 * If in the standard case (left-justified), then begin with our
-	 * indentation, otherwise (columns, etc.) just start spitting
-	 * out text.
+	 * Indent the first line of a paragraph.
 	 */
+	vbl = p->flags & TERMP_NOLPAD ? 0 : p->offset;
 
-	if ( ! (p->flags & TERMP_NOLPAD))
-		/* LINTED */
-		for (j = 0; j < (int)p->offset; j++)
-			putchar(' ');
+	vis = vend = i = 0;
 
-	for (i = 0; i < (int)p->col; i++) {
+	while (i < (int)p->col) {
 		/*
+		 * Handle literal tab characters: collapse all
+		 * subsequent tabs into a single huge set of spaces.
+		 */
+		for (j = i; j < (int)p->col; j++) {
+			if ('\t' != p->buf[j])
+				break;
+			vend = (vis / p->tabwidth + 1) * p->tabwidth;
+			vbl += vend - vis;
+			vis = vend;
+		}
+
+		/*
 		 * Count up visible word characters.  Control sequences
 		 * (starting with the CSI) aren't counted.  A space
 		 * generates a non-printing word, which is valid (the
@@ -181,76 +186,109 @@ term_flushln(struct termp *p)
 		 */
 
 		/* LINTED */
-		for (j = i, vsz = 0; j < (int)p->col; j++) {
-			if (j && ' ' == p->buf[j]) 
+		for (jhy = 0; j < (int)p->col; j++) {
+			if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j])
 				break;
-			else if (8 == p->buf[j])
-				vsz--;
-			else
-				vsz++;
+
+			/* Back over the the last printed character. */
+			if (8 == p->buf[j]) {
+				assert(j);
+				vend -= (*p->width)(p, p->buf[j - 1]);
+				continue;
+			}
+
+			/* Regular word. */
+			/* Break at the hyphen point if we overrun. */
+			if (vend > vis && vend < bp && 
+					ASCII_HYPH == p->buf[j])
+				jhy = j;
+
+			vend += (*p->width)(p, p->buf[j]);
 		}
 
 		/*
-		 * Choose the number of blanks to prepend: no blank at the
-		 * beginning of a line, one between words -- but do not
-		 * actually write them yet.
-		 */
-		vbl = (size_t)(0 == vis ? 0 : 1);
-
-		/*
 		 * Find out whether we would exceed the right margin.
-		 * If so, break to the next line.  (TODO: hyphenate)
-		 * Otherwise, write the chosen number of blanks now.
+		 * If so, break to the next line.
 		 */
-		if (vis && vis + vbl + vsz > bp) {
-			putchar('\n');
+		if (vend > bp && 0 == jhy && vis > 0) {
+			vend -= vis;
+			(*p->endline)(p);
 			if (TERMP_NOBREAK & p->flags) {
-				for (j = 0; j < (int)p->rmargin; j++)
-					putchar(' ');
-				vis = p->rmargin - p->offset;
+				p->viscol = p->rmargin;
+				(*p->advance)(p, p->rmargin);
+				vend += p->rmargin - p->offset;
 			} else {
-				for (j = 0; j < (int)p->offset; j++)
-					putchar(' ');
-				vis = 0;
+				p->viscol = 0;
+				vbl = p->offset;
 			}
-			/* Remove the overstep width. */
+
+			/* Remove the p->overstep width. */
+
 			bp += (int)/* LINTED */
-				overstep;
-			overstep = 0;
-		} else {
-			for (j = 0; j < (int)vbl; j++)
-				putchar(' ');
-			vis += vbl;
+				p->overstep;
+			p->overstep = 0;
 		}
 
 		/*
-		 * Finally, write out the word.
+		 * Skip leading tabs, they were handled above.
 		 */
+		while (i < (int)p->col && '\t' == p->buf[i])
+			i++;
+
+		/* Write out the [remaining] word. */
 		for ( ; i < (int)p->col; i++) {
-			if (' ' == p->buf[i])
+			if (vend > bp && jhy > 0 && i > jhy)
 				break;
+			if ('\t' == p->buf[i])
+				break;
+			if (' ' == p->buf[i]) {
+				while (' ' == p->buf[i]) {
+					vbl += (*p->width)(p, p->buf[i]);
+					i++;
+				}
+				break;
+			}
+			if (ASCII_NBRSP == p->buf[i]) {
+				vbl += (*p->width)(p, ' ');
+				continue;
+			}
 
-			/* The unit sep. is a non-breaking space. */
-			if (31 == p->buf[i])
-				putchar(' ');
-			else
-				putchar(p->buf[i]);
+			/*
+			 * Now we definitely know there will be
+			 * printable characters to output,
+			 * so write preceding white space now.
+			 */
+			if (vbl) {
+				(*p->advance)(p, vbl);
+				p->viscol += vbl;
+				vbl = 0;
+			}
+
+			if (ASCII_HYPH == p->buf[i]) {
+				(*p->letter)(p, '-');
+				p->viscol += (*p->width)(p, '-');
+			} else {
+				(*p->letter)(p, p->buf[i]);
+				p->viscol += (*p->width)(p, p->buf[i]);
+			}
 		}
-		vis += vsz;
+		vend += vbl;
+		vis = vend;
 	}
 
 	p->col = 0;
-	overstep = 0;
+	p->overstep = 0;
 
 	if ( ! (TERMP_NOBREAK & p->flags)) {
-		putchar('\n');
+		p->viscol = 0;
+		(*p->endline)(p);
 		return;
 	}
 
 	if (TERMP_HANG & p->flags) {
 		/* We need one blank after the tag. */
-		overstep = /* LINTED */
-			vis - maxvis + 1;
+		p->overstep = /* LINTED */
+			vis - maxvis + (*p->width)(p, ' ');
 
 		/*
 		 * Behave exactly the same way as groff:
@@ -262,25 +300,27 @@ term_flushln(struct termp *p)
 		 * move it one step LEFT and flag the rest of the line
 		 * to be longer.
 		 */
-		if (overstep >= -1) {
-			assert((int)maxvis + overstep >= 0);
+		if (p->overstep >= -1) {
+			assert((int)maxvis + p->overstep >= 0);
 			/* LINTED */
-			maxvis += overstep;
+			maxvis += p->overstep;
 		} else
-			overstep = 0;
+			p->overstep = 0;
 
 	} else if (TERMP_DANGLE & p->flags)
 		return;
 
 	/* Right-pad. */
 	if (maxvis > vis + /* LINTED */
-			((TERMP_TWOSPACE & p->flags) ? 1 : 0))  
-		for ( ; vis < maxvis; vis++)
-			putchar(' ');
-	else {	/* ...or newline break. */
-		putchar('\n');
-		for (i = 0; i < (int)p->rmargin; i++)
-			putchar(' ');
+			((TERMP_TWOSPACE & p->flags) ? 
+			 (*p->width)(p, ' ') : 0)) {
+		p->viscol += maxvis - vis;
+		(*p->advance)(p, maxvis - vis);
+		vis += (maxvis - vis);
+	} else {	/* ...or newline break. */
+		(*p->endline)(p);
+		p->viscol = p->rmargin;
+		(*p->advance)(p, p->rmargin);
 	}
 }
 
@@ -295,7 +335,7 @@ term_newln(struct termp *p)
 {
 
 	p->flags |= TERMP_NOSPACE;
-	if (0 == p->col) {
+	if (0 == p->col && 0 == p->viscol) {
 		p->flags &= ~TERMP_NOLPAD;
 		return;
 	}
@@ -315,56 +355,105 @@ term_vspace(struct termp *p)
 {
 
 	term_newln(p);
-	putchar('\n');
+	p->viscol = 0;
+	(*p->endline)(p);
 }
 
 
 static void
-do_special(struct termp *p, const char *word, size_t len)
+spec(struct termp *p, const char *word, size_t len)
 {
 	const char	*rhs;
 	size_t		 sz;
-	int		 i;
 
 	rhs = chars_a2ascii(p->symtab, word, len, &sz);
-
-	if (NULL == rhs) {
-#if 0
-		fputs("Unknown special character: ", stderr);
-		for (i = 0; i < (int)len; i++)
-			fputc(word[i], stderr);
-		fputc('\n', stderr);
-#endif
-		return;
-	}
-	for (i = 0; i < (int)sz; i++) 
-		encode(p, rhs[i]);
+	if (rhs) 
+		encode(p, rhs, sz);
 }
 
 
 static void
-do_reserved(struct termp *p, const char *word, size_t len)
+res(struct termp *p, const char *word, size_t len)
 {
 	const char	*rhs;
 	size_t		 sz;
-	int		 i;
 
 	rhs = chars_a2res(p->symtab, word, len, &sz);
-
 	if (NULL == rhs) {
-#if 0
-		fputs("Unknown reserved word: ", stderr);
-		for (i = 0; i < (int)len; i++)
-			fputc(word[i], stderr);
-		fputc('\n', stderr);
-#endif
-		return;
+		rhs = roff_getstrn(word, len);
+		if (rhs)
+			sz = strlen(rhs);
 	}
-	for (i = 0; i < (int)sz; i++) 
-		encode(p, rhs[i]);
+	if (rhs)
+		encode(p, rhs, sz);
 }
 
 
+void
+term_fontlast(struct termp *p)
+{
+	enum termfont	 f;
+
+	f = p->fontl;
+	p->fontl = p->fontq[p->fonti];
+	p->fontq[p->fonti] = f;
+}
+
+
+void
+term_fontrepl(struct termp *p, enum termfont f)
+{
+
+	p->fontl = p->fontq[p->fonti];
+	p->fontq[p->fonti] = f;
+}
+
+
+void
+term_fontpush(struct termp *p, enum termfont f)
+{
+
+	assert(p->fonti + 1 < 10);
+	p->fontl = p->fontq[p->fonti];
+	p->fontq[++p->fonti] = f;
+}
+
+
+const void *
+term_fontq(struct termp *p)
+{
+
+	return(&p->fontq[p->fonti]);
+}
+
+
+enum termfont
+term_fonttop(struct termp *p)
+{
+
+	return(p->fontq[p->fonti]);
+}
+
+
+void
+term_fontpopq(struct termp *p, const void *key)
+{
+
+	while (p->fonti >= 0 && key != &p->fontq[p->fonti])
+		p->fonti--;
+	assert(p->fonti >= 0);
+}
+
+
+void
+term_fontpop(struct termp *p)
+{
+
+	assert(p->fonti);
+	p->fonti--;
+}
+
+
 /*
  * Handle pwords, partial words, which may be either a single word or a
  * phrase that cannot be broken down (such as a literal string).  This
@@ -374,7 +463,7 @@ void
 term_word(struct termp *p, const char *word)
 {
 	const char	*sv, *seq;
-	int		 sz, meta;
+	int		 sz;
 	size_t		 ssz;
 	enum roffdeco	 deco;
 
@@ -397,8 +486,6 @@ term_word(struct termp *p, const char *word)
 		case(')'):
 			/* FALLTHROUGH */
 		case(']'):
-			/* FALLTHROUGH */
-		case('}'):
 			if ( ! (TERMP_IGNDELIM & p->flags))
 				p->flags |= TERMP_NOSPACE;
 			break;
@@ -406,21 +493,27 @@ term_word(struct termp *p, const char *word)
 			break;
 		}
 
-	if ( ! (TERMP_NOSPACE & p->flags))
-		buffer(p, ' ');
+	if ( ! (TERMP_NOSPACE & p->flags)) {
+		if ( ! (TERMP_KEEP & p->flags)) {
+			if (TERMP_PREKEEP & p->flags)
+				p->flags |= TERMP_KEEP;
+			bufferc(p, ' ');
+			if (TERMP_SENTENCE & p->flags)
+				bufferc(p, ' ');
+		} else
+			bufferc(p, ASCII_NBRSP);
+	}
 
 	if ( ! (p->flags & TERMP_NONOSPACE))
 		p->flags &= ~TERMP_NOSPACE;
 
-	/*
-	 * FIXME: it's faster to put the metafont conditional here,
-	 * because most of the time we're not a metafont and can use
-	 * strcspn and fwrite.
-	 */
+	p->flags &= ~TERMP_SENTENCE;
 
+	/* FIXME: use strcspn. */
+
 	while (*word) {
 		if ('\\' != *word) {
-			encode(p, *word);
+			encode(p, word, 1);
 			word++;
 			continue;
 		}
@@ -430,42 +523,41 @@ term_word(struct termp *p, const char *word)
 
 		switch (deco) {
 		case (DECO_RESERVED):
-			do_reserved(p, seq, ssz);
+			res(p, seq, ssz);
 			break;
 		case (DECO_SPECIAL):
-			do_special(p, seq, ssz);
+			spec(p, seq, ssz);
 			break;
 		case (DECO_BOLD):
-			p->metamask = p->metafont;
-			p->metafont |= METAF_BOLD;
+			term_fontrepl(p, TERMFONT_BOLD);
 			break;
 		case (DECO_ITALIC):
-			p->metamask = p->metafont;
-			p->metafont |= METAF_UNDER;
+			term_fontrepl(p, TERMFONT_UNDER);
 			break;
 		case (DECO_ROMAN):
-			p->metamask = p->metafont;
-			p->metafont &= ~METAF_UNDER;
-			p->metafont &= ~METAF_BOLD;
+			term_fontrepl(p, TERMFONT_NONE);
 			break;
 		case (DECO_PREVIOUS):
-			meta = p->metamask;
-			p->metamask = p->metafont;
-			p->metafont = meta;
+			term_fontlast(p);
 			break;
 		default:
 			break;
 		}
+
 		word += sz;
+		if (DECO_NOSPACE == deco && '\0' == *word)
+			p->flags |= TERMP_NOSPACE;
 	}
 
+	/* 
+	 * Note that we don't process the pipe: the parser sees it as
+	 * punctuation, but we don't in terms of typography.
+	 */
 	if (sv[0] && 0 == sv[1])
 		switch (sv[0]) {
 		case('('):
 			/* FALLTHROUGH */
 		case('['):
-			/* FALLTHROUGH */
-		case('{'):
 			p->flags |= TERMP_NOSPACE;
 			break;
 		default:
@@ -474,52 +566,104 @@ term_word(struct termp *p, const char *word)
 }
 
 
-/*
- * Insert a single character into the line-buffer.  If the buffer's
- * space is exceeded, then allocate more space by doubling the buffer
- * size.
- */
 static void
-buffer(struct termp *p, char c)
+adjbuf(struct termp *p, size_t sz)
 {
-	size_t		 s;
 
-	if (p->col + 1 >= p->maxcols) {
-		if (0 == p->maxcols)
-			p->maxcols = 256;
-		s = p->maxcols * 2;
-		p->buf = realloc(p->buf, s);
-		if (NULL == p->buf) {
-			perror(NULL);
-			exit(EXIT_FAILURE);
-		}
-		p->maxcols = s;
+	if (0 == p->maxcols)
+		p->maxcols = 1024;
+	while (sz >= p->maxcols)
+		p->maxcols <<= 2;
+
+	p->buf = realloc(p->buf, p->maxcols);
+	if (NULL == p->buf) {
+		perror(NULL);
+		exit(EXIT_FAILURE);
 	}
-	p->buf[(int)(p->col)++] = c;
 }
 
 
 static void
-encode(struct termp *p, char c)
+buffera(struct termp *p, const char *word, size_t sz)
 {
-	
-	if (isgraph((u_char)c)) {
-		if (p->under || METAF_UNDER & p->metafont) {
-			buffer(p, '_');
-			buffer(p, 8);
+
+	if (p->col + sz >= p->maxcols) 
+		adjbuf(p, p->col + sz);
+
+	memcpy(&p->buf[(int)p->col], word, sz);
+	p->col += sz;
+}
+
+
+static void
+bufferc(struct termp *p, char c)
+{
+
+	if (p->col + 1 >= p->maxcols)
+		adjbuf(p, p->col + 1);
+
+	p->buf[(int)p->col++] = c;
+}
+
+
+static void
+encode(struct termp *p, const char *word, size_t sz)
+{
+	enum termfont	  f;
+	int		  i;
+
+	/*
+	 * Encode and buffer a string of characters.  If the current
+	 * font mode is unset, buffer directly, else encode then buffer
+	 * character by character.
+	 */
+
+	if (TERMFONT_NONE == (f = term_fonttop(p))) {
+		buffera(p, word, sz);
+		return;
+	}
+
+	for (i = 0; i < (int)sz; i++) {
+		if ( ! isgraph((u_char)word[i])) {
+			bufferc(p, word[i]);
+			continue;
 		}
-		if (p->bold || METAF_BOLD & p->metafont) {
-			buffer(p, c);
-			buffer(p, 8);
-		}
+
+		if (TERMFONT_UNDER == f)
+			bufferc(p, '_');
+		else
+			bufferc(p, word[i]);
+
+		bufferc(p, 8);
+		bufferc(p, word[i]);
 	}
-	buffer(p, c);
 }
 
 
 size_t
-term_vspan(const struct roffsu *su)
+term_len(const struct termp *p, size_t sz)
 {
+
+	return((*p->width)(p, ' ') * sz);
+}
+
+
+size_t
+term_strlen(const struct termp *p, const char *cp)
+{
+	size_t		 sz;
+
+	for (sz = 0; *cp; cp++)
+		sz += (*p->width)(p, *cp);
+
+	return(sz);
+}
+
+
+/* ARGSUSED */
+size_t
+term_vspan(const struct termp *p, const struct roffsu *su)
+{
 	double		 r;
 
 	switch (su->unit) {
@@ -554,41 +698,13 @@ term_vspan(const struct roffsu *su)
 
 
 size_t
-term_hspan(const struct roffsu *su)
+term_hspan(const struct termp *p, const struct roffsu *su)
 {
-	double		 r;
+	double		 v;
 
-	/* XXX: CM, IN, and PT are approximations. */
-
-	switch (su->unit) {
-	case (SCALE_CM):
-		r = 4 * su->scale;
-		break;
-	case (SCALE_IN):
-		/* XXX: this is an approximation. */
-		r = 10 * su->scale;
-		break;
-	case (SCALE_PC):
-		r = (10 * su->scale) / 6;
-		break;
-	case (SCALE_PT):
-		r = (10 * su->scale) / 72;
-		break;
-	case (SCALE_MM):
-		r = su->scale / 1000; /* FIXME: double-check. */
-		break;
-	case (SCALE_VS):
-		r = su->scale * 2 - 1; /* FIXME: double-check. */
-		break;
-	default:
-		r = su->scale;
-		break;
-	}
-
-	if (r < 0.0)
-		r = 0.0;
-	return((size_t)/* LINTED */
-			r);
+	v = ((*p->hspan)(p, su));
+	if (v < 0.0)
+		v = 0.0;
+	return((size_t) /* LINTED */
+			v);
 }
-
-