mandoc: Do not allocate a column for decimal points if all numbers are

mandoc: Do not allocate a column for decimal points if all numbers are

[schwarze]

Log Message:
-----------
Do not allocate a column for decimal points if all numbers are integers.

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

Revision Data
-------------
Index: tbl_term.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/tbl_term.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -Ltbl_term.c -Ltbl_term.c -u -p -r1.57 -r1.58
--- tbl_term.c
+++ tbl_term.c
@@ -1,7 +1,7 @@
 /*	$Id$ */
 /*
  * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011,2012,2014,2015,2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2018 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
@@ -621,7 +621,7 @@ tbl_number(struct termp *tp, const struc
 {
 	char		*cp;
 	char		 buf[2];
-	size_t		 sz, psz, ssz, d, padl;
+	size_t		 sz, ssz, d, padl;
 	int		 i;
 
 	/*
@@ -636,16 +636,14 @@ tbl_number(struct termp *tp, const struc
 	buf[0] = opts->decimal;
 	buf[1] = '\0';
 
-	psz = term_strlen(tp, buf);
-
 	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 + psz;
+		d = ssz;
 	} else
-		d = sz + psz;
+		d = sz;
 
 	if (col->decimal > d && col->width > sz) {
 		padl = col->decimal - d;
Index: out.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/out.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -Lout.c -Lout.c -u -p -r1.70 -r1.71
--- out.c
+++ out.c
@@ -1,7 +1,7 @@
 /*	$Id$ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011,2014,2015,2017,2018 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
@@ -320,7 +320,7 @@ tblcalc_number(struct rofftbl *tbl, stru
 		const struct tbl_opts *opts, const struct tbl_dat *dp)
 {
 	int		 i;
-	size_t		 sz, psz, ssz, d;
+	size_t		 sz, ssz, d;
 	const char	*str;
 	char		*cp;
 	char		 buf[2];
@@ -342,17 +342,15 @@ tblcalc_number(struct rofftbl *tbl, stru
 	buf[0] = opts->decimal;
 	buf[1] = '\0';
 
-	psz = (*tbl->slen)(buf, tbl->arg);
-
 	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 + psz;
+		d = ssz;
 	} else
-		d = sz + psz;
+		d = sz;
 
 	/* Adjust the settings for this column. */
 
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv