Index: tests/io/.in/manipulatorsInput-uchunk.default.10.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.10.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-1  
Index: tests/io/.in/manipulatorsInput-uchunk.default.10.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.10.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.default.10.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+1  
Index: tests/io/.in/manipulatorsInput-uchunk.default.11.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.11.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-  1 123 
Index: tests/io/.in/manipulatorsInput-uchunk.default.11.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.11.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.default.11.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+  1 123 
Index: tests/io/.in/manipulatorsInput-uchunk.default.12.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.12.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-123  12345678  
Index: tests/io/.in/manipulatorsInput-uchunk.default.12.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.12.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.default.12.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+123  12345678  
Index: tests/io/.in/manipulatorsInput-uchunk.default.13.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.13.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
- 12345678 1
Index: tests/io/.in/manipulatorsInput-uchunk.default.13.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.13.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.default.13.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+ 12345678 1
Index: tests/io/.in/manipulatorsInput-uchunk.default.14.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.14.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-  
Index: tests/io/.in/manipulatorsInput-uchunk.default.14.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.14.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.default.14.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+  
Index: tests/io/.in/manipulatorsInput-uchunk.default.2.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.2.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-123
Index: tests/io/.in/manipulatorsInput-uchunk.default.2.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.2.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.default.2.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+123
Index: tests/io/.in/manipulatorsInput-uchunk.default.3.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.3.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-12345678
Index: tests/io/.in/manipulatorsInput-uchunk.default.3.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.3.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.default.3.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+12345678
Index: tests/io/.in/manipulatorsInput-uchunk.default.4.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.4.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
- 
Index: tests/io/.in/manipulatorsInput-uchunk.default.4.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.4.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.default.4.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+ 
Index: tests/io/.in/manipulatorsInput-uchunk.default.5.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.5.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-123 
Index: tests/io/.in/manipulatorsInput-uchunk.default.5.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.5.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.default.5.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+123 
Index: tests/io/.in/manipulatorsInput-uchunk.default.6.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.6.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-12345678 
Index: tests/io/.in/manipulatorsInput-uchunk.default.6.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.6.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.default.6.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+12345678 
Index: tests/io/.in/manipulatorsInput-uchunk.default.7.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.7.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-1
Index: tests/io/.in/manipulatorsInput-uchunk.default.7.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.7.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.default.7.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+1
Index: tests/io/.in/manipulatorsInput-uchunk.default.8.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.8.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
- 1123 
Index: tests/io/.in/manipulatorsInput-uchunk.default.8.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.8.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.default.8.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+ 1123 
Index: tests/io/.in/manipulatorsInput-uchunk.default.9.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.9.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-  1
Index: tests/io/.in/manipulatorsInput-uchunk.default.9.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.default.9.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.default.9.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+  1
Index: tests/io/.in/manipulatorsInput-uchunk.getline.10.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.10.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,2 +1,0 @@
-1
-
Index: tests/io/.in/manipulatorsInput-uchunk.getline.10.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.10.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.getline.10.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,2 @@
+1
+
Index: tests/io/.in/manipulatorsInput-uchunk.getline.11.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.11.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,4 +1,0 @@
-
-
-1
-123 
Index: tests/io/.in/manipulatorsInput-uchunk.getline.11.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.11.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.getline.11.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,4 @@
+
+
+1
+123 
Index: tests/io/.in/manipulatorsInput-uchunk.getline.12.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.12.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,4 +1,0 @@
-123
-
-12345678
-
Index: tests/io/.in/manipulatorsInput-uchunk.getline.12.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.12.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.getline.12.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,4 @@
+123
+
+12345678
+
Index: tests/io/.in/manipulatorsInput-uchunk.getline.13.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.13.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,3 +1,0 @@
-
-12345678
-1
Index: tests/io/.in/manipulatorsInput-uchunk.getline.13.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.13.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.getline.13.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,3 @@
+
+12345678
+1
Index: tests/io/.in/manipulatorsInput-uchunk.getline.14.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.14.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,2 +1,0 @@
-
-
Index: tests/io/.in/manipulatorsInput-uchunk.getline.14.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.14.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.getline.14.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,2 @@
+
+
Index: tests/io/.in/manipulatorsInput-uchunk.getline.2.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.2.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-123
Index: tests/io/.in/manipulatorsInput-uchunk.getline.2.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.2.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.getline.2.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+123
Index: tests/io/.in/manipulatorsInput-uchunk.getline.3.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.3.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-12345678
Index: tests/io/.in/manipulatorsInput-uchunk.getline.3.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.3.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.getline.3.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+12345678
Index: tests/io/.in/manipulatorsInput-uchunk.getline.4.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.4.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-
Index: tests/io/.in/manipulatorsInput-uchunk.getline.4.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.4.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.getline.4.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+
Index: tests/io/.in/manipulatorsInput-uchunk.getline.5.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.5.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-123
Index: tests/io/.in/manipulatorsInput-uchunk.getline.5.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.5.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.getline.5.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+123
Index: tests/io/.in/manipulatorsInput-uchunk.getline.6.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.6.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-12345678
Index: tests/io/.in/manipulatorsInput-uchunk.getline.6.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.6.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.getline.6.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+12345678
Index: tests/io/.in/manipulatorsInput-uchunk.getline.7.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.7.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,1 +1,0 @@
-1
Index: tests/io/.in/manipulatorsInput-uchunk.getline.7.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.7.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.getline.7.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,1 @@
+1
Index: tests/io/.in/manipulatorsInput-uchunk.getline.8.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.8.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,2 +1,0 @@
-
-123
Index: tests/io/.in/manipulatorsInput-uchunk.getline.8.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.8.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.getline.8.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,2 @@
+
+123
Index: tests/io/.in/manipulatorsInput-uchunk.getline.9.auxdata
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.9.auxdata	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ 	(revision )
@@ -1,3 +1,0 @@
-
-
-1
Index: tests/io/.in/manipulatorsInput-uchunk.getline.9.txt
===================================================================
--- tests/io/.in/manipulatorsInput-uchunk.getline.9.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
+++ tests/io/.in/manipulatorsInput-uchunk.getline.9.txt	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -0,0 +1,3 @@
+
+
+1
Index: tests/io/manipulatorsInput-uchunk.cfa
===================================================================
--- tests/io/manipulatorsInput-uchunk.cfa	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ tests/io/manipulatorsInput-uchunk.cfa	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -141,5 +141,5 @@
     }
 
-    #define SUBCASE_( TRYREAD_FUNCTION, IN_FILE_SLUG ) forkJoinSubcase( TRYREAD_FUNCTION, (IN_FILE_SLUG), (xstr(IN_DIR) "manipulatorsInput-uchunk." IN_FILE_SLUG ".auxdata") )
+    #define SUBCASE_( TRYREAD_FUNCTION, IN_FILE_SLUG ) forkJoinSubcase( TRYREAD_FUNCTION, (IN_FILE_SLUG), (xstr(IN_DIR) "manipulatorsInput-uchunk." IN_FILE_SLUG ".txt") )
     #define SUBCASE( MANIP, IN_FILE_SUFFIX ) SUBCASE_( tryread_ ## MANIP, #MANIP "." #IN_FILE_SUFFIX )
 
Index: tests/io/manipulatorsInput-uchunk.extra.sh
===================================================================
--- tests/io/manipulatorsInput-uchunk.extra.sh	(revision efe697d7961e2d85c347384ad29592fc7d5af800)
+++ tests/io/manipulatorsInput-uchunk.extra.sh	(revision 406c8069221de95ca6bafc04c5589965e3418c37)
@@ -12,5 +12,5 @@
 # ls
 # diff -y all-noend.expect.txt all-noend.cpp-actual.txt | nl
-# ./uchunk-getline-cfa < ~/mywork/cfa-cc/tests/io/.in/manipulatorsInput-uchunk.getline.1.auxdata
+# ./uchunk-getline-cfa < ~/mywork/cfa-cc/tests/io/.in/manipulatorsInput-uchunk.getline.1.txt
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
@@ -53,4 +53,4 @@
 echo diff -y all.cpp-actual.txt all.cfa-actual.txt '|' nl
 echo diff -y all-noend.cpp-actual.txt all-noend.cfa-actual.txt '|' nl
-echo './uchunk-getline-cfa <' $SCRIPT_DIR/.in/manipulatorsInput-uchunk.getline.1.auxdata
-echo './uchunk-default-cfa <' $SCRIPT_DIR/.in/manipulatorsInput-uchunk.default.1.auxdata
+echo './uchunk-getline-cfa <' $SCRIPT_DIR/.in/manipulatorsInput-uchunk.getline.1.txt
+echo './uchunk-default-cfa <' $SCRIPT_DIR/.in/manipulatorsInput-uchunk.default.1.txt