Import Upstream version 3a4upstream/3a4

1 files changed, 113 insertions, 107 deletions

diff --git a/mklibcat.scm b/mklibcat.scm
index d26c821..19c5425 100644
--- a/mklibcat.scm
+++ b/mklibcat.scm
@@ -50,68 +50,68 @@
 	 (library-vicinity)
 	 '(
 	   ;; null is the start of SLIB associations.
-	   (null				"null")
-	   (aggregate				"null")
+	   (null		source		"null")
+	   (aggregate		source		"null")
 	   (r2rs	aggregate	rev3-procedures	rev2-procedures)
 	   (r3rs	aggregate	rev3-procedures)
 	   (r4rs	aggregate	rev4-optional-procedures)
 	   (r5rs	aggregate	values	macro	eval)
-	   (rev4-optional-procedures		"sc4opt")
-	   (rev3-procedures			"null")
-	   (rev2-procedures			"sc2")
-	   (multiarg/and-			"mularg")
-	   (multiarg-apply			"mulapply")
-	   (rationalize				"ratize")
-	   (transcript				"trnscrpt")
-	   (with-file				"withfile")
-	   (dynamic-wind			"dynwind")
-	   (dynamic				"dynamic")
+	   (rev4-optional-procedures	source	"sc4opt")
+	   (rev3-procedures	source		"null")
+	   (rev2-procedures	source		"sc2")
+	   (multiarg/and-	source		"mularg")
+	   (multiarg-apply	source		"mulapply")
+	   (rationalize		source		"ratize")
+	   (transcript		source		"trnscrpt")
+	   (with-file		source		"withfile")
+	   (dynamic-wind	source		"dynwind")
+	   (dynamic		source		"dynamic")
 	   (fluid-let		defmacro	"fluidlet")
-	   (alist				"alist")
-	   (hash				"hash")
-	   (sierpinski				"sierpinski")
-	   (hilbert-fill			"phil-spc")
-	   (peano-fill				"peanosfc")
-	   (soundex				"soundex")
-	   (hash-table				"hashtab")
-	   (logical				"logical")
-	   (random				"random")
-	   (random-inexact			"randinex")
-	   (modular				"modular")
-	   (factor				"factor")
+	   (alist		source		"alist")
+	   (hash		source		"hash")
+	   (sierpinski		source		"sierpinski")
+	   (hilbert-fill	source		"phil-spc")
+	   (peano-fill		source		"peanosfc")
+	   (soundex		source		"soundex")
+	   (hash-table		source		"hashtab")
+	   (logical		source		"logical")
+	   (random		source		"random")
+	   (random-inexact	source		"randinex")
+	   (modular		source		"modular")
+	   (factor		source		"factor")
 	   (primes				factor)
-	   (limit				"limit")
-	   (eps-graph				"grapheps")
-	   (charplot				"charplot")
-	   (sort				"sort")
+	   (limit		source		"limit")
+	   (eps-graph		source		"grapheps")
+	   (charplot		source		"charplot")
+	   (sort		source		"sort")
 	   (tsort				topological-sort)
-	   (topological-sort			"tsort")
-	   (common-list-functions		"comlist")
-	   (tree				"tree")
-	   (coerce				"coerce")
-	   (format				"format")
-	   (generic-write			"genwrite")
-	   (pretty-print			"pp")
-	   (pprint-file				"ppfile")
-	   (object->string			"obj2str")
-	   (string-case				"strcase")
-	   (line-i/o				"lineio")
-	   (string-port				"strport")
-	   (getopt				"getopt")
-	   (qp					"qp")
-	   (eval				"eval")
-	   (record				"record")
-	   (synchk				"synchk")
-	   (defmacroexpand			"defmacex")
+	   (topological-sort	source		"tsort")
+	   (common-list-functions	source	"comlist")
+	   (tree		source		"tree")
+	   (coerce		source		"coerce")
+	   (format		source		"format")
+	   (generic-write	source		"genwrite")
+	   (pretty-print	source		"pp")
+	   (pprint-file		source		"ppfile")
+	   (object->string	source		"obj2str")
+	   (string-case		source		"strcase")
+	   (line-i/o		source		"lineio")
+	   (string-port		source		"strport")
+	   (getopt		source		"getopt")
+	   (qp			source		"qp")
+	   (eval		source		"eval")
+	   (record		source		"record")
+	   (synchk		source		"synchk")
+	   (defmacroexpand	source		"defmacex")
 
-	   (printf				"printf")
+	   (printf		source		"printf")
 	   (scanf		defmacro	"scanf")
-	   (stdio-ports				"stdio")
+	   (stdio-ports		source		"stdio")
 	   (stdio		aggregate scanf printf stdio-ports)
 
 	   (break		defmacro	"break")
 	   (trace		defmacro	"trace")
-	   (debugf				"debug")
+	   (debugf		source		"debug")
 	   (debug		aggregate trace break debugf)
 
 	   (delay				promise)
@@ -119,82 +119,84 @@
 
 	   (macro-by-example	defmacro	"mbe")
 
-	   (syntax-case				"scainit")
-	   (syntactic-closures			"scmacro")
-	   (macros-that-work			"macwork")
+	   (syntax-case		source		"scainit")
+	   (syntactic-closures	source		"scmacro")
+	   (macros-that-work	source		"macwork")
 	   (macro				macro-by-example)
-	   (object				"object")
+	   (object		source		"object")
 	   (yasos		macro		"yasyn")
 	   (oop					yasos)
-	   (collect				"collectx")
+	   (collect		source		"collectx")
 	   (structure		syntax-case	"structure")
-	   (values				"values")
-	   (queue				"queue")
-	   (priority-queue			"priorque")
-	   (array				"array")
-	   (subarray				"subarray")
-	   (array-for-each			"arraymap")
-	   (array-interpolate			"linterp")
-	   (repl				"repl")
-	   (process				"process")
-	   (chapter-order			"chap")
-	   (posix-time				"psxtime")
-	   (common-lisp-time			"cltime")
-	   (time-core				"timecore")
+	   (values		source		"values")
+	   (queue		source		"queue")
+	   (priority-queue	source		"priorque")
+	   (array		source		"array")
+	   (subarray		source		"subarray")
+	   (array-for-each	source		"arraymap")
+	   (array-interpolate	source		"linterp")
+	   (repl		source		"repl")
+	   (process		source		"process")
+	   (chapter-order	source		"chap")
+	   (posix-time		source		"psxtime")
+	   (common-lisp-time	source		"cltime")
+	   (time-core		source		"timecore")
 	   (time-zone		defmacro	"timezone")
-	   (relational-database			"rdms")
-	   (databases				"dbutil")
+	   (relational-database	source		"rdms")
+	   (databases		source		"dbutil")
 	   (database-utilities			databases)
-	   (database-commands			"dbcom")
-	   (database-browse			"dbrowse")
-	   (database-interpolate		"dbinterp")
+	   (database-commands	source		"dbcom")
+	   (database-browse	source		"dbrowse")
+	   (database-interpolate	source	"dbinterp")
 	   (within-database	macro		"dbsyn")
-	   (html-form				"htmlform")
-	   (alist-table				"alistab")
-	   (parameters				"paramlst")
-	   (getopt-parameters			"getparam")
-	   (read-command			"comparse")
-	   (batch				"batch")
-	   (glob				"glob")
+	   (html-form		source		"htmlform")
+	   (alist-table		source		"alistab")
+	   (parameters		source		"paramlst")
+	   (getopt-parameters	source		"getparam")
+	   (read-command	source		"comparse")
+	   (batch		source		"batch")
+	   (glob		source		"glob")
 	   (filename				glob)
-	   (crc					"crc")
-	   (fft					"fft")
-	   (wt-tree				"wttree")
-	   (string-search			"strsrch")
-	   (root				"root")
-	   (minimize				"minimize")
+	   (crc			source		"crc")
+	   (dft			source		"dft")
+	   (fft					dft)
+	   (Fourier-transform			dft)
+	   (wt-tree		source		"wttree")
+	   (string-search	source		"strsrch")
+	   (root		source		"root")
+	   (minimize		source		"minimize")
 	   (precedence-parse	defmacro	"prec")
 	   (parse				precedence-parse)
-	   (commutative-ring			"cring")
-	   (self-set				"selfset")
-	   (determinant				"determ")
-	   (byte				"byte")
-	   (byte-number				"bytenumb")
-	   (tzfile				"tzfile")
-	   (schmooz				"schmooz")
+	   (commutative-ring	source		"cring")
+	   (self-set		source		"selfset")
+	   (determinant		source		"determ")
+	   (byte		source		"byte")
+	   (byte-number		source		"bytenumb")
+	   (tzfile		source		"tzfile")
+	   (schmooz		source		"schmooz")
 	   (transact		defmacro	"transact")
 	   (net-clients				transact)
-	   (db->html				"db2html")
+	   (db->html		source		"db2html")
 	   (http		defmacro	"http-cgi")
 	   (cgi					http)
 	   (uri			defmacro	"uri")
 	   (uniform-resource-identifier		uri)
-	   (pnm					"pnm")
-	   (metric-units			"simetrix")
-	   (diff				"differ")
-	   (solid				"solid")
+	   (pnm			source		"pnm")
+	   (metric-units	source		"simetrix")
+	   (diff		source		"differ")
+	   (solid		source		"solid")
 	   (vrml97				solid)
 	   (vrml				vrml97)
 	   (color		defmacro	"color")
-	   (color-space				"colorspc")
+	   (color-space		source		"colorspc")
 	   (cie					color-space)
-	   (color-names				"colornam")
+	   (color-names		source		"colornam")
 	   (color-database	defmacro	"mkclrnam")
 	   (resene		color-names	"clrnamdb.scm")
 	   (saturate		color-names	"clrnamdb.scm")
 	   (nbs-iscc		color-names	"clrnamdb.scm")
-	   (daylight				"daylight")
-	   (matfile				"matfile")
+	   (daylight		source		"daylight")
+	   (matfile		source		"matfile")
 	   (mat-file				matfile)
 	   (spectral-tristimulus-values		color-space)
 	   (cie1964 spectral-tristimulus-values "cie1964.xyz")
@@ -202,14 +204,14 @@
 	   (ciexyz				cie1931)
 	   (cvs			defmacro	"cvs")
 	   (html-for-each	defmacro	"html4each")
-	   (directory				"dirs")
+	   (directory		source		"dirs")
 	   (ncbi-dna		defmacro	"ncbi-dna")
-	   (manifest				"manifest")
-	   (top-refs				"top-refs")
-	   (vet					"vet")
+	   (manifest		source		"manifest")
+	   (top-refs		source		"top-refs")
+	   (vet			source		"vet")
 	   (srfi-0				srfi)
 	   (srfi		defmacro	"srfi")
-	   (srfi-1				"srfi-1")
+	   (srfi-1		source		"srfi-1")
 	   (and-let*				srfi-2)
 	   (srfi-2		defmacro	"srfi-2")
 	   (receive				srfi-8)
@@ -221,7 +223,11 @@
 	   (srfi-60				logical)
 	   (guarded-cond-clause			srfi-61)
 	   (srfi-61		macro		"srfi-61")
-	   (new-catalog				"mklibcat")
+	   (srfi-23		source		"srfi-23")
+	   (math-integer	source		"math-integer")
+	   (math-real		source		"math-real")
+	   (srfi-94		aggregate math-integer math-real)
+	   (new-catalog		source		"mklibcat")
 	   ))))
       (let* ((req (in-vicinity (library-vicinity)
 			       (string-append "require" (scheme-file-suffix)))))