[svn-r14264] new features: 1) new usage for h5diff " A la" h5dump format

2) new usage for h5repack and new command line parsing using the tools library parsing code

tested: windows, linux, solaris

17 files changed, 289 insertions, 357 deletions

diff --git a/tools/testfiles/h5diff_10.txt b/tools/testfiles/h5diff_10.txt
index 6a45339..cc20357 100644
--- a/tools/testfiles/h5diff_10.txt
+++ b/tools/testfiles/h5diff_10.txt
@@ -2,27 +2,23 @@
 Expected output for 'h5diff -h'
 #############################
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_600.txt b/tools/testfiles/h5diff_600.txt
index a1bb063..d108d9a 100644
--- a/tools/testfiles/h5diff_600.txt
+++ b/tools/testfiles/h5diff_600.txt
@@ -2,27 +2,23 @@
 Expected output for 'h5diff h5diff_basic1.h5'
 #############################
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_602.txt b/tools/testfiles/h5diff_602.txt
index b9c2b8f6..318e91b 100644
--- a/tools/testfiles/h5diff_602.txt
+++ b/tools/testfiles/h5diff_602.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -d h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dse
 #############################
 <-d h5diff_basic1.h5> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_603.txt b/tools/testfiles/h5diff_603.txt
index efc8769..c1f1af2 100644
--- a/tools/testfiles/h5diff_603.txt
+++ b/tools/testfiles/h5diff_603.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -d -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/
 #############################
 <-d -4> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_604.txt b/tools/testfiles/h5diff_604.txt
index 7f0a2a6..898e32b 100644
--- a/tools/testfiles/h5diff_604.txt
+++ b/tools/testfiles/h5diff_604.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -d 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/d
 #############################
 <-d 0> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_605.txt b/tools/testfiles/h5diff_605.txt
index 5101c2d..be291ba 100644
--- a/tools/testfiles/h5diff_605.txt
+++ b/tools/testfiles/h5diff_605.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -d u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/d
 #############################
 <-d u> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_606.txt b/tools/testfiles/h5diff_606.txt
index 9e32909..c59f386 100644
--- a/tools/testfiles/h5diff_606.txt
+++ b/tools/testfiles/h5diff_606.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -d 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1
 #############################
 <-d 0x1> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_611.txt b/tools/testfiles/h5diff_611.txt
index 1d5e146..dc861ab 100644
--- a/tools/testfiles/h5diff_611.txt
+++ b/tools/testfiles/h5diff_611.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -r -p h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/
 #############################
 <-p h5diff_basic1.h5> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_612.txt b/tools/testfiles/h5diff_612.txt
index 47c36fb..a694dde 100644
--- a/tools/testfiles/h5diff_612.txt
+++ b/tools/testfiles/h5diff_612.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -p -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/
 #############################
 <-p -4> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_613.txt b/tools/testfiles/h5diff_613.txt
index 056cbd6..4e36094 100644
--- a/tools/testfiles/h5diff_613.txt
+++ b/tools/testfiles/h5diff_613.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -p 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/d
 #############################
 <-p 0> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_614.txt b/tools/testfiles/h5diff_614.txt
index 82db7f3..f0530e3 100644
--- a/tools/testfiles/h5diff_614.txt
+++ b/tools/testfiles/h5diff_614.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -p u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/d
 #############################
 <-p u> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_615.txt b/tools/testfiles/h5diff_615.txt
index 8ff33ac..eb45442 100644
--- a/tools/testfiles/h5diff_615.txt
+++ b/tools/testfiles/h5diff_615.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -p 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1
 #############################
 <-p 0x1> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_620.txt b/tools/testfiles/h5diff_620.txt
index 29110b9..1707bb7 100644
--- a/tools/testfiles/h5diff_620.txt
+++ b/tools/testfiles/h5diff_620.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -n h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dse
 #############################
 <-n h5diff_basic1.h5> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_621.txt b/tools/testfiles/h5diff_621.txt
index ae7c644..39e4c48 100644
--- a/tools/testfiles/h5diff_621.txt
+++ b/tools/testfiles/h5diff_621.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -n -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/
 #############################
 <-n -4> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_622.txt b/tools/testfiles/h5diff_622.txt
index 97cfda0..aff6dee 100644
--- a/tools/testfiles/h5diff_622.txt
+++ b/tools/testfiles/h5diff_622.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -n 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/d
 #############################
 <-n 0> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_623.txt b/tools/testfiles/h5diff_623.txt
index 9d2a914..4d1c6fa 100644
--- a/tools/testfiles/h5diff_623.txt
+++ b/tools/testfiles/h5diff_623.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -n u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/d
 #############################
 <-n u> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured
diff --git a/tools/testfiles/h5diff_624.txt b/tools/testfiles/h5diff_624.txt
index 7fc9cb1..1cba110 100644
--- a/tools/testfiles/h5diff_624.txt
+++ b/tools/testfiles/h5diff_624.txt
@@ -3,27 +3,23 @@ Expected output for 'h5diff -n 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1
 #############################
 <-n 0x1> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-
-file1             File name of the first HDF5 file
-file2             File name of the second HDF5 file
-[obj1]            Name of an HDF5 object, in absolute path
-[obj2]            Name of an HDF5 object, in absolute path
-[OPTIONS] are:
-[-h]              Print out this information
-[-V]              Print HDF5 library version number and exit
-[-r]              Report mode. Print differences
-[-v]              Verbose mode. Print differences, list of objects, warnings
-[-q]              Quiet mode. Do not do output
-[-n count]        Print difference up to count number
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print difference when it is greater than a relative limit
-
-Items in [] are optional
-[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)
-The 'count' value must be a positive integer
-The 'delta' and 'relative' values must be positive numbers
-The -d compare criteria is |a - b| > delta
-The -p compare criteria is |(b-a)/a| > relative
+  file1                    File name of the first HDF5 file
+  file2                    File name of the second HDF5 file
+  [obj1]                   Name of an HDF5 object, in absolute path
+  [obj2]                   Name of an HDF5 object, in absolute path
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -V, --version           Print version number and exit
+   -r, --report            Report mode. Print differences
+   -v, --verbose           Verbose mode. Print differences, list of objects
+   -q, --quiet             Quiet mode. Do not do output
+   -n C, --count=C         Print differences up to C number
+   -d D, --delta=D         Print difference when greater than limit D
+   -p R, --relative=R      Print difference when greater than relative limit R
+
+  C - is a positive integer
+  D - is a positive number. Compare criteria is |a - b| > D
+  R - is a positive number. Compare criteria is |(b-a)/a| > R
 
 h5diff has four modes of output:
  Normal mode: print the number of differences found and where they occured