[svn-r8580] Purpose:

bug fix

Description:
the output of array indices for the array datatype case was not done correctly

Solution:

Platforms tested:
linux
solaris
AIX

Misc. update:

8 files changed, 396 insertions, 385 deletions

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 6ceb916..13d8153 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -161,6 +161,7 @@ static h5dump_t         dataformat = {
     "%s",			/*dset_blockformat_pre */
     "%s",			/*dset_ptformat_pre */
     "%s",			/*dset_ptformat */
+    1       /*array indices */
 };
 
 /**
@@ -243,6 +244,7 @@ static h5dump_t         xml_dataformat = {
     "%s",			/*dset_blockformat_pre */
     "%s",			/*dset_ptformat_pre */
     "%s",			/*dset_ptformat */
+     0      /*array indices */
 };
 
 /** XML **/
@@ -1923,7 +1925,8 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int pindex)
         }
 
  /* print the matrix indices */
- if (pindex)
+ outputformat->pindex=pindex;
+ if (outputformat->pindex)
  {
   outputformat->idx_fmt = "(%s)";
   outputformat->idx_n_fmt = "%lu";
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index c1d231a..5e47f10 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -320,6 +320,9 @@ typedef struct h5dump_t {
     const char *dset_ptformat_pre;
     const char *dset_ptformat;
 
+    /*print array indices in output matrix */
+    int pindex;
+
 } h5dump_t;
 
 typedef struct dump_header{
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 3d9aaf7..80ad868 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -856,8 +856,13 @@ h5tools_str_sprint(h5tools_str_t *str, const h5dump_t *info, hid_t container,
                 h5tools_str_append(str, "%s", "\n");
 
                 /*need to indent some more here*/
-                if (ctx->indent_level >= 0)
-                    h5tools_str_append(str, "%s", OPT(info->line_pre, ""));
+                if (ctx->indent_level >= 0 )
+                {
+                 if (info->pindex)
+                  h5tools_str_append(str, "%s", "          ");
+                 else
+                  h5tools_str_append(str, "%s", OPT(info->line_pre, ""));
+                }
 
                 for (x = 0; x < ctx->indent_level + 1; x++)
                     h5tools_str_append(str,"%s",OPT(info->line_indent,""));
diff --git a/tools/testfiles/tarray2.ddl b/tools/testfiles/tarray2.ddl
index 167d480..40e284d 100644
--- a/tools/testfiles/tarray2.ddl
+++ b/tools/testfiles/tarray2.ddl
@@ -8,53 +8,53 @@ GROUP "/" {
       DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
         (0) [ 0, 1, 2, 3, 4,
-        %s    10, 11, 12, 13, 14,
-        %s    20, 21, 22, 23, 24,
-        %s    30, 31, 32, 33, 34,
-        %s    100, 101, 102, 103, 104,
-        %s    110, 111, 112, 113, 114,
-        %s    120, 121, 122, 123, 124,
-        %s    130, 131, 132, 133, 134,
-        %s    200, 201, 202, 203, 204,
-        %s    210, 211, 212, 213, 214,
-        %s    220, 221, 222, 223, 224,
-        %s    230, 231, 232, 233, 234 ],
+             10, 11, 12, 13, 14,
+             20, 21, 22, 23, 24,
+             30, 31, 32, 33, 34,
+             100, 101, 102, 103, 104,
+             110, 111, 112, 113, 114,
+             120, 121, 122, 123, 124,
+             130, 131, 132, 133, 134,
+             200, 201, 202, 203, 204,
+             210, 211, 212, 213, 214,
+             220, 221, 222, 223, 224,
+             230, 231, 232, 233, 234 ],
         (1) [ 1000, 1001, 1002, 1003, 1004,
-        %s    1010, 1011, 1012, 1013, 1014,
-        %s    1020, 1021, 1022, 1023, 1024,
-        %s    1030, 1031, 1032, 1033, 1034,
-        %s    1100, 1101, 1102, 1103, 1104,
-        %s    1110, 1111, 1112, 1113, 1114,
-        %s    1120, 1121, 1122, 1123, 1124,
-        %s    1130, 1131, 1132, 1133, 1134,
-        %s    1200, 1201, 1202, 1203, 1204,
-        %s    1210, 1211, 1212, 1213, 1214,
-        %s    1220, 1221, 1222, 1223, 1224,
-        %s    1230, 1231, 1232, 1233, 1234 ],
+             1010, 1011, 1012, 1013, 1014,
+             1020, 1021, 1022, 1023, 1024,
+             1030, 1031, 1032, 1033, 1034,
+             1100, 1101, 1102, 1103, 1104,
+             1110, 1111, 1112, 1113, 1114,
+             1120, 1121, 1122, 1123, 1124,
+             1130, 1131, 1132, 1133, 1134,
+             1200, 1201, 1202, 1203, 1204,
+             1210, 1211, 1212, 1213, 1214,
+             1220, 1221, 1222, 1223, 1224,
+             1230, 1231, 1232, 1233, 1234 ],
         (2) [ 2000, 2001, 2002, 2003, 2004,
-        %s    2010, 2011, 2012, 2013, 2014,
-        %s    2020, 2021, 2022, 2023, 2024,
-        %s    2030, 2031, 2032, 2033, 2034,
-        %s    2100, 2101, 2102, 2103, 2104,
-        %s    2110, 2111, 2112, 2113, 2114,
-        %s    2120, 2121, 2122, 2123, 2124,
-        %s    2130, 2131, 2132, 2133, 2134,
-        %s    2200, 2201, 2202, 2203, 2204,
-        %s    2210, 2211, 2212, 2213, 2214,
-        %s    2220, 2221, 2222, 2223, 2224,
-        %s    2230, 2231, 2232, 2233, 2234 ],
+             2010, 2011, 2012, 2013, 2014,
+             2020, 2021, 2022, 2023, 2024,
+             2030, 2031, 2032, 2033, 2034,
+             2100, 2101, 2102, 2103, 2104,
+             2110, 2111, 2112, 2113, 2114,
+             2120, 2121, 2122, 2123, 2124,
+             2130, 2131, 2132, 2133, 2134,
+             2200, 2201, 2202, 2203, 2204,
+             2210, 2211, 2212, 2213, 2214,
+             2220, 2221, 2222, 2223, 2224,
+             2230, 2231, 2232, 2233, 2234 ],
         (3) [ 3000, 3001, 3002, 3003, 3004,
-        %s    3010, 3011, 3012, 3013, 3014,
-        %s    3020, 3021, 3022, 3023, 3024,
-        %s    3030, 3031, 3032, 3033, 3034,
-        %s    3100, 3101, 3102, 3103, 3104,
-        %s    3110, 3111, 3112, 3113, 3114,
-        %s    3120, 3121, 3122, 3123, 3124,
-        %s    3130, 3131, 3132, 3133, 3134,
-        %s    3200, 3201, 3202, 3203, 3204,
-        %s    3210, 3211, 3212, 3213, 3214,
-        %s    3220, 3221, 3222, 3223, 3224,
-        %s    3230, 3231, 3232, 3233, 3234 ]
+             3010, 3011, 3012, 3013, 3014,
+             3020, 3021, 3022, 3023, 3024,
+             3030, 3031, 3032, 3033, 3034,
+             3100, 3101, 3102, 3103, 3104,
+             3110, 3111, 3112, 3113, 3114,
+             3120, 3121, 3122, 3123, 3124,
+             3130, 3131, 3132, 3133, 3134,
+             3200, 3201, 3202, 3203, 3204,
+             3210, 3211, 3212, 3213, 3214,
+             3220, 3221, 3222, 3223, 3224,
+             3230, 3231, 3232, 3233, 3234 ]
       }
    }
 }
diff --git a/tools/testfiles/tarray3.ddl b/tools/testfiles/tarray3.ddl
index 24a9809..06a959a 100644
--- a/tools/testfiles/tarray3.ddl
+++ b/tools/testfiles/tarray3.ddl
@@ -8,89 +8,89 @@ GROUP "/" {
       DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
         (0) [ [ 0, 1, 2,
-        %s       10, 11, 12,
-        %s       20, 21, 22,
-        %s       30, 31, 32,
-        %s       40, 41, 42,
-        %s       50, 51, 52 ], [ 100, 101, 102,
-        %s       110, 111, 112,
-        %s       120, 121, 122,
-        %s       130, 131, 132,
-        %s       140, 141, 142,
-        %s       150, 151, 152 ], [ 200, 201, 202,
-        %s       210, 211, 212,
-        %s       220, 221, 222,
-        %s       230, 231, 232,
-        %s       240, 241, 242,
-        %s       250, 251, 252 ], [ 300, 301, 302,
-        %s       310, 311, 312,
-        %s       320, 321, 322,
-        %s       330, 331, 332,
-        %s       340, 341, 342,
-        %s       350, 351, 352 ] ],
+                10, 11, 12,
+                20, 21, 22,
+                30, 31, 32,
+                40, 41, 42,
+                50, 51, 52 ], [ 100, 101, 102,
+                110, 111, 112,
+                120, 121, 122,
+                130, 131, 132,
+                140, 141, 142,
+                150, 151, 152 ], [ 200, 201, 202,
+                210, 211, 212,
+                220, 221, 222,
+                230, 231, 232,
+                240, 241, 242,
+                250, 251, 252 ], [ 300, 301, 302,
+                310, 311, 312,
+                320, 321, 322,
+                330, 331, 332,
+                340, 341, 342,
+                350, 351, 352 ] ],
         (1) [ [ 1000, 1001, 1002,
-        %s       1010, 1011, 1012,
-        %s       1020, 1021, 1022,
-        %s       1030, 1031, 1032,
-        %s       1040, 1041, 1042,
-        %s       1050, 1051, 1052 ], [ 1100, 1101, 1102,
-        %s       1110, 1111, 1112,
-        %s       1120, 1121, 1122,
-        %s       1130, 1131, 1132,
-        %s       1140, 1141, 1142,
-        %s       1150, 1151, 1152 ], [ 1200, 1201, 1202,
-        %s       1210, 1211, 1212,
-        %s       1220, 1221, 1222,
-        %s       1230, 1231, 1232,
-        %s       1240, 1241, 1242,
-        %s       1250, 1251, 1252 ], [ 1300, 1301, 1302,
-        %s       1310, 1311, 1312,
-        %s       1320, 1321, 1322,
-        %s       1330, 1331, 1332,
-        %s       1340, 1341, 1342,
-        %s       1350, 1351, 1352 ] ],
+                1010, 1011, 1012,
+                1020, 1021, 1022,
+                1030, 1031, 1032,
+                1040, 1041, 1042,
+                1050, 1051, 1052 ], [ 1100, 1101, 1102,
+                1110, 1111, 1112,
+                1120, 1121, 1122,
+                1130, 1131, 1132,
+                1140, 1141, 1142,
+                1150, 1151, 1152 ], [ 1200, 1201, 1202,
+                1210, 1211, 1212,
+                1220, 1221, 1222,
+                1230, 1231, 1232,
+                1240, 1241, 1242,
+                1250, 1251, 1252 ], [ 1300, 1301, 1302,
+                1310, 1311, 1312,
+                1320, 1321, 1322,
+                1330, 1331, 1332,
+                1340, 1341, 1342,
+                1350, 1351, 1352 ] ],
         (2) [ [ 2000, 2001, 2002,
-        %s       2010, 2011, 2012,
-        %s       2020, 2021, 2022,
-        %s       2030, 2031, 2032,
-        %s       2040, 2041, 2042,
-        %s       2050, 2051, 2052 ], [ 2100, 2101, 2102,
-        %s       2110, 2111, 2112,
-        %s       2120, 2121, 2122,
-        %s       2130, 2131, 2132,
-        %s       2140, 2141, 2142,
-        %s       2150, 2151, 2152 ], [ 2200, 2201, 2202,
-        %s       2210, 2211, 2212,
-        %s       2220, 2221, 2222,
-        %s       2230, 2231, 2232,
-        %s       2240, 2241, 2242,
-        %s       2250, 2251, 2252 ], [ 2300, 2301, 2302,
-        %s       2310, 2311, 2312,
-        %s       2320, 2321, 2322,
-        %s       2330, 2331, 2332,
-        %s       2340, 2341, 2342,
-        %s       2350, 2351, 2352 ] ],
+                2010, 2011, 2012,
+                2020, 2021, 2022,
+                2030, 2031, 2032,
+                2040, 2041, 2042,
+                2050, 2051, 2052 ], [ 2100, 2101, 2102,
+                2110, 2111, 2112,
+                2120, 2121, 2122,
+                2130, 2131, 2132,
+                2140, 2141, 2142,
+                2150, 2151, 2152 ], [ 2200, 2201, 2202,
+                2210, 2211, 2212,
+                2220, 2221, 2222,
+                2230, 2231, 2232,
+                2240, 2241, 2242,
+                2250, 2251, 2252 ], [ 2300, 2301, 2302,
+                2310, 2311, 2312,
+                2320, 2321, 2322,
+                2330, 2331, 2332,
+                2340, 2341, 2342,
+                2350, 2351, 2352 ] ],
         (3) [ [ 3000, 3001, 3002,
-        %s       3010, 3011, 3012,
-        %s       3020, 3021, 3022,
-        %s       3030, 3031, 3032,
-        %s       3040, 3041, 3042,
-        %s       3050, 3051, 3052 ], [ 3100, 3101, 3102,
-        %s       3110, 3111, 3112,
-        %s       3120, 3121, 3122,
-        %s       3130, 3131, 3132,
-        %s       3140, 3141, 3142,
-        %s       3150, 3151, 3152 ], [ 3200, 3201, 3202,
-        %s       3210, 3211, 3212,
-        %s       3220, 3221, 3222,
-        %s       3230, 3231, 3232,
-        %s       3240, 3241, 3242,
-        %s       3250, 3251, 3252 ], [ 3300, 3301, 3302,
-        %s       3310, 3311, 3312,
-        %s       3320, 3321, 3322,
-        %s       3330, 3331, 3332,
-        %s       3340, 3341, 3342,
-        %s       3350, 3351, 3352 ] ]
+                3010, 3011, 3012,
+                3020, 3021, 3022,
+                3030, 3031, 3032,
+                3040, 3041, 3042,
+                3050, 3051, 3052 ], [ 3100, 3101, 3102,
+                3110, 3111, 3112,
+                3120, 3121, 3122,
+                3130, 3131, 3132,
+                3140, 3141, 3142,
+                3150, 3151, 3152 ], [ 3200, 3201, 3202,
+                3210, 3211, 3212,
+                3220, 3221, 3222,
+                3230, 3231, 3232,
+                3240, 3241, 3242,
+                3250, 3251, 3252 ], [ 3300, 3301, 3302,
+                3310, 3311, 3312,
+                3320, 3321, 3322,
+                3330, 3331, 3332,
+                3340, 3341, 3342,
+                3350, 3351, 3352 ] ]
       }
    }
 }
diff --git a/tools/testfiles/tcomp-1.ddl b/tools/testfiles/tcomp-1.ddl
index 69ef206..f974d70 100644
--- a/tools/testfiles/tcomp-1.ddl
+++ b/tools/testfiles/tcomp-1.ddl
@@ -76,146 +76,146 @@ GROUP "/" {
         (0,0) {
             [ 0, 1, 2, 3 ],
             [ 1, 2, 3, 4, 5, 6,
-        %s       2, 3, 4, 5, 6, 7,
-        %s       3, 4, 5, 6, 7, 8,
-        %s       4, 5, 6, 7, 8, 9,
-        %s       5, 6, 7, 8, 9, 10 ]
+                2, 3, 4, 5, 6, 7,
+                3, 4, 5, 6, 7, 8,
+                4, 5, 6, 7, 8, 9,
+                5, 6, 7, 8, 9, 10 ]
          },
         (0,1) {
             [ 1, 2, 3, 4 ],
             [ 2, 3, 4, 5, 6, 7,
-        %s       3, 4, 5, 6, 7, 8,
-        %s       4, 5, 6, 7, 8, 9,
-        %s       5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11 ]
+                3, 4, 5, 6, 7, 8,
+                4, 5, 6, 7, 8, 9,
+                5, 6, 7, 8, 9, 10,
+                6, 7, 8, 9, 10, 11 ]
          },
         (0,2) {
             [ 2, 3, 4, 5 ],
             [ 3, 4, 5, 6, 7, 8,
-        %s       4, 5, 6, 7, 8, 9,
-        %s       5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12 ]
+                4, 5, 6, 7, 8, 9,
+                5, 6, 7, 8, 9, 10,
+                6, 7, 8, 9, 10, 11,
+                7, 8, 9, 10, 11, 12 ]
          },
         (0,3) {
             [ 3, 4, 5, 6 ],
             [ 4, 5, 6, 7, 8, 9,
-        %s       5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12,
-        %s       8, 9, 10, 11, 12, 13 ]
+                5, 6, 7, 8, 9, 10,
+                6, 7, 8, 9, 10, 11,
+                7, 8, 9, 10, 11, 12,
+                8, 9, 10, 11, 12, 13 ]
          },
         (0,4) {
             [ 4, 5, 6, 7 ],
             [ 5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12,
-        %s       8, 9, 10, 11, 12, 13,
-        %s       9, 10, 11, 12, 13, 14 ]
+                6, 7, 8, 9, 10, 11,
+                7, 8, 9, 10, 11, 12,
+                8, 9, 10, 11, 12, 13,
+                9, 10, 11, 12, 13, 14 ]
          },
         (0,5) {
             [ 5, 6, 7, 8 ],
             [ 6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12,
-        %s       8, 9, 10, 11, 12, 13,
-        %s       9, 10, 11, 12, 13, 14,
-        %s       10, 11, 12, 13, 14, 15 ]
+                7, 8, 9, 10, 11, 12,
+                8, 9, 10, 11, 12, 13,
+                9, 10, 11, 12, 13, 14,
+                10, 11, 12, 13, 14, 15 ]
          },
         (1,0) {
             [ 1, 2, 3, 4 ],
             [ 2, 3, 4, 5, 6, 7,
-        %s       3, 4, 5, 6, 7, 8,
-        %s       4, 5, 6, 7, 8, 9,
-        %s       5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11 ]
+                3, 4, 5, 6, 7, 8,
+                4, 5, 6, 7, 8, 9,
+                5, 6, 7, 8, 9, 10,
+                6, 7, 8, 9, 10, 11 ]
          },
         (1,1) {
             [ 2, 3, 4, 5 ],
             [ 3, 4, 5, 6, 7, 8,
-        %s       4, 5, 6, 7, 8, 9,
-        %s       5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12 ]
+                4, 5, 6, 7, 8, 9,
+                5, 6, 7, 8, 9, 10,
+                6, 7, 8, 9, 10, 11,
+                7, 8, 9, 10, 11, 12 ]
          },
         (1,2) {
             [ 3, 4, 5, 6 ],
             [ 4, 5, 6, 7, 8, 9,
-        %s       5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12,
-        %s       8, 9, 10, 11, 12, 13 ]
+                5, 6, 7, 8, 9, 10,
+                6, 7, 8, 9, 10, 11,
+                7, 8, 9, 10, 11, 12,
+                8, 9, 10, 11, 12, 13 ]
          },
         (1,3) {
             [ 4, 5, 6, 7 ],
             [ 5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12,
-        %s       8, 9, 10, 11, 12, 13,
-        %s       9, 10, 11, 12, 13, 14 ]
+                6, 7, 8, 9, 10, 11,
+                7, 8, 9, 10, 11, 12,
+                8, 9, 10, 11, 12, 13,
+                9, 10, 11, 12, 13, 14 ]
          },
         (1,4) {
             [ 5, 6, 7, 8 ],
             [ 6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12,
-        %s       8, 9, 10, 11, 12, 13,
-        %s       9, 10, 11, 12, 13, 14,
-        %s       10, 11, 12, 13, 14, 15 ]
+                7, 8, 9, 10, 11, 12,
+                8, 9, 10, 11, 12, 13,
+                9, 10, 11, 12, 13, 14,
+                10, 11, 12, 13, 14, 15 ]
          },
         (1,5) {
             [ 6, 7, 8, 9 ],
             [ 7, 8, 9, 10, 11, 12,
-        %s       8, 9, 10, 11, 12, 13,
-        %s       9, 10, 11, 12, 13, 14,
-        %s       10, 11, 12, 13, 14, 15,
-        %s       11, 12, 13, 14, 15, 16 ]
+                8, 9, 10, 11, 12, 13,
+                9, 10, 11, 12, 13, 14,
+                10, 11, 12, 13, 14, 15,
+                11, 12, 13, 14, 15, 16 ]
          },
         (2,0) {
             [ 2, 3, 4, 5 ],
             [ 3, 4, 5, 6, 7, 8,
-        %s       4, 5, 6, 7, 8, 9,
-        %s       5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12 ]
+                4, 5, 6, 7, 8, 9,
+                5, 6, 7, 8, 9, 10,
+                6, 7, 8, 9, 10, 11,
+                7, 8, 9, 10, 11, 12 ]
          },
         (2,1) {
             [ 3, 4, 5, 6 ],
             [ 4, 5, 6, 7, 8, 9,
-        %s       5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12,
-        %s       8, 9, 10, 11, 12, 13 ]
+                5, 6, 7, 8, 9, 10,
+                6, 7, 8, 9, 10, 11,
+                7, 8, 9, 10, 11, 12,
+                8, 9, 10, 11, 12, 13 ]
          },
         (2,2) {
             [ 4, 5, 6, 7 ],
             [ 5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12,
-        %s       8, 9, 10, 11, 12, 13,
-        %s       9, 10, 11, 12, 13, 14 ]
+                6, 7, 8, 9, 10, 11,
+                7, 8, 9, 10, 11, 12,
+                8, 9, 10, 11, 12, 13,
+                9, 10, 11, 12, 13, 14 ]
          },
         (2,3) {
             [ 5, 6, 7, 8 ],
             [ 6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12,
-        %s       8, 9, 10, 11, 12, 13,
-        %s       9, 10, 11, 12, 13, 14,
-        %s       10, 11, 12, 13, 14, 15 ]
+                7, 8, 9, 10, 11, 12,
+                8, 9, 10, 11, 12, 13,
+                9, 10, 11, 12, 13, 14,
+                10, 11, 12, 13, 14, 15 ]
          },
         (2,4) {
             [ 6, 7, 8, 9 ],
             [ 7, 8, 9, 10, 11, 12,
-        %s       8, 9, 10, 11, 12, 13,
-        %s       9, 10, 11, 12, 13, 14,
-        %s       10, 11, 12, 13, 14, 15,
-        %s       11, 12, 13, 14, 15, 16 ]
+                8, 9, 10, 11, 12, 13,
+                9, 10, 11, 12, 13, 14,
+                10, 11, 12, 13, 14, 15,
+                11, 12, 13, 14, 15, 16 ]
          },
         (2,5) {
             [ 7, 8, 9, 10 ],
             [ 8, 9, 10, 11, 12, 13,
-        %s       9, 10, 11, 12, 13, 14,
-        %s       10, 11, 12, 13, 14, 15,
-        %s       11, 12, 13, 14, 15, 16,
-        %s       12, 13, 14, 15, 16, 17 ]
+                9, 10, 11, 12, 13, 14,
+                10, 11, 12, 13, 14, 15,
+                11, 12, 13, 14, 15, 16,
+                12, 13, 14, 15, 16, 17 ]
          }
          }
       }
diff --git a/tools/testfiles/tcomp-4.ddl b/tools/testfiles/tcomp-4.ddl
index fe2afb3..3690f75 100644
--- a/tools/testfiles/tcomp-4.ddl
+++ b/tools/testfiles/tcomp-4.ddl
@@ -30,10 +30,10 @@ GROUP "/" {
             [ "A fight is a contract that takes two people to honor.", "A combative stance means that you've accepted the contract.", "In which case, you deserve what you get.", "  --  Professor Cheng Man-ch'ing" ],
             "Hello!",
             [ 0, 1, 2, 3, 4, 5,
-        %s       1, 2, 3, 4, 5, 6,
-        %s       2, 3, 4, 5, 6, 7,
-        %s       3, 4, 5, 6, 7, 8,
-        %s       4, 5, 6, 7, 8, 9 ],
+                1, 2, 3, 4, 5, 6,
+                2, 3, 4, 5, 6, 7,
+                3, 4, 5, 6, 7, 8,
+                4, 5, 6, 7, 8, 9 ],
             0,
             [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
             109
@@ -43,10 +43,10 @@ GROUP "/" {
             [ "A fight is a contract that takes two people to honor.", "A combative stance means that you've accepted the contract.", "In which case, you deserve what you get.", "  --  Professor Cheng Man-ch'ing" ],
             "Hello!",
             [ 1, 2, 3, 4, 5, 6,
-        %s       2, 3, 4, 5, 6, 7,
-        %s       3, 4, 5, 6, 7, 8,
-        %s       4, 5, 6, 7, 8, 9,
-        %s       5, 6, 7, 8, 9, 10 ],
+                2, 3, 4, 5, 6, 7,
+                3, 4, 5, 6, 7, 8,
+                4, 5, 6, 7, 8, 9,
+                5, 6, 7, 8, 9, 10 ],
             0.96,
             [ 1024.96, 1024.96, 1024.96, 1024.96, 1024.96, 1024.96, 1024.96, 1024.96, 1024.96, 1024.96 ],
             109
@@ -56,10 +56,10 @@ GROUP "/" {
             [ "A fight is a contract that takes two people to honor.", "A combative stance means that you've accepted the contract.", "In which case, you deserve what you get.", "  --  Professor Cheng Man-ch'ing" ],
             "Hello!",
             [ 2, 3, 4, 5, 6, 7,
-        %s       3, 4, 5, 6, 7, 8,
-        %s       4, 5, 6, 7, 8, 9,
-        %s       5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11 ],
+                3, 4, 5, 6, 7, 8,
+                4, 5, 6, 7, 8, 9,
+                5, 6, 7, 8, 9, 10,
+                6, 7, 8, 9, 10, 11 ],
             1.92,
             [ 2049.93, 2049.93, 2049.93, 2049.93, 2049.93, 2049.93, 2049.93, 2049.93, 2049.93, 2049.93 ],
             109
@@ -69,10 +69,10 @@ GROUP "/" {
             [ "A fight is a contract that takes two people to honor.", "A combative stance means that you've accepted the contract.", "In which case, you deserve what you get.", "  --  Professor Cheng Man-ch'ing" ],
             "Hello!",
             [ 3, 4, 5, 6, 7, 8,
-        %s       4, 5, 6, 7, 8, 9,
-        %s       5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12 ],
+                4, 5, 6, 7, 8, 9,
+                5, 6, 7, 8, 9, 10,
+                6, 7, 8, 9, 10, 11,
+                7, 8, 9, 10, 11, 12 ],
             2.88,
             [ 3074.89, 3074.89, 3074.89, 3074.89, 3074.89, 3074.89, 3074.89, 3074.89, 3074.89, 3074.89 ],
             109
@@ -82,10 +82,10 @@ GROUP "/" {
             [ "A fight is a contract that takes two people to honor.", "A combative stance means that you've accepted the contract.", "In which case, you deserve what you get.", "  --  Professor Cheng Man-ch'ing" ],
             "Hello!",
             [ 4, 5, 6, 7, 8, 9,
-        %s       5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12,
-        %s       8, 9, 10, 11, 12, 13 ],
+                5, 6, 7, 8, 9, 10,
+                6, 7, 8, 9, 10, 11,
+                7, 8, 9, 10, 11, 12,
+                8, 9, 10, 11, 12, 13 ],
             3.84,
             [ 4099.85, 4099.85, 4099.85, 4099.85, 4099.85, 4099.85, 4099.85, 4099.85, 4099.85, 4099.85 ],
             109
@@ -95,10 +95,10 @@ GROUP "/" {
             [ "A fight is a contract that takes two people to honor.", "A combative stance means that you've accepted the contract.", "In which case, you deserve what you get.", "  --  Professor Cheng Man-ch'ing" ],
             "Hello!",
             [ 5, 6, 7, 8, 9, 10,
-        %s       6, 7, 8, 9, 10, 11,
-        %s       7, 8, 9, 10, 11, 12,
-        %s       8, 9, 10, 11, 12, 13,
-        %s       9, 10, 11, 12, 13, 14 ],
+                6, 7, 8, 9, 10, 11,
+                7, 8, 9, 10, 11, 12,
+                8, 9, 10, 11, 12, 13,
+                9, 10, 11, 12, 13, 14 ],
             4.8,
             [ 5124.82, 5124.82, 5124.82, 5124.82, 5124.82, 5124.82, 5124.82, 5124.82, 5124.82, 5124.82 ],
             109
diff --git a/tools/testfiles/tstr-1.ddl b/tools/testfiles/tstr-1.ddl
index 6413084..5ad64c8 100644
--- a/tools/testfiles/tstr-1.ddl
+++ b/tools/testfiles/tstr-1.ddl
@@ -17,237 +17,237 @@ GROUP "/" {
       DATA {
         (0,0) {
             [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
-        %s       1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-        %s       4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
+                1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
+                4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (0,1) {
             [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-        %s       4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
+                4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (0,2) {
             [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (0,3) {
             [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (0,4) {
             [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-        %s       121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
+                121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (0,5) {
             [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-        %s       121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
-        %s       144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
+                121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
+                144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (1,0) {
             [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
-        %s       1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-        %s       4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
+                1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
+                4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (1,1) {
             [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-        %s       4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
+                4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (1,2) {
             [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (1,3) {
             [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (1,4) {
             [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-        %s       121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
+                121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (1,5) {
             [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-        %s       121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
-        %s       144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
+                121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
+                144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (2,0) {
             [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
-        %s       1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-        %s       4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
+                1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
+                4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (2,1) {
             [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-        %s       4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
+                4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (2,2) {
             [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (2,3) {
             [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (2,4) {
             [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-        %s       121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
+                121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
         (2,5) {
             [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-        %s       121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
-        %s       144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
+                121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
+                144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          }
       }
    }