Version 74txr-74

* txr.c (version): Bumped.

* txr.1: Bumped version and set date.

* configure (txr_ver): Bumped.

* RELNOTES, txr.vim, dep.mk: Updated.

7 files changed, 98 insertions, 59 deletions

diff --git a/ChangeLog b/ChangeLog
index 39713f76..a56288cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2014-01-13  Kaz Kylheku  <kaz@kylheku.com>
 
+	Version 74
+
+	* txr.c (version): Bumped.
+
+	* txr.1: Bumped version and set date.
+
+	* configure (txr_ver): Bumped.
+
+	* RELNOTES, txr.vim, dep.mk: Updated.
+
+2014-01-13  Kaz Kylheku  <kaz@kylheku.com>
+
 	* debug.h (debug_check): Fix broken build when debugger is disabled:
 	the debug-disabled stub function needs six arguments.
 
diff --git a/RELNOTES b/RELNOTES
index 421b9537..5647d593 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,28 @@
+                                     TXR 74
+                                   2014-01-13
+
+
+  Features
+
+  - Maintenance: builds on Cygwin, MinGW and Mac OS X 10.7.3.
+
+  - New math functions: n-choose-k, n-perm-k, cum-norm-dist.
+
+  - lisp-parse function renamed read; old name is obsolescent.
+
+  - In the TXR pattern language, the @ escape can now evaluate a non-compound
+    TXR Lisp expression also. Previously compounds like @(+ 1 1) 
+    were supported, but atoms like @foo were not.
+
+
+  Bugs
+
+  - Small fix in how exponent fields of printed floating point values
+    are normalized. Across all platforms, there are now no leading zeros
+    after the 'e'.
+    
+
+
                                      TXR 73
                                    2014-01-08
 
diff --git a/configure b/configure
index f0912c83..18c8748f 100755
--- a/configure
+++ b/configure
@@ -387,7 +387,7 @@ fi
 #
 
 
-txr_ver=73
+txr_ver=74
 
 #
 # The all important banner.
diff --git a/dep.mk b/dep.mk
index 71997288..50e6ee78 100644
--- a/dep.mk
+++ b/dep.mk
@@ -11,7 +11,7 @@
 ./hash.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./stream.h $(top_srcdir)/./hash.h
 ./utf8.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./utf8.h
 ./filter.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./hash.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./match.h $(top_srcdir)/./filter.h $(top_srcdir)/./gc.h $(top_srcdir)/./stream.h
-./eval.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./stream.h $(top_srcdir)/./parser.h $(top_srcdir)/./hash.h $(top_srcdir)/./debug.h $(top_srcdir)/./match.h $(top_srcdir)/./rand.h $(top_srcdir)/./filter.h $(top_srcdir)/./txr.h $(top_srcdir)/./syslog.h $(top_srcdir)/./eval.h
+./eval.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./arith.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./stream.h $(top_srcdir)/./parser.h $(top_srcdir)/./hash.h $(top_srcdir)/./debug.h $(top_srcdir)/./match.h $(top_srcdir)/./rand.h $(top_srcdir)/./filter.h $(top_srcdir)/./txr.h $(top_srcdir)/./syslog.h $(top_srcdir)/./eval.h
 ./rand.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./gc.h $(top_srcdir)/./arith.h $(top_srcdir)/./rand.h
 mpi-1.8.6/mpi.o: config.h $(top_srcdir)/mpi-1.8.6/mpi.h $(top_srcdir)/mpi-1.8.6/logtab.h
 mpi-1.8.6/mplogic.o: config.h $(top_srcdir)/mpi-1.8.6/mplogic.h
diff --git a/txr.1 b/txr.1
index a7812d15..8f87e428 100644
--- a/txr.1
+++ b/txr.1
@@ -21,9 +21,9 @@
 .\"IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 .\"WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-.TH "TXR" 1 2014-01-08 "Utility Commands" "Txr Text Processing Language" "Kaz Kylheku"
+.TH "TXR" 1 2014-01-13 "Utility Commands" "Txr Text Processing Language" "Kaz Kylheku"
 .SH NAME
-txr \- text processing language (version 73)
+txr \- text processing language (version 74)
 .SH SYNOPSIS
 .B txr [ options ] query-file { data-file }*
 .sp
diff --git a/txr.c b/txr.c
index 6ad49e1d..1ec16ec6 100644
--- a/txr.c
+++ b/txr.c
@@ -46,7 +46,7 @@
 #include "syslog.h"
 #include "txr.h"
 
-const wchli_t *version = wli("73");
+const wchli_t *version = wli("74");
 const wchar_t *progname = L"txr";
 const wchar_t *spec_file = L"stdin";
 val self_path;
diff --git a/txr.vim b/txr.vim
index dab316ab..28ebebbb 100644
--- a/txr.vim
+++ b/txr.vim
@@ -55,58 +55,59 @@ syn keyword txl_keyword contained collect-each collect-each* compl-span-str cond
 syn keyword txl_keyword contained cons consp copy-alist copy-cons
 syn keyword txl_keyword contained copy-hash copy-list copy-str copy-vec
 syn keyword txl_keyword contained cos count-if countq countql
-syn keyword txl_keyword contained countqual daemon dec defun
-syn keyword txl_keyword contained defvar del delete-package dohash
-syn keyword txl_keyword contained downcase-str dwim each each*
-syn keyword txl_keyword contained eq eql equal errno
-syn keyword txl_keyword contained error eval evenp exit
-syn keyword txl_keyword contained exp expt exptmod fboundp
-syn keyword txl_keyword contained fifth find find-if find-package
-syn keyword txl_keyword contained first fixnump flatten flatten*
-syn keyword txl_keyword contained flip flo-int flo-str floatp
-syn keyword txl_keyword contained floor flush-stream for for*
-syn keyword txl_keyword contained force format fourth fun
-syn keyword txl_keyword contained func-get-env func-get-form functionp gcd
-syn keyword txl_keyword contained generate gensym get-byte get-char
-syn keyword txl_keyword contained get-hash-userdata get-line get-list-from-stream get-sig-handler
-syn keyword txl_keyword contained get-string-from-stream gethash hash hash-alist
-syn keyword txl_keyword contained hash-construct hash-count hash-diff hash-eql
-syn keyword txl_keyword contained hash-equal hash-isec hash-keys hash-pairs
-syn keyword txl_keyword contained hash-uni hash-values hashp identity
-syn keyword txl_keyword contained if iff iffi inc
-syn keyword txl_keyword contained int-flo int-str integerp intern
-syn keyword txl_keyword contained interp-fun-p isqrt keep-if keep-if*
-syn keyword txl_keyword contained keywordp lambda lazy-str lazy-str-force
-syn keyword txl_keyword contained lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons lazy-stringp
-syn keyword txl_keyword contained lcons-fun ldiff length length-list
-syn keyword txl_keyword contained length-str length-str-< length-str-<= length-str->
-syn keyword txl_keyword contained length-str->= length-vec let let*
-syn keyword txl_keyword contained lisp-parse list list-str list-vector
-syn keyword txl_keyword contained listp log log-alert log-auth
-syn keyword txl_keyword contained log-authpriv log-cons log-crit log-daemon
-syn keyword txl_keyword contained log-debug log-emerg log-err log-info
-syn keyword txl_keyword contained log-ndelay log-notice log-nowait log-odelay
-syn keyword txl_keyword contained log-perror log-pid log-user log-warning
-syn keyword txl_keyword contained logand logior lognot logtest
-syn keyword txl_keyword contained logtrunc logxor make-hash make-lazy-cons
-syn keyword txl_keyword contained make-package make-random-state make-similar-hash make-string-byte-input-stream
-syn keyword txl_keyword contained make-string-input-stream make-string-output-stream make-strlist-output-stream make-sym
-syn keyword txl_keyword contained make-time make-time-utc mapcar mapcar*
-syn keyword txl_keyword contained maphash mappend mappend* mask
-syn keyword txl_keyword contained match-fun match-regex match-str match-str-tree
-syn keyword txl_keyword contained max memq memql memqual
-syn keyword txl_keyword contained merge min mkstring mod
-syn keyword txl_keyword contained multi-sort none not nreverse
-syn keyword txl_keyword contained null num-chr num-str numberp
-syn keyword txl_keyword contained oddp open-command open-directory open-file
-syn keyword txl_keyword contained open-pipe open-process open-tail openlog
-syn keyword txl_keyword contained or orf packagep pop
-syn keyword txl_keyword contained pprint print prog1 progn
-syn keyword txl_keyword contained prop proper-listp push pushhash
-syn keyword txl_keyword contained put-byte put-char put-line put-string
-syn keyword txl_keyword contained qquote quasi quote rand
-syn keyword txl_keyword contained random random-fixnum random-state-p range
-syn keyword txl_keyword contained range* real-time-stream-p reduce-left reduce-right
+syn keyword txl_keyword contained countqual cum-norm-dist daemon dec
+syn keyword txl_keyword contained defun defvar del delete-package
+syn keyword txl_keyword contained dohash downcase-str dwim each
+syn keyword txl_keyword contained each* eq eql equal
+syn keyword txl_keyword contained errno error eval evenp
+syn keyword txl_keyword contained exit exp expt exptmod
+syn keyword txl_keyword contained fboundp fifth find find-if
+syn keyword txl_keyword contained find-package first fixnump flatten
+syn keyword txl_keyword contained flatten* flip flo-int flo-str
+syn keyword txl_keyword contained floatp floor flush-stream for
+syn keyword txl_keyword contained for* force format fourth
+syn keyword txl_keyword contained fun func-get-env func-get-form functionp
+syn keyword txl_keyword contained gcd generate gensym get-byte
+syn keyword txl_keyword contained get-char get-hash-userdata get-line get-list-from-stream
+syn keyword txl_keyword contained get-sig-handler get-string-from-stream gethash hash
+syn keyword txl_keyword contained hash-alist hash-construct hash-count hash-diff
+syn keyword txl_keyword contained hash-eql hash-equal hash-isec hash-keys
+syn keyword txl_keyword contained hash-pairs hash-uni hash-values hashp
+syn keyword txl_keyword contained identity if iff iffi
+syn keyword txl_keyword contained inc int-flo int-str integerp
+syn keyword txl_keyword contained intern interp-fun-p isqrt keep-if
+syn keyword txl_keyword contained keep-if* keywordp lambda lazy-str
+syn keyword txl_keyword contained lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons
+syn keyword txl_keyword contained lazy-stringp lcons-fun ldiff length
+syn keyword txl_keyword contained length-list length-str length-str-< length-str-<=
+syn keyword txl_keyword contained length-str-> length-str->= length-vec let
+syn keyword txl_keyword contained let* lisp-parse list list-str
+syn keyword txl_keyword contained list-vector listp log log-alert
+syn keyword txl_keyword contained log-auth log-authpriv log-cons log-crit
+syn keyword txl_keyword contained log-daemon log-debug log-emerg log-err
+syn keyword txl_keyword contained log-info log-ndelay log-notice log-nowait
+syn keyword txl_keyword contained log-odelay log-perror log-pid log-user
+syn keyword txl_keyword contained log-warning logand logior lognot
+syn keyword txl_keyword contained logtest logtrunc logxor make-hash
+syn keyword txl_keyword contained make-lazy-cons make-package make-random-state make-similar-hash
+syn keyword txl_keyword contained make-string-byte-input-stream make-string-input-stream make-string-output-stream make-strlist-output-stream
+syn keyword txl_keyword contained make-sym make-time make-time-utc mapcar
+syn keyword txl_keyword contained mapcar* maphash mappend mappend*
+syn keyword txl_keyword contained mask match-fun match-regex match-str
+syn keyword txl_keyword contained match-str-tree max memq memql
+syn keyword txl_keyword contained memqual merge min mkstring
+syn keyword txl_keyword contained mod multi-sort n-choose-k n-perm-k
+syn keyword txl_keyword contained none not nreverse null
+syn keyword txl_keyword contained num-chr num-str numberp oddp
+syn keyword txl_keyword contained open-command open-directory open-file open-pipe
+syn keyword txl_keyword contained open-process open-tail openlog or
+syn keyword txl_keyword contained orf packagep pop pprint
+syn keyword txl_keyword contained print prog1 progn prop
+syn keyword txl_keyword contained proper-listp push pushhash put-byte
+syn keyword txl_keyword contained put-char put-line put-string qquote
+syn keyword txl_keyword contained quasi quote rand random
+syn keyword txl_keyword contained random-fixnum random-state-p range range*
+syn keyword txl_keyword contained read real-time-stream-p reduce-left reduce-right
 syn keyword txl_keyword contained ref refset regex-compile regex-parse
 syn keyword txl_keyword contained regexp regsub rehome-sym remhash
 syn keyword txl_keyword contained remove-if remove-if* remq remq*
@@ -143,8 +144,9 @@ syn keyword txl_keyword contained throwf time time-string-local time-string-utc
 syn keyword txl_keyword contained time-usec tok-str tostring tostringp
 syn keyword txl_keyword contained tree-find trim-str trunc typeof
 syn keyword txl_keyword contained unquote upcase-str url-decode url-encode
-syn keyword txl_keyword contained uw-protect vec-push vec-set-length vecref
-syn keyword txl_keyword contained vector vector-list vectorp zerop
+syn keyword txl_keyword contained usleep uw-protect vec-push vec-set-length
+syn keyword txl_keyword contained vecref vector vector-list vectorp
+syn keyword txl_keyword contained zerop
 
 syn match txr_error "@[\t ]*[*]\?[\t ]*."
 syn match txr_nested_error "[^\t `]\+" contained