From b7e873a4f2ae7e3df99816b1454c98f155202777 Mon Sep 17 00:00:00 2001
From: the-reverend <ronaldpwilson@gmail.com>
Date: Thu, 16 Mar 2023 19:40:46 -0500
Subject: [PATCH 1/2] Import Version 1.7

---
 LICENSE                              |   2 +-
 Makefile                             |  62 +++---
 alib/Makefile                        |   7 +-
 alib/alib.cbp                        | 215 ++++++++++-----------
 alib/inc/a_exec.h                    |   2 +-
 alib/inc/a_linenv.h                  |   1 +
 alib/inc/a_win.h                     |  11 +-
 alib/inc/a_winenv.h                  |   1 +
 alib/readme.txt                      |  23 +--
 alib/src/a_dir.cpp                   |  13 +-
 alib/src/a_env.cpp                   |  61 ------
 alib/src/a_exec.cpp                  |   4 +-
 alib/src/a_expr.cpp                  |  14 ++
 alib/src/a_linenv.cpp                |  66 +++++++
 alib/src/a_regex.cpp                 |  32 +++-
 alib/src/a_str.cpp                   |   6 +
 alib/src/a_winenv.cpp                |  76 ++++++++
 alib/src/a_winerr.cpp                |   6 -
 csvfix/Makefile                      |   4 +
 csvfix/csvfix.cbp                    |   9 +
 csvfix/inc/csved_command.h           |   4 +-
 csvfix/inc/csved_erase.h             |  57 ++++++
 csvfix/inc/csved_filesplit.h         |   5 +-
 csvfix/inc/csved_pivot.h             |  88 +++++++++
 csvfix/inc/csved_rsort.h             |  50 +++++
 csvfix/inc/csved_split.h             |  27 +++
 csvfix/inc/csved_squash.h            |  63 ++++++
 csvfix/inc/csved_stat.h              |  76 +++++++-
 csvfix/inc/csved_strings.h           |  23 +++
 csvfix/inc/csved_trim.h              |   2 +-
 csvfix/inc/csved_version.h           |   2 +-
 csvfix/installer/make_install.iss    |   2 +-
 csvfix/src/csved_atable.cpp          |   2 +-
 csvfix/src/csved_call.cpp            |   4 +-
 csvfix/src/csved_command.cpp         |  14 +-
 csvfix/src/csved_date.cpp            |   4 +-
 csvfix/src/csved_dsv.cpp             |   2 +-
 csvfix/src/csved_echo.cpp            |   2 +-
 csvfix/src/csved_edit.cpp            |   4 +-
 csvfix/src/csved_erase.cpp           | 149 +++++++++++++++
 csvfix/src/csved_escape.cpp          |   4 +-
 csvfix/src/csved_eval.cpp            |   4 +-
 csvfix/src/csved_exclude.cpp         |   4 +-
 csvfix/src/csved_exec.cpp            |  23 ++-
 csvfix/src/csved_fileinfo.cpp        |   4 +-
 csvfix/src/csved_filesplit.cpp       |  15 +-
 csvfix/src/csved_find.cpp            |   2 -
 csvfix/src/csved_fixed.cpp           |   2 +-
 csvfix/src/csved_flatten.cpp         |   4 +-
 csvfix/src/csved_headtail.cpp        |   4 +-
 csvfix/src/csved_map.cpp             |   4 +-
 csvfix/src/csved_merge.cpp           |   4 +-
 csvfix/src/csved_money.cpp           |   4 +-
 csvfix/src/csved_number.cpp          |   7 +-
 csvfix/src/csved_order.cpp           |   4 +-
 csvfix/src/csved_pivot.cpp           | 223 ++++++++++++++++++++++
 csvfix/src/csved_printf.cpp          |  45 ++++-
 csvfix/src/csved_rmnewline.cpp       |   4 +-
 csvfix/src/csved_rsort.cpp           | 219 +++++++++++++++++++++
 csvfix/src/csved_seq.cpp             |   4 +-
 csvfix/src/csved_sparse.cpp          |   2 +-
 csvfix/src/csved_split.cpp           | 204 +++++++++++++++++---
 csvfix/src/csved_sql.cpp             |   6 +-
 csvfix/src/csved_squash.cpp          | 275 +++++++++++++++++++++++++++
 csvfix/src/csved_stat.cpp            | 131 ++++++++++++-
 csvfix/src/csved_template.cpp        |  54 ++++--
 csvfix/src/csved_timestamp.cpp       |   2 +-
 csvfix/src/csved_toxml.cpp           |   2 +-
 csvfix/src/csved_trim.cpp            |  62 +++++-
 csvfix/src/csved_truncpad.cpp        |   4 +-
 csvfix/src/csved_util.cpp            |   2 +-
 csvfix/src/csved_valid.cpp           |   2 +-
 csvfix/src/csved_writemulti.cpp      |   4 +-
 csvfix/tests/correct/check.test      |   2 +
 csvfix/tests/correct/erase.test      |   8 +
 csvfix/tests/correct/exec.test       |   9 +
 csvfix/tests/correct/pivot.test      |   9 +
 csvfix/tests/correct/printf.test     |  14 ++
 csvfix/tests/correct/rowsort.test    |   9 +
 csvfix/tests/correct/splitlen.test   |   3 +
 csvfix/tests/correct/splitregex.test |   3 +
 csvfix/tests/correct/squash.test     |  18 ++
 csvfix/tests/correct/stat.test       |  15 +-
 csvfix/tests/correct/trim.test       |   4 +
 csvfix/tests/correct/wmulti.test     |  20 ++
 csvfix/tests/data/8bit.csv           |   3 +
 csvfix/tests/data/erase.csv          |   4 +
 csvfix/tests/data/fsplit.csv         |   4 +
 csvfix/tests/data/pivot.csv          |  12 ++
 csvfix/tests/data/rsort.csv          |   3 +
 csvfix/tests/data/sales_region.csv   |   6 +
 csvfix/tests/data/splitlen.csv       |   3 +
 csvfix/tests/data/squash1.csv        |   6 +
 csvfix/tests/data/squash2.csv        |   7 +
 csvfix/tests/data/squash3.csv        |   7 +
 csvfix/tests/data/squash4.csv        |   7 +
 csvfix/tests/data/trim2.csv          |   2 +
 csvfix/tests/data/wmulti.csv         |   5 +
 csvfix/tests/tests/check.test        |   3 +-
 csvfix/tests/tests/erase.test        |   2 +
 csvfix/tests/tests/exec.test         |   2 +
 csvfix/tests/tests/pivot.test        |   3 +
 csvfix/tests/tests/printf.test       |   2 +-
 csvfix/tests/tests/rowsort.test      |   4 +
 csvfix/tests/tests/splitlen.test     |   1 +
 csvfix/tests/tests/splitregex.test   |   1 +
 csvfix/tests/tests/squash.test       |   4 +
 csvfix/tests/tests/stat.test         |   2 +
 csvfix/tests/tests/trim.test         |   2 +
 csvfix/tests/tests/wmulti.test       |   4 +
 docs/src/csvfix-manual.hnd           | Bin 987136 -> 1097728 bytes
 111 files changed, 2356 insertions(+), 386 deletions(-)
 mode change 100644 => 100755 LICENSE
 mode change 100644 => 100755 Makefile
 mode change 100644 => 100755 alib/Makefile
 mode change 100644 => 100755 alib/alib.cbp
 mode change 100644 => 100755 alib/inc/a_exec.h
 create mode 100755 alib/inc/a_linenv.h
 mode change 100644 => 100755 alib/inc/a_win.h
 create mode 100755 alib/inc/a_winenv.h
 mode change 100644 => 100755 alib/readme.txt
 mode change 100644 => 100755 alib/src/a_dir.cpp
 mode change 100644 => 100755 alib/src/a_env.cpp
 mode change 100644 => 100755 alib/src/a_exec.cpp
 mode change 100644 => 100755 alib/src/a_expr.cpp
 create mode 100755 alib/src/a_linenv.cpp
 mode change 100644 => 100755 alib/src/a_regex.cpp
 mode change 100644 => 100755 alib/src/a_str.cpp
 create mode 100755 alib/src/a_winenv.cpp
 mode change 100644 => 100755 alib/src/a_winerr.cpp
 mode change 100644 => 100755 csvfix/Makefile
 mode change 100644 => 100755 csvfix/csvfix.cbp
 mode change 100644 => 100755 csvfix/inc/csved_command.h
 create mode 100755 csvfix/inc/csved_erase.h
 mode change 100644 => 100755 csvfix/inc/csved_filesplit.h
 create mode 100755 csvfix/inc/csved_pivot.h
 create mode 100755 csvfix/inc/csved_rsort.h
 mode change 100644 => 100755 csvfix/inc/csved_split.h
 create mode 100755 csvfix/inc/csved_squash.h
 mode change 100644 => 100755 csvfix/inc/csved_stat.h
 mode change 100644 => 100755 csvfix/inc/csved_strings.h
 mode change 100644 => 100755 csvfix/inc/csved_trim.h
 mode change 100644 => 100755 csvfix/inc/csved_version.h
 mode change 100644 => 100755 csvfix/installer/make_install.iss
 mode change 100644 => 100755 csvfix/src/csved_atable.cpp
 mode change 100644 => 100755 csvfix/src/csved_call.cpp
 mode change 100644 => 100755 csvfix/src/csved_command.cpp
 mode change 100644 => 100755 csvfix/src/csved_date.cpp
 mode change 100644 => 100755 csvfix/src/csved_dsv.cpp
 mode change 100644 => 100755 csvfix/src/csved_echo.cpp
 mode change 100644 => 100755 csvfix/src/csved_edit.cpp
 create mode 100755 csvfix/src/csved_erase.cpp
 mode change 100644 => 100755 csvfix/src/csved_escape.cpp
 mode change 100644 => 100755 csvfix/src/csved_eval.cpp
 mode change 100644 => 100755 csvfix/src/csved_exclude.cpp
 mode change 100644 => 100755 csvfix/src/csved_exec.cpp
 mode change 100644 => 100755 csvfix/src/csved_fileinfo.cpp
 mode change 100644 => 100755 csvfix/src/csved_filesplit.cpp
 mode change 100644 => 100755 csvfix/src/csved_find.cpp
 mode change 100644 => 100755 csvfix/src/csved_fixed.cpp
 mode change 100644 => 100755 csvfix/src/csved_flatten.cpp
 mode change 100644 => 100755 csvfix/src/csved_headtail.cpp
 mode change 100644 => 100755 csvfix/src/csved_map.cpp
 mode change 100644 => 100755 csvfix/src/csved_merge.cpp
 mode change 100644 => 100755 csvfix/src/csved_money.cpp
 mode change 100644 => 100755 csvfix/src/csved_number.cpp
 mode change 100644 => 100755 csvfix/src/csved_order.cpp
 create mode 100755 csvfix/src/csved_pivot.cpp
 mode change 100644 => 100755 csvfix/src/csved_printf.cpp
 mode change 100644 => 100755 csvfix/src/csved_rmnewline.cpp
 create mode 100755 csvfix/src/csved_rsort.cpp
 mode change 100644 => 100755 csvfix/src/csved_seq.cpp
 mode change 100644 => 100755 csvfix/src/csved_sparse.cpp
 mode change 100644 => 100755 csvfix/src/csved_split.cpp
 mode change 100644 => 100755 csvfix/src/csved_sql.cpp
 create mode 100755 csvfix/src/csved_squash.cpp
 mode change 100644 => 100755 csvfix/src/csved_stat.cpp
 mode change 100644 => 100755 csvfix/src/csved_template.cpp
 mode change 100644 => 100755 csvfix/src/csved_timestamp.cpp
 mode change 100644 => 100755 csvfix/src/csved_toxml.cpp
 mode change 100644 => 100755 csvfix/src/csved_trim.cpp
 mode change 100644 => 100755 csvfix/src/csved_truncpad.cpp
 mode change 100644 => 100755 csvfix/src/csved_util.cpp
 mode change 100644 => 100755 csvfix/src/csved_valid.cpp
 mode change 100644 => 100755 csvfix/src/csved_writemulti.cpp
 mode change 100644 => 100755 csvfix/tests/correct/check.test
 create mode 100755 csvfix/tests/correct/erase.test
 mode change 100644 => 100755 csvfix/tests/correct/exec.test
 create mode 100755 csvfix/tests/correct/pivot.test
 mode change 100644 => 100755 csvfix/tests/correct/printf.test
 create mode 100755 csvfix/tests/correct/rowsort.test
 create mode 100755 csvfix/tests/correct/splitlen.test
 create mode 100755 csvfix/tests/correct/splitregex.test
 create mode 100755 csvfix/tests/correct/squash.test
 mode change 100644 => 100755 csvfix/tests/correct/stat.test
 mode change 100644 => 100755 csvfix/tests/correct/trim.test
 create mode 100755 csvfix/tests/correct/wmulti.test
 create mode 100755 csvfix/tests/data/8bit.csv
 create mode 100755 csvfix/tests/data/erase.csv
 create mode 100755 csvfix/tests/data/fsplit.csv
 create mode 100755 csvfix/tests/data/pivot.csv
 create mode 100755 csvfix/tests/data/rsort.csv
 create mode 100755 csvfix/tests/data/sales_region.csv
 create mode 100755 csvfix/tests/data/splitlen.csv
 create mode 100755 csvfix/tests/data/squash1.csv
 create mode 100755 csvfix/tests/data/squash2.csv
 create mode 100755 csvfix/tests/data/squash3.csv
 create mode 100755 csvfix/tests/data/squash4.csv
 create mode 100755 csvfix/tests/data/trim2.csv
 create mode 100755 csvfix/tests/data/wmulti.csv
 mode change 100644 => 100755 csvfix/tests/tests/check.test
 create mode 100755 csvfix/tests/tests/erase.test
 mode change 100644 => 100755 csvfix/tests/tests/exec.test
 create mode 100755 csvfix/tests/tests/pivot.test
 mode change 100644 => 100755 csvfix/tests/tests/printf.test
 create mode 100755 csvfix/tests/tests/rowsort.test
 create mode 100755 csvfix/tests/tests/splitlen.test
 create mode 100755 csvfix/tests/tests/splitregex.test
 create mode 100755 csvfix/tests/tests/squash.test
 mode change 100644 => 100755 csvfix/tests/tests/stat.test
 mode change 100644 => 100755 csvfix/tests/tests/trim.test
 create mode 100755 csvfix/tests/tests/wmulti.test

diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
index 749d458..1aecfde
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011 Neil Butterworth
+Copyright (c) 2014 Neil Butterworth
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
index 7253495..1bfc232
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,30 @@
-ifndef COMSPEC
-	CLEAN =	(cd alib; $(MAKE) clean) && (cd csvfix; $(MAKE) clean)
-else
-	CLEAN = cmd.exe /c "clean.cmd"
-endif
-
-default:
-	@echo "use 'make win', 'make lin' or 'make mac'"
-
-win:
-	cmd.exe /c "mkdirs.cmd"
-	cd alib && $(MAKE) win
-	cd csvfix && $(MAKE) win
-	cd csvfix/bin; gzip csvfix.exe -c > csvfix.win64.gz
-
-lin:
-	mkdir -p alib/obj alib/lib csvfix/obj csvfix/bin
-	cd alib; $(MAKE) lin
-	cd csvfix; $(MAKE) lin
-	cd csvfix/bin; gzip csvfix -c > csvfix.linux-amd64.gz
-
-# build for mac on Mountain Lion
-# see http://groups.google.com/group/csvfix/browse_thread/thread/33ec3e5f157c16dd
-mac:
-	mkdir -p alib/obj alib/lib csvfix/obj csvfix/bin
-	cd alib; $(MAKE) lin CCTYPE=clang
-	cd csvfix; $(MAKE) lin CCTYPE=clang
-	cd csvfix/bin; gzip csvfix -c > csvfix.osx.gz
-
-
-clean:
-	$(CLEAN)
+ifndef COMSPEC
+	CLEAN =	(cd alib; $(MAKE) clean) && (cd csvfix; $(MAKE) clean) 
+else
+	CLEAN = cmd.exe /c "clean.cmd"
+endif
+
+SHELL := bash
+
+default:
+	@echo "use 'make win', 'make lin' or 'make mac'"
+
+win:
+	cmd.exe /c "mkdirs.cmd"
+	cd alib && $(MAKE) win
+	cd csvfix && $(MAKE) win
+
+lin:
+	mkdir -p alib/obj alib/lib csvfix/obj csvfix/bin
+	cd alib; $(MAKE) lin
+	cd csvfix; $(MAKE) lin
+
+# build for mac on Mountain Lion
+# see http://groups.google.com/group/csvfix/browse_thread/thread/33ec3e5f157c16dd
+mac:
+	mkdir -p alib/obj alib/lib csvfix/obj csvfix/bin
+	cd alib; $(MAKE) lin CCTYPE=clang 
+	cd csvfix; $(MAKE) lin CCTYPE=clang 
+
+clean:
+	$(CLEAN)
diff --git a/alib/Makefile b/alib/Makefile
old mode 100644
new mode 100755
index 8188bf1..bba409e
--- a/alib/Makefile
+++ b/alib/Makefile
@@ -23,9 +23,12 @@ _OBJS = a_chsrc.o a_csv.o a_enc.o a_env.o a_except.o \
 
 OBJS = $(patsubst %,$(ODIR)/%,$(_OBJS))
 
-_WINOBJS = a_db.o a_dir.o a_opsys.o a_winerr.o
+_WINOBJS = a_db.o a_dir.o a_opsys.o a_winerr.o a_winenv.o
 WINOBJS = $(patsubst %,$(ODIR)/%,$(_WINOBJS))
 
+_LINOBJS = a_linenv.o
+LINOBJS = $(patsubst %,$(ODIR)/%,$(_LINOBJS))
+
 _EXPAT = xmlparse.o  xmlrole.o  xmltok.o  xmltok_impl.o  xmltok_ns.o
 EXPAT = $(patsubst %,$(ODIR)/%,$(_EXPAT))
 
@@ -38,7 +41,7 @@ $(ODIR)/%.o: $(XDIR)/%.cpp
 win: $(OBJS) $(EXPAT) $(WINOBJS)
 	ar rvs $(OUT) $^
 
-lin: $(OBJS) $(EXPAT) 
+lin: $(OBJS) $(EXPAT)  $(LINOBJS)
 	ar rvs $(OUT) $^
 
 .PHONY: clean
diff --git a/alib/alib.cbp b/alib/alib.cbp
old mode 100644
new mode 100755
index 862b279..4280d63
--- a/alib/alib.cbp
+++ b/alib/alib.cbp
@@ -7,13 +7,12 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin\Debug\test.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\alib" />
-				<Option object_output="obj\Debug\" />
+				<Option output="bin/Debug/test.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="../alib" />
+				<Option object_output="obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
-					<Add option="-Wall" />
 					<Add option="-g" />
 					<Add option="-DALIB_TEST" />
 				</Compiler>
@@ -22,9 +21,9 @@
 				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="libalib" prefix_auto="1" extension_auto="1" />
+				<Option output="alib" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="obj\Release\" />
+				<Option object_output="obj/Release/" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -45,107 +44,109 @@
 			<Add directory="inc" />
 			<Add directory="expat" />
 		</Compiler>
-		<Unit filename="expat\ascii.h" />
-		<Unit filename="expat\asciitab.h" />
-		<Unit filename="expat\expat.h" />
-		<Unit filename="expat\expat_external.h" />
-		<Unit filename="expat\iasciitab.h" />
-		<Unit filename="expat\internal.h" />
-		<Unit filename="expat\latin1tab.h" />
-		<Unit filename="expat\macconfig.h" />
-		<Unit filename="expat\nametab.h" />
-		<Unit filename="expat\utf8tab.h" />
-		<Unit filename="expat\winconfig.h" />
-		<Unit filename="expat\xmlparse.cpp" />
-		<Unit filename="expat\xmlrole.cpp" />
-		<Unit filename="expat\xmlrole.h" />
-		<Unit filename="expat\xmltok.cpp" />
-		<Unit filename="expat\xmltok.h" />
-		<Unit filename="expat\xmltok_impl.cpp" />
-		<Unit filename="expat\xmltok_impl.h" />
-		<Unit filename="expat\xmltok_ns.cpp" />
-		<Unit filename="inc\a_assert.h" />
-		<Unit filename="inc\a_base.h" />
-		<Unit filename="inc\a_chsrc.h" />
-		<Unit filename="inc\a_collect.h" />
-		<Unit filename="inc\a_csv.h" />
-		<Unit filename="inc\a_date.h" />
-		<Unit filename="inc\a_db.h" />
-		<Unit filename="inc\a_debug.h" />
-		<Unit filename="inc\a_dict.h" />
-		<Unit filename="inc\a_dir.h" />
-		<Unit filename="inc\a_enc.h" />
-		<Unit filename="inc\a_env.h" />
-		<Unit filename="inc\a_except.h" />
-		<Unit filename="inc\a_exec.h" />
-		<Unit filename="inc\a_expr.h" />
-		<Unit filename="inc\a_file.h" />
-		<Unit filename="inc\a_html.h" />
-		<Unit filename="inc\a_inifile.h" />
-		<Unit filename="inc\a_io.h" />
-		<Unit filename="inc\a_log.h" />
-		<Unit filename="inc\a_math.h" />
-		<Unit filename="inc\a_matrix.h" />
-		<Unit filename="inc\a_myth.h" />
-		<Unit filename="inc\a_nameval.h" />
-		<Unit filename="inc\a_nullstream.h" />
-		<Unit filename="inc\a_opsys.h" />
-		<Unit filename="inc\a_rand.h" />
-		<Unit filename="inc\a_range.h" />
-		<Unit filename="inc\a_regex.h" />
-		<Unit filename="inc\a_shstr.h" />
-		<Unit filename="inc\a_slice.h" />
-		<Unit filename="inc\a_sort.h" />
-		<Unit filename="inc\a_str.h" />
-		<Unit filename="inc\a_strscan.h" />
-		<Unit filename="inc\a_table.h" />
-		<Unit filename="inc\a_time.h" />
-		<Unit filename="inc\a_util.h" />
-		<Unit filename="inc\a_valptr.h" />
-		<Unit filename="inc\a_win.h" />
-		<Unit filename="inc\a_winerr.h" />
-		<Unit filename="inc\a_xmlevents.h" />
-		<Unit filename="inc\a_xmlparser.h" />
-		<Unit filename="inc\a_xmltree.h" />
-		<Unit filename="src\a_chsrc.cpp" />
-		<Unit filename="src\a_collect.cpp" />
-		<Unit filename="src\a_csv.cpp" />
-		<Unit filename="src\a_date.cpp" />
-		<Unit filename="src\a_db.cpp" />
-		<Unit filename="src\a_debug.cpp" />
-		<Unit filename="src\a_dir.cpp" />
-		<Unit filename="src\a_enc.cpp" />
-		<Unit filename="src\a_env.cpp" />
-		<Unit filename="src\a_except.cpp" />
-		<Unit filename="src\a_exec.cpp" />
-		<Unit filename="src\a_expr.cpp" />
-		<Unit filename="src\a_file.cpp" />
-		<Unit filename="src\a_html.cpp" />
-		<Unit filename="src\a_inifile.cpp" />
-		<Unit filename="src\a_io.cpp" />
-		<Unit filename="src\a_log.cpp" />
-		<Unit filename="src\a_math.cpp" />
-		<Unit filename="src\a_matrix.cpp" />
-		<Unit filename="src\a_myth.cpp" />
-		<Unit filename="src\a_nameval.cpp" />
-		<Unit filename="src\a_nullstream.cpp" />
-		<Unit filename="src\a_opsys.cpp" />
-		<Unit filename="src\a_rand.cpp" />
-		<Unit filename="src\a_range.cpp" />
-		<Unit filename="src\a_regex.cpp" />
-		<Unit filename="src\a_shstr.cpp" />
-		<Unit filename="src\a_slice.cpp" />
-		<Unit filename="src\a_sort.cpp" />
-		<Unit filename="src\a_str.cpp" />
-		<Unit filename="src\a_strscan.cpp" />
-		<Unit filename="src\a_table.cpp" />
-		<Unit filename="src\a_time.cpp" />
-		<Unit filename="src\a_util.cpp" />
-		<Unit filename="src\a_winerr.cpp" />
-		<Unit filename="src\a_xmlevents.cpp" />
-		<Unit filename="src\a_xmlparser.cpp" />
-		<Unit filename="src\a_xmltree.cpp" />
-		<Unit filename="src\test_main.cpp" />
+		<Unit filename="expat/ascii.h" />
+		<Unit filename="expat/asciitab.h" />
+		<Unit filename="expat/expat.h" />
+		<Unit filename="expat/expat_external.h" />
+		<Unit filename="expat/iasciitab.h" />
+		<Unit filename="expat/internal.h" />
+		<Unit filename="expat/latin1tab.h" />
+		<Unit filename="expat/macconfig.h" />
+		<Unit filename="expat/nametab.h" />
+		<Unit filename="expat/utf8tab.h" />
+		<Unit filename="expat/winconfig.h" />
+		<Unit filename="expat/xmlparse.cpp" />
+		<Unit filename="expat/xmlrole.cpp" />
+		<Unit filename="expat/xmlrole.h" />
+		<Unit filename="expat/xmltok.cpp" />
+		<Unit filename="expat/xmltok.h" />
+		<Unit filename="expat/xmltok_impl.cpp" />
+		<Unit filename="expat/xmltok_impl.h" />
+		<Unit filename="expat/xmltok_ns.cpp" />
+		<Unit filename="inc/a_assert.h" />
+		<Unit filename="inc/a_base.h" />
+		<Unit filename="inc/a_chsrc.h" />
+		<Unit filename="inc/a_collect.h" />
+		<Unit filename="inc/a_csv.h" />
+		<Unit filename="inc/a_date.h" />
+		<Unit filename="inc/a_db.h" />
+		<Unit filename="inc/a_debug.h" />
+		<Unit filename="inc/a_dict.h" />
+		<Unit filename="inc/a_dir.h" />
+		<Unit filename="inc/a_enc.h" />
+		<Unit filename="inc/a_env.h" />
+		<Unit filename="inc/a_except.h" />
+		<Unit filename="inc/a_exec.h" />
+		<Unit filename="inc/a_expr.h" />
+		<Unit filename="inc/a_file.h" />
+		<Unit filename="inc/a_html.h" />
+		<Unit filename="inc/a_inifile.h" />
+		<Unit filename="inc/a_io.h" />
+		<Unit filename="inc/a_log.h" />
+		<Unit filename="inc/a_math.h" />
+		<Unit filename="inc/a_matrix.h" />
+		<Unit filename="inc/a_myth.h" />
+		<Unit filename="inc/a_nameval.h" />
+		<Unit filename="inc/a_nullstream.h" />
+		<Unit filename="inc/a_opsys.h" />
+		<Unit filename="inc/a_rand.h" />
+		<Unit filename="inc/a_range.h" />
+		<Unit filename="inc/a_regex.h" />
+		<Unit filename="inc/a_shstr.h" />
+		<Unit filename="inc/a_slice.h" />
+		<Unit filename="inc/a_sort.h" />
+		<Unit filename="inc/a_str.h" />
+		<Unit filename="inc/a_strscan.h" />
+		<Unit filename="inc/a_table.h" />
+		<Unit filename="inc/a_time.h" />
+		<Unit filename="inc/a_util.h" />
+		<Unit filename="inc/a_valptr.h" />
+		<Unit filename="inc/a_win.h" />
+		<Unit filename="inc/a_winenv.h" />
+		<Unit filename="inc/a_winerr.h" />
+		<Unit filename="inc/a_xmlevents.h" />
+		<Unit filename="inc/a_xmlparser.h" />
+		<Unit filename="inc/a_xmltree.h" />
+		<Unit filename="src/a_chsrc.cpp" />
+		<Unit filename="src/a_collect.cpp" />
+		<Unit filename="src/a_csv.cpp" />
+		<Unit filename="src/a_date.cpp" />
+		<Unit filename="src/a_db.cpp" />
+		<Unit filename="src/a_debug.cpp" />
+		<Unit filename="src/a_dir.cpp" />
+		<Unit filename="src/a_enc.cpp" />
+		<Unit filename="src/a_env.cpp" />
+		<Unit filename="src/a_except.cpp" />
+		<Unit filename="src/a_exec.cpp" />
+		<Unit filename="src/a_expr.cpp" />
+		<Unit filename="src/a_file.cpp" />
+		<Unit filename="src/a_html.cpp" />
+		<Unit filename="src/a_inifile.cpp" />
+		<Unit filename="src/a_io.cpp" />
+		<Unit filename="src/a_log.cpp" />
+		<Unit filename="src/a_math.cpp" />
+		<Unit filename="src/a_matrix.cpp" />
+		<Unit filename="src/a_myth.cpp" />
+		<Unit filename="src/a_nameval.cpp" />
+		<Unit filename="src/a_nullstream.cpp" />
+		<Unit filename="src/a_opsys.cpp" />
+		<Unit filename="src/a_rand.cpp" />
+		<Unit filename="src/a_range.cpp" />
+		<Unit filename="src/a_regex.cpp" />
+		<Unit filename="src/a_shstr.cpp" />
+		<Unit filename="src/a_slice.cpp" />
+		<Unit filename="src/a_sort.cpp" />
+		<Unit filename="src/a_str.cpp" />
+		<Unit filename="src/a_strscan.cpp" />
+		<Unit filename="src/a_table.cpp" />
+		<Unit filename="src/a_time.cpp" />
+		<Unit filename="src/a_util.cpp" />
+		<Unit filename="src/a_winenv.cpp" />
+		<Unit filename="src/a_winerr.cpp" />
+		<Unit filename="src/a_xmlevents.cpp" />
+		<Unit filename="src/a_xmlparser.cpp" />
+		<Unit filename="src/a_xmltree.cpp" />
+		<Unit filename="src/test_main.cpp" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/alib/inc/a_exec.h b/alib/inc/a_exec.h
old mode 100644
new mode 100755
index eadc404..c60325c
--- a/alib/inc/a_exec.h
+++ b/alib/inc/a_exec.h
@@ -24,7 +24,7 @@ class Executor {
 		Executor( const std::string & cmd = "" );
 		~Executor();
 
-		std::istream & Exec( const std::string & cmd = "" );
+		std::istream & Exec( const std::string & cmd = "", int ignorexit = 0 );
 
 	private:
 
diff --git a/alib/inc/a_linenv.h b/alib/inc/a_linenv.h
new file mode 100755
index 0000000..56a6f17
--- /dev/null
+++ b/alib/inc/a_linenv.h
@@ -0,0 +1 @@
+// empty a_winenv.h to keep make happy
diff --git a/alib/inc/a_win.h b/alib/inc/a_win.h
old mode 100644
new mode 100755
index 6e0bf20..2b3c2b7
--- a/alib/inc/a_win.h
+++ b/alib/inc/a_win.h
@@ -1,8 +1,7 @@
 //----------------------------------------------------------------------------
 // a_win.h
 //
-// Include Windows headers and define ALIB_WIN if we are on windows.
-// Any Windows specific code should include this.
+// Removed conditional compilation stuff as this is managed by the linker.
 //
 // Copyright (C) 2010 Neil Butterworth
 //----------------------------------------------------------------------------
@@ -10,12 +9,6 @@
 #ifndef INC_ALIB_WIN_H
 #define INC_ALIB_WIN_H
 
-#ifdef WINNT
-	#undef ALIB_WINAPI
-	#define ALIB_WINAPI
-	#include <windows.h>
-#else
-	#undef ALIB_WINAPI
-#endif
+#include <windows.h>
 
 #endif
diff --git a/alib/inc/a_winenv.h b/alib/inc/a_winenv.h
new file mode 100755
index 0000000..56a6f17
--- /dev/null
+++ b/alib/inc/a_winenv.h
@@ -0,0 +1 @@
+// empty a_winenv.h to keep make happy
diff --git a/alib/readme.txt b/alib/readme.txt
old mode 100644
new mode 100755
index 13867f6..acb9ab0
--- a/alib/readme.txt
+++ b/alib/readme.txt
@@ -1,21 +1,2 @@
-This is the utility library supporting the CSVfix program. Note that not
-all functionality is used by CSVfix, and it could usefully be pruned.
-
-The library is written by Neil Butterworth.
-
------
-
-
-Unfortunately there is only an [archived repo](https://code.google.com/archive/p/csvfix)
-on Google Code, that does not compile on Linux or OSX. That repository points to a
-successiv [repo on Bitbucket](http://neilb.bitbucket.org/csvfix) - but that one os
-dead. Neil seems not to be on Github.
-
-However, there is a newer tarball [version 1.6](https://sourceforge.net/projects/csvfix/)
-on Sourceforge by [Pedro Albanese](https://sourceforge.net/u/pedroalbanese/profile/).
-
-Unfortunately [Homebrew](https://brew.sh) does not find that. So the idea for this
-repository here is to provide a current source release and to link
-Homebrew to it.
-
-Michael Wolber
+This is the utility library supporting the CSVfix program. Note that not
+all functionality is used by CSVfix, and it could usefully be pruned.
diff --git a/alib/src/a_dir.cpp b/alib/src/a_dir.cpp
old mode 100644
new mode 100755
index d8f2907..9e33778
--- a/alib/src/a_dir.cpp
+++ b/alib/src/a_dir.cpp
@@ -2,6 +2,7 @@
 // a_dir.cpp
 //
 // portable directory listing
+// actually windows only for now
 //
 // Copyright (C) 2009 Neil Butterworth
 //----------------------------------------------------------------------------
@@ -24,10 +25,6 @@ DirListEntry :: DirListEntry() {
 DirListEntry :: ~DirListEntry() {
 }
 
-//----------------------------------------------------------------------------
-
-#ifdef ALIB_WINAPI
-
 //----------------------------------------------------------------------------
 // Windows implementation of DirList entry
 //----------------------------------------------------------------------------
@@ -190,14 +187,6 @@ const DirListEntry * DirList :: At( unsigned int i ) const {
 }
 
 
-//----------------------------------------------------------------------------
-// We only do Win32 at present
-//----------------------------------------------------------------------------
-
-#else
-#error "Windows only at present"
-#endif
-
 //----------------------------------------------------------------------------
 
 } // namespace
diff --git a/alib/src/a_env.cpp b/alib/src/a_env.cpp
old mode 100644
new mode 100755
index 046faf7..cc74fc9
--- a/alib/src/a_env.cpp
+++ b/alib/src/a_env.cpp
@@ -16,10 +16,6 @@
 #include <map>
 #include <cstdlib>
 
-// need win api if doing our own globbing on windows
-#include "a_win.h"
-#include "a_dir.h"
-
 using std::string;
 using std::vector;
 
@@ -307,63 +303,6 @@ void CommandLine :: CheckNoMoreFlags( unsigned int start ) {
 	}
 }
 
-//---------------------------------------------------------------------------
-// Construct list of files on command line. File names come after
-// any flags, so we work backwards until we get a flag.
-// On Windows, we need to do our own filename globbing, as we need
-// not to glob parameters for regex flags.
-//---------------------------------------------------------------------------
-
-unsigned int CommandLine :: BuildFileList( unsigned int start ) {
-
-	mFiles.clear();
-
-	// work backwards to find last flag
-	unsigned int pos = Argc() - 1, lastflag = 0;
-	while( pos >= start ) {
-		string arg = Argv( pos );
-		if ( arg.size() && arg != "-" && (arg.at(0) == '-' && ! isdigit( Peek( arg, 1 )))) {
-			lastflag = pos;
-			break;
-		}
-		pos--;
-	}
-
-	unsigned int filestart = 0;
-	if ( lastflag ) {
-		// if there was a flag then start is one past flag
-		// plus any paramaeter count
-		const CommandLineFlag * f = mFlagDict.GetPtr( Argv( lastflag ) );
-		AASSERT( f != 0 );	// we already validated flags
-		filestart = lastflag + 1 + f->ParamCount();
-	}
-	else {
-		// otherwise its right at the start
-		filestart = start;
-	}
-
-	// save all file names
-	for ( int i = filestart; i < Argc(); i++ ) {
-#ifdef ALIB_WINAPI			// do our own globbing for windows
-    DirList dir( Argv( i ) );
-	if ( dir.Count() == 0 ) {
-		mFiles.push_back( Argv( i ) );
-	}
-	else {
-		for( unsigned int i = 0; i < dir.Count(); i++ ) {
-			mFiles.push_back( dir.At(i)->Name() );
-		}
-	}
-#else
-    // on linux/unix we have already globbed
-	mFiles.push_back( Argv( i ) );
-#endif
-	}
-
-	return mFiles.size();
-}
-
-
 //---------------------------------------------------------------------------
 // How many files?
 //---------------------------------------------------------------------------
diff --git a/alib/src/a_exec.cpp b/alib/src/a_exec.cpp
old mode 100644
new mode 100755
index 34e158c..43963a0
--- a/alib/src/a_exec.cpp
+++ b/alib/src/a_exec.cpp
@@ -41,7 +41,7 @@ void Executor :: ClosePipe() {
 // Execute this or stored command, returning stream containing stout
 //----------------------------------------------------------------------------
 
-std::istream &  Executor:: Exec( const string & cmd  ) {
+std::istream &  Executor:: Exec( const string & cmd, int ignorexit  ) {
 
 	if ( cmd != "" ) {
 		mCmd = cmd;
@@ -69,7 +69,7 @@ std::istream &  Executor:: Exec( const string & cmd  ) {
 		mPipe = 0;
 	}
 
-	if ( rv ) {
+	if ( rv && rv > ignorexit ) {
 		mStream->setstate( std::ios::failbit );
 	}
 
diff --git a/alib/src/a_expr.cpp b/alib/src/a_expr.cpp
old mode 100644
new mode 100755
index 5eb21be..bcd7c74
--- a/alib/src/a_expr.cpp
+++ b/alib/src/a_expr.cpp
@@ -453,6 +453,19 @@ static string FuncRound( const deque <string> & params, Expression * e ) {
 	return os.str();
 }
 
+// if first parameter evaluates to true, exit immediately with return code
+// of second parameter, and write third parameter to stderr
+static string FuncErrorIf( const deque <string> & params, Expression * e ) {
+    if ( Expression::ToBool( params[0] ) ) {
+        int n = ToInteger( params[1] );
+        std::cerr << params[2] << std::endl;
+        std::exit( n );
+    }
+    else {
+        return "";   
+    }
+}
+
 //----------------------------------------------------------------------------
 // Add all the functions to the function dictionary
 //----------------------------------------------------------------------------
@@ -460,6 +473,7 @@ static string FuncRound( const deque <string> & params, Expression * e ) {
 ADD_FUNC( "abs", 		FuncAbs, 		1 );
 ADD_FUNC( "bool", 		FuncBool, 		1 );
 ADD_FUNC( "day", 		FuncDay, 		1 );
+ADD_FUNC( "errorif",	FuncErrorIf,   	3 );
 ADD_FUNC( "env", 		FuncGetenv, 	1 );
 ADD_FUNC( "field", 		FuncField, 		1 );
 ADD_FUNC( "find", 		FuncFind, 		1 );
diff --git a/alib/src/a_linenv.cpp b/alib/src/a_linenv.cpp
new file mode 100755
index 0000000..71d5d71
--- /dev/null
+++ b/alib/src/a_linenv.cpp
@@ -0,0 +1,66 @@
+//----------------------------------------------------------------------------
+// a_linenv.cpp
+//
+// split out from a_env.cpp as it contains linux-specific stuff
+//
+// Copyright (C) 2014 Neil Butterworth
+//----------------------------------------------------------------------------
+
+#include <stdlib.h>
+#include "a_base.h"
+#include "a_assert.h"
+#include "a_dict.h"
+#include "a_except.h"
+#include "a_str.h"
+#include "a_env.h"
+#include <map>
+#include <cstdlib>
+
+using std::string;
+
+namespace ALib {
+
+//---------------------------------------------------------------------------
+// Construct list of files on command line. File names come after
+// any flags, so we work backwards until we get a flag.
+// On Windows, we need to do our own filename globbing, as we need
+// not to glob parameters for regex flags.
+//---------------------------------------------------------------------------
+
+unsigned int CommandLine :: BuildFileList( unsigned int start ) {
+
+	mFiles.clear();
+
+	// work backwards to find last flag
+	unsigned int pos = Argc() - 1, lastflag = 0;
+	while( pos >= start ) {
+		string arg = Argv( pos );
+		if ( arg.size() && arg != "-" && (arg.at(0) == '-' && ! isdigit( Peek( arg, 1 )))) {
+			lastflag = pos;
+			break;
+		}
+		pos--;
+	}
+
+	unsigned int filestart = 0;
+	if ( lastflag ) {
+		// if there was a flag then start is one past flag
+		// plus any paramaeter count
+		const CommandLineFlag * f = mFlagDict.GetPtr( Argv( lastflag ) );
+		AASSERT( f != 0 );	// we already validated flags
+		filestart = lastflag + 1 + f->ParamCount();
+	}
+	else {
+		// otherwise its right at the start
+		filestart = start;
+	}
+
+	// save all file names
+	for ( int i = filestart; i < Argc(); i++ ) {
+    // on linux/unix we have already globbed
+        mFiles.push_back( Argv( i ) );
+	}
+	return mFiles.size();
+}
+
+} // namespace
diff --git a/alib/src/a_regex.cpp b/alib/src/a_regex.cpp
old mode 100644
new mode 100755
index 0524d6d..06e0b1f
--- a/alib/src/a_regex.cpp
+++ b/alib/src/a_regex.cpp
@@ -22,6 +22,8 @@
 
 using std::string;
 using std::vector;
+using std::cout;
+using std::endl;
 
 //------------------------------------------------------------------------
 // Begin ALib stuff
@@ -111,6 +113,8 @@ bool RegEx::Pos :: Found() const {
 //---------------------------------------------------------------------------
 // Bitmap used to represent char ranges, one bit for each character in a
 // range. Only chars with ASCII codes 0 to 127 are supported.
+//
+// Note: Now extended experimentally to codes 0 to 255.
 //---------------------------------------------------------------------------
 
 class RegEx::CharBitMap {
@@ -162,7 +166,7 @@ class RegEx::CharBitMap {
 
 	private:
 
-		enum { MAXSIZE = 128 };
+		enum { MAXSIZE = 256 };
 		std::bitset <MAXSIZE> mBits;
 };
 
@@ -343,7 +347,7 @@ void RegEx::Encoding ::AddToSavedPat( unsigned char c,
 
 //----------------------------------------------------------------------------
 // Clear the saved patter referenced by the tag of encoding entre ei down to
-// length specified by len.
+// length specified by len. Clear all saved patterns after the one specified.
 //----------------------------------------------------------------------------
 
 void RegEx::Encoding :: ClearSavedPat( unsigned int  ei,
@@ -351,6 +355,9 @@ void RegEx::Encoding :: ClearSavedPat( unsigned int  ei,
 	unsigned int i = mEntries.at(ei).Tag();
 	if ( i ) {
 		mSaved.at(i - 1).resize( len );
+        for ( int j = i; j < mSaved.size(); j++ ) {
+            mSaved.at(j).clear();
+        }
 	}
 }
 
@@ -1004,6 +1011,26 @@ DEFTEST( RepSaved ) {
 }
 
 
+DEFTEST( RepMulti1 )  {     // note no closure
+    string s = "ABC1234xyz";
+    RegEx re1( "\\(...\\)\\(....\\)\\(...\\)" );
+	RegEx::Pos p = re1.FindIn( s );
+	FAILNE( p.Found(), true );
+	re1.ReplaceIn( s, "(\\1)(\\2)(\\3)" );
+	FAILNE( s, "(ABC)(1234)(xyz)" );
+}
+
+
+DEFTEST( RepMulti2 )  {     // note closure
+    string s = "ABC1234xyz";
+    RegEx re1( "\\(...\\)\\(.*\\)\\(...\\)" );
+	RegEx::Pos p = re1.FindIn( s );
+	FAILNE( p.Found(), true );
+	re1.ReplaceIn( s, "(\\1)(\\2)(\\3)" );
+	FAILNE( s, "(ABC)(1234)(xyz)" );
+}
+
+
 DEFTEST( RepAll ) {
 
 	string s = "1x234x5y6";
@@ -1039,6 +1066,7 @@ DEFTEST( EmptyStr ) {
 	FAILNE( p.Found(), false );
 }
 
+
 #endif
 
 //----------------------------------------------------------------------------
diff --git a/alib/src/a_str.cpp b/alib/src/a_str.cpp
old mode 100644
new mode 100755
index f937f1c..aa8f6c5
--- a/alib/src/a_str.cpp
+++ b/alib/src/a_str.cpp
@@ -492,6 +492,9 @@ string Squeeze( const string & s, const string & out ) {
 //------------------------------------------------------------------------
 
 bool IsNumber( const std::string & s ) {
+    if ( IsEmpty( s ) ) {
+        return false;
+    }
 	char * p;
 	double d = strtod( s.c_str(), & p );
 	if ( fabs( d ) == HUGE_VAL ) {			// too big?
@@ -507,6 +510,9 @@ bool IsNumber( const std::string & s ) {
 //------------------------------------------------------------------------
 
 bool IsInteger( const std::string & s ) {
+    if ( IsEmpty( s ) ) {
+        return false;
+    }
 	char * p;
 	long n = strtol( s.c_str(), & p, 10 );		// base 10 conversion
 	if ( n == LONG_MAX || n == LONG_MIN ) {		// too big?
diff --git a/alib/src/a_winenv.cpp b/alib/src/a_winenv.cpp
new file mode 100755
index 0000000..5c7b96e
--- /dev/null
+++ b/alib/src/a_winenv.cpp
@@ -0,0 +1,76 @@
+//----------------------------------------------------------------------------
+// a_winenv.cpp
+//
+// split out from a_env.cpp as it contains windows-specificstuff
+//
+// Copyright (C) 2014 Neil Butterworth
+//----------------------------------------------------------------------------
+
+#include <stdlib.h>
+#include "a_base.h"
+#include "a_assert.h"
+#include "a_dict.h"
+#include "a_except.h"
+#include "a_str.h"
+#include "a_env.h"
+#include <map>
+#include <cstdlib>
+
+#include "a_dir.h"
+#include "a_win.h"
+
+using std::string;
+
+namespace ALib {
+
+//---------------------------------------------------------------------------
+// Construct list of files on command line. File names come after
+// any flags, so we work backwards until we get a flag.
+// On Windows, we need to do our own filename globbing, as we need
+// not to glob parameters for regex flags.
+//---------------------------------------------------------------------------
+
+unsigned int CommandLine :: BuildFileList( unsigned int start ) {
+
+	mFiles.clear();
+
+	// work backwards to find last flag
+	unsigned int pos = Argc() - 1, lastflag = 0;
+	while( pos >= start ) {
+		string arg = Argv( pos );
+		if ( arg.size() && arg != "-" && (arg.at(0) == '-' && ! isdigit( Peek( arg, 1 )))) {
+			lastflag = pos;
+			break;
+		}
+		pos--;
+	}
+
+	unsigned int filestart = 0;
+	if ( lastflag ) {
+		// if there was a flag then start is one past flag
+		// plus any paramaeter count
+		const CommandLineFlag * f = mFlagDict.GetPtr( Argv( lastflag ) );
+		AASSERT( f != 0 );	// we already validated flags
+		filestart = lastflag + 1 + f->ParamCount();
+	}
+	else {
+		// otherwise its right at the start
+		filestart = start;
+	}
+
+	// save all file names
+	for ( int i = filestart; i < Argc(); i++ ) {
+        DirList dir( Argv( i ) );
+        if ( dir.Count() == 0 ) {
+            mFiles.push_back( Argv( i ) );
+        }
+        else {
+            for( unsigned int i = 0; i < dir.Count(); i++ ) {
+                mFiles.push_back( dir.At(i)->Name() );
+            }
+        }
+    }
+	return mFiles.size();
+}
+
+} // namespace
diff --git a/alib/src/a_winerr.cpp b/alib/src/a_winerr.cpp
old mode 100644
new mode 100755
index 51af33b..bb331dc
--- a/alib/src/a_winerr.cpp
+++ b/alib/src/a_winerr.cpp
@@ -12,8 +12,6 @@
 
 namespace ALib {
 
-#ifdef ALIB_WINAPI
-
 std::string WinErrorToStr( DWORD ec ) {
 
 	char * lpMsgBuf;
@@ -65,10 +63,6 @@ DEFTEST( ErrMsgTest ) {
 //----------------------------------------------------------------------------
 
 
-#endif
-
-
-//----------------------------------------------------------------------------
 
 
 
diff --git a/csvfix/Makefile b/csvfix/Makefile
old mode 100644
new mode 100755
index 6fc160d..98b90f8
--- a/csvfix/Makefile
+++ b/csvfix/Makefile
@@ -36,6 +36,7 @@ _OBJS = csved_atable.o \
 		csved_dsv.o \
 		csved_echo.o \
 		csved_edit.o \
+		csved_erase.o \
 		csved_escape.o \
 		csved_eval.o \
 		csved_evalvars.o \
@@ -59,10 +60,12 @@ _OBJS = csved_atable.o \
 		csved_money.o \
 		csved_number.o \
 		csved_order.o \
+		csved_pivot.o \
 		csved_printf.o \
 		csved_put.o \
 		csved_readmulti.o \
 		csved_rmnewline.o \
+		csved_rsort.o \
 		csved_rules.o \
 		csved_seq.o \
 		csved_shuffle.o \
@@ -70,6 +73,7 @@ _OBJS = csved_atable.o \
 		csved_sparse.o \
 		csved_split.o \
 		csved_sql.o \
+		csved_squash.o \
 		csved_stat.o \
 		csved_sum.o \
 		csved_template.o \
diff --git a/csvfix/csvfix.cbp b/csvfix/csvfix.cbp
old mode 100644
new mode 100755
index e576e3d..77fcc23
--- a/csvfix/csvfix.cbp
+++ b/csvfix/csvfix.cbp
@@ -88,6 +88,7 @@
 		<Unit filename="inc/csved_dsv.h" />
 		<Unit filename="inc/csved_echo.h" />
 		<Unit filename="inc/csved_edit.h" />
+		<Unit filename="inc/csved_erase.h" />
 		<Unit filename="inc/csved_escape.h" />
 		<Unit filename="inc/csved_eval.h" />
 		<Unit filename="inc/csved_evalvars.h" />
@@ -111,10 +112,12 @@
 		<Unit filename="inc/csved_number.h" />
 		<Unit filename="inc/csved_odbc.h" />
 		<Unit filename="inc/csved_order.h" />
+		<Unit filename="inc/csved_pivot.h" />
 		<Unit filename="inc/csved_printf.h" />
 		<Unit filename="inc/csved_put.h" />
 		<Unit filename="inc/csved_readmulti.h" />
 		<Unit filename="inc/csved_rmnewline.h" />
+		<Unit filename="inc/csved_rsort.h" />
 		<Unit filename="inc/csved_rules.h" />
 		<Unit filename="inc/csved_seq.h" />
 		<Unit filename="inc/csved_shuffle.h" />
@@ -122,6 +125,7 @@
 		<Unit filename="inc/csved_sparse.h" />
 		<Unit filename="inc/csved_split.h" />
 		<Unit filename="inc/csved_sql.h" />
+		<Unit filename="inc/csved_squash.h" />
 		<Unit filename="inc/csved_stat.h" />
 		<Unit filename="inc/csved_strings.h" />
 		<Unit filename="inc/csved_sum.h" />
@@ -149,6 +153,7 @@
 		<Unit filename="src/csved_dsv.cpp" />
 		<Unit filename="src/csved_echo.cpp" />
 		<Unit filename="src/csved_edit.cpp" />
+		<Unit filename="src/csved_erase.cpp" />
 		<Unit filename="src/csved_escape.cpp" />
 		<Unit filename="src/csved_eval.cpp" />
 		<Unit filename="src/csved_evalvars.cpp" />
@@ -173,10 +178,12 @@
 		<Unit filename="src/csved_number.cpp" />
 		<Unit filename="src/csved_odbc.cpp" />
 		<Unit filename="src/csved_order.cpp" />
+		<Unit filename="src/csved_pivot.cpp" />
 		<Unit filename="src/csved_printf.cpp" />
 		<Unit filename="src/csved_put.cpp" />
 		<Unit filename="src/csved_readmulti.cpp" />
 		<Unit filename="src/csved_rmnewline.cpp" />
+		<Unit filename="src/csved_rsort.cpp" />
 		<Unit filename="src/csved_rules.cpp" />
 		<Unit filename="src/csved_seq.cpp" />
 		<Unit filename="src/csved_shuffle.cpp" />
@@ -184,6 +191,7 @@
 		<Unit filename="src/csved_sparse.cpp" />
 		<Unit filename="src/csved_split.cpp" />
 		<Unit filename="src/csved_sql.cpp" />
+		<Unit filename="src/csved_squash.cpp" />
 		<Unit filename="src/csved_stat.cpp" />
 		<Unit filename="src/csved_sum.cpp" />
 		<Unit filename="src/csved_template.cpp" />
@@ -348,6 +356,7 @@
 		<Unit filename="tests/tests/src2test/csved_diff.cpp.test" />
 		<Unit filename="tests/tests/src2test/csved_fromxml.cpp.test" />
 		<Unit filename="tests/tests/src2test/csved_join.cpp.test" />
+		<Unit filename="tests/tests/stat.test" />
 		<Unit filename="tests/tests/template.test" />
 		<Unit filename="tests/tests/toxml.test" />
 		<Unit filename="tests/tests/trim.test" />
diff --git a/csvfix/inc/csved_command.h b/csvfix/inc/csved_command.h
old mode 100644
new mode 100755
index 817d619..733cff0
--- a/csvfix/inc/csved_command.h
+++ b/csvfix/inc/csved_command.h
@@ -49,8 +49,8 @@ class Command {
 		void AddFlag( const ALib::CommandLineFlag & f );
 
 		void GetSkipOptions( const ALib::CommandLine & cl );
-		bool Skip( const CSVRow & r );
-		bool Pass( const CSVRow & r );
+		bool Skip( IOManager & io, const CSVRow & r );
+		bool Pass( IOManager & io, const CSVRow & r );
 
 	private:
 
diff --git a/csvfix/inc/csved_erase.h b/csvfix/inc/csved_erase.h
new file mode 100755
index 0000000..6e6f198
--- /dev/null
+++ b/csvfix/inc/csved_erase.h
@@ -0,0 +1,57 @@
+//---------------------------------------------------------------------------
+// csved_erase.h
+//
+// Erase fields from CSV records using regular expressions.
+//
+// Copyright (C) 2014 Neil Butterworth
+//---------------------------------------------------------------------------
+
+#ifndef INC_CSVED_ERASE_H
+#define INC_CSVED_ERASE_H
+
+#include <vector>
+
+#include "a_base.h"
+#include "a_regex.h"
+
+#include "csved_command.h"
+#include "csved_types.h"
+
+namespace CSVED {
+
+//---------------------------------------------------------------------------
+
+class EraseCommand : public Command {
+
+	public:
+
+		EraseCommand( const std::string & name,
+						const std::string & desc );
+
+		int Execute( ALib::CommandLine & cmd );
+
+	private:
+
+		void ProcessFlags( const ALib::CommandLine & cmd );
+        CSVRow EraseFields( const CSVRow & row ) const;
+        bool EraseField( const std::string & field ) const;
+
+        struct RegexAction {
+            ALib::RegEx mRegex;
+            bool mMatch;
+            RegexAction( const ALib::RegEx & re, bool match )
+                : mRegex( re ), mMatch( match ) {}
+
+        };
+
+		FieldList mFields;
+		std::vector <RegexAction> mExprs;
+		bool mKeep;
+};
+
+//------------------------------------------------------------------------
+
+}	// end namespace
+
+#endif
+
diff --git a/csvfix/inc/csved_filesplit.h b/csvfix/inc/csved_filesplit.h
old mode 100644
new mode 100755
index cd3242f..3d3ffdb
--- a/csvfix/inc/csved_filesplit.h
+++ b/csvfix/inc/csved_filesplit.h
@@ -11,8 +11,9 @@
 
 #include "a_base.h"
 #include "csved_command.h"
-#include "a_dict.h"
 #include <fstream>
+#include <map>
+#include <string>
 
 namespace CSVED {
 
@@ -36,7 +37,7 @@ class FileSplitCommand : public Command {
 		std::string MakeKey( const CSVRow & row );
 
 		std::string mDir, mFilePrefix, mFileExt, mCurrentFile;
-		ALib::Dictionary <std::string> mDict;
+        std::map <std::string, std::string> mDict;
 		std::vector <unsigned int> mColIndex;
 		unsigned int mFileNo;
 		std::ofstream mOutFile;
diff --git a/csvfix/inc/csved_pivot.h b/csvfix/inc/csved_pivot.h
new file mode 100755
index 0000000..76f5841
--- /dev/null
+++ b/csvfix/inc/csved_pivot.h
@@ -0,0 +1,88 @@
+//---------------------------------------------------------------------------
+// csved_pivot.h
+//
+// Simple pivot table stuff
+//
+// Copyright (C) 2014 Neil Butterworth
+//---------------------------------------------------------------------------
+
+#ifndef INC_CSVED_PIVOT_H
+#define INC_CSVED_PIVOT_H
+
+#include "a_base.h"
+#include "csved_command.h"
+
+#include <utility>
+#include <string>
+#include <map>
+#include <set>
+
+namespace CSVED {
+
+//---------------------------------------------------------------------------
+
+class PivotCommand : public Command {
+
+	public:
+
+		PivotCommand( const std::string & name,
+						const std::string & desc );
+
+		int Execute( ALib::CommandLine & cmd );
+
+        enum class Action {
+            Sum, Count, Average
+        };
+
+
+	private:
+
+        struct SumCount {
+
+            double mSum;
+            unsigned int mCount;
+
+            SumCount() : mSum(0), mCount(0) {}
+
+            void Update( double val ) {
+                mSum += val;
+                mCount++;
+            }
+        };
+
+        struct ColRow{
+
+            std::string mCol;
+            std::string mRow;
+
+            ColRow( const std::string & c, const std::string & r )
+                    : mCol(c), mRow(r) {}
+
+
+            bool operator < ( const ColRow & r ) const {
+                return std::tie( mCol, mRow ) < std::tie( r.mCol, r.mRow );
+            }
+        };
+
+        void ProcessFlags( const ALib::CommandLine & cmd );
+        ColRow MakeColRow( const CSVRow & row ) const;
+        std::string GetFact( const CSVRow & row ) const;
+        void AddFact( const ColRow & cr, const std::string & fact );
+        void OutputPivot( IOManager & io );
+
+        typedef std::map <ColRow, SumCount> MapType;
+        MapType mColRowValMap;
+        std::set <std::string> mCols, mRows;
+
+        Action mAction;
+        unsigned int mCol, mRow, mFact;
+
+};
+
+
+//------------------------------------------------------------------------
+
+}	// end namespace
+
+#endif
+
diff --git a/csvfix/inc/csved_rsort.h b/csvfix/inc/csved_rsort.h
new file mode 100755
index 0000000..fb18dc1
--- /dev/null
+++ b/csvfix/inc/csved_rsort.h
@@ -0,0 +1,50 @@
+//---------------------------------------------------------------------------
+// csved_rsort.h
+//
+// Do in-row sorting of CSV fields
+//
+// Copyright (C) 2014 Neil Butterworth
+//---------------------------------------------------------------------------
+
+#ifndef INC_CSVED_RSORT_H
+#define INC_CSVED_RSORT_H
+
+#include "a_base.h"
+#include "csved_command.h"
+#include <vector>
+#include <string>
+
+namespace CSVED {
+
+
+
+//---------------------------------------------------------------------------
+
+class RowSortCommand : public Command {
+
+	public:
+
+		RowSortCommand( const std::string & name,
+						const std::string & desc );
+
+		int Execute( ALib::CommandLine & cmd );
+
+	private:
+
+		void ProcessFlags( const ALib::CommandLine & cmd );
+        void SortRow( CSVRow & row );
+        std::vector <std::string> GetSortFields( const CSVRow & row ) ;
+        void PutSortFields(  CSVRow & row, const std::vector <std::string> & sf ) const;
+
+		FieldList mFields;
+		unsigned int mStartPos;
+		bool mSortAscending, mSortLex;
+
+};
+
+//------------------------------------------------------------------------
+
+}	// end namespace
+
+#endif
+
diff --git a/csvfix/inc/csved_split.h b/csvfix/inc/csved_split.h
old mode 100644
new mode 100755
index e8bedb0..17c1a6a
--- a/csvfix/inc/csved_split.h
+++ b/csvfix/inc/csved_split.h
@@ -10,7 +10,9 @@
 #define INC_CSVED_SPLIT_H
 
 #include "a_base.h"
+#include "a_regex.h"
 #include "csved_command.h"
+#include <vector>
 
 namespace CSVED {
 
@@ -43,6 +45,26 @@ class SplitBase : public Command {
 		bool mKeep;
 };
 
+//----------------------------------------------------------------------------
+// Split using regular expressions.
+//----------------------------------------------------------------------------
+
+class SplitRegex : public SplitBase {
+
+	public:
+
+		SplitRegex( const std::string & name,
+						const std::string & desc );
+
+		int Execute( ALib::CommandLine & cmd );
+
+	private:
+
+        void Split( CSVRow & row );
+        ALib::RegEx mRegex;
+};
+
+
 //---------------------------------------------------------------------------
 // Split at fixed positions
 //---------------------------------------------------------------------------
@@ -59,12 +81,17 @@ class SplitFixed : public SplitBase {
 	private:
 
 		void CreatePositions( const std::string & ps );
+		void CreateLengths( const std::string & ls );
+
 		void AddPosition( const std::string & spos,
 							const std::string & slen );
 		void Split( CSVRow & row );
+		void SplitLengths( CSVRow & row );
+
 
 		typedef std::vector <std::pair<unsigned int,unsigned int> > PairVec;
 		PairVec mPositions;
+		std::vector <int> mLengths;
 };
 
 //---------------------------------------------------------------------------
diff --git a/csvfix/inc/csved_squash.h b/csvfix/inc/csved_squash.h
new file mode 100755
index 0000000..b9b854b
--- /dev/null
+++ b/csvfix/inc/csved_squash.h
@@ -0,0 +1,63 @@
+//---------------------------------------------------------------------------
+// csved_squash.h
+//
+// squash duplicate rows to single row
+//
+// Copyright (C) 2014 Neil Butterworth
+//---------------------------------------------------------------------------
+
+#ifndef INC_CSVED_SQUASH_H
+#define INC_CSVED_SQUASH_H
+
+#include "a_base.h"
+#include "csved_command.h"
+#include <map>
+#include <vector>
+#include <string>
+#include <memory>
+
+namespace CSVED {
+
+
+class SquashValues {
+
+    public:
+
+        SquashValues() {}
+        virtual ~SquashValues() {}
+        virtual void Add( unsigned int idx, const std::string & val ) = 0;
+        virtual void AppendTo( CSVRow & row ) = 0;
+};
+
+//---------------------------------------------------------------------------
+
+class SquashCommand : public Command {
+
+	public:
+
+		SquashCommand( const std::string & name,
+							const std::string & desc );
+
+		int Execute( ALib::CommandLine & cmd );
+
+
+	private:
+
+        void ProcessFlags( const ALib::CommandLine & cmd );
+        std::string MakeKey( const CSVRow & row ) const;
+        void Accumulate( std::shared_ptr<SquashValues>& vp, const CSVRow & row  );
+        void Key2CSV( const std::string & key, CSVRow & row);
+
+        FieldList mKeyFields, mValFields;
+        std::map <std::string, std::shared_ptr<SquashValues>> mKeyValues;
+        std::string mNotNumVal;
+        bool mRealNums;
+
+};
+
+//------------------------------------------------------------------------
+
+}	// end namespace
+
+#endif
+
diff --git a/csvfix/inc/csved_stat.h b/csvfix/inc/csved_stat.h
old mode 100644
new mode 100755
index 822eefc..4374943
--- a/csvfix/inc/csved_stat.h
+++ b/csvfix/inc/csved_stat.h
@@ -11,9 +11,79 @@
 
 #include "a_base.h"
 #include "csved_command.h"
+#include "csved_ioman.h"
+#include <string>
+#include <vector>
+#include <climits>
 
 namespace CSVED {
 
+class FileStats {
+
+    public:
+
+        FileStats( const std::string & filename,
+                    const CSVRow & fieldnames );
+
+        void UpdateStats( const CSVRow & row );
+        void Report( IOManager & io ) const;
+
+    private:
+
+        enum class FieldType {
+            Empty, String, Number
+        };
+
+        std::string FT2Str( FieldType t ) const {
+            switch( t ) {
+                case FieldType::Empty:   return "empty";
+                case FieldType::String:  return "string";
+                case FieldType::Number:  return "number";
+                default:                 return "unknown";
+            }
+        }
+
+        FieldType Transition( FieldType t, const std::string & s ) {
+            if ( ALib::IsEmpty( s ) || t == FieldType::String ) {
+                return t;
+            }
+            else if ( t == FieldType::Empty ) {
+                if ( ALib::IsNumber(s) ) {
+                    return FieldType::Number;
+                }
+                else {
+                    return FieldType::String;
+                }
+            }
+            else if ( t == FieldType::Number && ALib::IsNumber(s) ) {
+                return FieldType::Number;
+            }
+            else {
+                return FieldType::String;
+            }
+        }
+
+
+        struct FieldRecord {
+            std::string mName;
+            FieldType mType;
+            int mMinLen, mMaxLen;
+
+            FieldRecord( const std::string & fieldname )
+                : mName( fieldname ), mType( FieldType::Empty ),
+                    mMinLen( INT_MAX ), mMaxLen( INT_MIN ){}
+
+        };
+
+        typedef std::vector <FieldRecord> FieldList;
+        typedef std::vector <std::string> FileHeader;
+
+        std::string mFileName;
+        FileHeader mFieldNames;
+        FieldList mFields;
+};
+
+
 class StatCommand : public Command {
 
 
@@ -27,8 +97,12 @@ class StatCommand : public Command {
 
 	private:
 
+        void SimpleStats(  ALib::CommandLine & cmd );
+        void FullStats(  ALib::CommandLine & cmd );
+
 		void OutputStats( IOManager & io, const std::string & fname,
-							int lines, int maxf, int minf );
+							int lines, int maxf, int minf,
+							const std::vector <int> & lengths );
 };
 
 }
diff --git a/csvfix/inc/csved_strings.h b/csvfix/inc/csved_strings.h
old mode 100644
new mode 100755
index 6fcd0b2..c01bf65
--- a/csvfix/inc/csved_strings.h
+++ b/csvfix/inc/csved_strings.h
@@ -28,6 +28,7 @@ const char * const CMD_DSVR		= "read_dsv";
 const char * const CMD_DSVW		= "write_dsv";
 const char * const CMD_ECHO		= "echo";
 const char * const CMD_EDIT		= "edit";
+const char * const CMD_ERASE	= "erase";
 const char * const CMD_EVAL		= "eval";
 const char * const CMD_EXCLUDE	= "exclude";
 const char * const CMD_EXEC		= "exec";
@@ -51,6 +52,7 @@ const char * const CMD_MONEY	= "money";
 const char * const CMD_NUMBER	= "number";
 const char * const CMD_ODBCGET	= "odbc_get";
 const char * const CMD_ORDER	= "order";
+const char * const CMD_PIVOT	= "pivot";
 const char * const CMD_PRINTF	= "printf";
 const char * const CMD_PAD		= "pad";
 const char * const CMD_PUT		= "put";
@@ -58,11 +60,14 @@ const char * const CMD_ESC		= "escape";
 const char * const CMD_REMOVE	= "remove";
 const char * const CMD_READMUL	= "read_multi";
 const char * const CMD_RMNEW	= "rmnew";
+const char * const CMD_RSORT	= "rowsort";
 const char * const CMD_SEQ		= "sequence";
 const char * const CMD_SHUFFLE	= "shuffle";
 const char * const CMD_SORT		= "sort";
 const char * const CMD_SPLFIX	= "split_fixed";
 const char * const CMD_SPLCHR	= "split_char";
+const char * const CMD_SPLREGEX	= "split_regex";
+const char * const CMD_SQUASH	= "squash";
 const char * const CMD_SQLDEL	= "sql_delete";
 const char * const CMD_SQLIN	= "sql_insert";
 const char * const CMD_SQLUP	= "sql_update";
@@ -88,6 +93,9 @@ const char * const CMD_XMLR		= "read_xml";
 // Flag names
 //---------------------------------------------------------------------------
 
+const char * const FLAG_ACTION	= "-a";
+const char * const FLAG_ASC		= "-a";
+const char * const FLAG_ALL		= "-a";
 const char * const FLAG_ARG		= "-arg";
 const char * const FLAG_AVG		= "-avg";
 const char * const FLAG_ACTKEEP	= "-k";
@@ -105,6 +113,7 @@ const char * const FLAG_CENTS	= "-cn";
 const char * const FLAG_CHARS	= "-s";
 const char * const FLAG_CHAR	= "-c";
 const char * const FLAG_CMD		= "-c";
+const char * const FLAG_COL	    = "-c";
 const char * const FLAG_COLS	= "-f";
 const char * const FLAG_CMULTI	= "-cm";
 const char * const FLAG_CONSTR	= "-cs";
@@ -114,8 +123,10 @@ const char * const FLAG_CSVSEP	= "-sep";
 const char * const FLAG_CSVSEPR	= "-rsep";
 const char * const FLAG_DUPES	= "-d";
 const char * const FLAG_DATE	= "-d";
+const char * const FLAG_DEBUG	= "-d";
 const char * const FLAG_DISCARD	= "-d";
 const char * const FLAG_DETAIL	= "-d";
+const char * const FLAG_DESC	= "-d";
 const char * const FLAG_DIR		= "-dir";
 const char * const FLAG_DLL		= "-dll";
 const char * const FLAG_DONLY	= "-d";
@@ -133,12 +144,15 @@ const char * const FLAG_ESCOFF	= "-noc";
 const char * const FLAG_EXPR	= "-e";
 const char * const FLAG_EXCLF	= "-xf";
 const char * const FLAG_EXCLNL	= "-x";
+const char * const FLAG_FACT	= "-f";
 const char * const FLAG_FCOUNT	= "-fc";
 const char * const FLAG_FSEP	= "-fs";
+const char * const FLAG_FLEN	= "-l";
 const char * const FLAG_FILTBAD	= "-x";
 const char * const FLAG_FMT		= "-fmt";
 const char * const FLAG_FNAMES	= "-fn";
 const char * const FLAG_FSPRE	= "-fp";
+const char * const FLAG_FSTATS	= "-fs";
 const char * const FLAG_FSEXT	= "-fx";
 const char * const FLAG_FSDIR	= "-fd";
 const char * const FLAG_FREQ	= "-frq";
@@ -150,6 +164,7 @@ const char * const FLAG_HEADEXP	= "-me";
 const char * const FLAG_HDRREC	= "-hdr";
 const char * const FLAG_ICASE	= "-ic";
 const char * const FLAG_IF		= "-if";
+const char * const FLAG_IGNOREX	= "-ix";
 const char * const FLAG_ICNAMES	= "-ifn";
 const char * const FLAG_ILTEXT	= "-ilt";
 const char * const FLAG_INC		= "-i";
@@ -162,6 +177,7 @@ const char * const FLAG_KEEP	= "-k";
 const char * const FLAG_KEY		= "-k";
 const char * const FLAG_KSEP	= "-ts";
 const char * const FLAG_LEN		= "-l";
+const char * const FLAG_LEX		= "-l";
 const char * const FLAG_MASK	= "-m";
 const char * const FLAG_MASTER	= "-m";
 const char * const FLAG_MEDIAN	= "-med";
@@ -174,6 +190,8 @@ const char * const FLAG_NOQUOTE	= "-nq";
 const char * const FLAG_NLOK	= "-nl";
 const char * const FLAG_NOCREAT = "-nc";
 const char * const FLAG_NOINFO	= "-ni";
+const char * const FLAG_NONUM	= "-nn";
+const char * const FLAG_NOTRE	= "-n";
 const char * const FLAG_NUM		= "-n";
 const char * const FLAG_NULLSTR	= "-ns";
 const char * const FLAG_OMODE	= "-om";
@@ -189,18 +207,22 @@ const char * const FLAG_QNULLS	= "-qn";
 const char * const FLAG_QUIET	= "-q";
 const char * const FLAG_QUOTE	= "-q";
 const char * const FLAG_REPLACE	= "-r";
+const char * const FLAG_REGEX	= "-r";
 const char * const FLAG_RHEAD	= "-rh";
 const char * const FLAG_RANGE	= "-r";
 const char * const FLAG_RFC		= "-rfc";
+const char * const FLAG_REALS	= "-rn";
 const char * const FLAG_REMOVE	= "-r";
 const char * const FLAG_REVCOLS	= "-rf";
 const char * const FLAG_RECSEP	= "-rs";
 const char * const FLAG_RSEED	= "-rs";
 const char * const FLAG_RFSEED	= "-seed";
+const char * const FLAG_ROW 	= "-r";
 const char * const FLAG_RTIME	= "-rt";
 const char * const FLAG_RULER	= "-ru";
 const char * const FLAG_RALIGN	= "-ra";
 const char * const FLAG_SEP		= "-s";
+const char * const FLAG_SINGLE		= "-s";
 const char * const FLAG_SIZE	= "-siz";
 const char * const FLAG_SMARTQ	= "-smq";
 const char * const FLAG_SQLQ	= "-sql";
@@ -211,6 +233,7 @@ const char * const FLAG_STR		= "-s";
 const char * const FLAG_STRIC	= "-si";
 const char * const FLAG_TABLE	= "-t";
 const char * const FLAG_SQLTBL	= "-tbl";
+const char * const FLAG_TPLSTR	= "-ts";
 const char * const FLAG_TFILE	= "-tf";
 const char * const FLAG_TONLY	= "-t";
 const char * const FLAG_TOV		= "-tv";
diff --git a/csvfix/inc/csved_trim.h b/csvfix/inc/csved_trim.h
old mode 100644
new mode 100755
index bc23cc0..78ccf3f
--- a/csvfix/inc/csved_trim.h
+++ b/csvfix/inc/csved_trim.h
@@ -32,7 +32,7 @@ class TrimCommand : public Command {
 		void Chop( CSVRow & row, unsigned int  i );
 
 		FieldList mFields;
-		bool mTrimLead, mTrimTrail;
+		bool mTrimLead, mTrimTrail, mTrimAll, mTrim2Single;
 		std::vector <int> mWidths;
 
 
diff --git a/csvfix/inc/csved_version.h b/csvfix/inc/csved_version.h
old mode 100644
new mode 100755
index 906e63b..099968a
--- a/csvfix/inc/csved_version.h
+++ b/csvfix/inc/csved_version.h
@@ -10,7 +10,7 @@
 #define INC_CSVED_VERSION_H
 
 const char * const CSVED_NAME 	= "CSVfix";
-const char * const CSVED_VERS 	= "1.6";
+const char * const CSVED_VERS 	= "1.7";
 const char * const CSVED_VDATE 	= __DATE__;
 const char * const CSVED_CPYR 	= "Copyright (C) 2014 Neil Butterworth";
 const char * const CSVED_NOWAR 	=
diff --git a/csvfix/installer/make_install.iss b/csvfix/installer/make_install.iss
old mode 100644
new mode 100755
index d5a60b0..9981880
--- a/csvfix/installer/make_install.iss
+++ b/csvfix/installer/make_install.iss
@@ -2,7 +2,7 @@
 
 [Setup]
 AppName=CSVfix
-AppVerName=CSVfix 1.5
+AppVerName=CSVfix 1.7
 AppPublisher=Neil Butterworth
 AppPublisherURL=http://code.google.com/p/csvfix/
 AppSupportURL=http://code.google.com/p/csvfix/
diff --git a/csvfix/src/csved_atable.cpp b/csvfix/src/csved_atable.cpp
old mode 100644
new mode 100755
index 84bd340..b83e60b
--- a/csvfix/src/csved_atable.cpp
+++ b/csvfix/src/csved_atable.cpp
@@ -75,7 +75,7 @@ int AsciiTableCommand :: Execute( ALib::CommandLine & cmd ) {
 	IOManager io( cmd );
 	CSVRow row;
 	while( io.ReadCSV( row ) ) {
-		if ( ! Skip( row ) ) {
+		if ( ! Skip( io, row ) ) {
 			AddRow( row );
 		}
 	}
diff --git a/csvfix/src/csved_call.cpp b/csvfix/src/csved_call.cpp
old mode 100644
new mode 100755
index b1ae23a..6b8e64e
--- a/csvfix/src/csved_call.cpp
+++ b/csvfix/src/csved_call.cpp
@@ -95,10 +95,10 @@ int CallCommand :: Execute( ALib::CommandLine & cmd ) {
 
 	while( io.ReadCSV( row ) ) {
 
-		if ( ! Skip( row ) ) {
+		if ( ! Skip( io, row ) ) {
 			continue;
 		}
-		if ( Pass( row ) ) {
+		if ( Pass( io, row ) ) {
 			io.WriteRow( row );
 			continue;
 		}
diff --git a/csvfix/src/csved_command.cpp b/csvfix/src/csved_command.cpp
old mode 100644
new mode 100755
index 414d0e5..0fbfd66
--- a/csvfix/src/csved_command.cpp
+++ b/csvfix/src/csved_command.cpp
@@ -12,6 +12,7 @@
 #include "csved_command.h"
 #include "csved_except.h"
 #include "csved_strings.h"
+#include "csved_evalvars.h"
 
 using std::string;
 using std::vector;
@@ -106,9 +107,12 @@ static void SetPosParams( ALib::Expression & e, const CSVRow & r ) {
 	}
 }
 
-static bool EvalSkipPass( ALib::Expression & e, const CSVRow & r ) {
+static bool EvalSkipPass( ALib::Expression & e, const CSVRow & r, IOManager & io ) {
 	if ( e.IsCompiled() ) {
 		SetPosParams( e, r );
+        e.AddVar( LINE_VAR, ALib::Str( io.CurrentLine() ));
+        e.AddVar( FILE_VAR, ALib::Str( io.CurrentFileName()));
+        e.AddVar( FIELD_VAR, ALib::Str( r.size()));
 		string ev = e.Evaluate();
 		return ev == "0" ? false : true;
 	}
@@ -117,12 +121,12 @@ static bool EvalSkipPass( ALib::Expression & e, const CSVRow & r ) {
 	}
 }
 
-bool Command :: Skip( const CSVRow & r  )  {
-	return EvalSkipPass( mSkipExpr, r );
+bool Command :: Skip( IOManager & io, const CSVRow & r  )  {
+	return EvalSkipPass( mSkipExpr, r, io );
 }
 
-bool Command :: Pass( const CSVRow & r )  {
-	return EvalSkipPass( mPassExpr, r );
+bool Command :: Pass( IOManager &io, const CSVRow & r )  {
+	return EvalSkipPass( mPassExpr, r, io );
 }
 
 //----------------------------------------------------------------------------
diff --git a/csvfix/src/csved_date.cpp b/csvfix/src/csved_date.cpp
old mode 100644
new mode 100755
index 60342a2..f6377a5
--- a/csvfix/src/csved_date.cpp
+++ b/csvfix/src/csved_date.cpp
@@ -112,10 +112,10 @@ int DateReadCommand :: Execute( ALib::CommandLine & cmd ) {
 
 	while( io.ReadCSV( row ) ) {
 
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
-		if( Pass( row ) ) {
+		if( Pass( io, row ) ) {
 			io.WriteRow( row );
 			continue;
 		}
diff --git a/csvfix/src/csved_dsv.cpp b/csvfix/src/csved_dsv.cpp
old mode 100644
new mode 100755
index bb685ac..1dca064
--- a/csvfix/src/csved_dsv.cpp
+++ b/csvfix/src/csved_dsv.cpp
@@ -265,7 +265,7 @@ int DSVWriteCommand :: Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( ! Skip( row ) ) {
+		if ( ! Skip( io, row ) ) {
 			io.Out() << MakeDSV( row ) << "\n";
 		}
 	}
diff --git a/csvfix/src/csved_echo.cpp b/csvfix/src/csved_echo.cpp
old mode 100644
new mode 100755
index 6842964..c8ad0de
--- a/csvfix/src/csved_echo.cpp
+++ b/csvfix/src/csved_echo.cpp
@@ -56,7 +56,7 @@ int EchoCommand :: Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( ! Skip( row ) ) {
+		if ( ! Skip( io, row ) ) {
 			io.WriteRow( row );
 		}
 	}
diff --git a/csvfix/src/csved_edit.cpp b/csvfix/src/csved_edit.cpp
old mode 100644
new mode 100755
index 78d92d9..a36acd1
--- a/csvfix/src/csved_edit.cpp
+++ b/csvfix/src/csved_edit.cpp
@@ -75,10 +75,10 @@ int EditCommand :: Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
-		if ( ! Pass( row ) ) {
+		if ( ! Pass( io, row ) ) {
 			EditRow( row );
 		}
 		io.WriteRow( row );
diff --git a/csvfix/src/csved_erase.cpp b/csvfix/src/csved_erase.cpp
new file mode 100755
index 0000000..6e3f0c1
--- /dev/null
+++ b/csvfix/src/csved_erase.cpp
@@ -0,0 +1,149 @@
+//---------------------------------------------------------------------------
+// csved_erase.cpp
+//
+// Erase fields from CSV records using regualr expressions
+//
+// Copyright (C) 2009 Neil Butterworth
+//---------------------------------------------------------------------------
+
+#include "a_base.h"
+#include "a_collect.h"
+#include "csved_cli.h"
+#include "csved_erase.h"
+#include "csved_strings.h"
+#include "csved_evalvars.h"
+
+using std::string;
+using std::vector;
+using namespace std;
+
+namespace CSVED {
+
+//---------------------------------------------------------------------------
+// Register exclude command
+//---------------------------------------------------------------------------
+
+static RegisterCommand <EraseCommand> rc1_(
+	CMD_ERASE,
+	"erase fields using regular expressions"
+);
+
+//----------------------------------------------------------------------------
+// Help text
+//----------------------------------------------------------------------------
+
+const char * const ERASE_HELP = {
+	"erase fields using regular expressions"
+	"usage: csvfix erase  [flags] [file ...]\n"
+	"where flags are:\n"
+	"  -f fields\tlist of fields to check for exclusion (default is all)\n"
+	"  -r regexp\terase fields that match this regular expression\n"
+    "  -n regex\terase fields which do not match this regular expression\n"
+	"  -k\t\tif all fields are erased, retain empty row (default is to delete it)\n"
+	"#ALL,SKIP,PASS"
+};
+
+//----------------------------------------------------------------------------
+// Standard command ctor
+//---------------------------------------------------------------------------
+
+EraseCommand ::EraseCommand( const string & name,
+								const string & desc )
+		: Command( name, desc, ERASE_HELP ) {
+
+	AddFlag( ALib::CommandLineFlag( FLAG_COLS, false, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_REGEX, false, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_NOTRE, false, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_KEEP, false, 0 ) );
+
+}
+
+//---------------------------------------------------------------------------
+// Get user-specified options and then read input, removing erased cols.
+//---------------------------------------------------------------------------
+
+int EraseCommand :: Execute( ALib::CommandLine & cmd ) {
+
+	GetSkipOptions( cmd );
+	ProcessFlags( cmd );
+
+	IOManager io( cmd );
+	CSVRow row, newrow;
+
+	while( io.ReadCSV( row ) ) {
+		if ( Skip( io, row ) ) {
+			continue;
+		}
+		if ( ! Pass( io, row ) ) {
+            newrow = EraseFields( row );
+		}
+        if ( newrow.size() != 0 || mKeep ) {
+            io.WriteRow( newrow );
+        }
+	}
+
+	return 0;
+}
+
+//---------------------------------------------------------------------------
+// Should this field be erased?
+//---------------------------------------------------------------------------
+
+bool EraseCommand :: EraseField( const std::string & field ) const{
+    for ( unsigned int i = 0; i < mExprs.size(); i++ ) {
+        ALib::RegEx::Pos pos = mExprs[i].mRegex.FindIn( field );
+        if ( (pos.Found() && mExprs[i].mMatch)
+              || (! pos.Found() && ! mExprs[i].mMatch ) ) {
+            return true;
+        }
+    }
+    return false;
+}
+
+//---------------------------------------------------------------------------
+// Erase fields that match/do not match regexes, returning new row without
+// the erased fields.
+//---------------------------------------------------------------------------
+
+CSVRow EraseCommand :: EraseFields( const CSVRow & row ) const {
+    CSVRow newrow;
+    for( unsigned int i = 0; i < row.size(); i++ ) {
+        if ( mFields.size() == 0 || ALib::Contains( mFields, i ) ) {
+            if ( ! EraseField( row[i] ) ) {
+                newrow.push_back( row[i] );
+            }
+        }
+        else {
+            newrow.push_back( row[i] );
+        }
+    }
+    return newrow;
+}
+
+//---------------------------------------------------------------------------
+// Handle all user options with error checking.
+//---------------------------------------------------------------------------
+
+void EraseCommand :: ProcessFlags( const ALib::CommandLine & cmd ) {
+
+    if ( ! cmd.HasFlag( FLAG_REGEX ) && ! cmd.HasFlag( FLAG_NOTRE ) ) {
+        CSVTHROW( "Need at least one of " << FLAG_REGEX << " or " << FLAG_NOTRE );
+    }
+
+    for(  int i = 1; i < cmd.Argc(); i++ ) {
+        if ( cmd.Argv(i) == FLAG_REGEX || cmd.Argv(i) == FLAG_NOTRE ) {
+            mExprs.push_back( RegexAction( ALib::RegEx( cmd.Argv(i+1)), cmd.Argv(i) == FLAG_REGEX ));
+            i++;
+        }
+    }
+    mKeep = cmd.HasFlag( FLAG_KEEP );
+    CommaListToIndex( ALib::CommaList( cmd.GetValue( FLAG_COLS) ), mFields );
+
+}
+
+
+
+} // end namespace
+
+// end
+
diff --git a/csvfix/src/csved_escape.cpp b/csvfix/src/csved_escape.cpp
old mode 100644
new mode 100755
index 87ecc3e..c84d515
--- a/csvfix/src/csved_escape.cpp
+++ b/csvfix/src/csved_escape.cpp
@@ -103,10 +103,10 @@ int EscCommand ::	Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
-		if( ! Pass( row ) ) {
+		if( ! Pass( io, row ) ) {
 			EscapeRow( row );
 		}
 		io.WriteRow( row, cmd.HasFlag( FLAG_ESCOFF) );
diff --git a/csvfix/src/csved_eval.cpp b/csvfix/src/csved_eval.cpp
old mode 100644
new mode 100755
index 39e6a74..a4c5794
--- a/csvfix/src/csved_eval.cpp
+++ b/csvfix/src/csved_eval.cpp
@@ -68,10 +68,10 @@ int EvalCommand ::	Execute( ALib::CommandLine & cmd ) {
 	GetExpressions( cmd );
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
-		if ( ! Pass( row ) ) {
+		if ( ! Pass( io, row ) ) {
 			SetParams( row, io );
 			if ( mDiscardInput ) {
 				row.clear();
diff --git a/csvfix/src/csved_exclude.cpp b/csvfix/src/csved_exclude.cpp
old mode 100644
new mode 100755
index 2a3de5c..908baec
--- a/csvfix/src/csved_exclude.cpp
+++ b/csvfix/src/csved_exclude.cpp
@@ -69,10 +69,10 @@ int ExcludeCommand :: Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
-		if ( ! Pass( row ) ) {
+		if ( ! Pass( io, row ) ) {
 			if ( EvalExprOnRow( io, row ) ) {
 				Exclude( row );
 			}
diff --git a/csvfix/src/csved_exec.cpp b/csvfix/src/csved_exec.cpp
old mode 100644
new mode 100755
index 2e287b5..b711097
--- a/csvfix/src/csved_exec.cpp
+++ b/csvfix/src/csved_exec.cpp
@@ -36,6 +36,8 @@ const char * const EXEC_HELP = {
 	"where flags are:\n"
 	"  -c cmd\tcommand line to execute\n"
 	"  -r\t\treplace CSV input with command output\n"
+    "  -ix ecode\tignore exit codes from cmd with values less than or equal to ecode\n"
+    "  -d\t\tdebug mode - print expamded command but don't execute it\n"
 	"#ALL,SKIP,PASS"
 };
 
@@ -49,6 +51,8 @@ ExecCommand ::ExecCommand( const string & name,
 
 	AddFlag( ALib::CommandLineFlag( FLAG_CMD, true, 1 ) );
 	AddFlag( ALib::CommandLineFlag( FLAG_REPLACE, false, 0 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_DEBUG, false, 0 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_IGNOREX, false, 1 ) );
 }
 
 //---------------------------------------------------------------------------
@@ -59,22 +63,35 @@ ExecCommand ::ExecCommand( const string & name,
 int ExecCommand :: Execute( ALib::CommandLine & cmd ) {
 
 	GetSkipOptions( cmd );
+
 	mCmdLine = cmd.GetValue( FLAG_CMD, "" );
 	if ( ALib::IsEmpty( mCmdLine ) ) {
 		CSVTHROW( "Empty command" );
 	}
+
 	bool csv = ! cmd.HasFlag( FLAG_REPLACE );
+    bool debug = cmd.HasFlag( FLAG_DEBUG );
+
+    string ix = cmd.GetValue( FLAG_IGNOREX, "0" );
+    if ( ! ALib::IsInteger( ix ) ) {
+        CSVTHROW( "Invalid value for " << FLAG_IGNOREX << ": " << ix );
+    }
+    int nix = ALib::ToInteger( ix );
 
 	IOManager io( cmd );
 	CSVRow row;
 	ALib::Executor ex;
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
 		string cmd = MakeCmd( row );
-		std::istream & is = ex.Exec( cmd );
+        if ( debug ) {
+            std::cout << cmd << "\n";
+            continue;
+        }
+		std::istream & is = ex.Exec( cmd, nix );
 		if ( ! is ) {
 			CSVTHROW( "Command execution error" );
 		}
@@ -85,7 +102,7 @@ int ExecCommand :: Execute( ALib::CommandLine & cmd ) {
 		while( std::getline( is, line ) ) {
 			if ( csv ) {
 				CSVRow tmp( row ), cmdout;
-				if ( ! Pass( tmp ) ) {
+				if ( ! Pass( io, tmp ) ) {
 					clp.Parse( line, cmdout );
 					ALib::operator+=( tmp, cmdout );
 					io.WriteRow( tmp );
diff --git a/csvfix/src/csved_fileinfo.cpp b/csvfix/src/csved_fileinfo.cpp
old mode 100644
new mode 100755
index 35dc3c4..3f1d94a
--- a/csvfix/src/csved_fileinfo.cpp
+++ b/csvfix/src/csved_fileinfo.cpp
@@ -65,10 +65,10 @@ int FileInfoCommand :: Execute( ALib::CommandLine & cmd ) {
 
 	CSVRow row;
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
-		if ( Pass( row ) ) {
+		if ( Pass( io, row ) ) {
 			io.WriteRow( row );
 			continue;
 		}
diff --git a/csvfix/src/csved_filesplit.cpp b/csvfix/src/csved_filesplit.cpp
old mode 100644
new mode 100755
index b08cf87..80f0a35
--- a/csvfix/src/csved_filesplit.cpp
+++ b/csvfix/src/csved_filesplit.cpp
@@ -11,6 +11,9 @@
 #include "csved_strings.h"
 #include "a_collect.h"
 
+
+#include <iostream>
+
 using std::string;
 using std::vector;
 
@@ -80,10 +83,10 @@ int FileSplitCommand :: Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
-		if ( Pass( row ) ) {
+		if ( Pass( io, row ) ) {
 			io.WriteRow( row  );
 		}
 		else {
@@ -121,11 +124,11 @@ string FileSplitCommand :: MakeKey( const CSVRow & row ) {
 void FileSplitCommand :: WriteRow( IOManager & ioman, const CSVRow & row ) {
 
 	string key = MakeKey( row );
-	const string * p = mDict.GetPtr( key );
-	string fname = (p == 0) ? NewFileName( key ) : * p;
+    auto it = mDict.find( key );
+	string fname = (it == mDict.end()) ? NewFileName( key ) : it->second;
 
-	if ( p == 0 ) {
-		mDict.Add( key, fname );
+	if ( it == mDict.end() ) {
+        mDict[key] = fname;
 	}
 
 	if ( fname != mCurrentFile ) {
diff --git a/csvfix/src/csved_find.cpp b/csvfix/src/csved_find.cpp
old mode 100644
new mode 100755
index 1014d80..f2cc818
--- a/csvfix/src/csved_find.cpp
+++ b/csvfix/src/csved_find.cpp
@@ -15,8 +15,6 @@
 #include "csved_strings.h"
 #include "csved_evalvars.h"
 
-#include "a_debug.h"
-
 using std::string;
 using std::vector;
 
diff --git a/csvfix/src/csved_fixed.cpp b/csvfix/src/csved_fixed.cpp
old mode 100644
new mode 100755
index 533e17e..41bf3bb
--- a/csvfix/src/csved_fixed.cpp
+++ b/csvfix/src/csved_fixed.cpp
@@ -196,7 +196,7 @@ int WriteFixedCommand :: Execute( ALib::CommandLine & cmd ) {
 
 	CSVRow row;
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
 		string line = MakeFixedOutput( row );
diff --git a/csvfix/src/csved_flatten.cpp b/csvfix/src/csved_flatten.cpp
old mode 100644
new mode 100755
index 0c5630a..fb1c00c
--- a/csvfix/src/csved_flatten.cpp
+++ b/csvfix/src/csved_flatten.cpp
@@ -87,7 +87,7 @@ int FlattenCommand :: MDFlatten( ALib::CommandLine & cmd ) {
 	e.Compile( mMasterExpr );
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
 		AddVars( e, io, row );
@@ -127,7 +127,7 @@ int FlattenCommand :: Execute( ALib::CommandLine & cmd ) {
 	int read = 0;
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
 		string key = MakeKey( row );
diff --git a/csvfix/src/csved_headtail.cpp b/csvfix/src/csved_headtail.cpp
old mode 100644
new mode 100755
index 1012e94..203d21a
--- a/csvfix/src/csved_headtail.cpp
+++ b/csvfix/src/csved_headtail.cpp
@@ -104,7 +104,7 @@ int HeadCommand :: Execute( ALib::CommandLine & cmd ) {
 
 	unsigned int nr = 0;
 	while( io.ReadCSV( row ) ) {
-		if ( ! Skip( row ) ) {
+		if ( ! Skip( io, row ) ) {
 			if ( ++nr > mRecords ) {
 				break;
 			}
@@ -126,7 +126,7 @@ int TailCommand :: Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( ! Skip( row ) ) {
+		if ( ! Skip( io, row ) ) {
 			mLastRows.push_back( row );
 			if ( mLastRows.size() > mRecords ) {
 				mLastRows.pop_front();
diff --git a/csvfix/src/csved_map.cpp b/csvfix/src/csved_map.cpp
old mode 100644
new mode 100755
index f05046c..64bd876
--- a/csvfix/src/csved_map.cpp
+++ b/csvfix/src/csved_map.cpp
@@ -67,10 +67,10 @@ int MapCommand :: Execute( ALib::CommandLine & cmd ) {
 	IOManager io( cmd );
 
 	while( io.ReadCSV( mRow ) ) {
-		if ( Skip( mRow ) ) {
+		if ( Skip( io, mRow ) ) {
 			continue;
 		}
-		if ( ! Pass( mRow ) ) {
+		if ( ! Pass( io, mRow ) ) {
 			DoMapping();
 		}
 		io.WriteRow( mRow );
diff --git a/csvfix/src/csved_merge.cpp b/csvfix/src/csved_merge.cpp
old mode 100644
new mode 100755
index 7a51c23..abe9b27
--- a/csvfix/src/csved_merge.cpp
+++ b/csvfix/src/csved_merge.cpp
@@ -68,10 +68,10 @@ int MergeCommand :: Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
-		if ( ! Pass( row ) ) {
+		if ( ! Pass( io, row ) ) {
 			DoMerge( row );
 		}
 		io.WriteRow( row );
diff --git a/csvfix/src/csved_money.cpp b/csvfix/src/csved_money.cpp
old mode 100644
new mode 100755
index 0700073..7fae9f5
--- a/csvfix/src/csved_money.cpp
+++ b/csvfix/src/csved_money.cpp
@@ -85,10 +85,10 @@ int MoneyCommand :: Execute( ALib::CommandLine & cmd ) {
 
 	while( io.ReadCSV( row ) ) {
 
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
-		if ( Pass( row ) ) {
+		if ( Pass( io, row ) ) {
 			io.WriteRow( row );
 			continue;
 		}
diff --git a/csvfix/src/csved_number.cpp b/csvfix/src/csved_number.cpp
old mode 100644
new mode 100755
index daaa1a7..0b8574b
--- a/csvfix/src/csved_number.cpp
+++ b/csvfix/src/csved_number.cpp
@@ -74,17 +74,18 @@ const string EU_FMT	= "EU";
 
 int NumberCommand :: Execute( ALib::CommandLine & cmd )  {
 
-	ProcessFlags( cmd );
+    GetSkipOptions( cmd );
+    ProcessFlags( cmd );
 
 	IOManager io( cmd );
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
 
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
-		if( ! Pass( row ) ) {
+		if( ! Pass( io, row ) ) {
 			Convert( row );
 		}
 
diff --git a/csvfix/src/csved_order.cpp b/csvfix/src/csved_order.cpp
old mode 100644
new mode 100755
index 3355b71..23e4a0e
--- a/csvfix/src/csved_order.cpp
+++ b/csvfix/src/csved_order.cpp
@@ -94,11 +94,11 @@ int OrderCommand :: Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
 
-		if ( ! Pass( row ) ) {
+		if ( ! Pass( io, row ) ) {
 			if ( mExclude ) {
 				ExcludeFields( row );
 			}
diff --git a/csvfix/src/csved_pivot.cpp b/csvfix/src/csved_pivot.cpp
new file mode 100755
index 0000000..bea2d71
--- /dev/null
+++ b/csvfix/src/csved_pivot.cpp
@@ -0,0 +1,223 @@
+//---------------------------------------------------------------------------
+// csved_pivot.cpp
+//
+// Simple pivot table stuff.
+// Doesn't support skip/pass.
+//
+// Copyright (C) 2014 Neil Butterworth
+//---------------------------------------------------------------------------
+
+#include "a_base.h"
+#include "a_collect.h"
+#include "csved_cli.h"
+#include "csved_pivot.h"
+#include "csved_strings.h"
+
+using std::string;
+using std::vector;
+
+namespace CSVED {
+
+//---------------------------------------------------------------------------
+// Possible pivoting operations
+//---------------------------------------------------------------------------
+
+const char * const OP_SUM = "sum";
+const char * const OP_COUNT = "count";
+const char * const OP_AVG = "avg";
+
+//---------------------------------------------------------------------------
+// Register pivot command
+//---------------------------------------------------------------------------
+
+static RegisterCommand <PivotCommand> rc1_(
+	CMD_PIVOT,
+	"simple pivot tables"
+);
+
+//----------------------------------------------------------------------------
+// Help text
+//----------------------------------------------------------------------------
+
+const char * const PIVOT_HELP = {
+	"performs simple pivot table operations on CSV input\n"
+	"usage: csvfix pivot [flags] [file ...]\n"
+	"where flags are:\n"
+	"  -c field\tfield to use for column headers\n"
+	"  -r field\tfield to use for row header \n"
+	"  -a act\taction to perform (one of sum, avg, count)\n"
+	"  -f field\tfield that represents the fact you want to perform action on\n"
+	"#ALL"
+};
+
+//---------------------------------------------------------------------------
+// standard command constructor
+//---------------------------------------------------------------------------
+
+PivotCommand :: PivotCommand( const string & name,
+								const string & desc )
+		: Command( name, desc, PIVOT_HELP ) {
+
+	AddFlag( ALib::CommandLineFlag( FLAG_ACTION, true, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_COL, true, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_ROW, true, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_FACT, true, 1 ) );
+
+}
+
+//---------------------------------------------------------------------------
+// Pivot the data. We store/accumulate every fact in a map indexed by
+// column and row. We also store the unique column androw values so
+// we can iterate over them when actually producing the output.
+//---------------------------------------------------------------------------
+
+int PivotCommand :: Execute( ALib::CommandLine & cmd ) {
+
+    ProcessFlags( cmd );
+	IOManager io( cmd );
+	CSVRow row;
+
+	while( io.ReadCSV( row ) ) {
+        ColRow cr = MakeColRow( row );
+        AddFact( cr, GetFact( row ));
+        mCols.insert( row[mCol] );
+        mRows.insert( row[mRow] );
+	}
+
+    OutputPivot( io );
+
+	return 0;
+}
+
+//---------------------------------------------------------------------------
+// Output the pivot data.
+//---------------------------------------------------------------------------
+
+void PivotCommand :: OutputPivot( IOManager & io ) {
+
+    CSVRow r;
+    r.push_back( "" );    // corresponds to row header
+    for ( auto col : mCols ) {
+        r.push_back( col );
+    }
+    io.WriteRow( r );
+
+    for( auto row : mRows ) {
+        r.clear();
+        r.push_back( row );
+        for ( auto col : mCols ) {
+            ColRow cr( col, row );
+            SumCount sc = mColRowValMap[ cr ];
+            if ( mAction == Action::Average ) {
+                r.push_back( ALib::Str( sc.mSum / sc.mCount ) );
+            }
+            else {
+                r.push_back( ALib::Str( sc.mSum ) );
+            }
+        }
+        io.WriteRow( r );
+    }
+
+
+}
+
+//---------------------------------------------------------------------------
+// Add fact value to total, or simply count it.
+//---------------------------------------------------------------------------
+
+void PivotCommand :: AddFact( const ColRow & cr, const string & fact )  {
+    if ( (mAction == Action::Average || mAction == Action::Sum) ) {
+        if ( ! ALib::IsNumber( fact ) ) {
+            CSVTHROW( "Non-numeric fact: " << fact);
+        }
+        double fd = ALib::ToReal( fact );
+        mColRowValMap[cr].Update( fd );
+    }
+    else {
+        mColRowValMap[cr].Update(1);
+    }
+}
+
+//---------------------------------------------------------------------------
+// Get fact field as string.
+//---------------------------------------------------------------------------
+
+string PivotCommand :: GetFact( const CSVRow & row ) const {
+    if ( mFact >= row.size() ) {
+        CSVTHROW( "Invalid fact index: " << mFact );
+    }
+    return row[mFact];
+}
+
+//---------------------------------------------------------------------------
+// Create ColRow combination object from two CSV fields.
+//---------------------------------------------------------------------------
+
+PivotCommand::ColRow PivotCommand:: MakeColRow( const CSVRow & row ) const {
+
+    if ( mCol >= row.size() || mRow >= row.size() ) {
+        CSVTHROW( "Invalid row/column index" );
+    }
+
+    return PivotCommand::ColRow( row[mCol], row[mRow] );
+}
+
+//---------------------------------------------------------------------------
+// Get positive integer value for row ,column ad fact  fields
+//---------------------------------------------------------------------------
+
+static unsigned int GetField( const ALib::CommandLine & cmd,
+                                const string & option ) {
+    string rc = cmd.GetValue( option );
+    if ( ! ALib::IsInteger( rc ) ) {
+        CSVTHROW( "Value for " << option << " must be integer" );
+    }
+    int n = ALib::ToInteger( rc );
+    if ( n <= 0 ) {
+        CSVTHROW( "Value for " << option << " must be greater than zero" );
+    }
+    return (unsigned int) n - 1;
+}
+
+//---------------------------------------------------------------------------
+// Get the action to perform when pivotting.
+//---------------------------------------------------------------------------
+
+PivotCommand::Action GetAction( const ALib::CommandLine & cmd ) {
+
+    string as = cmd.GetValue( FLAG_ACTION );
+    if ( as == OP_SUM ) {
+        return PivotCommand::Action::Sum;
+    }
+    else if ( as == OP_COUNT ) {
+        return PivotCommand::Action::Count;
+    }
+    else if ( as == OP_AVG ) {
+        return PivotCommand::Action::Average;
+    }
+    else {
+        CSVTHROW( "Invalid value for " << FLAG_ACTION << ". Need one of sum, count, avg" );
+    }
+
+}
+
+//---------------------------------------------------------------------------
+// Get options - all are requred.
+//---------------------------------------------------------------------------
+
+void PivotCommand :: ProcessFlags( const ALib::CommandLine & cmd ) {
+    mRow = GetField( cmd, FLAG_ROW );
+    mCol = GetField( cmd, FLAG_COL );
+    mFact = GetField( cmd, FLAG_FACT );
+    if ( mRow == mCol ) {
+        CSVTHROW( "Row and column options cannot have the same value" );
+    }
+    mAction = GetAction( cmd );
+}
+
+//------------------------------------------------------------------------
+
+} // end namespace
+
+// end
+
diff --git a/csvfix/src/csved_printf.cpp b/csvfix/src/csved_printf.cpp
old mode 100644
new mode 100755
index aab5cc5..eeedadc
--- a/csvfix/src/csved_printf.cpp
+++ b/csvfix/src/csved_printf.cpp
@@ -34,6 +34,7 @@ const char * const PRINTF_HELP = {
 	"  -fmt fmt\tspecify fields and printf-style formatters\n"
 	"  -f fields\tfield order to pass to formatter\n"
 	"  -q\t\tapply CSV quoting to each printf conversion\n"
+	"  -csv\t\ttreat output as CSV field and append to input row\n"
 	"#SMQ,SEP,IBL,IFN,OFL,SEP,SKIP,PASS"
 };
 
@@ -48,7 +49,7 @@ PrintfCommand :: PrintfCommand( const string & name,
 	AddFlag( ALib::CommandLineFlag( FLAG_FMT, true, 1 ) );
 	AddFlag( ALib::CommandLineFlag( FLAG_COLS, false, 1 ) );
 	AddFlag( ALib::CommandLineFlag( FLAG_QUOTE, false, 0 ) );
-
+	AddFlag( ALib::CommandLineFlag( FLAG_CSV, false, 0 ) );
 }
 
 //----------------------------------------------------------------------------
@@ -59,7 +60,10 @@ int PrintfCommand :: Execute( ALib::CommandLine & cmd ) {
 
 	GetSkipOptions( cmd );
 	string fmt = cmd.GetValue( FLAG_FMT );
+
+    NotBoth( cmd, FLAG_QUOTE, FLAG_CSV );
 	mCSVQuote = cmd.HasFlag( FLAG_QUOTE );
+    bool csv = cmd.HasFlag( FLAG_CSV );
 
 	ParseFormat( fmt );
 	if ( cmd.HasFlag( FLAG_COLS ) ) {
@@ -74,12 +78,16 @@ int PrintfCommand :: Execute( ALib::CommandLine & cmd ) {
 	IOManager io( cmd );
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
-		if ( Pass( row ) ) {
+		if ( Pass( io, row ) ) {
 			io.WriteRow( row );
 		}
+		if ( csv ) {
+            row.push_back( FormatRow( row ) );
+            io.WriteRow( row );
+        }
 		else {
 			string line = FormatRow( row );
 			io.Out() << line << std::endl;
@@ -251,6 +259,30 @@ PrintfCommand::Format PrintfCommand :: GetFormat( unsigned int & pos,
 	}
 }
 
+//----------------------------------------------------------------------------
+// Handle backslash escape characters
+//---------------------------------------------------------------------------
+
+static char GetEscaped( const string & fmt, unsigned int & pos ) {
+    char c = Peek( pos++, fmt );
+    if ( c == 0 ) {
+        CSVTHROW( "Invalid escape" );
+    }
+    else if ( c == 'n' ) {
+        return '\n';
+    }
+    else if ( c == 'r' ) {
+        return '\r';
+    }
+    else if ( c == 't' ) {
+        return '\t';
+    }
+    else {
+        return c;
+    }
+
+}
+
 //----------------------------------------------------------------------------
 // literals are things not beginning with '%'
 //----------------------------------------------------------------------------
@@ -259,7 +291,12 @@ PrintfCommand::Format PrintfCommand :: GetLiteral( unsigned int & pos,
 														const string & fmt ) {
 	string lit;
 	while( pos < fmt.size() && fmt[pos] != '%' ) {
-		lit += fmt[pos++];
+        if ( fmt[pos] == '\\' ) {
+            lit += GetEscaped( fmt, ++pos );
+        }
+        else {
+            lit += fmt[pos++];
+        }
 	}
 	return Format( Literal, lit );
 }
diff --git a/csvfix/src/csved_rmnewline.cpp b/csvfix/src/csved_rmnewline.cpp
old mode 100644
new mode 100755
index fd4bae8..0fd94d6
--- a/csvfix/src/csved_rmnewline.cpp
+++ b/csvfix/src/csved_rmnewline.cpp
@@ -68,10 +68,10 @@ int RemoveNewlineCommand :: Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
-		if ( ! Pass( row ) ) {
+		if ( ! Pass( io, row ) ) {
 			RemoveNewlines( row );
 		}
 		io.WriteRow( row );
diff --git a/csvfix/src/csved_rsort.cpp b/csvfix/src/csved_rsort.cpp
new file mode 100755
index 0000000..78bc782
--- /dev/null
+++ b/csvfix/src/csved_rsort.cpp
@@ -0,0 +1,219 @@
+//---------------------------------------------------------------------------
+// csved_rsort.cpp
+//
+// Do in-row sorting of CSV fields
+//
+// Copyright (C) 2009 Neil Butterworth
+//---------------------------------------------------------------------------
+
+#include "a_base.h"
+#include "a_collect.h"
+#include "csved_cli.h"
+#include "csved_rsort.h"
+#include "csved_strings.h"
+
+#include <algorithm>
+
+using std::string;
+using std::vector;
+
+namespace CSVED {
+
+//---------------------------------------------------------------------------
+// Register sequence command
+//---------------------------------------------------------------------------
+
+static RegisterCommand <RowSortCommand> rc1_(
+	CMD_RSORT,
+	"in-row sort of CSV fields"
+);
+
+//----------------------------------------------------------------------------
+// Help text
+//----------------------------------------------------------------------------
+
+const char * const ROWSORT_HELP = {
+	"in-row sort of CSV fields\n"
+	"usage: csvfix rowsort [flags] [files ...]\n"
+	"where flags are:\n"
+	"  -f fields\tfields to sort (default is all)\n"
+	"  -a \t\tsort ascending (default)\n"
+	"  -d \t\tsort descending \n"
+	"  -l \t\tlexographic order (default)\n"
+	"  -n \t\tnumeric order\n"
+	"#SMQ,SEP,IBL,IFN,OFL,SKIP,PASS"
+};
+
+//---------------------------------------------------------------------------
+// Standard command ctor
+//---------------------------------------------------------------------------
+
+RowSortCommand :: RowSortCommand( const string & name,
+								const string & desc )
+		: Command( name, desc, ROWSORT_HELP ),
+            mStartPos(UINT_MAX), mSortAscending( true ), mSortLex( true ){
+   	AddFlag( ALib::CommandLineFlag( FLAG_COLS, false, 1, false) );
+   	AddFlag( ALib::CommandLineFlag( FLAG_ASC, false, 0, false) );
+   	AddFlag( ALib::CommandLineFlag( FLAG_DESC, false, 0, false) );
+   	AddFlag( ALib::CommandLineFlag( FLAG_LEX, false, 0, false) );
+   	AddFlag( ALib::CommandLineFlag( FLAG_NUM, false, 0, false) );
+}
+
+//---------------------------------------------------------------------------
+// Sort fields in CSV records
+//---------------------------------------------------------------------------
+
+int RowSortCommand :: Execute( ALib::CommandLine & cmd ) {
+
+	GetSkipOptions( cmd );
+	ProcessFlags( cmd );
+
+	IOManager io( cmd );
+	CSVRow row;
+
+	while( io.ReadCSV( row ) ) {
+		if( Skip( io,row ) ) {
+			continue;
+		}
+		if ( ! Pass( io, row ) ) {
+            SortRow( row );
+		}
+		io.WriteRow( row );
+	}
+
+	return 0;
+}
+
+//---------------------------------------------------------------------------
+// Sort helpers
+//---------------------------------------------------------------------------
+
+template <typename T>
+struct SortDesc {
+    bool operator()( const T & a, const T  & b ) {
+        return a >= b;
+    }
+};
+
+struct StrNum {
+    string mStr;
+    double mNum;
+    StrNum( const string & s ) : mStr( s ), mNum( ALib::ToReal( s ) ) {}
+};
+
+bool operator<( const StrNum & a, const StrNum & b ) {
+    return a.mNum < b.mNum;
+}
+
+struct StrNumSortDesc {
+    bool operator()( const StrNum & a, const StrNum  & b ) {
+        return a.mNum >= b.mNum;
+    }
+};
+
+void Dump( const vector<StrNum> & sn ) {
+    for( unsigned int i = 0; i < sn.size(); i++) {
+        std::cout << sn[i].mStr << " " << sn[i].mNum << std::endl;
+    }
+}
+//---------------------------------------------------------------------------
+// Get the fields to be sorted into a temporary vector
+//---------------------------------------------------------------------------
+
+vector <string> RowSortCommand :: GetSortFields( const CSVRow & r )  {
+    vector <string> sf;
+    for( unsigned int i = 0; i < r.size(); i++ ) {
+        if ( mFields.size() == 0 || ALib::Contains( mFields, i ) ) {
+            if ( mStartPos == UINT_MAX ) {
+                mStartPos = i;
+            }
+            sf.push_back( r[i] );
+        }
+    }
+    return sf;
+
+}
+
+//---------------------------------------------------------------------------
+// Put the sorted fields back in the row for output.
+//---------------------------------------------------------------------------
+
+void RowSortCommand ::PutSortFields(  CSVRow & row,
+                                        const vector <string> & sf ) const {
+    for( unsigned int i =0; i < sf.size(); i++ ) {
+        row[mStartPos + i] = sf[i];
+    }
+}
+
+
+//---------------------------------------------------------------------------
+// Sort CSV fields in a single CSV record
+//---------------------------------------------------------------------------
+
+void RowSortCommand :: SortRow( CSVRow & row ) {
+    vector <string> sf = GetSortFields( row );
+    if ( mSortLex ) {
+        if ( mSortAscending ) {
+            std::sort( sf.begin(), sf.end() );
+        }
+        else {
+            SortDesc <string> sd;
+            std::sort( sf.begin(), sf.end(), sd );
+        }
+    }
+    else {
+        vector <StrNum> sn;
+        for( unsigned int i = 0; i < sf.size(); i++ ) {
+            sn.push_back( StrNum( sf[i] ) );
+        }
+        if ( mSortAscending ) {
+            std::sort( sn.begin(), sn.end() );
+        }
+        else {
+            StrNumSortDesc sd;
+            std::sort( sn.begin(), sn.end(), sd );
+        }
+        for( unsigned int i = 0; i < sn.size(); i++ ) {
+            sf[i] = sn[i].mStr;
+        }
+    }
+    PutSortFields( row, sf );
+}
+
+//---------------------------------------------------------------------------
+// Check fields to sort are contiguous
+//---------------------------------------------------------------------------
+
+static void CheckContiguous( const FieldList & fl ) {
+    if ( fl.size() == 0 ){
+        return;
+    }
+    unsigned int pos = fl[0];
+    for( unsigned int i = 1; i < fl.size(); i++ ) {
+        if ( fl[i] != pos + 1 ) {
+            CSVTHROW( "Fields to sort must be contiguous" );
+        }
+        pos = fl[i];
+    }
+}
+
+//---------------------------------------------------------------------------
+// Handle all user options with error checking
+//---------------------------------------------------------------------------
+
+void RowSortCommand :: ProcessFlags( const ALib::CommandLine & cmd ) {
+    NotBoth( cmd, FLAG_ASC, FLAG_DESC );
+    NotBoth( cmd, FLAG_LEX, FLAG_NUM );
+    mSortAscending = ! cmd.HasFlag( FLAG_DESC );
+    mSortLex = ! cmd.HasFlag( FLAG_NUM );
+    if ( cmd.HasFlag( FLAG_COLS )) {
+        ALib::CommaList cl( cmd.GetValue( FLAG_COLS ));
+        CommaListToIndex( cl, mFields );
+        CheckContiguous( mFields );
+    }
+}
+
+} // end namespace
+
+// end
+
diff --git a/csvfix/src/csved_seq.cpp b/csvfix/src/csved_seq.cpp
old mode 100644
new mode 100755
index 153e51a..d4d75c9
--- a/csvfix/src/csved_seq.cpp
+++ b/csvfix/src/csved_seq.cpp
@@ -79,10 +79,10 @@ int SeqCommand :: Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if( Skip( row ) ) {
+		if( Skip( io, row ) ) {
 			continue;
 		}
-		if ( ! Pass( row ) ) {
+		if ( ! Pass( io, row ) ) {
 			AddSeq( row );
 		}
 		io.WriteRow( row );
diff --git a/csvfix/src/csved_sparse.cpp b/csvfix/src/csved_sparse.cpp
old mode 100644
new mode 100755
index c10a553..de2a646
--- a/csvfix/src/csved_sparse.cpp
+++ b/csvfix/src/csved_sparse.cpp
@@ -109,7 +109,7 @@ void CSVChecker :: ReadQuotedField( CSVRow & r ) {
 				Error( "Unexpected double-quote", true );
 			}
 		}
-		else {
+		else if ( mNext == REC_SEP ) {
 			if ( mEmbedNLOK ) {
 				field += mNext;
 			}
diff --git a/csvfix/src/csved_split.cpp b/csvfix/src/csved_split.cpp
old mode 100644
new mode 100755
index 3e9f36e..f5c1989
--- a/csvfix/src/csved_split.cpp
+++ b/csvfix/src/csved_split.cpp
@@ -1,10 +1,16 @@
 //---------------------------------------------------------------------------
 // csved_split.cpp
 //
-// split single field to multple fields
-// can split on specific character or on transitions between char types
+// split single field to multiple fields
+// can split on:
 //
-// Copyright (C) 2009 Neil Butterworth
+//      specific character
+//      transitions between char types
+//      field position and length
+//      field length (with one variable length field)
+//      regular expression match
+//
+// Copyright (C) 2014 Neil Butterworth
 //---------------------------------------------------------------------------
 
 #include "a_base.h"
@@ -19,17 +25,16 @@ using std::vector;
 namespace CSVED {
 
 //----------------------------------------------------------------------------
-// Transition split values
+// Transition split options
 //----------------------------------------------------------------------------
 
-const char * const FLAG_TRANA2N	= "-tan";
-const char * const FLAG_TRANN2A	= "-tna";
+const char * const FLAG_TRANA2N	= "-tan";   // from alpha to digit
+const char * const FLAG_TRANN2A	= "-tna";   // from digit to alpha
 
 //---------------------------------------------------------------------------
-// Register split command
+// Register split commands
 //---------------------------------------------------------------------------
 
-
 static RegisterCommand <SplitFixed> rc1_(
 	CMD_SPLFIX,
 	"split input using fixed sizes"
@@ -37,6 +42,11 @@ static RegisterCommand <SplitFixed> rc1_(
 
 static RegisterCommand <SplitChar> rc2_(
 	CMD_SPLCHR,
+	"split using regular expression"
+);
+
+static RegisterCommand <SplitRegex> rc3_(
+	CMD_SPLREGEX,
 	"split at character or character type transition"
 );
 
@@ -50,10 +60,21 @@ const char * const FSPLIT_HELP = {
 	"where flags are:\n"
 	"  -f field\tindex of the field to be split\n"
 	"  -p plist\tlist of positions to split, in start:len format\n"
+	"  -l lengths\tlengths of fields to split (mutually exclusive with -p)\n"
 	"  -k\t\tretain field being split in output (default is discard it)\n"
 	"#ALL,SKIP,PASS"
 };
 
+const char * const RESPLIT_HELP = {
+	"split using regular expression\n"
+	"usage: csvfix split_fixed  [flags] [file ...]\n"
+	"where flags are:\n"
+	"  -f field\tindex of the field to be split\n"
+	"  -r regex\tregular expression to use to perform split\n"
+	"  -ic\t\tignore case when matching regular expressions\n"
+	"  -k\t\tretain field being split in output (default is discard it)\n"
+	"#ALL,SKIP,PASS"
+};
 const char * const CSPLIT_HELP = {
 	"split CSV field at specific character(s) or character type transition\n"
 	"usage: csvfix split_char  [flags] [file ...]\n"
@@ -118,6 +139,63 @@ void SplitBase :: Insert( CSVRow & row, const CSVRow & split ) {
 	row.swap( tmp );
 }
 
+//---------------------------------------------------------------------------
+// Split via regular expression
+//---------------------------------------------------------------------------
+
+SplitRegex :: SplitRegex( const string & name,
+							const string & desc )
+	: SplitBase( name, desc, RESPLIT_HELP ) {
+	AddFlag( ALib::CommandLineFlag( FLAG_REGEX, true, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_ICASE, false, 0 ) );
+}
+
+//---------------------------------------------------------------------------
+// Split using bracketed exressions then recall and insert into row.
+//---------------------------------------------------------------------------
+
+void SplitRegex :: Split( CSVRow & row ) {
+    CSVRow tmp;
+    string target = Field() < row.size() ? row[ Field() ] : "";
+    mRegex.FindIn( target );
+    for( unsigned int i = 0; i < mRegex.SavedMatchCount(); i++ ) {
+        tmp.push_back( mRegex.SavedMatch(i) );
+    }
+    Insert( row, tmp );
+}
+
+//---------------------------------------------------------------------------
+// Perform regex split.
+//---------------------------------------------------------------------------
+
+int SplitRegex :: Execute( ALib::CommandLine & cmd ) {
+
+	GetSkipOptions( cmd );
+	GetCommonFlags( cmd );
+
+    string rs = cmd.GetValue( FLAG_REGEX );
+    bool ic = cmd.HasFlag( FLAG_ICASE );
+    ALib::RegEx::CaseSense cs = ic  ? ALib::RegEx::Insensitive
+                                    : ALib::RegEx::Sensitive;
+    mRegex = ALib::RegEx( rs, cs );
+
+	IOManager io( cmd );
+	CSVRow row;
+
+	while( io.ReadCSV( row ) ) {
+		if ( Skip( io, row ) ) {
+			continue;
+		}
+		if( ! Pass( io,row ) ) {
+            Split( row );
+		}
+		io.WriteRow( row );
+	}
+
+	return 0;
+}
+
+
 //------------------------------------------------------------------------
 // Split by fixed positions in field
 //---------------------------------------------------------------------------
@@ -125,7 +203,74 @@ void SplitBase :: Insert( CSVRow & row, const CSVRow & split ) {
 SplitFixed :: SplitFixed( const string & name,
 							const string & desc )
 	: SplitBase( name, desc, FSPLIT_HELP ) {
-	AddFlag( ALib::CommandLineFlag( FLAG_POS, true, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_POS, false, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_FLEN, false, 1 ) );
+}
+
+
+//---------------------------------------------------------------------------
+// Create list of field lengths. One field is allowed to be of variable
+// length, which for each record will evaluate to the length of the input
+// minus the lengths of all the fixed length fields.
+//---------------------------------------------------------------------------
+
+const string VARLEN = "*";   // variable length
+
+void SplitFixed :: CreateLengths( const string & ls ) {
+    ALib::CommaList cl( ls );
+    bool havevar = false;
+    for( unsigned int i = 0; i < cl.Size(); i++ ) {
+        string len = cl.At( i );
+        if ( len == VARLEN ) {
+            if ( havevar ) {
+                CSVTHROW( "Only a single variable-length field is allowed" );
+            }
+            havevar = true;
+            mLengths.push_back( 0 );    // variable length indicator
+        }
+        else if ( ALib::IsInteger( len ) ) {
+            int l = ALib::ToInteger( len );
+            if ( l <= 0 ) {
+                CSVTHROW( "Invalid field length: " << len );
+            }
+            mLengths.push_back( l );
+        }
+        else {
+            CSVTHROW( "Invalid field length: " << len );
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+// Split using field lengths. If a variable length field (length 0) was
+// specified, its length is the length of the input minus the lengths of all 
+// the other fields.
+//---------------------------------------------------------------------------
+
+void SplitFixed :: SplitLengths( CSVRow & row ) {
+    string target = Field() < row.size() ? row[ Field() ] : "";
+    int flens =0;
+    for (unsigned int i = 0; i < mLengths.size(); i++) {
+        flens += mLengths[i];
+    }
+    int vlen = target.size() - flens;
+    if ( vlen < 0 ) {
+        vlen = 0;
+    }
+    CSVRow tmp;
+    int pos = 0;
+    for (unsigned int i = 0; i < mLengths.size(); i++) {
+        int len = mLengths[i];
+        if ( len == 0 ) {
+            tmp.push_back( vlen == 0 ? "" : target.substr( pos, vlen ));
+            pos += vlen;
+        }
+        else {
+            tmp.push_back( target.substr( pos, len ) );
+            pos += len;
+        }
+    }
+    Insert( row, tmp );
 }
 
 //---------------------------------------------------------------------------
@@ -134,30 +279,45 @@ SplitFixed :: SplitFixed( const string & name,
 
 int SplitFixed :: Execute( ALib::CommandLine & cmd ) {
 
+    NotBoth( cmd, FLAG_POS, FLAG_FLEN );
 	GetSkipOptions( cmd );
 	GetCommonFlags( cmd );
-	string pos = cmd.GetValue( FLAG_POS );
 
-	if ( ALib::IsEmpty( pos ) ) {
-		CSVTHROW( "Need list of position pairs specified by " << FLAG_POS );
-	}
-
-	CreatePositions( pos );
+	if ( cmd.HasFlag( FLAG_POS ) ) {
+        string pos = cmd.GetValue( FLAG_POS );
+        if ( ALib::IsEmpty( pos ) ) {
+            CSVTHROW( "Need list of position pairs specified by " << FLAG_POS );
+        }
+        CreatePositions( pos );
+    }
+    else if ( cmd.HasFlag( FLAG_FLEN ) ) {
+        string lens = cmd.GetValue( FLAG_FLEN );
+        if ( ALib::IsEmpty( lens ) ) {
+            CSVTHROW( "Need list of lengths specified by " << FLAG_FLEN );
+        }
+        CreateLengths( lens );
+    }
+    else {
+        CSVTHROW( "Need one of" << FLAG_POS << " or " << FLAG_FLEN );
+    }
 
 	IOManager io( cmd );
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
-		if( ! Pass( row ) ) {
-			Split( row );
+		if( ! Pass( io,row ) ) {
+            if ( mLengths.size() ) {
+                SplitLengths( row );
+            }
+            else {
+                Split( row );
+            }
 		}
 		io.WriteRow( row );
 	}
-
-
 	return 0;
 }
 
@@ -261,11 +421,11 @@ int SplitChar :: Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
 
-		if ( ! Pass( row ) ) {
+		if ( ! Pass( io, row ) ) {
 			if ( mTrans == stNone ) {
 				Split( row );
 			}
diff --git a/csvfix/src/csved_sql.cpp b/csvfix/src/csved_sql.cpp
old mode 100644
new mode 100755
index db1cccb..deaab7a
--- a/csvfix/src/csved_sql.cpp
+++ b/csvfix/src/csved_sql.cpp
@@ -327,7 +327,7 @@ int SQLInsertCommand ::	Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( ! Skip( row ) ) {
+		if ( ! Skip( io, row ) ) {
 			io.Out() << CreateInsertSQL( TableName(), row );
 			io.Out() << Separator();
 		}
@@ -446,7 +446,7 @@ int SQLUpdateCommand ::	Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( ! Skip( row ) ) {
+		if ( ! Skip( io, row ) ) {
 			io.Out() << CreateUpdateSQL( TableName(), row );
 			io.Out() << Separator();
 		}
@@ -533,7 +533,7 @@ int SQLDeleteCommand :: Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( ! Skip( row ) ) {
+		if ( ! Skip( io, row ) ) {
 			io.Out() << CreateDeleteSQL( TableName(), row );
 			io.Out() << Separator();
 		}
diff --git a/csvfix/src/csved_squash.cpp b/csvfix/src/csved_squash.cpp
new file mode 100755
index 0000000..503171c
--- /dev/null
+++ b/csvfix/src/csved_squash.cpp
@@ -0,0 +1,275 @@
+//---------------------------------------------------------------------------
+// csved_squash.h
+//
+// squash duplicate rows to single row
+//
+// Copyright (C) 2014 Neil Butterworth
+//---------------------------------------------------------------------------
+
+
+#include "csved_squash.h"
+#include "csved_cli.h"
+#include "csved_strings.h"
+
+#include <climits>
+#include <cfloat>
+
+using std::string;
+
+namespace CSVED {
+
+//---------------------------------------------------------------------------
+// Derived types for integer and double fields
+//---------------------------------------------------------------------------
+
+
+class IntSquashValues : public SquashValues {
+
+    public:
+
+        IntSquashValues( const std::string & nn ) : mNotNum( INT_MAX ) {
+            if ( nn != "" ) {
+                if ( ! ALib::IsInteger( nn ) ) {
+                    CSVTHROW( "Need integer value for " << FLAG_NONUM );
+                }
+                mNotNum = ALib::ToInteger( nn );
+            }
+        }
+
+        virtual void Add( unsigned int idx, const std::string & val ) {
+            int n;
+            if ( ! ALib::IsInteger( val ) ) {
+                if ( mNotNum == INT_MAX ) {
+                    CSVTHROW( "Non-integer value " << val << " for numeric field" );
+                }
+                n = mNotNum;
+            }
+            else {
+                n = ALib::ToInteger( val );
+            }
+
+            if ( idx >= mValues.size() ) {
+                mValues.push_back( n );
+            }
+            else {
+                mValues[idx] += n;
+            }
+        }
+
+        virtual void AppendTo( CSVRow & row ) {
+            for ( auto n : mValues ) {
+                row.push_back( ALib::Str( n ) );
+            }
+        }
+
+
+    private:
+
+        int mNotNum;
+        std::vector <int> mValues;
+};
+
+class RealSquashValues : public SquashValues {
+
+    public:
+
+        RealSquashValues( const std::string & nn ) : mNotNum( DBL_MAX ) {
+            if ( nn != "" ) {
+                if ( ! ALib::IsNumber( nn ) ) {
+                    CSVTHROW( "Need real number value for " << FLAG_NONUM );
+                }
+                mNotNum = ALib::ToReal( nn );
+            }
+        }
+
+        virtual void Add( unsigned int idx, const std::string & val ) {
+            double n;
+            if ( ! ALib::IsNumber( val ) ) {
+                if ( mNotNum == DBL_MAX ) {
+                    CSVTHROW( "Non-real number value " << val << " for numeric field" );
+                }
+                n = mNotNum;
+            }
+            else {
+                n = ALib::ToReal( val );
+            }
+            if ( idx >= mValues.size() ) {
+                mValues.push_back( n );
+            }
+            else {
+                mValues[idx] += n;
+            }
+        }
+
+        virtual void AppendTo( CSVRow & row ) {
+            for ( auto n : mValues ) {
+                row.push_back( ALib::Str( n ) );
+            }
+        }
+
+    private:
+
+        double mNotNum;
+        std::vector <double> mValues;
+};
+
+//---------------------------------------------------------------------------
+// Register squash command
+//---------------------------------------------------------------------------
+
+static RegisterCommand <SquashCommand> rc1_(
+	CMD_SQUASH,
+	"squash duplicate rows to single row"
+);
+
+//----------------------------------------------------------------------------
+// Squash command help
+//----------------------------------------------------------------------------
+
+const char * const UNIQUE_HELP = {
+	"squash duplicate rows to single row \n"
+	"usage: csvfix squash [flags] [files ...]\n"
+	"where flags are:\n"
+	"  -f fields\tfields specifying key (required)\n"
+	"  -n fields\toutput only duplicate rows (required)\n"
+	"  -nn val\tvalue to use if -n field contains non-numeric value\n"
+	"  -rn \t\ttreat -n fields as real numbers rather than as integers\n"
+	"#SMQ,SEP,IBL,IFN,OFL,SKIP"
+
+};
+
+//---------------------------------------------------------------------------
+// Standard ctor
+//---------------------------------------------------------------------------
+
+SquashCommand :: SquashCommand( const string & name,
+								const string & desc )
+		: Command( name, desc, UNIQUE_HELP), mRealNums( false ) {
+
+	AddFlag( ALib::CommandLineFlag( FLAG_COLS, true, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_NUM, true, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_NONUM, false, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_REALS, false, 0 ) );
+
+}
+
+//---------------------------------------------------------------------------
+// Read inputs and squash rows with same key.
+//---------------------------------------------------------------------------
+
+int SquashCommand :: Execute( ALib::CommandLine & cmd ) {
+
+    GetSkipOptions( cmd );
+    ProcessFlags( cmd );
+
+	IOManager io( cmd );
+	CSVRow row;
+
+	while( io.ReadCSV( row ) ) {
+
+        if ( Skip( io, row ) ) {
+			continue;
+		}
+
+
+        string key = MakeKey( row );
+        auto it = mKeyValues.find( key );
+        if ( it == mKeyValues.end() ) {
+
+            std::shared_ptr <SquashValues> vp(
+                mRealNums ? (SquashValues*) new RealSquashValues( mNotNumVal )
+                          : (SquashValues*) new IntSquashValues( mNotNumVal ) );
+            Accumulate( vp, row );
+            mKeyValues.insert( std::make_pair( key, vp ) );
+        }
+        else {
+            Accumulate( it->second, row );
+        }
+    }
+
+    for ( auto it : mKeyValues ) {
+        CSVRow outrow;
+        Key2CSV( it.first, outrow );
+        it.second->AppendTo( outrow );
+        io.WriteRow( outrow );
+    }
+
+    return 0;
+}
+
+
+//---------------------------------------------------------------------------
+// Convert null-separated key to CSV
+//---------------------------------------------------------------------------
+
+void SquashCommand :: Key2CSV( const std::string & key, CSVRow & row) {
+    string f;
+    for( unsigned int i =0; i < key.size(); i++ ) {
+        if ( key[i] == 0 ) {
+            row.push_back( f );
+            f = "";
+        }
+        else {
+            f += key[i];
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+// Accumulate values (or initialise, if first row seen)
+//---------------------------------------------------------------------------
+
+void SquashCommand :: Accumulate( std::shared_ptr<SquashValues>& vp,
+                            const CSVRow & row ) {
+    int n = 0;
+    for ( auto i : mValFields ) {
+        string v = GetField( row, i );
+        vp->Add( n, v );
+        n++;
+    }
+}
+
+//---------------------------------------------------------------------------
+// Create key from row by concatting key fields separated by a null char.
+//---------------------------------------------------------------------------
+
+string SquashCommand :: MakeKey( const CSVRow & row ) const{
+
+    string key;
+    for( auto i : mKeyFields ) {
+        string f = GetField( row, i );
+        key += f;
+        key += '\0';
+    }
+    return key;
+}
+
+//---------------------------------------------------------------------------
+// Read command line parameters.
+//---------------------------------------------------------------------------
+
+void SquashCommand :: ProcessFlags( const ALib::CommandLine & cmd ) {
+
+    string f = cmd.GetValue( FLAG_COLS, ""  );
+	if ( f == "" ) {
+        CSVTHROW( FLAG_COLS << " must specify field list" );
+	}
+	CommaListToIndex( ALib::CommaList( f ), mKeyFields );
+
+    f = cmd.GetValue( FLAG_NUM, ""  );
+    if ( f == "" ) {
+        CSVTHROW( FLAG_NUM << " must specify field list" );
+    }
+    CommaListToIndex( ALib::CommaList( f ), mValFields );
+
+	mRealNums = cmd.HasFlag( FLAG_REALS );
+	mNotNumVal = cmd.GetValue( FLAG_NONUM, "" );
+}
+
+
+//------------------------------------------------------------------------
+
+} // end namespace
+
+// end
+
diff --git a/csvfix/src/csved_stat.cpp b/csvfix/src/csved_stat.cpp
old mode 100644
new mode 100755
index b2f2013..d5bf761
--- a/csvfix/src/csved_stat.cpp
+++ b/csvfix/src/csved_stat.cpp
@@ -12,6 +12,7 @@
 #include "csved_stat.h"
 #include "csved_strings.h"
 #include <string>
+#include <memory>
 using std::string;
 
 namespace CSVED {
@@ -35,6 +36,8 @@ const char * const STAT_HELP = {
 	"produce record/field statistics for CSV files\n"
 	"usage: csvfix stat [flags] [file ...]\n"
 	"where flags are:\n"
+    "  -fs\t\tproduce full record stats (default is simplified output)\n"
+	"  -fn\t\tspecify that input contains a header record listing field names\n"
 	"#ALL"
 };
 
@@ -44,38 +47,102 @@ const char * const STAT_HELP = {
 
 StatCommand :: StatCommand( const string & name, const string & desc )
 				: Command( name, desc, STAT_HELP ) {
+    AddFlag( ALib::CommandLineFlag( FLAG_FSTATS, false, 0 ) );
+    AddFlag( ALib::CommandLineFlag( FLAG_FNAMES, false, 0 ) );
 }
 
 
+//---------------------------------------------------------------------------
+// Helper to record max field lengths
+//---------------------------------------------------------------------------
+
+void RecordLengths( const CSVRow & row, std::vector <int> & lengths ) {
+    for ( unsigned int i = 0; i < row.size(); i++ ) {
+        if ( i >= lengths.size() ) {
+            lengths.push_back( row[i].size() );
+        }
+        else {
+            lengths[i] = std::max( lengths[i], (int) row[i].size() );
+        }
+    }
+}
+
 //----------------------------------------------------------------------------
+// Produce full/simple file stats.
+// ---------------------------------------------------------------------------
+
+int StatCommand :: Execute( ALib::CommandLine & cmd ) {
+
+    if ( cmd.HasFlag( FLAG_FSTATS ) ) {
+        FullStats( cmd );
+    }
+    else {
+        SimpleStats( cmd );
+    }
+	return 0;
+}
+
+
+//---------------------------------------------------------------------------
+// Full stats with field names, types etc.
+//---------------------------------------------------------------------------
+
+void StatCommand :: FullStats(  ALib::CommandLine & cmd ){
+
+    bool usehead = cmd.HasFlag( FLAG_FNAMES );
+    string lastfile = "";
+    IOManager io( cmd );
+    CSVRow row;
+    std::shared_ptr <FileStats> stats;
+
+    while( io.ReadCSV( row ) ) {
+        if ( io.CurrentFileName() != lastfile ) {
+            if ( lastfile != "" ) {
+                stats->Report( io );
+            }
+            lastfile = io.CurrentFileName();
+            stats = std::make_shared<FileStats>( lastfile, usehead ? row : CSVRow() );
+            if ( usehead ) {
+                continue;
+            }
+        }
+        stats->UpdateStats( row );
+    }
+    stats->Report( io );
+}
+
+//---------------------------------------------------------------------------
+// Simple stats as per old version of stat command.
 // Stat the files in the IO manager, reporting file name, number of records
 // (not not number of lines!) and min and max field counts.
-//----------------------------------------------------------------------------
+// Now also output max lengths of all fields.
+//---------------------------------------------------------------------------
 
-int StatCommand :: Execute( ALib::CommandLine & cmd ) {
+void StatCommand :: SimpleStats(  ALib::CommandLine & cmd ) {
 
 	IOManager io( cmd );
-
 	string filename;
 	int lines = 0, fmin = INT_MAX, fmax = 0;
 	CSVRow row;
+    std::vector <int> lengths;
 
 	while( io.ReadCSV( row ) ) {
 		if ( filename != io.CurrentFileName() ) {
 			if ( filename != "" ) {
-				OutputStats( io, filename, lines, fmin, fmax );
+				OutputStats( io, filename, lines, fmin, fmax, lengths );
 			}
 			filename = io.CurrentFileName();
-			lines = 0; fmin = INT_MAX; fmax = 0;
+			lines = 0; fmin = INT_MAX; fmax = 0; lengths.clear();
 		}
+		RecordLengths( row, lengths );
 		lines++;
 		fmin = std::min( fmin, (int) row.size() );
 		fmax = std::max( fmax, (int) row.size() );
 	}
+
 	if ( filename != "" ) {
-		OutputStats( io, filename, lines, fmin, fmax );
+		OutputStats( io, filename, lines, fmin, fmax, lengths );
 	}
-	return 0;
 }
 
 //----------------------------------------------------------------------------
@@ -83,15 +150,63 @@ int StatCommand :: Execute( ALib::CommandLine & cmd ) {
 //----------------------------------------------------------------------------
 
 void StatCommand :: OutputStats( IOManager & io, const string & fname,
-									int lines, int minf, int maxf )  {
+									int lines, int minf, int maxf,
+									const std::vector <int> & lengths )  {
 	CSVRow row;
 	row.push_back( fname );
 	row.push_back( ALib::Str( lines ) );
 	row.push_back( ALib::Str( minf ) );
 	row.push_back( ALib::Str( maxf ) );
+	for ( int i : lengths ) {
+        row.push_back( ALib::Str( i ));
+    }
 	io.WriteRow( row );
 }
 
+//---------------------------------------------------------------------------
+// FileStats records details about an individual file - name, field names and
+// individual field stats.
+//---------------------------------------------------------------------------
+
+
+FileStats :: FileStats( const string & filename, const CSVRow & fieldnames )
+    : mFileName( filename ), mFieldNames( fieldnames ) {
+}
+
+//---------------------------------------------------------------------------
+// Update detailed statistics with contents of a row.
+//---------------------------------------------------------------------------
+
+void FileStats :: UpdateStats( const CSVRow & row ) {
+    for ( unsigned int i = 0; i < row.size(); i++ ) {
+        if ( i >= mFieldNames.size() ) {
+            mFieldNames.push_back( ALib::Str( i + 1 ) );
+        }
+        if ( i >= mFields.size() ) {
+            mFields.push_back( FieldRecord( mFieldNames[i] ));
+        }
+        int len = row[i].size();
+        mFields[i].mType = Transition( mFields[i].mType, row[i] );
+        mFields[i].mMinLen = std::min( len, mFields[i].mMinLen );
+        mFields[i].mMaxLen = std::max( len, mFields[i].mMaxLen );
+    }
+}
+
+//---------------------------------------------------------------------------
+// Report accumulated detailed statistics.
+//---------------------------------------------------------------------------
+
+void FileStats:: Report( IOManager & io ) const {
+    for ( unsigned int i = 0; i < mFields.size(); i++ ) {
+        CSVRow row;
+        row.push_back( mFileName );
+        row.push_back( mFieldNames[i] );
+        row.push_back( FT2Str( mFields[i].mType ) );
+        row.push_back( ALib::Str( mFields[i].mMinLen ) );
+        row.push_back( ALib::Str( mFields[i].mMaxLen ) );
+        io.WriteRow( row );
+    }
+}
 
 
 //----------------------------------------------------------------------------
diff --git a/csvfix/src/csved_template.cpp b/csvfix/src/csved_template.cpp
old mode 100644
new mode 100755
index 237eea3..0ad0042
--- a/csvfix/src/csved_template.cpp
+++ b/csvfix/src/csved_template.cpp
@@ -10,6 +10,8 @@
 #include "csved_template.h"
 #include "csved_strings.h"
 #include "csved_except.h"
+#include "csved_util.h"
+
 #include "a_expr.h"
 #include <fstream>
 
@@ -44,6 +46,7 @@ const char * const TPL_HELP = {
 	"where flags are:\n"
 	"  -ft file\tspecify name of template file\n"
 	"  -fn ftpl\tspecify template for generating file names\n"
+	"  -ts str\tspecifies a string containing the template\n"
 	"#IBL,SEP,IFN,OFL,SKIP"
 };
 
@@ -55,8 +58,9 @@ TemplateCommand ::	TemplateCommand( const string & name,
 									 const string & desc )
 		: Command( name, desc, TPL_HELP ) {
 
-	AddFlag( ALib::CommandLineFlag( FLAG_TFILE, true, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_TFILE, false, 1 ) );
 	AddFlag( ALib::CommandLineFlag( FLAG_FNAMES, false, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_TPLSTR, false, 1 ) );
 }
 
 //---------------------------------------------------------------------------
@@ -76,7 +80,7 @@ int TemplateCommand :: Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
 
@@ -203,27 +207,41 @@ string TemplateCommand :: ReplaceColumns( const string & tplate,
 }
 
 //---------------------------------------------------------------------------
-// Read template file into mTemplate member
+// Read template file into mTemplate member.
+// Can now specify template text as command line option.
 //---------------------------------------------------------------------------
 
 void TemplateCommand :: ReadTemplate( const ALib::CommandLine & cmd ) {
-	string fname = cmd.GetValue( FLAG_TFILE );
-	if ( ALib::IsEmpty( fname ) ) {
-		CSVTHROW( "Need template file name specified with "
-						<< FLAG_TFILE << " flag" );
-	}
-	std::ifstream ifs( fname.c_str() );
-	if ( ! ifs.is_open() ) {
-		CSVTHROW( "Cannot open file " << fname << "  for input" );
-	}
 
-	mTemplate = "";
-	string line;
-	while( std::getline( ifs, line ) ) {
-		mTemplate += line + "\n";
-	}
+    NotBoth( cmd, FLAG_TPLSTR, FLAG_TFILE );
+
+	if ( cmd.HasFlag( FLAG_TFILE ) ) {
+        string fname = cmd.GetValue( FLAG_TFILE );
+        if ( ALib::IsEmpty( fname ) ) {
+            CSVTHROW( "Need template file name specified with "
+                            << FLAG_TFILE << " flag" );
+        }
+        std::ifstream ifs( fname.c_str() );
+        if ( ! ifs.is_open() ) {
+            CSVTHROW( "Cannot open file " << fname << "  for input" );
+        }
+
+        mTemplate = "";
+        string line;
+        while( std::getline( ifs, line ) ) {
+            mTemplate += line + "\n";
+        }
+    }
+    else if( cmd.HasFlag( FLAG_TPLSTR ) ) {
+        mTemplate = cmd.GetValue( FLAG_TPLSTR );
+        if ( ALib::IsEmpty( mTemplate ) ) {
+            CSVTHROW( "Empty template string not allowed" );
+        }
+    }
+    else {
+        CSVTHROW( "Need one of " << FLAG_TFILE << " or " << FLAG_TPLSTR );
+    }
 
-	ifs.close();
 }
 
 //------------------------------------------------------------------------
diff --git a/csvfix/src/csved_timestamp.cpp b/csvfix/src/csved_timestamp.cpp
old mode 100644
new mode 100755
index 18b4320..2505b54
--- a/csvfix/src/csved_timestamp.cpp
+++ b/csvfix/src/csved_timestamp.cpp
@@ -112,7 +112,7 @@ int TimestampCommand :: Execute( ALib::CommandLine & cmd ) {
 
 	while( io.ReadCSV( row ) ) {
 
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
 
diff --git a/csvfix/src/csved_toxml.cpp b/csvfix/src/csved_toxml.cpp
old mode 100644
new mode 100755
index 7e1ef0b..8938c67
--- a/csvfix/src/csved_toxml.cpp
+++ b/csvfix/src/csved_toxml.cpp
@@ -268,7 +268,7 @@ int ToXMLCommand :: Execute( ALib::CommandLine & cmd ) {
 		std::unique_ptr <XMLSpecTag> root( ReadSpec( mXMLSpec ) );
 		vector <CSVRow> input;
 		while( io.ReadCSV( row ) ) {
-			if ( ! Skip( row ) ) {
+			if ( ! Skip( io, row ) ) {
 				input.push_back( row );
 			}
 		}
diff --git a/csvfix/src/csved_trim.cpp b/csvfix/src/csved_trim.cpp
old mode 100644
new mode 100755
index 3662ac7..71ffc0c
--- a/csvfix/src/csved_trim.cpp
+++ b/csvfix/src/csved_trim.cpp
@@ -36,6 +36,8 @@ const char * const TRIM_HELP = {
 	"  -f fields\tfields to trim (default is all)\n"
 	"  -l\t\ttrim leading whitespace\n"
 	"  -t\t\ttrim trailing whitespace\n"
+	"  -a\t\tremove all whitespace\n"
+    "  -s\t\ttrim all multiple whitespace to single space\n"
 	"  -w widths\tspecifies widths to truncate fields to\n"
 	"#ALL,SKIP,PASS"
 };
@@ -52,6 +54,8 @@ TrimCommand ::	TrimCommand( const string & name,
 	AddFlag( ALib::CommandLineFlag( FLAG_TRLEAD, false, 0 ) );
 	AddFlag( ALib::CommandLineFlag( FLAG_TRTRAIL, false, 0 ) );
 	AddFlag( ALib::CommandLineFlag( FLAG_WIDTH, false, 1 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_ALL, false, 0 ) );
+	AddFlag( ALib::CommandLineFlag( FLAG_SINGLE, false, 0 ) );
 }
 
 //----------------------------------------------------------------------------
@@ -89,6 +93,13 @@ int TrimCommand ::	Execute( ALib::CommandLine & cmd ) {
 		GetWidths( cmd.GetValue( FLAG_WIDTH ) );
 	}
 
+    mTrimAll = cmd.HasFlag( FLAG_ALL );
+    mTrim2Single = cmd.HasFlag( FLAG_SINGLE );
+
+    if ( mTrimAll && mTrim2Single )  {
+        CSVTHROW( "Cannot use both " << FLAG_ALL << " and " << FLAG_SINGLE );
+    }
+
 	ALib::CommaList cl( cmd.GetValue( FLAG_COLS, "" ) );
 	CommaListToIndex( cl, mFields );
 
@@ -96,11 +107,11 @@ int TrimCommand ::	Execute( ALib::CommandLine & cmd ) {
 	CSVRow row;
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
 
-		if ( ! Pass( row ) ) {
+		if ( ! Pass( io, row ) ) {
 			Trim( row );
 		}
 		io.WriteRow( row );
@@ -133,6 +144,46 @@ void TrimCommand :: Chop( CSVRow & row, unsigned int  i ) {
 	}
 }
 
+//---------------------------------------------------------------------------
+// Remove all whitespace
+//---------------------------------------------------------------------------
+
+static string TrimAll( const string & s ) {
+    string result;
+    for ( auto c : s ) {
+        if ( ! std::isspace( c ) ) {
+            result += c;
+        }
+    }
+    return result;
+}
+
+//---------------------------------------------------------------------------
+// Reduce multiple whitespace to single space
+//---------------------------------------------------------------------------
+
+static string Trim2Single( const string & s ) {
+    string result;
+    bool havespace = false;
+    for ( auto c : s ) {
+        if ( std::isspace( c ) ) {
+            if ( havespace ){
+                continue;
+            }
+            else {
+                result += ' ';
+                havespace = true;
+            }
+        }
+        else {
+            result += c;
+            havespace = false;
+        }
+    }
+    return result;
+}
+
+
 //---------------------------------------------------------------------------
 // Trim fields of row. Always perform whitespace removal and only perform
 // width reductions if widths specified.
@@ -152,6 +203,13 @@ void TrimCommand :: Trim( CSVRow & row ) {
 			}
 		}
 
+		if ( mTrimAll ) {
+            row[i] = TrimAll( row[i] );
+        }
+        else if ( mTrim2Single ) {
+            row[i] = Trim2Single( row[i] );
+        }
+
 		if (  mWidths.size() ) {
 			if ( mFields.size() == 0 || ALib::Contains( mFields, i ) ) {
 				Chop( row, i );
diff --git a/csvfix/src/csved_truncpad.cpp b/csvfix/src/csved_truncpad.cpp
old mode 100644
new mode 100755
index f9f6eec..2741fa4
--- a/csvfix/src/csved_truncpad.cpp
+++ b/csvfix/src/csved_truncpad.cpp
@@ -143,11 +143,11 @@ int TruncPadBase :: Execute( ALib::CommandLine & cmd ) {
 
 	while( io.ReadCSV( row ) ) {
 
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
 
-		if ( ! Pass( row ) ) {
+		if ( ! Pass( io, row ) ) {
 			unsigned int nc = ncolspec ? ncols : row.size() + padding.Size();
 			ProcessRow( row, nc, padding );
 		}
diff --git a/csvfix/src/csved_util.cpp b/csvfix/src/csved_util.cpp
old mode 100644
new mode 100755
index 1fcb068..402f100
--- a/csvfix/src/csved_util.cpp
+++ b/csvfix/src/csved_util.cpp
@@ -110,7 +110,7 @@ int CmpRow( const CSVRow & a, const CSVRow & b, const FieldList & f ) {
 // Get field or empty string if field does not exist
 //----------------------------------------------------------------------------
 
-std:: string GetField( const CSVRow & row, unsigned int  i ) {
+std::string GetField( const CSVRow & row, unsigned int  i ) {
 	return i >= row.size() ? "" : row[i];
 }
 
diff --git a/csvfix/src/csved_valid.cpp b/csvfix/src/csved_valid.cpp
old mode 100644
new mode 100755
index db2629e..d3b965e
--- a/csvfix/src/csved_valid.cpp
+++ b/csvfix/src/csved_valid.cpp
@@ -89,7 +89,7 @@ int ValidateCommand :: Execute( ALib::CommandLine & cmd ) {
 	bool errcode = cmd.HasFlag( FLAG_ERRCODE );
 
 	while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
 		int errcount = 0;
diff --git a/csvfix/src/csved_writemulti.cpp b/csvfix/src/csved_writemulti.cpp
old mode 100644
new mode 100755
index 5286213..956e517
--- a/csvfix/src/csved_writemulti.cpp
+++ b/csvfix/src/csved_writemulti.cpp
@@ -66,7 +66,7 @@ int WriteMultiCommand :: Execute( ALib::CommandLine & cmd ) {
     CSVRow row, master;
     bool haveout = false;
     while( io.ReadCSV( row ) ) {
-		if ( Skip( row ) ) {
+		if ( Skip( io, row ) ) {
 			continue;
 		}
         if ( GetNewMaster( row, master )) {    // new master
@@ -175,7 +175,7 @@ void WriteMultiCommand :: ProcessFlags( const ALib::CommandLine & cmd ) {
 	CommaListToIndex( dl, mDetail );
 
     mHaveRecSep = cmd.HasFlag( FLAG_RECSEP );
-    mRecSep = cmd.GetValue( FLAG_RECSEP, "" );
+    mRecSep = ALib::UnEscape( cmd.GetValue( FLAG_RECSEP, "" ) );
 
 }
 
diff --git a/csvfix/tests/correct/check.test b/csvfix/tests/correct/check.test
old mode 100644
new mode 100755
index e69de29..0664a02
--- a/csvfix/tests/correct/check.test
+++ b/csvfix/tests/correct/check.test
@@ -0,0 +1,2 @@
+data/names.csv - OK
+data/birthdays.csv - OK
diff --git a/csvfix/tests/correct/erase.test b/csvfix/tests/correct/erase.test
new file mode 100755
index 0000000..2d350c3
--- /dev/null
+++ b/csvfix/tests/correct/erase.test
@@ -0,0 +1,8 @@
+"2","3"
+"1","3"
+"1","2"
+"1","","3"
+"foo"
+"foo"
+"foo"
+""
diff --git a/csvfix/tests/correct/exec.test b/csvfix/tests/correct/exec.test
old mode 100644
new mode 100755
index 0713c7c..a62a979
--- a/csvfix/tests/correct/exec.test
+++ b/csvfix/tests/correct/exec.test
@@ -5,3 +5,12 @@
 "George","Elliot","F","GXXrgX EllXXt"
 "Virginia","Woolf","F","VXrgXnXX WXXlf"
 "Oscar","Wilde","M","OscXr WXldX"
+"Charles","Dickens","M","Dickens","Charles","Bleak House","Esther Sumerson","Drippy Heroine"
+"Charles","Dickens","M","Dickens","Charles","Bleak House","Inspector Bucket","Prototype detective"
+"Charles","Dickens","M","Dickens","Charles","Great Expectations","Pip","Deluded ex-blacksmith"
+"Charles","Dickens","M","Dickens","Charles","Bleak House","Mr Vholes","Vampiric lawyer"
+"Jane","Austen","F","Austen","Jane","Emma","Emma Woodhouse","Smug Surrey goddess"
+"Jane","Austen","F","Austen","Jane","Pride & Prejudice","Elizabeth Bennet","Non-drippy heroine"
+"Jane","Austen","F","Austen","Jane","Pride & Prejudice","Mr Darcy","Proud landowner"
+"Herman","Melville","M","Melville","Herman","Moby Dick","Queeqeg","Tattooed harpooneer"
+"Herman","Melville","M","Melville","Herman","Moby Dick","Moby Dick","Great white whale"
diff --git a/csvfix/tests/correct/pivot.test b/csvfix/tests/correct/pivot.test
new file mode 100755
index 0000000..3068f05
--- /dev/null
+++ b/csvfix/tests/correct/pivot.test
@@ -0,0 +1,9 @@
+"","beans","bread","rice"
+"north","37","7","13"
+"south","31","21","10"
+"","beans","bread","rice"
+"north","3","1","2"
+"south","2","2","2"
+"","beans","bread","rice"
+"north","12.3333","7","6.5"
+"south","15.5","10.5","5"
diff --git a/csvfix/tests/correct/printf.test b/csvfix/tests/correct/printf.test
old mode 100644
new mode 100755
index d769c59..a575c4b
--- a/csvfix/tests/correct/printf.test
+++ b/csvfix/tests/correct/printf.test
@@ -15,3 +15,17 @@ Sex: M Name: Oscar Wilde
 Name: Al ""Scarface"" Capone
 Name: Clyde Barrow
 Name: Michael ""Godfather 2"" Corleone
+Sex: M
+Name: Charles Dickens
+Sex: F
+Name: Jane Austen
+Sex: M
+Name: Herman Melville
+Sex: M
+Name: Flann O'Brien
+Sex: F
+Name: George Elliot
+Sex: F
+Name: Virginia Woolf
+Sex: M
+Name: Oscar Wilde
diff --git a/csvfix/tests/correct/rowsort.test b/csvfix/tests/correct/rowsort.test
new file mode 100755
index 0000000..cecc8e5
--- /dev/null
+++ b/csvfix/tests/correct/rowsort.test
@@ -0,0 +1,9 @@
+"1","2","3"
+"1","2","3"
+"1","2","3"
+"1","2","3"
+"1","2","3"
+"1","2","3"
+"3","2","1"
+"3","2","1"
+"3","2","1"
diff --git a/csvfix/tests/correct/splitlen.test b/csvfix/tests/correct/splitlen.test
new file mode 100755
index 0000000..04add11
--- /dev/null
+++ b/csvfix/tests/correct/splitlen.test
@@ -0,0 +1,3 @@
+"A","1234","xx"
+"A","123456","xx"
+"A","","xx"
diff --git a/csvfix/tests/correct/splitregex.test b/csvfix/tests/correct/splitregex.test
new file mode 100755
index 0000000..04add11
--- /dev/null
+++ b/csvfix/tests/correct/splitregex.test
@@ -0,0 +1,3 @@
+"A","1234","xx"
+"A","123456","xx"
+"A","","xx"
diff --git a/csvfix/tests/correct/squash.test b/csvfix/tests/correct/squash.test
new file mode 100755
index 0000000..34c475b
--- /dev/null
+++ b/csvfix/tests/correct/squash.test
@@ -0,0 +1,18 @@
+"bar","8"
+"foo","7"
+"zod","6"
+"foo","bar","4"
+"foo","xxx","5"
+"foo","zod","2"
+"goo","bar","11"
+"zoo","","6"
+"foo","bar","4.4"
+"foo","xxx","5.5"
+"foo","zod","2.2"
+"goo","bar","12.1"
+"zoo","","6.6"
+"foo","bar","4.4"
+"foo","xxx","42"
+"foo","zod","42"
+"goo","bar","12.1"
+"zoo","","6.6"
diff --git a/csvfix/tests/correct/stat.test b/csvfix/tests/correct/stat.test
old mode 100644
new mode 100755
index ed8a90e..3152109
--- a/csvfix/tests/correct/stat.test
+++ b/csvfix/tests/correct/stat.test
@@ -1 +1,14 @@
-"data/names.csv","7","3","3"
+"data/names.csv","7","3","3","8","8","1"
+"data/army.csv","1","string","4","5"
+"data/army.csv","2","string","3","4"
+"data/army.csv","3","string","5","9"
+"data/books.csv","1","string","6","8"
+"data/books.csv","2","string","4","7"
+"data/books.csv","3","string","4","18"
+"data/books.csv","4","string","3","16"
+"data/books.csv","5","string","14","21"
+"data/numbers.csv","1","number","1","1"
+"data/numbers.csv","2","number","2","4"
+"data/army.csv","name","string","4","5"
+"data/army.csv","rank","string","3","3"
+"data/army.csv","serial_no","number","5","5"
diff --git a/csvfix/tests/correct/trim.test b/csvfix/tests/correct/trim.test
old mode 100644
new mode 100755
index 38a5fbd..8d719c8
--- a/csvfix/tests/correct/trim.test
+++ b/csvfix/tests/correct/trim.test
@@ -8,3 +8,7 @@
 "G","E","F"
 "V","W","F"
 "O","W","M"
+"thequickbrownfox"
+"thequickbrownfox"
+"the quick brown fox"
+"the quick brown fox"
diff --git a/csvfix/tests/correct/wmulti.test b/csvfix/tests/correct/wmulti.test
new file mode 100755
index 0000000..7e04d81
--- /dev/null
+++ b/csvfix/tests/correct/wmulti.test
@@ -0,0 +1,20 @@
+bob,dylan
+bringing it all back home
+blonde on blonde
+john wesley harding
+-----
+nick,drake
+bryter later
+pink moon
+-----
+bob,dylan
+bringing it all back home
+blonde on blonde
+john wesley harding
+
+
+nick,drake
+bryter later
+pink moon
+
+
diff --git a/csvfix/tests/data/8bit.csv b/csvfix/tests/data/8bit.csv
new file mode 100755
index 0000000..cab194f
--- /dev/null
+++ b/csvfix/tests/data/8bit.csv
@@ -0,0 +1,3 @@
+ø£Ø
+not
+ø£Ø
diff --git a/csvfix/tests/data/erase.csv b/csvfix/tests/data/erase.csv
new file mode 100755
index 0000000..3e873da
--- /dev/null
+++ b/csvfix/tests/data/erase.csv
@@ -0,0 +1,4 @@
+foo,2,3
+1,foo,3
+1,2,foo
+1,,3
diff --git a/csvfix/tests/data/fsplit.csv b/csvfix/tests/data/fsplit.csv
new file mode 100755
index 0000000..562ad06
--- /dev/null
+++ b/csvfix/tests/data/fsplit.csv
@@ -0,0 +1,4 @@
+1,2,"key 1,2"
+1,3,"key 1,3"
+1,2,"key 1,2"
+4,5,"key 4,5"
diff --git a/csvfix/tests/data/pivot.csv b/csvfix/tests/data/pivot.csv
new file mode 100755
index 0000000..b11726b
--- /dev/null
+++ b/csvfix/tests/data/pivot.csv
@@ -0,0 +1,12 @@
+north,beans,2014-01-01,12
+north,beans,2014-01-01,10
+north,rice,2014-01-02,5
+north,bread,2014-01-02,7
+north,beans,2014-01-03,15
+north,rice,2014-01-03,8
+south,bread,2014-01-01,13
+south,beans,2014-01-01,19
+south,rice,2014-01-02,1
+south,rice,2014-01-02,9
+south,beans,2014-01-03,12
+south,bread,2014-01-03,8
diff --git a/csvfix/tests/data/rsort.csv b/csvfix/tests/data/rsort.csv
new file mode 100755
index 0000000..2c4319e
--- /dev/null
+++ b/csvfix/tests/data/rsort.csv
@@ -0,0 +1,3 @@
+1,2,3
+3,2,1
+1,3,2
diff --git a/csvfix/tests/data/sales_region.csv b/csvfix/tests/data/sales_region.csv
new file mode 100755
index 0000000..0215d55
--- /dev/null
+++ b/csvfix/tests/data/sales_region.csv
@@ -0,0 +1,6 @@
+South,1040
+East,200
+South,78
+North,2023
+West,77
+North,770
diff --git a/csvfix/tests/data/splitlen.csv b/csvfix/tests/data/splitlen.csv
new file mode 100755
index 0000000..74c5ee3
--- /dev/null
+++ b/csvfix/tests/data/splitlen.csv
@@ -0,0 +1,3 @@
+A1234xx
+A123456xx
+Axx
diff --git a/csvfix/tests/data/squash1.csv b/csvfix/tests/data/squash1.csv
new file mode 100755
index 0000000..5e2bbc7
--- /dev/null
+++ b/csvfix/tests/data/squash1.csv
@@ -0,0 +1,6 @@
+foo,1
+foo,2
+bar,3
+foo,4
+bar,5
+zod,6
diff --git a/csvfix/tests/data/squash2.csv b/csvfix/tests/data/squash2.csv
new file mode 100755
index 0000000..4b5c69c
--- /dev/null
+++ b/csvfix/tests/data/squash2.csv
@@ -0,0 +1,7 @@
+foo,bar,1
+foo,zod,2
+foo,bar,3
+goo,bar,4
+foo,xxx,5
+zoo,,6
+goo,bar,7
diff --git a/csvfix/tests/data/squash3.csv b/csvfix/tests/data/squash3.csv
new file mode 100755
index 0000000..26eda7a
--- /dev/null
+++ b/csvfix/tests/data/squash3.csv
@@ -0,0 +1,7 @@
+foo,bar,1.1
+foo,zod,2.2
+foo,bar,3.3
+goo,bar,4.4
+foo,xxx,5.5
+zoo,,6.6
+goo,bar,7.7
diff --git a/csvfix/tests/data/squash4.csv b/csvfix/tests/data/squash4.csv
new file mode 100755
index 0000000..28cb711
--- /dev/null
+++ b/csvfix/tests/data/squash4.csv
@@ -0,0 +1,7 @@
+foo,bar,1.1
+foo,zod,
+foo,bar,3.3
+goo,bar,4.4
+foo,xxx,
+zoo,,6.6
+goo,bar,7.7
diff --git a/csvfix/tests/data/trim2.csv b/csvfix/tests/data/trim2.csv
new file mode 100755
index 0000000..1a90dde
--- /dev/null
+++ b/csvfix/tests/data/trim2.csv
@@ -0,0 +1,2 @@
+the quick brown fox
+the  quick brown       fox
diff --git a/csvfix/tests/data/wmulti.csv b/csvfix/tests/data/wmulti.csv
new file mode 100755
index 0000000..07ec091
--- /dev/null
+++ b/csvfix/tests/data/wmulti.csv
@@ -0,0 +1,5 @@
+bob,dylan,bringing it all back home
+bob,dylan,blonde on blonde
+bob,dylan,john wesley harding
+nick,drake,bryter later
+nick,drake,pink moon
diff --git a/csvfix/tests/tests/check.test b/csvfix/tests/tests/check.test
old mode 100644
new mode 100755
index b62b8fc..4ef3bf7
--- a/csvfix/tests/tests/check.test
+++ b/csvfix/tests/tests/check.test
@@ -1 +1,2 @@
-$CSVED check data/names.csv 
+$CSVED check -v data/names.csv 
+$CSVED check -v data/birthdays.csv 
diff --git a/csvfix/tests/tests/erase.test b/csvfix/tests/tests/erase.test
new file mode 100755
index 0000000..d2c460f
--- /dev/null
+++ b/csvfix/tests/tests/erase.test
@@ -0,0 +1,2 @@
+$CSVED erase -r 'foo' data/erase.csv
+$CSVED erase -r '[0-9]' data/erase.csv
diff --git a/csvfix/tests/tests/exec.test b/csvfix/tests/tests/exec.test
old mode 100644
new mode 100755
index bde1381..ea49416
--- a/csvfix/tests/tests/exec.test
+++ b/csvfix/tests/tests/exec.test
@@ -1 +1,3 @@
 $CSVED exec -c 'echo %1 %2|tr aeiou X' data/names.csv
+$CSVED exec -ix 1 -c 'grep %1 data/books.csv' data/names.csv 
+
diff --git a/csvfix/tests/tests/pivot.test b/csvfix/tests/tests/pivot.test
new file mode 100755
index 0000000..1573a6c
--- /dev/null
+++ b/csvfix/tests/tests/pivot.test
@@ -0,0 +1,3 @@
+$CSVED pivot -c 2 -r 1 -f 4  -a sum data/pivot.csv
+$CSVED pivot -c 2 -r 1 -f 4  -a count data/pivot.csv
+$CSVED pivot -c 2 -r 1 -f 4  -a avg data/pivot.csv
diff --git a/csvfix/tests/tests/printf.test b/csvfix/tests/tests/printf.test
old mode 100644
new mode 100755
index 13313aa..610bc53
--- a/csvfix/tests/tests/printf.test
+++ b/csvfix/tests/tests/printf.test
@@ -1,5 +1,5 @@
 $CSVED printf -fmt 'Name: %10.10s %@ Sex: %s' data/names.csv
 $CSVED printf -f 3,1,2 -fmt 'Sex: %s Name: %s %s' data/names.csv
 $CSVED printf -q -fmt 'Name: %s' data/gangsters.csv
-
+$CSVED printf -f 3,1,2 -fmt 'Sex: %s\nName: %s %s' data/names.csv
 
diff --git a/csvfix/tests/tests/rowsort.test b/csvfix/tests/tests/rowsort.test
new file mode 100755
index 0000000..1ed4b1c
--- /dev/null
+++ b/csvfix/tests/tests/rowsort.test
@@ -0,0 +1,4 @@
+$CSVED rowsort data/rsort.csv
+$CSVED rowsort -n  data/rsort.csv
+$CSVED rowsort -n -d data/rsort.csv
+
diff --git a/csvfix/tests/tests/splitlen.test b/csvfix/tests/tests/splitlen.test
new file mode 100755
index 0000000..8855225
--- /dev/null
+++ b/csvfix/tests/tests/splitlen.test
@@ -0,0 +1 @@
+$CSVED split_fixed -f 1 -l 1,*,2 data/splitlen.csv
diff --git a/csvfix/tests/tests/splitregex.test b/csvfix/tests/tests/splitregex.test
new file mode 100755
index 0000000..6263b40
--- /dev/null
+++ b/csvfix/tests/tests/splitregex.test
@@ -0,0 +1 @@
+$CSVED split_regex -f 1 -r '\(.\)\([0-9]*\)\(.*\)' data/splitlen.csv
diff --git a/csvfix/tests/tests/squash.test b/csvfix/tests/tests/squash.test
new file mode 100755
index 0000000..8f07b10
--- /dev/null
+++ b/csvfix/tests/tests/squash.test
@@ -0,0 +1,4 @@
+$CSVED squash -f 1 -n 2 data/squash1.csv
+$CSVED squash -f 1,2 -n 3 data/squash2.csv
+$CSVED squash -f 1,2 -n 3 -rn data/squash3.csv
+$CSVED squash -f 1,2 -n 3 -rn -nn 42.0 data/squash4.csv
diff --git a/csvfix/tests/tests/stat.test b/csvfix/tests/tests/stat.test
old mode 100644
new mode 100755
index 6b7114c..8a11a57
--- a/csvfix/tests/tests/stat.test
+++ b/csvfix/tests/tests/stat.test
@@ -1 +1,3 @@
 $CSVED stat data/names.csv
+$CSVED stat -fs   data/army.csv data/books.csv data/numbers.csv
+$CSVED stat -fs -fn data/army.csv
diff --git a/csvfix/tests/tests/trim.test b/csvfix/tests/tests/trim.test
old mode 100644
new mode 100755
index 261f262..eaafb5c
--- a/csvfix/tests/tests/trim.test
+++ b/csvfix/tests/tests/trim.test
@@ -1,2 +1,4 @@
 $CSVED trim  data/spaces.csv
 $CSVED trim  -w 1,1,1 data/names.csv
+$CSVED trim  -a data/trim2.csv
+$CSVED trim  -s data/trim2.csv
diff --git a/csvfix/tests/tests/wmulti.test b/csvfix/tests/tests/wmulti.test
new file mode 100755
index 0000000..5d03158
--- /dev/null
+++ b/csvfix/tests/tests/wmulti.test
@@ -0,0 +1,4 @@
+$CSVED write_multi -m 1,2 -rs '-----' -smq data/wmulti.csv
+$CSVED write_multi -m 1,2 -rs '\n' -smq data/wmulti.csv
+
+
diff --git a/docs/src/csvfix-manual.hnd b/docs/src/csvfix-manual.hnd
index e960a814e2561ea8dc3f115161fcddd479f8919e..8e91ccca1de8ed4b744ef62f5fbf0d1bc59068f7 100644
GIT binary patch
delta 35120
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
W&$d#F9WbX%GLr0c>sQE;^Zx+@1P(m_

delta 19984
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


From 858e3f0168810a49580283c1cdf55e40b1d6ae78 Mon Sep 17 00:00:00 2001
From: the-reverend <ronaldpwilson@gmail.com>
Date: Thu, 16 Mar 2023 20:03:18 -0500
Subject: [PATCH 2/2] Documentation updates for Version 1.7

---
 docs/citiescsv.html | 4 ++--
 docs/index.html     | 6 ++++++
 readme.md           | 6 ++++--
 3 files changed, 12 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 readme.md

diff --git a/docs/citiescsv.html b/docs/citiescsv.html
index 266ca81..6652882 100644
--- a/docs/citiescsv.html
+++ b/docs/citiescsv.html
@@ -28,7 +28,7 @@
   <meta property="og:title" content="cities.csv" />
   <meta property="og:type" content="article" />
   <meta property="og:description" content="" />
-  <meta property="og:site_name" content="CSVfix 1.6  Manual" /> 
+  <meta property="og:site_name" content="CSVfix 1.7  Manual" /> 
 
   <!-- Bootstrap core CSS -->
   <link href="vendors/bootstrap-3.4.1/css/bootstrap.min.css" rel="stylesheet"/>
@@ -74,7 +74,7 @@
       <span class="sr-only">Toggle navigation</span>
       <span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span>        
     </button>
-    <h1>CSVfix 1.6  Manual</h1>
+    <h1>CSVfix 1.7  Manual</h1>
     
   </header>
 
diff --git a/docs/index.html b/docs/index.html
index 6020c73..47b772f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -777,6 +777,12 @@
 <p class="rvps4" style="clear: both;"><span class="rvts19">Created with the Personal Edition of HelpNDoc: </span><a class="rvts20" href="https://www.helpndoc.com/feature-tour/create-ebooks-for-amazon-kindle">Write eBooks for the Kindle</a></p>
 <a name="ChangeLog"></a><h2>Change Log</h2>
 <p class="rvps2"><span class="rvts30"><br/></span></p>
+<p class="rvps2"><span class="rvts30">Changes from Version 1.6 to 1.7</span></p>
+<p class="rvps2"><span class="rvts30"><br/></span></p>
+<ul style="text-indent: 0px; padding: 0; margin: 0 0 0 24px; list-style-position: outside; list-style-type: disc;">
+ <li class="rvps2"><span class="rvts31">Code imported without history from some forgotten Mercurial repository.</span></li>
+</ul>
+<p class="rvps2"><span class="rvts31"><br/></span></p>
 <p class="rvps2"><span class="rvts30">Changes from Version 1.5 to 1.6</span></p>
 <p class="rvps2"><span class="rvts30"><br/></span></p>
 <ul style="text-indent: 0px; padding: 0; margin: 0 0 0 24px; list-style-position: outside; list-style-type: disc;">
diff --git a/readme.md b/readme.md
old mode 100644
new mode 100755
index f0a01df..4f9f869
--- a/readme.md
+++ b/readme.md
@@ -10,7 +10,7 @@ For further information, please see the CSVfix website
 at http://neilb.bitbucket.org/csvfix/
 
 Neil Butterworth
-13-Apr-2014
+13-Nov-2014
 
 
 -----
@@ -25,10 +25,12 @@ the code from the Google Code repo, but none of them compiles correctly on Linux
 the mentioned [1.6 on Sourceforce](https://sourceforge.net/projects/csvfix/) that was brought 
 there by [Pedro Albanese](https://sourceforge.net/u/pedroalbanese/profile/). That one works!
 
+UPDATE : A zip of version 1.7 was discovered on a backup drive by [@the-reverend](https://github.com/the-reverend) and it also builds!
+
 I tried to install CSVfix using Homebrew on the Mac but that fails as well, as it tries to use the dead Bitbucket repo.
 
 So the idea of this repository here is:
-   * provide a working copy of 1.6 on Github (done, more or less a copy of Pedros repo)
+   * provide a working copy of 1.7 on Github (done, more or less a copy of [@the-reverend](https://github.com/the-reverend)'s backup)
    * provide a release using Github Actions (done)
    * point Homebrew to the new location (-not accepted by Homebrew-)