mandoc: Do alignment of non-numeric strings in numeric cells the same

mandoc: Do alignment of non-numeric strings in numeric cells the same

[schwarze]

Log Message:
-----------
Do alignment of non-numeric strings in numeric cells the same way 
as groff, and also honour the explicit alignment indicator "\&".
This required an almost complete rewrite of both the measurement
function and the formatter function for numeric cells.

Modified Files:
--------------
    mandoc:
        out.c
        tbl_term.c

Revision Data
-------------
Index: tbl_term.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/tbl_term.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -Ltbl_term.c -Ltbl_term.c -u -p -r1.59 -r1.60
--- tbl_term.c
+++ tbl_term.c
@@ -20,6 +20,7 @@
 #include <sys/types.h>
 
 #include <assert.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -633,42 +634,66 @@ tbl_number(struct termp *tp, const struc
 		const struct tbl_dat *dp,
 		const struct roffcol *col)
 {
-	char		*cp;
+	const char	*cp, *lastdigit, *lastpoint;
+	size_t		 intsz, padl, totsz;
 	char		 buf[2];
-	size_t		 sz, ssz, d, padl;
-	int		 i;
 
 	/*
-	 * See calc_data_number().  Left-pad by taking the offset of our
-	 * and the maximum decimal; right-pad by the remaining amount.
+	 * Almost the same code as in tblcalc_number():
+	 * First find the position of the decimal point.
 	 */
 
 	assert(dp->string);
+	lastdigit = lastpoint = NULL;
+	for (cp = dp->string; cp[0] != '\0'; cp++) {
+		if (cp[0] == '\\' && cp[1] == '&') {
+			lastdigit = lastpoint = cp;
+			break;
+		} else if (cp[0] == opts->decimal &&
+		    (isdigit((unsigned char)cp[1]) ||
+		     (cp > dp->string && isdigit((unsigned char)cp[-1]))))
+			lastpoint = cp;
+		else if (isdigit((unsigned char)cp[0]))
+			lastdigit = cp;
+	}
+
+	/* Then measure both widths. */
 
-	sz = term_strlen(tp, dp->string);
+	padl = 0;
+	totsz = term_strlen(tp, dp->string);
+	if (lastdigit != NULL) {
+		if (lastpoint == NULL)
+			lastpoint = lastdigit + 1;
+		intsz = 0;
+		buf[1] = '\0';
+		for (cp = dp->string; cp < lastpoint; cp++) {
+			buf[0] = cp[0];
+			intsz += term_strlen(tp, buf);
+		}
+
+		/*
+		 * Pad left to match the decimal position,
+		 * but avoid exceeding the total column width.
+		 */
+
+		if (col->decimal > intsz && col->width > totsz) {
+			padl = col->decimal - intsz;
+			if (padl + totsz > col->width)
+				padl = col->width - totsz;
+		}
 
-	buf[0] = opts->decimal;
-	buf[1] = '\0';
+	/* If it is not a number, simply center the string. */
 
-	if ((cp = strrchr(dp->string, opts->decimal)) != NULL) {
-		for (ssz = 0, i = 0; cp != &dp->string[i]; i++) {
-			buf[0] = dp->string[i];
-			ssz += term_strlen(tp, buf);
-		}
-		d = ssz;
-	} else
-		d = sz;
-
-	if (col->decimal > d && col->width > sz) {
-		padl = col->decimal - d;
-		if (padl + sz > col->width)
-			padl = col->width - sz;
-		tbl_char(tp, ASCII_NBRSP, padl);
-	} else
-		padl = 0;
+	} else if (col->width > totsz)
+		padl = (col->width - totsz) / 2;
+
+	tbl_char(tp, ASCII_NBRSP, padl);
 	tbl_word(tp, dp);
-	if (col->width > sz + padl)
-		tbl_char(tp, ASCII_NBRSP, col->width - sz - padl);
+
+	/* Pad right to fill the column.  */
+
+	if (col->width > padl + totsz)
+		tbl_char(tp, ASCII_NBRSP, col->width - padl - totsz);
 }
 
 static void
Index: out.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/out.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -Lout.c -Lout.c -u -p -r1.72 -r1.73
--- out.c
+++ out.c
@@ -20,6 +20,7 @@
 #include <sys/types.h>
 
 #include <assert.h>
+#include <ctype.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -324,49 +325,66 @@ static void
 tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
 		const struct tbl_opts *opts, const struct tbl_dat *dp)
 {
-	int		 i;
-	size_t		 sz, ssz, d;
-	const char	*str;
-	char		*cp;
+	const char	*cp, *lastdigit, *lastpoint;
+	size_t		 intsz, totsz;
 	char		 buf[2];
 
+	if (dp->string == NULL || *dp->string == '\0')
+		return;
+
 	/*
-	 * First calculate number width and decimal place (last + 1 for
-	 * non-decimal numbers).  If the stored decimal is subsequent to
-	 * ours, make our size longer by that difference
-	 * (right-"shifting"); similarly, if ours is subsequent the
-	 * stored, then extend the stored size by the difference.
-	 * Finally, re-assign the stored values.
+	 * Find the last digit and
+	 * the last decimal point that is adjacent to a digit.
+	 * The alignment indicator "\&" overrides everything.
 	 */
 
-	str = dp->string ? dp->string : "";
-	sz = (*tbl->slen)(str, tbl->arg);
+	lastdigit = lastpoint = NULL;
+	for (cp = dp->string; cp[0] != '\0'; cp++) {
+		if (cp[0] == '\\' && cp[1] == '&') {
+			lastdigit = lastpoint = cp;
+			break;
+		} else if (cp[0] == opts->decimal &&
+		    (isdigit((unsigned char)cp[1]) ||
+		     (cp > dp->string && isdigit((unsigned char)cp[-1]))))
+			lastpoint = cp;
+		else if (isdigit((unsigned char)cp[0]))
+			lastdigit = cp;
+	}
 
-	/* FIXME: TBL_DATA_HORIZ et al.? */
+	/* Not a number, treat as a literal string. */
 
-	buf[0] = opts->decimal;
-	buf[1] = '\0';
+	totsz = (*tbl->slen)(dp->string, tbl->arg);
+	if (lastdigit == NULL) {
+		if (col->width < totsz)
+			col->width = totsz;
+		return;
+	}
 
-	if (NULL != (cp = strrchr(str, opts->decimal))) {
-		buf[1] = '\0';
-		for (ssz = 0, i = 0; cp != &str[i]; i++) {
-			buf[0] = str[i];
-			ssz += (*tbl->slen)(buf, tbl->arg);
-		}
-		d = ssz;
-	} else
-		d = sz;
+	/* Measure the width of the integer part. */
 
-	/* Adjust the settings for this column. */
+	if (lastpoint == NULL)
+		lastpoint = lastdigit + 1;
+	intsz = 0;
+	buf[1] = '\0';
+	for (cp = dp->string; cp < lastpoint; cp++) {
+		buf[0] = cp[0];
+		intsz += (*tbl->slen)(buf, tbl->arg);
+	}
 
-	if (col->decimal > d) {
-		sz += col->decimal - d;
-		d = col->decimal;
+	/*
+         * If this number has more integer digits than all numbers
+         * seen on earlier lines, shift them all to the right.
+	 * If it has fewer, shift this number to the right.
+	 */
+
+	if (intsz > col->decimal) {
+		col->nwidth += intsz - col->decimal;
+		col->decimal = intsz;
 	} else
-		col->nwidth += d - col->decimal;
+		totsz += col->decimal - intsz;
+
+	/* Update the maximum total width seen so far. */
 
-	if (sz > col->nwidth)
-		col->nwidth = sz;
-	if (d > col->decimal)
-		col->decimal = d;
+	if (totsz > col->nwidth)
+		col->nwidth = totsz;
 }
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv