Version 87.txr-87

6 files changed, 45 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 07556c2a..0254802f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2014-03-22  Kaz Kylheku  <kaz@kylheku.com>
 
+	Version 87
+
+	* txr.c (version): Bumped.
+
+	* txr.1: Bumped version, set date.
+
+	* configure (txr_ver): Bumped.
+
+	* RELNOTES: Updated
+
+	* txr.vim: Regenerated.
+
+2014-03-22  Kaz Kylheku  <kaz@kylheku.com>
+
 	* utf8.c (w_fopen, w_popen, w_freopen, w_remove, w_rename): Revert
 	2014-03-14 changes.
 
diff --git a/RELNOTES b/RELNOTES
index b3922427..f9c1d809 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,28 @@
+                                     TXR 87
+                                   2014-03-22
+
+
+  Features
+
+  - New convenience functions tofloat, toint: convert string or number to
+    integer or floating-point.
+
+  - New macro: when.
+
+  Bugs
+
+  - int-flo function was failing on negative numbers.
+
+  - Fixed long-standing syntax issue: directives of the pattern matching
+    language being syntactically recognized in the @(output) clause and
+    in string quasiliterals, interfering with the ability to invoke Lisp
+    forms based on the same symbols. This issue really "hit home" with
+    the recent introduction of the @(if) directive, causing
+    @(if expr then else) to suddenly be inaccessible in @(output) and
+    quasistrings.
+
+
+
                                      TXR 86
                                    2014-03-16
 
diff --git a/configure b/configure
index 43f81c60..1e8ae736 100755
--- a/configure
+++ b/configure
@@ -387,7 +387,7 @@ fi
 #
 
 
-txr_ver=86
+txr_ver=87
 
 #
 # The all important banner.
diff --git a/txr.1 b/txr.1
index 2fa11c73..c59d3f3b 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-03-16 "Utility Commands" "TXR Text Processing Language" "Kaz Kylheku"
+.TH "TXR" 1 2014-03-22 "Utility Commands" "TXR Text Processing Language" "Kaz Kylheku"
 .SH NAME
-txr \- text processing language (version 86)
+txr \- text processing language (version 87)
 .SH SYNOPSIS
 .B txr [ options ] query-file { data-file }*
 .sp
diff --git a/txr.c b/txr.c
index b6482c11..63f95c98 100644
--- a/txr.c
+++ b/txr.c
@@ -47,7 +47,7 @@
 #include "eval.h"
 #include "txr.h"
 
-const wchli_t *version = wli("86");
+const wchli_t *version = wli("87");
 const wchar_t *progname = L"txr";
 
 /*
diff --git a/txr.vim b/txr.vim
index 1ce01da5..d15ce65d 100644
--- a/txr.vim
+++ b/txr.vim
@@ -168,7 +168,8 @@ syn keyword txl_keyword contained trunc typeof unget-byte unget-char
 syn keyword txl_keyword contained unquote upcase-str update url-decode
 syn keyword txl_keyword contained url-encode usleep uw-protect vec
 syn keyword txl_keyword contained vec-push vec-set-length vecref vector
-syn keyword txl_keyword contained vector-list vectorp with-saved-vars zerop
+syn keyword txl_keyword contained vector-list vectorp when with-saved-vars
+syn keyword txl_keyword contained zerop
 
 syn match txr_error "@[\t ]*[*]\?[\t ]*."
 syn match txr_nested_error "[^\t `]\+" contained