[svn-r7548] Purpose:

Bug fixes and code cleanup

Description:
    Whitespace removal.

    Added testfiles for named datatypes in attributes.

Platforms tested:
    FreeBSD 4.9 (sleipnir)
    h5committest

tools/testfiles/tall-1.ddl

@@ -4,25 +4,25 @@ Expected output for 'h5dump tall.h5'
 HDF5 "tall.h5" {
 GROUP "/" {
    ATTRIBUTE "attr1" {
-      DATATYPE  H5T_STD_I8BE  
-      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
+      DATATYPE  H5T_STD_I8BE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
       DATA {
          97, 98, 99, 100, 101, 102, 103, 104, 105, 0
-      } 
-   } 
+      }
+   }
    ATTRIBUTE "attr2" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 2, 2 ) / ( 2, 2 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 2, 2 ) / ( 2, 2 ) }
       DATA {
          0, 1,
          2, 3
-      } 
-   } 
+      }
+   }
    GROUP "g1" {
       GROUP "g1.1" {
          DATASET "dset1.1.1" {
-            DATATYPE  H5T_STD_I32BE  
-            DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) } 
+            DATATYPE  H5T_STD_I32BE
+            DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
             DATA {
                0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
@@ -34,58 +34,58 @@ GROUP "/" {
                0, 7, 14, 21, 28, 35, 42, 49, 56, 63,
                0, 8, 16, 24, 32, 40, 48, 56, 64, 72,
                0, 9, 18, 27, 36, 45, 54, 63, 72, 81
-            } 
+            }
             ATTRIBUTE "attr1" {
-               DATATYPE  H5T_STD_I8BE  
-               DATASPACE  SIMPLE { ( 27 ) / ( 27 ) } 
+               DATATYPE  H5T_STD_I8BE
+               DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
                DATA {
                   49, 115, 116, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101,
                   32, 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0
-               } 
-            } 
+               }
+            }
             ATTRIBUTE "attr2" {
-               DATATYPE  H5T_STD_I8BE  
-               DATASPACE  SIMPLE { ( 27 ) / ( 27 ) } 
+               DATATYPE  H5T_STD_I8BE
+               DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
                DATA {
                   50, 110, 100, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101,
                   32, 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0
-               } 
-            } 
-         } 
+               }
+            }
+         }
          DATASET "dset1.1.2" {
-            DATATYPE  H5T_STD_I32BE  
-            DATASPACE  SIMPLE { ( 20 ) / ( 20 ) } 
+            DATATYPE  H5T_STD_I32BE
+            DATASPACE  SIMPLE { ( 20 ) / ( 20 ) }
             DATA {
                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
                19
-            } 
-         } 
-      } 
+            }
+         }
+      }
       GROUP "g1.2" {
          GROUP "g1.2.1" {
             SOFTLINK "slink" {
                LINKTARGET "somevalue"
-            } 
-         } 
-      } 
-   } 
+            }
+         }
+      }
+   }
    GROUP "g2" {
       DATASET "dset2.1" {
-         DATATYPE  H5T_IEEE_F32BE  
-         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
+         DATATYPE  H5T_IEEE_F32BE
+         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
          DATA {
             1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9
-         } 
-      } 
+         }
+      }
       DATASET "dset2.2" {
-         DATATYPE  H5T_IEEE_F32BE  
-         DATASPACE  SIMPLE { ( 3, 5 ) / ( 3, 5 ) } 
+         DATATYPE  H5T_IEEE_F32BE
+         DATASPACE  SIMPLE { ( 3, 5 ) / ( 3, 5 ) }
          DATA {
             0, 0.1, 0.2, 0.3, 0.4,
             0, 0.2, 0.4, 0.6, 0.8,
             0, 0.3, 0.6, 0.9, 1.2
-         } 
-      } 
-   } 
-} 
-} 
+         }
+      }
+   }
+}
+}

tools/testfiles/tall-2.ddl

@@ -4,24 +4,24 @@ Expected output for 'h5dump --header -g /g1/g1.1 -a attr2 tall.h5'
 HDF5 "tall.h5" {
 GROUP "/g1/g1.1" {
    DATASET "dset1.1.1" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
       ATTRIBUTE "attr1" {
-         DATATYPE  H5T_STD_I8BE  
-         DATASPACE  SIMPLE { ( 27 ) / ( 27 ) } 
-      } 
+         DATATYPE  H5T_STD_I8BE
+         DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
+      }
       ATTRIBUTE "attr2" {
-         DATATYPE  H5T_STD_I8BE  
-         DATASPACE  SIMPLE { ( 27 ) / ( 27 ) } 
-      } 
-   } 
+         DATATYPE  H5T_STD_I8BE
+         DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
+      }
+   }
    DATASET "dset1.1.2" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 20 ) / ( 20 ) } 
-   } 
-} 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 20 ) / ( 20 ) }
+   }
+}
 ATTRIBUTE "attr2" {
-   DATATYPE  H5T_STD_I32BE  
-   DATASPACE  SIMPLE { ( 2, 2 ) / ( 2, 2 ) } 
-} 
-} 
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 2, 2 ) / ( 2, 2 ) }
+}
+}

tools/testfiles/tall-2A.ddl

@@ -4,64 +4,64 @@ Expected output for 'h5dump -A tall.h5'
 HDF5 "tall.h5" {
 GROUP "/" {
    ATTRIBUTE "attr1" {
-      DATATYPE  H5T_STD_I8BE  
-      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
+      DATATYPE  H5T_STD_I8BE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
       DATA {
          97, 98, 99, 100, 101, 102, 103, 104, 105, 0
-      } 
-   } 
+      }
+   }
    ATTRIBUTE "attr2" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 2, 2 ) / ( 2, 2 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 2, 2 ) / ( 2, 2 ) }
       DATA {
          0, 1,
          2, 3
-      } 
-   } 
+      }
+   }
    GROUP "g1" {
       GROUP "g1.1" {
          DATASET "dset1.1.1" {
-            DATATYPE  H5T_STD_I32BE  
-            DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) } 
+            DATATYPE  H5T_STD_I32BE
+            DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
             ATTRIBUTE "attr1" {
-               DATATYPE  H5T_STD_I8BE  
-               DATASPACE  SIMPLE { ( 27 ) / ( 27 ) } 
+               DATATYPE  H5T_STD_I8BE
+               DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
                DATA {
                   49, 115, 116, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101,
                   32, 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0
-               } 
-            } 
+               }
+            }
             ATTRIBUTE "attr2" {
-               DATATYPE  H5T_STD_I8BE  
-               DATASPACE  SIMPLE { ( 27 ) / ( 27 ) } 
+               DATATYPE  H5T_STD_I8BE
+               DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
                DATA {
                   50, 110, 100, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101,
                   32, 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0
-               } 
-            } 
-         } 
+               }
+            }
+         }
          DATASET "dset1.1.2" {
-            DATATYPE  H5T_STD_I32BE  
-            DATASPACE  SIMPLE { ( 20 ) / ( 20 ) } 
-         } 
-      } 
+            DATATYPE  H5T_STD_I32BE
+            DATASPACE  SIMPLE { ( 20 ) / ( 20 ) }
+         }
+      }
       GROUP "g1.2" {
          GROUP "g1.2.1" {
             SOFTLINK "slink" {
                LINKTARGET "somevalue"
-            } 
-         } 
-      } 
-   } 
+            }
+         }
+      }
+   }
    GROUP "g2" {
       DATASET "dset2.1" {
-         DATATYPE  H5T_IEEE_F32BE  
-         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
-      } 
+         DATATYPE  H5T_IEEE_F32BE
+         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+      }
       DATASET "dset2.2" {
-         DATATYPE  H5T_IEEE_F32BE  
-         DATASPACE  SIMPLE { ( 3, 5 ) / ( 3, 5 ) } 
-      } 
-   } 
-} 
-} 
+         DATATYPE  H5T_IEEE_F32BE
+         DATASPACE  SIMPLE { ( 3, 5 ) / ( 3, 5 ) }
+      }
+   }
+}
+}

tools/testfiles/tall-2A.h5.xml

@@ -35,7 +35,7 @@ Expected output for 'h5dump --xml -A tall.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0 1 
+         0 1
          2 3
          </hdf5:DataFromFile>
       </hdf5:Data>
@@ -75,7 +75,7 @@ Expected output for 'h5dump --xml -A tall.h5'
                </hdf5:DataType>
                <hdf5:Data>
                   <hdf5:DataFromFile>
-                  49 115 116 32 97 116 116 114 105 98 117 116 101 32 111 102 32 
+                  49 115 116 32 97 116 116 114 105 98 117 116 101 32 111 102 32
                   100 115 101 116 49 46 49 46 49 0
                   </hdf5:DataFromFile>
                </hdf5:Data>
@@ -93,7 +93,7 @@ Expected output for 'h5dump --xml -A tall.h5'
                </hdf5:DataType>
                <hdf5:Data>
                   <hdf5:DataFromFile>
-                  50 110 100 32 97 116 116 114 105 98 117 116 101 32 111 102 32 
+                  50 110 100 32 97 116 116 114 105 98 117 116 101 32 111 102 32
                   100 115 101 116 49 46 49 46 49 0
                   </hdf5:DataFromFile>
                </hdf5:Data>

tools/testfiles/tall-3.ddl

@@ -3,13 +3,13 @@ Expected output for 'h5dump -d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink tall.h5'
 #############################
 HDF5 "tall.h5" {
 DATASET "/g2/dset2.1" {
-   DATATYPE  H5T_IEEE_F32BE  
-   DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
+   DATATYPE  H5T_IEEE_F32BE
+   DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
    DATA {
       1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9
-   } 
-} 
+   }
+}
 SOFTLINK "/g1/g1.2/g1.2.1/slink" {
    LINKTARGET "somevalue"
-} 
-} 
+}
+}

tools/testfiles/tall-4s.ddl

@@ -3,8 +3,8 @@ Expected output for 'h5dump --dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,
 #############################
 HDF5 "tall.h5" {
 DATASET "/g1/g1.1/dset1.1.1" {
-   DATATYPE  H5T_STD_I32BE  
-   DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) } 
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
    SUBSET {
       START ( 1, 1 );
       STRIDE ( 2, 3 );
@@ -12,23 +12,23 @@ DATASET "/g1/g1.1/dset1.1.1" {
       BLOCK ( 1, 1 );
       DATA {
          1, 3, 5, 4, 12, 20
-      } 
-   } 
+      }
+   }
    ATTRIBUTE "attr1" {
-      DATATYPE  H5T_STD_I8BE  
-      DATASPACE  SIMPLE { ( 27 ) / ( 27 ) } 
+      DATATYPE  H5T_STD_I8BE
+      DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
       DATA {
          49, 115, 116, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111,
          102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0
-      } 
-   } 
+      }
+   }
    ATTRIBUTE "attr2" {
-      DATATYPE  H5T_STD_I8BE  
-      DATASPACE  SIMPLE { ( 27 ) / ( 27 ) } 
+      DATATYPE  H5T_STD_I8BE
+      DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
       DATA {
          50, 110, 100, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111,
          102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tall-5s.ddl

@@ -3,8 +3,8 @@ Expected output for 'h5dump -d /g1/g1.1/dset1.1.2[0;2;10;] tall.h5'
 #############################
 HDF5 "tall.h5" {
 DATASET "/g1/g1.1/dset1.1.2" {
-   DATATYPE  H5T_STD_I32BE  
-   DATASPACE  SIMPLE { ( 20 ) / ( 20 ) } 
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 20 ) / ( 20 ) }
    SUBSET {
       START ( 0 );
       STRIDE ( 2 );
@@ -12,7 +12,7 @@ DATASET "/g1/g1.1/dset1.1.2" {
       BLOCK ( 1 );
       DATA {
          0, 2, 4, 6, 8, 10, 12, 14, 16, 18
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tall.h5.xml

@@ -35,7 +35,7 @@ Expected output for 'h5dump --xml tall.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0 1 
+         0 1
          2 3
          </hdf5:DataFromFile>
       </hdf5:Data>
@@ -75,7 +75,7 @@ Expected output for 'h5dump --xml tall.h5'
                </hdf5:DataType>
                <hdf5:Data>
                   <hdf5:DataFromFile>
-                  49 115 116 32 97 116 116 114 105 98 117 116 101 32 111 102 32 
+                  49 115 116 32 97 116 116 114 105 98 117 116 101 32 111 102 32
                   100 115 101 116 49 46 49 46 49 0
                   </hdf5:DataFromFile>
                </hdf5:Data>
@@ -93,22 +93,22 @@ Expected output for 'h5dump --xml tall.h5'
                </hdf5:DataType>
                <hdf5:Data>
                   <hdf5:DataFromFile>
-                  50 110 100 32 97 116 116 114 105 98 117 116 101 32 111 102 32 
+                  50 110 100 32 97 116 116 114 105 98 117 116 101 32 111 102 32
                   100 115 101 116 49 46 49 46 49 0
                   </hdf5:DataFromFile>
                </hdf5:Data>
             </hdf5:Attribute>
             <hdf5:Data>
                <hdf5:DataFromFile>
-               0 0 0 0 0 0 0 0 0 0 
-               0 1 2 3 4 5 6 7 8 9 
-               0 2 4 6 8 10 12 14 16 18 
-               0 3 6 9 12 15 18 21 24 27 
-               0 4 8 12 16 20 24 28 32 36 
-               0 5 10 15 20 25 30 35 40 45 
-               0 6 12 18 24 30 36 42 48 54 
-               0 7 14 21 28 35 42 49 56 63 
-               0 8 16 24 32 40 48 56 64 72 
+               0 0 0 0 0 0 0 0 0 0
+               0 1 2 3 4 5 6 7 8 9
+               0 2 4 6 8 10 12 14 16 18
+               0 3 6 9 12 15 18 21 24 27
+               0 4 8 12 16 20 24 28 32 36
+               0 5 10 15 20 25 30 35 40 45
+               0 6 12 18 24 30 36 42 48 54
+               0 7 14 21 28 35 42 49 56 63
+               0 8 16 24 32 40 48 56 64 72
                0 9 18 27 36 45 54 63 72 81
                </hdf5:DataFromFile>
             </hdf5:Data>
@@ -193,8 +193,8 @@ Expected output for 'h5dump --xml tall.h5'
          </hdf5:DataType>
          <hdf5:Data>
             <hdf5:DataFromFile>
-            0 0.1 0.2 0.3 0.4 
-            0 0.2 0.4 0.6 0.8 
+            0 0.1 0.2 0.3 0.4
+            0 0.2 0.4 0.6 0.8
             0 0.3 0.6 0.9 1.2
             </hdf5:DataFromFile>
          </hdf5:Data>

tools/testfiles/tarray1.ddl

@@ -4,12 +4,12 @@ Expected output for 'h5dump tarray1.h5'
 HDF5 "tarray1.h5" {
 GROUP "/" {
    DATASET "Dataset1" {
-      DATATYPE  H5T_ARRAY { [4] H5T_STD_I32LE }  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_ARRAY { [4] H5T_STD_I32LE }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          [ 0, 1, 2, 3 ], [ 10, 11, 12, 13 ], [ 20, 21, 22, 23 ],
          [ 30, 31, 32, 33 ]
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tarray1.h5.xml

@@ -30,7 +30,7 @@ Expected output for 'h5dump --xml tarray1.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-          0 1 2 3   10 11 12 13   20 21 22 23   30 31 32 33 
+          0 1 2 3  10 11 12 13  20 21 22 23  30 31 32 33
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>

tools/testfiles/tarray2.ddl

@@ -4,58 +4,58 @@ Expected output for 'h5dump tarray2.h5'
 HDF5 "tarray2.h5" {
 GROUP "/" {
    DATASET "Dataset1" {
-      DATATYPE  H5T_ARRAY { [3][4][5] H5T_STD_I32LE }  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_ARRAY { [3][4][5] H5T_STD_I32LE }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
-         [ 0, 1, 2, 3, 4, 
-            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, 
+         [ 0, 1, 2, 3, 4,
+            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 ],
-         [ 1000, 1001, 1002, 1003, 1004, 
-            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, 
+         [ 1000, 1001, 1002, 1003, 1004,
+            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 ],
-         [ 2000, 2001, 2002, 2003, 2004, 
-            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, 
+         [ 2000, 2001, 2002, 2003, 2004,
+            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 ],
-         [ 3000, 3001, 3002, 3003, 3004, 
-            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, 
+         [ 3000, 3001, 3002, 3003, 3004,
+            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 ]
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tarray2.h5.xml

@@ -32,54 +32,54 @@ Expected output for 'h5dump --xml tarray2.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-          0 1 2 3 4 
-            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  
-          1000 1001 1002 1003 1004 
-            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  
-          2000 2001 2002 2003 2004 
-            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  
-          3000 3001 3002 3003 3004 
-            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 
+          0 1 2 3 4
+            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
+          1000 1001 1002 1003 1004
+            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
+          2000 2001 2002 2003 2004
+            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
+          3000 3001 3002 3003 3004
+            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
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>

tools/testfiles/tarray3.ddl

@@ -4,94 +4,94 @@ Expected output for 'h5dump tarray3.h5'
 HDF5 "tarray3.h5" {
 GROUP "/" {
    DATASET "Dataset1" {
-      DATATYPE  H5T_ARRAY { [4] H5T_ARRAY { [6][3] H5T_STD_I32LE } }  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_ARRAY { [4] H5T_ARRAY { [6][3] H5T_STD_I32LE } }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
-         [ [ 0, 1, 2, 
-               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, 
+         [ [ 0, 1, 2,
+               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 ] ],
-         [ [ 1000, 1001, 1002, 
-               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, 
+         [ [ 1000, 1001, 1002,
+               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 ] ],
-         [ [ 2000, 2001, 2002, 
-               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, 
+         [ [ 2000, 2001, 2002,
+               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 ] ],
-         [ [ 3000, 3001, 3002, 
-               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, 
+         [ [ 3000, 3001, 3002,
+               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 ] ]
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tarray3.h5.xml

@@ -36,90 +36,90 @@ Expected output for 'h5dump --xml tarray3.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-           0 1 2 
-               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   
-           1000 1001 1002 
-               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   
-           2000 2001 2002 
-               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   
-           3000 3001 3002 
-               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  
+           0 1 2
+               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
+           1000 1001 1002
+               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
+           2000 2001 2002
+               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
+           3000 3001 3002
+               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
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>

tools/testfiles/tarray4.ddl

@@ -7,8 +7,8 @@ GROUP "/" {
       DATATYPE  H5T_ARRAY { [4] H5T_COMPOUND {
          H5T_STD_I32LE "i";
          H5T_IEEE_F32LE "f";
-      } }  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      } }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          [ {
                0,
@@ -62,7 +62,7 @@ GROUP "/" {
                33,
                10.5
             } ]
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tarray5.ddl

@@ -7,8 +7,8 @@ GROUP "/" {
       DATATYPE  H5T_ARRAY { [4] H5T_COMPOUND {
          H5T_STD_I32LE "i";
          H5T_ARRAY { [4] H5T_IEEE_F32LE } "f";
-      } }  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      } }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          [ {
                0,
@@ -62,7 +62,7 @@ GROUP "/" {
                33,
                [ 37.5, 38.5, 39.5, 40.5 ]
             } ]
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tarray6.ddl

@@ -4,14 +4,14 @@ Expected output for 'h5dump tarray6.h5'
 HDF5 "tarray6.h5" {
 GROUP "/" {
    DATASET "Dataset1" {
-      DATATYPE  H5T_ARRAY { [4] H5T_VLEN { H5T_STD_U32LE} }  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_ARRAY { [4] H5T_VLEN { H5T_STD_U32LE} }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          [ (0), (10, 11), (20, 21, 22), (30, 31, 32, 33) ],
          [ (100, 101), (110, 111, 112), (120, 121, 122, 123), (130, 131, 132, 133, 134) ],
          [ (200, 201, 202), (210, 211, 212, 213), (220, 221, 222, 223, 224), (230, 231, 232, 233, 234, 235) ],
          [ (300, 301, 302, 303), (310, 311, 312, 313, 314), (320, 321, 322, 323, 324, 325), (330, 331, 332, 333, 334, 335, 336) ]
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tarray6.h5.xml

@@ -34,10 +34,10 @@ Expected output for 'h5dump --xml tarray6.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-           0   10 11   20 21 22   30 31 32 33   
-           100 101   110 111 112   120 121 122 123   130 131 132 133 134   
-           200 201 202   210 211 212 213   220 221 222 223 224   230 231 232 233 234 235   
-           300 301 302 303   310 311 312 313 314   320 321 322 323 324 325   330 331 332 333 334 335 336  
+           0  10 11  20 21 22  30 31 32 33
+           100 101  110 111 112  120 121 122 123  130 131 132 133 134
+           200 201 202  210 211 212 213  220 221 222 223 224  230 231 232 233 234 235
+           300 301 302 303  310 311 312 313 314  320 321 322 323 324 325  330 331 332 333 334 335 336
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>

tools/testfiles/tarray7.ddl

@@ -4,14 +4,14 @@ Expected output for 'h5dump tarray7.h5'
 HDF5 "tarray7.h5" {
 GROUP "/" {
    DATASET "Dataset1" {
-      DATATYPE  H5T_ARRAY { [4] H5T_VLEN { H5T_ARRAY { [4] H5T_STD_U32LE }} }  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_ARRAY { [4] H5T_VLEN { H5T_ARRAY { [4] H5T_STD_U32LE }} }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          [ ([ 0, 1, 2, 3 ]), ([ 100, 101, 102, 103 ], [ 110, 111, 112, 113 ]), ([ 200, 201, 202, 203 ], [ 210, 211, 212, 213 ], [ 220, 221, 222, 223 ]), ([ 300, 301, 302, 303 ], [ 310, 311, 312, 313 ], [ 320, 321, 322, 323 ], [ 330, 331, 332, 333 ]) ],
          [ ([ 1000, 1001, 1002, 1003 ], [ 1010, 1011, 1012, 1013 ]), ([ 1100, 1101, 1102, 1103 ], [ 1110, 1111, 1112, 1113 ], [ 1120, 1121, 1122, 1123 ]), ([ 1200, 1201, 1202, 1203 ], [ 1210, 1211, 1212, 1213 ], [ 1220, 1221, 1222, 1223 ], [ 1230, 1231, 1232, 1233 ]), ([ 1300, 1301, 1302, 1303 ], [ 1310, 1311, 1312, 1313 ], [ 1320, 1321, 1322, 1323 ], [ 1330, 1331, 1332, 1333 ], [ 1340, 1341, 1342, 1343 ]) ],
          [ ([ 2000, 2001, 2002, 2003 ], [ 2010, 2011, 2012, 2013 ], [ 2020, 2021, 2022, 2023 ]), ([ 2100, 2101, 2102, 2103 ], [ 2110, 2111, 2112, 2113 ], [ 2120, 2121, 2122, 2123 ], [ 2130, 2131, 2132, 2133 ]), ([ 2200, 2201, 2202, 2203 ], [ 2210, 2211, 2212, 2213 ], [ 2220, 2221, 2222, 2223 ], [ 2230, 2231, 2232, 2233 ], [ 2240, 2241, 2242, 2243 ]), ([ 2300, 2301, 2302, 2303 ], [ 2310, 2311, 2312, 2313 ], [ 2320, 2321, 2322, 2323 ], [ 2330, 2331, 2332, 2333 ], [ 2340, 2341, 2342, 2343 ], [ 2350, 2351, 2352, 2353 ]) ],
          [ ([ 3000, 3001, 3002, 3003 ], [ 3010, 3011, 3012, 3013 ], [ 3020, 3021, 3022, 3023 ], [ 3030, 3031, 3032, 3033 ]), ([ 3100, 3101, 3102, 3103 ], [ 3110, 3111, 3112, 3113 ], [ 3120, 3121, 3122, 3123 ], [ 3130, 3131, 3132, 3133 ], [ 3140, 3141, 3142, 3143 ]), ([ 3200, 3201, 3202, 3203 ], [ 3210, 3211, 3212, 3213 ], [ 3220, 3221, 3222, 3223 ], [ 3230, 3231, 3232, 3233 ], [ 3240, 3241, 3242, 3243 ], [ 3250, 3251, 3252, 3253 ]), ([ 3300, 3301, 3302, 3303 ], [ 3310, 3311, 3312, 3313 ], [ 3320, 3321, 3322, 3323 ], [ 3330, 3331, 3332, 3333 ], [ 3340, 3341, 3342, 3343 ], [ 3350, 3351, 3352, 3353 ], [ 3360, 3361, 3362, 3363 ]) ]
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tarray7.h5.xml

@@ -39,10 +39,10 @@ Expected output for 'h5dump --xml tarray7.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-            0 1 2 3     100 101 102 103   110 111 112 113     200 201 202 203   210 211 212 213   220 221 222 223     300 301 302 303   310 311 312 313   320 321 322 323   330 331 332 333    
-            1000 1001 1002 1003   1010 1011 1012 1013     1100 1101 1102 1103   1110 1111 1112 1113   1120 1121 1122 1123     1200 1201 1202 1203   1210 1211 1212 1213   1220 1221 1222 1223   1230 1231 1232 1233     1300 1301 1302 1303   1310 1311 1312 1313   1320 1321 1322 1323   1330 1331 1332 1333   1340 1341 1342 1343    
-            2000 2001 2002 2003   2010 2011 2012 2013   2020 2021 2022 2023     2100 2101 2102 2103   2110 2111 2112 2113   2120 2121 2122 2123   2130 2131 2132 2133     2200 2201 2202 2203   2210 2211 2212 2213   2220 2221 2222 2223   2230 2231 2232 2233   2240 2241 2242 2243     2300 2301 2302 2303   2310 2311 2312 2313   2320 2321 2322 2323   2330 2331 2332 2333   2340 2341 2342 2343   2350 2351 2352 2353    
-            3000 3001 3002 3003   3010 3011 3012 3013   3020 3021 3022 3023   3030 3031 3032 3033     3100 3101 3102 3103   3110 3111 3112 3113   3120 3121 3122 3123   3130 3131 3132 3133   3140 3141 3142 3143     3200 3201 3202 3203   3210 3211 3212 3213   3220 3221 3222 3223   3230 3231 3232 3233   3240 3241 3242 3243   3250 3251 3252 3253     3300 3301 3302 3303   3310 3311 3312 3313   3320 3321 3322 3323   3330 3331 3332 3333   3340 3341 3342 3343   3350 3351 3352 3353   3360 3361 3362 3363   
+            0 1 2 3   100 101 102 103  110 111 112 113   200 201 202 203  210 211 212 213  220 221 222 223   300 301 302 303  310 311 312 313  320 321 322 323  330 331 332 333
+            1000 1001 1002 1003  1010 1011 1012 1013   1100 1101 1102 1103  1110 1111 1112 1113  1120 1121 1122 1123   1200 1201 1202 1203  1210 1211 1212 1213  1220 1221 1222 1223  1230 1231 1232 1233   1300 1301 1302 1303  1310 1311 1312 1313  1320 1321 1322 1323  1330 1331 1332 1333  1340 1341 1342 1343
+            2000 2001 2002 2003  2010 2011 2012 2013  2020 2021 2022 2023   2100 2101 2102 2103  2110 2111 2112 2113  2120 2121 2122 2123  2130 2131 2132 2133   2200 2201 2202 2203  2210 2211 2212 2213  2220 2221 2222 2223  2230 2231 2232 2233  2240 2241 2242 2243   2300 2301 2302 2303  2310 2311 2312 2313  2320 2321 2322 2323  2330 2331 2332 2333  2340 2341 2342 2343  2350 2351 2352 2353
+            3000 3001 3002 3003  3010 3011 3012 3013  3020 3021 3022 3023  3030 3031 3032 3033   3100 3101 3102 3103  3110 3111 3112 3113  3120 3121 3122 3123  3130 3131 3132 3133  3140 3141 3142 3143   3200 3201 3202 3203  3210 3211 3212 3213  3220 3221 3222 3223  3230 3231 3232 3233  3240 3241 3242 3243  3250 3251 3252 3253   3300 3301 3302 3303  3310 3311 3312 3313  3320 3321 3322 3323  3330 3331 3332 3333  3340 3341 3342 3343  3350 3351 3352 3353  3360 3361 3362 3363
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>

tools/testfiles/tattr-1.ddl

@@ -4,45 +4,45 @@ Expected output for 'h5dump tattr.h5'
 HDF5 "tattr.h5" {
 GROUP "/" {
    ATTRIBUTE "attr1" {
-      DATATYPE  H5T_STD_I8BE  
-      DATASPACE  SIMPLE { ( 24 ) / ( 24 ) } 
+      DATATYPE  H5T_STD_I8BE
+      DATASPACE  SIMPLE { ( 24 ) / ( 24 ) }
       DATA {
          97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 114, 111,
          111, 116, 32, 103, 114, 111, 117, 112, 0
-      } 
-   } 
+      }
+   }
    ATTRIBUTE "attr2" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
       DATA {
          1, 2, 3, 4, 5, 6, 7, 8, 9, 10
-      } 
-   } 
+      }
+   }
    ATTRIBUTE "attr3" {
-      DATATYPE  H5T_IEEE_F64BE  
-      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
+      DATATYPE  H5T_IEEE_F64BE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
       DATA {
          0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9
-      } 
-   } 
+      }
+   }
    ATTRIBUTE "attr4" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SCALAR  
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SCALAR
       DATA {
          100
-      } 
-   } 
+      }
+   }
    ATTRIBUTE "attr5" {
       DATATYPE  H5T_STRING {
             STRSIZE 17;
             STRPAD H5T_STR_NULLTERM;
             CSET H5T_CSET_ASCII;
             CTYPE H5T_C_S1;
-         }        
-      DATASPACE  SCALAR  
+         }
+      DATASPACE  SCALAR
       DATA {
          "string attribute"
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tattr-2.ddl

@@ -3,30 +3,30 @@ Expected output for 'h5dump -a /attr1 --attribute /attr4 --attribute=/attr5 tatt
 #############################
 HDF5 "tattr.h5" {
 ATTRIBUTE "/attr1" {
-   DATATYPE  H5T_STD_I8BE  
-   DATASPACE  SIMPLE { ( 24 ) / ( 24 ) } 
+   DATATYPE  H5T_STD_I8BE
+   DATASPACE  SIMPLE { ( 24 ) / ( 24 ) }
    DATA {
       97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 114, 111,
       111, 116, 32, 103, 114, 111, 117, 112, 0
-   } 
-} 
+   }
+}
 ATTRIBUTE "/attr4" {
-   DATATYPE  H5T_STD_I32BE  
-   DATASPACE  SCALAR  
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SCALAR
    DATA {
       100
-   } 
-} 
+   }
+}
 ATTRIBUTE "/attr5" {
    DATATYPE  H5T_STRING {
          STRSIZE 17;
          STRPAD H5T_STR_NULLTERM;
          CSET H5T_CSET_ASCII;
          CTYPE H5T_C_S1;
-      }     
-   DATASPACE  SCALAR  
+      }
+   DATASPACE  SCALAR
    DATA {
       "string attribute"
-   } 
-} 
-} 
+   }
+}
+}

tools/testfiles/tattr-3.ddl

@@ -3,10 +3,10 @@ Expected output for 'h5dump --header -a /attr2 --attribute=/attr tattr.h5'
 #############################
 HDF5 "tattr.h5" {
 ATTRIBUTE "/attr2" {
-   DATATYPE  H5T_STD_I32BE  
-   DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
-} 
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+}
 ATTRIBUTE "/attr" {
-   } 
-} 
+   }
+}
 h5dump error: unable to open attribute "/"

tools/testfiles/tattr.h5.xml

@@ -17,7 +17,7 @@ Expected output for 'h5dump --xml tattr.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-         97 116 116 114 105 98 117 116 101 32 111 102 32 114 111 111 116 32 103 
+         97 116 116 114 105 98 117 116 101 32 111 102 32 114 111 111 116 32 103
          114 111 117 112 0
          </hdf5:DataFromFile>
       </hdf5:Data>

tools/testfiles/tbitfields.h5.xml

@@ -26,8 +26,8 @@ Expected output for 'h5dump --xml tbitfields.h5'
          </hdf5:DataType>
          <hdf5:Data>
             <hdf5:DataFromFile>
-            0xff 0xfe 0xfd 0xfc 0xfb 0xfa 0xf9 0xf8 0xf7 0xf6 0xf5 0xf4 0xf3 
-            0xf2 0xf1 0xf0 0xef 0xee 0xed 0xec 0xeb 0xea 0xe9 0xe8 0xe7 0xe6 
+            0xff 0xfe 0xfd 0xfc 0xfb 0xfa 0xf9 0xf8 0xf7 0xf6 0xf5 0xf4 0xf3
+            0xf2 0xf1 0xf0 0xef 0xee 0xed 0xec 0xeb 0xea 0xe9 0xe8 0xe7 0xe6
             0xe5 0xe4 0xe3 0xe2 0xe1 0xe0
             </hdf5:DataFromFile>
          </hdf5:Data>
@@ -53,7 +53,7 @@ Expected output for 'h5dump --xml tbitfields.h5'
          </hdf5:DataType>
          <hdf5:Data>
             <hdf5:DataFromFile>
-            ff:fe fd:fc fb:fa f9:f8 f7:f6 f5:f4 f3:f2 f1:f0 ef:ee ed:ec eb:ea 
+            ff:fe fd:fc fb:fa f9:f8 f7:f6 f5:f4 f3:f2 f1:f0 ef:ee ed:ec eb:ea
             e9:e8 e7:e6 e5:e4 e3:e2 e1:e0
             </hdf5:DataFromFile>
          </hdf5:Data>

tools/testfiles/tchar1.ddl

@@ -4,15 +4,15 @@ Expected output for 'h5dump -r tchar.h5'
 HDF5 "tchar.h5" {
 GROUP "/" {
    DATASET "Dataset1" {
-      DATATYPE  H5T_STD_I8LE  
-      DATASPACE  SIMPLE { ( 308 ) / ( 308 ) } 
+      DATATYPE  H5T_STD_I8LE
+      DATASPACE  SIMPLE { ( 308 ) / ( 308 ) }
       DATA {
          "Four score and seven years ago our forefathers brought forth on this "
          "continent a new nation, conceived in liberty and dedicated to the pro"
          "position that all men are created equal. Now we are engaged in a grea"
          "t civil war, testing whether that nation or any nation so conceived a"
          "nd so dedicated can long endure."
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tcomp-1.ddl

@@ -6,14 +6,14 @@ GROUP "/" {
    DATATYPE "#6632:0" H5T_COMPOUND {
       H5T_STD_I32BE "int";
       H5T_IEEE_F32BE "float";
-   }    
+   }
    DATASET "dset1" {
       DATATYPE  H5T_COMPOUND {
          H5T_STD_I32BE "a_name";
          H5T_IEEE_F32BE "b_name";
          H5T_IEEE_F64BE "c_name";
-      }        
-      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+      }
+      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
       DATA {
          {
             0,
@@ -40,12 +40,12 @@ GROUP "/" {
             16,
             0.2
          }
-      } 
-   } 
+      }
+   }
    GROUP "group1" {
       DATASET "dset2" {
-         DATATYPE  "/type1"           
-         DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+         DATATYPE  "/type1"
+         DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
          DATA {
             {
                0,
@@ -67,161 +67,161 @@ GROUP "/" {
                4,
                4.4
             }
-         } 
-      } 
+         }
+      }
       DATASET "dset3" {
-         DATATYPE  "/type2"           
-         DATASPACE  SIMPLE { ( 3, 6 ) / ( 3, 6 ) } 
+         DATATYPE  "/type2"
+         DATASPACE  SIMPLE { ( 3, 6 ) / ( 3, 6 ) }
          DATA {
             {
                [ 0, 1, 2, 3 ],
-               [ 1, 2, 3, 4, 5, 6, 
-                  2, 3, 4, 5, 6, 7, 
-                  3, 4, 5, 6, 7, 8, 
-                  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,
                   5, 6, 7, 8, 9, 10 ]
             },
             {
                [ 1, 2, 3, 4 ],
-               [ 2, 3, 4, 5, 6, 7, 
-                  3, 4, 5, 6, 7, 8, 
-                  4, 5, 6, 7, 8, 9, 
-                  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,
                   6, 7, 8, 9, 10, 11 ]
             },
             {
                [ 2, 3, 4, 5 ],
-               [ 3, 4, 5, 6, 7, 8, 
-                  4, 5, 6, 7, 8, 9, 
-                  5, 6, 7, 8, 9, 10, 
-                  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,
                   7, 8, 9, 10, 11, 12 ]
             },
             {
                [ 3, 4, 5, 6 ],
-               [ 4, 5, 6, 7, 8, 9, 
-                  5, 6, 7, 8, 9, 10, 
-                  6, 7, 8, 9, 10, 11, 
-                  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,
                   8, 9, 10, 11, 12, 13 ]
             },
             {
                [ 4, 5, 6, 7 ],
-               [ 5, 6, 7, 8, 9, 10, 
-                  6, 7, 8, 9, 10, 11, 
-                  7, 8, 9, 10, 11, 12, 
-                  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,
                   9, 10, 11, 12, 13, 14 ]
             },
             {
                [ 5, 6, 7, 8 ],
-               [ 6, 7, 8, 9, 10, 11, 
-                  7, 8, 9, 10, 11, 12, 
-                  8, 9, 10, 11, 12, 13, 
-                  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,
                   10, 11, 12, 13, 14, 15 ]
             },
             {
                [ 1, 2, 3, 4 ],
-               [ 2, 3, 4, 5, 6, 7, 
-                  3, 4, 5, 6, 7, 8, 
-                  4, 5, 6, 7, 8, 9, 
-                  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,
                   6, 7, 8, 9, 10, 11 ]
             },
             {
                [ 2, 3, 4, 5 ],
-               [ 3, 4, 5, 6, 7, 8, 
-                  4, 5, 6, 7, 8, 9, 
-                  5, 6, 7, 8, 9, 10, 
-                  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,
                   7, 8, 9, 10, 11, 12 ]
             },
             {
                [ 3, 4, 5, 6 ],
-               [ 4, 5, 6, 7, 8, 9, 
-                  5, 6, 7, 8, 9, 10, 
-                  6, 7, 8, 9, 10, 11, 
-                  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,
                   8, 9, 10, 11, 12, 13 ]
             },
             {
                [ 4, 5, 6, 7 ],
-               [ 5, 6, 7, 8, 9, 10, 
-                  6, 7, 8, 9, 10, 11, 
-                  7, 8, 9, 10, 11, 12, 
-                  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,
                   9, 10, 11, 12, 13, 14 ]
             },
             {
                [ 5, 6, 7, 8 ],
-               [ 6, 7, 8, 9, 10, 11, 
-                  7, 8, 9, 10, 11, 12, 
-                  8, 9, 10, 11, 12, 13, 
-                  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,
                   10, 11, 12, 13, 14, 15 ]
             },
             {
                [ 6, 7, 8, 9 ],
-               [ 7, 8, 9, 10, 11, 12, 
-                  8, 9, 10, 11, 12, 13, 
-                  9, 10, 11, 12, 13, 14, 
-                  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,
                   11, 12, 13, 14, 15, 16 ]
             },
             {
                [ 2, 3, 4, 5 ],
-               [ 3, 4, 5, 6, 7, 8, 
-                  4, 5, 6, 7, 8, 9, 
-                  5, 6, 7, 8, 9, 10, 
-                  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,
                   7, 8, 9, 10, 11, 12 ]
             },
             {
                [ 3, 4, 5, 6 ],
-               [ 4, 5, 6, 7, 8, 9, 
-                  5, 6, 7, 8, 9, 10, 
-                  6, 7, 8, 9, 10, 11, 
-                  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,
                   8, 9, 10, 11, 12, 13 ]
             },
             {
                [ 4, 5, 6, 7 ],
-               [ 5, 6, 7, 8, 9, 10, 
-                  6, 7, 8, 9, 10, 11, 
-                  7, 8, 9, 10, 11, 12, 
-                  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,
                   9, 10, 11, 12, 13, 14 ]
             },
             {
                [ 5, 6, 7, 8 ],
-               [ 6, 7, 8, 9, 10, 11, 
-                  7, 8, 9, 10, 11, 12, 
-                  8, 9, 10, 11, 12, 13, 
-                  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,
                   10, 11, 12, 13, 14, 15 ]
             },
             {
                [ 6, 7, 8, 9 ],
-               [ 7, 8, 9, 10, 11, 12, 
-                  8, 9, 10, 11, 12, 13, 
-                  9, 10, 11, 12, 13, 14, 
-                  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,
                   11, 12, 13, 14, 15, 16 ]
             },
             {
                [ 7, 8, 9, 10 ],
-               [ 8, 9, 10, 11, 12, 13, 
-                  9, 10, 11, 12, 13, 14, 
-                  10, 11, 12, 13, 14, 15, 
-                  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,
                   12, 13, 14, 15, 16, 17 ]
             }
-         } 
-      } 
+         }
+      }
       DATASET "dset4" {
-         DATATYPE  "/group1/type3"           
-         DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+         DATATYPE  "/group1/type3"
+         DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
          DATA {
             {
                0,
@@ -243,18 +243,17 @@ GROUP "/" {
                4,
                7
             }
-         } 
-      } 
+         }
+      }
       DATATYPE "type3" H5T_COMPOUND {
          H5T_STD_I32BE "int";
          H5T_IEEE_F32BE "float";
-      }       
-   } 
+      }
+   }
    GROUP "group2" {
       DATASET "dset5" {
          DATATYPE  "/#6632:0"
-           
-         DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+         DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
          DATA {
             {
                0,
@@ -276,16 +275,16 @@ GROUP "/" {
                4,
                0.4
             }
-         } 
-      } 
-   } 
+         }
+      }
+   }
    DATATYPE "type1" H5T_COMPOUND {
       H5T_STD_I32BE "int_name";
       H5T_IEEE_F32BE "float_name";
-   }    
+   }
    DATATYPE "type2" H5T_COMPOUND {
       H5T_ARRAY { [4] H5T_STD_I32BE } "int_array";
       H5T_ARRAY { [5][6] H5T_IEEE_F32BE } "float_array";
-   }    
-} 
-} 
+   }
+}
+}

tools/testfiles/tcomp-2.ddl

@@ -5,13 +5,13 @@ HDF5 "tcompound.h5" {
 DATATYPE "/type1" H5T_COMPOUND {
    H5T_STD_I32BE "int_name";
    H5T_IEEE_F32BE "float_name";
-} 
+}
 DATATYPE "/type2" H5T_COMPOUND {
    H5T_ARRAY { [4] H5T_STD_I32BE } "int_array";
    H5T_ARRAY { [5][6] H5T_IEEE_F32BE } "float_array";
-} 
+}
 DATATYPE "/group1/type3" H5T_COMPOUND {
    H5T_STD_I32BE "int";
    H5T_IEEE_F32BE "float";
-} 
-} 
+}
+}

tools/testfiles/tcomp-3.ddl

@@ -1,14 +1,15 @@
 #############################
-Expected output for 'h5dump -t /#5992:0 -g /group2 tcompound.h5'
+Expected output for 'h5dump -t /#6632:0 -g /group2 tcompound.h5'
 #############################
 HDF5 "tcompound.h5" {
-DATATYPE "/#5992:0" 
-    
+DATATYPE "/#6632:0" H5T_COMPOUND {
+   H5T_STD_I32BE "int";
+   H5T_IEEE_F32BE "float";
+}
 GROUP "/group2" {
    DATASET "dset5" {
       DATATYPE  "/#6632:0"
-        
-      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
       DATA {
          {
             0,
@@ -30,8 +31,7 @@ GROUP "/group2" {
             4,
             0.4
          }
-      } 
-   } 
-} 
-} 
-h5dump error: unable to open datatype "/#5992:0"
+      }
+   }
+}
+}

tools/testfiles/tcomp-4.ddl

@@ -22,17 +22,17 @@ GROUP "/" {
          H5T_IEEE_F32BE "e_name";
          H5T_ARRAY { [10] H5T_IEEE_F64BE } "f_name";
          H5T_STD_I8LE "g_name";
-      }        
-      DATASPACE  SIMPLE { ( 6 ) / ( 6 ) } 
+      }
+      DATASPACE  SIMPLE { ( 6 ) / ( 6 ) }
       DATA {
          {
             0,
             [ "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, 
-               1, 2, 3, 4, 5, 6, 
-               2, 3, 4, 5, 6, 7, 
-               3, 4, 5, 6, 7, 8, 
+            [ 0, 1, 2, 3, 4, 5,
+               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 ],
@@ -42,10 +42,10 @@ GROUP "/" {
             1,
             [ "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, 
-               2, 3, 4, 5, 6, 7, 
-               3, 4, 5, 6, 7, 8, 
-               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,
                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 ],
@@ -55,10 +55,10 @@ GROUP "/" {
             2,
             [ "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, 
-               3, 4, 5, 6, 7, 8, 
-               4, 5, 6, 7, 8, 9, 
-               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,
                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 ],
@@ -68,10 +68,10 @@ GROUP "/" {
             3,
             [ "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, 
-               4, 5, 6, 7, 8, 9, 
-               5, 6, 7, 8, 9, 10, 
-               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,
                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 ],
@@ -81,10 +81,10 @@ GROUP "/" {
             4,
             [ "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, 
-               5, 6, 7, 8, 9, 10, 
-               6, 7, 8, 9, 10, 11, 
-               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,
                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 ],
@@ -94,16 +94,16 @@ GROUP "/" {
             5,
             [ "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, 
-               6, 7, 8, 9, 10, 11, 
-               7, 8, 9, 10, 11, 12, 
-               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,
                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
          }
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tcompound.h5.xml

@@ -6,73 +6,73 @@ Expected output for 'h5dump --xml tcompound.h5'
 <hdf5:RootGroup OBJ-XID="xid_696-0" H5Path="/">
    <hdf5:NamedDataType Name="#6632:0" OBJ-XID="xid_4294967294-4294967293" Parents="xid_696-0" H5ParentPaths="/">
       <hdf5:DataType>
-      <hdf5:CompoundType>
-         <hdf5:Field FieldName="int">
-            <hdf5:DataType>
-               <hdf5:AtomicType>
-                  <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
-               </hdf5:AtomicType>
-            </hdf5:DataType>
-         </hdf5:Field>
-         <hdf5:Field FieldName="float">
-            <hdf5:DataType>
-               <hdf5:AtomicType>
-                  <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-               </hdf5:AtomicType>
-            </hdf5:DataType>
-         </hdf5:Field>
-      </hdf5:CompoundType>
+         <hdf5:CompoundType>
+            <hdf5:Field FieldName="int">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="float">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+         </hdf5:CompoundType>
       </hdf5:DataType>
    </hdf5:NamedDataType>
    <hdf5:NamedDataType Name="type1" OBJ-XID="xid_1424-0" H5Path="/type1" Parents="xid_696-0" H5ParentPaths="/">
       <hdf5:DataType>
-      <hdf5:CompoundType>
-         <hdf5:Field FieldName="int_name">
-            <hdf5:DataType>
-               <hdf5:AtomicType>
-                  <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
-               </hdf5:AtomicType>
-            </hdf5:DataType>
-         </hdf5:Field>
-         <hdf5:Field FieldName="float_name">
-            <hdf5:DataType>
-               <hdf5:AtomicType>
-                  <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-               </hdf5:AtomicType>
-            </hdf5:DataType>
-         </hdf5:Field>
-      </hdf5:CompoundType>
+         <hdf5:CompoundType>
+            <hdf5:Field FieldName="int_name">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="float_name">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+         </hdf5:CompoundType>
       </hdf5:DataType>
    </hdf5:NamedDataType>
    <hdf5:NamedDataType Name="type2" OBJ-XID="xid_2792-0" H5Path="/type2" Parents="xid_696-0" H5ParentPaths="/">
       <hdf5:DataType>
-      <hdf5:CompoundType>
-         <hdf5:Field FieldName="int_array">
-            <hdf5:DataType>
-               <hdf5:ArrayType Ndims="1">
-                  <hdf5:ArrayDimension DimSize="4" DimPerm="0"/>
-                  <hdf5:DataType>
-                     <hdf5:AtomicType>
-                        <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                     </hdf5:AtomicType>
-                  </hdf5:DataType>
-               </hdf5:ArrayType>
-            </hdf5:DataType>
-         </hdf5:Field>
-         <hdf5:Field FieldName="float_array">
-            <hdf5:DataType>
-               <hdf5:ArrayType Ndims="2">
-                  <hdf5:ArrayDimension DimSize="5" DimPerm="0"/>
-                  <hdf5:ArrayDimension DimSize="6" DimPerm="1"/>
-                  <hdf5:DataType>
-                     <hdf5:AtomicType>
-                        <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                     </hdf5:AtomicType>
-                  </hdf5:DataType>
-               </hdf5:ArrayType>
-            </hdf5:DataType>
-         </hdf5:Field>
-      </hdf5:CompoundType>
+         <hdf5:CompoundType>
+            <hdf5:Field FieldName="int_array">
+               <hdf5:DataType>
+                  <hdf5:ArrayType Ndims="1">
+                     <hdf5:ArrayDimension DimSize="4" DimPerm="0"/>
+                     <hdf5:DataType>
+                        <hdf5:AtomicType>
+                           <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                        </hdf5:AtomicType>
+                     </hdf5:DataType>
+                  </hdf5:ArrayType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="float_array">
+               <hdf5:DataType>
+                  <hdf5:ArrayType Ndims="2">
+                     <hdf5:ArrayDimension DimSize="5" DimPerm="0"/>
+                     <hdf5:ArrayDimension DimSize="6" DimPerm="1"/>
+                     <hdf5:DataType>
+                        <hdf5:AtomicType>
+                           <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                        </hdf5:AtomicType>
+                     </hdf5:DataType>
+                  </hdf5:ArrayType>
+               </hdf5:DataType>
+            </hdf5:Field>
+         </hdf5:CompoundType>
       </hdf5:DataType>
    </hdf5:NamedDataType>
    <hdf5:Dataset Name="dset1" OBJ-XID="xid_744-0" H5Path= "/dset1" Parents="xid_696-0" H5ParentPaths="/">
@@ -124,22 +124,22 @@ Expected output for 'h5dump --xml tcompound.h5'
    <hdf5:Group Name="group1" OBJ-XID="xid_2104-0" H5Path="/group1" Parents="xid_696-0" H5ParentPaths="/" >
       <hdf5:NamedDataType Name="type3" OBJ-XID="xid_5592-0" H5Path="/group1/type3" Parents="xid_2104-0" H5ParentPaths="/group1">
          <hdf5:DataType>
-         <hdf5:CompoundType>
-            <hdf5:Field FieldName="int">
-               <hdf5:DataType>
-                  <hdf5:AtomicType>
-                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                  </hdf5:AtomicType>
-               </hdf5:DataType>
-            </hdf5:Field>
-            <hdf5:Field FieldName="float">
-               <hdf5:DataType>
-                  <hdf5:AtomicType>
-                     <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </hdf5:AtomicType>
-               </hdf5:DataType>
-            </hdf5:Field>
-         </hdf5:CompoundType>
+            <hdf5:CompoundType>
+               <hdf5:Field FieldName="int">
+                  <hdf5:DataType>
+                     <hdf5:AtomicType>
+                        <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                     </hdf5:AtomicType>
+                  </hdf5:DataType>
+               </hdf5:Field>
+               <hdf5:Field FieldName="float">
+                  <hdf5:DataType>
+                     <hdf5:AtomicType>
+                        <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                     </hdf5:AtomicType>
+                  </hdf5:DataType>
+               </hdf5:Field>
+            </hdf5:CompoundType>
          </hdf5:DataType>
       </hdf5:NamedDataType>
       <hdf5:Dataset Name="dset2" OBJ-XID="xid_2152-0" H5Path= "/group1/dset2" Parents="xid_2104-0" H5ParentPaths="/group1">
@@ -183,96 +183,96 @@ Expected output for 'h5dump --xml tcompound.h5'
       <!-- Note: format of compound data not specified -->
          <hdf5:Data>
             <hdf5:DataFromFile>
-             0 1 2 3   1 2 3 4 5 6 
-                  2 3 4 5 6 7 
-                  3 4 5 6 7 8 
-                  4 5 6 7 8 9 
-                  5 6 7 8 9 10  
-             1 2 3 4   2 3 4 5 6 7 
-                  3 4 5 6 7 8 
-                  4 5 6 7 8 9 
-                  5 6 7 8 9 10 
-                  6 7 8 9 10 11  
-             2 3 4 5   3 4 5 6 7 8 
-                  4 5 6 7 8 9 
-                  5 6 7 8 9 10 
-                  6 7 8 9 10 11 
-                  7 8 9 10 11 12  
-             3 4 5 6   4 5 6 7 8 9 
-                  5 6 7 8 9 10 
-                  6 7 8 9 10 11 
-                  7 8 9 10 11 12 
-                  8 9 10 11 12 13  
-             4 5 6 7   5 6 7 8 9 10 
-                  6 7 8 9 10 11 
-                  7 8 9 10 11 12 
-                  8 9 10 11 12 13 
-                  9 10 11 12 13 14  
-             5 6 7 8   6 7 8 9 10 11 
-                  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 2 3 4   2 3 4 5 6 7 
-                  3 4 5 6 7 8 
-                  4 5 6 7 8 9 
-                  5 6 7 8 9 10 
-                  6 7 8 9 10 11  
-             2 3 4 5   3 4 5 6 7 8 
-                  4 5 6 7 8 9 
-                  5 6 7 8 9 10 
-                  6 7 8 9 10 11 
-                  7 8 9 10 11 12  
-             3 4 5 6   4 5 6 7 8 9 
-                  5 6 7 8 9 10 
-                  6 7 8 9 10 11 
-                  7 8 9 10 11 12 
-                  8 9 10 11 12 13  
-             4 5 6 7   5 6 7 8 9 10 
-                  6 7 8 9 10 11 
-                  7 8 9 10 11 12 
-                  8 9 10 11 12 13 
-                  9 10 11 12 13 14  
-             5 6 7 8   6 7 8 9 10 11 
-                  7 8 9 10 11 12 
-                  8 9 10 11 12 13 
-                  9 10 11 12 13 14 
-                  10 11 12 13 14 15  
-             6 7 8 9   7 8 9 10 11 12 
-                  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 3 4 5   3 4 5 6 7 8 
-                  4 5 6 7 8 9 
-                  5 6 7 8 9 10 
-                  6 7 8 9 10 11 
-                  7 8 9 10 11 12  
-             3 4 5 6   4 5 6 7 8 9 
-                  5 6 7 8 9 10 
-                  6 7 8 9 10 11 
-                  7 8 9 10 11 12 
-                  8 9 10 11 12 13  
-             4 5 6 7   5 6 7 8 9 10 
-                  6 7 8 9 10 11 
-                  7 8 9 10 11 12 
-                  8 9 10 11 12 13 
-                  9 10 11 12 13 14  
-             5 6 7 8   6 7 8 9 10 11 
-                  7 8 9 10 11 12 
-                  8 9 10 11 12 13 
-                  9 10 11 12 13 14 
-                  10 11 12 13 14 15  
-             6 7 8 9   7 8 9 10 11 12 
-                  8 9 10 11 12 13 
-                  9 10 11 12 13 14 
-                  10 11 12 13 14 15 
-                  11 12 13 14 15 16  
-             7 8 9 10   8 9 10 11 12 13 
-                  9 10 11 12 13 14 
-                  10 11 12 13 14 15 
-                  11 12 13 14 15 16 
-                  12 13 14 15 16 17 
+             0 1 2 3  1 2 3 4 5 6
+                  2 3 4 5 6 7
+                  3 4 5 6 7 8
+                  4 5 6 7 8 9
+                  5 6 7 8 9 10
+             1 2 3 4  2 3 4 5 6 7
+                  3 4 5 6 7 8
+                  4 5 6 7 8 9
+                  5 6 7 8 9 10
+                  6 7 8 9 10 11
+             2 3 4 5  3 4 5 6 7 8
+                  4 5 6 7 8 9
+                  5 6 7 8 9 10
+                  6 7 8 9 10 11
+                  7 8 9 10 11 12
+             3 4 5 6  4 5 6 7 8 9
+                  5 6 7 8 9 10
+                  6 7 8 9 10 11
+                  7 8 9 10 11 12
+                  8 9 10 11 12 13
+             4 5 6 7  5 6 7 8 9 10
+                  6 7 8 9 10 11
+                  7 8 9 10 11 12
+                  8 9 10 11 12 13
+                  9 10 11 12 13 14
+             5 6 7 8  6 7 8 9 10 11
+                  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 2 3 4  2 3 4 5 6 7
+                  3 4 5 6 7 8
+                  4 5 6 7 8 9
+                  5 6 7 8 9 10
+                  6 7 8 9 10 11
+             2 3 4 5  3 4 5 6 7 8
+                  4 5 6 7 8 9
+                  5 6 7 8 9 10
+                  6 7 8 9 10 11
+                  7 8 9 10 11 12
+             3 4 5 6  4 5 6 7 8 9
+                  5 6 7 8 9 10
+                  6 7 8 9 10 11
+                  7 8 9 10 11 12
+                  8 9 10 11 12 13
+             4 5 6 7  5 6 7 8 9 10
+                  6 7 8 9 10 11
+                  7 8 9 10 11 12
+                  8 9 10 11 12 13
+                  9 10 11 12 13 14
+             5 6 7 8  6 7 8 9 10 11
+                  7 8 9 10 11 12
+                  8 9 10 11 12 13
+                  9 10 11 12 13 14
+                  10 11 12 13 14 15
+             6 7 8 9  7 8 9 10 11 12
+                  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 3 4 5  3 4 5 6 7 8
+                  4 5 6 7 8 9
+                  5 6 7 8 9 10
+                  6 7 8 9 10 11
+                  7 8 9 10 11 12
+             3 4 5 6  4 5 6 7 8 9
+                  5 6 7 8 9 10
+                  6 7 8 9 10 11
+                  7 8 9 10 11 12
+                  8 9 10 11 12 13
+             4 5 6 7  5 6 7 8 9 10
+                  6 7 8 9 10 11
+                  7 8 9 10 11 12
+                  8 9 10 11 12 13
+                  9 10 11 12 13 14
+             5 6 7 8  6 7 8 9 10 11
+                  7 8 9 10 11 12
+                  8 9 10 11 12 13
+                  9 10 11 12 13 14
+                  10 11 12 13 14 15
+             6 7 8 9  7 8 9 10 11 12
+                  8 9 10 11 12 13
+                  9 10 11 12 13 14
+                  10 11 12 13 14 15
+                  11 12 13 14 15 16
+             7 8 9 10  8 9 10 11 12 13
+                  9 10 11 12 13 14
+                  10 11 12 13 14 15
+                  11 12 13 14 15 16
+                  12 13 14 15 16 17
             </hdf5:DataFromFile>
          </hdf5:Data>
       </hdf5:Dataset>

tools/testfiles/tcompound2.h5.xml

@@ -6,73 +6,73 @@ Expected output for 'h5dump --xml tcompound2.h5'
 <hdf5:RootGroup OBJ-XID="xid_696-0" H5Path="/">
    <hdf5:NamedDataType Name="#9560:0" OBJ-XID="xid_4294967294-4294967293" Parents="xid_696-0" H5ParentPaths="/">
       <hdf5:DataType>
-      <hdf5:CompoundType>
-         <hdf5:Field FieldName="int">
-            <hdf5:DataType>
-               <hdf5:AtomicType>
-                  <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
-               </hdf5:AtomicType>
-            </hdf5:DataType>
-         </hdf5:Field>
-         <hdf5:Field FieldName="float">
-            <hdf5:DataType>
-               <hdf5:AtomicType>
-                  <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-               </hdf5:AtomicType>
-            </hdf5:DataType>
-         </hdf5:Field>
-      </hdf5:CompoundType>
+         <hdf5:CompoundType>
+            <hdf5:Field FieldName="int">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="float">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+         </hdf5:CompoundType>
       </hdf5:DataType>
    </hdf5:NamedDataType>
    <hdf5:NamedDataType Name="type1" OBJ-XID="xid_3280-0" H5Path="/type1" Parents="xid_696-0" H5ParentPaths="/">
       <hdf5:DataType>
-      <hdf5:CompoundType>
-         <hdf5:Field FieldName="int_name">
-            <hdf5:DataType>
-               <hdf5:AtomicType>
-                  <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
-               </hdf5:AtomicType>
-            </hdf5:DataType>
-         </hdf5:Field>
-         <hdf5:Field FieldName="float_name">
-            <hdf5:DataType>
-               <hdf5:AtomicType>
-                  <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-               </hdf5:AtomicType>
-            </hdf5:DataType>
-         </hdf5:Field>
-      </hdf5:CompoundType>
+         <hdf5:CompoundType>
+            <hdf5:Field FieldName="int_name">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="float_name">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+         </hdf5:CompoundType>
       </hdf5:DataType>
    </hdf5:NamedDataType>
    <hdf5:NamedDataType Name="type2" OBJ-XID="xid_6544-0" H5Path="/type2" Parents="xid_696-0" H5ParentPaths="/">
       <hdf5:DataType>
-      <hdf5:CompoundType>
-         <hdf5:Field FieldName="int_array">
-            <hdf5:DataType>
-               <hdf5:ArrayType Ndims="1">
-                  <hdf5:ArrayDimension DimSize="4" DimPerm="0"/>
-                  <hdf5:DataType>
-                     <hdf5:AtomicType>
-                        <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                     </hdf5:AtomicType>
-                  </hdf5:DataType>
-               </hdf5:ArrayType>
-            </hdf5:DataType>
-         </hdf5:Field>
-         <hdf5:Field FieldName="float_array">
-            <hdf5:DataType>
-               <hdf5:ArrayType Ndims="2">
-                  <hdf5:ArrayDimension DimSize="5" DimPerm="0"/>
-                  <hdf5:ArrayDimension DimSize="6" DimPerm="1"/>
-                  <hdf5:DataType>
-                     <hdf5:AtomicType>
-                        <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                     </hdf5:AtomicType>
-                  </hdf5:DataType>
-               </hdf5:ArrayType>
-            </hdf5:DataType>
-         </hdf5:Field>
-      </hdf5:CompoundType>
+         <hdf5:CompoundType>
+            <hdf5:Field FieldName="int_array">
+               <hdf5:DataType>
+                  <hdf5:ArrayType Ndims="1">
+                     <hdf5:ArrayDimension DimSize="4" DimPerm="0"/>
+                     <hdf5:DataType>
+                        <hdf5:AtomicType>
+                           <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                        </hdf5:AtomicType>
+                     </hdf5:DataType>
+                  </hdf5:ArrayType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="float_array">
+               <hdf5:DataType>
+                  <hdf5:ArrayType Ndims="2">
+                     <hdf5:ArrayDimension DimSize="5" DimPerm="0"/>
+                     <hdf5:ArrayDimension DimSize="6" DimPerm="1"/>
+                     <hdf5:DataType>
+                        <hdf5:AtomicType>
+                           <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                        </hdf5:AtomicType>
+                     </hdf5:DataType>
+                  </hdf5:ArrayType>
+               </hdf5:DataType>
+            </hdf5:Field>
+         </hdf5:CompoundType>
       </hdf5:DataType>
    </hdf5:NamedDataType>
    <hdf5:Dataset Name="dset1" OBJ-XID="xid_744-0" H5Path= "/dset1" Parents="xid_696-0" H5ParentPaths="/">
@@ -128,22 +128,22 @@ Expected output for 'h5dump --xml tcompound2.h5'
    <hdf5:Group Name="group1" OBJ-XID="xid_3960-0" H5Path="/group1" Parents="xid_696-0" H5ParentPaths="/" >
       <hdf5:NamedDataType Name="type3" OBJ-XID="xid_6624-0" H5Path="/group1/type3" Parents="xid_3960-0" H5ParentPaths="/group1">
          <hdf5:DataType>
-         <hdf5:CompoundType>
-            <hdf5:Field FieldName="int">
-               <hdf5:DataType>
-                  <hdf5:AtomicType>
-                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                  </hdf5:AtomicType>
-               </hdf5:DataType>
-            </hdf5:Field>
-            <hdf5:Field FieldName="float">
-               <hdf5:DataType>
-                  <hdf5:AtomicType>
-                     <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </hdf5:AtomicType>
-               </hdf5:DataType>
-            </hdf5:Field>
-         </hdf5:CompoundType>
+            <hdf5:CompoundType>
+               <hdf5:Field FieldName="int">
+                  <hdf5:DataType>
+                     <hdf5:AtomicType>
+                        <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                     </hdf5:AtomicType>
+                  </hdf5:DataType>
+               </hdf5:Field>
+               <hdf5:Field FieldName="float">
+                  <hdf5:DataType>
+                     <hdf5:AtomicType>
+                        <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                     </hdf5:AtomicType>
+                  </hdf5:DataType>
+               </hdf5:Field>
+            </hdf5:CompoundType>
          </hdf5:DataType>
       </hdf5:NamedDataType>
       <hdf5:Dataset Name="dset2" OBJ-XID="xid_4008-0" H5Path= "/group1/dset2" Parents="xid_3960-0" H5ParentPaths="/group1">

tools/testfiles/tcompound_complex.h5.xml

@@ -93,36 +93,36 @@ Expected output for 'h5dump --xml tcompound_complex.h5'
    <!-- Note: format of compound data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0  "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 
-               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 
-         1  "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 
-               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 
-         2  "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 
-               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 
-         3  "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 
-               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 
-         4  "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 
-               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 
-         5  "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 
-               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
+         0  "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
+               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
+         1  "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
+               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
+         2  "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
+               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
+         3  "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
+               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
+         4  "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
+               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
+         5  "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
+               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
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>

tools/testfiles/tdatareg.h5.xml

@@ -52,15 +52,15 @@ Expected output for 'h5dump --xml tdatareg.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0 3 6 9 12 15 18 21 24 27 
-         30 33 36 39 42 45 48 51 54 57 
-         60 63 66 69 72 75 78 81 84 87 
-         90 93 96 99 102 105 108 111 114 117 
-         120 123 126 129 132 135 138 141 144 147 
-         150 153 156 159 162 165 168 171 174 177 
-         180 183 186 189 192 195 198 201 204 207 
-         210 213 216 219 222 225 228 231 234 237 
-         240 243 246 249 252 255 2 5 8 11 
+         0 3 6 9 12 15 18 21 24 27
+         30 33 36 39 42 45 48 51 54 57
+         60 63 66 69 72 75 78 81 84 87
+         90 93 96 99 102 105 108 111 114 117
+         120 123 126 129 132 135 138 141 144 147
+         150 153 156 159 162 165 168 171 174 177
+         180 183 186 189 192 195 198 201 204 207
+         210 213 216 219 222 225 228 231 234 237
+         240 243 246 249 252 255 2 5 8 11
          14 17 20 23 26 29 32 35 38 41
          </hdf5:DataFromFile>
       </hdf5:Data>

tools/testfiles/tdset-1.ddl

@@ -4,8 +4,8 @@ Expected output for 'h5dump tdset.h5'
 HDF5 "tdset.h5" {
 GROUP "/" {
    DATASET "dset1" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 10, 20 ) / ( 10, 20 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 10, 20 ) / ( 10, 20 ) }
       DATA {
          0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
          1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
@@ -24,11 +24,11 @@ GROUP "/" {
          26, 27,
          9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
          27, 28
-      } 
-   } 
+      }
+   }
    DATASET "dset2" {
-      DATATYPE  H5T_IEEE_F64BE  
-      DATASPACE  SIMPLE { ( 30, 20 ) / ( 30, 20 ) } 
+      DATATYPE  H5T_IEEE_F64BE
+      DATASPACE  SIMPLE { ( 30, 20 ) / ( 30, 20 ) }
       DATA {
          0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008,
          0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017,
@@ -120,7 +120,7 @@ GROUP "/" {
          29, 29.0001, 29.0002, 29.0003, 29.0004, 29.0005, 29.0006, 29.0007,
          29.0008, 29.0009, 29.001, 29.0011, 29.0012, 29.0013, 29.0014, 29.0015,
          29.0016, 29.0017, 29.0018, 29.0019
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tdset-2.ddl

@@ -3,14 +3,14 @@ Expected output for 'h5dump -H -d dset1 -d /dset2 --dataset=dset3 tdset.h5'
 #############################
 HDF5 "tdset.h5" {
 DATASET "dset1" {
-   DATATYPE  H5T_STD_I32BE  
-   DATASPACE  SIMPLE { ( 10, 20 ) / ( 10, 20 ) } 
-} 
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 10, 20 ) / ( 10, 20 ) }
+}
 DATASET "/dset2" {
-   DATATYPE  H5T_IEEE_F64BE  
-   DATASPACE  SIMPLE { ( 30, 20 ) / ( 30, 20 ) } 
-} 
+   DATATYPE  H5T_IEEE_F64BE
+   DATASPACE  SIMPLE { ( 30, 20 ) / ( 30, 20 ) }
+}
 DATASET "dset3" {
-   } 
-} 
+   }
+}
 h5dump error: unable to open dataset "dset3"

tools/testfiles/tdset-3s.ddl

@@ -3,8 +3,8 @@ Expected output for 'h5dump -d /dset1[1,1;;;] tdset.h5'
 #############################
 HDF5 "tdset.h5" {
 DATASET "/dset1" {
-   DATATYPE  H5T_STD_I32BE  
-   DATASPACE  SIMPLE { ( 10, 20 ) / ( 10, 20 ) } 
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 10, 20 ) / ( 10, 20 ) }
    SUBSET {
       START ( 1, 1 );
       STRIDE ( 1, 1 );
@@ -21,7 +21,7 @@ DATASET "/dset1" {
          21, 22, 23, 24, 17, 18, 19, 20, 21, 22, 23, 24, 25, 18, 19, 20, 21, 22,
          23, 24, 25, 26, 19, 20, 21, 22, 23, 24, 25, 26, 27, 20, 21, 22, 23, 24,
          25, 26, 27, 28
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tdset.h5.xml

@@ -26,15 +26,15 @@ Expected output for 'h5dump --xml tdset.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
-         1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 
-         2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 
-         3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 
-         4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 
-         5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 
-         6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 
-         7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 
-         8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 
+         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+         1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+         2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
+         3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
+         4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
+         5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+         6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25
+         7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
+         8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
          9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28
          </hdf5:DataFromFile>
       </hdf5:Data>
@@ -61,85 +61,85 @@ Expected output for 'h5dump --xml tdset.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0 0.0001 0.0002 0.0003 0.0004 0.0005 0.0006 0.0007 0.0008 0.0009 0.001 
-         0.0011 0.0012 0.0013 0.0014 0.0015 0.0016 0.0017 0.0018 0.0019 
-         1 1.0001 1.0002 1.0003 1.0004 1.0005 1.0006 1.0007 1.0008 1.0009 1.001 
-         1.0011 1.0012 1.0013 1.0014 1.0015 1.0016 1.0017 1.0018 1.0019 
-         2 2.0001 2.0002 2.0003 2.0004 2.0005 2.0006 2.0007 2.0008 2.0009 2.001 
-         2.0011 2.0012 2.0013 2.0014 2.0015 2.0016 2.0017 2.0018 2.0019 
-         3 3.0001 3.0002 3.0003 3.0004 3.0005 3.0006 3.0007 3.0008 3.0009 3.001 
-         3.0011 3.0012 3.0013 3.0014 3.0015 3.0016 3.0017 3.0018 3.0019 
-         4 4.0001 4.0002 4.0003 4.0004 4.0005 4.0006 4.0007 4.0008 4.0009 4.001 
-         4.0011 4.0012 4.0013 4.0014 4.0015 4.0016 4.0017 4.0018 4.0019 
-         5 5.0001 5.0002 5.0003 5.0004 5.0005 5.0006 5.0007 5.0008 5.0009 5.001 
-         5.0011 5.0012 5.0013 5.0014 5.0015 5.0016 5.0017 5.0018 5.0019 
-         6 6.0001 6.0002 6.0003 6.0004 6.0005 6.0006 6.0007 6.0008 6.0009 6.001 
-         6.0011 6.0012 6.0013 6.0014 6.0015 6.0016 6.0017 6.0018 6.0019 
-         7 7.0001 7.0002 7.0003 7.0004 7.0005 7.0006 7.0007 7.0008 7.0009 7.001 
-         7.0011 7.0012 7.0013 7.0014 7.0015 7.0016 7.0017 7.0018 7.0019 
-         8 8.0001 8.0002 8.0003 8.0004 8.0005 8.0006 8.0007 8.0008 8.0009 8.001 
-         8.0011 8.0012 8.0013 8.0014 8.0015 8.0016 8.0017 8.0018 8.0019 
-         9 9.0001 9.0002 9.0003 9.0004 9.0005 9.0006 9.0007 9.0008 9.0009 9.001 
-         9.0011 9.0012 9.0013 9.0014 9.0015 9.0016 9.0017 9.0018 9.0019 
-         10 10.0001 10.0002 10.0003 10.0004 10.0005 10.0006 10.0007 10.0008 
-         10.0009 10.001 10.0011 10.0012 10.0013 10.0014 10.0015 10.0016 10.0017 
-         10.0018 10.0019 
-         11 11.0001 11.0002 11.0003 11.0004 11.0005 11.0006 11.0007 11.0008 
-         11.0009 11.001 11.0011 11.0012 11.0013 11.0014 11.0015 11.0016 11.0017 
-         11.0018 11.0019 
-         12 12.0001 12.0002 12.0003 12.0004 12.0005 12.0006 12.0007 12.0008 
-         12.0009 12.001 12.0011 12.0012 12.0013 12.0014 12.0015 12.0016 12.0017 
-         12.0018 12.0019 
-         13 13.0001 13.0002 13.0003 13.0004 13.0005 13.0006 13.0007 13.0008 
-         13.0009 13.001 13.0011 13.0012 13.0013 13.0014 13.0015 13.0016 13.0017 
-         13.0018 13.0019 
-         14 14.0001 14.0002 14.0003 14.0004 14.0005 14.0006 14.0007 14.0008 
-         14.0009 14.001 14.0011 14.0012 14.0013 14.0014 14.0015 14.0016 14.0017 
-         14.0018 14.0019 
-         15 15.0001 15.0002 15.0003 15.0004 15.0005 15.0006 15.0007 15.0008 
-         15.0009 15.001 15.0011 15.0012 15.0013 15.0014 15.0015 15.0016 15.0017 
-         15.0018 15.0019 
-         16 16.0001 16.0002 16.0003 16.0004 16.0005 16.0006 16.0007 16.0008 
-         16.0009 16.001 16.0011 16.0012 16.0013 16.0014 16.0015 16.0016 16.0017 
-         16.0018 16.0019 
-         17 17.0001 17.0002 17.0003 17.0004 17.0005 17.0006 17.0007 17.0008 
-         17.0009 17.001 17.0011 17.0012 17.0013 17.0014 17.0015 17.0016 17.0017 
-         17.0018 17.0019 
-         18 18.0001 18.0002 18.0003 18.0004 18.0005 18.0006 18.0007 18.0008 
-         18.0009 18.001 18.0011 18.0012 18.0013 18.0014 18.0015 18.0016 18.0017 
-         18.0018 18.0019 
-         19 19.0001 19.0002 19.0003 19.0004 19.0005 19.0006 19.0007 19.0008 
-         19.0009 19.001 19.0011 19.0012 19.0013 19.0014 19.0015 19.0016 19.0017 
-         19.0018 19.0019 
-         20 20.0001 20.0002 20.0003 20.0004 20.0005 20.0006 20.0007 20.0008 
-         20.0009 20.001 20.0011 20.0012 20.0013 20.0014 20.0015 20.0016 20.0017 
-         20.0018 20.0019 
-         21 21.0001 21.0002 21.0003 21.0004 21.0005 21.0006 21.0007 21.0008 
-         21.0009 21.001 21.0011 21.0012 21.0013 21.0014 21.0015 21.0016 21.0017 
-         21.0018 21.0019 
-         22 22.0001 22.0002 22.0003 22.0004 22.0005 22.0006 22.0007 22.0008 
-         22.0009 22.001 22.0011 22.0012 22.0013 22.0014 22.0015 22.0016 22.0017 
-         22.0018 22.0019 
-         23 23.0001 23.0002 23.0003 23.0004 23.0005 23.0006 23.0007 23.0008 
-         23.0009 23.001 23.0011 23.0012 23.0013 23.0014 23.0015 23.0016 23.0017 
-         23.0018 23.0019 
-         24 24.0001 24.0002 24.0003 24.0004 24.0005 24.0006 24.0007 24.0008 
-         24.0009 24.001 24.0011 24.0012 24.0013 24.0014 24.0015 24.0016 24.0017 
-         24.0018 24.0019 
-         25 25.0001 25.0002 25.0003 25.0004 25.0005 25.0006 25.0007 25.0008 
-         25.0009 25.001 25.0011 25.0012 25.0013 25.0014 25.0015 25.0016 25.0017 
-         25.0018 25.0019 
-         26 26.0001 26.0002 26.0003 26.0004 26.0005 26.0006 26.0007 26.0008 
-         26.0009 26.001 26.0011 26.0012 26.0013 26.0014 26.0015 26.0016 26.0017 
-         26.0018 26.0019 
-         27 27.0001 27.0002 27.0003 27.0004 27.0005 27.0006 27.0007 27.0008 
-         27.0009 27.001 27.0011 27.0012 27.0013 27.0014 27.0015 27.0016 27.0017 
-         27.0018 27.0019 
-         28 28.0001 28.0002 28.0003 28.0004 28.0005 28.0006 28.0007 28.0008 
-         28.0009 28.001 28.0011 28.0012 28.0013 28.0014 28.0015 28.0016 28.0017 
-         28.0018 28.0019 
-         29 29.0001 29.0002 29.0003 29.0004 29.0005 29.0006 29.0007 29.0008 
-         29.0009 29.001 29.0011 29.0012 29.0013 29.0014 29.0015 29.0016 29.0017 
+         0 0.0001 0.0002 0.0003 0.0004 0.0005 0.0006 0.0007 0.0008 0.0009 0.001
+         0.0011 0.0012 0.0013 0.0014 0.0015 0.0016 0.0017 0.0018 0.0019
+         1 1.0001 1.0002 1.0003 1.0004 1.0005 1.0006 1.0007 1.0008 1.0009 1.001
+         1.0011 1.0012 1.0013 1.0014 1.0015 1.0016 1.0017 1.0018 1.0019
+         2 2.0001 2.0002 2.0003 2.0004 2.0005 2.0006 2.0007 2.0008 2.0009 2.001
+         2.0011 2.0012 2.0013 2.0014 2.0015 2.0016 2.0017 2.0018 2.0019
+         3 3.0001 3.0002 3.0003 3.0004 3.0005 3.0006 3.0007 3.0008 3.0009 3.001
+         3.0011 3.0012 3.0013 3.0014 3.0015 3.0016 3.0017 3.0018 3.0019
+         4 4.0001 4.0002 4.0003 4.0004 4.0005 4.0006 4.0007 4.0008 4.0009 4.001
+         4.0011 4.0012 4.0013 4.0014 4.0015 4.0016 4.0017 4.0018 4.0019
+         5 5.0001 5.0002 5.0003 5.0004 5.0005 5.0006 5.0007 5.0008 5.0009 5.001
+         5.0011 5.0012 5.0013 5.0014 5.0015 5.0016 5.0017 5.0018 5.0019
+         6 6.0001 6.0002 6.0003 6.0004 6.0005 6.0006 6.0007 6.0008 6.0009 6.001
+         6.0011 6.0012 6.0013 6.0014 6.0015 6.0016 6.0017 6.0018 6.0019
+         7 7.0001 7.0002 7.0003 7.0004 7.0005 7.0006 7.0007 7.0008 7.0009 7.001
+         7.0011 7.0012 7.0013 7.0014 7.0015 7.0016 7.0017 7.0018 7.0019
+         8 8.0001 8.0002 8.0003 8.0004 8.0005 8.0006 8.0007 8.0008 8.0009 8.001
+         8.0011 8.0012 8.0013 8.0014 8.0015 8.0016 8.0017 8.0018 8.0019
+         9 9.0001 9.0002 9.0003 9.0004 9.0005 9.0006 9.0007 9.0008 9.0009 9.001
+         9.0011 9.0012 9.0013 9.0014 9.0015 9.0016 9.0017 9.0018 9.0019
+         10 10.0001 10.0002 10.0003 10.0004 10.0005 10.0006 10.0007 10.0008
+         10.0009 10.001 10.0011 10.0012 10.0013 10.0014 10.0015 10.0016 10.0017
+         10.0018 10.0019
+         11 11.0001 11.0002 11.0003 11.0004 11.0005 11.0006 11.0007 11.0008
+         11.0009 11.001 11.0011 11.0012 11.0013 11.0014 11.0015 11.0016 11.0017
+         11.0018 11.0019
+         12 12.0001 12.0002 12.0003 12.0004 12.0005 12.0006 12.0007 12.0008
+         12.0009 12.001 12.0011 12.0012 12.0013 12.0014 12.0015 12.0016 12.0017
+         12.0018 12.0019
+         13 13.0001 13.0002 13.0003 13.0004 13.0005 13.0006 13.0007 13.0008
+         13.0009 13.001 13.0011 13.0012 13.0013 13.0014 13.0015 13.0016 13.0017
+         13.0018 13.0019
+         14 14.0001 14.0002 14.0003 14.0004 14.0005 14.0006 14.0007 14.0008
+         14.0009 14.001 14.0011 14.0012 14.0013 14.0014 14.0015 14.0016 14.0017
+         14.0018 14.0019
+         15 15.0001 15.0002 15.0003 15.0004 15.0005 15.0006 15.0007 15.0008
+         15.0009 15.001 15.0011 15.0012 15.0013 15.0014 15.0015 15.0016 15.0017
+         15.0018 15.0019
+         16 16.0001 16.0002 16.0003 16.0004 16.0005 16.0006 16.0007 16.0008
+         16.0009 16.001 16.0011 16.0012 16.0013 16.0014 16.0015 16.0016 16.0017
+         16.0018 16.0019
+         17 17.0001 17.0002 17.0003 17.0004 17.0005 17.0006 17.0007 17.0008
+         17.0009 17.001 17.0011 17.0012 17.0013 17.0014 17.0015 17.0016 17.0017
+         17.0018 17.0019
+         18 18.0001 18.0002 18.0003 18.0004 18.0005 18.0006 18.0007 18.0008
+         18.0009 18.001 18.0011 18.0012 18.0013 18.0014 18.0015 18.0016 18.0017
+         18.0018 18.0019
+         19 19.0001 19.0002 19.0003 19.0004 19.0005 19.0006 19.0007 19.0008
+         19.0009 19.001 19.0011 19.0012 19.0013 19.0014 19.0015 19.0016 19.0017
+         19.0018 19.0019
+         20 20.0001 20.0002 20.0003 20.0004 20.0005 20.0006 20.0007 20.0008
+         20.0009 20.001 20.0011 20.0012 20.0013 20.0014 20.0015 20.0016 20.0017
+         20.0018 20.0019
+         21 21.0001 21.0002 21.0003 21.0004 21.0005 21.0006 21.0007 21.0008
+         21.0009 21.001 21.0011 21.0012 21.0013 21.0014 21.0015 21.0016 21.0017
+         21.0018 21.0019
+         22 22.0001 22.0002 22.0003 22.0004 22.0005 22.0006 22.0007 22.0008
+         22.0009 22.001 22.0011 22.0012 22.0013 22.0014 22.0015 22.0016 22.0017
+         22.0018 22.0019
+         23 23.0001 23.0002 23.0003 23.0004 23.0005 23.0006 23.0007 23.0008
+         23.0009 23.001 23.0011 23.0012 23.0013 23.0014 23.0015 23.0016 23.0017
+         23.0018 23.0019
+         24 24.0001 24.0002 24.0003 24.0004 24.0005 24.0006 24.0007 24.0008
+         24.0009 24.001 24.0011 24.0012 24.0013 24.0014 24.0015 24.0016 24.0017
+         24.0018 24.0019
+         25 25.0001 25.0002 25.0003 25.0004 25.0005 25.0006 25.0007 25.0008
+         25.0009 25.001 25.0011 25.0012 25.0013 25.0014 25.0015 25.0016 25.0017
+         25.0018 25.0019
+         26 26.0001 26.0002 26.0003 26.0004 26.0005 26.0006 26.0007 26.0008
+         26.0009 26.001 26.0011 26.0012 26.0013 26.0014 26.0015 26.0016 26.0017
+         26.0018 26.0019
+         27 27.0001 27.0002 27.0003 27.0004 27.0005 27.0006 27.0007 27.0008
+         27.0009 27.001 27.0011 27.0012 27.0013 27.0014 27.0015 27.0016 27.0017
+         27.0018 27.0019
+         28 28.0001 28.0002 28.0003 28.0004 28.0005 28.0006 28.0007 28.0008
+         28.0009 28.001 28.0011 28.0012 28.0013 28.0014 28.0015 28.0016 28.0017
+         28.0018 28.0019
+         29 29.0001 29.0002 29.0003 29.0004 29.0005 29.0006 29.0007 29.0008
+         29.0009 29.001 29.0011 29.0012 29.0013 29.0014 29.0015 29.0016 29.0017
          29.0018 29.0019
          </hdf5:DataFromFile>
       </hdf5:Data>

tools/testfiles/tdset2-1s.ddl

@@ -3,8 +3,8 @@ Expected output for 'h5dump -d /dset1[;3,2;4,4;1,4] tdset2.h5'
 #############################
 HDF5 "tdset2.h5" {
 DATASET "/dset1" {
-   DATATYPE  H5T_STD_I32BE  
-   DATASPACE  SIMPLE { ( 10, 20 ) / ( H5S_UNLIMITED, 20 ) } 
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 10, 20 ) / ( H5S_UNLIMITED, 20 ) }
    SUBSET {
       START ( 0, 0 );
       STRIDE ( 3, 2 );
@@ -15,7 +15,7 @@ DATASET "/dset1" {
          2, 3, 4, 5, 2, 3, 4, 5, 2, 3, 4, 5, 4, 5, 6, 7, 4, 5, 6, 7,
          4, 5, 6, 7, 4, 5, 6, 7, 6, 7, 8, 9, 6, 7, 8, 9, 6, 7, 8, 9,
          6, 7, 8, 9
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tdset2.h5.xml

@@ -31,15 +31,15 @@ Expected output for 'h5dump --xml tdset2.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
-         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
-         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
-         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
-         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
-         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
-         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
-         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
-         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
+         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+         0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
          0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
          </hdf5:DataFromFile>
       </hdf5:Data>
@@ -71,35 +71,35 @@ Expected output for 'h5dump --xml tdset2.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
-         0 1 2 3 4 5 6 7 8 9 
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
+         0 1 2 3 4 5 6 7 8 9
          0 1 2 3 4 5 6 7 8 9
          </hdf5:DataFromFile>
       </hdf5:Data>

tools/testfiles/tempty-dtd-2.h5.xml

@@ -31,7 +31,7 @@ Expected output for 'h5dump --xml -u tempty.h5'
 <!-- Note: format of VL data not specified -->
       <Data>
          <DataFromFile>
-                    
+                
          </DataFromFile>
       </Data>
    </Dataset>
@@ -111,7 +111,7 @@ Expected output for 'h5dump --xml -u tempty.h5'
       </DataType>
       <Data>
          <DataFromFile>
-          0 0 0 0   0 0 0 0   0 0 0 0   0 0 0 0 
+          0 0 0 0  0 0 0 0  0 0 0 0  0 0 0 0
          </DataFromFile>
       </Data>
    </Dataset>

tools/testfiles/tempty-dtd-uri.h5.xml

@@ -31,7 +31,7 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt
 <!-- Note: format of VL data not specified -->
       <Data>
          <DataFromFile>
-                    
+                
          </DataFromFile>
       </Data>
    </Dataset>
@@ -111,7 +111,7 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt
       </DataType>
       <Data>
          <DataFromFile>
-          0 0 0 0   0 0 0 0   0 0 0 0   0 0 0 0 
+          0 0 0 0  0 0 0 0  0 0 0 0  0 0 0 0
          </DataFromFile>
       </Data>
    </Dataset>

tools/testfiles/tempty-dtd.h5.xml

@@ -31,7 +31,7 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5'
 <!-- Note: format of VL data not specified -->
       <Data>
          <DataFromFile>
-                    
+                
          </DataFromFile>
       </Data>
    </Dataset>
@@ -111,7 +111,7 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5'
       </DataType>
       <Data>
          <DataFromFile>
-          0 0 0 0   0 0 0 0   0 0 0 0   0 0 0 0 
+          0 0 0 0  0 0 0 0  0 0 0 0  0 0 0 0
          </DataFromFile>
       </Data>
    </Dataset>

tools/testfiles/tempty-nons-2.h5.xml

@@ -30,7 +30,7 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5'
 <!-- Note: format of VL data not specified -->
       <Data>
          <DataFromFile>
-                    
+                
          </DataFromFile>
       </Data>
    </Dataset>
@@ -110,7 +110,7 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5'
       </DataType>
       <Data>
          <DataFromFile>
-          0 0 0 0   0 0 0 0   0 0 0 0   0 0 0 0 
+          0 0 0 0  0 0 0 0  0 0 0 0  0 0 0 0
          </DataFromFile>
       </Data>
    </Dataset>

tools/testfiles/tempty-nons-uri.h5.xml

@@ -30,7 +30,7 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp
 <!-- Note: format of VL data not specified -->
       <Data>
          <DataFromFile>
-                    
+                
          </DataFromFile>
       </Data>
    </Dataset>
@@ -110,7 +110,7 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp
       </DataType>
       <Data>
          <DataFromFile>
-          0 0 0 0   0 0 0 0   0 0 0 0   0 0 0 0 
+          0 0 0 0  0 0 0 0  0 0 0 0  0 0 0 0
          </DataFromFile>
       </Data>
    </Dataset>

tools/testfiles/tempty-nons.h5.xml

@@ -30,7 +30,7 @@ Expected output for 'h5dump --xml -X : tempty.h5'
 <!-- Note: format of VL data not specified -->
       <Data>
          <DataFromFile>
-                    
+                
          </DataFromFile>
       </Data>
    </Dataset>
@@ -110,7 +110,7 @@ Expected output for 'h5dump --xml -X : tempty.h5'
       </DataType>
       <Data>
          <DataFromFile>
-          0 0 0 0   0 0 0 0   0 0 0 0   0 0 0 0 
+          0 0 0 0  0 0 0 0  0 0 0 0  0 0 0 0
          </DataFromFile>
       </Data>
    </Dataset>

tools/testfiles/tempty-ns-2.h5.xml

@@ -30,7 +30,7 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5'
 <!-- Note: format of VL data not specified -->
       <thing:Data>
          <thing:DataFromFile>
-                    
+                
          </thing:DataFromFile>
       </thing:Data>
    </thing:Dataset>
@@ -110,7 +110,7 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5'
       </thing:DataType>
       <thing:Data>
          <thing:DataFromFile>
-          0 0 0 0   0 0 0 0   0 0 0 0   0 0 0 0 
+          0 0 0 0  0 0 0 0  0 0 0 0  0 0 0 0
          </thing:DataFromFile>
       </thing:Data>
    </thing:Dataset>

tools/testfiles/tempty-ns.h5.xml

@@ -30,7 +30,7 @@ Expected output for 'h5dump --xml -X thing: tempty.h5'
 <!-- Note: format of VL data not specified -->
       <thing:Data>
          <thing:DataFromFile>
-                    
+                
          </thing:DataFromFile>
       </thing:Data>
    </thing:Dataset>
@@ -110,7 +110,7 @@ Expected output for 'h5dump --xml -X thing: tempty.h5'
       </thing:DataType>
       <thing:Data>
          <thing:DataFromFile>
-          0 0 0 0   0 0 0 0   0 0 0 0   0 0 0 0 
+          0 0 0 0  0 0 0 0  0 0 0 0  0 0 0 0
          </thing:DataFromFile>
       </thing:Data>
    </thing:Dataset>

tools/testfiles/tempty.ddl

@@ -4,40 +4,40 @@ Expected output for 'h5dump tempty.h5'
 HDF5 "tempty.h5" {
 GROUP "/" {
    DATASET "Dataset1.0" {
-      DATATYPE  H5T_VLEN { H5T_STD_I32LE}  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_VLEN { H5T_STD_I32LE}
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          (), (), (), ()
-      } 
-   } 
+      }
+   }
    DATASET "Dataset2.0" {
-      DATATYPE  H5T_STD_I32LE  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          0, 0, 0, 0
-      } 
-   } 
+      }
+   }
    DATASET "Dataset3.0" {
-      DATATYPE  H5T_IEEE_F32LE  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_IEEE_F32LE
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          0, 0, 0, 0
-      } 
-   } 
+      }
+   }
    DATASET "Dataset4.0" {
-      DATATYPE  H5T_ARRAY { [4] H5T_STD_I32LE }  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_ARRAY { [4] H5T_STD_I32LE }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          [ 0, 0, 0, 0 ], [ 0, 0, 0, 0 ], [ 0, 0, 0, 0 ], [ 0, 0, 0, 0 ]
-      } 
-   } 
+      }
+   }
    DATASET "Dataset5.0" {
       DATATYPE  H5T_COMPOUND {
          H5T_STD_I32LE "a";
          H5T_IEEE_F32LE "b";
          H5T_STD_I8LE "c";
-      }        
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          {
             0,
@@ -59,7 +59,7 @@ GROUP "/" {
             0,
             0
          }
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tempty.h5.xml

@@ -30,7 +30,7 @@ Expected output for 'h5dump --xml tempty.h5'
 <!-- Note: format of VL data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-                    
+                
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
@@ -110,7 +110,7 @@ Expected output for 'h5dump --xml tempty.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-          0 0 0 0   0 0 0 0   0 0 0 0   0 0 0 0 
+          0 0 0 0  0 0 0 0  0 0 0 0  0 0 0 0
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>

tools/testfiles/tenum.h5.xml

@@ -64,7 +64,7 @@ Expected output for 'h5dump --xml tenum.h5'
       <hdf5:NamedDataTypePtr OBJ-XID="xid_744-0" H5Path="/enum normal" />
       <hdf5:Data>
          <hdf5:DataFromFile>
-         RED GREEN BLUE GREEN WHITE WHITE BLACK GREEN BLUE RED RED BLUE GREEN 
+         RED GREEN BLUE GREEN WHITE WHITE BLACK GREEN BLUE RED RED BLUE GREEN
          BLACK WHITE RED WHITE GREEN GREEN BLUE
          </hdf5:DataFromFile>
       </hdf5:Data>

tools/testfiles/tfamily.ddl

@@ -4,8 +4,8 @@ Expected output for 'h5dump --filedriver=family tfamily%05d.h5'
 HDF5 "tfamily%05d.h5" {
 GROUP "/" {
    DATASET "dset1" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 10, 15 ) / ( 10, 15 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 10, 15 ) / ( 10, 15 ) }
       DATA {
          0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
          1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
@@ -17,7 +17,7 @@ GROUP "/" {
          7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
          8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
          9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tgroup-1.ddl

@@ -5,29 +5,29 @@ HDF5 "tgroup.h5" {
 GROUP "/" {
    GROUP "g1" {
       GROUP "g1.1" {
-      } 
+      }
       GROUP "g1.2" {
-      } 
-   } 
+      }
+   }
    GROUP "g2" {
       GROUP "g2.1" {
          GROUP "g2.1.1" {
-         } 
+         }
          GROUP "g2.1.2" {
-         } 
+         }
          GROUP "g2.1.3" {
-         } 
-      } 
-   } 
+         }
+      }
+   }
    GROUP "g3" {
       GROUP "g3.1" {
-      } 
+      }
       GROUP "g3.2" {
-      } 
+      }
       GROUP "g3.3" {
-      } 
+      }
       GROUP "g3.4" {
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tgroup-2.ddl

@@ -5,42 +5,42 @@ HDF5 "tgroup.h5" {
 GROUP "/g2" {
    GROUP "g2.1" {
       GROUP "g2.1.1" {
-      } 
+      }
       GROUP "g2.1.2" {
-      } 
+      }
       GROUP "g2.1.3" {
-      } 
-   } 
-} 
+      }
+   }
+}
 GROUP "/" {
    GROUP "g1" {
       GROUP "g1.1" {
-      } 
+      }
       GROUP "g1.2" {
-      } 
-   } 
+      }
+   }
    GROUP "g2" {
       GROUP "g2.1" {
          GROUP "g2.1.1" {
-         } 
+         }
          GROUP "g2.1.2" {
-         } 
+         }
          GROUP "g2.1.3" {
-         } 
-      } 
-   } 
+         }
+      }
+   }
    GROUP "g3" {
       GROUP "g3.1" {
-      } 
+      }
       GROUP "g3.2" {
-      } 
+      }
       GROUP "g3.3" {
-      } 
+      }
       GROUP "g3.4" {
-      } 
-   } 
-} 
+      }
+   }
+}
 GROUP "/y" {
-   } 
-} 
+   }
+}
 h5dump error: unable to open group "/y"

tools/testfiles/tgrp_comments.ddl

@@ -7,40 +7,40 @@ GROUP "/" {
       COMMENT "Comment for group /g1"
       GROUP "g1.1" {
          COMMENT "Comment for group /g1/g1.1"
-      } 
+      }
       GROUP "g1.2" {
          COMMENT "Comment for group /g1/g1.2"
-      } 
-   } 
+      }
+   }
    GROUP "g2" {
       COMMENT "Comment for group /g2"
       GROUP "g2.1" {
          COMMENT "Comment for group /g2/g2.1"
          GROUP "g2.1.1" {
             COMMENT "Comment for group /g2/g2.1/g2.1.1"
-         } 
+         }
          GROUP "g2.1.2" {
             COMMENT "Comment for group /g2/g2.1/g2.1.2"
-         } 
+         }
          GROUP "g2.1.3" {
             COMMENT "Comment for group /g2/g2.1/g2.1.3"
-         } 
-      } 
-   } 
+         }
+      }
+   }
    GROUP "g3" {
       COMMENT "Comment for group /g3"
       GROUP "g3.1" {
          COMMENT "Comment for group /g3/g3.1"
-      } 
+      }
       GROUP "g3.2" {
          COMMENT "Comment for group /g3/g3.2"
-      } 
+      }
       GROUP "g3.3" {
          COMMENT "Comment for group /g3/g3.3"
-      } 
+      }
       GROUP "g3.4" {
          COMMENT "Comment for group /g3/g3.4"
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/thlink-1.ddl

@@ -4,24 +4,24 @@ Expected output for 'h5dump thlink.h5'
 HDF5 "thlink.h5" {
 GROUP "/" {
    DATASET "dset1" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
       DATA {
          0, 1, 2, 3, 4
-      } 
-   } 
+      }
+   }
    GROUP "g1" {
       DATASET "dset2" {
          HARDLINK "/dset1"
-      } 
+      }
       GROUP "g1.1" {
          DATASET "dset3" {
             HARDLINK "/dset1"
-         } 
-      } 
-   } 
+         }
+      }
+   }
    GROUP "g2" {
       HARDLINK "/g1/g1.1"
-   } 
-} 
-} 
+   }
+}
+}

tools/testfiles/thlink-2.ddl

@@ -3,16 +3,16 @@ Expected output for 'h5dump -d /g1/dset2 --dataset /dset1 --dataset=/g1/g1.1/dse
 #############################
 HDF5 "thlink.h5" {
 DATASET "/g1/dset2" {
-   DATATYPE  H5T_STD_I32BE  
-   DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
    DATA {
       0, 1, 2, 3, 4
-   } 
-} 
+   }
+}
 DATASET "/dset1" {
    HARDLINK "/g1/dset2"
-} 
+}
 DATASET "/g1/g1.1/dset3" {
    HARDLINK "/g1/dset2"
-} 
-} 
+}
+}

tools/testfiles/thlink-3.ddl

@@ -3,16 +3,16 @@ Expected output for 'h5dump -d /g1/g1.1/dset3 --dataset /g1/dset2 --dataset=/dse
 #############################
 HDF5 "thlink.h5" {
 DATASET "/g1/g1.1/dset3" {
-   DATATYPE  H5T_STD_I32BE  
-   DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
    DATA {
       0, 1, 2, 3, 4
-   } 
-} 
+   }
+}
 DATASET "/g1/dset2" {
    HARDLINK "/g1/g1.1/dset3"
-} 
+}
 DATASET "/dset1" {
    HARDLINK "/g1/g1.1/dset3"
-} 
-} 
+}
+}

tools/testfiles/thlink-4.ddl

@@ -4,16 +4,16 @@ Expected output for 'h5dump -g /g1 thlink.h5'
 HDF5 "thlink.h5" {
 GROUP "/g1" {
    DATASET "dset2" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
       DATA {
          0, 1, 2, 3, 4
-      } 
-   } 
+      }
+   }
    GROUP "g1.1" {
       DATASET "dset3" {
          HARDLINK "/g1/dset2"
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/thlink-5.ddl

@@ -3,18 +3,18 @@ Expected output for 'h5dump -d /dset1 -g /g2 -d /g1/dset2 thlink.h5'
 #############################
 HDF5 "thlink.h5" {
 DATASET "/dset1" {
-   DATATYPE  H5T_STD_I32BE  
-   DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
    DATA {
       0, 1, 2, 3, 4
-   } 
-} 
+   }
+}
 GROUP "/g2" {
    DATASET "dset3" {
       HARDLINK "/dset1"
-   } 
-} 
+   }
+}
 DATASET "/g1/dset2" {
    HARDLINK "/dset1"
-} 
-} 
+}
+}

tools/testfiles/tlarge_objname.ddl

@@ -54,56 +54,56 @@ GROUP "/" {
                                                                                                                                                    GROUP "this_is_a_large_group_name47" {
                                                                                                                                                       GROUP "this_is_a_large_group_name48" {
                                                                                                                                                          GROUP "this_is_a_large_group_name49" {
-                                                                                                                                                         } 
-                                                                                                                                                      } 
-                                                                                                                                                   } 
-                                                                                                                                                } 
-                                                                                                                                             } 
-                                                                                                                                          } 
-                                                                                                                                       } 
-                                                                                                                                    } 
-                                                                                                                                 } 
-                                                                                                                              } 
-                                                                                                                           } 
-                                                                                                                        } 
-                                                                                                                     } 
-                                                                                                                  } 
-                                                                                                               } 
-                                                                                                            } 
-                                                                                                         } 
-                                                                                                      } 
-                                                                                                   } 
-                                                                                                } 
-                                                                                             } 
-                                                                                          } 
-                                                                                       } 
-                                                                                    } 
-                                                                                 } 
-                                                                              } 
-                                                                           } 
-                                                                        } 
-                                                                     } 
-                                                                  } 
-                                                               } 
-                                                            } 
-                                                         } 
-                                                      } 
-                                                   } 
-                                                } 
-                                             } 
-                                          } 
-                                       } 
-                                    } 
-                                 } 
-                              } 
-                           } 
-                        } 
-                     } 
-                  } 
-               } 
-            } 
-         } 
-      } 
-   } 
-} 
-} 
+                                                                                                                                                         }
+                                                                                                                                                      }
+                                                                                                                                                   }
+                                                                                                                                                }
+                                                                                                                                             }
+                                                                                                                                          }
+                                                                                                                                       }
+                                                                                                                                    }
+                                                                                                                                 }
+                                                                                                                              }
+                                                                                                                           }
+                                                                                                                        }
+                                                                                                                     }
+                                                                                                                  }
+                                                                                                               }
+                                                                                                            }
+                                                                                                         }
+                                                                                                      }
+                                                                                                   }
+                                                                                                }
+                                                                                             }
+                                                                                          }
+                                                                                       }
+                                                                                    }
+                                                                                 }
+                                                                              }
+                                                                           }
+                                                                        }
+                                                                     }
+                                                                  }
+                                                               }
+                                                            }
+                                                         }
+                                                      }
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+                        }
+                     }
+                  }
+               }
+            }
+         }
+      }
+   }
+}
+}

tools/testfiles/tloop-1.ddl

@@ -7,11 +7,11 @@ GROUP "/" {
       GROUP "g1.1" {
          GROUP "g2.1" {
             HARDLINK "/g1"
-         } 
-      } 
-   } 
+         }
+      }
+   }
    GROUP "g2" {
       HARDLINK "/g1/g1.1"
-   } 
-} 
-} 
+   }
+}
+}

tools/testfiles/tmany.h5.xml

@@ -104,7 +104,7 @@ Expected output for 'h5dump --xml tmany.h5'
                </hdf5:DataType>
                <hdf5:Data>
                   <hdf5:DataFromFile>
-                  0 1 
+                  0 1
                   2 3
                   </hdf5:DataFromFile>
                </hdf5:Data>
@@ -129,138 +129,138 @@ Expected output for 'h5dump --xml tmany.h5'
          <!-- Note: format of compound data not specified -->
             <hdf5:Data>
                <hdf5:DataFromFile>
-                0 1 
-                     0 1 
-                     0 1 
-                     0 1 
-                     0 1 
-                     0 1 
-                     0 1 
-                     0 1   0 1 
-                     0 1 
-                     0 1 
-                     0 1 
-                     0 1 
-                     0 1 
-                     0 1 
-                     0 1   6 7 
-                     6 7 
-                     6 7 
-                     6 7 
-                     6 7 
-                     6 7 
-                     6 7 
-                     6 7  
-                1 2 
-                     1 2 
-                     1 2 
-                     1 2 
-                     1 2 
-                     1 2 
-                     1 2 
-                     1 2   1 2 
-                     1 2 
-                     1 2 
-                     1 2 
-                     1 2 
-                     1 2 
-                     1 2 
-                     1 2   7 8 
-                     7 8 
-                     7 8 
-                     7 8 
-                     7 8 
-                     7 8 
-                     7 8 
-                     7 8  
-                2 3 
-                     2 3 
-                     2 3 
-                     2 3 
-                     2 3 
-                     2 3 
-                     2 3 
-                     2 3   2 3 
-                     2 3 
-                     2 3 
-                     2 3 
-                     2 3 
-                     2 3 
-                     2 3 
-                     2 3   8 9 
-                     8 9 
-                     8 9 
-                     8 9 
-                     8 9 
-                     8 9 
-                     8 9 
-                     8 9  
-                3 4 
-                     3 4 
-                     3 4 
-                     3 4 
-                     3 4 
-                     3 4 
-                     3 4 
-                     3 4   3 4 
-                     3 4 
-                     3 4 
-                     3 4 
-                     3 4 
-                     3 4 
-                     3 4 
-                     3 4   9 10 
-                     9 10 
-                     9 10 
-                     9 10 
-                     9 10 
-                     9 10 
-                     9 10 
-                     9 10  
-                4 5 
-                     4 5 
-                     4 5 
-                     4 5 
-                     4 5 
-                     4 5 
-                     4 5 
-                     4 5   4 5 
-                     4 5 
-                     4 5 
-                     4 5 
-                     4 5 
-                     4 5 
-                     4 5 
-                     4 5   10 11 
-                     10 11 
-                     10 11 
-                     10 11 
-                     10 11 
-                     10 11 
-                     10 11 
-                     10 11  
-                5 6 
-                     5 6 
-                     5 6 
-                     5 6 
-                     5 6 
-                     5 6 
-                     5 6 
-                     5 6   5 6 
-                     5 6 
-                     5 6 
-                     5 6 
-                     5 6 
-                     5 6 
-                     5 6 
-                     5 6   11 12 
-                     11 12 
-                     11 12 
-                     11 12 
-                     11 12 
-                     11 12 
-                     11 12 
-                     11 12 
+                0 1
+                     0 1
+                     0 1
+                     0 1
+                     0 1
+                     0 1
+                     0 1
+                     0 1  0 1
+                     0 1
+                     0 1
+                     0 1
+                     0 1
+                     0 1
+                     0 1
+                     0 1  6 7
+                     6 7
+                     6 7
+                     6 7
+                     6 7
+                     6 7
+                     6 7
+                     6 7
+                1 2
+                     1 2
+                     1 2
+                     1 2
+                     1 2
+                     1 2
+                     1 2
+                     1 2  1 2
+                     1 2
+                     1 2
+                     1 2
+                     1 2
+                     1 2
+                     1 2
+                     1 2  7 8
+                     7 8
+                     7 8
+                     7 8
+                     7 8
+                     7 8
+                     7 8
+                     7 8
+                2 3
+                     2 3
+                     2 3
+                     2 3
+                     2 3
+                     2 3
+                     2 3
+                     2 3  2 3
+                     2 3
+                     2 3
+                     2 3
+                     2 3
+                     2 3
+                     2 3
+                     2 3  8 9
+                     8 9
+                     8 9
+                     8 9
+                     8 9
+                     8 9
+                     8 9
+                     8 9
+                3 4
+                     3 4
+                     3 4
+                     3 4
+                     3 4
+                     3 4
+                     3 4
+                     3 4  3 4
+                     3 4
+                     3 4
+                     3 4
+                     3 4
+                     3 4
+                     3 4
+                     3 4  9 10
+                     9 10
+                     9 10
+                     9 10
+                     9 10
+                     9 10
+                     9 10
+                     9 10
+                4 5
+                     4 5
+                     4 5
+                     4 5
+                     4 5
+                     4 5
+                     4 5
+                     4 5  4 5
+                     4 5
+                     4 5
+                     4 5
+                     4 5
+                     4 5
+                     4 5
+                     4 5  10 11
+                     10 11
+                     10 11
+                     10 11
+                     10 11
+                     10 11
+                     10 11
+                     10 11
+                5 6
+                     5 6
+                     5 6
+                     5 6
+                     5 6
+                     5 6
+                     5 6
+                     5 6  5 6
+                     5 6
+                     5 6
+                     5 6
+                     5 6
+                     5 6
+                     5 6
+                     5 6  11 12
+                     11 12
+                     11 12
+                     11 12
+                     11 12
+                     11 12
+                     11 12
+                     11 12
                </hdf5:DataFromFile>
             </hdf5:Data>
          </hdf5:Dataset>
@@ -297,15 +297,15 @@ Expected output for 'h5dump --xml tmany.h5'
          </hdf5:DataType>
          <hdf5:Data>
             <hdf5:DataFromFile>
-            0 1 2 3 4 5 6 7 8 9 
-            0 1 2 3 4 5 6 7 8 9 
-            0 1 2 3 4 5 6 7 8 9 
-            0 1 2 3 4 5 6 7 8 9 
-            0 1 2 3 4 5 6 7 8 9 
-            0 1 2 3 4 5 6 7 8 9 
-            0 1 2 3 4 5 6 7 8 9 
-            0 1 2 3 4 5 6 7 8 9 
-            0 1 2 3 4 5 6 7 8 9 
+            0 1 2 3 4 5 6 7 8 9
+            0 1 2 3 4 5 6 7 8 9
+            0 1 2 3 4 5 6 7 8 9
+            0 1 2 3 4 5 6 7 8 9
+            0 1 2 3 4 5 6 7 8 9
+            0 1 2 3 4 5 6 7 8 9
+            0 1 2 3 4 5 6 7 8 9
+            0 1 2 3 4 5 6 7 8 9
+            0 1 2 3 4 5 6 7 8 9
             0 1 2 3 4 5 6 7 8 9
             </hdf5:DataFromFile>
          </hdf5:Data>
@@ -342,15 +342,15 @@ Expected output for 'h5dump --xml tmany.h5'
          </hdf5:DataType>
          <hdf5:Data>
             <hdf5:DataFromFile>
-            0 0 0 0 0 0 0 0 0 0 
-            1 1 1 1 1 1 1 1 1 1 
-            2 2 2 2 2 2 2 2 2 2 
-            3 3 3 3 3 3 3 3 3 3 
-            4 4 4 4 4 4 4 4 4 4 
-            5 5 5 5 5 5 5 5 5 5 
-            6 6 6 6 6 6 6 6 6 6 
-            7 7 7 7 7 7 7 7 7 7 
-            8 8 8 8 8 8 8 8 8 8 
+            0 0 0 0 0 0 0 0 0 0
+            1 1 1 1 1 1 1 1 1 1
+            2 2 2 2 2 2 2 2 2 2
+            3 3 3 3 3 3 3 3 3 3
+            4 4 4 4 4 4 4 4 4 4
+            5 5 5 5 5 5 5 5 5 5
+            6 6 6 6 6 6 6 6 6 6
+            7 7 7 7 7 7 7 7 7 7
+            8 8 8 8 8 8 8 8 8 8
             9 9 9 9 9 9 9 9 9 9
             </hdf5:DataFromFile>
          </hdf5:Data>

tools/testfiles/tmulti.ddl

@@ -4,8 +4,8 @@ Expected output for 'h5dump --filedriver=multi tmulti'
 HDF5 "tmulti" {
 GROUP "/" {
    DATASET "dset1" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 10, 15 ) / ( 10, 15 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 10, 15 ) / ( 10, 15 ) }
       DATA {
          0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
          1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
@@ -17,7 +17,7 @@ GROUP "/" {
          7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
          8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
          9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tname-amp.h5.xml

@@ -44,15 +44,15 @@ Expected output for 'h5dump --xml tname-amp.h5'
          </hdf5:DataType>
          <hdf5:Data>
             <hdf5:DataFromFile>
-            0 0 0 0 0 0 0 0 0 0 
-            0 1 2 3 4 5 6 7 8 9 
-            0 2 4 6 8 10 12 14 16 18 
-            0 3 6 9 12 15 18 21 24 27 
-            0 4 8 12 16 20 24 28 32 36 
-            0 5 10 15 20 25 30 35 40 45 
-            0 6 12 18 24 30 36 42 48 54 
-            0 7 14 21 28 35 42 49 56 63 
-            0 8 16 24 32 40 48 56 64 72 
+            0 0 0 0 0 0 0 0 0 0
+            0 1 2 3 4 5 6 7 8 9
+            0 2 4 6 8 10 12 14 16 18
+            0 3 6 9 12 15 18 21 24 27
+            0 4 8 12 16 20 24 28 32 36
+            0 5 10 15 20 25 30 35 40 45
+            0 6 12 18 24 30 36 42 48 54
+            0 7 14 21 28 35 42 49 56 63
+            0 8 16 24 32 40 48 56 64 72
             0 9 18 27 36 45 54 63 72 81
             </hdf5:DataFromFile>
          </hdf5:Data>

tools/testfiles/tname-apos.h5.xml

@@ -44,15 +44,15 @@ Expected output for 'h5dump --xml tname-apos.h5'
          </hdf5:DataType>
          <hdf5:Data>
             <hdf5:DataFromFile>
-            0 0 0 0 0 0 0 0 0 0 
-            0 1 2 3 4 5 6 7 8 9 
-            0 2 4 6 8 10 12 14 16 18 
-            0 3 6 9 12 15 18 21 24 27 
-            0 4 8 12 16 20 24 28 32 36 
-            0 5 10 15 20 25 30 35 40 45 
-            0 6 12 18 24 30 36 42 48 54 
-            0 7 14 21 28 35 42 49 56 63 
-            0 8 16 24 32 40 48 56 64 72 
+            0 0 0 0 0 0 0 0 0 0
+            0 1 2 3 4 5 6 7 8 9
+            0 2 4 6 8 10 12 14 16 18
+            0 3 6 9 12 15 18 21 24 27
+            0 4 8 12 16 20 24 28 32 36
+            0 5 10 15 20 25 30 35 40 45
+            0 6 12 18 24 30 36 42 48 54
+            0 7 14 21 28 35 42 49 56 63
+            0 8 16 24 32 40 48 56 64 72
             0 9 18 27 36 45 54 63 72 81
             </hdf5:DataFromFile>
          </hdf5:Data>

tools/testfiles/tname-gt.h5.xml

@@ -44,15 +44,15 @@ Expected output for 'h5dump --xml tname-gt.h5'
          </hdf5:DataType>
          <hdf5:Data>
             <hdf5:DataFromFile>
-            0 0 0 0 0 0 0 0 0 0 
-            0 1 2 3 4 5 6 7 8 9 
-            0 2 4 6 8 10 12 14 16 18 
-            0 3 6 9 12 15 18 21 24 27 
-            0 4 8 12 16 20 24 28 32 36 
-            0 5 10 15 20 25 30 35 40 45 
-            0 6 12 18 24 30 36 42 48 54 
-            0 7 14 21 28 35 42 49 56 63 
-            0 8 16 24 32 40 48 56 64 72 
+            0 0 0 0 0 0 0 0 0 0
+            0 1 2 3 4 5 6 7 8 9
+            0 2 4 6 8 10 12 14 16 18
+            0 3 6 9 12 15 18 21 24 27
+            0 4 8 12 16 20 24 28 32 36
+            0 5 10 15 20 25 30 35 40 45
+            0 6 12 18 24 30 36 42 48 54
+            0 7 14 21 28 35 42 49 56 63
+            0 8 16 24 32 40 48 56 64 72
             0 9 18 27 36 45 54 63 72 81
             </hdf5:DataFromFile>
          </hdf5:Data>

tools/testfiles/tname-lt.h5.xml

@@ -44,15 +44,15 @@ Expected output for 'h5dump --xml tname-lt.h5'
          </hdf5:DataType>
          <hdf5:Data>
             <hdf5:DataFromFile>
-            0 0 0 0 0 0 0 0 0 0 
-            0 1 2 3 4 5 6 7 8 9 
-            0 2 4 6 8 10 12 14 16 18 
-            0 3 6 9 12 15 18 21 24 27 
-            0 4 8 12 16 20 24 28 32 36 
-            0 5 10 15 20 25 30 35 40 45 
-            0 6 12 18 24 30 36 42 48 54 
-            0 7 14 21 28 35 42 49 56 63 
-            0 8 16 24 32 40 48 56 64 72 
+            0 0 0 0 0 0 0 0 0 0
+            0 1 2 3 4 5 6 7 8 9
+            0 2 4 6 8 10 12 14 16 18
+            0 3 6 9 12 15 18 21 24 27
+            0 4 8 12 16 20 24 28 32 36
+            0 5 10 15 20 25 30 35 40 45
+            0 6 12 18 24 30 36 42 48 54
+            0 7 14 21 28 35 42 49 56 63
+            0 8 16 24 32 40 48 56 64 72
             0 9 18 27 36 45 54 63 72 81
             </hdf5:DataFromFile>
          </hdf5:Data>

tools/testfiles/tname-quot.h5.xml

@@ -44,15 +44,15 @@ Expected output for 'h5dump --xml tname-quot.h5'
          </hdf5:DataType>
          <hdf5:Data>
             <hdf5:DataFromFile>
-            0 0 0 0 0 0 0 0 0 0 
-            0 1 2 3 4 5 6 7 8 9 
-            0 2 4 6 8 10 12 14 16 18 
-            0 3 6 9 12 15 18 21 24 27 
-            0 4 8 12 16 20 24 28 32 36 
-            0 5 10 15 20 25 30 35 40 45 
-            0 6 12 18 24 30 36 42 48 54 
-            0 7 14 21 28 35 42 49 56 63 
-            0 8 16 24 32 40 48 56 64 72 
+            0 0 0 0 0 0 0 0 0 0
+            0 1 2 3 4 5 6 7 8 9
+            0 2 4 6 8 10 12 14 16 18
+            0 3 6 9 12 15 18 21 24 27
+            0 4 8 12 16 20 24 28 32 36
+            0 5 10 15 20 25 30 35 40 45
+            0 6 12 18 24 30 36 42 48 54
+            0 7 14 21 28 35 42 49 56 63
+            0 8 16 24 32 40 48 56 64 72
             0 9 18 27 36 45 54 63 72 81
             </hdf5:DataFromFile>
          </hdf5:Data>

tools/testfiles/tname-sp.h5.xml

@@ -44,15 +44,15 @@ Expected output for 'h5dump --xml tname-sp.h5'
          </hdf5:DataType>
          <hdf5:Data>
             <hdf5:DataFromFile>
-            0 0 0 0 0 0 0 0 0 0 
-            0 1 2 3 4 5 6 7 8 9 
-            0 2 4 6 8 10 12 14 16 18 
-            0 3 6 9 12 15 18 21 24 27 
-            0 4 8 12 16 20 24 28 32 36 
-            0 5 10 15 20 25 30 35 40 45 
-            0 6 12 18 24 30 36 42 48 54 
-            0 7 14 21 28 35 42 49 56 63 
-            0 8 16 24 32 40 48 56 64 72 
+            0 0 0 0 0 0 0 0 0 0
+            0 1 2 3 4 5 6 7 8 9
+            0 2 4 6 8 10 12 14 16 18
+            0 3 6 9 12 15 18 21 24 27
+            0 4 8 12 16 20 24 28 32 36
+            0 5 10 15 20 25 30 35 40 45
+            0 6 12 18 24 30 36 42 48 54
+            0 7 14 21 28 35 42 49 56 63
+            0 8 16 24 32 40 48 56 64 72
             0 9 18 27 36 45 54 63 72 81
             </hdf5:DataFromFile>
          </hdf5:Data>

tools/testfiles/tnamed_dtype_attr.h5.xml

@@ -3,32 +3,36 @@ Expected output for 'h5dump --xml tnamed_dtype_attr.h5'
 #############################
 <?xml version="1.0" encoding="UTF-8"?>
 <hdf5:HDF5-File xmlns:hdf5="http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdf.ncsa.uiuc.edu/DTDs/HDF5File http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.xsd">
-<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
-   <hdf5:NamedDataType Name="Datatype" OBJ-XID="xid_976" H5Path="/Datatype" Parents="xid_928" H5ParentPaths="/">
+<hdf5:RootGroup OBJ-XID="xid_928-0" H5Path="/">
+   <hdf5:NamedDataType Name="Datatype" OBJ-XID="xid_976-0" H5Path="/Datatype" Parents="xid_928-0" H5ParentPaths="/">
       <hdf5:DataType>
          <hdf5:AtomicType>
             <hdf5:IntegerType ByteOrder="LE" Sign="true" Size="4" />
          </hdf5:AtomicType>
       </hdf5:DataType>
    </hdf5:NamedDataType>
-   <hdf5:Dataset Name="Dataset" OBJ-XID="xid_1384" H5Path= "/Dataset" Parents="xid_928" H5ParentPaths="/">
+   <hdf5:Dataset Name="Dataset" OBJ-XID="xid_1384-0" H5Path= "/Dataset" Parents="xid_928-0" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
          <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
          <hdf5:FillValue>
-               <hdf5:NoFill/>
+               <hdf5:Data>
+                  <hdf5:DataFromFile>
+                  "0"
+                  </hdf5:DataFromFile>
+               </hdf5:Data>
          </hdf5:FillValue>
       </hdf5:FillValueInfo>
       <hdf5:Dataspace>
          <hdf5:ScalarDataspace />
       </hdf5:Dataspace>
-      <hdf5:NamedDataTypePtr OBJ-XID="xid_976" H5Path="/Datatype" />
+      <hdf5:NamedDataTypePtr OBJ-XID="xid_976-0" H5Path="/Datatype" />
       <hdf5:Attribute Name="Attribute">
          <hdf5:Dataspace>
             <hdf5:ScalarDataspace />
          </hdf5:Dataspace>
-         <hdf5:NamedDataTypePtr OBJ-XID="xid_976" H5Path="/Datatype" />
+         <hdf5:NamedDataTypePtr OBJ-XID="xid_976-0" H5Path="/Datatype" />
          <hdf5:Data>
             <hdf5:DataFromFile>
             8

tools/testfiles/tnestcomp-1.ddl

@@ -17,8 +17,8 @@ GROUP "/" {
             } "char_name";
             H5T_ARRAY { [2] H5T_IEEE_F32LE } "array_name";
          } "d_name";
-      }        
-      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
+      }
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
       DATA {
          {
             0,
@@ -110,7 +110,7 @@ GROUP "/" {
                [ -100, 100 ]
             }
          }
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tnestedcomp.h5.xml

@@ -71,11 +71,11 @@ Expected output for 'h5dump --xml tnestedcomp.h5'
    <!-- Note: format of compound data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0 0 1 "A"  -100 100  1 1 0.5 "B"  -100 100  
-         2 4 0.333333 "C"  -100 100  3 9 0.25 "D"  -100 100  
-         4 16 0.2 "E"  -100 100  5 25 0.166667 "F"  -100 100  
-         6 36 0.142857 "G"  -100 100  7 49 0.125 "H"  -100 100  
-         8 64 0.111111 "I"  -100 100  9 81 0.1 "J"  -100 100 
+         0 0 1 "A"  -100 100 1 1 0.5 "B"  -100 100 2 4 0.333333 "C"  -100 100
+         3 9 0.25 "D"  -100 100 4 16 0.2 "E"  -100 100
+         5 25 0.166667 "F"  -100 100 6 36 0.142857 "G"  -100 100
+         7 49 0.125 "H"  -100 100 8 64 0.111111 "I"  -100 100
+         9 81 0.1 "J"  -100 100
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>

tools/testfiles/tobjref.h5.xml

@@ -37,29 +37,29 @@ Expected output for 'h5dump --xml tobjref.h5'
    <hdf5:Group Name="Group1" OBJ-XID="xid_1320-0" H5Path="/Group1" Parents="xid_696-0" H5ParentPaths="/" >
       <hdf5:NamedDataType Name="Datatype1" OBJ-XID="xid_2268-0" H5Path="/Group1/Datatype1" Parents="xid_1320-0" H5ParentPaths="/Group1">
          <hdf5:DataType>
-         <hdf5:CompoundType>
-            <hdf5:Field FieldName="a">
-               <hdf5:DataType>
-                  <hdf5:AtomicType>
-                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                  </hdf5:AtomicType>
-               </hdf5:DataType>
-            </hdf5:Field>
-            <hdf5:Field FieldName="b">
-               <hdf5:DataType>
-                  <hdf5:AtomicType>
-                     <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </hdf5:AtomicType>
-               </hdf5:DataType>
-            </hdf5:Field>
-            <hdf5:Field FieldName="c">
-               <hdf5:DataType>
-                  <hdf5:AtomicType>
-                     <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </hdf5:AtomicType>
-               </hdf5:DataType>
-            </hdf5:Field>
-         </hdf5:CompoundType>
+            <hdf5:CompoundType>
+               <hdf5:Field FieldName="a">
+                  <hdf5:DataType>
+                     <hdf5:AtomicType>
+                        <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                     </hdf5:AtomicType>
+                  </hdf5:DataType>
+               </hdf5:Field>
+               <hdf5:Field FieldName="b">
+                  <hdf5:DataType>
+                     <hdf5:AtomicType>
+                        <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                     </hdf5:AtomicType>
+                  </hdf5:DataType>
+               </hdf5:Field>
+               <hdf5:Field FieldName="c">
+                  <hdf5:DataType>
+                     <hdf5:AtomicType>
+                        <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                     </hdf5:AtomicType>
+                  </hdf5:DataType>
+               </hdf5:Field>
+            </hdf5:CompoundType>
          </hdf5:DataType>
       </hdf5:NamedDataType>
       <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_1696-0" H5Path= "/Group1/Dataset1" Parents="xid_1320-0" H5ParentPaths="/Group1">

tools/testfiles/topaque.h5.xml

@@ -25,7 +25,7 @@ Expected output for 'h5dump --xml topaque.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-         00:63:01:62:02:61:03:60:04:5f:05:5e:06:5d:07:5c:08:5b:09:5a:0a:59:0b:58:0c:57:0d:56:0e:55:0f:54:10:53:11:52:12:51:13:50:14:4f:15:4e:16:4d:17:4c:18:4b:19:4a:1a:49:1b:48:1c:47:1d:46:1e:45:1f:44:20:43:21:42:22:41:23:40:24:3f:25:3e:26:3d:27:3c:28:3b:29:3a:2a:39:2b:38:2c:37:2d:36:2e:35:2f:34:30:33:31:32:32:31:33:30:34:2f:35:2e:36:2d:37:2c:38:2b:39:2a:3a:29:3b:28:3c:27:3d:26:3e:25:3f:24:40:23:41:22:42:21:43:20:44:1f:45:1e:46:1d:47:1c:48:1b:49:1a:4a:19:4b:18:4c:17:4d:16:4e:15:4f:14:50:13:51:12:52:11:53:10:54:0f:55:0e:56:0d:57:0c:58:0b:59:0a:5a:09:5b:08:5c:07:5d:06:5e:05:5f:04:60:03:61:02:62:01:63:00 
+         00:63:01:62:02:61:03:60:04:5f:05:5e:06:5d:07:5c:08:5b:09:5a:0a:59:0b:58:0c:57:0d:56:0e:55:0f:54:10:53:11:52:12:51:13:50:14:4f:15:4e:16:4d:17:4c:18:4b:19:4a:1a:49:1b:48:1c:47:1d:46:1e:45:1f:44:20:43:21:42:22:41:23:40:24:3f:25:3e:26:3d:27:3c:28:3b:29:3a:2a:39:2b:38:2c:37:2d:36:2e:35:2f:34:30:33:31:32:32:31:33:30:34:2f:35:2e:36:2d:37:2c:38:2b:39:2a:3a:29:3b:28:3c:27:3d:26:3e:25:3f:24:40:23:41:22:42:21:43:20:44:1f:45:1e:46:1d:47:1c:48:1b:49:1a:4a:19:4b:18:4c:17:4d:16:4e:15:4f:14:50:13:51:12:52:11:53:10:54:0f:55:0e:56:0d:57:0c:58:0b:59:0a:5a:09:5b:08:5c:07:5d:06:5e:05:5f:04:60:03:61:02:62:01:63:00
          38:00:00:2c:3c:00:00:27:34:00:01:ea:04:00:00:12:00:00:00:00:00:08:a4:64:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:ef:7e:c9:c0:00:00:00:01:ef:ff:fa:84:ef:ff:fa:8c:00:03:fc:00:00:00:00:00:00:00:00:00:ef:ff:fa:20:00:01:2e:84:ef:ff:fa:20:00:01:2e:58:00:00:00:03:ef:ff:fa:84:00:00:00:04:ef:ff:fa:8c:00:00:00:05:ef:ff:fa:f0:00:00:00:00:00:00:00:00:00:00:00:01:ef:ff:fa:84:ef:ff:fa:8c:00:03:fc:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00
          </hdf5:DataFromFile>
       </hdf5:Data>

tools/testfiles/tsaf.ddl

@@ -4,8 +4,8 @@ Expected output for 'h5dump tsaf.h5'
 HDF5 "tsaf.h5" {
 GROUP "/" {
    DATASET ".DSL_METADATA" {
-      DATATYPE  H5T_STD_U8LE  
-      DATASPACE  SIMPLE { ( 5919 ) / ( H5S_UNLIMITED ) } 
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SIMPLE { ( 5919 ) / ( H5S_UNLIMITED ) }
       DATA {
          47, 32, 67, 79, 78, 84, 65, 73, 78, 69, 82, 10, 47, 46, 97, 116, 116,
          114, 105, 98, 117, 116, 101, 115, 32, 67, 79, 78, 84, 65, 73, 78, 69,
@@ -367,8 +367,8 @@ GROUP "/" {
          98, 108, 111, 98, 48, 48, 48, 48, 48, 46, 98, 108, 111, 98, 32, 68, 65,
          84, 65, 83, 69, 84, 32, 68, 83, 76, 95, 79, 102, 102, 115, 101, 116,
          59, 10
-      } 
-   } 
+      }
+   }
    GROUP ".attributes" {
       GROUP "database" {
          DATASET ".SAF_DbProps" {
@@ -457,8 +457,8 @@ GROUP "/" {
                H5T_STD_I32BE "ReadOnly";
                H5T_STD_I32BE "Clobber";
                H5T_STD_I32BE "OSModes";
-            }              
-            DATASPACE  SIMPLE { ( 1 ) / ( 1 ) } 
+            }
+            DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
             DATA {
                {
                   -604320037,
@@ -506,10 +506,10 @@ GROUP "/" {
                   1,
                   0
                }
-            } 
-         } 
-      } 
-   } 
+            }
+         }
+      }
+   }
    DATASET "Blob" {
       DATATYPE  H5T_COMPOUND {
          H5T_STD_I32BE "file_id";
@@ -519,8 +519,8 @@ GROUP "/" {
          H5T_STD_I32BE "count";
          H5T_STD_I32BE "base_id";
          H5T_STD_I32BE "num_recs";
-      }        
-      DATASPACE  SIMPLE { ( 24 ) / ( H5S_UNLIMITED ) } 
+      }
+      DATASPACE  SIMPLE { ( 24 ) / ( H5S_UNLIMITED ) }
       DATA {
          {
             -1,
@@ -738,8 +738,8 @@ GROUP "/" {
             23,
             1
          }
-      } 
-   } 
+      }
+   }
    DATASET "Cat" {
       DATATYPE  H5T_COMPOUND {
          H5T_STRING {
@@ -767,8 +767,8 @@ GROUP "/" {
          H5T_STD_I32BE "tdim";
          H5T_STD_I32BE "base_id";
          H5T_STD_I32BE "num_recs";
-      }        
-      DATASPACE  SIMPLE { ( 5 ) / ( H5S_UNLIMITED ) } 
+      }
+      DATASPACE  SIMPLE { ( 5 ) / ( H5S_UNLIMITED ) }
       DATA {
          {
             "nodes",
@@ -805,8 +805,8 @@ GROUP "/" {
             4,
             1
          }
-      } 
-   } 
+      }
+   }
    DATASET "Collection" {
       DATATYPE  H5T_COMPOUND {
          H5T_STD_I32BE "containing_set_id";
@@ -840,8 +840,8 @@ GROUP "/" {
          H5T_STD_I32BE "members_blob_id";
          H5T_STD_I32BE "base_id";
          H5T_STD_I32BE "num_recs";
-      }        
-      DATASPACE  SIMPLE { ( 24 ) / ( H5S_UNLIMITED ) } 
+      }
+      DATASPACE  SIMPLE { ( 24 ) / ( H5S_UNLIMITED ) }
       DATA {
          {
             0,
@@ -1107,8 +1107,8 @@ GROUP "/" {
             23,
             1
          }
-      } 
-   } 
+      }
+   }
    DATASET "Field" {
       DATATYPE  H5T_COMPOUND {
          H5T_STD_I32BE "ftmpl_id";
@@ -1154,8 +1154,8 @@ GROUP "/" {
          H5T_STD_I32BE "dof_blob_id";
          H5T_STD_I32BE "base_id";
          H5T_STD_I32BE "num_recs";
-      }        
-      DATASPACE  SIMPLE { ( 14 ) / ( H5S_UNLIMITED ) } 
+      }
+      DATASPACE  SIMPLE { ( 14 ) / ( H5S_UNLIMITED ) }
       DATA {
          {
             1,
@@ -1437,8 +1437,8 @@ GROUP "/" {
             13,
             1
          }
-      } 
-   } 
+      }
+   }
    DATASET "FieldTmpl" {
       DATATYPE  H5T_COMPOUND {
          H5T_STRING {
@@ -1483,8 +1483,8 @@ GROUP "/" {
          H5T_STD_I32BE "ftmpl_ids_blob_id";
          H5T_STD_I32BE "base_id";
          H5T_STD_I32BE "num_recs";
-      }        
-      DATASPACE  SIMPLE { ( 8 ) / ( H5S_UNLIMITED ) } 
+      }
+      DATASPACE  SIMPLE { ( 8 ) / ( H5S_UNLIMITED ) }
       DATA {
          {
             "coordinate_tmpl",
@@ -1574,8 +1574,8 @@ GROUP "/" {
             7,
             1
          }
-      } 
-   } 
+      }
+   }
    DATASET "IndexSpec" {
       DATATYPE  H5T_COMPOUND {
          H5T_STD_I32BE "ndims";
@@ -1599,8 +1599,8 @@ GROUP "/" {
          } "index_type";
          H5T_STD_I32BE "base_id";
          H5T_STD_I32BE "num_recs";
-      }        
-      DATASPACE  SIMPLE { ( 24 ) / ( H5S_UNLIMITED ) } 
+      }
+      DATASPACE  SIMPLE { ( 24 ) / ( H5S_UNLIMITED ) }
       DATA {
          {
             1,
@@ -1962,8 +1962,8 @@ GROUP "/" {
             23,
             1
          }
-      } 
-   } 
+      }
+   }
    DATASET "Relation" {
       DATATYPE  H5T_COMPOUND {
          H5T_STD_I32BE "sub_id";
@@ -2006,8 +2006,8 @@ GROUP "/" {
          H5T_STD_I32BE "r_blob_id";
          H5T_STD_I32BE "base_id";
          H5T_STD_I32BE "num_recs";
-      }        
-      DATASPACE  SIMPLE { ( 21 ) / ( H5S_UNLIMITED ) } 
+      }
+      DATASPACE  SIMPLE { ( 21 ) / ( H5S_UNLIMITED ) }
       DATA {
          {
             1,
@@ -2303,8 +2303,8 @@ GROUP "/" {
             20,
             1
          }
-      } 
-   } 
+      }
+   }
    DATASET "Set" {
       DATATYPE  H5T_COMPOUND {
          H5T_STD_I32BE "user_id";
@@ -2338,8 +2338,8 @@ GROUP "/" {
          H5T_STD_I32BE "bnd_set_id";
          H5T_STD_I32BE "base_id";
          H5T_STD_I32BE "num_recs";
-      }        
-      DATASPACE  SIMPLE { ( 9 ) / ( H5S_UNLIMITED ) } 
+      }
+      DATASPACE  SIMPLE { ( 9 ) / ( H5S_UNLIMITED ) }
       DATA {
          {
             0,
@@ -2476,73 +2476,73 @@ GROUP "/" {
             8,
             1
          }
-      } 
-   } 
+      }
+   }
    DATASET "field-coords_0002" {
-      DATATYPE  H5T_IEEE_F32BE  
-      DATASPACE  SIMPLE { ( 36 ) / ( 36 ) } 
+      DATATYPE  H5T_IEEE_F32BE
+      DATASPACE  SIMPLE { ( 36 ) / ( 36 ) }
       DATA {
          0, 4, 1, 4, 2, 4, 2.5, 4, 0, 3, 1, 3, 2, 3, 2.5, 3, 0, 2, 1, 2, 2, 2,
          2.5, 2, 0, 1, 2, 1, 2.5, 1, 0, 0, 2, 0, 2.5, 0
-      } 
-   } 
+      }
+   }
    DATASET "field-displacements_0007" {
-      DATATYPE  H5T_IEEE_F32BE  
-      DATASPACE  SIMPLE { ( 36 ) / ( 36 ) } 
+      DATATYPE  H5T_IEEE_F32BE
+      DATASPACE  SIMPLE { ( 36 ) / ( 36 ) }
       DATA {
          0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25,
          0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25,
          0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25
-      } 
-   } 
+      }
+   }
    DATASET "field-distribution_factors_0003" {
-      DATATYPE  H5T_IEEE_F32BE  
-      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+      DATATYPE  H5T_IEEE_F32BE
+      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
       DATA {
          4, 3, 2, 1, 0
-      } 
-   } 
+      }
+   }
    DATASET "field-pressure_0013" {
-      DATATYPE  H5T_IEEE_F32BE  
-      DATASPACE  SIMPLE { ( 2 ) / ( 2 ) } 
+      DATATYPE  H5T_IEEE_F32BE
+      DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
       DATA {
          45, 55
-      } 
-   } 
+      }
+   }
    DATASET "field-stress_0011" {
-      DATATYPE  H5T_IEEE_F32BE  
-      DATASPACE  SIMPLE { ( 12 ) / ( 12 ) } 
+      DATATYPE  H5T_IEEE_F32BE
+      DATASPACE  SIMPLE { ( 12 ) / ( 12 ) }
       DATA {
          0.5, 0.25, 0.5, 0.5, 0.25, 0.5, 0.5, 0.25, 0.5, 0.5, 0.25, 0.5
-      } 
-   } 
+      }
+   }
    DATASET "field-temperature_0004" {
-      DATATYPE  H5T_IEEE_F32BE  
-      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+      DATATYPE  H5T_IEEE_F32BE
+      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
       DATA {
          100, 150, 150, 100, 75
-      } 
-   } 
+      }
+   }
    DATASET "field-temperature_0012" {
-      DATATYPE  H5T_IEEE_F32BE  
-      DATASPACE  SIMPLE { ( 7 ) / ( 7 ) } 
+      DATATYPE  H5T_IEEE_F32BE
+      DATASPACE  SIMPLE { ( 7 ) / ( 7 ) }
       DATA {
          75, 95, 120, 80, 115, 85, 110
-      } 
-   } 
+      }
+   }
    DATASET "metablob00000.blob" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 19 ) / ( H5S_UNLIMITED ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 19 ) / ( H5S_UNLIMITED ) }
       DATA {
          1, 7, 8, 3, -2, -2, -2, -2, -2, -2, -2, -2, 0, 1, 5, 6, 8, 9, 10
-      } 
-   } 
+      }
+   }
    DATASET "metablob00000.index" {
       DATATYPE  H5T_COMPOUND {
          H5T_STD_I32BE "index";
          H5T_STD_I32BE "length";
-      }        
-      DATASPACE  SIMPLE { ( 10 ) / ( H5S_UNLIMITED ) } 
+      }
+      DATASPACE  SIMPLE { ( 10 ) / ( H5S_UNLIMITED ) }
       DATA {
          {
             0,
@@ -2584,126 +2584,126 @@ GROUP "/" {
             16,
             3
          }
-      } 
-   } 
+      }
+   }
    DATASET "ssrel-_0000" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 9 ) / ( 9 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 9 ) / ( 9 ) }
       DATA {
          1, 2, 3, 5, 6, 7, 9, 10, 11
-      } 
-   } 
+      }
+   }
    DATASET "ssrel-_0001" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          1, 2, 4, 5
-      } 
-   } 
+      }
+   }
    DATASET "ssrel-_0002" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 7 ) / ( 7 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 7 ) / ( 7 ) }
       DATA {
          9, 10, 11, 13, 14, 16, 17
-      } 
-   } 
+      }
+   }
    DATASET "ssrel-_0003" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          7, 8, 9, 11
-      } 
-   } 
+      }
+   }
    DATASET "ssrel-_0004" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
       DATA {
          9, 10, 11, 13, 14
-      } 
-   } 
+      }
+   }
    DATASET "ssrel-_0005" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 3 ) / ( 3 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 3 ) / ( 3 ) }
       DATA {
          7, 8, 9
-      } 
-   } 
+      }
+   }
    DATASET "ssrel-_0006" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          13, 14, 16, 17
-      } 
-   } 
+      }
+   }
    DATASET "ssrel-_0007" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 1 ) / ( 1 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
       DATA {
          11
-      } 
-   } 
+      }
+   }
    DATASET "ssrel-_0008" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
       DATA {
          3, 4, 7, 8, 11, 12, 14, 15, 17, 18
-      } 
-   } 
+      }
+   }
    DATASET "ssrel-_0009" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          3, 6, 10, 12
-      } 
-   } 
+      }
+   }
    DATASET "ssrel-_0010" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 3 ) / ( 3 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 3 ) / ( 3 ) }
       DATA {
          9, 10, 11
-      } 
-   } 
+      }
+   }
    DATASET "ssrel-_0011" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
       DATA {
          1, 5, 9, 13, 16
-      } 
-   } 
+      }
+   }
    DATASET "ssrel-_0012" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
       DATA {
          4, 8, 12, 15, 18
-      } 
-   } 
+      }
+   }
    DATASET "toporel-_0017" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 16 ) / ( 16 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 16 ) / ( 16 ) }
       DATA {
          1, 2, 6, 5, 2, 3, 7, 6, 5, 6, 10, 9, 6, 7, 11, 10
-      } 
-   } 
+      }
+   }
    DATASET "toporel-_0018" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 9 ) / ( 9 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 9 ) / ( 9 ) }
       DATA {
          9, 10, 13, 10, 14, 13, 10, 11, 14
-      } 
-   } 
+      }
+   }
    DATASET "toporel-_0019" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          13, 14, 17, 16
-      } 
-   } 
+      }
+   }
    DATASET "toporel-_0020" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 16 ) / ( 16 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 16 ) / ( 16 ) }
       DATA {
          3, 4, 8, 7, 7, 8, 12, 11, 11, 12, 15, 14, 14, 15, 18, 17
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tsaf.h5.xml

@@ -29,288 +29,281 @@ Expected output for 'h5dump --xml tsaf.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-         47 32 67 79 78 84 65 73 78 69 82 10 47 46 97 116 116 114 105 98 117 
-         116 101 115 32 67 79 78 84 65 73 78 69 82 10 47 46 97 116 116 114 105 
-         98 117 116 101 115 47 100 97 116 97 98 97 115 101 32 67 79 78 84 65 73 
-         78 69 82 10 47 46 97 116 116 114 105 98 117 116 101 115 47 100 97 116 
-         97 98 97 115 101 47 46 83 65 70 95 68 98 80 114 111 112 115 32 68 65 
-         84 65 83 69 84 32 115 116 114 117 99 116 32 83 65 70 95 68 98 80 114 
-         111 112 115 123 105 110 116 32 109 97 103 105 99 59 99 104 97 114 32 
-         83 70 105 108 101 68 105 114 91 49 48 50 52 93 59 99 104 97 114 32 73 
-         109 112 111 114 116 70 105 108 101 91 49 48 50 52 93 59 105 110 116 32 
-         112 97 114 97 108 108 101 108 59 115 116 114 117 99 116 32 83 65 70 95 
-         86 101 114 115 105 111 110 73 110 102 111 123 105 110 116 32 118 109 
-         97 106 111 114 59 105 110 116 32 118 109 105 110 111 114 59 105 110 
-         116 32 114 101 108 59 99 104 97 114 32 97 110 110 111 116 91 49 48 93 
-         59 125 115 97 102 97 112 105 59 115 116 114 117 99 116 32 83 65 70 95 
-         86 101 114 115 105 111 110 73 110 102 111 123 105 110 116 32 118 109 
-         97 106 111 114 59 105 110 116 32 118 109 105 110 111 114 59 105 110 
-         116 32 114 101 108 59 99 104 97 114 32 97 110 110 111 116 91 49 48 93 
-         59 125 115 97 102 108 105 98 59 115 116 114 117 99 116 32 83 65 70 95 
-         86 101 114 115 105 111 110 73 110 102 111 123 105 110 116 32 118 109 
-         97 106 111 114 59 105 110 116 32 118 109 105 110 111 114 59 105 110 
-         116 32 114 101 108 59 99 104 97 114 32 97 110 110 111 116 91 49 48 93 
-         59 125 118 98 116 59 115 116 114 117 99 116 32 83 65 70 95 86 101 114 
-         115 105 111 110 73 110 102 111 123 105 110 116 32 118 109 97 106 111 
-         114 59 105 110 116 32 118 109 105 110 111 114 59 105 110 116 32 114 
-         101 108 59 99 104 97 114 32 97 110 110 111 116 91 49 48 93 59 125 100 
-         115 108 59 115 116 114 117 99 116 32 83 65 70 95 86 101 114 115 105 
-         111 110 73 110 102 111 123 105 110 116 32 118 109 97 106 111 114 59 
-         105 110 116 32 118 109 105 110 111 114 59 105 110 116 32 114 101 108 
-         59 99 104 97 114 32 97 110 110 111 116 91 49 48 93 59 125 104 100 102 
-         53 59 115 116 114 117 99 116 32 83 65 70 95 86 101 114 115 105 111 110 
-         73 110 102 111 123 105 110 116 32 118 109 97 106 111 114 59 105 110 
-         116 32 118 109 105 110 111 114 59 105 110 116 32 114 101 108 59 99 104 
-         97 114 32 97 110 110 111 116 91 49 48 93 59 125 109 112 105 59 105 110 
-         116 32 68 111 84 111 99 59 105 110 116 32 82 101 97 100 79 110 108 121 
-         59 105 110 116 32 67 108 111 98 98 101 114 59 105 110 116 32 79 83 77 
-         111 100 101 115 59 125 59 10 47 115 115 114 101 108 45 95 48 48 48 48 
-         32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 115 115 114 101 108 45 
-         95 48 48 48 49 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 115 115 
-         114 101 108 45 95 48 48 48 50 32 68 65 84 65 83 69 84 32 105 110 116 
-         59 10 47 115 115 114 101 108 45 95 48 48 48 51 32 68 65 84 65 83 69 84 
-         32 105 110 116 59 10 47 115 115 114 101 108 45 95 48 48 48 52 32 68 65 
-         84 65 83 69 84 32 105 110 116 59 10 47 115 115 114 101 108 45 95 48 48 
-         48 53 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 115 115 114 101 
-         108 45 95 48 48 48 54 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 
-         115 115 114 101 108 45 95 48 48 48 55 32 68 65 84 65 83 69 84 32 105 
-         110 116 59 10 47 115 115 114 101 108 45 95 48 48 48 56 32 68 65 84 65 
-         83 69 84 32 105 110 116 59 10 47 115 115 114 101 108 45 95 48 48 48 57 
-         32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 115 115 114 101 108 45 
-         95 48 48 49 48 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 115 115 
-         114 101 108 45 95 48 48 49 49 32 68 65 84 65 83 69 84 32 105 110 116 
-         59 10 47 115 115 114 101 108 45 95 48 48 49 50 32 68 65 84 65 83 69 84 
-         32 105 110 116 59 10 47 116 111 112 111 114 101 108 45 95 48 48 49 55 
-         32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 116 111 112 111 114 
-         101 108 45 95 48 48 49 56 32 68 65 84 65 83 69 84 32 105 110 116 59 10 
-         47 116 111 112 111 114 101 108 45 95 48 48 49 57 32 68 65 84 65 83 69 
-         84 32 105 110 116 59 10 47 116 111 112 111 114 101 108 45 95 48 48 50 
-         48 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 102 105 101 108 100 
-         45 99 111 111 114 100 115 95 48 48 48 50 32 68 65 84 65 83 69 84 32 
-         102 108 111 97 116 59 10 47 102 105 101 108 100 45 100 105 115 116 114 
-         105 98 117 116 105 111 110 95 102 97 99 116 111 114 115 95 48 48 48 51 
-         32 68 65 84 65 83 69 84 32 102 108 111 97 116 59 10 47 102 105 101 108 
-         100 45 116 101 109 112 101 114 97 116 117 114 101 95 48 48 48 52 32 68 
-         65 84 65 83 69 84 32 102 108 111 97 116 59 10 47 102 105 101 108 100 
-         45 100 105 115 112 108 97 99 101 109 101 110 116 115 95 48 48 48 55 32 
-         68 65 84 65 83 69 84 32 102 108 111 97 116 59 10 47 102 105 101 108 
-         100 45 115 116 114 101 115 115 95 48 48 49 49 32 68 65 84 65 83 69 84 
-         32 102 108 111 97 116 59 10 47 102 105 101 108 100 45 116 101 109 112 
-         101 114 97 116 117 114 101 95 48 48 49 50 32 68 65 84 65 83 69 84 32 
-         102 108 111 97 116 59 10 47 102 105 101 108 100 45 112 114 101 115 115 
-         117 114 101 95 48 48 49 51 32 68 65 84 65 83 69 84 32 102 108 111 97 
-         116 59 10 47 66 108 111 98 32 68 65 84 65 83 69 84 32 115 116 114 117 
-         99 116 32 66 108 111 98 123 68 83 76 95 79 102 102 115 101 116 32 102 
-         105 108 101 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 100 97 
-         116 97 115 101 116 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 
-         111 102 102 115 101 116 59 68 83 76 95 79 102 102 115 101 116 32 115 
-         116 114 105 100 101 59 68 83 76 95 79 102 102 115 101 116 32 99 111 
-         117 110 116 59 68 83 76 95 79 102 102 115 101 116 32 98 97 115 101 95 
-         105 100 59 68 83 76 95 79 102 102 115 101 116 32 110 117 109 95 114 
-         101 99 115 59 125 59 10 47 73 110 100 101 120 83 112 101 99 32 68 65 
-         84 65 83 69 84 32 115 116 114 117 99 116 32 73 110 100 101 120 83 112 
-         101 99 123 105 110 116 32 110 100 105 109 115 59 105 110 116 32 111 
-         114 105 103 105 110 115 91 56 93 59 105 110 116 32 115 105 122 101 115 
-         91 56 93 59 105 110 116 32 111 114 100 101 114 91 56 93 59 101 110 117 
-         109 32 73 110 100 101 120 84 121 112 101 123 86 66 84 95 73 78 68 69 
-         88 95 84 89 80 69 95 67 95 79 82 68 69 82 61 48 44 86 66 84 95 73 78 
-         68 69 88 95 84 89 80 69 95 70 95 79 82 68 69 82 61 49 44 86 66 84 95 
-         73 78 68 69 88 95 84 89 80 69 95 65 78 89 61 45 49 44 86 66 84 95 73 
-         78 68 69 88 95 84 89 80 69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 
-         84 95 73 78 68 69 88 95 84 89 80 69 95 78 65 61 45 51 44 86 66 84 95 
-         73 78 68 69 88 95 84 89 80 69 95 85 78 75 78 79 87 78 61 45 52 125 105 
-         110 100 101 120 95 116 121 112 101 59 68 83 76 95 79 102 102 115 101 
-         116 32 98 97 115 101 95 105 100 59 68 83 76 95 79 102 102 115 101 116 
-         32 110 117 109 95 114 101 99 115 59 125 59 10 47 67 97 116 32 68 65 84 
-         65 83 69 84 32 115 116 114 117 99 116 32 67 97 116 123 99 104 97 114 
-         32 110 97 109 101 91 54 52 93 59 101 110 117 109 32 82 111 108 101 123 
-         86 66 84 95 82 79 76 69 95 84 79 80 79 61 48 44 86 66 84 95 82 79 76 
-         69 95 66 78 68 61 49 44 86 66 84 95 82 79 76 69 95 80 82 79 67 61 50 
-         44 86 66 84 95 82 79 76 69 95 68 79 77 78 61 51 44 86 66 84 95 82 79 
-         76 69 95 66 76 79 67 75 61 52 44 86 66 84 95 82 79 76 69 95 65 83 83 
-         89 61 53 44 86 66 84 95 82 79 76 69 95 77 65 84 61 54 44 86 66 84 95 
-         82 79 76 69 95 88 80 82 79 68 61 55 44 86 66 84 95 82 79 76 69 95 85 
-         83 69 82 68 61 56 44 86 66 84 95 82 79 76 69 95 65 78 89 61 45 49 44 
-         86 66 84 95 82 79 76 69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 
-         95 82 79 76 69 95 78 65 61 45 51 44 86 66 84 95 82 79 76 69 95 85 78 
-         75 78 79 87 78 61 45 52 125 114 111 108 101 59 105 110 116 32 116 100 
-         105 109 59 68 83 76 95 79 102 102 115 101 116 32 98 97 115 101 95 105 
-         100 59 68 83 76 95 79 102 102 115 101 116 32 110 117 109 95 114 101 99 
-         115 59 125 59 10 47 83 101 116 32 68 65 84 65 83 69 84 32 115 116 114 
-         117 99 116 32 83 101 116 123 105 110 116 32 117 115 101 114 95 105 100 
-         59 99 104 97 114 32 110 97 109 101 91 54 52 93 59 105 110 116 32 116 
-         100 105 109 59 101 110 117 109 32 83 105 108 82 111 108 101 123 86 66 
-         84 95 83 82 79 76 69 95 84 73 77 69 61 48 44 86 66 84 95 83 82 79 76 
-         69 95 83 80 65 67 69 61 49 44 86 66 84 95 83 82 79 76 69 95 83 84 65 
-         84 69 61 50 44 86 66 84 95 83 82 79 76 69 95 80 65 82 65 77 61 51 44 
-         86 66 84 95 83 82 79 76 69 95 67 84 89 80 69 61 52 44 86 66 84 95 83 
-         82 79 76 69 95 65 84 89 80 69 61 53 44 86 66 84 95 83 82 79 76 69 95 
-         85 83 69 82 68 61 54 44 86 66 84 95 83 82 79 76 69 95 65 78 89 61 45 
-         49 44 86 66 84 95 83 82 79 76 69 95 73 78 86 65 76 73 68 61 45 50 44 
-         86 66 84 95 83 82 79 76 69 95 78 65 61 45 51 44 86 66 84 95 83 82 79 
-         76 69 95 85 78 75 78 79 87 78 61 45 52 125 115 114 111 108 101 59 68 
-         83 76 95 79 102 102 115 101 116 32 99 111 108 108 95 105 100 115 91 49 
-         54 93 59 105 110 116 32 105 115 95 116 111 112 59 105 110 116 32 105 
-         115 95 101 120 116 101 110 100 105 98 108 101 59 68 83 76 95 79 102 
-         102 115 101 116 32 100 102 108 116 95 99 111 111 114 100 102 108 100 
-         95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 98 110 100 95 115 
-         101 116 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 98 97 115 
-         101 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 110 117 109 95 
-         114 101 99 115 59 125 59 10 47 67 111 108 108 101 99 116 105 111 110 
-         32 68 65 84 65 83 69 84 32 115 116 114 117 99 116 32 67 111 108 108 
-         101 99 116 105 111 110 123 68 83 76 95 79 102 102 115 101 116 32 99 
-         111 110 116 97 105 110 105 110 103 95 115 101 116 95 105 100 59 68 83 
-         76 95 79 102 102 115 101 116 32 99 97 116 95 105 100 59 101 110 117 
-         109 32 67 101 108 108 84 121 112 101 123 86 66 84 95 67 69 76 76 95 84 
-         89 80 69 95 78 79 78 69 61 48 44 86 66 84 95 67 69 76 76 95 84 89 80 
-         69 95 80 79 73 78 84 61 49 44 86 66 84 95 67 69 76 76 95 84 89 80 69 
-         95 76 73 78 69 61 50 44 86 66 84 95 67 69 76 76 95 84 89 80 69 95 84 
-         82 73 61 51 44 86 66 84 95 67 69 76 76 95 84 89 80 69 95 81 85 65 68 
-         61 52 44 86 66 84 95 67 69 76 76 95 84 89 80 69 95 84 69 84 61 53 44 
-         86 66 84 95 67 69 76 76 95 84 89 80 69 95 80 89 82 65 77 73 68 61 54 
-         44 86 66 84 95 67 69 76 76 95 84 89 80 69 95 80 82 73 83 77 61 55 44 
-         86 66 84 95 67 69 76 76 95 84 89 80 69 95 72 69 88 61 56 44 86 66 84 
-         95 67 69 76 76 95 84 89 80 69 95 77 73 88 69 68 61 57 44 86 66 84 95 
-         67 69 76 76 95 84 89 80 69 95 65 82 66 61 49 48 44 86 66 84 95 67 69 
-         76 76 95 84 89 80 69 95 49 66 65 76 76 61 49 49 44 86 66 84 95 67 69 
-         76 76 95 84 89 80 69 95 50 66 65 76 76 61 49 50 44 86 66 84 95 67 69 
-         76 76 95 84 89 80 69 95 51 66 65 76 76 61 49 51 44 86 66 84 95 67 69 
-         76 76 95 84 89 80 69 95 49 83 72 69 76 76 61 49 52 44 86 66 84 95 67 
-         69 76 76 95 84 89 80 69 95 50 83 72 69 76 76 61 49 53 44 86 66 84 95 
-         67 69 76 76 95 84 89 80 69 95 65 78 89 61 45 49 44 86 66 84 95 67 69 
-         76 76 95 84 89 80 69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 95 
-         67 69 76 76 95 84 89 80 69 95 78 65 61 45 51 44 86 66 84 95 67 69 76 
-         76 95 84 89 80 69 95 85 78 75 78 79 87 78 61 45 52 125 99 101 108 108 
-         95 116 121 112 101 59 105 110 116 32 99 111 117 110 116 59 68 83 76 95 
-         79 102 102 115 101 116 32 105 110 100 101 120 105 110 103 95 105 100 
-         59 105 110 116 32 105 115 95 100 101 99 111 109 112 59 68 83 76 95 79 
-         102 102 115 101 116 32 109 101 109 98 101 114 115 95 98 108 111 98 95 
-         105 100 59 68 83 76 95 79 102 102 115 101 116 32 98 97 115 101 95 105 
-         100 59 68 83 76 95 79 102 102 115 101 116 32 110 117 109 95 114 101 99 
-         115 59 125 59 10 47 82 101 108 97 116 105 111 110 32 68 65 84 65 83 69 
-         84 32 115 116 114 117 99 116 32 82 101 108 97 116 105 111 110 123 68 
-         83 76 95 79 102 102 115 101 116 32 115 117 98 95 105 100 59 68 83 76 
-         95 79 102 102 115 101 116 32 115 117 98 95 99 97 116 95 105 100 59 68 
-         83 76 95 79 102 102 115 101 116 32 115 117 98 95 100 101 99 111 109 
-         112 95 99 97 116 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 
-         115 117 112 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 115 
-         117 112 95 99 97 116 95 105 100 59 68 83 76 95 79 102 102 115 101 116 
-         32 115 117 112 95 100 101 99 111 109 112 95 99 97 116 95 105 100 59 
-         101 110 117 109 32 82 101 108 75 105 110 100 123 86 66 84 95 82 69 76 
-         75 73 78 68 95 83 85 66 83 69 84 61 48 44 86 66 84 95 82 69 76 75 73 
-         78 68 95 83 85 80 83 69 84 61 49 44 86 66 84 95 82 69 76 75 73 78 68 
-         95 66 79 85 78 68 61 50 44 86 66 84 95 82 69 76 75 73 78 68 95 80 69 
-         82 77 85 84 69 61 51 44 86 66 84 95 82 69 76 75 73 78 68 95 78 69 73 
-         71 72 66 79 82 61 52 44 86 66 84 95 82 69 76 75 73 78 68 95 67 79 80 
-         89 61 53 44 86 66 84 95 82 69 76 75 73 78 68 95 69 81 85 65 76 61 54 
-         44 86 66 84 95 82 69 76 75 73 78 68 95 65 78 89 61 45 49 44 86 66 84 
-         95 82 69 76 75 73 78 68 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 
-         95 82 69 76 75 73 78 68 95 78 65 61 45 51 44 86 66 84 95 82 69 76 75 
-         73 78 68 95 85 78 75 78 79 87 78 61 45 52 125 107 105 110 100 59 101 
-         110 117 109 32 82 101 108 82 101 112 123 86 66 84 95 82 69 76 82 69 80 
-         95 73 68 69 78 84 73 84 89 61 48 44 86 66 84 95 82 69 76 82 69 80 95 
-         72 76 73 83 84 61 49 44 86 66 84 95 82 69 76 82 69 80 95 84 76 73 83 
-         84 61 50 44 86 66 84 95 82 69 76 82 69 80 95 84 76 73 83 84 95 49 61 
-         51 44 86 66 84 95 82 69 76 82 69 80 95 69 76 73 83 84 61 52 44 86 66 
-         84 95 82 69 76 82 69 80 95 83 84 82 85 67 84 85 82 69 68 61 53 44 86 
-         66 84 95 82 69 76 82 69 80 95 85 78 83 84 82 85 67 84 85 82 69 68 61 
-         54 44 86 66 84 95 82 69 76 82 69 80 95 65 82 66 73 84 82 65 82 89 95 
-         82 61 55 44 86 66 84 95 82 69 76 82 69 80 95 65 82 66 73 84 82 65 82 
-         89 95 68 82 61 56 44 86 66 84 95 82 69 76 82 69 80 95 65 78 89 61 45 
-         49 44 86 66 84 95 82 69 76 82 69 80 95 73 78 86 65 76 73 68 61 45 50 
-         44 86 66 84 95 82 69 76 82 69 80 95 78 65 61 45 51 44 86 66 84 95 82 
-         69 76 82 69 80 95 85 78 75 78 79 87 78 61 45 52 125 114 101 112 95 116 
-         121 112 101 59 68 83 76 95 79 102 102 115 101 116 32 100 95 98 108 111 
-         98 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 114 95 98 108 
-         111 98 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 98 97 115 
-         101 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 110 117 109 95 
-         114 101 99 115 59 125 59 10 47 70 105 101 108 100 84 109 112 108 32 68 
-         65 84 65 83 69 84 32 115 116 114 117 99 116 32 70 105 101 108 100 84 
-         109 112 108 123 99 104 97 114 32 110 97 109 101 91 54 52 93 59 68 83 
-         76 95 79 102 102 115 101 116 32 98 97 115 101 95 115 112 97 99 101 95 
-         105 100 59 101 110 117 109 32 65 108 103 101 98 114 97 105 99 84 121 
-         112 101 123 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 
-         67 79 78 83 84 65 78 84 61 48 44 86 66 84 95 65 76 71 69 66 82 65 73 
-         67 95 84 89 80 69 95 67 79 77 80 79 78 69 78 84 61 49 44 86 66 84 95 
-         65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 83 67 65 76 65 82 61 50 
-         44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 86 69 67 
-         84 79 82 61 51 44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89 80 
-         69 95 84 69 78 83 79 82 61 52 44 86 66 84 95 65 76 71 69 66 82 65 73 
-         67 95 84 89 80 69 95 83 89 77 95 84 69 78 83 79 82 61 53 44 86 66 84 
-         95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 70 73 69 76 68 61 54 
-         44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 83 84 65 
-         84 69 61 55 44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 
-         95 84 85 80 76 69 61 56 44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 
-         84 89 80 69 95 65 78 89 61 45 49 44 86 66 84 95 65 76 71 69 66 82 65 
-         73 67 95 84 89 80 69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 95 
-         65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 78 65 61 45 51 44 86 66 
-         84 95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 85 78 75 78 79 87 
-         78 61 45 52 125 97 108 103 95 116 121 112 101 59 101 110 117 109 32 66 
-         97 115 105 115 84 121 112 101 123 86 66 84 95 66 65 83 73 83 95 84 89 
-         80 69 95 85 78 73 84 89 61 48 44 86 66 84 95 66 65 83 73 83 95 84 89 
-         80 69 95 67 65 82 84 69 83 73 65 78 61 49 44 86 66 84 95 66 65 83 73 
-         83 95 84 89 80 69 95 83 80 72 69 82 73 67 65 76 61 50 44 86 66 84 95 
-         66 65 83 73 83 95 84 89 80 69 95 67 89 76 73 78 68 82 73 67 65 76 61 
-         51 44 86 66 84 95 66 65 83 73 83 95 84 89 80 69 95 85 80 80 69 82 95 
-         84 82 73 61 52 44 86 66 84 95 66 65 83 73 83 95 84 89 80 69 95 70 79 
-         85 82 73 69 82 61 53 44 86 66 84 95 66 65 83 73 83 95 84 89 80 69 95 
-         86 65 82 73 65 66 76 69 61 54 44 86 66 84 95 66 65 83 73 83 95 84 89 
-         80 69 95 65 78 89 61 45 49 44 86 66 84 95 66 65 83 73 83 95 84 89 80 
-         69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 95 66 65 83 73 83 95 
-         84 89 80 69 95 78 65 61 45 51 44 86 66 84 95 66 65 83 73 83 95 84 89 
-         80 69 95 85 78 75 78 79 87 78 61 45 52 125 98 97 115 105 115 59 68 83 
-         76 95 79 102 102 115 101 116 32 113 117 97 110 116 105 116 121 95 105 
-         100 59 105 110 116 32 110 117 109 95 99 111 109 112 115 59 68 83 76 95 
-         79 102 102 115 101 116 32 102 116 109 112 108 95 105 100 115 95 98 108 
-         111 98 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 98 97 115 
-         101 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 110 117 109 95 
-         114 101 99 115 59 125 59 10 47 70 105 101 108 100 32 68 65 84 65 83 69 
-         84 32 115 116 114 117 99 116 32 70 105 101 108 100 123 68 83 76 95 79 
-         102 102 115 101 116 32 102 116 109 112 108 95 105 100 59 99 104 97 114 
-         32 110 97 109 101 91 54 52 93 59 68 83 76 95 79 102 102 115 101 116 32 
-         117 110 105 116 115 95 105 100 59 68 83 76 95 79 102 102 115 101 116 
-         32 115 116 111 114 97 103 101 95 100 101 99 111 109 112 95 99 97 116 
-         95 105 100 59 101 110 117 109 32 73 110 116 101 114 108 101 97 118 101 
-         123 86 66 84 95 73 78 84 69 82 76 69 65 86 69 95 67 79 77 80 79 78 69 
-         78 84 61 48 44 86 66 84 95 73 78 84 69 82 76 69 65 86 69 95 86 69 67 
-         84 79 82 61 49 44 86 66 84 95 73 78 84 69 82 76 69 65 86 69 95 73 78 
-         68 69 80 69 78 68 69 78 84 61 50 44 86 66 84 95 73 78 84 69 82 76 69 
-         65 86 69 95 78 79 78 69 61 51 44 86 66 84 95 73 78 84 69 82 76 69 65 
-         86 69 95 65 78 89 61 45 49 44 86 66 84 95 73 78 84 69 82 76 69 65 86 
-         69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 95 73 78 84 69 82 76 
-         69 65 86 69 95 78 65 61 45 51 44 86 66 84 95 73 78 84 69 82 76 69 65 
-         86 69 95 85 78 75 78 79 87 78 61 45 52 125 99 111 109 112 95 105 110 
-         116 108 118 59 68 83 76 95 79 102 102 115 101 116 32 105 110 100 101 
-         120 105 110 103 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 
-         100 111 102 95 97 115 115 111 99 95 99 97 116 95 105 100 59 105 110 
-         116 32 97 115 115 111 99 95 114 97 116 105 111 59 68 83 76 95 79 102 
-         102 115 101 116 32 101 118 97 108 95 100 101 99 111 109 112 95 99 97 
-         116 95 105 100 59 101 110 117 109 32 69 118 97 108 70 117 110 99 123 
-         86 66 84 95 69 86 65 76 95 70 85 78 67 95 67 79 78 83 84 65 78 84 61 
-         48 44 86 66 84 95 69 86 65 76 95 70 85 78 67 95 85 78 73 70 79 82 77 
-         61 49 44 86 66 84 95 69 86 65 76 95 70 85 78 67 95 80 87 67 79 78 83 
-         84 61 50 44 86 66 84 95 69 86 65 76 95 70 85 78 67 95 80 87 76 73 78 
-         69 65 82 61 51 44 86 66 84 95 69 86 65 76 95 70 85 78 67 95 65 78 89 
-         61 45 49 44 86 66 84 95 69 86 65 76 95 70 85 78 67 95 73 78 86 65 76 
-         73 68 61 45 50 44 86 66 84 95 69 86 65 76 95 70 85 78 67 95 78 65 61 
-         45 51 44 86 66 84 95 69 86 65 76 95 70 85 78 67 95 85 78 75 78 79 87 
-         78 61 45 52 125 101 118 97 108 95 102 117 110 99 59 105 110 116 32 105 
-         115 95 104 111 109 111 103 101 110 101 111 117 115 59 105 110 116 32 
-         105 115 95 99 111 111 114 100 95 102 105 101 108 100 59 68 83 76 95 79 
-         102 102 115 101 116 32 99 111 109 112 95 105 100 115 95 98 108 111 98 
-         95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 99 111 109 112 95 
-         111 114 100 101 114 95 98 108 111 98 95 105 100 59 68 83 76 95 79 102 
-         102 115 101 116 32 118 98 97 115 105 115 95 98 108 111 98 95 105 100 
-         59 68 83 76 95 79 102 102 115 101 116 32 100 111 102 95 98 108 111 98 
-         95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 98 97 115 101 95 
-         105 100 59 68 83 76 95 79 102 102 115 101 116 32 110 117 109 95 114 
-         101 99 115 59 125 59 10 47 109 101 116 97 98 108 111 98 48 48 48 48 48 
-         46 105 110 100 101 120 32 68 65 84 65 83 69 84 32 115 116 114 117 99 
-         116 32 73 110 100 101 120 80 97 105 114 123 68 83 76 95 79 102 102 115 
-         101 116 32 105 110 100 101 120 59 105 110 116 32 108 101 110 103 116 
-         104 59 125 59 10 47 109 101 116 97 98 108 111 98 48 48 48 48 48 46 98 
-         108 111 98 32 68 65 84 65 83 69 84 32 68 83 76 95 79 102 102 115 101 
-         116 59 10
+         47 32 67 79 78 84 65 73 78 69 82 10 47 46 97 116 116 114 105 98 117 116
+         101 115 32 67 79 78 84 65 73 78 69 82 10 47 46 97 116 116 114 105 98
+         117 116 101 115 47 100 97 116 97 98 97 115 101 32 67 79 78 84 65 73 78
+         69 82 10 47 46 97 116 116 114 105 98 117 116 101 115 47 100 97 116 97
+         98 97 115 101 47 46 83 65 70 95 68 98 80 114 111 112 115 32 68 65 84 65
+         83 69 84 32 115 116 114 117 99 116 32 83 65 70 95 68 98 80 114 111 112
+         115 123 105 110 116 32 109 97 103 105 99 59 99 104 97 114 32 83 70 105
+         108 101 68 105 114 91 49 48 50 52 93 59 99 104 97 114 32 73 109 112 111
+         114 116 70 105 108 101 91 49 48 50 52 93 59 105 110 116 32 112 97 114
+         97 108 108 101 108 59 115 116 114 117 99 116 32 83 65 70 95 86 101 114
+         115 105 111 110 73 110 102 111 123 105 110 116 32 118 109 97 106 111
+         114 59 105 110 116 32 118 109 105 110 111 114 59 105 110 116 32 114 101
+         108 59 99 104 97 114 32 97 110 110 111 116 91 49 48 93 59 125 115 97
+         102 97 112 105 59 115 116 114 117 99 116 32 83 65 70 95 86 101 114 115
+         105 111 110 73 110 102 111 123 105 110 116 32 118 109 97 106 111 114 59
+         105 110 116 32 118 109 105 110 111 114 59 105 110 116 32 114 101 108 59
+         99 104 97 114 32 97 110 110 111 116 91 49 48 93 59 125 115 97 102 108
+         105 98 59 115 116 114 117 99 116 32 83 65 70 95 86 101 114 115 105 111
+         110 73 110 102 111 123 105 110 116 32 118 109 97 106 111 114 59 105 110
+         116 32 118 109 105 110 111 114 59 105 110 116 32 114 101 108 59 99 104
+         97 114 32 97 110 110 111 116 91 49 48 93 59 125 118 98 116 59 115 116
+         114 117 99 116 32 83 65 70 95 86 101 114 115 105 111 110 73 110 102 111
+         123 105 110 116 32 118 109 97 106 111 114 59 105 110 116 32 118 109 105
+         110 111 114 59 105 110 116 32 114 101 108 59 99 104 97 114 32 97 110
+         110 111 116 91 49 48 93 59 125 100 115 108 59 115 116 114 117 99 116 32
+         83 65 70 95 86 101 114 115 105 111 110 73 110 102 111 123 105 110 116
+         32 118 109 97 106 111 114 59 105 110 116 32 118 109 105 110 111 114 59
+         105 110 116 32 114 101 108 59 99 104 97 114 32 97 110 110 111 116 91 49
+         48 93 59 125 104 100 102 53 59 115 116 114 117 99 116 32 83 65 70 95 86
+         101 114 115 105 111 110 73 110 102 111 123 105 110 116 32 118 109 97
+         106 111 114 59 105 110 116 32 118 109 105 110 111 114 59 105 110 116 32
+         114 101 108 59 99 104 97 114 32 97 110 110 111 116 91 49 48 93 59 125
+         109 112 105 59 105 110 116 32 68 111 84 111 99 59 105 110 116 32 82 101
+         97 100 79 110 108 121 59 105 110 116 32 67 108 111 98 98 101 114 59 105
+         110 116 32 79 83 77 111 100 101 115 59 125 59 10 47 115 115 114 101 108
+         45 95 48 48 48 48 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 115
+         115 114 101 108 45 95 48 48 48 49 32 68 65 84 65 83 69 84 32 105 110
+         116 59 10 47 115 115 114 101 108 45 95 48 48 48 50 32 68 65 84 65 83 69
+         84 32 105 110 116 59 10 47 115 115 114 101 108 45 95 48 48 48 51 32 68
+         65 84 65 83 69 84 32 105 110 116 59 10 47 115 115 114 101 108 45 95 48
+         48 48 52 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 115 115 114
+         101 108 45 95 48 48 48 53 32 68 65 84 65 83 69 84 32 105 110 116 59 10
+         47 115 115 114 101 108 45 95 48 48 48 54 32 68 65 84 65 83 69 84 32 105
+         110 116 59 10 47 115 115 114 101 108 45 95 48 48 48 55 32 68 65 84 65
+         83 69 84 32 105 110 116 59 10 47 115 115 114 101 108 45 95 48 48 48 56
+         32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 115 115 114 101 108 45
+         95 48 48 48 57 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 115 115
+         114 101 108 45 95 48 48 49 48 32 68 65 84 65 83 69 84 32 105 110 116 59
+         10 47 115 115 114 101 108 45 95 48 48 49 49 32 68 65 84 65 83 69 84 32
+         105 110 116 59 10 47 115 115 114 101 108 45 95 48 48 49 50 32 68 65 84
+         65 83 69 84 32 105 110 116 59 10 47 116 111 112 111 114 101 108 45 95
+         48 48 49 55 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 116 111 112
+         111 114 101 108 45 95 48 48 49 56 32 68 65 84 65 83 69 84 32 105 110
+         116 59 10 47 116 111 112 111 114 101 108 45 95 48 48 49 57 32 68 65 84
+         65 83 69 84 32 105 110 116 59 10 47 116 111 112 111 114 101 108 45 95
+         48 48 50 48 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 102 105 101
+         108 100 45 99 111 111 114 100 115 95 48 48 48 50 32 68 65 84 65 83 69
+         84 32 102 108 111 97 116 59 10 47 102 105 101 108 100 45 100 105 115
+         116 114 105 98 117 116 105 111 110 95 102 97 99 116 111 114 115 95 48
+         48 48 51 32 68 65 84 65 83 69 84 32 102 108 111 97 116 59 10 47 102 105
+         101 108 100 45 116 101 109 112 101 114 97 116 117 114 101 95 48 48 48
+         52 32 68 65 84 65 83 69 84 32 102 108 111 97 116 59 10 47 102 105 101
+         108 100 45 100 105 115 112 108 97 99 101 109 101 110 116 115 95 48 48
+         48 55 32 68 65 84 65 83 69 84 32 102 108 111 97 116 59 10 47 102 105
+         101 108 100 45 115 116 114 101 115 115 95 48 48 49 49 32 68 65 84 65 83
+         69 84 32 102 108 111 97 116 59 10 47 102 105 101 108 100 45 116 101 109
+         112 101 114 97 116 117 114 101 95 48 48 49 50 32 68 65 84 65 83 69 84
+         32 102 108 111 97 116 59 10 47 102 105 101 108 100 45 112 114 101 115
+         115 117 114 101 95 48 48 49 51 32 68 65 84 65 83 69 84 32 102 108 111
+         97 116 59 10 47 66 108 111 98 32 68 65 84 65 83 69 84 32 115 116 114
+         117 99 116 32 66 108 111 98 123 68 83 76 95 79 102 102 115 101 116 32
+         102 105 108 101 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 100
+         97 116 97 115 101 116 95 105 100 59 68 83 76 95 79 102 102 115 101 116
+         32 111 102 102 115 101 116 59 68 83 76 95 79 102 102 115 101 116 32 115
+         116 114 105 100 101 59 68 83 76 95 79 102 102 115 101 116 32 99 111 117
+         110 116 59 68 83 76 95 79 102 102 115 101 116 32 98 97 115 101 95 105
+         100 59 68 83 76 95 79 102 102 115 101 116 32 110 117 109 95 114 101 99
+         115 59 125 59 10 47 73 110 100 101 120 83 112 101 99 32 68 65 84 65 83
+         69 84 32 115 116 114 117 99 116 32 73 110 100 101 120 83 112 101 99 123
+         105 110 116 32 110 100 105 109 115 59 105 110 116 32 111 114 105 103
+         105 110 115 91 56 93 59 105 110 116 32 115 105 122 101 115 91 56 93 59
+         105 110 116 32 111 114 100 101 114 91 56 93 59 101 110 117 109 32 73
+         110 100 101 120 84 121 112 101 123 86 66 84 95 73 78 68 69 88 95 84 89
+         80 69 95 67 95 79 82 68 69 82 61 48 44 86 66 84 95 73 78 68 69 88 95 84
+         89 80 69 95 70 95 79 82 68 69 82 61 49 44 86 66 84 95 73 78 68 69 88 95
+         84 89 80 69 95 65 78 89 61 45 49 44 86 66 84 95 73 78 68 69 88 95 84 89
+         80 69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 95 73 78 68 69 88 95
+         84 89 80 69 95 78 65 61 45 51 44 86 66 84 95 73 78 68 69 88 95 84 89 80
+         69 95 85 78 75 78 79 87 78 61 45 52 125 105 110 100 101 120 95 116 121
+         112 101 59 68 83 76 95 79 102 102 115 101 116 32 98 97 115 101 95 105
+         100 59 68 83 76 95 79 102 102 115 101 116 32 110 117 109 95 114 101 99
+         115 59 125 59 10 47 67 97 116 32 68 65 84 65 83 69 84 32 115 116 114
+         117 99 116 32 67 97 116 123 99 104 97 114 32 110 97 109 101 91 54 52 93
+         59 101 110 117 109 32 82 111 108 101 123 86 66 84 95 82 79 76 69 95 84
+         79 80 79 61 48 44 86 66 84 95 82 79 76 69 95 66 78 68 61 49 44 86 66 84
+         95 82 79 76 69 95 80 82 79 67 61 50 44 86 66 84 95 82 79 76 69 95 68 79
+         77 78 61 51 44 86 66 84 95 82 79 76 69 95 66 76 79 67 75 61 52 44 86 66
+         84 95 82 79 76 69 95 65 83 83 89 61 53 44 86 66 84 95 82 79 76 69 95 77
+         65 84 61 54 44 86 66 84 95 82 79 76 69 95 88 80 82 79 68 61 55 44 86 66
+         84 95 82 79 76 69 95 85 83 69 82 68 61 56 44 86 66 84 95 82 79 76 69 95
+         65 78 89 61 45 49 44 86 66 84 95 82 79 76 69 95 73 78 86 65 76 73 68 61
+         45 50 44 86 66 84 95 82 79 76 69 95 78 65 61 45 51 44 86 66 84 95 82 79
+         76 69 95 85 78 75 78 79 87 78 61 45 52 125 114 111 108 101 59 105 110
+         116 32 116 100 105 109 59 68 83 76 95 79 102 102 115 101 116 32 98 97
+         115 101 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 110 117 109
+         95 114 101 99 115 59 125 59 10 47 83 101 116 32 68 65 84 65 83 69 84 32
+         115 116 114 117 99 116 32 83 101 116 123 105 110 116 32 117 115 101 114
+         95 105 100 59 99 104 97 114 32 110 97 109 101 91 54 52 93 59 105 110
+         116 32 116 100 105 109 59 101 110 117 109 32 83 105 108 82 111 108 101
+         123 86 66 84 95 83 82 79 76 69 95 84 73 77 69 61 48 44 86 66 84 95 83
+         82 79 76 69 95 83 80 65 67 69 61 49 44 86 66 84 95 83 82 79 76 69 95 83
+         84 65 84 69 61 50 44 86 66 84 95 83 82 79 76 69 95 80 65 82 65 77 61 51
+         44 86 66 84 95 83 82 79 76 69 95 67 84 89 80 69 61 52 44 86 66 84 95 83
+         82 79 76 69 95 65 84 89 80 69 61 53 44 86 66 84 95 83 82 79 76 69 95 85
+         83 69 82 68 61 54 44 86 66 84 95 83 82 79 76 69 95 65 78 89 61 45 49 44
+         86 66 84 95 83 82 79 76 69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84
+         95 83 82 79 76 69 95 78 65 61 45 51 44 86 66 84 95 83 82 79 76 69 95 85
+         78 75 78 79 87 78 61 45 52 125 115 114 111 108 101 59 68 83 76 95 79
+         102 102 115 101 116 32 99 111 108 108 95 105 100 115 91 49 54 93 59 105
+         110 116 32 105 115 95 116 111 112 59 105 110 116 32 105 115 95 101 120
+         116 101 110 100 105 98 108 101 59 68 83 76 95 79 102 102 115 101 116 32
+         100 102 108 116 95 99 111 111 114 100 102 108 100 95 105 100 59 68 83
+         76 95 79 102 102 115 101 116 32 98 110 100 95 115 101 116 95 105 100 59
+         68 83 76 95 79 102 102 115 101 116 32 98 97 115 101 95 105 100 59 68 83
+         76 95 79 102 102 115 101 116 32 110 117 109 95 114 101 99 115 59 125 59
+         10 47 67 111 108 108 101 99 116 105 111 110 32 68 65 84 65 83 69 84 32
+         115 116 114 117 99 116 32 67 111 108 108 101 99 116 105 111 110 123 68
+         83 76 95 79 102 102 115 101 116 32 99 111 110 116 97 105 110 105 110
+         103 95 115 101 116 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32
+         99 97 116 95 105 100 59 101 110 117 109 32 67 101 108 108 84 121 112
+         101 123 86 66 84 95 67 69 76 76 95 84 89 80 69 95 78 79 78 69 61 48 44
+         86 66 84 95 67 69 76 76 95 84 89 80 69 95 80 79 73 78 84 61 49 44 86 66
+         84 95 67 69 76 76 95 84 89 80 69 95 76 73 78 69 61 50 44 86 66 84 95 67
+         69 76 76 95 84 89 80 69 95 84 82 73 61 51 44 86 66 84 95 67 69 76 76 95
+         84 89 80 69 95 81 85 65 68 61 52 44 86 66 84 95 67 69 76 76 95 84 89 80
+         69 95 84 69 84 61 53 44 86 66 84 95 67 69 76 76 95 84 89 80 69 95 80 89
+         82 65 77 73 68 61 54 44 86 66 84 95 67 69 76 76 95 84 89 80 69 95 80 82
+         73 83 77 61 55 44 86 66 84 95 67 69 76 76 95 84 89 80 69 95 72 69 88 61
+         56 44 86 66 84 95 67 69 76 76 95 84 89 80 69 95 77 73 88 69 68 61 57 44
+         86 66 84 95 67 69 76 76 95 84 89 80 69 95 65 82 66 61 49 48 44 86 66 84
+         95 67 69 76 76 95 84 89 80 69 95 49 66 65 76 76 61 49 49 44 86 66 84 95
+         67 69 76 76 95 84 89 80 69 95 50 66 65 76 76 61 49 50 44 86 66 84 95 67
+         69 76 76 95 84 89 80 69 95 51 66 65 76 76 61 49 51 44 86 66 84 95 67 69
+         76 76 95 84 89 80 69 95 49 83 72 69 76 76 61 49 52 44 86 66 84 95 67 69
+         76 76 95 84 89 80 69 95 50 83 72 69 76 76 61 49 53 44 86 66 84 95 67 69
+         76 76 95 84 89 80 69 95 65 78 89 61 45 49 44 86 66 84 95 67 69 76 76 95
+         84 89 80 69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 95 67 69 76 76
+         95 84 89 80 69 95 78 65 61 45 51 44 86 66 84 95 67 69 76 76 95 84 89 80
+         69 95 85 78 75 78 79 87 78 61 45 52 125 99 101 108 108 95 116 121 112
+         101 59 105 110 116 32 99 111 117 110 116 59 68 83 76 95 79 102 102 115
+         101 116 32 105 110 100 101 120 105 110 103 95 105 100 59 105 110 116 32
+         105 115 95 100 101 99 111 109 112 59 68 83 76 95 79 102 102 115 101 116
+         32 109 101 109 98 101 114 115 95 98 108 111 98 95 105 100 59 68 83 76
+         95 79 102 102 115 101 116 32 98 97 115 101 95 105 100 59 68 83 76 95 79
+         102 102 115 101 116 32 110 117 109 95 114 101 99 115 59 125 59 10 47 82
+         101 108 97 116 105 111 110 32 68 65 84 65 83 69 84 32 115 116 114 117
+         99 116 32 82 101 108 97 116 105 111 110 123 68 83 76 95 79 102 102 115
+         101 116 32 115 117 98 95 105 100 59 68 83 76 95 79 102 102 115 101 116
+         32 115 117 98 95 99 97 116 95 105 100 59 68 83 76 95 79 102 102 115 101
+         116 32 115 117 98 95 100 101 99 111 109 112 95 99 97 116 95 105 100 59
+         68 83 76 95 79 102 102 115 101 116 32 115 117 112 95 105 100 59 68 83
+         76 95 79 102 102 115 101 116 32 115 117 112 95 99 97 116 95 105 100 59
+         68 83 76 95 79 102 102 115 101 116 32 115 117 112 95 100 101 99 111 109
+         112 95 99 97 116 95 105 100 59 101 110 117 109 32 82 101 108 75 105 110
+         100 123 86 66 84 95 82 69 76 75 73 78 68 95 83 85 66 83 69 84 61 48 44
+         86 66 84 95 82 69 76 75 73 78 68 95 83 85 80 83 69 84 61 49 44 86 66 84
+         95 82 69 76 75 73 78 68 95 66 79 85 78 68 61 50 44 86 66 84 95 82 69 76
+         75 73 78 68 95 80 69 82 77 85 84 69 61 51 44 86 66 84 95 82 69 76 75 73
+         78 68 95 78 69 73 71 72 66 79 82 61 52 44 86 66 84 95 82 69 76 75 73 78
+         68 95 67 79 80 89 61 53 44 86 66 84 95 82 69 76 75 73 78 68 95 69 81 85
+         65 76 61 54 44 86 66 84 95 82 69 76 75 73 78 68 95 65 78 89 61 45 49 44
+         86 66 84 95 82 69 76 75 73 78 68 95 73 78 86 65 76 73 68 61 45 50 44 86
+         66 84 95 82 69 76 75 73 78 68 95 78 65 61 45 51 44 86 66 84 95 82 69 76
+         75 73 78 68 95 85 78 75 78 79 87 78 61 45 52 125 107 105 110 100 59 101
+         110 117 109 32 82 101 108 82 101 112 123 86 66 84 95 82 69 76 82 69 80
+         95 73 68 69 78 84 73 84 89 61 48 44 86 66 84 95 82 69 76 82 69 80 95 72
+         76 73 83 84 61 49 44 86 66 84 95 82 69 76 82 69 80 95 84 76 73 83 84 61
+         50 44 86 66 84 95 82 69 76 82 69 80 95 84 76 73 83 84 95 49 61 51 44 86
+         66 84 95 82 69 76 82 69 80 95 69 76 73 83 84 61 52 44 86 66 84 95 82 69
+         76 82 69 80 95 83 84 82 85 67 84 85 82 69 68 61 53 44 86 66 84 95 82 69
+         76 82 69 80 95 85 78 83 84 82 85 67 84 85 82 69 68 61 54 44 86 66 84 95
+         82 69 76 82 69 80 95 65 82 66 73 84 82 65 82 89 95 82 61 55 44 86 66 84
+         95 82 69 76 82 69 80 95 65 82 66 73 84 82 65 82 89 95 68 82 61 56 44 86
+         66 84 95 82 69 76 82 69 80 95 65 78 89 61 45 49 44 86 66 84 95 82 69 76
+         82 69 80 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 95 82 69 76 82 69
+         80 95 78 65 61 45 51 44 86 66 84 95 82 69 76 82 69 80 95 85 78 75 78 79
+         87 78 61 45 52 125 114 101 112 95 116 121 112 101 59 68 83 76 95 79 102
+         102 115 101 116 32 100 95 98 108 111 98 95 105 100 59 68 83 76 95 79
+         102 102 115 101 116 32 114 95 98 108 111 98 95 105 100 59 68 83 76 95
+         79 102 102 115 101 116 32 98 97 115 101 95 105 100 59 68 83 76 95 79
+         102 102 115 101 116 32 110 117 109 95 114 101 99 115 59 125 59 10 47 70
+         105 101 108 100 84 109 112 108 32 68 65 84 65 83 69 84 32 115 116 114
+         117 99 116 32 70 105 101 108 100 84 109 112 108 123 99 104 97 114 32
+         110 97 109 101 91 54 52 93 59 68 83 76 95 79 102 102 115 101 116 32 98
+         97 115 101 95 115 112 97 99 101 95 105 100 59 101 110 117 109 32 65 108
+         103 101 98 114 97 105 99 84 121 112 101 123 86 66 84 95 65 76 71 69 66
+         82 65 73 67 95 84 89 80 69 95 67 79 78 83 84 65 78 84 61 48 44 86 66 84
+         95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 67 79 77 80 79 78 69 78
+         84 61 49 44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 83
+         67 65 76 65 82 61 50 44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89
+         80 69 95 86 69 67 84 79 82 61 51 44 86 66 84 95 65 76 71 69 66 82 65 73
+         67 95 84 89 80 69 95 84 69 78 83 79 82 61 52 44 86 66 84 95 65 76 71 69
+         66 82 65 73 67 95 84 89 80 69 95 83 89 77 95 84 69 78 83 79 82 61 53 44
+         86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 70 73 69 76 68
+         61 54 44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 83 84
+         65 84 69 61 55 44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89 80 69
+         95 84 85 80 76 69 61 56 44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84
+         89 80 69 95 65 78 89 61 45 49 44 86 66 84 95 65 76 71 69 66 82 65 73 67
+         95 84 89 80 69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 95 65 76 71
+         69 66 82 65 73 67 95 84 89 80 69 95 78 65 61 45 51 44 86 66 84 95 65 76
+         71 69 66 82 65 73 67 95 84 89 80 69 95 85 78 75 78 79 87 78 61 45 52
+         125 97 108 103 95 116 121 112 101 59 101 110 117 109 32 66 97 115 105
+         115 84 121 112 101 123 86 66 84 95 66 65 83 73 83 95 84 89 80 69 95 85
+         78 73 84 89 61 48 44 86 66 84 95 66 65 83 73 83 95 84 89 80 69 95 67 65
+         82 84 69 83 73 65 78 61 49 44 86 66 84 95 66 65 83 73 83 95 84 89 80 69
+         95 83 80 72 69 82 73 67 65 76 61 50 44 86 66 84 95 66 65 83 73 83 95 84
+         89 80 69 95 67 89 76 73 78 68 82 73 67 65 76 61 51 44 86 66 84 95 66 65
+         83 73 83 95 84 89 80 69 95 85 80 80 69 82 95 84 82 73 61 52 44 86 66 84
+         95 66 65 83 73 83 95 84 89 80 69 95 70 79 85 82 73 69 82 61 53 44 86 66
+         84 95 66 65 83 73 83 95 84 89 80 69 95 86 65 82 73 65 66 76 69 61 54 44
+         86 66 84 95 66 65 83 73 83 95 84 89 80 69 95 65 78 89 61 45 49 44 86 66
+         84 95 66 65 83 73 83 95 84 89 80 69 95 73 78 86 65 76 73 68 61 45 50 44
+         86 66 84 95 66 65 83 73 83 95 84 89 80 69 95 78 65 61 45 51 44 86 66 84
+         95 66 65 83 73 83 95 84 89 80 69 95 85 78 75 78 79 87 78 61 45 52 125
+         98 97 115 105 115 59 68 83 76 95 79 102 102 115 101 116 32 113 117 97
+         110 116 105 116 121 95 105 100 59 105 110 116 32 110 117 109 95 99 111
+         109 112 115 59 68 83 76 95 79 102 102 115 101 116 32 102 116 109 112
+         108 95 105 100 115 95 98 108 111 98 95 105 100 59 68 83 76 95 79 102
+         102 115 101 116 32 98 97 115 101 95 105 100 59 68 83 76 95 79 102 102
+         115 101 116 32 110 117 109 95 114 101 99 115 59 125 59 10 47 70 105 101
+         108 100 32 68 65 84 65 83 69 84 32 115 116 114 117 99 116 32 70 105 101
+         108 100 123 68 83 76 95 79 102 102 115 101 116 32 102 116 109 112 108
+         95 105 100 59 99 104 97 114 32 110 97 109 101 91 54 52 93 59 68 83 76
+         95 79 102 102 115 101 116 32 117 110 105 116 115 95 105 100 59 68 83 76
+         95 79 102 102 115 101 116 32 115 116 111 114 97 103 101 95 100 101 99
+         111 109 112 95 99 97 116 95 105 100 59 101 110 117 109 32 73 110 116
+         101 114 108 101 97 118 101 123 86 66 84 95 73 78 84 69 82 76 69 65 86
+         69 95 67 79 77 80 79 78 69 78 84 61 48 44 86 66 84 95 73 78 84 69 82 76
+         69 65 86 69 95 86 69 67 84 79 82 61 49 44 86 66 84 95 73 78 84 69 82 76
+         69 65 86 69 95 73 78 68 69 80 69 78 68 69 78 84 61 50 44 86 66 84 95 73
+         78 84 69 82 76 69 65 86 69 95 78 79 78 69 61 51 44 86 66 84 95 73 78 84
+         69 82 76 69 65 86 69 95 65 78 89 61 45 49 44 86 66 84 95 73 78 84 69 82
+         76 69 65 86 69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 95 73 78 84
+         69 82 76 69 65 86 69 95 78 65 61 45 51 44 86 66 84 95 73 78 84 69 82 76
+         69 65 86 69 95 85 78 75 78 79 87 78 61 45 52 125 99 111 109 112 95 105
+         110 116 108 118 59 68 83 76 95 79 102 102 115 101 116 32 105 110 100
+         101 120 105 110 103 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32
+         100 111 102 95 97 115 115 111 99 95 99 97 116 95 105 100 59 105 110 116
+         32 97 115 115 111 99 95 114 97 116 105 111 59 68 83 76 95 79 102 102
+         115 101 116 32 101 118 97 108 95 100 101 99 111 109 112 95 99 97 116 95
+         105 100 59 101 110 117 109 32 69 118 97 108 70 117 110 99 123 86 66 84
+         95 69 86 65 76 95 70 85 78 67 95 67 79 78 83 84 65 78 84 61 48 44 86 66
+         84 95 69 86 65 76 95 70 85 78 67 95 85 78 73 70 79 82 77 61 49 44 86 66
+         84 95 69 86 65 76 95 70 85 78 67 95 80 87 67 79 78 83 84 61 50 44 86 66
+         84 95 69 86 65 76 95 70 85 78 67 95 80 87 76 73 78 69 65 82 61 51 44 86
+         66 84 95 69 86 65 76 95 70 85 78 67 95 65 78 89 61 45 49 44 86 66 84 95
+         69 86 65 76 95 70 85 78 67 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84
+         95 69 86 65 76 95 70 85 78 67 95 78 65 61 45 51 44 86 66 84 95 69 86 65
+         76 95 70 85 78 67 95 85 78 75 78 79 87 78 61 45 52 125 101 118 97 108
+         95 102 117 110 99 59 105 110 116 32 105 115 95 104 111 109 111 103 101
+         110 101 111 117 115 59 105 110 116 32 105 115 95 99 111 111 114 100 95
+         102 105 101 108 100 59 68 83 76 95 79 102 102 115 101 116 32 99 111 109
+         112 95 105 100 115 95 98 108 111 98 95 105 100 59 68 83 76 95 79 102
+         102 115 101 116 32 99 111 109 112 95 111 114 100 101 114 95 98 108 111
+         98 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 118 98 97 115
+         105 115 95 98 108 111 98 95 105 100 59 68 83 76 95 79 102 102 115 101
+         116 32 100 111 102 95 98 108 111 98 95 105 100 59 68 83 76 95 79 102
+         102 115 101 116 32 98 97 115 101 95 105 100 59 68 83 76 95 79 102 102
+         115 101 116 32 110 117 109 95 114 101 99 115 59 125 59 10 47 109 101
+         116 97 98 108 111 98 48 48 48 48 48 46 105 110 100 101 120 32 68 65 84
+         65 83 69 84 32 115 116 114 117 99 116 32 73 110 100 101 120 80 97 105
+         114 123 68 83 76 95 79 102 102 115 101 116 32 105 110 100 101 120 59
+         105 110 116 32 108 101 110 103 116 104 59 125 59 10 47 109 101 116 97
+         98 108 111 98 48 48 48 48 48 46 98 108 111 98 32 68 65 84 65 83 69 84
+         32 68 83 76 95 79 102 102 115 101 116 59 10
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
@@ -388,11 +381,11 @@ Expected output for 'h5dump --xml tsaf.h5'
    <!-- Note: format of compound data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-         -1 1 0 1 9 0 1 -1 2 0 1 4 1 1 -1 3 0 1 7 2 1 -1 4 0 1 4 3 1 
-         -1 5 0 1 5 4 1 -1 6 0 1 3 5 1 -1 7 0 1 4 6 1 -1 8 0 1 1 7 1 
-         -1 9 0 1 10 8 1 -1 10 0 1 4 9 1 -1 11 0 1 3 10 1 -1 12 0 1 5 11 1 
-         -1 13 0 1 5 12 1 -1 14 0 1 16 13 1 -1 15 0 1 9 14 1 -1 16 0 1 4 15 1 
-         -1 17 0 1 16 16 1 -1 18 0 1 36 17 1 -1 19 0 1 5 18 1 -1 20 0 1 5 19 1 
+         -1 1 0 1 9 0 1 -1 2 0 1 4 1 1 -1 3 0 1 7 2 1 -1 4 0 1 4 3 1
+         -1 5 0 1 5 4 1 -1 6 0 1 3 5 1 -1 7 0 1 4 6 1 -1 8 0 1 1 7 1
+         -1 9 0 1 10 8 1 -1 10 0 1 4 9 1 -1 11 0 1 3 10 1 -1 12 0 1 5 11 1
+         -1 13 0 1 5 12 1 -1 14 0 1 16 13 1 -1 15 0 1 9 14 1 -1 16 0 1 4 15 1
+         -1 17 0 1 16 16 1 -1 18 0 1 36 17 1 -1 19 0 1 5 18 1 -1 20 0 1 5 19 1
          -1 21 0 1 36 20 1 -1 22 0 1 12 21 1 -1 23 0 1 7 22 1 -1 24 0 1 2 23 1
          </hdf5:DataFromFile>
       </hdf5:Data>
@@ -541,7 +534,7 @@ Expected output for 'h5dump --xml tsaf.h5'
    <!-- Note: format of compound data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-         "nodes" TOPO 0 0 1 "elems" TOPO 2 1 1 "edges" USERD 1 2 1 
+         "nodes" TOPO 0 0 1 "elems" TOPO 2 1 1 "edges" USERD 1 2 1
          "blocks" BLOCK 2 3 1 "side_sets" USERD 1 4 1
          </hdf5:DataFromFile>
       </hdf5:Data>
@@ -760,15 +753,15 @@ Expected output for 'h5dump --xml tsaf.h5'
    <!-- Note: format of compound data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0 0 POINT 18 0 0 -2 0 1 0 1 MIXED 12 1 1 -2 1 1 0 3 NONE 4 2 1 0 2 1 
-         0 4 NONE 2 3 0 1 3 1 1 0 POINT 9 4 0 -2 4 1 1 1 QUAD 4 5 1 -2 5 1 
-         1 3 NONE 1 6 1 2 6 1 2 0 POINT 7 7 0 -2 7 1 2 1 MIXED 4 8 1 -2 8 1 
-         2 3 NONE 2 9 1 3 9 1 3 0 POINT 10 10 0 -2 10 1 3 1 QUAD 4 11 1 -2 11 1 
-         3 3 NONE 1 12 1 4 12 1 4 0 POINT 3 13 0 -2 13 1 
-         4 2 LINE 2 14 1 -2 14 1 5 0 POINT 5 15 0 -2 15 1 
-         5 2 LINE 4 16 1 -2 16 1 6 0 POINT 5 17 1 -2 17 1 
-         7 0 POINT 5 18 0 -2 18 1 7 1 TRI 3 19 1 -2 19 1 7 3 NONE 1 20 1 5 20 1 
-         8 0 POINT 4 21 0 -2 21 1 8 1 QUAD 1 22 1 -2 22 1 8 3 NONE 1 23 1 6 23 1
+         0 0 POINT 18 0 0 -2 0 1 0 1 MIXED 12 1 1 -2 1 1 0 3 NONE 4 2 1 0 2 1
+         0 4 NONE 2 3 0 1 3 1 1 0 POINT 9 4 0 -2 4 1 1 1 QUAD 4 5 1 -2 5 1
+         1 3 NONE 1 6 1 2 6 1 2 0 POINT 7 7 0 -2 7 1 2 1 MIXED 4 8 1 -2 8 1
+         2 3 NONE 2 9 1 3 9 1 3 0 POINT 10 10 0 -2 10 1 3 1 QUAD 4 11 1 -2 11 1
+         3 3 NONE 1 12 1 4 12 1 4 0 POINT 3 13 0 -2 13 1 4 2 LINE 2 14 1 -2 14 1
+         5 0 POINT 5 15 0 -2 15 1 5 2 LINE 4 16 1 -2 16 1
+         6 0 POINT 5 17 1 -2 17 1 7 0 POINT 5 18 0 -2 18 1
+         7 1 TRI 3 19 1 -2 19 1 7 3 NONE 1 20 1 5 20 1 8 0 POINT 4 21 0 -2 21 1
+         8 1 QUAD 1 22 1 -2 22 1 8 3 NONE 1 23 1 6 23 1
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
@@ -1031,19 +1024,19 @@ Expected output for 'h5dump --xml tsaf.h5'
    <!-- Note: format of compound data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-         1 "X" -7 -2 NONE -2 0 1 0 PWLINEAR 1 0 -2 -2 -2 -2 0 1 
-         1 "Y" -7 -2 NONE -2 0 1 0 PWLINEAR 1 0 -2 -2 -2 -2 1 1 
-         0 "coords" -7 -2 VECTOR -2 0 1 0 PWLINEAR 1 1 7 -2 -2 17 2 1 
-         2 "distribution factors" -5 -2 NONE -2 0 1 0 PWLINEAR 1 0 -2 -2 -2 18 3 1 
-         3 "temperature" -7 -2 NONE -2 0 1 0 PWLINEAR 1 0 -2 -2 -2 19 4 1 
-         1 "dX" -7 -2 NONE -2 0 1 0 PWLINEAR 1 0 -2 -2 -2 -2 5 1 
-         1 "dY" -7 -2 NONE -2 0 1 0 PWLINEAR 1 0 -2 -2 -2 -2 6 1 
-         0 "displacements" -7 -2 VECTOR -2 0 1 0 PWLINEAR 1 0 8 -2 -2 20 7 1 
-         5 "Sx" -7 -2 NONE -2 1 1 1 PWCONST 1 0 -2 -2 -2 -2 8 1 
-         5 "Sy" -7 -2 NONE -2 1 1 1 PWCONST 1 0 -2 -2 -2 -2 9 1 
-         5 "Sxy" -7 -2 NONE -2 1 1 1 PWCONST 1 0 -2 -2 -2 -2 10 1 
-         4 "stress" -7 -2 VECTOR -2 1 1 1 PWCONST 1 0 9 -2 -2 21 11 1 
-         6 "temperature" -7 -2 NONE -2 0 1 0 PWLINEAR 1 0 -2 -2 -2 22 12 1 
+         1 "X" -7 -2 NONE -2 0 1 0 PWLINEAR 1 0 -2 -2 -2 -2 0 1
+         1 "Y" -7 -2 NONE -2 0 1 0 PWLINEAR 1 0 -2 -2 -2 -2 1 1
+         0 "coords" -7 -2 VECTOR -2 0 1 0 PWLINEAR 1 1 7 -2 -2 17 2 1
+         2 "distribution factors" -5 -2 NONE -2 0 1 0 PWLINEAR 1 0 -2 -2 -2 18 3 1
+         3 "temperature" -7 -2 NONE -2 0 1 0 PWLINEAR 1 0 -2 -2 -2 19 4 1
+         1 "dX" -7 -2 NONE -2 0 1 0 PWLINEAR 1 0 -2 -2 -2 -2 5 1
+         1 "dY" -7 -2 NONE -2 0 1 0 PWLINEAR 1 0 -2 -2 -2 -2 6 1
+         0 "displacements" -7 -2 VECTOR -2 0 1 0 PWLINEAR 1 0 8 -2 -2 20 7 1
+         5 "Sx" -7 -2 NONE -2 1 1 1 PWCONST 1 0 -2 -2 -2 -2 8 1
+         5 "Sy" -7 -2 NONE -2 1 1 1 PWCONST 1 0 -2 -2 -2 -2 9 1
+         5 "Sxy" -7 -2 NONE -2 1 1 1 PWCONST 1 0 -2 -2 -2 -2 10 1
+         4 "stress" -7 -2 VECTOR -2 1 1 1 PWCONST 1 0 9 -2 -2 21 11 1
+         6 "temperature" -7 -2 NONE -2 0 1 0 PWLINEAR 1 0 -2 -2 -2 22 12 1
          7 "pressure" -7 -2 NONE -2 2 1 2 PWCONST 1 0 -2 -2 -2 23 13 1
          </hdf5:DataFromFile>
       </hdf5:Data>
@@ -1292,13 +1285,13 @@ Expected output for 'h5dump --xml tsaf.h5'
    <!-- Note: format of compound data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-         "coordinate_tmpl" 0 VECTOR CARTESIAN 2 2 0 0 1 
-         "coordinate_tmpl_component" 0 SCALAR CARTESIAN 2 1 0 1 1 
-         "distrib_factors_tmpl" 5 SCALAR UNITY -5 1 0 2 1 
-         "temp_on_ns1_tmpl" 6 SCALAR UNITY 0 1 0 3 1 
-         "stress_on_cell_1_tmpl" 1 SYM_TENSOR UPPER_TRI 0 3 0 4 1 
-         "stress_on_cell_1_tmpl_component" 1 SCALAR UPPER_TRI 0 1 0 5 1 
-         "temp_on_cell_2_tmpl" 2 SCALAR UNITY 1 1 0 6 1 
+         "coordinate_tmpl" 0 VECTOR CARTESIAN 2 2 0 0 1
+         "coordinate_tmpl_component" 0 SCALAR CARTESIAN 2 1 0 1 1
+         "distrib_factors_tmpl" 5 SCALAR UNITY -5 1 0 2 1
+         "temp_on_ns1_tmpl" 6 SCALAR UNITY 0 1 0 3 1
+         "stress_on_cell_1_tmpl" 1 SYM_TENSOR UPPER_TRI 0 3 0 4 1
+         "stress_on_cell_1_tmpl_component" 1 SCALAR UPPER_TRI 0 1 0 5 1
+         "temp_on_cell_2_tmpl" 2 SCALAR UNITY 1 1 0 6 1
          "pressure_on_ss1" 4 SCALAR UNITY 0 1 0 7 1
          </hdf5:DataFromFile>
       </hdf5:Data>
@@ -1452,30 +1445,30 @@ Expected output for 'h5dump --xml tsaf.h5'
    <!-- Note: format of compound data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-         1  0 0 0 0 0 0 0 0   18 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 0 1 
-         1  0 0 0 0 0 0 0 0   12 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 1 1 
-         1  0 0 0 0 0 0 0 0   4 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 2 1 
-         1  0 0 0 0 0 0 0 0   2 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 3 1 
-         1  0 0 0 0 0 0 0 0   9 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 4 1 
-         1  0 0 0 0 0 0 0 0   4 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 5 1 
-         1  0 0 0 0 0 0 0 0   1 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 6 1 
-         1  0 0 0 0 0 0 0 0   7 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 7 1 
-         1  0 0 0 0 0 0 0 0   4 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 8 1 
-         1  0 0 0 0 0 0 0 0   2 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 9 1 
-         1  0 0 0 0 0 0 0 0   10 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 10 1 
-         1  0 0 0 0 0 0 0 0   4 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 11 1 
-         1  0 0 0 0 0 0 0 0   1 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 12 1 
-         1  0 0 0 0 0 0 0 0   3 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 13 1 
-         1  0 0 0 0 0 0 0 0   2 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 14 1 
-         1  0 0 0 0 0 0 0 0   5 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 15 1 
-         1  0 0 0 0 0 0 0 0   4 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 16 1 
-         1  0 0 0 0 0 0 0 0   5 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 17 1 
-         1  0 0 0 0 0 0 0 0   5 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 18 1 
-         1  0 0 0 0 0 0 0 0   3 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 19 1 
-         1  0 0 0 0 0 0 0 0   1 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 20 1 
-         1  0 0 0 0 0 0 0 0   4 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 21 1 
-         1  0 0 0 0 0 0 0 0   1 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 22 1 
-         1  0 0 0 0 0 0 0 0   1 0 0 0 0 0 0 0   0 0 0 0 0 0 0 0  C_ORDER 23 1
+         1  0 0 0 0 0 0 0 0  18 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 0 1
+         1  0 0 0 0 0 0 0 0  12 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 1 1
+         1  0 0 0 0 0 0 0 0  4 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 2 1
+         1  0 0 0 0 0 0 0 0  2 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 3 1
+         1  0 0 0 0 0 0 0 0  9 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 4 1
+         1  0 0 0 0 0 0 0 0  4 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 5 1
+         1  0 0 0 0 0 0 0 0  1 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 6 1
+         1  0 0 0 0 0 0 0 0  7 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 7 1
+         1  0 0 0 0 0 0 0 0  4 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 8 1
+         1  0 0 0 0 0 0 0 0  2 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 9 1
+         1  0 0 0 0 0 0 0 0  10 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 10 1
+         1  0 0 0 0 0 0 0 0  4 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 11 1
+         1  0 0 0 0 0 0 0 0  1 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 12 1
+         1  0 0 0 0 0 0 0 0  3 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 13 1
+         1  0 0 0 0 0 0 0 0  2 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 14 1
+         1  0 0 0 0 0 0 0 0  5 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 15 1
+         1  0 0 0 0 0 0 0 0  4 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 16 1
+         1  0 0 0 0 0 0 0 0  5 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 17 1
+         1  0 0 0 0 0 0 0 0  5 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 18 1
+         1  0 0 0 0 0 0 0 0  3 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 19 1
+         1  0 0 0 0 0 0 0 0  1 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 20 1
+         1  0 0 0 0 0 0 0 0  4 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 21 1
+         1  0 0 0 0 0 0 0 0  1 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 22 1
+         1  0 0 0 0 0 0 0 0  1 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 C_ORDER 23 1
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
@@ -1744,21 +1737,21 @@ Expected output for 'h5dump --xml tsaf.h5'
    <!-- Note: format of compound data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-         1 0 -2 0 0 -2 EQUAL TLIST -2 0 0 1 1 1 -2 0 1 -2 EQUAL TLIST -2 1 1 1 
-         2 0 -2 0 0 -2 EQUAL TLIST -2 2 2 1 2 1 -2 0 1 -2 EQUAL TLIST -2 3 3 1 
-         7 0 -2 0 0 -2 EQUAL TLIST -2 4 4 1 7 1 -2 0 1 -2 EQUAL TLIST -2 5 5 1 
-         8 0 -2 0 0 -2 EQUAL TLIST -2 6 6 1 8 1 -2 0 1 -2 EQUAL TLIST -2 7 7 1 
-         3 0 -2 0 0 -2 EQUAL TLIST -2 8 8 1 3 1 -2 0 1 -2 EQUAL TLIST -2 9 9 1 
-         4 0 -2 0 0 -2 EQUAL TLIST -2 10 10 1 
-         5 0 -2 0 0 -2 EQUAL TLIST -2 11 11 1 
-         6 0 -2 0 0 -2 EQUAL TLIST -2 12 12 1 
-         1 3 -2 0 3 -2 EQUAL TLIST -2 -2 13 1 
-         7 3 -2 0 3 -2 EQUAL TLIST -2 -2 14 1 
-         8 3 -2 0 3 -2 EQUAL TLIST -2 -2 15 1 
-         3 3 -2 0 3 -2 EQUAL TLIST -2 -2 16 1 
-         1 1 -2 0 0 -2 SUBSET UNSTRUCTURED -2 13 17 1 
-         7 1 -2 0 0 -2 SUBSET UNSTRUCTURED -2 14 18 1 
-         8 1 -2 0 0 -2 SUBSET UNSTRUCTURED -2 15 19 1 
+         1 0 -2 0 0 -2 EQUAL TLIST -2 0 0 1 1 1 -2 0 1 -2 EQUAL TLIST -2 1 1 1
+         2 0 -2 0 0 -2 EQUAL TLIST -2 2 2 1 2 1 -2 0 1 -2 EQUAL TLIST -2 3 3 1
+         7 0 -2 0 0 -2 EQUAL TLIST -2 4 4 1 7 1 -2 0 1 -2 EQUAL TLIST -2 5 5 1
+         8 0 -2 0 0 -2 EQUAL TLIST -2 6 6 1 8 1 -2 0 1 -2 EQUAL TLIST -2 7 7 1
+         3 0 -2 0 0 -2 EQUAL TLIST -2 8 8 1 3 1 -2 0 1 -2 EQUAL TLIST -2 9 9 1
+         4 0 -2 0 0 -2 EQUAL TLIST -2 10 10 1
+         5 0 -2 0 0 -2 EQUAL TLIST -2 11 11 1
+         6 0 -2 0 0 -2 EQUAL TLIST -2 12 12 1
+         1 3 -2 0 3 -2 EQUAL TLIST -2 -2 13 1
+         7 3 -2 0 3 -2 EQUAL TLIST -2 -2 14 1
+         8 3 -2 0 3 -2 EQUAL TLIST -2 -2 15 1
+         3 3 -2 0 3 -2 EQUAL TLIST -2 -2 16 1
+         1 1 -2 0 0 -2 SUBSET UNSTRUCTURED -2 13 17 1
+         7 1 -2 0 0 -2 SUBSET UNSTRUCTURED -2 14 18 1
+         8 1 -2 0 0 -2 SUBSET UNSTRUCTURED -2 15 19 1
          3 1 -2 0 0 -2 SUBSET UNSTRUCTURED -2 16 20 1
          </hdf5:DataFromFile>
       </hdf5:Data>
@@ -1948,15 +1941,15 @@ Expected output for 'h5dump --xml tsaf.h5'
    <!-- Note: format of compound data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0 "TOP_CELL" 2 SPACE  0 1 -2 2 3 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2  1 0 -2 -2 0 1 
-         0 "CELL_1" 2 SPACE  4 5 -2 6 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2  0 0 -2 -2 1 1 
-         0 "CELL_2" 2 SPACE  7 8 -2 9 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2  0 0 -2 -2 2 1 
-         0 "CELL_3" 2 SPACE  10 11 -2 12 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2  0 0 -2 -2 3 1 
-         0 "SIDE_SET_1" 1 SPACE  13 -2 14 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2  0 0 -2 -2 4 1 
-         0 "SIDE_SET_2" 1 SPACE  15 -2 16 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2  0 0 -2 -2 5 1 
-         0 "NODE_SET_1" 0 SPACE  17 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2  0 0 -2 -2 6 1 
-         0 "CELL_2_TRIS" 2 SPACE  18 19 -2 20 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2  0 0 -2 -2 7 1 
-         0 "CELL_2_QUADS" 2 SPACE  21 22 -2 23 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2  0 0 -2 -2 8 1
+         0 "TOP_CELL" 2 SPACE  0 1 -2 2 3 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 1 0 -2 -2 0 1
+         0 "CELL_1" 2 SPACE  4 5 -2 6 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 1 1
+         0 "CELL_2" 2 SPACE  7 8 -2 9 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 2 1
+         0 "CELL_3" 2 SPACE  10 11 -2 12 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 3 1
+         0 "SIDE_SET_1" 1 SPACE  13 -2 14 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 4 1
+         0 "SIDE_SET_2" 1 SPACE  15 -2 16 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 5 1
+         0 "NODE_SET_1" 0 SPACE  17 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 6 1
+         0 "CELL_2_TRIS" 2 SPACE  18 19 -2 20 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 7 1
+         0 "CELL_2_QUADS" 2 SPACE  21 22 -2 23 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 8 1
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
@@ -1981,8 +1974,8 @@ Expected output for 'h5dump --xml tsaf.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0 4 1 4 2 4 2.5 4 0 3 1 3 2 3 2.5 3 0 2 1 2 2 2 2.5 2 0 1 2 1 2.5 1 0 
-         0 2 0 2.5 0
+         0 4 1 4 2 4 2.5 4 0 3 1 3 2 3 2.5 3 0 2 1 2 2 2 2.5 2 0 1 2 1 2.5 1 0 0
+         2 0 2.5 0
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
@@ -2007,8 +2000,8 @@ Expected output for 'h5dump --xml tsaf.h5'
       </hdf5:DataType>
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 
-         0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 
+         0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25
+         0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25
          0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25
          </hdf5:DataFromFile>
       </hdf5:Data>

tools/testfiles/tslink-1.ddl

@@ -5,9 +5,9 @@ HDF5 "tslink.h5" {
 GROUP "/" {
    SOFTLINK "slink1" {
       LINKTARGET "somevalue"
-   } 
+   }
    SOFTLINK "slink2" {
       LINKTARGET "linkvalue"
-   } 
-} 
-} 
+   }
+}
+}

tools/testfiles/tslink-2.ddl

@@ -4,5 +4,5 @@ Expected output for 'h5dump -l slink2 tslink.h5'
 HDF5 "tslink.h5" {
 SOFTLINK "slink2" {
    LINKTARGET "linkvalue"
-} 
-} 
+}
+}

tools/testfiles/tsplit_file.ddl

@@ -9,15 +9,15 @@ GROUP "/" {
             STRPAD H5T_STR_NULLTERM;
             CSET H5T_CSET_ASCII;
             CTYPE H5T_C_S1;
-         }        
-      DATASPACE  SIMPLE { ( 1 ) / ( 1 ) } 
+         }
+      DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
       DATA {
          "this is some metadata on this file"
-      } 
-   } 
+      }
+   }
    DATASET "dset1" {
-      DATATYPE  H5T_STD_I32BE  
-      DATASPACE  SIMPLE { ( 10, 15 ) / ( 10, 15 ) } 
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 10, 15 ) / ( 10, 15 ) }
       DATA {
          0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
          1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
@@ -29,7 +29,7 @@ GROUP "/" {
          7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
          8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
          9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tstr-1.ddl

@@ -12,283 +12,283 @@ GROUP "/" {
             CSET H5T_CSET_ASCII;
             CTYPE H5T_C_S1;
          } } "string";
-      }        
-      DATASPACE  SIMPLE { ( 3, 6 ) / ( 3, 6 ) } 
+      }
+      DATASPACE  SIMPLE { ( 3, 6 ) / ( 3, 6 ) }
       DATA {
          {
-            [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 
-               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, 
+            [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
+               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", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 
-               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, 
+            [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
+               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", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 
-               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, 
+            [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
+               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", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 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, 
+            [ 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,
                144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
-               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          }
-      } 
-   } 
+      }
+   }
    DATASET "string1" {
       DATATYPE  H5T_STRING {
             STRSIZE 5;
             STRPAD H5T_STR_NULLTERM;
             CSET H5T_CSET_ASCII;
             CTYPE H5T_C_S1;
-         }        
-      DATASPACE  SIMPLE { ( 3, 4 ) / ( 3, 4 ) } 
+         }
+      DATASPACE  SIMPLE { ( 3, 4 ) / ( 3, 4 ) }
       DATA {
          "s1", "s2", "s3", "s4",
          "s5", "s6", "s7", "s8",
          "s9", "s0", "s1", "s2"
-      } 
-   } 
+      }
+   }
    DATASET "string2" {
       DATATYPE  H5T_STRING {
             STRSIZE 11;
             STRPAD H5T_STR_SPACEPAD;
             CSET H5T_CSET_ASCII;
             CTYPE H5T_C_S1;
-         }        
-      DATASPACE  SIMPLE { ( 20 ) / ( 20 ) } 
+         }
+      DATASPACE  SIMPLE { ( 20 ) / ( 20 ) }
       DATA {
          "ab cd ef1  ", "ab cd ef2  ", "ab cd ef3  ", "ab cd ef4  ",
          "ab cd ef5  ", "ab cd ef6  ", "ab cd ef7  ", "ab cd ef8  ",
          "ab cd ef9  ", "ab cd ef0  ", "ab cd ef1  ", "ab cd ef2  ",
          "ab cd ef3  ", "ab cd ef4  ", "ab cd ef5  ", "ab cd ef6  ",
          "ab cd ef7  ", "ab cd ef8  ", "ab cd ef9  ", "ab cd ef0  "
-      } 
-   } 
+      }
+   }
    DATASET "string3" {
       DATATYPE  H5T_STRING {
             STRSIZE 8;
             STRPAD H5T_STR_NULLPAD;
             CSET H5T_CSET_ASCII;
             CTYPE H5T_C_S1;
-         }        
-      DATASPACE  SIMPLE { ( 27 ) / ( 27 ) } 
+         }
+      DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
       DATA {
          "abcd0\000\000\000", "abcd1\000\000\000", "abcd2\000\000\000",
          "abcd3\000\000\000", "abcd4\000\000\000", "abcd5\000\000\000",
@@ -299,21 +299,21 @@ GROUP "/" {
          "abcd8\000\000\000", "abcd9\000\000\000", "abcd0\000\000\000",
          "abcd1\000\000\000", "abcd2\000\000\000", "abcd3\000\000\000",
          "abcd4\000\000\000", "abcd5\000\000\000", "abcd6\000\000\000"
-      } 
-   } 
+      }
+   }
    DATASET "string4" {
       DATATYPE  H5T_STRING {
             STRSIZE 168;
             STRPAD H5T_STR_SPACEPAD;
             CSET H5T_CSET_ASCII;
             CTYPE H5T_C_S1;
-         }        
-      DATASPACE  SIMPLE { ( 3 ) / ( 3 ) } 
+         }
+      DATASPACE  SIMPLE { ( 3 ) / ( 3 ) }
       DATA {
          "s1234567890123456789                                                                                                                                                    ",
          "s1234567890123456789                                                                                                                                                    ",
          "s1234567890123456789                                                                                                                                                    "
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tstr-2.ddl

@@ -10,8 +10,8 @@ GROUP "/" {
                STRPAD H5T_STR_NULLTERM;
                CSET H5T_CSET_ASCII;
                CTYPE H5T_C_S1;
-            }           
-         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
+            }
+         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
          DATA {
             "This is row 0 of type H5T_STR_NULLTERM of",
             "This is row 1 of type H5T_STR_NULLTERM of",
@@ -23,21 +23,21 @@ GROUP "/" {
             "This is row 7 of type H5T_STR_NULLTERM of",
             "This is row 8 of type H5T_STR_NULLTERM of",
             "This is row 9 of type H5T_STR_NULLTERM of"
-         } 
+         }
          ATTRIBUTE "attr1" {
             DATATYPE  H5T_STRING {
                   STRSIZE 11;
                   STRPAD H5T_STR_NULLTERM;
                   CSET H5T_CSET_ASCII;
                   CTYPE H5T_C_S1;
-               }              
-            DATASPACE  SIMPLE { ( 3 ) / ( 3 ) } 
+               }
+            DATASPACE  SIMPLE { ( 3 ) / ( 3 ) }
             DATA {
                "0123456789", "abcdefghij", "ABCDEFGHIJ"
-            } 
-         } 
-      } 
-   } 
+            }
+         }
+      }
+   }
    GROUP "g2" {
       DATASET "dset2" {
          DATATYPE  H5T_STRING {
@@ -45,8 +45,8 @@ GROUP "/" {
                STRPAD H5T_STR_NULLTERM;
                CSET H5T_CSET_ASCII;
                CTYPE H5T_C_S1;
-            }           
-         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
+            }
+         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
          DATA {
             "This is row 0 of type H5T_STR_NULLTERM of string ",
             "This is row 1 of type H5T_STR_NULLTERM of string ",
@@ -58,9 +58,9 @@ GROUP "/" {
             "This is row 7 of type H5T_STR_NULLTERM of string ",
             "This is row 8 of type H5T_STR_NULLTERM of string ",
             "This is row 9 of type H5T_STR_NULLTERM of string "
-         } 
-      } 
-   } 
+         }
+      }
+   }
    GROUP "g3" {
       DATASET "dset3" {
          DATATYPE  H5T_STRING {
@@ -68,8 +68,8 @@ GROUP "/" {
                STRPAD H5T_STR_NULLPAD;
                CSET H5T_CSET_ASCII;
                CTYPE H5T_C_S1;
-            }           
-         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
+            }
+         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
          DATA {
             "This is row 0 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000",
             "This is row 1 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000",
@@ -81,9 +81,9 @@ GROUP "/" {
             "This is row 7 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000",
             "This is row 8 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000",
             "This is row 9 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000"
-         } 
-      } 
-   } 
+         }
+      }
+   }
    GROUP "g4" {
       DATASET "dset4" {
          DATATYPE  H5T_STRING {
@@ -91,8 +91,8 @@ GROUP "/" {
                STRPAD H5T_STR_NULLPAD;
                CSET H5T_CSET_ASCII;
                CTYPE H5T_C_S1;
-            }           
-         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
+            }
+         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
          DATA {
             "This is row 0 of type H5T_STR_NULLPAD of string ar",
             "This is row 1 of type H5T_STR_NULLPAD of string ar",
@@ -104,9 +104,9 @@ GROUP "/" {
             "This is row 7 of type H5T_STR_NULLPAD of string ar",
             "This is row 8 of type H5T_STR_NULLPAD of string ar",
             "This is row 9 of type H5T_STR_NULLPAD of string ar"
-         } 
-      } 
-   } 
+         }
+      }
+   }
    GROUP "g5" {
       DATASET "dset5" {
          DATATYPE  H5T_STRING {
@@ -114,8 +114,8 @@ GROUP "/" {
                STRPAD H5T_STR_SPACEPAD;
                CSET H5T_CSET_ASCII;
                CTYPE H5T_C_S1;
-            }           
-         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
+            }
+         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
          DATA {
             "This is row 0 of type H5T_STR_SPACEPAD of         ",
             "This is row 1 of type H5T_STR_SPACEPAD of         ",
@@ -127,9 +127,9 @@ GROUP "/" {
             "This is row 7 of type H5T_STR_SPACEPAD of         ",
             "This is row 8 of type H5T_STR_SPACEPAD of         ",
             "This is row 9 of type H5T_STR_SPACEPAD of         "
-         } 
-      } 
-   } 
+         }
+      }
+   }
    GROUP "g6" {
       DATASET "dset6" {
          DATATYPE  H5T_STRING {
@@ -137,8 +137,8 @@ GROUP "/" {
                STRPAD H5T_STR_SPACEPAD;
                CSET H5T_CSET_ASCII;
                CTYPE H5T_C_S1;
-            }           
-         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
+            }
+         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
          DATA {
             "This is row 0 of type H5T_STR_SPACEPAD of string a",
             "This is row 1 of type H5T_STR_SPACEPAD of string a",
@@ -150,8 +150,8 @@ GROUP "/" {
             "This is row 7 of type H5T_STR_SPACEPAD of string a",
             "This is row 8 of type H5T_STR_SPACEPAD of string a",
             "This is row 9 of type H5T_STR_SPACEPAD of string a"
-         } 
-      } 
-   } 
-} 
-} 
+         }
+      }
+   }
+}
+}

tools/testfiles/tstr.h5.xml

@@ -52,186 +52,186 @@ Expected output for 'h5dump --xml tstr.h5'
    <!-- Note: format of compound data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-          0 1 4 9 16 25 36 49 64 81 
-               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" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               64 81 100 121 144 169 196 225 256 289   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               81 100 121 144 169 196 225 256 289 324   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               100 121 144 169 196 225 256 289 324 361   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               121 144 169 196 225 256 289 324 361 400   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               144 169 196 225 256 289 324 361 400 441   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          0 1 4 9 16 25 36 49 64 81 
-               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" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               64 81 100 121 144 169 196 225 256 289   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               81 100 121 144 169 196 225 256 289 324   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               100 121 144 169 196 225 256 289 324 361   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               121 144 169 196 225 256 289 324 361 400   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               144 169 196 225 256 289 324 361 400 441   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          0 1 4 9 16 25 36 49 64 81 
-               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" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               64 81 100 121 144 169 196 225 256 289   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               81 100 121 144 169 196 225 256 289 324   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               100 121 144 169 196 225 256 289 324 361   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               121 144 169 196 225 256 289 324 361 400   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"  
-          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 
-               144 169 196 225 256 289 324 361 400 441   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
+          0 1 4 9 16 25 36 49 64 81
+               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"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               64 81 100 121 144 169 196 225 256 289  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               81 100 121 144 169 196 225 256 289 324  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               100 121 144 169 196 225 256 289 324 361  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               121 144 169 196 225 256 289 324 361 400  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               144 169 196 225 256 289 324 361 400 441  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          0 1 4 9 16 25 36 49 64 81
+               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"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               64 81 100 121 144 169 196 225 256 289  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               81 100 121 144 169 196 225 256 289 324  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               100 121 144 169 196 225 256 289 324 361  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               121 144 169 196 225 256 289 324 361 400  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               144 169 196 225 256 289 324 361 400 441  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          0 1 4 9 16 25 36 49 64 81
+               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"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               64 81 100 121 144 169 196 225 256 289  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               81 100 121 144 169 196 225 256 289 324  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               100 121 144 169 196 225 256 289 324 361  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               121 144 169 196 225 256 289 324 361 400  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+          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
+               144 169 196 225 256 289 324 361 400 441  "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
+               "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678"
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>

tools/testfiles/tvldtypes1.ddl

@@ -4,25 +4,25 @@ Expected output for 'h5dump tvldtypes1.h5'
 HDF5 "tvldtypes1.h5" {
 GROUP "/" {
    DATASET "Dataset1.0" {
-      DATATYPE  H5T_VLEN { H5T_STD_I32LE}  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_VLEN { H5T_STD_I32LE}
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          (0), (10, 11), (20, 21, 22), (30, 31, 32, 33)
-      } 
-   } 
+      }
+   }
    DATASET "Dataset2.0" {
-      DATATYPE  H5T_VLEN { H5T_IEEE_F32LE}  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_VLEN { H5T_IEEE_F32LE}
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          (0), (10, 10.1), (20, 20.1, 20.2), (30, 30.1, 30.2, 30.3)
-      } 
-   } 
+      }
+   }
    DATASET "Dataset3.0" {
-      DATATYPE  H5T_VLEN { H5T_STD_I32LE}  
-      DATASPACE  SCALAR  
+      DATATYPE  H5T_VLEN { H5T_STD_I32LE}
+      DATASPACE  SCALAR
       DATA {
          (0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72)
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tvldtypes1.h5.xml

@@ -30,7 +30,7 @@ Expected output for 'h5dump --xml tvldtypes1.h5'
 <!-- Note: format of VL data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-          0   10 11   20 21 22   30 31 32 33 
+          0  10 11  20 21 22  30 31 32 33
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
@@ -60,7 +60,7 @@ Expected output for 'h5dump --xml tvldtypes1.h5'
 <!-- Note: format of VL data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-          0   10 10.1   20 20.1 20.2   30 30.1 30.2 30.3 
+          0  10 10.1  20 20.1 20.2  30 30.1 30.2 30.3
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
@@ -88,7 +88,7 @@ Expected output for 'h5dump --xml tvldtypes1.h5'
 <!-- Note: format of VL data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-          0 2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48 50 52 54 56 58 60 62 64 66 68 70 72 
+          0 2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48 50 52 54 56 58 60 62 64 66 68 70 72
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>

tools/testfiles/tvldtypes2.ddl

@@ -4,12 +4,12 @@ Expected output for 'h5dump tvldtypes2.h5'
 HDF5 "tvldtypes2.h5" {
 GROUP "/" {
    DATASET "Dataset1" {
-      DATATYPE  H5T_VLEN { H5T_VLEN { H5T_STD_U32LE}}  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATATYPE  H5T_VLEN { H5T_VLEN { H5T_STD_U32LE}}
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          ((0)), ((100), (110, 111)), ((200), (210, 211), (220, 221, 222)),
          ((300), (310, 311), (320, 321, 322), (330, 331, 332, 333))
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tvldtypes2.h5.xml

@@ -34,8 +34,8 @@ Expected output for 'h5dump --xml tvldtypes2.h5'
 <!-- Note: format of VL data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-           0     100   110 111     200   210 211   220 221 222   
-           300   310 311   320 321 322   330 331 332 333  
+           0   100  110 111   200  210 211  220 221 222
+           300  310 311  320 321 322  330 331 332 333
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>

tools/testfiles/tvldtypes3.ddl

@@ -8,8 +8,8 @@ GROUP "/" {
          H5T_STD_I32LE "i";
          H5T_IEEE_F32LE "f";
          H5T_VLEN { H5T_STD_U32LE} "v";
-      }        
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          {
             0,
@@ -31,7 +31,7 @@ GROUP "/" {
             20,
             (30, 31, 32, 33)
          }
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tvldtypes3.h5.xml

@@ -50,7 +50,7 @@ Expected output for 'h5dump --xml tvldtypes3.h5'
    <!-- Note: format of compound data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0 0  0  10 6.66667  10 11  20 13.3333  20 21 22  30 20  30 31 32 33 
+         0 0  0 10 6.66667  10 11 20 13.3333  20 21 22 30 20  30 31 32 33
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>

tools/testfiles/tvldtypes4.ddl

@@ -7,8 +7,8 @@ GROUP "/" {
       DATATYPE  H5T_VLEN { H5T_COMPOUND {
          H5T_STD_I32LE "i";
          H5T_IEEE_F32LE "f";
-      }}  
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      }}
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          ({
                0,
@@ -44,7 +44,7 @@ GROUP "/" {
                33,
                21
             })
-      } 
-   } 
-} 
-} 
+      }
+   }
+}
+}

tools/testfiles/tvlstr.ddl

@@ -4,38 +4,33 @@ Expected output for 'h5dump tvlstr.h5'
 HDF5 "tvlstr.h5" {
 GROUP "/" {
    ATTRIBUTE "test_scalar" {
-      DATATYPE  H5T_STRING {
-            STRSIZE H5T_VARIABLE;
-            STRPAD H5T_STR_NULLPAD;
-            CSET H5T_CSET_ASCII;
-            CTYPE H5T_C_S1;
-         }        
-      DATASPACE  SCALAR  
+      DATATYPE  "/vl_string_type"
+      DATASPACE  SCALAR
       DATA {
          "This is the string for the attribute"
-      } 
-   } 
+      }
+   }
    DATASET "Dataset1" {
       DATATYPE  H5T_STRING {
             STRSIZE H5T_VARIABLE;
             STRPAD H5T_STR_NULLTERM;
             CSET H5T_CSET_ASCII;
             CTYPE H5T_C_S1;
-         }        
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+         }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          "Four score and seven years ago our forefathers brought forth on this continent a new nation,",
          "conceived in liberty and dedicated to the proposition that all men are created equal.",
          "Now we are engaged in a great civil war,",
          "testing whether that nation or any nation so conceived and so dedicated can long endure."
-      } 
-   } 
+      }
+   }
    DATATYPE "vl_string_type"       H5T_STRING {
          STRSIZE H5T_VARIABLE;
          STRPAD H5T_STR_NULLPAD;
          CSET H5T_CSET_ASCII;
          CTYPE H5T_C_S1;
       };
-    
-} 
-} 
+
+}
+}

tools/testfiles/tvlstr.h5.xml

@@ -8,11 +8,7 @@ Expected output for 'h5dump --xml tvlstr.h5'
       <hdf5:Dataspace>
          <hdf5:ScalarDataspace />
       </hdf5:Dataspace>
-      <hdf5:DataType>
-         <hdf5:AtomicType>
-            <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="H5T_VARIABLE" StrPad="H5T_STR_NULLPAD"/>
-         </hdf5:AtomicType>
-      </hdf5:DataType>
+      <hdf5:NamedDataTypePtr OBJ-XID="xid_1576-0" H5Path="/vl_string_type" />
       <hdf5:Data>
          <hdf5:DataFromFile>
          "This is the string for the attribute"