[svn-r13368]

Added a little format alignment to the printing of dimensions

1 files changed, 95 insertions, 70 deletions

diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt
index f30cdea..063f1d0 100644
--- a/tools/testfiles/h5diff_80.txt
+++ b/tools/testfiles/h5diff_80.txt
@@ -39,20 +39,19 @@ file1     file2
     x      x    /g1/vlen3D     
     x      x    /refreg        
 
-dataset:
-</dset> and </dset> [2]
+dataset: </dset> and </dset>
+size:           [2]           [2]
 position        dset            dset            difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 2 differences found
-dataset:
-</dsetref> and </dsetref> [10x10]
+dataset: </dsetref> and </dsetref>
 0 differences found
-group:
-</g1> and </g1> 0 differences found
-dataset:
-</g1/array> and </g1/array> [2]
+group  : </g1> and </g1>
+0 differences found
+dataset: </g1/array> and </g1/array>
+size:           [2]           [2]
 position        array           array           difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
@@ -62,8 +61,8 @@ position        array           array           difference
 [ 1 ]          5               0               5              
 [ 1 ]          6               0               6              
 6 differences found
-dataset:
-</g1/array2D> and </g1/array2D> [3x2]
+dataset: </g1/array2D> and </g1/array2D>
+size:           [3x2]           [3x2]
 position        array2D         array2D         difference          
 ------------------------------------------------------------
 [ 0 0 ]          1               0               1              
@@ -85,8 +84,8 @@ position        array2D         array2D         difference
 [ 2 1 ]          17              0               17             
 [ 2 1 ]          18              0               18             
 18 differences found
-dataset:
-</g1/array3D> and </g1/array3D> [4x3x2]
+dataset: </g1/array3D> and </g1/array3D>
+size:           [4x3x2]           [4x3x2]
 position        array3D         array3D         difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          1               0               1              
@@ -162,15 +161,15 @@ position        array3D         array3D         difference
 [ 3 2 1 ]          71              0               71             
 [ 3 2 1 ]          72              0               72             
 72 differences found
-dataset:
-</g1/bitfield> and </g1/bitfield> [2]
+dataset: </g1/bitfield> and </g1/bitfield>
+size:           [2]           [2]
 position        bitfield        bitfield        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 2 differences found
-dataset:
-</g1/bitfield2D> and </g1/bitfield2D> [3x2]
+dataset: </g1/bitfield2D> and </g1/bitfield2D>
+size:           [3x2]           [3x2]
 position        bitfield2D      bitfield2D      difference          
 ------------------------------------------------------------
 [ 0 0 ]          1               0               1              
@@ -180,8 +179,8 @@ position        bitfield2D      bitfield2D      difference
 [ 2 0 ]          5               0               5              
 [ 2 1 ]          6               0               6              
 6 differences found
-dataset:
-</g1/bitfield3D> and </g1/bitfield3D> [4x3x2]
+dataset: </g1/bitfield3D> and </g1/bitfield3D>
+size:           [4x3x2]           [4x3x2]
 position        bitfield3D      bitfield3D      difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          1               0               1              
@@ -209,8 +208,8 @@ position        bitfield3D      bitfield3D      difference
 [ 3 2 0 ]          23              0               23             
 [ 3 2 1 ]          24              0               24             
 24 differences found
-dataset:
-</g1/compound> and </g1/compound> [2]
+dataset: </g1/compound> and </g1/compound>
+size:           [2]           [2]
 position        compound        compound        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
@@ -218,8 +217,8 @@ position        compound        compound        difference
 [ 1 ]          3               0               3              
 [ 1 ]          4               0               4              
 4 differences found
-dataset:
-</g1/compound2D> and </g1/compound2D> [3x2]
+dataset: </g1/compound2D> and </g1/compound2D>
+size:           [3x2]           [3x2]
 position        compound2D      compound2D      difference          
 ------------------------------------------------------------
 [ 0 0 ]          1               0               1              
@@ -235,8 +234,8 @@ position        compound2D      compound2D      difference
 [ 2 1 ]          11              0               11             
 [ 2 1 ]          12              0               12             
 12 differences found
-dataset:
-</g1/compound3D> and </g1/compound3D> [4x3x2]
+dataset: </g1/compound3D> and </g1/compound3D>
+size:           [4x3x2]           [4x3x2]
 position        compound3D      compound3D      difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          1               0               1              
@@ -288,29 +287,27 @@ position        compound3D      compound3D      difference
 [ 3 2 1 ]          47              0               47             
 [ 3 2 1 ]          48              0               48             
 48 differences found
-dataset:
-</g1/enum> and </g1/enum> [2]
+dataset: </g1/enum> and </g1/enum>
+size:           [2]           [2]
 position        enum            enum            difference          
 ------------------------------------------------------------
 [ 0 ]          RED              GREEN            
 1 differences found
-dataset:
-</g1/enum2D> and </g1/enum2D> [3x2]
+dataset: </g1/enum2D> and </g1/enum2D>
 </g1/enum2D> and </g1/enum2D> are empty datasets
 0 differences found
-dataset:
-</g1/enum3D> and </g1/enum3D> [4x3x2]
+dataset: </g1/enum3D> and </g1/enum3D>
 </g1/enum3D> and </g1/enum3D> are empty datasets
 0 differences found
-dataset:
-</g1/float> and </g1/float> [2]
+dataset: </g1/float> and </g1/float>
+size:           [2]           [2]
 position        float           float           difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 2 differences found
-dataset:
-</g1/float2D> and </g1/float2D> [3x2]
+dataset: </g1/float2D> and </g1/float2D>
+size:           [3x2]           [3x2]
 position        float2D         float2D         difference          
 ------------------------------------------------------------
 [ 0 0 ]          1               0               1              
@@ -320,8 +317,8 @@ position        float2D         float2D         difference
 [ 2 0 ]          5               0               5              
 [ 2 1 ]          6               0               6              
 6 differences found
-dataset:
-</g1/float3D> and </g1/float3D> [4x3x2]
+dataset: </g1/float3D> and </g1/float3D>
+size:           [4x3x2]           [4x3x2]
 position        float3D         float3D         difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          1               0               1              
@@ -349,15 +346,15 @@ position        float3D         float3D         difference
 [ 3 2 0 ]          23              0               23             
 [ 3 2 1 ]          24              0               24             
 24 differences found
-dataset:
-</g1/integer> and </g1/integer> [2]
+dataset: </g1/integer> and </g1/integer>
+size:           [2]           [2]
 position        integer         integer         difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 2 differences found
-dataset:
-</g1/integer2D> and </g1/integer2D> [3x2]
+dataset: </g1/integer2D> and </g1/integer2D>
+size:           [3x2]           [3x2]
 position        integer2D       integer2D       difference          
 ------------------------------------------------------------
 [ 0 0 ]          1               0               1              
@@ -367,8 +364,8 @@ position        integer2D       integer2D       difference
 [ 2 0 ]          5               0               5              
 [ 2 1 ]          6               0               6              
 6 differences found
-dataset:
-</g1/integer3D> and </g1/integer3D> [4x3x2]
+dataset: </g1/integer3D> and </g1/integer3D>
+size:           [4x3x2]           [4x3x2]
 position        integer3D       integer3D       difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          1               0               1              
@@ -396,15 +393,15 @@ position        integer3D       integer3D       difference
 [ 3 2 0 ]          23              0               23             
 [ 3 2 1 ]          24              0               24             
 24 differences found
-dataset:
-</g1/opaque> and </g1/opaque> [2]
+dataset: </g1/opaque> and </g1/opaque>
+size:           [2]           [2]
 position        opaque          opaque          difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 2 differences found
-dataset:
-</g1/opaque2D> and </g1/opaque2D> [3x2]
+dataset: </g1/opaque2D> and </g1/opaque2D>
+size:           [3x2]           [3x2]
 position        opaque2D        opaque2D        difference          
 ------------------------------------------------------------
 [ 0 0 ]          1               0               1              
@@ -414,8 +411,8 @@ position        opaque2D        opaque2D        difference
 [ 2 0 ]          5               0               5              
 [ 2 1 ]          6               0               6              
 6 differences found
-dataset:
-</g1/opaque3D> and </g1/opaque3D> [4x3x2]
+dataset: </g1/opaque3D> and </g1/opaque3D>
+size:           [4x3x2]           [4x3x2]
 position        opaque3D        opaque3D        difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          1               0               1              
@@ -443,145 +440,174 @@ position        opaque3D        opaque3D        difference
 [ 3 2 0 ]          23              0               23             
 [ 3 2 1 ]          24              0               24             
 24 differences found
-dataset:
-</g1/reference> and </g1/reference> [2]
+dataset: </g1/reference> and </g1/reference>
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 4 differences found
-dataset:
-</g1/reference2D> and </g1/reference2D> [3x2]
+dataset: </g1/reference2D> and </g1/reference2D>
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 12 differences found
-dataset:
-</g1/reference3D> and </g1/reference3D> [4x3x2]
+dataset: </g1/reference3D> and </g1/reference3D>
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+size:           [2]           [2]
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 48 differences found
-dataset:
-</g1/string> and </g1/string> [2]
+dataset: </g1/string> and </g1/string>
+size:           [2]           [2]
 position        string          string          difference          
 ------------------------------------------------------------
 [ 0 ]          a                z                
@@ -589,8 +615,8 @@ position        string          string          difference
 [ 1 ]          d                z                
 [ 1 ]          e                z                
 4 differences found
-dataset:
-</g1/string2D> and </g1/string2D> [3x2]
+dataset: </g1/string2D> and </g1/string2D>
+size:           [3x2]           [3x2]
 position        string2D        string2D        difference          
 ------------------------------------------------------------
 [ 0 0 ]          a                z                
@@ -606,8 +632,8 @@ position        string2D        string2D        difference
 [ 2 1 ]          k                z                
 [ 2 1 ]          l                z                
 12 differences found
-dataset:
-</g1/string3D> and </g1/string3D> [4x3x2]
+dataset: </g1/string3D> and </g1/string3D>
+size:           [4x3x2]           [4x3x2]
 position        string3D        string3D        difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          a                z                
@@ -658,16 +684,16 @@ position        string3D        string3D        difference
 [ 3 2 1 ]          X                z                
 [ 3 2 1 ]          Z                z                
 47 differences found
-dataset:
-</g1/vlen> and </g1/vlen> [2]
+dataset: </g1/vlen> and </g1/vlen>
+size:           [2]           [2]
 position        vlen            vlen            difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 [ 1 ]          3               0               3              
 3 differences found
-dataset:
-</g1/vlen2D> and </g1/vlen2D> [3x2]
+dataset: </g1/vlen2D> and </g1/vlen2D>
+size:           [3x2]           [3x2]
 position        vlen2D          vlen2D          difference          
 ------------------------------------------------------------
 [ 0 1 ]          1               0               1              
@@ -682,8 +708,8 @@ position        vlen2D          vlen2D          difference
 [ 2 1 ]          10              0               10             
 [ 2 1 ]          11              0               11             
 11 differences found
-dataset:
-</g1/vlen3D> and </g1/vlen3D> [4x3x2]
+dataset: </g1/vlen3D> and </g1/vlen3D>
+size:           [4x3x2]           [4x3x2]
 position        vlen3D          vlen3D          difference          
 ------------------------------------------------------------
 [ 0 0 1 ]          1               0               1              
@@ -746,8 +772,7 @@ position        vlen3D          vlen3D          difference
 [ 3 2 1 ]          58              0               58             
 [ 3 2 1 ]          59              0               59             
 59 differences found
-dataset:
-</refreg> and </refreg> [2]
+dataset: </refreg> and </refreg>
 Referenced dataset      5904            5904
 ------------------------------------------------------------
 Region blocks
@@ -757,8 +782,8 @@ point #1              (2,2)              (3,3)
 point #3              (1,6)              (2,5)
 point #4              (2,8)              (1,7)
 4 differences found
-group:
-</> and </> 0 differences found
+group  : </> and </>
+0 differences found
 --------------------------------
 Some objects are not comparable
 --------------------------------