Imported Upstream version 1.8.3

32 files changed, 15 insertions, 10 deletions

diff --git a/target/ColorChecker.ti2 b/target/ColorChecker.ti2
index 6ede47a..6ede47a 100644..100755
--- a/target/ColorChecker.ti2
+++ b/target/ColorChecker.ti2
diff --git a/target/ECI2002.ti2 b/target/ECI2002.ti2
index 0ab3095..0ab3095 100644..100755
--- a/target/ECI2002.ti2
+++ b/target/ECI2002.ti2
diff --git a/target/ECI2002R.ti2 b/target/ECI2002R.ti2
index d3f2d8b..d3f2d8b 100644..100755
--- a/target/ECI2002R.ti2
+++ b/target/ECI2002R.ti2
diff --git a/target/FograStrip2.ti1 b/target/FograStrip2.ti1
index f8abae7..f8abae7 100644..100755
--- a/target/FograStrip2.ti1
+++ b/target/FograStrip2.ti1
diff --git a/target/FograStrip2_2.ti2 b/target/FograStrip2_2.ti2
index b84cb9d..b84cb9d 100644..100755
--- a/target/FograStrip2_2.ti2
+++ b/target/FograStrip2_2.ti2
diff --git a/target/FograStrip3.ti1 b/target/FograStrip3.ti1
index 4cf126f..4cf126f 100644..100755
--- a/target/FograStrip3.ti1
+++ b/target/FograStrip3.ti1
diff --git a/target/FograStrip3_3.ti2 b/target/FograStrip3_3.ti2
index 8f9822e..8f9822e 100644..100755
--- a/target/FograStrip3_3.ti2
+++ b/target/FograStrip3_3.ti2
diff --git a/target/Jamfile b/target/Jamfile
index 1ab2da6..1ab2da6 100644..100755
--- a/target/Jamfile
+++ b/target/Jamfile
diff --git a/target/License.txt b/target/License.txt
index a871fcf..a871fcf 100644..100755
--- a/target/License.txt
+++ b/target/License.txt
diff --git a/target/Readme.txt b/target/Readme.txt
index 99a8317..99a8317 100644..100755
--- a/target/Readme.txt
+++ b/target/Readme.txt
diff --git a/target/afiles b/target/afiles
index 4b06b9f..4b06b9f 100644..100755
--- a/target/afiles
+++ b/target/afiles
diff --git a/target/alphix.c b/target/alphix.c
index 68dfd48..68dfd48 100644..100755
--- a/target/alphix.c
+++ b/target/alphix.c
diff --git a/target/alphix.h b/target/alphix.h
index 091c191..091c191 100644..100755
--- a/target/alphix.h
+++ b/target/alphix.h
diff --git a/target/filmtarg.c b/target/filmtarg.c
index af341dd..af341dd 100644..100755
--- a/target/filmtarg.c
+++ b/target/filmtarg.c
diff --git a/target/i1_RGB_Scan_1.4.ti2 b/target/i1_RGB_Scan_1.4.ti2
index 8aaf081..8aaf081 100644..100755
--- a/target/i1_RGB_Scan_1.4.ti2
+++ b/target/i1_RGB_Scan_1.4.ti2
diff --git a/target/ifarp.c b/target/ifarp.c
index 544f316..03fc914 100644..100755
--- a/target/ifarp.c
+++ b/target/ifarp.c
@@ -310,6 +310,7 @@ ifarp_del(ifarp *s) {
 
 /* Constructor */
 ifarp *new_ifarp(
+int verb,				/* Verbosity */
 int di,					/* Dimensionality of device space */
 double ilimit,			/* Ink limit (sum of device coords max) */
 int inp,				/* Number of points to generate */
@@ -320,7 +321,6 @@ void *od				/* context for Perceptual function */
 ) {
 	ifarp *s;
 	int e, i;
-	int verb = 1;
 
 #ifdef DEBUG
 	printf("new_ifarp called with di %d, inp %d, fxno = %d\n",di,inp,fxno);
@@ -855,7 +855,7 @@ char *argv[];
 		error ("Creation of xcolorant lu object failed");
 
 	/* Create the required points */
-	s = new_ifarp(di, 1.5, npoints, NULL, 0, sa_percept, (void *)NULL);
+	s = new_ifarp(1, di, 1.5, npoints, NULL, 0, sa_percept, (void *)NULL);
 
 #ifdef DEBUG
 	/* Dump perceptual map */
diff --git a/target/ifarp.h b/target/ifarp.h
index 083411b..ee18840 100644..100755
--- a/target/ifarp.h
+++ b/target/ifarp.h
@@ -59,9 +59,10 @@ struct _ifarp {
 }; typedef struct _ifarp ifarp;
 
 /* Constructor */
-extern ifarp *new_ifarp(int di, double ilimit, int npoints,
+extern ifarp *new_ifarp(int verb, int di, double ilimit, int npoints,
 	fxpos *fxlist, int fxno, 
-	void (*percept)(void *od, double *out, double *in), void *od);
+	void (*percept)(void *od, double *out, double *in), void *od
+);
 
 #define IFARP_H
 #endif /* IFARP_H */
diff --git a/target/ofps.c b/target/ofps.c
index dfcee2e..dfcee2e 100644..100755
--- a/target/ofps.c
+++ b/target/ofps.c
diff --git a/target/ofps.h b/target/ofps.h
index e2b1d55..e2b1d55 100644..100755
--- a/target/ofps.h
+++ b/target/ofps.h
diff --git a/target/ppoint.c b/target/ppoint.c
index 217b1e9..217b1e9 100644..100755
--- a/target/ppoint.c
+++ b/target/ppoint.c
diff --git a/target/ppoint.h b/target/ppoint.h
index 2a4bc52..2a4bc52 100644..100755
--- a/target/ppoint.h
+++ b/target/ppoint.h
diff --git a/target/prand.c b/target/prand.c
index 7ce5760..7ce5760 100644..100755
--- a/target/prand.c
+++ b/target/prand.c
diff --git a/target/prand.h b/target/prand.h
index d7e50eb..d7e50eb 100644..100755
--- a/target/prand.h
+++ b/target/prand.h
diff --git a/target/printtarg.c b/target/printtarg.c
index 863537f..1b03b3c 100644..100755
--- a/target/printtarg.c
+++ b/target/printtarg.c
@@ -2912,8 +2912,8 @@ void usage(char *diag, ...) {
 	fprintf(stderr," -b              Force B&W spacers\n");
 	fprintf(stderr," -n              Force no spacers\n");
 	fprintf(stderr," -f              Create PostScript DeviceN Color fallback\n");
-	fprintf(stderr," -w g|r|s|n      White colorspace encoding DeviceGray (def), DeviceRGB, Separation or DeviceN\n");            
-	fprintf(stderr," -k g|c|s|n      Black colorspace encoding DeviceGray (def), DeviceCMYK, Separation or DeviceN\n");            
+	fprintf(stderr," -w g|r|s|n      White colorspace encoding: DeviceGray (def), DeviceRGB, Separation or DeviceN\n");            
+	fprintf(stderr," -k g|c|s|n      Black colorspace encoding: DeviceGray (def), DeviceCMYK, Separation or DeviceN\n");            
 	fprintf(stderr," -o k|r|n        CMY colorspace encoding DeviceCMYK (def), inverted DeviceRGB or DeviceN\n");            
 	fprintf(stderr," -e              Output EPS compatible file\n");
 	fprintf(stderr," -t [res]        Output 8 bit TIFF raster file, optional res DPI (default 100)\n");
@@ -3645,12 +3645,16 @@ char *argv[];
 		}
 	}
 
-	if (verb) {
-		if (pap != NULL)
+	if (pap != NULL) {
+		sprintf(buf, "%.1fx%.1f",pap->w, pap->h);
+		if (verb)
 			printf("Paper chosen is %s	[%.1f x %.1f mm]\n", pap->name, pap->w, pap->h);
-		else
+	} else {
+		sprintf(buf, "%.1fx%.1f",cwidth, cheight);
+		if (verb)
 			printf("Paper chosen is custom %.1f x %.1f mm\n", cwidth, cheight);
 	}
+	ocg->add_kword(ocg, 0, "PAPER_SIZE", buf, NULL);
 
 	if (rstart == -1) {
 		rstart = clk % npat;
diff --git a/target/randix.c b/target/randix.c
index bf85764..bf85764 100644..100755
--- a/target/randix.c
+++ b/target/randix.c
diff --git a/target/randix.h b/target/randix.h
index b4c36c0..b4c36c0 100644..100755
--- a/target/randix.h
+++ b/target/randix.h
diff --git a/target/simdlat.c b/target/simdlat.c
index 50f159b..50f159b 100644..100755
--- a/target/simdlat.c
+++ b/target/simdlat.c
diff --git a/target/simdlat.h b/target/simdlat.h
index 93e0ad3..93e0ad3 100644..100755
--- a/target/simdlat.h
+++ b/target/simdlat.h
diff --git a/target/simplat.c b/target/simplat.c
index e738ff7..e738ff7 100644..100755
--- a/target/simplat.c
+++ b/target/simplat.c
diff --git a/target/simplat.h b/target/simplat.h
index 4cede20..4cede20 100644..100755
--- a/target/simplat.h
+++ b/target/simplat.h
diff --git a/target/targen.c b/target/targen.c
index 4d1d7ac..a29ef63 100644..100755
--- a/target/targen.c
+++ b/target/targen.c
@@ -2165,7 +2165,7 @@ int main(int argc, char *argv[]) {
 			/* for some of these (new_prand).  */
 			if (uselat)	 {
 				/* A "greedy"/incremental far point approach */
-				t = new_ifarp(di, uilimit, fsteps, fxlist, fxno,
+				t = new_ifarp(verb, di, uilimit, fsteps, fxlist, fxno,
 				                (void(*)(void *, double *, double *))pdata->dev_to_perc, (void *)pdata);
 				sprintf(buf,"%d",fsteps - fxno);
 				pp->add_kword(pp, 0, "IFP_PATCHES", buf, NULL);
diff --git a/target/targen.h b/target/targen.h
index c99b551..c99b551 100644..100755
--- a/target/targen.h
+++ b/target/targen.h