summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--RELNOTES53
-rwxr-xr-xconfigure2
-rw-r--r--share/txr/stdlib/ver.tl2
-rw-r--r--tl.vim366
-rw-r--r--txr.14
-rw-r--r--txr.vim366
6 files changed, 423 insertions, 370 deletions
diff --git a/RELNOTES b/RELNOTES
index 8f938f7b..146d6c49 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,56 @@
+ TXR 112
+ 2015-08-14
+
+
+ Features
+
+ ! Note: the ChangeLog is discontinued. Description of changes, going
+ forward, is maintained in git commit messages only, in a hybrid format
+ which conforms to ChangeLog and git conventions at the same time.
+
+ ! Note: txr doesn't work correctly if parse.y is built with Byacc.
+ GNU Bison must be used. This will be addressed in the next release,
+ hopefully.
+
+ - Support for display width concept: identifying Unicode characters which
+ occupy two print positions on tty-like display and printing devices.
+ - Indentation, and field formatting in the format function obey display
+ width, rather than naive string length.
+ - The new display-width function calculates the display width of
+ characters and strings.
+
+ - The a..b syntax is slightly revised; it can occur outside of a list now,
+ and in the terminating position of a dotted list. It correctly associates,
+ so that a..b..c denotes (cons a (cons b c)).
+
+ - New function clamp for clamping numeric and other values to a range.
+
+ - New "qref dot" syntax: a dot flanked by expressions and no whitespace
+ denotes a new syntatic sugar such that a.b.c.d denotes the form
+ (qref a b c d), and a.b.(x y).z denotes (qref a b (x y) z).
+ However, this qref syntax has no assigned meaning yet (coming soon).
+
+ Bugs
+
+ - Regression in format function introduced in 111 is addressed: geneating
+ superfluous left padding when formatting non-numeric fields.
+
+ - Bad consing dot syntax like (a . b c) and (a . b . c)
+ is properly diagnosed instead of silently producing
+ strange (though consistent) results.
+
+ - Tokens with a package prefix but empty name like abc: are correctly
+ handled now by interning a symbol with the name "" (empty string)
+ in the given package.
+
+ - Fixed some minor bugs in lexical analysis of floating-point constants:
+ actual behavior was interpreting as valid certain forms that were
+ documented as erroneous.
+
+ - Fixed stream close bug in catenated streams.
+
+
+
TXR 111
2015-08-08
diff --git a/configure b/configure
index 4c0b9ffa..971164d4 100755
--- a/configure
+++ b/configure
@@ -427,7 +427,7 @@ fi
#
-txr_ver=111
+txr_ver=112
#
# The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index 9a314bee..a1827ecf 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 111)
+(defvarl lib-version 112)
(defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index 19a56395..e53a2194 100644
--- a/tl.vim
+++ b/tl.vim
@@ -63,189 +63,189 @@ syn keyword txl_keyword contained chr-isascii chr-isblank chr-iscntrl chr-isdigi
syn keyword txl_keyword contained chr-isgraph chr-islower chr-isprint chr-ispunct
syn keyword txl_keyword contained chr-isspace chr-isunisp chr-isupper chr-isxdigit
syn keyword txl_keyword contained chr-num chr-str chr-str-set chr-tolower
-syn keyword txl_keyword contained chr-toupper chrp clear-error close-stream
-syn keyword txl_keyword contained closelog cmp-str collect-each collect-each*
-syn keyword txl_keyword contained comb compl-span-str cond conda
-syn keyword txl_keyword contained cons conses conses* consp
-syn keyword txl_keyword contained constantp copy 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 cum-norm-dist daemon dec
-syn keyword txl_keyword contained define-modify-macro define-place-macro defmacro defparm
-syn keyword txl_keyword contained defparml defplace defsymacro defun
-syn keyword txl_keyword contained defvar defvarl del delay
-syn keyword txl_keyword contained delete-package do dohash dotimes
-syn keyword txl_keyword contained downcase-str dup dupfd dwim
-syn keyword txl_keyword contained each each* eighth empty
-syn keyword txl_keyword contained ensure-dir env env-fbind env-hash
-syn keyword txl_keyword contained env-vbind eq eql equal
-syn keyword txl_keyword contained errno error eval evenp
-syn keyword txl_keyword contained exec exit exit* exp
-syn keyword txl_keyword contained expr expt exptmod false
-syn keyword txl_keyword contained fbind fboundp fifth fileno
-syn keyword txl_keyword contained filter-equal filter-string-tree finalize find
-syn keyword txl_keyword contained find-if find-max find-min find-package
-syn keyword txl_keyword contained first fixnump flatten flatten*
-syn keyword txl_keyword contained flet flip flipargs flo-dig
-syn keyword txl_keyword contained flo-epsilon flo-int flo-max flo-min
-syn keyword txl_keyword contained flo-str floatp floor flush-stream
-syn keyword txl_keyword contained fmakunbound for for* force
-syn keyword txl_keyword contained fork format fourth fstat
-syn keyword txl_keyword contained fun func-get-env func-get-form func-get-name
-syn keyword txl_keyword contained func-set-env functionp gcd gen
-syn keyword txl_keyword contained generate gensym gequal get-byte
-syn keyword txl_keyword contained get-char get-clobber-expander get-delete-expander get-error
-syn keyword txl_keyword contained get-error-str get-hash-userdata get-indent get-indent-mode
-syn keyword txl_keyword contained get-line get-lines get-list-from-stream get-sig-handler
-syn keyword txl_keyword contained get-string get-string-from-stream get-update-expander getegid
-syn keyword txl_keyword contained getenv geteuid getgid getgroups
-syn keyword txl_keyword contained gethash getitimer getpid getppid
-syn keyword txl_keyword contained getuid giterate glob glob-altdirfunc
-syn keyword txl_keyword contained glob-brace glob-err glob-mark glob-nocheck
-syn keyword txl_keyword contained glob-noescape glob-nomagic glob-nosort glob-onlydir
-syn keyword txl_keyword contained glob-period glob-tilde glob-tilde-check greater
-syn keyword txl_keyword contained group-by gun hash hash-alist
-syn keyword txl_keyword contained hash-construct hash-count hash-diff hash-eql
-syn keyword txl_keyword contained hash-equal hash-from-pairs hash-isec hash-keys
-syn keyword txl_keyword contained hash-list hash-pairs hash-proper-subset hash-revget
-syn keyword txl_keyword contained hash-subset hash-uni hash-update hash-update-1
-syn keyword txl_keyword contained hash-values hashp have html-decode
-syn keyword txl_keyword contained html-encode iapply identity ido
-syn keyword txl_keyword contained if ifa iff iffi
-syn keyword txl_keyword contained iflet ignerr in inc
-syn keyword txl_keyword contained inc-indent indent-code indent-data indent-off
-syn keyword txl_keyword contained inhash int-flo int-str integerp
-syn keyword txl_keyword contained intern interp-fun-p interpose ip
-syn keyword txl_keyword contained ipf isqrt itimer-prov itimer-real
-syn keyword txl_keyword contained itimer-virtual juxt keep-if keep-if*
-syn keyword txl_keyword contained keyword-package keywordp kill labels
-syn keyword txl_keyword contained lambda last 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 lbind lcm lcons lcons-fun
-syn keyword txl_keyword contained lconsp 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 lequal less
-syn keyword txl_keyword contained let let* lexical-fun-p lexical-lisp1-binding
-syn keyword txl_keyword contained lexical-var-p lib-version link lisp-parse
-syn keyword txl_keyword contained list list* list-str list-vector
-syn keyword txl_keyword contained listp load 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 log10 log2 logand
-syn keyword txl_keyword contained logior lognot logtest logtrunc
-syn keyword txl_keyword contained logxor lstat mac-param-bind macro-form-p
-syn keyword txl_keyword contained macro-time macroexpand macroexpand-1 macrolet
-syn keyword txl_keyword contained major make-catenated-stream make-env make-hash
-syn keyword txl_keyword contained make-lazy-cons make-like make-package make-random-state
-syn keyword txl_keyword contained make-similar-hash make-string-byte-input-stream make-string-input-stream make-string-output-stream
-syn keyword txl_keyword contained make-strlist-output-stream make-sym make-time make-time-utc
-syn keyword txl_keyword contained make-trie makedev makunbound mapcar
-syn keyword txl_keyword contained mapcar* mapdo mapf maphash
-syn keyword txl_keyword contained mappend mappend* mask match-fun
-syn keyword txl_keyword contained match-regex match-regex-right match-regst match-regst-right
-syn keyword txl_keyword contained match-str match-str-tree max member
-syn keyword txl_keyword contained member-if memq memql memqual
-syn keyword txl_keyword contained merge min minor minusp
-syn keyword txl_keyword contained mkdir mknod mkstring mlet
-syn keyword txl_keyword contained mod multi multi-sort n-choose-k
-syn keyword txl_keyword contained n-perm-k nconc nilf ninth
-syn keyword txl_keyword contained none not notf nreverse
-syn keyword txl_keyword contained nthcdr null nullify num-chr
-syn keyword txl_keyword contained num-str numberp oand oddp
-syn keyword txl_keyword contained op open-command open-directory open-file
-syn keyword txl_keyword contained open-fileno open-files open-files* open-pipe
-syn keyword txl_keyword contained open-process open-tail openlog opip
-syn keyword txl_keyword contained or orf packagep pad
-syn keyword txl_keyword contained partition partition* partition-by perm
-syn keyword txl_keyword contained pipe place-form-p placelet placelet*
-syn keyword txl_keyword contained plusp poll poll-err poll-in
-syn keyword txl_keyword contained poll-nval poll-out poll-pri poll-rdband
-syn keyword txl_keyword contained poll-rdhup poll-wrband pop pos
-syn keyword txl_keyword contained pos-if pos-max pos-min posq
-syn keyword txl_keyword contained posql posqual pppred ppred
-syn keyword txl_keyword contained pprinl pprint pprof pred
-syn keyword txl_keyword contained prinl print prof prog1
-syn keyword txl_keyword contained progn prop proper-listp pset
-syn keyword txl_keyword contained push pushhash pushnew put-byte
-syn keyword txl_keyword contained put-char put-line put-lines put-string
-syn keyword txl_keyword contained put-strings pwd qquote quasi
-syn keyword txl_keyword contained quasilist quote rand random
-syn keyword txl_keyword contained random-fixnum random-state-p range range*
-syn keyword txl_keyword contained range-regex rcomb read readlink
-syn keyword txl_keyword contained real-time-stream-p reduce-left reduce-right ref
-syn keyword txl_keyword contained refset regex-compile regex-parse regexp
-syn keyword txl_keyword contained regsub rehome-sym remhash remove-if
-syn keyword txl_keyword contained remove-if* remove-path remq remq*
-syn keyword txl_keyword contained remql remql* remqual remqual*
-syn keyword txl_keyword contained rename-path repeat replace replace-list
-syn keyword txl_keyword contained replace-str replace-vec rest ret
-syn keyword txl_keyword contained retf return return-from reverse
-syn keyword txl_keyword contained rlcp rlet rotate rperm
-syn keyword txl_keyword contained rplaca rplacd run s-ifblk
-syn keyword txl_keyword contained s-ifchr s-ifdir s-ififo s-iflnk
-syn keyword txl_keyword contained s-ifmt s-ifreg s-ifsock s-irgrp
-syn keyword txl_keyword contained s-iroth s-irusr s-irwxg s-irwxo
-syn keyword txl_keyword contained s-irwxu s-isgid s-isuid s-isvtx
-syn keyword txl_keyword contained s-iwgrp s-iwoth s-iwusr s-ixgrp
-syn keyword txl_keyword contained s-ixoth s-ixusr search search-regex
-syn keyword txl_keyword contained search-regst search-str search-str-tree second
-syn keyword txl_keyword contained seek-stream select self-path seqp
-syn keyword txl_keyword contained set set-diff set-hash-userdata set-indent
-syn keyword txl_keyword contained set-indent-mode set-sig-handler setegid setenv
-syn keyword txl_keyword contained seteuid setgid sethash setitimer
-syn keyword txl_keyword contained setlogmask setq setuid seventh
-syn keyword txl_keyword contained sh shift sig-abrt sig-alrm
-syn keyword txl_keyword contained sig-bus sig-check sig-chld sig-cont
-syn keyword txl_keyword contained sig-fpe sig-hup sig-ill sig-int
-syn keyword txl_keyword contained sig-io sig-iot sig-kill sig-lost
-syn keyword txl_keyword contained sig-pipe sig-poll sig-prof sig-pwr
-syn keyword txl_keyword contained sig-quit sig-segv sig-stkflt sig-stop
-syn keyword txl_keyword contained sig-sys sig-term sig-trap sig-tstp
-syn keyword txl_keyword contained sig-ttin sig-ttou sig-urg sig-usr1
-syn keyword txl_keyword contained sig-usr2 sig-vtalrm sig-winch sig-xcpu
-syn keyword txl_keyword contained sig-xfsz sign-extend sin sixth
-syn keyword txl_keyword contained size-vec some sort sort-group
-syn keyword txl_keyword contained source-loc source-loc-str span-str special-operator-p
-syn keyword txl_keyword contained special-var-p splice split split-str
-syn keyword txl_keyword contained split-str-set sqrt sssucc ssucc
-syn keyword txl_keyword contained stat stdlib str< str<=
-syn keyword txl_keyword contained str= str> str>= stream-get-prop
-syn keyword txl_keyword contained stream-set-prop streamp string-extend string-lt
-syn keyword txl_keyword contained stringp sub sub-list sub-str
-syn keyword txl_keyword contained sub-vec succ swap symacrolet
-syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
-syn keyword txl_keyword contained symbolp symlink sys-lisp1-value sys-mark-special
-syn keyword txl_keyword contained sys-qquote sys-splice sys-unquote sys:*lisp1*
-syn keyword txl_keyword contained sys:eval-err sys:get-fb sys:get-vb sys:l1-setq
-syn keyword txl_keyword contained sys:l1-val sys:pl-expand sys:placelet-1 sys:sym-clobber-expander
-syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:trigger-load syslog
-syn keyword txl_keyword contained tan tb tc tenth
-syn keyword txl_keyword contained test-set-indent-mode tf third throw
-syn keyword txl_keyword contained throwf time time-fields-local time-fields-utc
-syn keyword txl_keyword contained time-string-local time-string-utc time-usec tofloat
-syn keyword txl_keyword contained toint tok-str tok-where tostring
-syn keyword txl_keyword contained tostringp tprint transpose tree-bind
-syn keyword txl_keyword contained tree-case tree-find trie-add trie-compress
-syn keyword txl_keyword contained trie-lookup-begin trie-lookup-feed-char trie-value-at trim-str
-syn keyword txl_keyword contained true trunc trunc-rem tuples
-syn keyword txl_keyword contained txr-case txr-case-impl txr-if txr-version
-syn keyword txl_keyword contained txr-when typeof unget-byte unget-char
-syn keyword txl_keyword contained uniq unique unless unquote
-syn keyword txl_keyword contained unsetenv until until* upcase-str
-syn keyword txl_keyword contained update url-decode url-encode user-package
-syn keyword txl_keyword contained usleep uw-protect var vec
-syn keyword txl_keyword contained vec-push vec-set-length vecref vector
-syn keyword txl_keyword contained vector-list vectorp w-continued w-coredump
-syn keyword txl_keyword contained w-exitstatus w-ifcontinued w-ifexited w-ifsignaled
-syn keyword txl_keyword contained w-ifstopped w-nohang w-stopsig w-termsig
-syn keyword txl_keyword contained w-untraced wait weave when
-syn keyword txl_keyword contained whenlet where while while*
-syn keyword txl_keyword contained whilet width width-check with-clobber-expander
-syn keyword txl_keyword contained with-delete-expander with-gensyms with-resources with-saved-vars
-syn keyword txl_keyword contained with-update-expander wrap wrap* zap
-syn keyword txl_keyword contained zerop zip
+syn keyword txl_keyword contained chr-toupper chrp clamp clear-error
+syn keyword txl_keyword contained close-stream closelog cmp-str collect-each
+syn keyword txl_keyword contained collect-each* comb compl-span-str cond
+syn keyword txl_keyword contained conda cons conses conses*
+syn keyword txl_keyword contained consp constantp copy copy-alist
+syn keyword txl_keyword contained copy-cons copy-hash copy-list copy-str
+syn keyword txl_keyword contained copy-vec cos count-if countq
+syn keyword txl_keyword contained countql countqual cum-norm-dist daemon
+syn keyword txl_keyword contained dec define-modify-macro define-place-macro defmacro
+syn keyword txl_keyword contained defparm defparml defplace defsymacro
+syn keyword txl_keyword contained defun defvar defvarl del
+syn keyword txl_keyword contained delay delete-package display-width do
+syn keyword txl_keyword contained dohash dotimes downcase-str dup
+syn keyword txl_keyword contained dupfd dwim each each*
+syn keyword txl_keyword contained eighth empty ensure-dir env
+syn keyword txl_keyword contained env-fbind env-hash env-vbind eq
+syn keyword txl_keyword contained eql equal errno error
+syn keyword txl_keyword contained eval evenp exec exit
+syn keyword txl_keyword contained exit* exp expr expt
+syn keyword txl_keyword contained exptmod false fbind fboundp
+syn keyword txl_keyword contained fifth fileno filter-equal filter-string-tree
+syn keyword txl_keyword contained finalize find find-if find-max
+syn keyword txl_keyword contained find-min find-package first fixnump
+syn keyword txl_keyword contained flatten flatten* flet flip
+syn keyword txl_keyword contained flipargs flo-dig flo-epsilon flo-int
+syn keyword txl_keyword contained flo-max flo-min flo-str floatp
+syn keyword txl_keyword contained floor flush-stream fmakunbound for
+syn keyword txl_keyword contained for* force fork format
+syn keyword txl_keyword contained fourth fstat fun func-get-env
+syn keyword txl_keyword contained func-get-form func-get-name func-set-env functionp
+syn keyword txl_keyword contained gcd gen generate gensym
+syn keyword txl_keyword contained gequal get-byte get-char get-clobber-expander
+syn keyword txl_keyword contained get-delete-expander get-error get-error-str get-hash-userdata
+syn keyword txl_keyword contained get-indent get-indent-mode get-line get-lines
+syn keyword txl_keyword contained get-list-from-stream get-sig-handler get-string get-string-from-stream
+syn keyword txl_keyword contained get-update-expander getegid getenv geteuid
+syn keyword txl_keyword contained getgid getgroups gethash getitimer
+syn keyword txl_keyword contained getpid getppid getuid giterate
+syn keyword txl_keyword contained glob glob-altdirfunc glob-brace glob-err
+syn keyword txl_keyword contained glob-mark glob-nocheck glob-noescape glob-nomagic
+syn keyword txl_keyword contained glob-nosort glob-onlydir glob-period glob-tilde
+syn keyword txl_keyword contained glob-tilde-check greater group-by gun
+syn keyword txl_keyword contained hash hash-alist hash-construct hash-count
+syn keyword txl_keyword contained hash-diff hash-eql hash-equal hash-from-pairs
+syn keyword txl_keyword contained hash-isec hash-keys hash-list hash-pairs
+syn keyword txl_keyword contained hash-proper-subset hash-revget hash-subset hash-uni
+syn keyword txl_keyword contained hash-update hash-update-1 hash-values hashp
+syn keyword txl_keyword contained have html-decode html-encode iapply
+syn keyword txl_keyword contained identity ido if ifa
+syn keyword txl_keyword contained iff iffi iflet ignerr
+syn keyword txl_keyword contained in inc inc-indent indent-code
+syn keyword txl_keyword contained indent-data indent-off inhash int-flo
+syn keyword txl_keyword contained int-str integerp intern interp-fun-p
+syn keyword txl_keyword contained interpose ip ipf isqrt
+syn keyword txl_keyword contained itimer-prov itimer-real itimer-virtual juxt
+syn keyword txl_keyword contained keep-if keep-if* keyword-package keywordp
+syn keyword txl_keyword contained kill labels lambda last
+syn keyword txl_keyword contained lazy-str lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list
+syn keyword txl_keyword contained lazy-stream-cons lazy-stringp lbind lcm
+syn keyword txl_keyword contained lcons lcons-fun lconsp ldiff
+syn keyword txl_keyword contained length length-list length-str length-str-<
+syn keyword txl_keyword contained length-str-<= length-str-> length-str->= length-vec
+syn keyword txl_keyword contained lequal less let let*
+syn keyword txl_keyword contained lexical-fun-p lexical-lisp1-binding lexical-var-p lib-version
+syn keyword txl_keyword contained link lisp-parse list list*
+syn keyword txl_keyword contained list-str list-vector listp load
+syn keyword txl_keyword contained log log-alert log-auth log-authpriv
+syn keyword txl_keyword contained log-cons log-crit log-daemon log-debug
+syn keyword txl_keyword contained log-emerg log-err log-info log-ndelay
+syn keyword txl_keyword contained log-notice log-nowait log-odelay log-perror
+syn keyword txl_keyword contained log-pid log-user log-warning log10
+syn keyword txl_keyword contained log2 logand logior lognot
+syn keyword txl_keyword contained logtest logtrunc logxor lstat
+syn keyword txl_keyword contained mac-param-bind macro-form-p macro-time macroexpand
+syn keyword txl_keyword contained macroexpand-1 macrolet major make-catenated-stream
+syn keyword txl_keyword contained make-env make-hash make-lazy-cons make-like
+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 make-trie makedev
+syn keyword txl_keyword contained makunbound mapcar mapcar* mapdo
+syn keyword txl_keyword contained mapf maphash mappend mappend*
+syn keyword txl_keyword contained mask match-fun match-regex match-regex-right
+syn keyword txl_keyword contained match-regst match-regst-right match-str match-str-tree
+syn keyword txl_keyword contained max member member-if memq
+syn keyword txl_keyword contained memql memqual merge min
+syn keyword txl_keyword contained minor minusp mkdir mknod
+syn keyword txl_keyword contained mkstring mlet mod multi
+syn keyword txl_keyword contained multi-sort n-choose-k n-perm-k nconc
+syn keyword txl_keyword contained nilf ninth none not
+syn keyword txl_keyword contained notf nreverse nthcdr null
+syn keyword txl_keyword contained nullify num-chr num-str numberp
+syn keyword txl_keyword contained oand oddp op open-command
+syn keyword txl_keyword contained open-directory open-file open-fileno open-files
+syn keyword txl_keyword contained open-files* open-pipe open-process open-tail
+syn keyword txl_keyword contained openlog opip or orf
+syn keyword txl_keyword contained packagep pad partition partition*
+syn keyword txl_keyword contained partition-by perm pipe place-form-p
+syn keyword txl_keyword contained placelet placelet* plusp poll
+syn keyword txl_keyword contained poll-err poll-in poll-nval poll-out
+syn keyword txl_keyword contained poll-pri poll-rdband poll-rdhup poll-wrband
+syn keyword txl_keyword contained pop pos pos-if pos-max
+syn keyword txl_keyword contained pos-min posq posql posqual
+syn keyword txl_keyword contained pppred ppred pprinl pprint
+syn keyword txl_keyword contained pprof pred prinl print
+syn keyword txl_keyword contained prof prog1 progn prop
+syn keyword txl_keyword contained proper-listp pset push pushhash
+syn keyword txl_keyword contained pushnew put-byte put-char put-line
+syn keyword txl_keyword contained put-lines put-string put-strings pwd
+syn keyword txl_keyword contained qquote quasi quasilist quote
+syn keyword txl_keyword contained rand random random-fixnum random-state-p
+syn keyword txl_keyword contained range range* range-regex rcomb
+syn keyword txl_keyword contained read readlink real-time-stream-p reduce-left
+syn keyword txl_keyword contained reduce-right ref refset regex-compile
+syn keyword txl_keyword contained regex-parse regexp regsub rehome-sym
+syn keyword txl_keyword contained remhash remove-if remove-if* remove-path
+syn keyword txl_keyword contained remq remq* remql remql*
+syn keyword txl_keyword contained remqual remqual* rename-path repeat
+syn keyword txl_keyword contained replace replace-list replace-str replace-vec
+syn keyword txl_keyword contained rest ret retf return
+syn keyword txl_keyword contained return-from reverse rlcp rlet
+syn keyword txl_keyword contained rotate rperm rplaca rplacd
+syn keyword txl_keyword contained run s-ifblk s-ifchr s-ifdir
+syn keyword txl_keyword contained s-ififo s-iflnk s-ifmt s-ifreg
+syn keyword txl_keyword contained s-ifsock s-irgrp s-iroth s-irusr
+syn keyword txl_keyword contained s-irwxg s-irwxo s-irwxu s-isgid
+syn keyword txl_keyword contained s-isuid s-isvtx s-iwgrp s-iwoth
+syn keyword txl_keyword contained s-iwusr s-ixgrp s-ixoth s-ixusr
+syn keyword txl_keyword contained search search-regex search-regst search-str
+syn keyword txl_keyword contained search-str-tree second seek-stream select
+syn keyword txl_keyword contained self-path seqp set set-diff
+syn keyword txl_keyword contained set-hash-userdata set-indent set-indent-mode set-sig-handler
+syn keyword txl_keyword contained setegid setenv seteuid setgid
+syn keyword txl_keyword contained sethash setitimer setlogmask setq
+syn keyword txl_keyword contained setuid seventh sh shift
+syn keyword txl_keyword contained sig-abrt sig-alrm sig-bus sig-check
+syn keyword txl_keyword contained sig-chld sig-cont sig-fpe sig-hup
+syn keyword txl_keyword contained sig-ill sig-int sig-io sig-iot
+syn keyword txl_keyword contained sig-kill sig-lost sig-pipe sig-poll
+syn keyword txl_keyword contained sig-prof sig-pwr sig-quit sig-segv
+syn keyword txl_keyword contained sig-stkflt sig-stop sig-sys sig-term
+syn keyword txl_keyword contained sig-trap sig-tstp sig-ttin sig-ttou
+syn keyword txl_keyword contained sig-urg sig-usr1 sig-usr2 sig-vtalrm
+syn keyword txl_keyword contained sig-winch sig-xcpu sig-xfsz sign-extend
+syn keyword txl_keyword contained sin sixth size-vec some
+syn keyword txl_keyword contained sort sort-group source-loc source-loc-str
+syn keyword txl_keyword contained span-str special-operator-p special-var-p splice
+syn keyword txl_keyword contained split split-str split-str-set sqrt
+syn keyword txl_keyword contained sssucc ssucc stat stdlib
+syn keyword txl_keyword contained str< str<= str= str>
+syn keyword txl_keyword contained str>= stream-get-prop stream-set-prop streamp
+syn keyword txl_keyword contained string-extend string-lt stringp sub
+syn keyword txl_keyword contained sub-list sub-str sub-vec succ
+syn keyword txl_keyword contained swap symacrolet symbol-function symbol-name
+syn keyword txl_keyword contained symbol-package symbol-value symbolp symlink
+syn keyword txl_keyword contained sys-lisp1-value sys-mark-special sys-qquote sys-splice
+syn keyword txl_keyword contained sys-unquote sys:*lisp1* sys:eval-err sys:get-fb
+syn keyword txl_keyword contained sys:get-vb sys:l1-setq sys:l1-val sys:pl-expand
+syn keyword txl_keyword contained sys:placelet-1 sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander
+syn keyword txl_keyword contained sys:trigger-load syslog tan tb
+syn keyword txl_keyword contained tc tenth test-set-indent-mode tf
+syn keyword txl_keyword contained third throw throwf time
+syn keyword txl_keyword contained time-fields-local time-fields-utc time-string-local time-string-utc
+syn keyword txl_keyword contained time-usec tofloat toint tok-str
+syn keyword txl_keyword contained tok-where tostring tostringp tprint
+syn keyword txl_keyword contained transpose tree-bind tree-case tree-find
+syn keyword txl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
+syn keyword txl_keyword contained trie-value-at trim-str true trunc
+syn keyword txl_keyword contained trunc-rem tuples txr-case txr-case-impl
+syn keyword txl_keyword contained txr-if txr-version txr-when typeof
+syn keyword txl_keyword contained unget-byte unget-char uniq unique
+syn keyword txl_keyword contained unless unquote unsetenv until
+syn keyword txl_keyword contained until* upcase-str update url-decode
+syn keyword txl_keyword contained url-encode user-package usleep uw-protect
+syn keyword txl_keyword contained var vec vec-push vec-set-length
+syn keyword txl_keyword contained vecref vector vector-list vectorp
+syn keyword txl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
+syn keyword txl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
+syn keyword txl_keyword contained w-stopsig w-termsig w-untraced wait
+syn keyword txl_keyword contained weave when whenlet where
+syn keyword txl_keyword contained while while* whilet width
+syn keyword txl_keyword contained width-check with-clobber-expander with-delete-expander with-gensyms
+syn keyword txl_keyword contained with-resources with-saved-vars with-update-expander wrap
+syn keyword txl_keyword contained wrap* zap zerop zip
syn match txr_nested_error "[^\t ]\+" contained
syn match txr_variable "\(@[ \t]*\)[*]\?[ \t]*[A-Za-z_][A-Za-z_0-9]*"
syn match txr_splicevar "@[ \t,*@]*[A-Za-z_][A-Za-z_0-9]*"
diff --git a/txr.1 b/txr.1
index 1e25f8e8..a6663b3b 100644
--- a/txr.1
+++ b/txr.1
@@ -344,9 +344,9 @@
.ds TX \f[B]TXR\f[]
.ds TL \f[B]TXR Lisp\f[]
.\" Start of man page:
-.TH TXR 1 2015-08-08 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2015-08-14 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
.SH* NAME
-\*(TX \- text processing language (version 111)
+\*(TX \- text processing language (version 112)
.SH* SYNOPSIS
.cblk
.meti txr >> [ options ] < query-file < data-files ..
diff --git a/txr.vim b/txr.vim
index deaa2866..4b05ae5b 100644
--- a/txr.vim
+++ b/txr.vim
@@ -63,189 +63,189 @@ syn keyword txl_keyword contained chr-isascii chr-isblank chr-iscntrl chr-isdigi
syn keyword txl_keyword contained chr-isgraph chr-islower chr-isprint chr-ispunct
syn keyword txl_keyword contained chr-isspace chr-isunisp chr-isupper chr-isxdigit
syn keyword txl_keyword contained chr-num chr-str chr-str-set chr-tolower
-syn keyword txl_keyword contained chr-toupper chrp clear-error close-stream
-syn keyword txl_keyword contained closelog cmp-str collect-each collect-each*
-syn keyword txl_keyword contained comb compl-span-str cond conda
-syn keyword txl_keyword contained cons conses conses* consp
-syn keyword txl_keyword contained constantp copy 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 cum-norm-dist daemon dec
-syn keyword txl_keyword contained define-modify-macro define-place-macro defmacro defparm
-syn keyword txl_keyword contained defparml defplace defsymacro defun
-syn keyword txl_keyword contained defvar defvarl del delay
-syn keyword txl_keyword contained delete-package do dohash dotimes
-syn keyword txl_keyword contained downcase-str dup dupfd dwim
-syn keyword txl_keyword contained each each* eighth empty
-syn keyword txl_keyword contained ensure-dir env env-fbind env-hash
-syn keyword txl_keyword contained env-vbind eq eql equal
-syn keyword txl_keyword contained errno error eval evenp
-syn keyword txl_keyword contained exec exit exit* exp
-syn keyword txl_keyword contained expr expt exptmod false
-syn keyword txl_keyword contained fbind fboundp fifth fileno
-syn keyword txl_keyword contained filter-equal filter-string-tree finalize find
-syn keyword txl_keyword contained find-if find-max find-min find-package
-syn keyword txl_keyword contained first fixnump flatten flatten*
-syn keyword txl_keyword contained flet flip flipargs flo-dig
-syn keyword txl_keyword contained flo-epsilon flo-int flo-max flo-min
-syn keyword txl_keyword contained flo-str floatp floor flush-stream
-syn keyword txl_keyword contained fmakunbound for for* force
-syn keyword txl_keyword contained fork format fourth fstat
-syn keyword txl_keyword contained fun func-get-env func-get-form func-get-name
-syn keyword txl_keyword contained func-set-env functionp gcd gen
-syn keyword txl_keyword contained generate gensym gequal get-byte
-syn keyword txl_keyword contained get-char get-clobber-expander get-delete-expander get-error
-syn keyword txl_keyword contained get-error-str get-hash-userdata get-indent get-indent-mode
-syn keyword txl_keyword contained get-line get-lines get-list-from-stream get-sig-handler
-syn keyword txl_keyword contained get-string get-string-from-stream get-update-expander getegid
-syn keyword txl_keyword contained getenv geteuid getgid getgroups
-syn keyword txl_keyword contained gethash getitimer getpid getppid
-syn keyword txl_keyword contained getuid giterate glob glob-altdirfunc
-syn keyword txl_keyword contained glob-brace glob-err glob-mark glob-nocheck
-syn keyword txl_keyword contained glob-noescape glob-nomagic glob-nosort glob-onlydir
-syn keyword txl_keyword contained glob-period glob-tilde glob-tilde-check greater
-syn keyword txl_keyword contained group-by gun hash hash-alist
-syn keyword txl_keyword contained hash-construct hash-count hash-diff hash-eql
-syn keyword txl_keyword contained hash-equal hash-from-pairs hash-isec hash-keys
-syn keyword txl_keyword contained hash-list hash-pairs hash-proper-subset hash-revget
-syn keyword txl_keyword contained hash-subset hash-uni hash-update hash-update-1
-syn keyword txl_keyword contained hash-values hashp have html-decode
-syn keyword txl_keyword contained html-encode iapply identity ido
-syn keyword txl_keyword contained if ifa iff iffi
-syn keyword txl_keyword contained iflet ignerr in inc
-syn keyword txl_keyword contained inc-indent indent-code indent-data indent-off
-syn keyword txl_keyword contained inhash int-flo int-str integerp
-syn keyword txl_keyword contained intern interp-fun-p interpose ip
-syn keyword txl_keyword contained ipf isqrt itimer-prov itimer-real
-syn keyword txl_keyword contained itimer-virtual juxt keep-if keep-if*
-syn keyword txl_keyword contained keyword-package keywordp kill labels
-syn keyword txl_keyword contained lambda last 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 lbind lcm lcons lcons-fun
-syn keyword txl_keyword contained lconsp 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 lequal less
-syn keyword txl_keyword contained let let* lexical-fun-p lexical-lisp1-binding
-syn keyword txl_keyword contained lexical-var-p lib-version link lisp-parse
-syn keyword txl_keyword contained list list* list-str list-vector
-syn keyword txl_keyword contained listp load 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 log10 log2 logand
-syn keyword txl_keyword contained logior lognot logtest logtrunc
-syn keyword txl_keyword contained logxor lstat mac-param-bind macro-form-p
-syn keyword txl_keyword contained macro-time macroexpand macroexpand-1 macrolet
-syn keyword txl_keyword contained major make-catenated-stream make-env make-hash
-syn keyword txl_keyword contained make-lazy-cons make-like make-package make-random-state
-syn keyword txl_keyword contained make-similar-hash make-string-byte-input-stream make-string-input-stream make-string-output-stream
-syn keyword txl_keyword contained make-strlist-output-stream make-sym make-time make-time-utc
-syn keyword txl_keyword contained make-trie makedev makunbound mapcar
-syn keyword txl_keyword contained mapcar* mapdo mapf maphash
-syn keyword txl_keyword contained mappend mappend* mask match-fun
-syn keyword txl_keyword contained match-regex match-regex-right match-regst match-regst-right
-syn keyword txl_keyword contained match-str match-str-tree max member
-syn keyword txl_keyword contained member-if memq memql memqual
-syn keyword txl_keyword contained merge min minor minusp
-syn keyword txl_keyword contained mkdir mknod mkstring mlet
-syn keyword txl_keyword contained mod multi multi-sort n-choose-k
-syn keyword txl_keyword contained n-perm-k nconc nilf ninth
-syn keyword txl_keyword contained none not notf nreverse
-syn keyword txl_keyword contained nthcdr null nullify num-chr
-syn keyword txl_keyword contained num-str numberp oand oddp
-syn keyword txl_keyword contained op open-command open-directory open-file
-syn keyword txl_keyword contained open-fileno open-files open-files* open-pipe
-syn keyword txl_keyword contained open-process open-tail openlog opip
-syn keyword txl_keyword contained or orf packagep pad
-syn keyword txl_keyword contained partition partition* partition-by perm
-syn keyword txl_keyword contained pipe place-form-p placelet placelet*
-syn keyword txl_keyword contained plusp poll poll-err poll-in
-syn keyword txl_keyword contained poll-nval poll-out poll-pri poll-rdband
-syn keyword txl_keyword contained poll-rdhup poll-wrband pop pos
-syn keyword txl_keyword contained pos-if pos-max pos-min posq
-syn keyword txl_keyword contained posql posqual pppred ppred
-syn keyword txl_keyword contained pprinl pprint pprof pred
-syn keyword txl_keyword contained prinl print prof prog1
-syn keyword txl_keyword contained progn prop proper-listp pset
-syn keyword txl_keyword contained push pushhash pushnew put-byte
-syn keyword txl_keyword contained put-char put-line put-lines put-string
-syn keyword txl_keyword contained put-strings pwd qquote quasi
-syn keyword txl_keyword contained quasilist quote rand random
-syn keyword txl_keyword contained random-fixnum random-state-p range range*
-syn keyword txl_keyword contained range-regex rcomb read readlink
-syn keyword txl_keyword contained real-time-stream-p reduce-left reduce-right ref
-syn keyword txl_keyword contained refset regex-compile regex-parse regexp
-syn keyword txl_keyword contained regsub rehome-sym remhash remove-if
-syn keyword txl_keyword contained remove-if* remove-path remq remq*
-syn keyword txl_keyword contained remql remql* remqual remqual*
-syn keyword txl_keyword contained rename-path repeat replace replace-list
-syn keyword txl_keyword contained replace-str replace-vec rest ret
-syn keyword txl_keyword contained retf return return-from reverse
-syn keyword txl_keyword contained rlcp rlet rotate rperm
-syn keyword txl_keyword contained rplaca rplacd run s-ifblk
-syn keyword txl_keyword contained s-ifchr s-ifdir s-ififo s-iflnk
-syn keyword txl_keyword contained s-ifmt s-ifreg s-ifsock s-irgrp
-syn keyword txl_keyword contained s-iroth s-irusr s-irwxg s-irwxo
-syn keyword txl_keyword contained s-irwxu s-isgid s-isuid s-isvtx
-syn keyword txl_keyword contained s-iwgrp s-iwoth s-iwusr s-ixgrp
-syn keyword txl_keyword contained s-ixoth s-ixusr search search-regex
-syn keyword txl_keyword contained search-regst search-str search-str-tree second
-syn keyword txl_keyword contained seek-stream select self-path seqp
-syn keyword txl_keyword contained set set-diff set-hash-userdata set-indent
-syn keyword txl_keyword contained set-indent-mode set-sig-handler setegid setenv
-syn keyword txl_keyword contained seteuid setgid sethash setitimer
-syn keyword txl_keyword contained setlogmask setq setuid seventh
-syn keyword txl_keyword contained sh shift sig-abrt sig-alrm
-syn keyword txl_keyword contained sig-bus sig-check sig-chld sig-cont
-syn keyword txl_keyword contained sig-fpe sig-hup sig-ill sig-int
-syn keyword txl_keyword contained sig-io sig-iot sig-kill sig-lost
-syn keyword txl_keyword contained sig-pipe sig-poll sig-prof sig-pwr
-syn keyword txl_keyword contained sig-quit sig-segv sig-stkflt sig-stop
-syn keyword txl_keyword contained sig-sys sig-term sig-trap sig-tstp
-syn keyword txl_keyword contained sig-ttin sig-ttou sig-urg sig-usr1
-syn keyword txl_keyword contained sig-usr2 sig-vtalrm sig-winch sig-xcpu
-syn keyword txl_keyword contained sig-xfsz sign-extend sin sixth
-syn keyword txl_keyword contained size-vec some sort sort-group
-syn keyword txl_keyword contained source-loc source-loc-str span-str special-operator-p
-syn keyword txl_keyword contained special-var-p splice split split-str
-syn keyword txl_keyword contained split-str-set sqrt sssucc ssucc
-syn keyword txl_keyword contained stat stdlib str< str<=
-syn keyword txl_keyword contained str= str> str>= stream-get-prop
-syn keyword txl_keyword contained stream-set-prop streamp string-extend string-lt
-syn keyword txl_keyword contained stringp sub sub-list sub-str
-syn keyword txl_keyword contained sub-vec succ swap symacrolet
-syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
-syn keyword txl_keyword contained symbolp symlink sys-lisp1-value sys-mark-special
-syn keyword txl_keyword contained sys-qquote sys-splice sys-unquote sys:*lisp1*
-syn keyword txl_keyword contained sys:eval-err sys:get-fb sys:get-vb sys:l1-setq
-syn keyword txl_keyword contained sys:l1-val sys:pl-expand sys:placelet-1 sys:sym-clobber-expander
-syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:trigger-load syslog
-syn keyword txl_keyword contained tan tb tc tenth
-syn keyword txl_keyword contained test-set-indent-mode tf third throw
-syn keyword txl_keyword contained throwf time time-fields-local time-fields-utc
-syn keyword txl_keyword contained time-string-local time-string-utc time-usec tofloat
-syn keyword txl_keyword contained toint tok-str tok-where tostring
-syn keyword txl_keyword contained tostringp tprint transpose tree-bind
-syn keyword txl_keyword contained tree-case tree-find trie-add trie-compress
-syn keyword txl_keyword contained trie-lookup-begin trie-lookup-feed-char trie-value-at trim-str
-syn keyword txl_keyword contained true trunc trunc-rem tuples
-syn keyword txl_keyword contained txr-case txr-case-impl txr-if txr-version
-syn keyword txl_keyword contained txr-when typeof unget-byte unget-char
-syn keyword txl_keyword contained uniq unique unless unquote
-syn keyword txl_keyword contained unsetenv until until* upcase-str
-syn keyword txl_keyword contained update url-decode url-encode user-package
-syn keyword txl_keyword contained usleep uw-protect var vec
-syn keyword txl_keyword contained vec-push vec-set-length vecref vector
-syn keyword txl_keyword contained vector-list vectorp w-continued w-coredump
-syn keyword txl_keyword contained w-exitstatus w-ifcontinued w-ifexited w-ifsignaled
-syn keyword txl_keyword contained w-ifstopped w-nohang w-stopsig w-termsig
-syn keyword txl_keyword contained w-untraced wait weave when
-syn keyword txl_keyword contained whenlet where while while*
-syn keyword txl_keyword contained whilet width width-check with-clobber-expander
-syn keyword txl_keyword contained with-delete-expander with-gensyms with-resources with-saved-vars
-syn keyword txl_keyword contained with-update-expander wrap wrap* zap
-syn keyword txl_keyword contained zerop zip
+syn keyword txl_keyword contained chr-toupper chrp clamp clear-error
+syn keyword txl_keyword contained close-stream closelog cmp-str collect-each
+syn keyword txl_keyword contained collect-each* comb compl-span-str cond
+syn keyword txl_keyword contained conda cons conses conses*
+syn keyword txl_keyword contained consp constantp copy copy-alist
+syn keyword txl_keyword contained copy-cons copy-hash copy-list copy-str
+syn keyword txl_keyword contained copy-vec cos count-if countq
+syn keyword txl_keyword contained countql countqual cum-norm-dist daemon
+syn keyword txl_keyword contained dec define-modify-macro define-place-macro defmacro
+syn keyword txl_keyword contained defparm defparml defplace defsymacro
+syn keyword txl_keyword contained defun defvar defvarl del
+syn keyword txl_keyword contained delay delete-package display-width do
+syn keyword txl_keyword contained dohash dotimes downcase-str dup
+syn keyword txl_keyword contained dupfd dwim each each*
+syn keyword txl_keyword contained eighth empty ensure-dir env
+syn keyword txl_keyword contained env-fbind env-hash env-vbind eq
+syn keyword txl_keyword contained eql equal errno error
+syn keyword txl_keyword contained eval evenp exec exit
+syn keyword txl_keyword contained exit* exp expr expt
+syn keyword txl_keyword contained exptmod false fbind fboundp
+syn keyword txl_keyword contained fifth fileno filter-equal filter-string-tree
+syn keyword txl_keyword contained finalize find find-if find-max
+syn keyword txl_keyword contained find-min find-package first fixnump
+syn keyword txl_keyword contained flatten flatten* flet flip
+syn keyword txl_keyword contained flipargs flo-dig flo-epsilon flo-int
+syn keyword txl_keyword contained flo-max flo-min flo-str floatp
+syn keyword txl_keyword contained floor flush-stream fmakunbound for
+syn keyword txl_keyword contained for* force fork format
+syn keyword txl_keyword contained fourth fstat fun func-get-env
+syn keyword txl_keyword contained func-get-form func-get-name func-set-env functionp
+syn keyword txl_keyword contained gcd gen generate gensym
+syn keyword txl_keyword contained gequal get-byte get-char get-clobber-expander
+syn keyword txl_keyword contained get-delete-expander get-error get-error-str get-hash-userdata
+syn keyword txl_keyword contained get-indent get-indent-mode get-line get-lines
+syn keyword txl_keyword contained get-list-from-stream get-sig-handler get-string get-string-from-stream
+syn keyword txl_keyword contained get-update-expander getegid getenv geteuid
+syn keyword txl_keyword contained getgid getgroups gethash getitimer
+syn keyword txl_keyword contained getpid getppid getuid giterate
+syn keyword txl_keyword contained glob glob-altdirfunc glob-brace glob-err
+syn keyword txl_keyword contained glob-mark glob-nocheck glob-noescape glob-nomagic
+syn keyword txl_keyword contained glob-nosort glob-onlydir glob-period glob-tilde
+syn keyword txl_keyword contained glob-tilde-check greater group-by gun
+syn keyword txl_keyword contained hash hash-alist hash-construct hash-count
+syn keyword txl_keyword contained hash-diff hash-eql hash-equal hash-from-pairs
+syn keyword txl_keyword contained hash-isec hash-keys hash-list hash-pairs
+syn keyword txl_keyword contained hash-proper-subset hash-revget hash-subset hash-uni
+syn keyword txl_keyword contained hash-update hash-update-1 hash-values hashp
+syn keyword txl_keyword contained have html-decode html-encode iapply
+syn keyword txl_keyword contained identity ido if ifa
+syn keyword txl_keyword contained iff iffi iflet ignerr
+syn keyword txl_keyword contained in inc inc-indent indent-code
+syn keyword txl_keyword contained indent-data indent-off inhash int-flo
+syn keyword txl_keyword contained int-str integerp intern interp-fun-p
+syn keyword txl_keyword contained interpose ip ipf isqrt
+syn keyword txl_keyword contained itimer-prov itimer-real itimer-virtual juxt
+syn keyword txl_keyword contained keep-if keep-if* keyword-package keywordp
+syn keyword txl_keyword contained kill labels lambda last
+syn keyword txl_keyword contained lazy-str lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list
+syn keyword txl_keyword contained lazy-stream-cons lazy-stringp lbind lcm
+syn keyword txl_keyword contained lcons lcons-fun lconsp ldiff
+syn keyword txl_keyword contained length length-list length-str length-str-<
+syn keyword txl_keyword contained length-str-<= length-str-> length-str->= length-vec
+syn keyword txl_keyword contained lequal less let let*
+syn keyword txl_keyword contained lexical-fun-p lexical-lisp1-binding lexical-var-p lib-version
+syn keyword txl_keyword contained link lisp-parse list list*
+syn keyword txl_keyword contained list-str list-vector listp load
+syn keyword txl_keyword contained log log-alert log-auth log-authpriv
+syn keyword txl_keyword contained log-cons log-crit log-daemon log-debug
+syn keyword txl_keyword contained log-emerg log-err log-info log-ndelay
+syn keyword txl_keyword contained log-notice log-nowait log-odelay log-perror
+syn keyword txl_keyword contained log-pid log-user log-warning log10
+syn keyword txl_keyword contained log2 logand logior lognot
+syn keyword txl_keyword contained logtest logtrunc logxor lstat
+syn keyword txl_keyword contained mac-param-bind macro-form-p macro-time macroexpand
+syn keyword txl_keyword contained macroexpand-1 macrolet major make-catenated-stream
+syn keyword txl_keyword contained make-env make-hash make-lazy-cons make-like
+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 make-trie makedev
+syn keyword txl_keyword contained makunbound mapcar mapcar* mapdo
+syn keyword txl_keyword contained mapf maphash mappend mappend*
+syn keyword txl_keyword contained mask match-fun match-regex match-regex-right
+syn keyword txl_keyword contained match-regst match-regst-right match-str match-str-tree
+syn keyword txl_keyword contained max member member-if memq
+syn keyword txl_keyword contained memql memqual merge min
+syn keyword txl_keyword contained minor minusp mkdir mknod
+syn keyword txl_keyword contained mkstring mlet mod multi
+syn keyword txl_keyword contained multi-sort n-choose-k n-perm-k nconc
+syn keyword txl_keyword contained nilf ninth none not
+syn keyword txl_keyword contained notf nreverse nthcdr null
+syn keyword txl_keyword contained nullify num-chr num-str numberp
+syn keyword txl_keyword contained oand oddp op open-command
+syn keyword txl_keyword contained open-directory open-file open-fileno open-files
+syn keyword txl_keyword contained open-files* open-pipe open-process open-tail
+syn keyword txl_keyword contained openlog opip or orf
+syn keyword txl_keyword contained packagep pad partition partition*
+syn keyword txl_keyword contained partition-by perm pipe place-form-p
+syn keyword txl_keyword contained placelet placelet* plusp poll
+syn keyword txl_keyword contained poll-err poll-in poll-nval poll-out
+syn keyword txl_keyword contained poll-pri poll-rdband poll-rdhup poll-wrband
+syn keyword txl_keyword contained pop pos pos-if pos-max
+syn keyword txl_keyword contained pos-min posq posql posqual
+syn keyword txl_keyword contained pppred ppred pprinl pprint
+syn keyword txl_keyword contained pprof pred prinl print
+syn keyword txl_keyword contained prof prog1 progn prop
+syn keyword txl_keyword contained proper-listp pset push pushhash
+syn keyword txl_keyword contained pushnew put-byte put-char put-line
+syn keyword txl_keyword contained put-lines put-string put-strings pwd
+syn keyword txl_keyword contained qquote quasi quasilist quote
+syn keyword txl_keyword contained rand random random-fixnum random-state-p
+syn keyword txl_keyword contained range range* range-regex rcomb
+syn keyword txl_keyword contained read readlink real-time-stream-p reduce-left
+syn keyword txl_keyword contained reduce-right ref refset regex-compile
+syn keyword txl_keyword contained regex-parse regexp regsub rehome-sym
+syn keyword txl_keyword contained remhash remove-if remove-if* remove-path
+syn keyword txl_keyword contained remq remq* remql remql*
+syn keyword txl_keyword contained remqual remqual* rename-path repeat
+syn keyword txl_keyword contained replace replace-list replace-str replace-vec
+syn keyword txl_keyword contained rest ret retf return
+syn keyword txl_keyword contained return-from reverse rlcp rlet
+syn keyword txl_keyword contained rotate rperm rplaca rplacd
+syn keyword txl_keyword contained run s-ifblk s-ifchr s-ifdir
+syn keyword txl_keyword contained s-ififo s-iflnk s-ifmt s-ifreg
+syn keyword txl_keyword contained s-ifsock s-irgrp s-iroth s-irusr
+syn keyword txl_keyword contained s-irwxg s-irwxo s-irwxu s-isgid
+syn keyword txl_keyword contained s-isuid s-isvtx s-iwgrp s-iwoth
+syn keyword txl_keyword contained s-iwusr s-ixgrp s-ixoth s-ixusr
+syn keyword txl_keyword contained search search-regex search-regst search-str
+syn keyword txl_keyword contained search-str-tree second seek-stream select
+syn keyword txl_keyword contained self-path seqp set set-diff
+syn keyword txl_keyword contained set-hash-userdata set-indent set-indent-mode set-sig-handler
+syn keyword txl_keyword contained setegid setenv seteuid setgid
+syn keyword txl_keyword contained sethash setitimer setlogmask setq
+syn keyword txl_keyword contained setuid seventh sh shift
+syn keyword txl_keyword contained sig-abrt sig-alrm sig-bus sig-check
+syn keyword txl_keyword contained sig-chld sig-cont sig-fpe sig-hup
+syn keyword txl_keyword contained sig-ill sig-int sig-io sig-iot
+syn keyword txl_keyword contained sig-kill sig-lost sig-pipe sig-poll
+syn keyword txl_keyword contained sig-prof sig-pwr sig-quit sig-segv
+syn keyword txl_keyword contained sig-stkflt sig-stop sig-sys sig-term
+syn keyword txl_keyword contained sig-trap sig-tstp sig-ttin sig-ttou
+syn keyword txl_keyword contained sig-urg sig-usr1 sig-usr2 sig-vtalrm
+syn keyword txl_keyword contained sig-winch sig-xcpu sig-xfsz sign-extend
+syn keyword txl_keyword contained sin sixth size-vec some
+syn keyword txl_keyword contained sort sort-group source-loc source-loc-str
+syn keyword txl_keyword contained span-str special-operator-p special-var-p splice
+syn keyword txl_keyword contained split split-str split-str-set sqrt
+syn keyword txl_keyword contained sssucc ssucc stat stdlib
+syn keyword txl_keyword contained str< str<= str= str>
+syn keyword txl_keyword contained str>= stream-get-prop stream-set-prop streamp
+syn keyword txl_keyword contained string-extend string-lt stringp sub
+syn keyword txl_keyword contained sub-list sub-str sub-vec succ
+syn keyword txl_keyword contained swap symacrolet symbol-function symbol-name
+syn keyword txl_keyword contained symbol-package symbol-value symbolp symlink
+syn keyword txl_keyword contained sys-lisp1-value sys-mark-special sys-qquote sys-splice
+syn keyword txl_keyword contained sys-unquote sys:*lisp1* sys:eval-err sys:get-fb
+syn keyword txl_keyword contained sys:get-vb sys:l1-setq sys:l1-val sys:pl-expand
+syn keyword txl_keyword contained sys:placelet-1 sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander
+syn keyword txl_keyword contained sys:trigger-load syslog tan tb
+syn keyword txl_keyword contained tc tenth test-set-indent-mode tf
+syn keyword txl_keyword contained third throw throwf time
+syn keyword txl_keyword contained time-fields-local time-fields-utc time-string-local time-string-utc
+syn keyword txl_keyword contained time-usec tofloat toint tok-str
+syn keyword txl_keyword contained tok-where tostring tostringp tprint
+syn keyword txl_keyword contained transpose tree-bind tree-case tree-find
+syn keyword txl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
+syn keyword txl_keyword contained trie-value-at trim-str true trunc
+syn keyword txl_keyword contained trunc-rem tuples txr-case txr-case-impl
+syn keyword txl_keyword contained txr-if txr-version txr-when typeof
+syn keyword txl_keyword contained unget-byte unget-char uniq unique
+syn keyword txl_keyword contained unless unquote unsetenv until
+syn keyword txl_keyword contained until* upcase-str update url-decode
+syn keyword txl_keyword contained url-encode user-package usleep uw-protect
+syn keyword txl_keyword contained var vec vec-push vec-set-length
+syn keyword txl_keyword contained vecref vector vector-list vectorp
+syn keyword txl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
+syn keyword txl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
+syn keyword txl_keyword contained w-stopsig w-termsig w-untraced wait
+syn keyword txl_keyword contained weave when whenlet where
+syn keyword txl_keyword contained while while* whilet width
+syn keyword txl_keyword contained width-check with-clobber-expander with-delete-expander with-gensyms
+syn keyword txl_keyword contained with-resources with-saved-vars with-update-expander wrap
+syn keyword txl_keyword contained wrap* zap zerop zip
syn keyword txr_keyword contained accept all and assert
syn keyword txr_keyword contained bind block cases cat