--- ray/src/cal/tabfunc.c	2003/06/26 00:58:09	1.3
+++ ray/src/cal/tabfunc.c	2024/02/28 03:17:23	1.11
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: tabfunc.c,v 1.3 2003/06/26 00:58:09 schorsch Exp $";
+static const char	RCSid[] = "$Id: tabfunc.c,v 1.11 2024/02/28 03:17:23 greg Exp $";
 #endif
 /*
  * Put tabular data into functions suitable for cal programs.
@@ -7,25 +7,18 @@ static const char	RCSid[] = "$Id: tabfunc.c,v 1.3 2003
  *	2/2/95	Greg Ward
  */
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <math.h>
 #include <ctype.h>
-#ifdef _WIN32
- #include <process.h> /* getpid() */
-#else
- #include <sys/types.h>
- #include <unistd.h>
-#endif
 
-#include "standard.h"
-#include "platform.h"
+#include "rtprocess.h" /* getpid() */
+#include "rtmath.h"
+#include "rtio.h"
 
 #define  isdelim(c)	(isspace(c) || (c)==',')
 
-#define  MAXTAB		1024		/* maximum number of data rows */
-#define  MAXLINE	4096		/* maximum line width (characters) */
+#define  MAXTAB		8192		/* maximum number of data rows */
+#define  MAXLINE	16384		/* maximum line width (characters) */
 #define  OUTFMT		"%.7g"		/* output format conversion string */
 
 int	interpolate = 0;
@@ -113,7 +106,7 @@ FILE	*fp
 				goto fatal;
 			}
 			ordinate[i][tabsize] = atof(cp);
-			if ((cp = fskip(cp)) == NULL) {
+			if ((cp = fskip(cp)) == NULL || !isdelim(*cp)) {
 				err = "bad floating-point format";
 				goto fatal;
 			}
@@ -155,26 +148,29 @@ absc_exp(void)			/* produce expression for abscissa */
 				strcpy(ourexp, "x");
 			else
 				sprintf(ourexp, "x-%g", abscissa[0]-1);
-		} else
+		} else if (fabs(abscissa[0]) < eps)
+			sprintf(ourexp, "x/%g+1", step);
+		else
 			sprintf(ourexp, "(x-%g)/%g+1", abscissa[0], step);
 	} else {
 		printf("X`%s(i):select(i,", locID);
 		putlist(abscissa, tabsize, 20);
 		puts(");");
-		if (increasing) {
+		if (increasing)
+			printf("fx2`%s(x,i):if(x-X`%s(i),\n", locID, locID);
+		else
+			printf("fx2`%s(x,i):if(X`%s(i)-x,\n", locID, locID);
+		printf("\ti+(x-X`%s(i))/(X`%s(i+1)-X`%s(i)),\n",
+				locID, locID, locID);
+		printf("\tfx2`%s(x,i-1));\n", locID);
+		if (increasing)
 			printf("fx`%s(x):if(x-%g,if(%g-x,fx2`%s(x,%d),%d),1);\n",
 					locID, abscissa[0], abscissa[tabsize-1],
 					locID, tabsize, tabsize);
-			printf("fx2`%s(x,i):if(x-X`%s(i),\n", locID, locID);
-		} else {
+		else
 			printf("fx`%s(x):if(%g-x,if(x-%g,fx2`%s(x,%d),%d),1);\n",
 					locID, abscissa[0], abscissa[tabsize-1],
 					locID, tabsize, tabsize);
-			printf("fx2`%s(x,i):if(X`%s(i)-x,\n", locID, locID);
-		}
-		printf("\ti+(x-X`%s(i))/(X`%s(i+1)-X`%s(i)),\n",
-				locID, locID, locID);
-		printf("\tfx2`%s(x,i-1));\n", locID);
 		sprintf(ourexp, "fx`%s(x)", locID);
 	}
 	return(ourexp);
@@ -191,7 +187,7 @@ char	*xe
 
 	xelen = strlen(xe);
 	for (i = 0; i < nfuncs; i++) {
-		if (func[i][0] == '\0' | func[i][0] == '0')
+		if ((func[i][0] == '\0') | (func[i][0] == '0'))
 			continue;
 		if (interpolate) {
 			printf("%s`%s(i):select(i,", func[i], locID);