format: Always output 2-digit hours for TIME format.

This makes the code honor what the documentation says.

Thanks to Nolan Void <nolvoa@hanakami.com> for reporting the problem.

diff --git a/src/data/format.c b/src/data/format.c
index a2cb1310624dc35b8b0f126a9cc909378047506c..1cf083d38f60ecbda65a22fdfb9712b99fda2ba3 100644 (file)
--- a/src/data/format.c
+++ b/src/data/format.c
@@ -1009,8 +1009,8 @@ fmt_date_template (enum fmt_type type, int width)
       break;
 
     case FMT_TIME:
-      s1 = "H:MM";
-      s2 = "H:MM:SS";
+      s1 = "HH:MM";
+      s2 = "HH:MM:SS";
       break;
 
     case FMT_DTIME:

diff --git a/tests/data/data-out.at b/tests/data/data-out.at
index 8b2b4195776585ce166bd48ca48b3460b0d66718..77f12ff43ced51f3e3927712f5b90dcceb435be5 100644 (file)
--- a/tests/data/data-out.at
+++ b/tests/data/data-out.at
@@ -1509,26 +1509,26 @@ execute.
 ])
 AT_CHECK([pspp -O format=csv time-out.sps])
 AT_CHECK([cat time5.out], [0], [dnl
-  0:00
-  4:50
+ 00:00
+ 04:50
  12:31
  12:47
-  1:26
+ 01:26
  20:58
-  7:36
+ 07:36
  15:43
-  4:25
-  6:49
-  2:57
+ 04:25
+ 06:49
+ 02:57
  16:45
  21:30
-  4:25
-  6:49
-  2:57
+ 04:25
+ 06:49
+ 02:57
  16:45
  21:30
  22:30
-  1:56
+ 01:56
  24:00
  28:50
  36:31
@@ -1609,26 +1609,26 @@ AT_CHECK([cat time5.out], [0], [dnl
  *****
  *****
  *****
-  0:00
- -4:50
+ 00:00
+ *****
+ *****
+ *****
+ *****
+ *****
+ *****
+ *****
+ *****
+ *****
+ *****
  *****
  *****
- -1:26
  *****
- -7:36
  *****
- -4:25
- -6:49
- -2:57
  *****
  *****
- -4:25
- -6:49
- -2:57
  *****
  *****
  *****
- -1:56
  *****
  *****
  *****
@@ -1711,26 +1711,26 @@ AT_CHECK([cat time5.out], [0], [dnl
  *****
 ])
 AT_CHECK([cat time6.out], [0], [dnl
-   0:00
-   4:50
+  00:00
+  04:50
   12:31
   12:47
-   1:26
+  01:26
   20:58
-   7:36
+  07:36
   15:43
-   4:25
-   6:49
-   2:57
+  04:25
+  06:49
+  02:57
   16:45
   21:30
-   4:25
-   6:49
-   2:57
+  04:25
+  06:49
+  02:57
   16:45
   21:30
   22:30
-   1:56
+  01:56
   24:00
   28:50
   36:31
@@ -1811,26 +1811,26 @@ AT_CHECK([cat time6.out], [0], [dnl
  ******
  ******
  ******
-   0:00
-  -4:50
+  00:00
+ -04:50
  -12:31
  -12:47
-  -1:26
+ -01:26
  -20:58
-  -7:36
+ -07:36
  -15:43
-  -4:25
-  -6:49
-  -2:57
+ -04:25
+ -06:49
+ -02:57
  -16:45
  -21:30
-  -4:25
-  -6:49
-  -2:57
+ -04:25
+ -06:49
+ -02:57
  -16:45
  -21:30
  -22:30
-  -1:56
+ -01:56
  -24:00
  -28:50
  -36:31
@@ -1913,26 +1913,26 @@ AT_CHECK([cat time6.out], [0], [dnl
  ******
 ])
 AT_CHECK([cat time7.out], [0], [dnl
- 0:00:00
- 4:50:38
+   00:00
+   04:50
    12:31
    12:47
- 1:26:00
+   01:26
    20:58
- 7:36:05
+   07:36
    15:43
- 4:25:09
- 6:49:27
- 2:57:52
+   04:25
+   06:49
+   02:57
    16:45
    21:30
- 4:25:09
- 6:49:27
- 2:57:52
+   04:25
+   06:49
+   02:57
    16:45
    21:30
    22:30
- 1:56:51
+   01:56
    24:00
    28:50
    36:31
@@ -2013,26 +2013,26 @@ AT_CHECK([cat time7.out], [0], [dnl
  *******
  *******
  *******
- 0:00:00
-   -4:50
+   00:00
+  -04:50
   -12:31
   -12:47
-   -1:26
+  -01:26
   -20:58
-   -7:36
+  -07:36
   -15:43
-   -4:25
-   -6:49
-   -2:57
+  -04:25
+  -06:49
+  -02:57
   -16:45
   -21:30
-   -4:25
-   -6:49
-   -2:57
+  -04:25
+  -06:49
+  -02:57
   -16:45
   -21:30
   -22:30
-   -1:56
+  -01:56
   -24:00
   -28:50
   -36:31
@@ -2115,26 +2115,26 @@ AT_CHECK([cat time7.out], [0], [dnl
  *******
 ])
 AT_CHECK([cat time8.out], [0], [dnl
-  0:00:00
-  4:50:38
+ 00:00:00
+ 04:50:38
  12:31:35
  12:47:53
-  1:26:00
+ 01:26:00
  20:58:11
-  7:36:05
+ 07:36:05
  15:43:49
-  4:25:09
-  6:49:27
-  2:57:52
+ 04:25:09
+ 06:49:27
+ 02:57:52
  16:45:44
  21:30:57
-  4:25:09
-  6:49:27
-  2:57:52
+ 04:25:09
+ 06:49:27
+ 02:57:52
  16:45:44
  21:30:57
  22:30:04
-  1:56:51
+ 01:56:51
  24:00:00
  28:50:38
  36:31:35
@@ -2215,26 +2215,26 @@ AT_CHECK([cat time8.out], [0], [dnl
  16365:30
  16366:30
  16345:56
-  0:00:00
- -4:50:38
+ 00:00:00
+   -04:50
    -12:31
    -12:47
- -1:26:00
+   -01:26
    -20:58
- -7:36:05
+   -07:36
    -15:43
- -4:25:09
- -6:49:27
- -2:57:52
+   -04:25
+   -06:49
+   -02:57
    -16:45
    -21:30
- -4:25:09
- -6:49:27
- -2:57:52
+   -04:25
+   -06:49
+   -02:57
    -16:45
    -21:30
    -22:30
- -1:56:51
+   -01:56
    -24:00
    -28:50
    -36:31
@@ -2317,26 +2317,26 @@ AT_CHECK([cat time8.out], [0], [dnl
  ********
 ])
 AT_CHECK([cat time9.out], [0], [dnl
-   0:00:00
-   4:50:38
+  00:00:00
+  04:50:38
   12:31:35
   12:47:53
-   1:26:00
+  01:26:00
   20:58:11
-   7:36:05
+  07:36:05
   15:43:49
-   4:25:09
-   6:49:27
-   2:57:52
+  04:25:09
+  06:49:27
+  02:57:52
   16:45:44
   21:30:57
-   4:25:09
-   6:49:27
-   2:57:52
+  04:25:09
+  06:49:27
+  02:57:52
   16:45:44
   21:30:57
   22:30:04
-   1:56:51
+  01:56:51
   24:00:00
   28:50:38
   36:31:35
@@ -2417,26 +2417,26 @@ AT_CHECK([cat time9.out], [0], [dnl
   16365:30
   16366:30
   16345:56
-   0:00:00
-  -4:50:38
+  00:00:00
+ -04:50:38
  -12:31:35
  -12:47:53
-  -1:26:00
+ -01:26:00
  -20:58:11
-  -7:36:05
+ -07:36:05
  -15:43:49
-  -4:25:09
-  -6:49:27
-  -2:57:52
+ -04:25:09
+ -06:49:27
+ -02:57:52
  -16:45:44
  -21:30:57
-  -4:25:09
-  -6:49:27
-  -2:57:52
+ -04:25:09
+ -06:49:27
+ -02:57:52
  -16:45:44
  -21:30:57
  -22:30:04
-  -1:56:51
+ -01:56:51
  -24:00:00
  -28:50:38
  -36:31:35
@@ -2519,26 +2519,26 @@ AT_CHECK([cat time9.out], [0], [dnl
  -16345:56
 ])
 AT_CHECK([cat time10.out], [0], [dnl
-    0:00:00
-    4:50:38
+   00:00:00
+   04:50:38
    12:31:35
    12:47:53
-    1:26:00
+   01:26:00
    20:58:11
-    7:36:05
+   07:36:05
    15:43:49
-    4:25:09
-    6:49:27
-    2:57:52
+   04:25:09
+   06:49:27
+   02:57:52
    16:45:44
    21:30:57
-    4:25:09
-    6:49:27
-    2:57:52
+   04:25:09
+   06:49:27
+   02:57:52
    16:45:44
    21:30:57
    22:30:04
-    1:56:51
+   01:56:51
    24:00:00
    28:50:38
    36:31:35
@@ -2619,26 +2619,26 @@ AT_CHECK([cat time10.out], [0], [dnl
    16365:30
    16366:30
    16345:56
-    0:00:00
-   -4:50:38
+   00:00:00
+  -04:50:38
   -12:31:35
   -12:47:53
-   -1:26:00
+  -01:26:00
   -20:58:11
-   -7:36:05
+  -07:36:05
   -15:43:49
-   -4:25:09
-   -6:49:27
-   -2:57:52
+  -04:25:09
+  -06:49:27
+  -02:57:52
   -16:45:44
   -21:30:57
-   -4:25:09
-   -6:49:27
-   -2:57:52
+  -04:25:09
+  -06:49:27
+  -02:57:52
   -16:45:44
   -21:30:57
   -22:30:04
-   -1:56:51
+  -01:56:51
   -24:00:00
   -28:50:38
   -36:31:35
@@ -2721,26 +2721,26 @@ AT_CHECK([cat time10.out], [0], [dnl
   -16345:56
 ])
 AT_CHECK([cat time10.1.out], [0], [dnl
-  0:00:00.0
-  4:50:38.1
+ 00:00:00.0
+ 04:50:38.1
  12:31:35.2
  12:47:53.3
-  1:26:00.5
+ 01:26:00.5
  20:58:11.6
-  7:36:05.2
+ 07:36:05.2
  15:43:49.8
-  4:25:09.0
-  6:49:27.5
-  2:57:52.0
+ 04:25:09.0
+ 06:49:27.5
+ 02:57:52.0
  16:45:44.9
  21:30:57.8
-  4:25:09.2
-  6:49:27.1
-  2:57:52.5
+ 04:25:09.2
+ 06:49:27.1
+ 02:57:52.5
  16:45:44.7
  21:30:57.6
  22:30:04.2
-  1:56:51.6
+ 01:56:51.6
  24:00:00.0
  28:50:38.1
  36:31:35.2
@@ -2821,26 +2821,26 @@ AT_CHECK([cat time10.1.out], [0], [dnl
    16365:30
    16366:30
    16345:56
-  0:00:00.0
- -4:50:38.1
+ 00:00:00.0
+  -04:50:38
   -12:31:35
   -12:47:53
- -1:26:00.5
+  -01:26:00
   -20:58:11
- -7:36:05.2
+  -07:36:05
   -15:43:49
- -4:25:09.0
- -6:49:27.5
- -2:57:52.0
+  -04:25:09
+  -06:49:27
+  -02:57:52
   -16:45:44
   -21:30:57
- -4:25:09.2
- -6:49:27.1
- -2:57:52.5
+  -04:25:09
+  -06:49:27
+  -02:57:52
   -16:45:44
   -21:30:57
   -22:30:04
- -1:56:51.6
+  -01:56:51
   -24:00:00
   -28:50:38
   -36:31:35
@@ -2923,26 +2923,26 @@ AT_CHECK([cat time10.1.out], [0], [dnl
   -16345:56
 ])
 AT_CHECK([cat time11.out], [0], [dnl
-     0:00:00
-     4:50:38
+    00:00:00
+    04:50:38
     12:31:35
     12:47:53
-     1:26:00
+    01:26:00
     20:58:11
-     7:36:05
+    07:36:05
     15:43:49
-     4:25:09
-     6:49:27
-     2:57:52
+    04:25:09
+    06:49:27
+    02:57:52
     16:45:44
     21:30:57
-     4:25:09
-     6:49:27
-     2:57:52
+    04:25:09
+    06:49:27
+    02:57:52
     16:45:44
     21:30:57
     22:30:04
-     1:56:51
+    01:56:51
     24:00:00
     28:50:38
     36:31:35
@@ -3023,26 +3023,26 @@ AT_CHECK([cat time11.out], [0], [dnl
  16365:30:57
  16366:30:04
  16345:56:51
-     0:00:00
-    -4:50:38
+    00:00:00
+   -04:50:38
    -12:31:35
    -12:47:53
-    -1:26:00
+   -01:26:00
    -20:58:11
-    -7:36:05
+   -07:36:05
    -15:43:49
-    -4:25:09
-    -6:49:27
-    -2:57:52
+   -04:25:09
+   -06:49:27
+   -02:57:52
    -16:45:44
    -21:30:57
-    -4:25:09
-    -6:49:27
-    -2:57:52
+   -04:25:09
+   -06:49:27
+   -02:57:52
    -16:45:44
    -21:30:57
    -22:30:04
-    -1:56:51
+   -01:56:51
    -24:00:00
    -28:50:38
    -36:31:35
@@ -3125,26 +3125,26 @@ AT_CHECK([cat time11.out], [0], [dnl
    -16345:56
 ])
 AT_CHECK([cat time11.1.out], [0], [dnl
-   0:00:00.0
-   4:50:38.1
+  00:00:00.0
+  04:50:38.1
   12:31:35.2
   12:47:53.3
-   1:26:00.5
+  01:26:00.5
   20:58:11.6
-   7:36:05.2
+  07:36:05.2
   15:43:49.8
-   4:25:09.0
-   6:49:27.5
-   2:57:52.0
+  04:25:09.0
+  06:49:27.5
+  02:57:52.0
   16:45:44.9
   21:30:57.8
-   4:25:09.2
-   6:49:27.1
-   2:57:52.5
+  04:25:09.2
+  06:49:27.1
+  02:57:52.5
   16:45:44.7
   21:30:57.6
   22:30:04.2
-   1:56:51.6
+  01:56:51.6
   24:00:00.0
   28:50:38.1
   36:31:35.2
@@ -3225,26 +3225,26 @@ AT_CHECK([cat time11.1.out], [0], [dnl
  16365:30:57
  16366:30:04
  16345:56:51
-   0:00:00.0
-  -4:50:38.1
+  00:00:00.0
+ -04:50:38.1
  -12:31:35.2
  -12:47:53.3
-  -1:26:00.5
+ -01:26:00.5
  -20:58:11.6
-  -7:36:05.2
+ -07:36:05.2
  -15:43:49.8
-  -4:25:09.0
-  -6:49:27.5
-  -2:57:52.0
+ -04:25:09.0
+ -06:49:27.5
+ -02:57:52.0
  -16:45:44.9
  -21:30:57.8
-  -4:25:09.2
-  -6:49:27.1
-  -2:57:52.5
+ -04:25:09.2
+ -06:49:27.1
+ -02:57:52.5
  -16:45:44.7
  -21:30:57.6
  -22:30:04.2
-  -1:56:51.6
+ -01:56:51.6
  -24:00:00.0
  -28:50:38.1
  -36:31:35.2
@@ -3327,26 +3327,26 @@ AT_CHECK([cat time11.1.out], [0], [dnl
    -16345:56
 ])
 AT_CHECK([cat time11.2.out], [0], [dnl
-  0:00:00.00
-  4:50:38.12
+ 00:00:00.00
+ 04:50:38.12
  12:31:35.23
  12:47:53.35
-  1:26:00.46
+ 01:26:00.46
  20:58:11.57
-  7:36:05.19
+ 07:36:05.19
  15:43:49.83
-  4:25:09.01
-  6:49:27.52
-  2:57:52.02
+ 04:25:09.01
+ 06:49:27.52
+ 02:57:52.02
  16:45:44.87
  21:30:57.82
-  4:25:09.15
-  6:49:27.11
-  2:57:52.48
+ 04:25:09.15
+ 06:49:27.11
+ 02:57:52.48
  16:45:44.66
  21:30:57.58
  22:30:04.18
-  1:56:51.59
+ 01:56:51.59
  24:00:00.00
  28:50:38.12
  36:31:35.23
@@ -3427,26 +3427,26 @@ AT_CHECK([cat time11.2.out], [0], [dnl
  16365:30:57
  16366:30:04
  16345:56:51
-  0:00:00.00
- -4:50:38.12
+ 00:00:00.00
+ -04:50:38.1
  -12:31:35.2
  -12:47:53.3
- -1:26:00.46
+ -01:26:00.5
  -20:58:11.6
- -7:36:05.19
+ -07:36:05.2
  -15:43:49.8
- -4:25:09.01
- -6:49:27.52
- -2:57:52.02
+ -04:25:09.0
+ -06:49:27.5
+ -02:57:52.0
  -16:45:44.9
  -21:30:57.8
- -4:25:09.15
- -6:49:27.11
- -2:57:52.48
+ -04:25:09.2
+ -06:49:27.1
+ -02:57:52.5
  -16:45:44.7
  -21:30:57.6
  -22:30:04.2
- -1:56:51.59
+ -01:56:51.6
  -24:00:00.0
  -28:50:38.1
  -36:31:35.2
@@ -3529,26 +3529,26 @@ AT_CHECK([cat time11.2.out], [0], [dnl
    -16345:56
 ])
 AT_CHECK([cat time12.out], [0], [dnl
-      0:00:00
-      4:50:38
+     00:00:00
+     04:50:38
      12:31:35
      12:47:53
-      1:26:00
+     01:26:00
      20:58:11
-      7:36:05
+     07:36:05
      15:43:49
-      4:25:09
-      6:49:27
-      2:57:52
+     04:25:09
+     06:49:27
+     02:57:52
      16:45:44
      21:30:57
-      4:25:09
-      6:49:27
-      2:57:52
+     04:25:09
+     06:49:27
+     02:57:52
      16:45:44
      21:30:57
      22:30:04
-      1:56:51
+     01:56:51
      24:00:00
      28:50:38
      36:31:35
@@ -3629,26 +3629,26 @@ AT_CHECK([cat time12.out], [0], [dnl
   16365:30:57
   16366:30:04
   16345:56:51
-      0:00:00
-     -4:50:38
+     00:00:00
+    -04:50:38
     -12:31:35
     -12:47:53
-     -1:26:00
+    -01:26:00
     -20:58:11
-     -7:36:05
+    -07:36:05
     -15:43:49
-     -4:25:09
-     -6:49:27
-     -2:57:52
+    -04:25:09
+    -06:49:27
+    -02:57:52
     -16:45:44
     -21:30:57
-     -4:25:09
-     -6:49:27
-     -2:57:52
+    -04:25:09
+    -06:49:27
+    -02:57:52
     -16:45:44
     -21:30:57
     -22:30:04
-     -1:56:51
+    -01:56:51
     -24:00:00
     -28:50:38
     -36:31:35
@@ -3731,26 +3731,26 @@ AT_CHECK([cat time12.out], [0], [dnl
  -16345:56:51
 ])
 AT_CHECK([cat time12.1.out], [0], [dnl
-    0:00:00.0
-    4:50:38.1
+   00:00:00.0
+   04:50:38.1
    12:31:35.2
    12:47:53.3
-    1:26:00.5
+   01:26:00.5
    20:58:11.6
-    7:36:05.2
+   07:36:05.2
    15:43:49.8
-    4:25:09.0
-    6:49:27.5
-    2:57:52.0
+   04:25:09.0
+   06:49:27.5
+   02:57:52.0
    16:45:44.9
    21:30:57.8
-    4:25:09.2
-    6:49:27.1
-    2:57:52.5
+   04:25:09.2
+   06:49:27.1
+   02:57:52.5
    16:45:44.7
    21:30:57.6
    22:30:04.2
-    1:56:51.6
+   01:56:51.6
    24:00:00.0
    28:50:38.1
    36:31:35.2
@@ -3831,26 +3831,26 @@ AT_CHECK([cat time12.1.out], [0], [dnl
   16365:30:57
   16366:30:04
   16345:56:51
-    0:00:00.0
-   -4:50:38.1
+   00:00:00.0
+  -04:50:38.1
   -12:31:35.2
   -12:47:53.3
-   -1:26:00.5
+  -01:26:00.5
   -20:58:11.6
-   -7:36:05.2
+  -07:36:05.2
   -15:43:49.8
-   -4:25:09.0
-   -6:49:27.5
-   -2:57:52.0
+  -04:25:09.0
+  -06:49:27.5
+  -02:57:52.0
   -16:45:44.9
   -21:30:57.8
-   -4:25:09.2
-   -6:49:27.1
-   -2:57:52.5
+  -04:25:09.2
+  -06:49:27.1
+  -02:57:52.5
   -16:45:44.7
   -21:30:57.6
   -22:30:04.2
-   -1:56:51.6
+  -01:56:51.6
   -24:00:00.0
   -28:50:38.1
   -36:31:35.2
@@ -3933,26 +3933,26 @@ AT_CHECK([cat time12.1.out], [0], [dnl
  -16345:56:51
 ])
 AT_CHECK([cat time12.2.out], [0], [dnl
-   0:00:00.00
-   4:50:38.12
+  00:00:00.00
+  04:50:38.12
   12:31:35.23
   12:47:53.35
-   1:26:00.46
+  01:26:00.46
   20:58:11.57
-   7:36:05.19
+  07:36:05.19
   15:43:49.83
-   4:25:09.01
-   6:49:27.52
-   2:57:52.02
+  04:25:09.01
+  06:49:27.52
+  02:57:52.02
   16:45:44.87
   21:30:57.82
-   4:25:09.15
-   6:49:27.11
-   2:57:52.48
+  04:25:09.15
+  06:49:27.11
+  02:57:52.48
   16:45:44.66
   21:30:57.58
   22:30:04.18
-   1:56:51.59
+  01:56:51.59
   24:00:00.00
   28:50:38.12
   36:31:35.23
@@ -4033,26 +4033,26 @@ AT_CHECK([cat time12.2.out], [0], [dnl
   16365:30:57
   16366:30:04
   16345:56:51
-   0:00:00.00
-  -4:50:38.12
+  00:00:00.00
+ -04:50:38.12
  -12:31:35.23
  -12:47:53.35
-  -1:26:00.46
+ -01:26:00.46
  -20:58:11.57
-  -7:36:05.19
+ -07:36:05.19
  -15:43:49.83
-  -4:25:09.01
-  -6:49:27.52
-  -2:57:52.02
+ -04:25:09.01
+ -06:49:27.52
+ -02:57:52.02
  -16:45:44.87
  -21:30:57.82
-  -4:25:09.15
-  -6:49:27.11
-  -2:57:52.48
+ -04:25:09.15
+ -06:49:27.11
+ -02:57:52.48
  -16:45:44.66
  -21:30:57.58
  -22:30:04.18
-  -1:56:51.59
+ -01:56:51.59
  -24:00:00.00
  -28:50:38.12
  -36:31:35.23
@@ -4135,26 +4135,26 @@ AT_CHECK([cat time12.2.out], [0], [dnl
  -16345:56:51
 ])
 AT_CHECK([cat time12.3.out], [0], [dnl
-  0:00:00.000
-  4:50:38.123
+ 00:00:00.000
+ 04:50:38.123
  12:31:35.235
  12:47:53.345
-  1:26:00.456
+ 01:26:00.456
  20:58:11.567
-  7:36:05.190
+ 07:36:05.190
  15:43:49.831
-  4:25:09.013
-  6:49:27.524
-  2:57:52.016
+ 04:25:09.013
+ 06:49:27.524
+ 02:57:52.016
  16:45:44.865
  21:30:57.820
-  4:25:09.154
-  6:49:27.105
-  2:57:52.482
+ 04:25:09.154
+ 06:49:27.105
+ 02:57:52.482
  16:45:44.658
  21:30:57.582
  22:30:04.183
-  1:56:51.593
+ 01:56:51.593
  24:00:00.000
  28:50:38.123
  36:31:35.235
@@ -4235,26 +4235,26 @@ AT_CHECK([cat time12.3.out], [0], [dnl
   16365:30:57
   16366:30:04
   16345:56:51
-  0:00:00.000
- -4:50:38.123
+ 00:00:00.000
+ -04:50:38.12
  -12:31:35.23
  -12:47:53.35
- -1:26:00.456
+ -01:26:00.46
  -20:58:11.57
- -7:36:05.190
+ -07:36:05.19
  -15:43:49.83
- -4:25:09.013
- -6:49:27.524
- -2:57:52.016
+ -04:25:09.01
+ -06:49:27.52
+ -02:57:52.02
  -16:45:44.87
  -21:30:57.82
- -4:25:09.154
- -6:49:27.105
- -2:57:52.482
+ -04:25:09.15
+ -06:49:27.11
+ -02:57:52.48
  -16:45:44.66
  -21:30:57.58
  -22:30:04.18
- -1:56:51.593
+ -01:56:51.59
  -24:00:00.00
  -28:50:38.12
  -36:31:35.23
@@ -4337,26 +4337,26 @@ AT_CHECK([cat time12.3.out], [0], [dnl
  -16345:56:51
 ])
 AT_CHECK([cat time13.out], [0], [dnl
-       0:00:00
-       4:50:38
+      00:00:00
+      04:50:38
       12:31:35
       12:47:53
-       1:26:00
+      01:26:00
       20:58:11
-       7:36:05
+      07:36:05
       15:43:49
-       4:25:09
-       6:49:27
-       2:57:52
+      04:25:09
+      06:49:27
+      02:57:52
       16:45:44
       21:30:57
-       4:25:09
-       6:49:27
-       2:57:52
+      04:25:09
+      06:49:27
+      02:57:52
       16:45:44
       21:30:57
       22:30:04
-       1:56:51
+      01:56:51
       24:00:00
       28:50:38
       36:31:35
@@ -4437,26 +4437,26 @@ AT_CHECK([cat time13.out], [0], [dnl
    16365:30:57
    16366:30:04
    16345:56:51
-       0:00:00
-      -4:50:38
+      00:00:00
+     -04:50:38
      -12:31:35
      -12:47:53
-      -1:26:00
+     -01:26:00
      -20:58:11
-      -7:36:05
+     -07:36:05
      -15:43:49
-      -4:25:09
-      -6:49:27
-      -2:57:52
+     -04:25:09
+     -06:49:27
+     -02:57:52
      -16:45:44
      -21:30:57
-      -4:25:09
-      -6:49:27
-      -2:57:52
+     -04:25:09
+     -06:49:27
+     -02:57:52
      -16:45:44
      -21:30:57
      -22:30:04
-      -1:56:51
+     -01:56:51
      -24:00:00
      -28:50:38
      -36:31:35
@@ -4539,26 +4539,26 @@ AT_CHECK([cat time13.out], [0], [dnl
   -16345:56:51
 ])
 AT_CHECK([cat time13.1.out], [0], [dnl
-     0:00:00.0
-     4:50:38.1
+    00:00:00.0
+    04:50:38.1
     12:31:35.2
     12:47:53.3
-     1:26:00.5
+    01:26:00.5
     20:58:11.6
-     7:36:05.2
+    07:36:05.2
     15:43:49.8
-     4:25:09.0
-     6:49:27.5
-     2:57:52.0
+    04:25:09.0
+    06:49:27.5
+    02:57:52.0
     16:45:44.9
     21:30:57.8
-     4:25:09.2
-     6:49:27.1
-     2:57:52.5
+    04:25:09.2
+    06:49:27.1
+    02:57:52.5
     16:45:44.7
     21:30:57.6
     22:30:04.2
-     1:56:51.6
+    01:56:51.6
     24:00:00.0
     28:50:38.1
     36:31:35.2
@@ -4639,26 +4639,26 @@ AT_CHECK([cat time13.1.out], [0], [dnl
  16365:30:57.6
  16366:30:04.2
  16345:56:51.6
-     0:00:00.0
-    -4:50:38.1
+    00:00:00.0
+   -04:50:38.1
    -12:31:35.2
    -12:47:53.3
-    -1:26:00.5
+   -01:26:00.5
    -20:58:11.6
-    -7:36:05.2
+   -07:36:05.2
    -15:43:49.8
-    -4:25:09.0
-    -6:49:27.5
-    -2:57:52.0
+   -04:25:09.0
+   -06:49:27.5
+   -02:57:52.0
    -16:45:44.9
    -21:30:57.8
-    -4:25:09.2
-    -6:49:27.1
-    -2:57:52.5
+   -04:25:09.2
+   -06:49:27.1
+   -02:57:52.5
    -16:45:44.7
    -21:30:57.6
    -22:30:04.2
-    -1:56:51.6
+   -01:56:51.6
    -24:00:00.0
    -28:50:38.1
    -36:31:35.2
@@ -4741,26 +4741,26 @@ AT_CHECK([cat time13.1.out], [0], [dnl
   -16345:56:51
 ])
 AT_CHECK([cat time13.2.out], [0], [dnl
-    0:00:00.00
-    4:50:38.12
+   00:00:00.00
+   04:50:38.12
    12:31:35.23
    12:47:53.35
-    1:26:00.46
+   01:26:00.46
    20:58:11.57
-    7:36:05.19
+   07:36:05.19
    15:43:49.83
-    4:25:09.01
-    6:49:27.52
-    2:57:52.02
+   04:25:09.01
+   06:49:27.52
+   02:57:52.02
    16:45:44.87
    21:30:57.82
-    4:25:09.15
-    6:49:27.11
-    2:57:52.48
+   04:25:09.15
+   06:49:27.11
+   02:57:52.48
    16:45:44.66
    21:30:57.58
    22:30:04.18
-    1:56:51.59
+   01:56:51.59
    24:00:00.00
    28:50:38.12
    36:31:35.23
@@ -4841,26 +4841,26 @@ AT_CHECK([cat time13.2.out], [0], [dnl
  16365:30:57.6
  16366:30:04.2
  16345:56:51.6
-    0:00:00.00
-   -4:50:38.12
+   00:00:00.00
+  -04:50:38.12
   -12:31:35.23
   -12:47:53.35
-   -1:26:00.46
+  -01:26:00.46
   -20:58:11.57
-   -7:36:05.19
+  -07:36:05.19
   -15:43:49.83
-   -4:25:09.01
-   -6:49:27.52
-   -2:57:52.02
+  -04:25:09.01
+  -06:49:27.52
+  -02:57:52.02
   -16:45:44.87
   -21:30:57.82
-   -4:25:09.15
-   -6:49:27.11
-   -2:57:52.48
+  -04:25:09.15
+  -06:49:27.11
+  -02:57:52.48
   -16:45:44.66
   -21:30:57.58
   -22:30:04.18
-   -1:56:51.59
+  -01:56:51.59
   -24:00:00.00
   -28:50:38.12
   -36:31:35.23
@@ -4943,26 +4943,26 @@ AT_CHECK([cat time13.2.out], [0], [dnl
   -16345:56:51
 ])
 AT_CHECK([cat time13.3.out], [0], [dnl
-   0:00:00.000
-   4:50:38.123
+  00:00:00.000
+  04:50:38.123
   12:31:35.235
   12:47:53.345
-   1:26:00.456
+  01:26:00.456
   20:58:11.567
-   7:36:05.190
+  07:36:05.190
   15:43:49.831
-   4:25:09.013
-   6:49:27.524
-   2:57:52.016
+  04:25:09.013
+  06:49:27.524
+  02:57:52.016
   16:45:44.865
   21:30:57.820
-   4:25:09.154
-   6:49:27.105
-   2:57:52.482
+  04:25:09.154
+  06:49:27.105
+  02:57:52.482
   16:45:44.658
   21:30:57.582
   22:30:04.183
-   1:56:51.593
+  01:56:51.593
   24:00:00.000
   28:50:38.123
   36:31:35.235
@@ -5043,26 +5043,26 @@ AT_CHECK([cat time13.3.out], [0], [dnl
  16365:30:57.6
  16366:30:04.2
  16345:56:51.6
-   0:00:00.000
-  -4:50:38.123
+  00:00:00.000
+ -04:50:38.123
  -12:31:35.235
  -12:47:53.345
-  -1:26:00.456
+ -01:26:00.456
  -20:58:11.567
-  -7:36:05.190
+ -07:36:05.190
  -15:43:49.831
-  -4:25:09.013
-  -6:49:27.524
-  -2:57:52.016
+ -04:25:09.013
+ -06:49:27.524
+ -02:57:52.016
  -16:45:44.865
  -21:30:57.820
-  -4:25:09.154
-  -6:49:27.105
-  -2:57:52.482
+ -04:25:09.154
+ -06:49:27.105
+ -02:57:52.482
  -16:45:44.658
  -21:30:57.582
  -22:30:04.183
-  -1:56:51.593
+ -01:56:51.593
  -24:00:00.000
  -28:50:38.123
  -36:31:35.235
@@ -5145,26 +5145,26 @@ AT_CHECK([cat time13.3.out], [0], [dnl
   -16345:56:51
 ])
 AT_CHECK([cat time13.4.out], [0], [dnl
-  0:00:00.0000
-  4:50:38.1230
+ 00:00:00.0000
+ 04:50:38.1230
  12:31:35.2345
  12:47:53.3451
-  1:26:00.4561
+ 01:26:00.4561
  20:58:11.5668
-  7:36:05.1896
+ 07:36:05.1896
  15:43:49.8313
-  4:25:09.0129
-  6:49:27.5238
-  2:57:52.0156
+ 04:25:09.0129
+ 06:49:27.5238
+ 02:57:52.0156
  16:45:44.8653
  21:30:57.8205
-  4:25:09.1539
-  6:49:27.1053
-  2:57:52.4823
+ 04:25:09.1539
+ 06:49:27.1053
+ 02:57:52.4823
  16:45:44.6583
  21:30:57.5822
  22:30:04.1835
-  1:56:51.5932
+ 01:56:51.5932
  24:00:00.0000
  28:50:38.1230
  36:31:35.2345
@@ -5245,26 +5245,26 @@ AT_CHECK([cat time13.4.out], [0], [dnl
  16365:30:57.6
  16366:30:04.2
  16345:56:51.6
-  0:00:00.0000
- -4:50:38.1230
+ 00:00:00.0000
+ -04:50:38.123
  -12:31:35.235
  -12:47:53.345
- -1:26:00.4561
+ -01:26:00.456
  -20:58:11.567
- -7:36:05.1896
+ -07:36:05.190
  -15:43:49.831
- -4:25:09.0129
- -6:49:27.5238
- -2:57:52.0156
+ -04:25:09.013
+ -06:49:27.524
+ -02:57:52.016
  -16:45:44.865
  -21:30:57.820
- -4:25:09.1539
- -6:49:27.1053
- -2:57:52.4823
+ -04:25:09.154
+ -06:49:27.105
+ -02:57:52.482
  -16:45:44.658
  -21:30:57.582
  -22:30:04.183
- -1:56:51.5932
+ -01:56:51.593
  -24:00:00.000
  -28:50:38.123
  -36:31:35.235
@@ -5347,26 +5347,26 @@ AT_CHECK([cat time13.4.out], [0], [dnl
   -16345:56:51
 ])
 AT_CHECK([cat time14.out], [0], [dnl
-        0:00:00
-        4:50:38
+       00:00:00
+       04:50:38
        12:31:35
        12:47:53
-        1:26:00
+       01:26:00
        20:58:11
-        7:36:05
+       07:36:05
        15:43:49
-        4:25:09
-        6:49:27
-        2:57:52
+       04:25:09
+       06:49:27
+       02:57:52
        16:45:44
        21:30:57
-        4:25:09
-        6:49:27
-        2:57:52
+       04:25:09
+       06:49:27
+       02:57:52
        16:45:44
        21:30:57
        22:30:04
-        1:56:51
+       01:56:51
        24:00:00
        28:50:38
        36:31:35
@@ -5447,26 +5447,26 @@ AT_CHECK([cat time14.out], [0], [dnl
     16365:30:57
     16366:30:04
     16345:56:51
-        0:00:00
-       -4:50:38
+       00:00:00
+      -04:50:38
       -12:31:35
       -12:47:53
-       -1:26:00
+      -01:26:00
       -20:58:11
-       -7:36:05
+      -07:36:05
       -15:43:49
-       -4:25:09
-       -6:49:27
-       -2:57:52
+      -04:25:09
+      -06:49:27
+      -02:57:52
       -16:45:44
       -21:30:57
-       -4:25:09
-       -6:49:27
-       -2:57:52
+      -04:25:09
+      -06:49:27
+      -02:57:52
       -16:45:44
       -21:30:57
       -22:30:04
-       -1:56:51
+      -01:56:51
       -24:00:00
       -28:50:38
       -36:31:35
@@ -5549,26 +5549,26 @@ AT_CHECK([cat time14.out], [0], [dnl
    -16345:56:51
 ])
 AT_CHECK([cat time14.1.out], [0], [dnl
-      0:00:00.0
-      4:50:38.1
+     00:00:00.0
+     04:50:38.1
      12:31:35.2
      12:47:53.3
-      1:26:00.5
+     01:26:00.5
      20:58:11.6
-      7:36:05.2
+     07:36:05.2
      15:43:49.8
-      4:25:09.0
-      6:49:27.5
-      2:57:52.0
+     04:25:09.0
+     06:49:27.5
+     02:57:52.0
      16:45:44.9
      21:30:57.8
-      4:25:09.2
-      6:49:27.1
-      2:57:52.5
+     04:25:09.2
+     06:49:27.1
+     02:57:52.5
      16:45:44.7
      21:30:57.6
      22:30:04.2
-      1:56:51.6
+     01:56:51.6
      24:00:00.0
      28:50:38.1
      36:31:35.2
@@ -5649,26 +5649,26 @@ AT_CHECK([cat time14.1.out], [0], [dnl
   16365:30:57.6
   16366:30:04.2
   16345:56:51.6
-      0:00:00.0
-     -4:50:38.1
+     00:00:00.0
+    -04:50:38.1
     -12:31:35.2
     -12:47:53.3
-     -1:26:00.5
+    -01:26:00.5
     -20:58:11.6
-     -7:36:05.2
+    -07:36:05.2
     -15:43:49.8
-     -4:25:09.0
-     -6:49:27.5
-     -2:57:52.0
+    -04:25:09.0
+    -06:49:27.5
+    -02:57:52.0
     -16:45:44.9
     -21:30:57.8
-     -4:25:09.2
-     -6:49:27.1
-     -2:57:52.5
+    -04:25:09.2
+    -06:49:27.1
+    -02:57:52.5
     -16:45:44.7
     -21:30:57.6
     -22:30:04.2
-     -1:56:51.6
+    -01:56:51.6
     -24:00:00.0
     -28:50:38.1
     -36:31:35.2
@@ -5751,26 +5751,26 @@ AT_CHECK([cat time14.1.out], [0], [dnl
  -16345:56:51.6
 ])
 AT_CHECK([cat time14.2.out], [0], [dnl
-     0:00:00.00
-     4:50:38.12
+    00:00:00.00
+    04:50:38.12
     12:31:35.23
     12:47:53.35
-     1:26:00.46
+    01:26:00.46
     20:58:11.57
-     7:36:05.19
+    07:36:05.19
     15:43:49.83
-     4:25:09.01
-     6:49:27.52
-     2:57:52.02
+    04:25:09.01
+    06:49:27.52
+    02:57:52.02
     16:45:44.87
     21:30:57.82
-     4:25:09.15
-     6:49:27.11
-     2:57:52.48
+    04:25:09.15
+    06:49:27.11
+    02:57:52.48
     16:45:44.66
     21:30:57.58
     22:30:04.18
-     1:56:51.59
+    01:56:51.59
     24:00:00.00
     28:50:38.12
     36:31:35.23
@@ -5851,26 +5851,26 @@ AT_CHECK([cat time14.2.out], [0], [dnl
  16365:30:57.58
  16366:30:04.18
  16345:56:51.59
-     0:00:00.00
-    -4:50:38.12
+    00:00:00.00
+   -04:50:38.12
    -12:31:35.23
    -12:47:53.35
-    -1:26:00.46
+   -01:26:00.46
    -20:58:11.57
-    -7:36:05.19
+   -07:36:05.19
    -15:43:49.83
-    -4:25:09.01
-    -6:49:27.52
-    -2:57:52.02
+   -04:25:09.01
+   -06:49:27.52
+   -02:57:52.02
    -16:45:44.87
    -21:30:57.82
-    -4:25:09.15
-    -6:49:27.11
-    -2:57:52.48
+   -04:25:09.15
+   -06:49:27.11
+   -02:57:52.48
    -16:45:44.66
    -21:30:57.58
    -22:30:04.18
-    -1:56:51.59
+   -01:56:51.59
    -24:00:00.00
    -28:50:38.12
    -36:31:35.23
@@ -5953,26 +5953,26 @@ AT_CHECK([cat time14.2.out], [0], [dnl
  -16345:56:51.6
 ])
 AT_CHECK([cat time14.3.out], [0], [dnl
-    0:00:00.000
-    4:50:38.123
+   00:00:00.000
+   04:50:38.123
    12:31:35.235
    12:47:53.345
-    1:26:00.456
+   01:26:00.456
    20:58:11.567
-    7:36:05.190
+   07:36:05.190
    15:43:49.831
-    4:25:09.013
-    6:49:27.524
-    2:57:52.016
+   04:25:09.013
+   06:49:27.524
+   02:57:52.016
    16:45:44.865
    21:30:57.820
-    4:25:09.154
-    6:49:27.105
-    2:57:52.482
+   04:25:09.154
+   06:49:27.105
+   02:57:52.482
    16:45:44.658
    21:30:57.582
    22:30:04.183
-    1:56:51.593
+   01:56:51.593
    24:00:00.000
    28:50:38.123
    36:31:35.235
@@ -6053,26 +6053,26 @@ AT_CHECK([cat time14.3.out], [0], [dnl
  16365:30:57.58
  16366:30:04.18
  16345:56:51.59
-    0:00:00.000
-   -4:50:38.123
+   00:00:00.000
+  -04:50:38.123
   -12:31:35.235
   -12:47:53.345
-   -1:26:00.456
+  -01:26:00.456
   -20:58:11.567
-   -7:36:05.190
+  -07:36:05.190
   -15:43:49.831
-   -4:25:09.013
-   -6:49:27.524
-   -2:57:52.016
+  -04:25:09.013
+  -06:49:27.524
+  -02:57:52.016
   -16:45:44.865
   -21:30:57.820
-   -4:25:09.154
-   -6:49:27.105
-   -2:57:52.482
+  -04:25:09.154
+  -06:49:27.105
+  -02:57:52.482
   -16:45:44.658
   -21:30:57.582
   -22:30:04.183
-   -1:56:51.593
+  -01:56:51.593
   -24:00:00.000
   -28:50:38.123
   -36:31:35.235
@@ -6155,26 +6155,26 @@ AT_CHECK([cat time14.3.out], [0], [dnl
  -16345:56:51.6
 ])
 AT_CHECK([cat time14.4.out], [0], [dnl
-   0:00:00.0000
-   4:50:38.1230
+  00:00:00.0000
+  04:50:38.1230
   12:31:35.2345
   12:47:53.3451
-   1:26:00.4561
+  01:26:00.4561
   20:58:11.5668
-   7:36:05.1896
+  07:36:05.1896
   15:43:49.8313
-   4:25:09.0129
-   6:49:27.5238
-   2:57:52.0156
+  04:25:09.0129
+  06:49:27.5238
+  02:57:52.0156
   16:45:44.8653
   21:30:57.8205
-   4:25:09.1539
-   6:49:27.1053
-   2:57:52.4823
+  04:25:09.1539
+  06:49:27.1053
+  02:57:52.4823
   16:45:44.6583
   21:30:57.5822
   22:30:04.1835
-   1:56:51.5932
+  01:56:51.5932
   24:00:00.0000
   28:50:38.1230
   36:31:35.2345
@@ -6255,26 +6255,26 @@ AT_CHECK([cat time14.4.out], [0], [dnl
  16365:30:57.58
  16366:30:04.18
  16345:56:51.59
-   0:00:00.0000
-  -4:50:38.1230
+  00:00:00.0000
+ -04:50:38.1230
  -12:31:35.2345
  -12:47:53.3451
-  -1:26:00.4561
+ -01:26:00.4561
  -20:58:11.5668
-  -7:36:05.1896
+ -07:36:05.1896
  -15:43:49.8313
-  -4:25:09.0129
-  -6:49:27.5238
-  -2:57:52.0156
+ -04:25:09.0129
+ -06:49:27.5238
+ -02:57:52.0156
  -16:45:44.8653
  -21:30:57.8205
-  -4:25:09.1539
-  -6:49:27.1053
-  -2:57:52.4823
+ -04:25:09.1539
+ -06:49:27.1053
+ -02:57:52.4823
  -16:45:44.6583
  -21:30:57.5822
  -22:30:04.1835
-  -1:56:51.5932
+ -01:56:51.5932
  -24:00:00.0000
  -28:50:38.1230
  -36:31:35.2345
@@ -6357,26 +6357,26 @@ AT_CHECK([cat time14.4.out], [0], [dnl
  -16345:56:51.6
 ])
 AT_CHECK([cat time14.5.out], [0], [dnl
-  0:00:00.00000
-  4:50:38.12301
+ 00:00:00.00000
+ 04:50:38.12301
  12:31:35.23453
  12:47:53.34505
-  1:26:00.45615
+ 01:26:00.45615
  20:58:11.56677
-  7:36:05.18964
+ 07:36:05.18964
  15:43:49.83132
-  4:25:09.01293
-  6:49:27.52375
-  2:57:52.01565
+ 04:25:09.01293
+ 06:49:27.52375
+ 02:57:52.01565
  16:45:44.86529
  21:30:57.82047
-  4:25:09.15395
-  6:49:27.10533
-  2:57:52.48229
+ 04:25:09.15395
+ 06:49:27.10533
+ 02:57:52.48229
  16:45:44.65827
  21:30:57.58219
  22:30:04.18347
-  1:56:51.59319
+ 01:56:51.59319
  24:00:00.00000
  28:50:38.12301
  36:31:35.23453
@@ -6457,26 +6457,26 @@ AT_CHECK([cat time14.5.out], [0], [dnl
  16365:30:57.58
  16366:30:04.18
  16345:56:51.59
-  0:00:00.00000
- -4:50:38.12301
+ 00:00:00.00000
+ -04:50:38.1230
  -12:31:35.2345
  -12:47:53.3451
- -1:26:00.45615
+ -01:26:00.4561
  -20:58:11.5668
- -7:36:05.18964
+ -07:36:05.1896
  -15:43:49.8313
- -4:25:09.01293
- -6:49:27.52375
- -2:57:52.01565
+ -04:25:09.0129
+ -06:49:27.5238
+ -02:57:52.0156
  -16:45:44.8653
  -21:30:57.8205
- -4:25:09.15395
- -6:49:27.10533
- -2:57:52.48229
+ -04:25:09.1539
+ -06:49:27.1053
+ -02:57:52.4823
  -16:45:44.6583
  -21:30:57.5822
  -22:30:04.1835
- -1:56:51.59319
+ -01:56:51.5932
  -24:00:00.0000
  -28:50:38.1230
  -36:31:35.2345
@@ -6559,26 +6559,26 @@ AT_CHECK([cat time14.5.out], [0], [dnl
  -16345:56:51.6
 ])
 AT_CHECK([cat time15.out], [0], [dnl
-         0:00:00
-         4:50:38
+        00:00:00
+        04:50:38
         12:31:35
         12:47:53
-         1:26:00
+        01:26:00
         20:58:11
-         7:36:05
+        07:36:05
         15:43:49
-         4:25:09
-         6:49:27
-         2:57:52
+        04:25:09
+        06:49:27
+        02:57:52
         16:45:44
         21:30:57
-         4:25:09
-         6:49:27
-         2:57:52
+        04:25:09
+        06:49:27
+        02:57:52
         16:45:44
         21:30:57
         22:30:04
-         1:56:51
+        01:56:51
         24:00:00
         28:50:38
         36:31:35
@@ -6659,26 +6659,26 @@ AT_CHECK([cat time15.out], [0], [dnl
      16365:30:57
      16366:30:04
      16345:56:51
-         0:00:00
-        -4:50:38
+        00:00:00
+       -04:50:38
        -12:31:35
        -12:47:53
-        -1:26:00
+       -01:26:00
        -20:58:11
-        -7:36:05
+       -07:36:05
        -15:43:49
-        -4:25:09
-        -6:49:27
-        -2:57:52
+       -04:25:09
+       -06:49:27
+       -02:57:52
        -16:45:44
        -21:30:57
-        -4:25:09
-        -6:49:27
-        -2:57:52
+       -04:25:09
+       -06:49:27
+       -02:57:52
        -16:45:44
        -21:30:57
        -22:30:04
-        -1:56:51
+       -01:56:51
        -24:00:00
        -28:50:38
        -36:31:35
@@ -6761,26 +6761,26 @@ AT_CHECK([cat time15.out], [0], [dnl
     -16345:56:51
 ])
 AT_CHECK([cat time15.1.out], [0], [dnl
-       0:00:00.0
-       4:50:38.1
+      00:00:00.0
+      04:50:38.1
       12:31:35.2
       12:47:53.3
-       1:26:00.5
+      01:26:00.5
       20:58:11.6
-       7:36:05.2
+      07:36:05.2
       15:43:49.8
-       4:25:09.0
-       6:49:27.5
-       2:57:52.0
+      04:25:09.0
+      06:49:27.5
+      02:57:52.0
       16:45:44.9
       21:30:57.8
-       4:25:09.2
-       6:49:27.1
-       2:57:52.5
+      04:25:09.2
+      06:49:27.1
+      02:57:52.5
       16:45:44.7
       21:30:57.6
       22:30:04.2
-       1:56:51.6
+      01:56:51.6
       24:00:00.0
       28:50:38.1
       36:31:35.2
@@ -6861,26 +6861,26 @@ AT_CHECK([cat time15.1.out], [0], [dnl
    16365:30:57.6
    16366:30:04.2
    16345:56:51.6
-       0:00:00.0
-      -4:50:38.1
+      00:00:00.0
+     -04:50:38.1
      -12:31:35.2
      -12:47:53.3
-      -1:26:00.5
+     -01:26:00.5
      -20:58:11.6
-      -7:36:05.2
+     -07:36:05.2
      -15:43:49.8
-      -4:25:09.0
-      -6:49:27.5
-      -2:57:52.0
+     -04:25:09.0
+     -06:49:27.5
+     -02:57:52.0
      -16:45:44.9
      -21:30:57.8
-      -4:25:09.2
-      -6:49:27.1
-      -2:57:52.5
+     -04:25:09.2
+     -06:49:27.1
+     -02:57:52.5
      -16:45:44.7
      -21:30:57.6
      -22:30:04.2
-      -1:56:51.6
+     -01:56:51.6
      -24:00:00.0
      -28:50:38.1
      -36:31:35.2
@@ -6963,26 +6963,26 @@ AT_CHECK([cat time15.1.out], [0], [dnl
   -16345:56:51.6
 ])
 AT_CHECK([cat time15.2.out], [0], [dnl
-      0:00:00.00
-      4:50:38.12
+     00:00:00.00
+     04:50:38.12
      12:31:35.23
      12:47:53.35
-      1:26:00.46
+     01:26:00.46
      20:58:11.57
-      7:36:05.19
+     07:36:05.19
      15:43:49.83
-      4:25:09.01
-      6:49:27.52
-      2:57:52.02
+     04:25:09.01
+     06:49:27.52
+     02:57:52.02
      16:45:44.87
      21:30:57.82
-      4:25:09.15
-      6:49:27.11
-      2:57:52.48
+     04:25:09.15
+     06:49:27.11
+     02:57:52.48
      16:45:44.66
      21:30:57.58
      22:30:04.18
-      1:56:51.59
+     01:56:51.59
      24:00:00.00
      28:50:38.12
      36:31:35.23
@@ -7063,26 +7063,26 @@ AT_CHECK([cat time15.2.out], [0], [dnl
   16365:30:57.58
   16366:30:04.18
   16345:56:51.59
-      0:00:00.00
-     -4:50:38.12
+     00:00:00.00
+    -04:50:38.12
     -12:31:35.23
     -12:47:53.35
-     -1:26:00.46
+    -01:26:00.46
     -20:58:11.57
-     -7:36:05.19
+    -07:36:05.19
     -15:43:49.83
-     -4:25:09.01
-     -6:49:27.52
-     -2:57:52.02
+    -04:25:09.01
+    -06:49:27.52
+    -02:57:52.02
     -16:45:44.87
     -21:30:57.82
-     -4:25:09.15
-     -6:49:27.11
-     -2:57:52.48
+    -04:25:09.15
+    -06:49:27.11
+    -02:57:52.48
     -16:45:44.66
     -21:30:57.58
     -22:30:04.18
-     -1:56:51.59
+    -01:56:51.59
     -24:00:00.00
     -28:50:38.12
     -36:31:35.23
@@ -7165,26 +7165,26 @@ AT_CHECK([cat time15.2.out], [0], [dnl
  -16345:56:51.59
 ])
 AT_CHECK([cat time15.3.out], [0], [dnl
-     0:00:00.000
-     4:50:38.123
+    00:00:00.000
+    04:50:38.123
     12:31:35.235
     12:47:53.345
-     1:26:00.456
+    01:26:00.456
     20:58:11.567
-     7:36:05.190
+    07:36:05.190
     15:43:49.831
-     4:25:09.013
-     6:49:27.524
-     2:57:52.016
+    04:25:09.013
+    06:49:27.524
+    02:57:52.016
     16:45:44.865
     21:30:57.820
-     4:25:09.154
-     6:49:27.105
-     2:57:52.482
+    04:25:09.154
+    06:49:27.105
+    02:57:52.482
     16:45:44.658
     21:30:57.582
     22:30:04.183
-     1:56:51.593
+    01:56:51.593
     24:00:00.000
     28:50:38.123
     36:31:35.235
@@ -7265,26 +7265,26 @@ AT_CHECK([cat time15.3.out], [0], [dnl
  16365:30:57.582
  16366:30:04.183
  16345:56:51.593
-     0:00:00.000
-    -4:50:38.123
+    00:00:00.000
+   -04:50:38.123
    -12:31:35.235
    -12:47:53.345
-    -1:26:00.456
+   -01:26:00.456
    -20:58:11.567
-    -7:36:05.190
+   -07:36:05.190
    -15:43:49.831
-    -4:25:09.013
-    -6:49:27.524
-    -2:57:52.016
+   -04:25:09.013
+   -06:49:27.524
+   -02:57:52.016
    -16:45:44.865
    -21:30:57.820
-    -4:25:09.154
-    -6:49:27.105
-    -2:57:52.482
+   -04:25:09.154
+   -06:49:27.105
+   -02:57:52.482
    -16:45:44.658
    -21:30:57.582
    -22:30:04.183
-    -1:56:51.593
+   -01:56:51.593
    -24:00:00.000
    -28:50:38.123
    -36:31:35.235
@@ -7367,26 +7367,26 @@ AT_CHECK([cat time15.3.out], [0], [dnl
  -16345:56:51.59
 ])
 AT_CHECK([cat time15.4.out], [0], [dnl
-    0:00:00.0000
-    4:50:38.1230
+   00:00:00.0000
+   04:50:38.1230
    12:31:35.2345
    12:47:53.3451
-    1:26:00.4561
+   01:26:00.4561
    20:58:11.5668
-    7:36:05.1896
+   07:36:05.1896
    15:43:49.8313
-    4:25:09.0129
-    6:49:27.5238
-    2:57:52.0156
+   04:25:09.0129
+   06:49:27.5238
+   02:57:52.0156
    16:45:44.8653
    21:30:57.8205
-    4:25:09.1539
-    6:49:27.1053
-    2:57:52.4823
+   04:25:09.1539
+   06:49:27.1053
+   02:57:52.4823
    16:45:44.6583
    21:30:57.5822
    22:30:04.1835
-    1:56:51.5932
+   01:56:51.5932
    24:00:00.0000
    28:50:38.1230
    36:31:35.2345
@@ -7467,26 +7467,26 @@ AT_CHECK([cat time15.4.out], [0], [dnl
  16365:30:57.582
  16366:30:04.183
  16345:56:51.593
-    0:00:00.0000
-   -4:50:38.1230
+   00:00:00.0000
+  -04:50:38.1230
   -12:31:35.2345
   -12:47:53.3451
-   -1:26:00.4561
+  -01:26:00.4561
   -20:58:11.5668
-   -7:36:05.1896
+  -07:36:05.1896
   -15:43:49.8313
-   -4:25:09.0129
-   -6:49:27.5238
-   -2:57:52.0156
+  -04:25:09.0129
+  -06:49:27.5238
+  -02:57:52.0156
   -16:45:44.8653
   -21:30:57.8205
-   -4:25:09.1539
-   -6:49:27.1053
-   -2:57:52.4823
+  -04:25:09.1539
+  -06:49:27.1053
+  -02:57:52.4823
   -16:45:44.6583
   -21:30:57.5822
   -22:30:04.1835
-   -1:56:51.5932
+  -01:56:51.5932
   -24:00:00.0000
   -28:50:38.1230
   -36:31:35.2345
@@ -7569,26 +7569,26 @@ AT_CHECK([cat time15.4.out], [0], [dnl
  -16345:56:51.59
 ])
 AT_CHECK([cat time15.5.out], [0], [dnl
-   0:00:00.00000
-   4:50:38.12301
+  00:00:00.00000
+  04:50:38.12301
   12:31:35.23453
   12:47:53.34505
-   1:26:00.45615
+  01:26:00.45615
   20:58:11.56677
-   7:36:05.18964
+  07:36:05.18964
   15:43:49.83132
-   4:25:09.01293
-   6:49:27.52375
-   2:57:52.01565
+  04:25:09.01293
+  06:49:27.52375
+  02:57:52.01565
   16:45:44.86529
   21:30:57.82047
-   4:25:09.15395
-   6:49:27.10533
-   2:57:52.48229
+  04:25:09.15395
+  06:49:27.10533
+  02:57:52.48229
   16:45:44.65827
   21:30:57.58219
   22:30:04.18347
-   1:56:51.59319
+  01:56:51.59319
   24:00:00.00000
   28:50:38.12301
   36:31:35.23453
@@ -7669,26 +7669,26 @@ AT_CHECK([cat time15.5.out], [0], [dnl
  16365:30:57.582
  16366:30:04.183
  16345:56:51.593
-   0:00:00.00000
-  -4:50:38.12301
+  00:00:00.00000
+ -04:50:38.12301
  -12:31:35.23453
  -12:47:53.34505
-  -1:26:00.45615
+ -01:26:00.45615
  -20:58:11.56677
-  -7:36:05.18964
+ -07:36:05.18964
  -15:43:49.83132
-  -4:25:09.01293
-  -6:49:27.52375
-  -2:57:52.01565
+ -04:25:09.01293
+ -06:49:27.52375
+ -02:57:52.01565
  -16:45:44.86529
  -21:30:57.82047
-  -4:25:09.15395
-  -6:49:27.10533
-  -2:57:52.48229
+ -04:25:09.15395
+ -06:49:27.10533
+ -02:57:52.48229
  -16:45:44.65827
  -21:30:57.58219
  -22:30:04.18347
-  -1:56:51.59319
+ -01:56:51.59319
  -24:00:00.00000
  -28:50:38.12301
  -36:31:35.23453
@@ -7771,26 +7771,26 @@ AT_CHECK([cat time15.5.out], [0], [dnl
  -16345:56:51.59
 ])
 AT_CHECK([cat time15.6.out], [0], [dnl
-  0:00:00.000000
-  4:50:38.123010
+ 00:00:00.000000
+ 04:50:38.123010
  12:31:35.234530
  12:47:53.345050
-  1:26:00.456150
+ 01:26:00.456150
  20:58:11.566770
-  7:36:05.189640
+ 07:36:05.189640
  15:43:49.831320
-  4:25:09.012930
-  6:49:27.523750
-  2:57:52.015650
+ 04:25:09.012930
+ 06:49:27.523750
+ 02:57:52.015650
  16:45:44.865290
  21:30:57.820470
-  4:25:09.153950
-  6:49:27.105330
-  2:57:52.482290
+ 04:25:09.153950
+ 06:49:27.105330
+ 02:57:52.482290
  16:45:44.658270
  21:30:57.582190
  22:30:04.183470
-  1:56:51.593190
+ 01:56:51.593190
  24:00:00.000000
  28:50:38.123010
  36:31:35.234530
@@ -7871,26 +7871,26 @@ AT_CHECK([cat time15.6.out], [0], [dnl
  16365:30:57.582
  16366:30:04.183
  16345:56:51.593
-  0:00:00.000000
- -4:50:38.123010
+ 00:00:00.000000
+ -04:50:38.12301
  -12:31:35.23453
  -12:47:53.34505
- -1:26:00.456150
+ -01:26:00.45615
  -20:58:11.56677
- -7:36:05.189640
+ -07:36:05.18964
  -15:43:49.83132
- -4:25:09.012930
- -6:49:27.523750
- -2:57:52.015650
+ -04:25:09.01293
+ -06:49:27.52375
+ -02:57:52.01565
  -16:45:44.86529
  -21:30:57.82047
- -4:25:09.153950
- -6:49:27.105330
- -2:57:52.482290
+ -04:25:09.15395
+ -06:49:27.10533
+ -02:57:52.48229
  -16:45:44.65827
  -21:30:57.58219
  -22:30:04.18347
- -1:56:51.593190
+ -01:56:51.59319
  -24:00:00.00000
  -28:50:38.12301
  -36:31:35.23453

diff --git a/tests/language/data-io/get-data-psql.at b/tests/language/data-io/get-data-psql.at
index f1ebd3404ea977683b33a67e0fca4895c82ee213..2cf33fd1b33cd13e5634e548f13a7829a8beb909 100644 (file)
--- a/tests/language/data-io/get-data-psql.at
+++ b/tests/language/data-io/get-data-psql.at
@@ -189,9 +189,9 @@ timetz_zone,22,,Scale,Input,8,Right,F8.2,F8.2,
 
 Table: Data List
 bool,bytea,char,int8,int2,int4,numeric,text,oid,float4,float8,money,pbchar,varchar,date,time,timestamp,timestamptz,interval,interval_months,timetz,timetz_zone
-.00,30,a,.00,.00,.00,-2.560980E+002,this-long-text,.00,.00,.00,$.01,a,A,01-JAN-2000,0:00:00,08-JAN-1999 04:05:06,08-JAN-1999 12:05:06,0 00:01:00,0,10:09:00,4.00
+.00,30,a,.00,.00,.00,-2.560980E+002,this-long-text,.00,.00,.00,$.01,a,A,01-JAN-2000,00:00:00,08-JAN-1999 04:05:06,08-JAN-1999 12:05:06,0 00:01:00,0,10:09:00,4.00
 .  ,,,.  ,.  ,.  ,.          ,,.  ,.  ,.  ,.  ,,,.,.,.,.,.,.,.,.  @&t@
-1.00,31,b,1.00,1.00,1.00,6.553500E+004,that-long-text,.00,1.00,1.00,$1.23,b,B,10-JAN-1963,1:05:02,10-JAN-1963 23:58:00,10-JAN-1963 22:58:00,12 01:03:04,25,1:05:02,-7.00
+1.00,31,b,1.00,1.00,1.00,6.553500E+004,that-long-text,.00,1.00,1.00,$1.23,b,B,10-JAN-1963,01:05:02,10-JAN-1963 23:58:00,10-JAN-1963 22:58:00,12 01:03:04,25,01:05:02,-7.00
 ])
 
 dnl Test query with empty result set.