stdio-common: Add 'a', 'g' conversion tests for 0x. scanf input [BZ #12701]

Verify that 0x. input is rejected by 'a' and 'g' conversions (and their
uppercase counterparts).  Replace 0x0p0 input with 0x.0p0 rather than
adding new one, because 0x0 significand is already covered by 0x0p+0
data, so there's no need to keep this duplication.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>

24 files changed, 1584 insertions, 1584 deletions

diff --git a/sysdeps/ieee754/dbl-64/tst-scanf-format-double-a.input b/sysdeps/ieee754/dbl-64/tst-scanf-format-double-a.input
index ba9e02f..c0a5b83 100644
--- a/sysdeps/ieee754/dbl-64/tst-scanf-format-double-a.input
+++ b/sysdeps/ieee754/dbl-64/tst-scanf-format-double-a.input
@@ -14,8 +14,8 @@
 %*la:-0x8p-1025:0:10:
 %la:-0x0p+0:1:7:-0x0:
 %*la:-0x0p+0:0:7:
-%la:-0x0p0:1:6:-0x0:
-%*la:-0x0p0:0:6:
+%la:-0x.0p0:1:7:-0x0:
+%*la:-0x.0p0:0:7:
 %la:-nan(09A_Zaz):1:13:-nan:
 %*la:-nan(09A_Zaz):0:13:
 %la:-nan():1:6:-nan:
@@ -24,8 +24,8 @@
 %*la:nan():0:5:
 %la:nan(09A_Zaz):1:12:nan:
 %*la:nan(09A_Zaz):0:12:
-%la:0x0p0:1:5:0x0:
-%*la:0x0p0:0:5:
+%la:0x.0p0:1:6:0x0:
+%*la:0x.0p0:0:6:
 %la:0x0p+0:1:6:0x0:
 %*la:0x0p+0:0:6:
 %la:0x8p-1025:1:9:0x1p-1022:
@@ -44,8 +44,8 @@
 %*la:+nan():0:6:
 %la:+nan(09A_Zaz):1:13:nan:
 %*la:+nan(09A_Zaz):0:13:
-%la:+0x0p0:1:6:0x0:
-%*la:+0x0p0:0:6:
+%la:+0x.0p0:1:7:0x0:
+%*la:+0x.0p0:0:7:
 %la:+0x0p+0:1:7:0x0:
 %*la:+0x0p+0:0:7:
 %la:+0x8p-1025:1:10:0x1p-1022:
@@ -76,8 +76,8 @@
 %*1la:-0x8p-1025:0:-1:
 %1la:-0x0p+0:0:-1:
 %*1la:-0x0p+0:0:-1:
-%1la:-0x0p0:0:-1:
-%*1la:-0x0p0:0:-1:
+%1la:-0x.0p0:0:-1:
+%*1la:-0x.0p0:0:-1:
 %1la:-nan(09A_Zaz):0:-1:
 %*1la:-nan(09A_Zaz):0:-1:
 %1la:-nan():0:-1:
@@ -86,8 +86,8 @@
 %*1la:nan():0:-1:
 %1la:nan(09A_Zaz):0:-1:
 %*1la:nan(09A_Zaz):0:-1:
-%1la:0x0p0:1:1:0x0:
-%*1la:0x0p0:0:1:
+%1la:0x.0p0:1:1:0x0:
+%*1la:0x.0p0:0:1:
 %1la:0x0p+0:1:1:0x0:
 %*1la:0x0p+0:0:1:
 %1la:0x8p-1025:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1la:+nan():0:-1:
 %1la:+nan(09A_Zaz):0:-1:
 %*1la:+nan(09A_Zaz):0:-1:
-%1la:+0x0p0:0:-1:
-%*1la:+0x0p0:0:-1:
+%1la:+0x.0p0:0:-1:
+%*1la:+0x.0p0:0:-1:
 %1la:+0x0p+0:0:-1:
 %*1la:+0x0p+0:0:-1:
 %1la:+0x8p-1025:0:-1:
@@ -138,8 +138,8 @@
 %*2la:-0x8p-1025:0:2:
 %2la:-0x0p+0:1:2:-0x0:
 %*2la:-0x0p+0:0:2:
-%2la:-0x0p0:1:2:-0x0:
-%*2la:-0x0p0:0:2:
+%2la:-0x.0p0:1:2:-0x0:
+%*2la:-0x.0p0:0:2:
 %2la:-nan(09A_Zaz):0:-1:
 %*2la:-nan(09A_Zaz):0:-1:
 %2la:-nan():0:-1:
@@ -148,8 +148,8 @@
 %*2la:nan():0:-1:
 %2la:nan(09A_Zaz):0:-1:
 %*2la:nan(09A_Zaz):0:-1:
-%2la:0x0p0:0:-1:
-%*2la:0x0p0:0:-1:
+%2la:0x.0p0:0:-1:
+%*2la:0x.0p0:0:-1:
 %2la:0x0p+0:0:-1:
 %*2la:0x0p+0:0:-1:
 %2la:0x8p-1025:0:-1:
@@ -168,8 +168,8 @@
 %*2la:+nan():0:-1:
 %2la:+nan(09A_Zaz):0:-1:
 %*2la:+nan(09A_Zaz):0:-1:
-%2la:+0x0p0:1:2:0x0:
-%*2la:+0x0p0:0:2:
+%2la:+0x.0p0:1:2:0x0:
+%*2la:+0x.0p0:0:2:
 %2la:+0x0p+0:1:2:0x0:
 %*2la:+0x0p+0:0:2:
 %2la:+0x8p-1025:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3la:-0x8p-1025:0:-1:
 %3la:-0x0p+0:0:-1:
 %*3la:-0x0p+0:0:-1:
-%3la:-0x0p0:0:-1:
-%*3la:-0x0p0:0:-1:
+%3la:-0x.0p0:0:-1:
+%*3la:-0x.0p0:0:-1:
 %3la:-nan(09A_Zaz):0:-1:
 %*3la:-nan(09A_Zaz):0:-1:
 %3la:-nan():0:-1:
@@ -210,8 +210,8 @@
 %*3la:nan():0:3:
 %3la:nan(09A_Zaz):1:3:nan:
 %*3la:nan(09A_Zaz):0:3:
-%3la:0x0p0:1:3:0x0:
-%*3la:0x0p0:0:3:
+%3la:0x.0p0:0:-1:
+%*3la:0x.0p0:0:-1:
 %3la:0x0p+0:1:3:0x0:
 %*3la:0x0p+0:0:3:
 %3la:0x8p-1025:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3la:+nan():0:-1:
 %3la:+nan(09A_Zaz):0:-1:
 %*3la:+nan(09A_Zaz):0:-1:
-%3la:+0x0p0:0:-1:
-%*3la:+0x0p0:0:-1:
+%3la:+0x.0p0:0:-1:
+%*3la:+0x.0p0:0:-1:
 %3la:+0x0p+0:0:-1:
 %*3la:+0x0p+0:0:-1:
 %3la:+0x8p-1025:0:-1:
@@ -262,8 +262,8 @@
 %*4la:-0x8p-1025:0:4:
 %4la:-0x0p+0:1:4:-0x0:
 %*4la:-0x0p+0:0:4:
-%4la:-0x0p0:1:4:-0x0:
-%*4la:-0x0p0:0:4:
+%4la:-0x.0p0:0:-1:
+%*4la:-0x.0p0:0:-1:
 %4la:-nan(09A_Zaz):1:4:-nan:
 %*4la:-nan(09A_Zaz):0:4:
 %4la:-nan():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4la:nan():0:-1:
 %4la:nan(09A_Zaz):0:-1:
 %*4la:nan(09A_Zaz):0:-1:
-%4la:0x0p0:0:-1:
-%*4la:0x0p0:0:-1:
+%4la:0x.0p0:1:4:0x0:
+%*4la:0x.0p0:0:4:
 %4la:0x0p+0:0:-1:
 %*4la:0x0p+0:0:-1:
 %4la:0x8p-1025:0:-1:
@@ -292,8 +292,8 @@
 %*4la:+nan():0:4:
 %4la:+nan(09A_Zaz):1:4:nan:
 %*4la:+nan(09A_Zaz):0:4:
-%4la:+0x0p0:1:4:0x0:
-%*4la:+0x0p0:0:4:
+%4la:+0x.0p0:0:-1:
+%*4la:+0x.0p0:0:-1:
 %4la:+0x0p+0:1:4:0x0:
 %*4la:+0x0p+0:0:4:
 %4la:+0x8p-1025:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5la:-0x8p-1025:0:-1:
 %5la:-0x0p+0:0:-1:
 %*5la:-0x0p+0:0:-1:
-%5la:-0x0p0:0:-1:
-%*5la:-0x0p0:0:-1:
+%5la:-0x.0p0:1:5:-0x0:
+%*5la:-0x.0p0:0:5:
 %5la:-nan(09A_Zaz):0:-1:
 %*5la:-nan(09A_Zaz):0:-1:
 %5la:-nan():0:-1:
@@ -334,8 +334,8 @@
 %*5la:nan():0:5:
 %5la:nan(09A_Zaz):0:-1:
 %*5la:nan(09A_Zaz):0:-1:
-%5la:0x0p0:1:5:0x0:
-%*5la:0x0p0:0:5:
+%5la:0x.0p0:0:-1:
+%*5la:0x.0p0:0:-1:
 %5la:0x0p+0:0:-1:
 %*5la:0x0p+0:0:-1:
 %5la:0x8p-1025:0:-1:
@@ -354,8 +354,8 @@
 %*5la:+nan():0:-1:
 %5la:+nan(09A_Zaz):0:-1:
 %*5la:+nan(09A_Zaz):0:-1:
-%5la:+0x0p0:0:-1:
-%*5la:+0x0p0:0:-1:
+%5la:+0x.0p0:1:5:0x0:
+%*5la:+0x.0p0:0:5:
 %5la:+0x0p+0:0:-1:
 %*5la:+0x0p+0:0:-1:
 %5la:+0x8p-1025:0:-1:
@@ -386,8 +386,8 @@
 %*6la:-0x8p-1025:0:-1:
 %6la:-0x0p+0:0:-1:
 %*6la:-0x0p+0:0:-1:
-%6la:-0x0p0:1:6:-0x0:
-%*6la:-0x0p0:0:6:
+%6la:-0x.0p0:0:-1:
+%*6la:-0x.0p0:0:-1:
 %6la:-nan(09A_Zaz):0:-1:
 %*6la:-nan(09A_Zaz):0:-1:
 %6la:-nan():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6la:nan():0:5:
 %6la:nan(09A_Zaz):0:-1:
 %*6la:nan(09A_Zaz):0:-1:
-%6la:0x0p0:1:5:0x0:
-%*6la:0x0p0:0:5:
+%6la:0x.0p0:1:6:0x0:
+%*6la:0x.0p0:0:6:
 %6la:0x0p+0:1:6:0x0:
 %*6la:0x0p+0:0:6:
 %6la:0x8p-1025:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6la:+nan():0:6:
 %6la:+nan(09A_Zaz):0:-1:
 %*6la:+nan(09A_Zaz):0:-1:
-%6la:+0x0p0:1:6:0x0:
-%*6la:+0x0p0:0:6:
+%6la:+0x.0p0:0:-1:
+%*6la:+0x.0p0:0:-1:
 %6la:+0x0p+0:0:-1:
 %*6la:+0x0p+0:0:-1:
 %6la:+0x8p-1025:0:-1:
@@ -448,8 +448,8 @@
 %*20la:-0x8p-1025:0:10:
 %20la:-0x0p+0:1:7:-0x0:
 %*20la:-0x0p+0:0:7:
-%20la:-0x0p0:1:6:-0x0:
-%*20la:-0x0p0:0:6:
+%20la:-0x.0p0:1:7:-0x0:
+%*20la:-0x.0p0:0:7:
 %20la:-nan(09A_Zaz):1:13:-nan:
 %*20la:-nan(09A_Zaz):0:13:
 %20la:-nan():1:6:-nan:
@@ -458,8 +458,8 @@
 %*20la:nan():0:5:
 %20la:nan(09A_Zaz):1:12:nan:
 %*20la:nan(09A_Zaz):0:12:
-%20la:0x0p0:1:5:0x0:
-%*20la:0x0p0:0:5:
+%20la:0x.0p0:1:6:0x0:
+%*20la:0x.0p0:0:6:
 %20la:0x0p+0:1:6:0x0:
 %*20la:0x0p+0:0:6:
 %20la:0x8p-1025:1:9:0x1p-1022:
@@ -478,8 +478,8 @@
 %*20la:+nan():0:6:
 %20la:+nan(09A_Zaz):1:13:nan:
 %*20la:+nan(09A_Zaz):0:13:
-%20la:+0x0p0:1:6:0x0:
-%*20la:+0x0p0:0:6:
+%20la:+0x.0p0:1:7:0x0:
+%*20la:+0x.0p0:0:7:
 %20la:+0x0p+0:1:7:0x0:
 %*20la:+0x0p+0:0:7:
 %20la:+0x8p-1025:1:10:0x1p-1022:
@@ -510,8 +510,8 @@
 %*32la:-0x8p-1025:0:10:
 %32la:-0x0p+0:1:7:-0x0:
 %*32la:-0x0p+0:0:7:
-%32la:-0x0p0:1:6:-0x0:
-%*32la:-0x0p0:0:6:
+%32la:-0x.0p0:1:7:-0x0:
+%*32la:-0x.0p0:0:7:
 %32la:-nan(09A_Zaz):1:13:-nan:
 %*32la:-nan(09A_Zaz):0:13:
 %32la:-nan():1:6:-nan:
@@ -520,8 +520,8 @@
 %*32la:nan():0:5:
 %32la:nan(09A_Zaz):1:12:nan:
 %*32la:nan(09A_Zaz):0:12:
-%32la:0x0p0:1:5:0x0:
-%*32la:0x0p0:0:5:
+%32la:0x.0p0:1:6:0x0:
+%*32la:0x.0p0:0:6:
 %32la:0x0p+0:1:6:0x0:
 %*32la:0x0p+0:0:6:
 %32la:0x8p-1025:1:9:0x1p-1022:
@@ -540,8 +540,8 @@
 %*32la:+nan():0:6:
 %32la:+nan(09A_Zaz):1:13:nan:
 %*32la:+nan(09A_Zaz):0:13:
-%32la:+0x0p0:1:6:0x0:
-%*32la:+0x0p0:0:6:
+%32la:+0x.0p0:1:7:0x0:
+%*32la:+0x.0p0:0:7:
 %32la:+0x0p+0:1:7:0x0:
 %*32la:+0x0p+0:0:7:
 %32la:+0x8p-1025:1:10:0x1p-1022:
@@ -572,8 +572,8 @@
 %*5la: -0x8p-1025:0:-1:
 %5la: -0x0p+0:0:-1:
 %*5la: -0x0p+0:0:-1:
-%5la: -0x0p0:0:-1:
-%*5la: -0x0p0:0:-1:
+%5la: -0x.0p0:1:6:-0x0:
+%*5la: -0x.0p0:0:6:
 %5la: -nan(09A_Zaz):0:-1:
 %*5la: -nan(09A_Zaz):0:-1:
 %5la: -nan():0:-1:
@@ -582,8 +582,8 @@
 %*5la: nan():0:6:
 %5la: nan(09A_Zaz):0:-1:
 %*5la: nan(09A_Zaz):0:-1:
-%5la: 0x0p0:1:6:0x0:
-%*5la: 0x0p0:0:6:
+%5la: 0x.0p0:0:-1:
+%*5la: 0x.0p0:0:-1:
 %5la: 0x0p+0:0:-1:
 %*5la: 0x0p+0:0:-1:
 %5la: 0x8p-1025:0:-1:
@@ -602,8 +602,8 @@
 %*5la: +nan():0:-1:
 %5la: +nan(09A_Zaz):0:-1:
 %*5la: +nan(09A_Zaz):0:-1:
-%5la: +0x0p0:0:-1:
-%*5la: +0x0p0:0:-1:
+%5la: +0x.0p0:1:6:0x0:
+%*5la: +0x.0p0:0:6:
 %5la: +0x0p+0:0:-1:
 %*5la: +0x0p+0:0:-1:
 %5la: +0x8p-1025:0:-1:
@@ -634,8 +634,8 @@
 %*32la: -0x8p-1025:0:11:
 %32la: -0x0p+0:1:8:-0x0:
 %*32la: -0x0p+0:0:8:
-%32la: -0x0p0:1:7:-0x0:
-%*32la: -0x0p0:0:7:
+%32la: -0x.0p0:1:8:-0x0:
+%*32la: -0x.0p0:0:8:
 %32la: -nan(09A_Zaz):1:14:-nan:
 %*32la: -nan(09A_Zaz):0:14:
 %32la: -nan():1:7:-nan:
@@ -644,8 +644,8 @@
 %*32la: nan():0:6:
 %32la: nan(09A_Zaz):1:13:nan:
 %*32la: nan(09A_Zaz):0:13:
-%32la: 0x0p0:1:6:0x0:
-%*32la: 0x0p0:0:6:
+%32la: 0x.0p0:1:7:0x0:
+%*32la: 0x.0p0:0:7:
 %32la: 0x0p+0:1:7:0x0:
 %*32la: 0x0p+0:0:7:
 %32la: 0x8p-1025:1:10:0x1p-1022:
@@ -664,8 +664,8 @@
 %*32la: +nan():0:7:
 %32la: +nan(09A_Zaz):1:14:nan:
 %*32la: +nan(09A_Zaz):0:14:
-%32la: +0x0p0:1:7:0x0:
-%*32la: +0x0p0:0:7:
+%32la: +0x.0p0:1:8:0x0:
+%*32la: +0x.0p0:0:8:
 %32la: +0x0p+0:1:8:0x0:
 %*32la: +0x0p+0:0:8:
 %32la: +0x8p-1025:1:11:0x1p-1022:
diff --git a/sysdeps/ieee754/dbl-64/tst-scanf-format-double-aa.input b/sysdeps/ieee754/dbl-64/tst-scanf-format-double-aa.input
index f7217b7..6d075c5 100644
--- a/sysdeps/ieee754/dbl-64/tst-scanf-format-double-aa.input
+++ b/sysdeps/ieee754/dbl-64/tst-scanf-format-double-aa.input
@@ -14,8 +14,8 @@
 %*lA:-0X8P-1025:0:10:
 %lA:-0X0P+0:1:7:-0x0:
 %*lA:-0X0P+0:0:7:
-%lA:-0X0P0:1:6:-0x0:
-%*lA:-0X0P0:0:6:
+%lA:-0X.0P0:1:7:-0x0:
+%*lA:-0X.0P0:0:7:
 %lA:-NAN(09A_Zaz):1:13:-nan:
 %*lA:-NAN(09A_Zaz):0:13:
 %lA:-NAN():1:6:-nan:
@@ -24,8 +24,8 @@
 %*lA:NAN():0:5:
 %lA:NAN(09A_Zaz):1:12:nan:
 %*lA:NAN(09A_Zaz):0:12:
-%lA:0X0P0:1:5:0x0:
-%*lA:0X0P0:0:5:
+%lA:0X.0P0:1:6:0x0:
+%*lA:0X.0P0:0:6:
 %lA:0X0P+0:1:6:0x0:
 %*lA:0X0P+0:0:6:
 %lA:0X8P-1025:1:9:0x1p-1022:
@@ -44,8 +44,8 @@
 %*lA:+NAN():0:6:
 %lA:+NAN(09A_Zaz):1:13:nan:
 %*lA:+NAN(09A_Zaz):0:13:
-%lA:+0X0P0:1:6:0x0:
-%*lA:+0X0P0:0:6:
+%lA:+0X.0P0:1:7:0x0:
+%*lA:+0X.0P0:0:7:
 %lA:+0X0P+0:1:7:0x0:
 %*lA:+0X0P+0:0:7:
 %lA:+0X8P-1025:1:10:0x1p-1022:
@@ -76,8 +76,8 @@
 %*1lA:-0X8P-1025:0:-1:
 %1lA:-0X0P+0:0:-1:
 %*1lA:-0X0P+0:0:-1:
-%1lA:-0X0P0:0:-1:
-%*1lA:-0X0P0:0:-1:
+%1lA:-0X.0P0:0:-1:
+%*1lA:-0X.0P0:0:-1:
 %1lA:-NAN(09A_Zaz):0:-1:
 %*1lA:-NAN(09A_Zaz):0:-1:
 %1lA:-NAN():0:-1:
@@ -86,8 +86,8 @@
 %*1lA:NAN():0:-1:
 %1lA:NAN(09A_Zaz):0:-1:
 %*1lA:NAN(09A_Zaz):0:-1:
-%1lA:0X0P0:1:1:0x0:
-%*1lA:0X0P0:0:1:
+%1lA:0X.0P0:1:1:0x0:
+%*1lA:0X.0P0:0:1:
 %1lA:0X0P+0:1:1:0x0:
 %*1lA:0X0P+0:0:1:
 %1lA:0X8P-1025:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1lA:+NAN():0:-1:
 %1lA:+NAN(09A_Zaz):0:-1:
 %*1lA:+NAN(09A_Zaz):0:-1:
-%1lA:+0X0P0:0:-1:
-%*1lA:+0X0P0:0:-1:
+%1lA:+0X.0P0:0:-1:
+%*1lA:+0X.0P0:0:-1:
 %1lA:+0X0P+0:0:-1:
 %*1lA:+0X0P+0:0:-1:
 %1lA:+0X8P-1025:0:-1:
@@ -138,8 +138,8 @@
 %*2lA:-0X8P-1025:0:2:
 %2lA:-0X0P+0:1:2:-0x0:
 %*2lA:-0X0P+0:0:2:
-%2lA:-0X0P0:1:2:-0x0:
-%*2lA:-0X0P0:0:2:
+%2lA:-0X.0P0:1:2:-0x0:
+%*2lA:-0X.0P0:0:2:
 %2lA:-NAN(09A_Zaz):0:-1:
 %*2lA:-NAN(09A_Zaz):0:-1:
 %2lA:-NAN():0:-1:
@@ -148,8 +148,8 @@
 %*2lA:NAN():0:-1:
 %2lA:NAN(09A_Zaz):0:-1:
 %*2lA:NAN(09A_Zaz):0:-1:
-%2lA:0X0P0:0:-1:
-%*2lA:0X0P0:0:-1:
+%2lA:0X.0P0:0:-1:
+%*2lA:0X.0P0:0:-1:
 %2lA:0X0P+0:0:-1:
 %*2lA:0X0P+0:0:-1:
 %2lA:0X8P-1025:0:-1:
@@ -168,8 +168,8 @@
 %*2lA:+NAN():0:-1:
 %2lA:+NAN(09A_Zaz):0:-1:
 %*2lA:+NAN(09A_Zaz):0:-1:
-%2lA:+0X0P0:1:2:0x0:
-%*2lA:+0X0P0:0:2:
+%2lA:+0X.0P0:1:2:0x0:
+%*2lA:+0X.0P0:0:2:
 %2lA:+0X0P+0:1:2:0x0:
 %*2lA:+0X0P+0:0:2:
 %2lA:+0X8P-1025:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3lA:-0X8P-1025:0:-1:
 %3lA:-0X0P+0:0:-1:
 %*3lA:-0X0P+0:0:-1:
-%3lA:-0X0P0:0:-1:
-%*3lA:-0X0P0:0:-1:
+%3lA:-0X.0P0:0:-1:
+%*3lA:-0X.0P0:0:-1:
 %3lA:-NAN(09A_Zaz):0:-1:
 %*3lA:-NAN(09A_Zaz):0:-1:
 %3lA:-NAN():0:-1:
@@ -210,8 +210,8 @@
 %*3lA:NAN():0:3:
 %3lA:NAN(09A_Zaz):1:3:nan:
 %*3lA:NAN(09A_Zaz):0:3:
-%3lA:0X0P0:1:3:0x0:
-%*3lA:0X0P0:0:3:
+%3lA:0X.0P0:0:-1:
+%*3lA:0X.0P0:0:-1:
 %3lA:0X0P+0:1:3:0x0:
 %*3lA:0X0P+0:0:3:
 %3lA:0X8P-1025:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3lA:+NAN():0:-1:
 %3lA:+NAN(09A_Zaz):0:-1:
 %*3lA:+NAN(09A_Zaz):0:-1:
-%3lA:+0X0P0:0:-1:
-%*3lA:+0X0P0:0:-1:
+%3lA:+0X.0P0:0:-1:
+%*3lA:+0X.0P0:0:-1:
 %3lA:+0X0P+0:0:-1:
 %*3lA:+0X0P+0:0:-1:
 %3lA:+0X8P-1025:0:-1:
@@ -262,8 +262,8 @@
 %*4lA:-0X8P-1025:0:4:
 %4lA:-0X0P+0:1:4:-0x0:
 %*4lA:-0X0P+0:0:4:
-%4lA:-0X0P0:1:4:-0x0:
-%*4lA:-0X0P0:0:4:
+%4lA:-0X.0P0:0:-1:
+%*4lA:-0X.0P0:0:-1:
 %4lA:-NAN(09A_Zaz):1:4:-nan:
 %*4lA:-NAN(09A_Zaz):0:4:
 %4lA:-NAN():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4lA:NAN():0:-1:
 %4lA:NAN(09A_Zaz):0:-1:
 %*4lA:NAN(09A_Zaz):0:-1:
-%4lA:0X0P0:0:-1:
-%*4lA:0X0P0:0:-1:
+%4lA:0X.0P0:1:4:0x0:
+%*4lA:0X.0P0:0:4:
 %4lA:0X0P+0:0:-1:
 %*4lA:0X0P+0:0:-1:
 %4lA:0X8P-1025:0:-1:
@@ -292,8 +292,8 @@
 %*4lA:+NAN():0:4:
 %4lA:+NAN(09A_Zaz):1:4:nan:
 %*4lA:+NAN(09A_Zaz):0:4:
-%4lA:+0X0P0:1:4:0x0:
-%*4lA:+0X0P0:0:4:
+%4lA:+0X.0P0:0:-1:
+%*4lA:+0X.0P0:0:-1:
 %4lA:+0X0P+0:1:4:0x0:
 %*4lA:+0X0P+0:0:4:
 %4lA:+0X8P-1025:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5lA:-0X8P-1025:0:-1:
 %5lA:-0X0P+0:0:-1:
 %*5lA:-0X0P+0:0:-1:
-%5lA:-0X0P0:0:-1:
-%*5lA:-0X0P0:0:-1:
+%5lA:-0X.0P0:1:5:-0x0:
+%*5lA:-0X.0P0:0:5:
 %5lA:-NAN(09A_Zaz):0:-1:
 %*5lA:-NAN(09A_Zaz):0:-1:
 %5lA:-NAN():0:-1:
@@ -334,8 +334,8 @@
 %*5lA:NAN():0:5:
 %5lA:NAN(09A_Zaz):0:-1:
 %*5lA:NAN(09A_Zaz):0:-1:
-%5lA:0X0P0:1:5:0x0:
-%*5lA:0X0P0:0:5:
+%5lA:0X.0P0:0:-1:
+%*5lA:0X.0P0:0:-1:
 %5lA:0X0P+0:0:-1:
 %*5lA:0X0P+0:0:-1:
 %5lA:0X8P-1025:0:-1:
@@ -354,8 +354,8 @@
 %*5lA:+NAN():0:-1:
 %5lA:+NAN(09A_Zaz):0:-1:
 %*5lA:+NAN(09A_Zaz):0:-1:
-%5lA:+0X0P0:0:-1:
-%*5lA:+0X0P0:0:-1:
+%5lA:+0X.0P0:1:5:0x0:
+%*5lA:+0X.0P0:0:5:
 %5lA:+0X0P+0:0:-1:
 %*5lA:+0X0P+0:0:-1:
 %5lA:+0X8P-1025:0:-1:
@@ -386,8 +386,8 @@
 %*6lA:-0X8P-1025:0:-1:
 %6lA:-0X0P+0:0:-1:
 %*6lA:-0X0P+0:0:-1:
-%6lA:-0X0P0:1:6:-0x0:
-%*6lA:-0X0P0:0:6:
+%6lA:-0X.0P0:0:-1:
+%*6lA:-0X.0P0:0:-1:
 %6lA:-NAN(09A_Zaz):0:-1:
 %*6lA:-NAN(09A_Zaz):0:-1:
 %6lA:-NAN():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6lA:NAN():0:5:
 %6lA:NAN(09A_Zaz):0:-1:
 %*6lA:NAN(09A_Zaz):0:-1:
-%6lA:0X0P0:1:5:0x0:
-%*6lA:0X0P0:0:5:
+%6lA:0X.0P0:1:6:0x0:
+%*6lA:0X.0P0:0:6:
 %6lA:0X0P+0:1:6:0x0:
 %*6lA:0X0P+0:0:6:
 %6lA:0X8P-1025:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6lA:+NAN():0:6:
 %6lA:+NAN(09A_Zaz):0:-1:
 %*6lA:+NAN(09A_Zaz):0:-1:
-%6lA:+0X0P0:1:6:0x0:
-%*6lA:+0X0P0:0:6:
+%6lA:+0X.0P0:0:-1:
+%*6lA:+0X.0P0:0:-1:
 %6lA:+0X0P+0:0:-1:
 %*6lA:+0X0P+0:0:-1:
 %6lA:+0X8P-1025:0:-1:
@@ -448,8 +448,8 @@
 %*20lA:-0X8P-1025:0:10:
 %20lA:-0X0P+0:1:7:-0x0:
 %*20lA:-0X0P+0:0:7:
-%20lA:-0X0P0:1:6:-0x0:
-%*20lA:-0X0P0:0:6:
+%20lA:-0X.0P0:1:7:-0x0:
+%*20lA:-0X.0P0:0:7:
 %20lA:-NAN(09A_Zaz):1:13:-nan:
 %*20lA:-NAN(09A_Zaz):0:13:
 %20lA:-NAN():1:6:-nan:
@@ -458,8 +458,8 @@
 %*20lA:NAN():0:5:
 %20lA:NAN(09A_Zaz):1:12:nan:
 %*20lA:NAN(09A_Zaz):0:12:
-%20lA:0X0P0:1:5:0x0:
-%*20lA:0X0P0:0:5:
+%20lA:0X.0P0:1:6:0x0:
+%*20lA:0X.0P0:0:6:
 %20lA:0X0P+0:1:6:0x0:
 %*20lA:0X0P+0:0:6:
 %20lA:0X8P-1025:1:9:0x1p-1022:
@@ -478,8 +478,8 @@
 %*20lA:+NAN():0:6:
 %20lA:+NAN(09A_Zaz):1:13:nan:
 %*20lA:+NAN(09A_Zaz):0:13:
-%20lA:+0X0P0:1:6:0x0:
-%*20lA:+0X0P0:0:6:
+%20lA:+0X.0P0:1:7:0x0:
+%*20lA:+0X.0P0:0:7:
 %20lA:+0X0P+0:1:7:0x0:
 %*20lA:+0X0P+0:0:7:
 %20lA:+0X8P-1025:1:10:0x1p-1022:
@@ -510,8 +510,8 @@
 %*32lA:-0X8P-1025:0:10:
 %32lA:-0X0P+0:1:7:-0x0:
 %*32lA:-0X0P+0:0:7:
-%32lA:-0X0P0:1:6:-0x0:
-%*32lA:-0X0P0:0:6:
+%32lA:-0X.0P0:1:7:-0x0:
+%*32lA:-0X.0P0:0:7:
 %32lA:-NAN(09A_Zaz):1:13:-nan:
 %*32lA:-NAN(09A_Zaz):0:13:
 %32lA:-NAN():1:6:-nan:
@@ -520,8 +520,8 @@
 %*32lA:NAN():0:5:
 %32lA:NAN(09A_Zaz):1:12:nan:
 %*32lA:NAN(09A_Zaz):0:12:
-%32lA:0X0P0:1:5:0x0:
-%*32lA:0X0P0:0:5:
+%32lA:0X.0P0:1:6:0x0:
+%*32lA:0X.0P0:0:6:
 %32lA:0X0P+0:1:6:0x0:
 %*32lA:0X0P+0:0:6:
 %32lA:0X8P-1025:1:9:0x1p-1022:
@@ -540,8 +540,8 @@
 %*32lA:+NAN():0:6:
 %32lA:+NAN(09A_Zaz):1:13:nan:
 %*32lA:+NAN(09A_Zaz):0:13:
-%32lA:+0X0P0:1:6:0x0:
-%*32lA:+0X0P0:0:6:
+%32lA:+0X.0P0:1:7:0x0:
+%*32lA:+0X.0P0:0:7:
 %32lA:+0X0P+0:1:7:0x0:
 %*32lA:+0X0P+0:0:7:
 %32lA:+0X8P-1025:1:10:0x1p-1022:
@@ -572,8 +572,8 @@
 %*5lA: -0X8P-1025:0:-1:
 %5lA: -0X0P+0:0:-1:
 %*5lA: -0X0P+0:0:-1:
-%5lA: -0X0P0:0:-1:
-%*5lA: -0X0P0:0:-1:
+%5lA: -0X.0P0:1:6:-0x0:
+%*5lA: -0X.0P0:0:6:
 %5lA: -NAN(09A_Zaz):0:-1:
 %*5lA: -NAN(09A_Zaz):0:-1:
 %5lA: -NAN():0:-1:
@@ -582,8 +582,8 @@
 %*5lA: NAN():0:6:
 %5lA: NAN(09A_Zaz):0:-1:
 %*5lA: NAN(09A_Zaz):0:-1:
-%5lA: 0X0P0:1:6:0x0:
-%*5lA: 0X0P0:0:6:
+%5lA: 0X.0P0:0:-1:
+%*5lA: 0X.0P0:0:-1:
 %5lA: 0X0P+0:0:-1:
 %*5lA: 0X0P+0:0:-1:
 %5lA: 0X8P-1025:0:-1:
@@ -602,8 +602,8 @@
 %*5lA: +NAN():0:-1:
 %5lA: +NAN(09A_Zaz):0:-1:
 %*5lA: +NAN(09A_Zaz):0:-1:
-%5lA: +0X0P0:0:-1:
-%*5lA: +0X0P0:0:-1:
+%5lA: +0X.0P0:1:6:0x0:
+%*5lA: +0X.0P0:0:6:
 %5lA: +0X0P+0:0:-1:
 %*5lA: +0X0P+0:0:-1:
 %5lA: +0X8P-1025:0:-1:
@@ -634,8 +634,8 @@
 %*32lA: -0X8P-1025:0:11:
 %32lA: -0X0P+0:1:8:-0x0:
 %*32lA: -0X0P+0:0:8:
-%32lA: -0X0P0:1:7:-0x0:
-%*32lA: -0X0P0:0:7:
+%32lA: -0X.0P0:1:8:-0x0:
+%*32lA: -0X.0P0:0:8:
 %32lA: -NAN(09A_Zaz):1:14:-nan:
 %*32lA: -NAN(09A_Zaz):0:14:
 %32lA: -NAN():1:7:-nan:
@@ -644,8 +644,8 @@
 %*32lA: NAN():0:6:
 %32lA: NAN(09A_Zaz):1:13:nan:
 %*32lA: NAN(09A_Zaz):0:13:
-%32lA: 0X0P0:1:6:0x0:
-%*32lA: 0X0P0:0:6:
+%32lA: 0X.0P0:1:7:0x0:
+%*32lA: 0X.0P0:0:7:
 %32lA: 0X0P+0:1:7:0x0:
 %*32lA: 0X0P+0:0:7:
 %32lA: 0X8P-1025:1:10:0x1p-1022:
@@ -664,8 +664,8 @@
 %*32lA: +NAN():0:7:
 %32lA: +NAN(09A_Zaz):1:14:nan:
 %*32lA: +NAN(09A_Zaz):0:14:
-%32lA: +0X0P0:1:7:0x0:
-%*32lA: +0X0P0:0:7:
+%32lA: +0X.0P0:1:8:0x0:
+%*32lA: +0X.0P0:0:8:
 %32lA: +0X0P+0:1:8:0x0:
 %*32lA: +0X0P+0:0:8:
 %32lA: +0X8P-1025:1:11:0x1p-1022:
diff --git a/sysdeps/ieee754/dbl-64/tst-scanf-format-double-g.input b/sysdeps/ieee754/dbl-64/tst-scanf-format-double-g.input
index 553172f..9e873e5 100644
--- a/sysdeps/ieee754/dbl-64/tst-scanf-format-double-g.input
+++ b/sysdeps/ieee754/dbl-64/tst-scanf-format-double-g.input
@@ -14,8 +14,8 @@
 %*lg:-0x8p-1025:0:10:
 %lg:-0x0p+0:1:7:-0x0:
 %*lg:-0x0p+0:0:7:
-%lg:-0x0p0:1:6:-0x0:
-%*lg:-0x0p0:0:6:
+%lg:-0x.0p0:1:7:-0x0:
+%*lg:-0x.0p0:0:7:
 %lg:-nan(09A_Zaz):1:13:-nan:
 %*lg:-nan(09A_Zaz):0:13:
 %lg:-nan():1:6:-nan:
@@ -24,8 +24,8 @@
 %*lg:nan():0:5:
 %lg:nan(09A_Zaz):1:12:nan:
 %*lg:nan(09A_Zaz):0:12:
-%lg:0x0p0:1:5:0x0:
-%*lg:0x0p0:0:5:
+%lg:0x.0p0:1:6:0x0:
+%*lg:0x.0p0:0:6:
 %lg:0x0p+0:1:6:0x0:
 %*lg:0x0p+0:0:6:
 %lg:0x8p-1025:1:9:0x1p-1022:
@@ -44,8 +44,8 @@
 %*lg:+nan():0:6:
 %lg:+nan(09A_Zaz):1:13:nan:
 %*lg:+nan(09A_Zaz):0:13:
-%lg:+0x0p0:1:6:0x0:
-%*lg:+0x0p0:0:6:
+%lg:+0x.0p0:1:7:0x0:
+%*lg:+0x.0p0:0:7:
 %lg:+0x0p+0:1:7:0x0:
 %*lg:+0x0p+0:0:7:
 %lg:+0x8p-1025:1:10:0x1p-1022:
@@ -76,8 +76,8 @@
 %*1lg:-0x8p-1025:0:-1:
 %1lg:-0x0p+0:0:-1:
 %*1lg:-0x0p+0:0:-1:
-%1lg:-0x0p0:0:-1:
-%*1lg:-0x0p0:0:-1:
+%1lg:-0x.0p0:0:-1:
+%*1lg:-0x.0p0:0:-1:
 %1lg:-nan(09A_Zaz):0:-1:
 %*1lg:-nan(09A_Zaz):0:-1:
 %1lg:-nan():0:-1:
@@ -86,8 +86,8 @@
 %*1lg:nan():0:-1:
 %1lg:nan(09A_Zaz):0:-1:
 %*1lg:nan(09A_Zaz):0:-1:
-%1lg:0x0p0:1:1:0x0:
-%*1lg:0x0p0:0:1:
+%1lg:0x.0p0:1:1:0x0:
+%*1lg:0x.0p0:0:1:
 %1lg:0x0p+0:1:1:0x0:
 %*1lg:0x0p+0:0:1:
 %1lg:0x8p-1025:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1lg:+nan():0:-1:
 %1lg:+nan(09A_Zaz):0:-1:
 %*1lg:+nan(09A_Zaz):0:-1:
-%1lg:+0x0p0:0:-1:
-%*1lg:+0x0p0:0:-1:
+%1lg:+0x.0p0:0:-1:
+%*1lg:+0x.0p0:0:-1:
 %1lg:+0x0p+0:0:-1:
 %*1lg:+0x0p+0:0:-1:
 %1lg:+0x8p-1025:0:-1:
@@ -138,8 +138,8 @@
 %*2lg:-0x8p-1025:0:2:
 %2lg:-0x0p+0:1:2:-0x0:
 %*2lg:-0x0p+0:0:2:
-%2lg:-0x0p0:1:2:-0x0:
-%*2lg:-0x0p0:0:2:
+%2lg:-0x.0p0:1:2:-0x0:
+%*2lg:-0x.0p0:0:2:
 %2lg:-nan(09A_Zaz):0:-1:
 %*2lg:-nan(09A_Zaz):0:-1:
 %2lg:-nan():0:-1:
@@ -148,8 +148,8 @@
 %*2lg:nan():0:-1:
 %2lg:nan(09A_Zaz):0:-1:
 %*2lg:nan(09A_Zaz):0:-1:
-%2lg:0x0p0:0:-1:
-%*2lg:0x0p0:0:-1:
+%2lg:0x.0p0:0:-1:
+%*2lg:0x.0p0:0:-1:
 %2lg:0x0p+0:0:-1:
 %*2lg:0x0p+0:0:-1:
 %2lg:0x8p-1025:0:-1:
@@ -168,8 +168,8 @@
 %*2lg:+nan():0:-1:
 %2lg:+nan(09A_Zaz):0:-1:
 %*2lg:+nan(09A_Zaz):0:-1:
-%2lg:+0x0p0:1:2:0x0:
-%*2lg:+0x0p0:0:2:
+%2lg:+0x.0p0:1:2:0x0:
+%*2lg:+0x.0p0:0:2:
 %2lg:+0x0p+0:1:2:0x0:
 %*2lg:+0x0p+0:0:2:
 %2lg:+0x8p-1025:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3lg:-0x8p-1025:0:-1:
 %3lg:-0x0p+0:0:-1:
 %*3lg:-0x0p+0:0:-1:
-%3lg:-0x0p0:0:-1:
-%*3lg:-0x0p0:0:-1:
+%3lg:-0x.0p0:0:-1:
+%*3lg:-0x.0p0:0:-1:
 %3lg:-nan(09A_Zaz):0:-1:
 %*3lg:-nan(09A_Zaz):0:-1:
 %3lg:-nan():0:-1:
@@ -210,8 +210,8 @@
 %*3lg:nan():0:3:
 %3lg:nan(09A_Zaz):1:3:nan:
 %*3lg:nan(09A_Zaz):0:3:
-%3lg:0x0p0:1:3:0x0:
-%*3lg:0x0p0:0:3:
+%3lg:0x.0p0:0:-1:
+%*3lg:0x.0p0:0:-1:
 %3lg:0x0p+0:1:3:0x0:
 %*3lg:0x0p+0:0:3:
 %3lg:0x8p-1025:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3lg:+nan():0:-1:
 %3lg:+nan(09A_Zaz):0:-1:
 %*3lg:+nan(09A_Zaz):0:-1:
-%3lg:+0x0p0:0:-1:
-%*3lg:+0x0p0:0:-1:
+%3lg:+0x.0p0:0:-1:
+%*3lg:+0x.0p0:0:-1:
 %3lg:+0x0p+0:0:-1:
 %*3lg:+0x0p+0:0:-1:
 %3lg:+0x8p-1025:0:-1:
@@ -262,8 +262,8 @@
 %*4lg:-0x8p-1025:0:4:
 %4lg:-0x0p+0:1:4:-0x0:
 %*4lg:-0x0p+0:0:4:
-%4lg:-0x0p0:1:4:-0x0:
-%*4lg:-0x0p0:0:4:
+%4lg:-0x.0p0:0:-1:
+%*4lg:-0x.0p0:0:-1:
 %4lg:-nan(09A_Zaz):1:4:-nan:
 %*4lg:-nan(09A_Zaz):0:4:
 %4lg:-nan():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4lg:nan():0:-1:
 %4lg:nan(09A_Zaz):0:-1:
 %*4lg:nan(09A_Zaz):0:-1:
-%4lg:0x0p0:0:-1:
-%*4lg:0x0p0:0:-1:
+%4lg:0x.0p0:1:4:0x0:
+%*4lg:0x.0p0:0:4:
 %4lg:0x0p+0:0:-1:
 %*4lg:0x0p+0:0:-1:
 %4lg:0x8p-1025:0:-1:
@@ -292,8 +292,8 @@
 %*4lg:+nan():0:4:
 %4lg:+nan(09A_Zaz):1:4:nan:
 %*4lg:+nan(09A_Zaz):0:4:
-%4lg:+0x0p0:1:4:0x0:
-%*4lg:+0x0p0:0:4:
+%4lg:+0x.0p0:0:-1:
+%*4lg:+0x.0p0:0:-1:
 %4lg:+0x0p+0:1:4:0x0:
 %*4lg:+0x0p+0:0:4:
 %4lg:+0x8p-1025:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5lg:-0x8p-1025:0:-1:
 %5lg:-0x0p+0:0:-1:
 %*5lg:-0x0p+0:0:-1:
-%5lg:-0x0p0:0:-1:
-%*5lg:-0x0p0:0:-1:
+%5lg:-0x.0p0:1:5:-0x0:
+%*5lg:-0x.0p0:0:5:
 %5lg:-nan(09A_Zaz):0:-1:
 %*5lg:-nan(09A_Zaz):0:-1:
 %5lg:-nan():0:-1:
@@ -334,8 +334,8 @@
 %*5lg:nan():0:5:
 %5lg:nan(09A_Zaz):0:-1:
 %*5lg:nan(09A_Zaz):0:-1:
-%5lg:0x0p0:1:5:0x0:
-%*5lg:0x0p0:0:5:
+%5lg:0x.0p0:0:-1:
+%*5lg:0x.0p0:0:-1:
 %5lg:0x0p+0:0:-1:
 %*5lg:0x0p+0:0:-1:
 %5lg:0x8p-1025:0:-1:
@@ -354,8 +354,8 @@
 %*5lg:+nan():0:-1:
 %5lg:+nan(09A_Zaz):0:-1:
 %*5lg:+nan(09A_Zaz):0:-1:
-%5lg:+0x0p0:0:-1:
-%*5lg:+0x0p0:0:-1:
+%5lg:+0x.0p0:1:5:0x0:
+%*5lg:+0x.0p0:0:5:
 %5lg:+0x0p+0:0:-1:
 %*5lg:+0x0p+0:0:-1:
 %5lg:+0x8p-1025:0:-1:
@@ -386,8 +386,8 @@
 %*6lg:-0x8p-1025:0:-1:
 %6lg:-0x0p+0:0:-1:
 %*6lg:-0x0p+0:0:-1:
-%6lg:-0x0p0:1:6:-0x0:
-%*6lg:-0x0p0:0:6:
+%6lg:-0x.0p0:0:-1:
+%*6lg:-0x.0p0:0:-1:
 %6lg:-nan(09A_Zaz):0:-1:
 %*6lg:-nan(09A_Zaz):0:-1:
 %6lg:-nan():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6lg:nan():0:5:
 %6lg:nan(09A_Zaz):0:-1:
 %*6lg:nan(09A_Zaz):0:-1:
-%6lg:0x0p0:1:5:0x0:
-%*6lg:0x0p0:0:5:
+%6lg:0x.0p0:1:6:0x0:
+%*6lg:0x.0p0:0:6:
 %6lg:0x0p+0:1:6:0x0:
 %*6lg:0x0p+0:0:6:
 %6lg:0x8p-1025:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6lg:+nan():0:6:
 %6lg:+nan(09A_Zaz):0:-1:
 %*6lg:+nan(09A_Zaz):0:-1:
-%6lg:+0x0p0:1:6:0x0:
-%*6lg:+0x0p0:0:6:
+%6lg:+0x.0p0:0:-1:
+%*6lg:+0x.0p0:0:-1:
 %6lg:+0x0p+0:0:-1:
 %*6lg:+0x0p+0:0:-1:
 %6lg:+0x8p-1025:0:-1:
@@ -448,8 +448,8 @@
 %*20lg:-0x8p-1025:0:10:
 %20lg:-0x0p+0:1:7:-0x0:
 %*20lg:-0x0p+0:0:7:
-%20lg:-0x0p0:1:6:-0x0:
-%*20lg:-0x0p0:0:6:
+%20lg:-0x.0p0:1:7:-0x0:
+%*20lg:-0x.0p0:0:7:
 %20lg:-nan(09A_Zaz):1:13:-nan:
 %*20lg:-nan(09A_Zaz):0:13:
 %20lg:-nan():1:6:-nan:
@@ -458,8 +458,8 @@
 %*20lg:nan():0:5:
 %20lg:nan(09A_Zaz):1:12:nan:
 %*20lg:nan(09A_Zaz):0:12:
-%20lg:0x0p0:1:5:0x0:
-%*20lg:0x0p0:0:5:
+%20lg:0x.0p0:1:6:0x0:
+%*20lg:0x.0p0:0:6:
 %20lg:0x0p+0:1:6:0x0:
 %*20lg:0x0p+0:0:6:
 %20lg:0x8p-1025:1:9:0x1p-1022:
@@ -478,8 +478,8 @@
 %*20lg:+nan():0:6:
 %20lg:+nan(09A_Zaz):1:13:nan:
 %*20lg:+nan(09A_Zaz):0:13:
-%20lg:+0x0p0:1:6:0x0:
-%*20lg:+0x0p0:0:6:
+%20lg:+0x.0p0:1:7:0x0:
+%*20lg:+0x.0p0:0:7:
 %20lg:+0x0p+0:1:7:0x0:
 %*20lg:+0x0p+0:0:7:
 %20lg:+0x8p-1025:1:10:0x1p-1022:
@@ -510,8 +510,8 @@
 %*32lg:-0x8p-1025:0:10:
 %32lg:-0x0p+0:1:7:-0x0:
 %*32lg:-0x0p+0:0:7:
-%32lg:-0x0p0:1:6:-0x0:
-%*32lg:-0x0p0:0:6:
+%32lg:-0x.0p0:1:7:-0x0:
+%*32lg:-0x.0p0:0:7:
 %32lg:-nan(09A_Zaz):1:13:-nan:
 %*32lg:-nan(09A_Zaz):0:13:
 %32lg:-nan():1:6:-nan:
@@ -520,8 +520,8 @@
 %*32lg:nan():0:5:
 %32lg:nan(09A_Zaz):1:12:nan:
 %*32lg:nan(09A_Zaz):0:12:
-%32lg:0x0p0:1:5:0x0:
-%*32lg:0x0p0:0:5:
+%32lg:0x.0p0:1:6:0x0:
+%*32lg:0x.0p0:0:6:
 %32lg:0x0p+0:1:6:0x0:
 %*32lg:0x0p+0:0:6:
 %32lg:0x8p-1025:1:9:0x1p-1022:
@@ -540,8 +540,8 @@
 %*32lg:+nan():0:6:
 %32lg:+nan(09A_Zaz):1:13:nan:
 %*32lg:+nan(09A_Zaz):0:13:
-%32lg:+0x0p0:1:6:0x0:
-%*32lg:+0x0p0:0:6:
+%32lg:+0x.0p0:1:7:0x0:
+%*32lg:+0x.0p0:0:7:
 %32lg:+0x0p+0:1:7:0x0:
 %*32lg:+0x0p+0:0:7:
 %32lg:+0x8p-1025:1:10:0x1p-1022:
@@ -572,8 +572,8 @@
 %*5lg: -0x8p-1025:0:-1:
 %5lg: -0x0p+0:0:-1:
 %*5lg: -0x0p+0:0:-1:
-%5lg: -0x0p0:0:-1:
-%*5lg: -0x0p0:0:-1:
+%5lg: -0x.0p0:1:6:-0x0:
+%*5lg: -0x.0p0:0:6:
 %5lg: -nan(09A_Zaz):0:-1:
 %*5lg: -nan(09A_Zaz):0:-1:
 %5lg: -nan():0:-1:
@@ -582,8 +582,8 @@
 %*5lg: nan():0:6:
 %5lg: nan(09A_Zaz):0:-1:
 %*5lg: nan(09A_Zaz):0:-1:
-%5lg: 0x0p0:1:6:0x0:
-%*5lg: 0x0p0:0:6:
+%5lg: 0x.0p0:0:-1:
+%*5lg: 0x.0p0:0:-1:
 %5lg: 0x0p+0:0:-1:
 %*5lg: 0x0p+0:0:-1:
 %5lg: 0x8p-1025:0:-1:
@@ -602,8 +602,8 @@
 %*5lg: +nan():0:-1:
 %5lg: +nan(09A_Zaz):0:-1:
 %*5lg: +nan(09A_Zaz):0:-1:
-%5lg: +0x0p0:0:-1:
-%*5lg: +0x0p0:0:-1:
+%5lg: +0x.0p0:1:6:0x0:
+%*5lg: +0x.0p0:0:6:
 %5lg: +0x0p+0:0:-1:
 %*5lg: +0x0p+0:0:-1:
 %5lg: +0x8p-1025:0:-1:
@@ -634,8 +634,8 @@
 %*32lg: -0x8p-1025:0:11:
 %32lg: -0x0p+0:1:8:-0x0:
 %*32lg: -0x0p+0:0:8:
-%32lg: -0x0p0:1:7:-0x0:
-%*32lg: -0x0p0:0:7:
+%32lg: -0x.0p0:1:8:-0x0:
+%*32lg: -0x.0p0:0:8:
 %32lg: -nan(09A_Zaz):1:14:-nan:
 %*32lg: -nan(09A_Zaz):0:14:
 %32lg: -nan():1:7:-nan:
@@ -644,8 +644,8 @@
 %*32lg: nan():0:6:
 %32lg: nan(09A_Zaz):1:13:nan:
 %*32lg: nan(09A_Zaz):0:13:
-%32lg: 0x0p0:1:6:0x0:
-%*32lg: 0x0p0:0:6:
+%32lg: 0x.0p0:1:7:0x0:
+%*32lg: 0x.0p0:0:7:
 %32lg: 0x0p+0:1:7:0x0:
 %*32lg: 0x0p+0:0:7:
 %32lg: 0x8p-1025:1:10:0x1p-1022:
@@ -664,8 +664,8 @@
 %*32lg: +nan():0:7:
 %32lg: +nan(09A_Zaz):1:14:nan:
 %*32lg: +nan(09A_Zaz):0:14:
-%32lg: +0x0p0:1:7:0x0:
-%*32lg: +0x0p0:0:7:
+%32lg: +0x.0p0:1:8:0x0:
+%*32lg: +0x.0p0:0:8:
 %32lg: +0x0p+0:1:8:0x0:
 %*32lg: +0x0p+0:0:8:
 %32lg: +0x8p-1025:1:11:0x1p-1022:
diff --git a/sysdeps/ieee754/dbl-64/tst-scanf-format-double-gg.input b/sysdeps/ieee754/dbl-64/tst-scanf-format-double-gg.input
index 11ffe34..0a3fe29 100644
--- a/sysdeps/ieee754/dbl-64/tst-scanf-format-double-gg.input
+++ b/sysdeps/ieee754/dbl-64/tst-scanf-format-double-gg.input
@@ -14,8 +14,8 @@
 %*lG:-0X8P-1025:0:10:
 %lG:-0X0P+0:1:7:-0x0:
 %*lG:-0X0P+0:0:7:
-%lG:-0X0P0:1:6:-0x0:
-%*lG:-0X0P0:0:6:
+%lG:-0X.0P0:1:7:-0x0:
+%*lG:-0X.0P0:0:7:
 %lG:-NAN(09A_Zaz):1:13:-nan:
 %*lG:-NAN(09A_Zaz):0:13:
 %lG:-NAN():1:6:-nan:
@@ -24,8 +24,8 @@
 %*lG:NAN():0:5:
 %lG:NAN(09A_Zaz):1:12:nan:
 %*lG:NAN(09A_Zaz):0:12:
-%lG:0X0P0:1:5:0x0:
-%*lG:0X0P0:0:5:
+%lG:0X.0P0:1:6:0x0:
+%*lG:0X.0P0:0:6:
 %lG:0X0P+0:1:6:0x0:
 %*lG:0X0P+0:0:6:
 %lG:0X8P-1025:1:9:0x1p-1022:
@@ -44,8 +44,8 @@
 %*lG:+NAN():0:6:
 %lG:+NAN(09A_Zaz):1:13:nan:
 %*lG:+NAN(09A_Zaz):0:13:
-%lG:+0X0P0:1:6:0x0:
-%*lG:+0X0P0:0:6:
+%lG:+0X.0P0:1:7:0x0:
+%*lG:+0X.0P0:0:7:
 %lG:+0X0P+0:1:7:0x0:
 %*lG:+0X0P+0:0:7:
 %lG:+0X8P-1025:1:10:0x1p-1022:
@@ -76,8 +76,8 @@
 %*1lG:-0X8P-1025:0:-1:
 %1lG:-0X0P+0:0:-1:
 %*1lG:-0X0P+0:0:-1:
-%1lG:-0X0P0:0:-1:
-%*1lG:-0X0P0:0:-1:
+%1lG:-0X.0P0:0:-1:
+%*1lG:-0X.0P0:0:-1:
 %1lG:-NAN(09A_Zaz):0:-1:
 %*1lG:-NAN(09A_Zaz):0:-1:
 %1lG:-NAN():0:-1:
@@ -86,8 +86,8 @@
 %*1lG:NAN():0:-1:
 %1lG:NAN(09A_Zaz):0:-1:
 %*1lG:NAN(09A_Zaz):0:-1:
-%1lG:0X0P0:1:1:0x0:
-%*1lG:0X0P0:0:1:
+%1lG:0X.0P0:1:1:0x0:
+%*1lG:0X.0P0:0:1:
 %1lG:0X0P+0:1:1:0x0:
 %*1lG:0X0P+0:0:1:
 %1lG:0X8P-1025:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1lG:+NAN():0:-1:
 %1lG:+NAN(09A_Zaz):0:-1:
 %*1lG:+NAN(09A_Zaz):0:-1:
-%1lG:+0X0P0:0:-1:
-%*1lG:+0X0P0:0:-1:
+%1lG:+0X.0P0:0:-1:
+%*1lG:+0X.0P0:0:-1:
 %1lG:+0X0P+0:0:-1:
 %*1lG:+0X0P+0:0:-1:
 %1lG:+0X8P-1025:0:-1:
@@ -138,8 +138,8 @@
 %*2lG:-0X8P-1025:0:2:
 %2lG:-0X0P+0:1:2:-0x0:
 %*2lG:-0X0P+0:0:2:
-%2lG:-0X0P0:1:2:-0x0:
-%*2lG:-0X0P0:0:2:
+%2lG:-0X.0P0:1:2:-0x0:
+%*2lG:-0X.0P0:0:2:
 %2lG:-NAN(09A_Zaz):0:-1:
 %*2lG:-NAN(09A_Zaz):0:-1:
 %2lG:-NAN():0:-1:
@@ -148,8 +148,8 @@
 %*2lG:NAN():0:-1:
 %2lG:NAN(09A_Zaz):0:-1:
 %*2lG:NAN(09A_Zaz):0:-1:
-%2lG:0X0P0:0:-1:
-%*2lG:0X0P0:0:-1:
+%2lG:0X.0P0:0:-1:
+%*2lG:0X.0P0:0:-1:
 %2lG:0X0P+0:0:-1:
 %*2lG:0X0P+0:0:-1:
 %2lG:0X8P-1025:0:-1:
@@ -168,8 +168,8 @@
 %*2lG:+NAN():0:-1:
 %2lG:+NAN(09A_Zaz):0:-1:
 %*2lG:+NAN(09A_Zaz):0:-1:
-%2lG:+0X0P0:1:2:0x0:
-%*2lG:+0X0P0:0:2:
+%2lG:+0X.0P0:1:2:0x0:
+%*2lG:+0X.0P0:0:2:
 %2lG:+0X0P+0:1:2:0x0:
 %*2lG:+0X0P+0:0:2:
 %2lG:+0X8P-1025:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3lG:-0X8P-1025:0:-1:
 %3lG:-0X0P+0:0:-1:
 %*3lG:-0X0P+0:0:-1:
-%3lG:-0X0P0:0:-1:
-%*3lG:-0X0P0:0:-1:
+%3lG:-0X.0P0:0:-1:
+%*3lG:-0X.0P0:0:-1:
 %3lG:-NAN(09A_Zaz):0:-1:
 %*3lG:-NAN(09A_Zaz):0:-1:
 %3lG:-NAN():0:-1:
@@ -210,8 +210,8 @@
 %*3lG:NAN():0:3:
 %3lG:NAN(09A_Zaz):1:3:nan:
 %*3lG:NAN(09A_Zaz):0:3:
-%3lG:0X0P0:1:3:0x0:
-%*3lG:0X0P0:0:3:
+%3lG:0X.0P0:0:-1:
+%*3lG:0X.0P0:0:-1:
 %3lG:0X0P+0:1:3:0x0:
 %*3lG:0X0P+0:0:3:
 %3lG:0X8P-1025:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3lG:+NAN():0:-1:
 %3lG:+NAN(09A_Zaz):0:-1:
 %*3lG:+NAN(09A_Zaz):0:-1:
-%3lG:+0X0P0:0:-1:
-%*3lG:+0X0P0:0:-1:
+%3lG:+0X.0P0:0:-1:
+%*3lG:+0X.0P0:0:-1:
 %3lG:+0X0P+0:0:-1:
 %*3lG:+0X0P+0:0:-1:
 %3lG:+0X8P-1025:0:-1:
@@ -262,8 +262,8 @@
 %*4lG:-0X8P-1025:0:4:
 %4lG:-0X0P+0:1:4:-0x0:
 %*4lG:-0X0P+0:0:4:
-%4lG:-0X0P0:1:4:-0x0:
-%*4lG:-0X0P0:0:4:
+%4lG:-0X.0P0:0:-1:
+%*4lG:-0X.0P0:0:-1:
 %4lG:-NAN(09A_Zaz):1:4:-nan:
 %*4lG:-NAN(09A_Zaz):0:4:
 %4lG:-NAN():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4lG:NAN():0:-1:
 %4lG:NAN(09A_Zaz):0:-1:
 %*4lG:NAN(09A_Zaz):0:-1:
-%4lG:0X0P0:0:-1:
-%*4lG:0X0P0:0:-1:
+%4lG:0X.0P0:1:4:0x0:
+%*4lG:0X.0P0:0:4:
 %4lG:0X0P+0:0:-1:
 %*4lG:0X0P+0:0:-1:
 %4lG:0X8P-1025:0:-1:
@@ -292,8 +292,8 @@
 %*4lG:+NAN():0:4:
 %4lG:+NAN(09A_Zaz):1:4:nan:
 %*4lG:+NAN(09A_Zaz):0:4:
-%4lG:+0X0P0:1:4:0x0:
-%*4lG:+0X0P0:0:4:
+%4lG:+0X.0P0:0:-1:
+%*4lG:+0X.0P0:0:-1:
 %4lG:+0X0P+0:1:4:0x0:
 %*4lG:+0X0P+0:0:4:
 %4lG:+0X8P-1025:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5lG:-0X8P-1025:0:-1:
 %5lG:-0X0P+0:0:-1:
 %*5lG:-0X0P+0:0:-1:
-%5lG:-0X0P0:0:-1:
-%*5lG:-0X0P0:0:-1:
+%5lG:-0X.0P0:1:5:-0x0:
+%*5lG:-0X.0P0:0:5:
 %5lG:-NAN(09A_Zaz):0:-1:
 %*5lG:-NAN(09A_Zaz):0:-1:
 %5lG:-NAN():0:-1:
@@ -334,8 +334,8 @@
 %*5lG:NAN():0:5:
 %5lG:NAN(09A_Zaz):0:-1:
 %*5lG:NAN(09A_Zaz):0:-1:
-%5lG:0X0P0:1:5:0x0:
-%*5lG:0X0P0:0:5:
+%5lG:0X.0P0:0:-1:
+%*5lG:0X.0P0:0:-1:
 %5lG:0X0P+0:0:-1:
 %*5lG:0X0P+0:0:-1:
 %5lG:0X8P-1025:0:-1:
@@ -354,8 +354,8 @@
 %*5lG:+NAN():0:-1:
 %5lG:+NAN(09A_Zaz):0:-1:
 %*5lG:+NAN(09A_Zaz):0:-1:
-%5lG:+0X0P0:0:-1:
-%*5lG:+0X0P0:0:-1:
+%5lG:+0X.0P0:1:5:0x0:
+%*5lG:+0X.0P0:0:5:
 %5lG:+0X0P+0:0:-1:
 %*5lG:+0X0P+0:0:-1:
 %5lG:+0X8P-1025:0:-1:
@@ -386,8 +386,8 @@
 %*6lG:-0X8P-1025:0:-1:
 %6lG:-0X0P+0:0:-1:
 %*6lG:-0X0P+0:0:-1:
-%6lG:-0X0P0:1:6:-0x0:
-%*6lG:-0X0P0:0:6:
+%6lG:-0X.0P0:0:-1:
+%*6lG:-0X.0P0:0:-1:
 %6lG:-NAN(09A_Zaz):0:-1:
 %*6lG:-NAN(09A_Zaz):0:-1:
 %6lG:-NAN():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6lG:NAN():0:5:
 %6lG:NAN(09A_Zaz):0:-1:
 %*6lG:NAN(09A_Zaz):0:-1:
-%6lG:0X0P0:1:5:0x0:
-%*6lG:0X0P0:0:5:
+%6lG:0X.0P0:1:6:0x0:
+%*6lG:0X.0P0:0:6:
 %6lG:0X0P+0:1:6:0x0:
 %*6lG:0X0P+0:0:6:
 %6lG:0X8P-1025:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6lG:+NAN():0:6:
 %6lG:+NAN(09A_Zaz):0:-1:
 %*6lG:+NAN(09A_Zaz):0:-1:
-%6lG:+0X0P0:1:6:0x0:
-%*6lG:+0X0P0:0:6:
+%6lG:+0X.0P0:0:-1:
+%*6lG:+0X.0P0:0:-1:
 %6lG:+0X0P+0:0:-1:
 %*6lG:+0X0P+0:0:-1:
 %6lG:+0X8P-1025:0:-1:
@@ -448,8 +448,8 @@
 %*20lG:-0X8P-1025:0:10:
 %20lG:-0X0P+0:1:7:-0x0:
 %*20lG:-0X0P+0:0:7:
-%20lG:-0X0P0:1:6:-0x0:
-%*20lG:-0X0P0:0:6:
+%20lG:-0X.0P0:1:7:-0x0:
+%*20lG:-0X.0P0:0:7:
 %20lG:-NAN(09A_Zaz):1:13:-nan:
 %*20lG:-NAN(09A_Zaz):0:13:
 %20lG:-NAN():1:6:-nan:
@@ -458,8 +458,8 @@
 %*20lG:NAN():0:5:
 %20lG:NAN(09A_Zaz):1:12:nan:
 %*20lG:NAN(09A_Zaz):0:12:
-%20lG:0X0P0:1:5:0x0:
-%*20lG:0X0P0:0:5:
+%20lG:0X.0P0:1:6:0x0:
+%*20lG:0X.0P0:0:6:
 %20lG:0X0P+0:1:6:0x0:
 %*20lG:0X0P+0:0:6:
 %20lG:0X8P-1025:1:9:0x1p-1022:
@@ -478,8 +478,8 @@
 %*20lG:+NAN():0:6:
 %20lG:+NAN(09A_Zaz):1:13:nan:
 %*20lG:+NAN(09A_Zaz):0:13:
-%20lG:+0X0P0:1:6:0x0:
-%*20lG:+0X0P0:0:6:
+%20lG:+0X.0P0:1:7:0x0:
+%*20lG:+0X.0P0:0:7:
 %20lG:+0X0P+0:1:7:0x0:
 %*20lG:+0X0P+0:0:7:
 %20lG:+0X8P-1025:1:10:0x1p-1022:
@@ -510,8 +510,8 @@
 %*32lG:-0X8P-1025:0:10:
 %32lG:-0X0P+0:1:7:-0x0:
 %*32lG:-0X0P+0:0:7:
-%32lG:-0X0P0:1:6:-0x0:
-%*32lG:-0X0P0:0:6:
+%32lG:-0X.0P0:1:7:-0x0:
+%*32lG:-0X.0P0:0:7:
 %32lG:-NAN(09A_Zaz):1:13:-nan:
 %*32lG:-NAN(09A_Zaz):0:13:
 %32lG:-NAN():1:6:-nan:
@@ -520,8 +520,8 @@
 %*32lG:NAN():0:5:
 %32lG:NAN(09A_Zaz):1:12:nan:
 %*32lG:NAN(09A_Zaz):0:12:
-%32lG:0X0P0:1:5:0x0:
-%*32lG:0X0P0:0:5:
+%32lG:0X.0P0:1:6:0x0:
+%*32lG:0X.0P0:0:6:
 %32lG:0X0P+0:1:6:0x0:
 %*32lG:0X0P+0:0:6:
 %32lG:0X8P-1025:1:9:0x1p-1022:
@@ -540,8 +540,8 @@
 %*32lG:+NAN():0:6:
 %32lG:+NAN(09A_Zaz):1:13:nan:
 %*32lG:+NAN(09A_Zaz):0:13:
-%32lG:+0X0P0:1:6:0x0:
-%*32lG:+0X0P0:0:6:
+%32lG:+0X.0P0:1:7:0x0:
+%*32lG:+0X.0P0:0:7:
 %32lG:+0X0P+0:1:7:0x0:
 %*32lG:+0X0P+0:0:7:
 %32lG:+0X8P-1025:1:10:0x1p-1022:
@@ -572,8 +572,8 @@
 %*5lG: -0X8P-1025:0:-1:
 %5lG: -0X0P+0:0:-1:
 %*5lG: -0X0P+0:0:-1:
-%5lG: -0X0P0:0:-1:
-%*5lG: -0X0P0:0:-1:
+%5lG: -0X.0P0:1:6:-0x0:
+%*5lG: -0X.0P0:0:6:
 %5lG: -NAN(09A_Zaz):0:-1:
 %*5lG: -NAN(09A_Zaz):0:-1:
 %5lG: -NAN():0:-1:
@@ -582,8 +582,8 @@
 %*5lG: NAN():0:6:
 %5lG: NAN(09A_Zaz):0:-1:
 %*5lG: NAN(09A_Zaz):0:-1:
-%5lG: 0X0P0:1:6:0x0:
-%*5lG: 0X0P0:0:6:
+%5lG: 0X.0P0:0:-1:
+%*5lG: 0X.0P0:0:-1:
 %5lG: 0X0P+0:0:-1:
 %*5lG: 0X0P+0:0:-1:
 %5lG: 0X8P-1025:0:-1:
@@ -602,8 +602,8 @@
 %*5lG: +NAN():0:-1:
 %5lG: +NAN(09A_Zaz):0:-1:
 %*5lG: +NAN(09A_Zaz):0:-1:
-%5lG: +0X0P0:0:-1:
-%*5lG: +0X0P0:0:-1:
+%5lG: +0X.0P0:1:6:0x0:
+%*5lG: +0X.0P0:0:6:
 %5lG: +0X0P+0:0:-1:
 %*5lG: +0X0P+0:0:-1:
 %5lG: +0X8P-1025:0:-1:
@@ -634,8 +634,8 @@
 %*32lG: -0X8P-1025:0:11:
 %32lG: -0X0P+0:1:8:-0x0:
 %*32lG: -0X0P+0:0:8:
-%32lG: -0X0P0:1:7:-0x0:
-%*32lG: -0X0P0:0:7:
+%32lG: -0X.0P0:1:8:-0x0:
+%*32lG: -0X.0P0:0:8:
 %32lG: -NAN(09A_Zaz):1:14:-nan:
 %*32lG: -NAN(09A_Zaz):0:14:
 %32lG: -NAN():1:7:-nan:
@@ -644,8 +644,8 @@
 %*32lG: NAN():0:6:
 %32lG: NAN(09A_Zaz):1:13:nan:
 %*32lG: NAN(09A_Zaz):0:13:
-%32lG: 0X0P0:1:6:0x0:
-%*32lG: 0X0P0:0:6:
+%32lG: 0X.0P0:1:7:0x0:
+%*32lG: 0X.0P0:0:7:
 %32lG: 0X0P+0:1:7:0x0:
 %*32lG: 0X0P+0:0:7:
 %32lG: 0X8P-1025:1:10:0x1p-1022:
@@ -664,8 +664,8 @@
 %*32lG: +NAN():0:7:
 %32lG: +NAN(09A_Zaz):1:14:nan:
 %*32lG: +NAN(09A_Zaz):0:14:
-%32lG: +0X0P0:1:7:0x0:
-%*32lG: +0X0P0:0:7:
+%32lG: +0X.0P0:1:8:0x0:
+%*32lG: +0X.0P0:0:8:
 %32lG: +0X0P+0:1:8:0x0:
 %*32lG: +0X0P+0:0:8:
 %32lG: +0X8P-1025:1:11:0x1p-1022:
diff --git a/sysdeps/ieee754/flt-32/tst-scanf-format-float-a.input b/sysdeps/ieee754/flt-32/tst-scanf-format-float-a.input
index f753bca..b066430 100644
--- a/sysdeps/ieee754/flt-32/tst-scanf-format-float-a.input
+++ b/sysdeps/ieee754/flt-32/tst-scanf-format-float-a.input
@@ -14,8 +14,8 @@
 %*a:-0x8p-129:0:9:
 %a:-0x0p+0:1:7:-0x0:
 %*a:-0x0p+0:0:7:
-%a:-0x0p0:1:6:-0x0:
-%*a:-0x0p0:0:6:
+%a:-0x.0p0:1:7:-0x0:
+%*a:-0x.0p0:0:7:
 %a:-nan(09A_Zaz):1:13:-nan:
 %*a:-nan(09A_Zaz):0:13:
 %a:-nan():1:6:-nan:
@@ -24,8 +24,8 @@
 %*a:nan():0:5:
 %a:nan(09A_Zaz):1:12:nan:
 %*a:nan(09A_Zaz):0:12:
-%a:0x0p0:1:5:0x0:
-%*a:0x0p0:0:5:
+%a:0x.0p0:1:6:0x0:
+%*a:0x.0p0:0:6:
 %a:0x0p+0:1:6:0x0:
 %*a:0x0p+0:0:6:
 %a:0x8p-129:1:8:0x1p-126:
@@ -44,8 +44,8 @@
 %*a:+nan():0:6:
 %a:+nan(09A_Zaz):1:13:nan:
 %*a:+nan(09A_Zaz):0:13:
-%a:+0x0p0:1:6:0x0:
-%*a:+0x0p0:0:6:
+%a:+0x.0p0:1:7:0x0:
+%*a:+0x.0p0:0:7:
 %a:+0x0p+0:1:7:0x0:
 %*a:+0x0p+0:0:7:
 %a:+0x8p-129:1:9:0x1p-126:
@@ -76,8 +76,8 @@
 %*1a:-0x8p-129:0:-1:
 %1a:-0x0p+0:0:-1:
 %*1a:-0x0p+0:0:-1:
-%1a:-0x0p0:0:-1:
-%*1a:-0x0p0:0:-1:
+%1a:-0x.0p0:0:-1:
+%*1a:-0x.0p0:0:-1:
 %1a:-nan(09A_Zaz):0:-1:
 %*1a:-nan(09A_Zaz):0:-1:
 %1a:-nan():0:-1:
@@ -86,8 +86,8 @@
 %*1a:nan():0:-1:
 %1a:nan(09A_Zaz):0:-1:
 %*1a:nan(09A_Zaz):0:-1:
-%1a:0x0p0:1:1:0x0:
-%*1a:0x0p0:0:1:
+%1a:0x.0p0:1:1:0x0:
+%*1a:0x.0p0:0:1:
 %1a:0x0p+0:1:1:0x0:
 %*1a:0x0p+0:0:1:
 %1a:0x8p-129:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1a:+nan():0:-1:
 %1a:+nan(09A_Zaz):0:-1:
 %*1a:+nan(09A_Zaz):0:-1:
-%1a:+0x0p0:0:-1:
-%*1a:+0x0p0:0:-1:
+%1a:+0x.0p0:0:-1:
+%*1a:+0x.0p0:0:-1:
 %1a:+0x0p+0:0:-1:
 %*1a:+0x0p+0:0:-1:
 %1a:+0x8p-129:0:-1:
@@ -138,8 +138,8 @@
 %*2a:-0x8p-129:0:2:
 %2a:-0x0p+0:1:2:-0x0:
 %*2a:-0x0p+0:0:2:
-%2a:-0x0p0:1:2:-0x0:
-%*2a:-0x0p0:0:2:
+%2a:-0x.0p0:1:2:-0x0:
+%*2a:-0x.0p0:0:2:
 %2a:-nan(09A_Zaz):0:-1:
 %*2a:-nan(09A_Zaz):0:-1:
 %2a:-nan():0:-1:
@@ -148,8 +148,8 @@
 %*2a:nan():0:-1:
 %2a:nan(09A_Zaz):0:-1:
 %*2a:nan(09A_Zaz):0:-1:
-%2a:0x0p0:0:-1:
-%*2a:0x0p0:0:-1:
+%2a:0x.0p0:0:-1:
+%*2a:0x.0p0:0:-1:
 %2a:0x0p+0:0:-1:
 %*2a:0x0p+0:0:-1:
 %2a:0x8p-129:0:-1:
@@ -168,8 +168,8 @@
 %*2a:+nan():0:-1:
 %2a:+nan(09A_Zaz):0:-1:
 %*2a:+nan(09A_Zaz):0:-1:
-%2a:+0x0p0:1:2:0x0:
-%*2a:+0x0p0:0:2:
+%2a:+0x.0p0:1:2:0x0:
+%*2a:+0x.0p0:0:2:
 %2a:+0x0p+0:1:2:0x0:
 %*2a:+0x0p+0:0:2:
 %2a:+0x8p-129:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3a:-0x8p-129:0:-1:
 %3a:-0x0p+0:0:-1:
 %*3a:-0x0p+0:0:-1:
-%3a:-0x0p0:0:-1:
-%*3a:-0x0p0:0:-1:
+%3a:-0x.0p0:0:-1:
+%*3a:-0x.0p0:0:-1:
 %3a:-nan(09A_Zaz):0:-1:
 %*3a:-nan(09A_Zaz):0:-1:
 %3a:-nan():0:-1:
@@ -210,8 +210,8 @@
 %*3a:nan():0:3:
 %3a:nan(09A_Zaz):1:3:nan:
 %*3a:nan(09A_Zaz):0:3:
-%3a:0x0p0:1:3:0x0:
-%*3a:0x0p0:0:3:
+%3a:0x.0p0:0:-1:
+%*3a:0x.0p0:0:-1:
 %3a:0x0p+0:1:3:0x0:
 %*3a:0x0p+0:0:3:
 %3a:0x8p-129:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3a:+nan():0:-1:
 %3a:+nan(09A_Zaz):0:-1:
 %*3a:+nan(09A_Zaz):0:-1:
-%3a:+0x0p0:0:-1:
-%*3a:+0x0p0:0:-1:
+%3a:+0x.0p0:0:-1:
+%*3a:+0x.0p0:0:-1:
 %3a:+0x0p+0:0:-1:
 %*3a:+0x0p+0:0:-1:
 %3a:+0x8p-129:0:-1:
@@ -262,8 +262,8 @@
 %*4a:-0x8p-129:0:4:
 %4a:-0x0p+0:1:4:-0x0:
 %*4a:-0x0p+0:0:4:
-%4a:-0x0p0:1:4:-0x0:
-%*4a:-0x0p0:0:4:
+%4a:-0x.0p0:0:-1:
+%*4a:-0x.0p0:0:-1:
 %4a:-nan(09A_Zaz):1:4:-nan:
 %*4a:-nan(09A_Zaz):0:4:
 %4a:-nan():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4a:nan():0:-1:
 %4a:nan(09A_Zaz):0:-1:
 %*4a:nan(09A_Zaz):0:-1:
-%4a:0x0p0:0:-1:
-%*4a:0x0p0:0:-1:
+%4a:0x.0p0:1:4:0x0:
+%*4a:0x.0p0:0:4:
 %4a:0x0p+0:0:-1:
 %*4a:0x0p+0:0:-1:
 %4a:0x8p-129:0:-1:
@@ -292,8 +292,8 @@
 %*4a:+nan():0:4:
 %4a:+nan(09A_Zaz):1:4:nan:
 %*4a:+nan(09A_Zaz):0:4:
-%4a:+0x0p0:1:4:0x0:
-%*4a:+0x0p0:0:4:
+%4a:+0x.0p0:0:-1:
+%*4a:+0x.0p0:0:-1:
 %4a:+0x0p+0:1:4:0x0:
 %*4a:+0x0p+0:0:4:
 %4a:+0x8p-129:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5a:-0x8p-129:0:-1:
 %5a:-0x0p+0:0:-1:
 %*5a:-0x0p+0:0:-1:
-%5a:-0x0p0:0:-1:
-%*5a:-0x0p0:0:-1:
+%5a:-0x.0p0:1:5:-0x0:
+%*5a:-0x.0p0:0:5:
 %5a:-nan(09A_Zaz):0:-1:
 %*5a:-nan(09A_Zaz):0:-1:
 %5a:-nan():0:-1:
@@ -334,8 +334,8 @@
 %*5a:nan():0:5:
 %5a:nan(09A_Zaz):0:-1:
 %*5a:nan(09A_Zaz):0:-1:
-%5a:0x0p0:1:5:0x0:
-%*5a:0x0p0:0:5:
+%5a:0x.0p0:0:-1:
+%*5a:0x.0p0:0:-1:
 %5a:0x0p+0:0:-1:
 %*5a:0x0p+0:0:-1:
 %5a:0x8p-129:0:-1:
@@ -354,8 +354,8 @@
 %*5a:+nan():0:-1:
 %5a:+nan(09A_Zaz):0:-1:
 %*5a:+nan(09A_Zaz):0:-1:
-%5a:+0x0p0:0:-1:
-%*5a:+0x0p0:0:-1:
+%5a:+0x.0p0:1:5:0x0:
+%*5a:+0x.0p0:0:5:
 %5a:+0x0p+0:0:-1:
 %*5a:+0x0p+0:0:-1:
 %5a:+0x8p-129:0:-1:
@@ -386,8 +386,8 @@
 %*6a:-0x8p-129:0:-1:
 %6a:-0x0p+0:0:-1:
 %*6a:-0x0p+0:0:-1:
-%6a:-0x0p0:1:6:-0x0:
-%*6a:-0x0p0:0:6:
+%6a:-0x.0p0:0:-1:
+%*6a:-0x.0p0:0:-1:
 %6a:-nan(09A_Zaz):0:-1:
 %*6a:-nan(09A_Zaz):0:-1:
 %6a:-nan():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6a:nan():0:5:
 %6a:nan(09A_Zaz):0:-1:
 %*6a:nan(09A_Zaz):0:-1:
-%6a:0x0p0:1:5:0x0:
-%*6a:0x0p0:0:5:
+%6a:0x.0p0:1:6:0x0:
+%*6a:0x.0p0:0:6:
 %6a:0x0p+0:1:6:0x0:
 %*6a:0x0p+0:0:6:
 %6a:0x8p-129:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6a:+nan():0:6:
 %6a:+nan(09A_Zaz):0:-1:
 %*6a:+nan(09A_Zaz):0:-1:
-%6a:+0x0p0:1:6:0x0:
-%*6a:+0x0p0:0:6:
+%6a:+0x.0p0:0:-1:
+%*6a:+0x.0p0:0:-1:
 %6a:+0x0p+0:0:-1:
 %*6a:+0x0p+0:0:-1:
 %6a:+0x8p-129:0:-1:
@@ -448,8 +448,8 @@
 %*12a:-0x8p-129:0:9:
 %12a:-0x0p+0:1:7:-0x0:
 %*12a:-0x0p+0:0:7:
-%12a:-0x0p0:1:6:-0x0:
-%*12a:-0x0p0:0:6:
+%12a:-0x.0p0:1:7:-0x0:
+%*12a:-0x.0p0:0:7:
 %12a:-nan(09A_Zaz):0:-1:
 %*12a:-nan(09A_Zaz):0:-1:
 %12a:-nan():1:6:-nan:
@@ -458,8 +458,8 @@
 %*12a:nan():0:5:
 %12a:nan(09A_Zaz):1:12:nan:
 %*12a:nan(09A_Zaz):0:12:
-%12a:0x0p0:1:5:0x0:
-%*12a:0x0p0:0:5:
+%12a:0x.0p0:1:6:0x0:
+%*12a:0x.0p0:0:6:
 %12a:0x0p+0:1:6:0x0:
 %*12a:0x0p+0:0:6:
 %12a:0x8p-129:1:8:0x1p-126:
@@ -478,8 +478,8 @@
 %*12a:+nan():0:6:
 %12a:+nan(09A_Zaz):0:-1:
 %*12a:+nan(09A_Zaz):0:-1:
-%12a:+0x0p0:1:6:0x0:
-%*12a:+0x0p0:0:6:
+%12a:+0x.0p0:1:7:0x0:
+%*12a:+0x.0p0:0:7:
 %12a:+0x0p+0:1:7:0x0:
 %*12a:+0x0p+0:0:7:
 %12a:+0x8p-129:1:9:0x1p-126:
@@ -510,8 +510,8 @@
 %*18a:-0x8p-129:0:9:
 %18a:-0x0p+0:1:7:-0x0:
 %*18a:-0x0p+0:0:7:
-%18a:-0x0p0:1:6:-0x0:
-%*18a:-0x0p0:0:6:
+%18a:-0x.0p0:1:7:-0x0:
+%*18a:-0x.0p0:0:7:
 %18a:-nan(09A_Zaz):1:13:-nan:
 %*18a:-nan(09A_Zaz):0:13:
 %18a:-nan():1:6:-nan:
@@ -520,8 +520,8 @@
 %*18a:nan():0:5:
 %18a:nan(09A_Zaz):1:12:nan:
 %*18a:nan(09A_Zaz):0:12:
-%18a:0x0p0:1:5:0x0:
-%*18a:0x0p0:0:5:
+%18a:0x.0p0:1:6:0x0:
+%*18a:0x.0p0:0:6:
 %18a:0x0p+0:1:6:0x0:
 %*18a:0x0p+0:0:6:
 %18a:0x8p-129:1:8:0x1p-126:
@@ -540,8 +540,8 @@
 %*18a:+nan():0:6:
 %18a:+nan(09A_Zaz):1:13:nan:
 %*18a:+nan(09A_Zaz):0:13:
-%18a:+0x0p0:1:6:0x0:
-%*18a:+0x0p0:0:6:
+%18a:+0x.0p0:1:7:0x0:
+%*18a:+0x.0p0:0:7:
 %18a:+0x0p+0:1:7:0x0:
 %*18a:+0x0p+0:0:7:
 %18a:+0x8p-129:1:9:0x1p-126:
@@ -572,8 +572,8 @@
 %*5a: -0x8p-129:0:-1:
 %5a: -0x0p+0:0:-1:
 %*5a: -0x0p+0:0:-1:
-%5a: -0x0p0:0:-1:
-%*5a: -0x0p0:0:-1:
+%5a: -0x.0p0:1:6:-0x0:
+%*5a: -0x.0p0:0:6:
 %5a: -nan(09A_Zaz):0:-1:
 %*5a: -nan(09A_Zaz):0:-1:
 %5a: -nan():0:-1:
@@ -582,8 +582,8 @@
 %*5a: nan():0:6:
 %5a: nan(09A_Zaz):0:-1:
 %*5a: nan(09A_Zaz):0:-1:
-%5a: 0x0p0:1:6:0x0:
-%*5a: 0x0p0:0:6:
+%5a: 0x.0p0:0:-1:
+%*5a: 0x.0p0:0:-1:
 %5a: 0x0p+0:0:-1:
 %*5a: 0x0p+0:0:-1:
 %5a: 0x8p-129:0:-1:
@@ -602,8 +602,8 @@
 %*5a: +nan():0:-1:
 %5a: +nan(09A_Zaz):0:-1:
 %*5a: +nan(09A_Zaz):0:-1:
-%5a: +0x0p0:0:-1:
-%*5a: +0x0p0:0:-1:
+%5a: +0x.0p0:1:6:0x0:
+%*5a: +0x.0p0:0:6:
 %5a: +0x0p+0:0:-1:
 %*5a: +0x0p+0:0:-1:
 %5a: +0x8p-129:0:-1:
@@ -634,8 +634,8 @@
 %*18a: -0x8p-129:0:10:
 %18a: -0x0p+0:1:8:-0x0:
 %*18a: -0x0p+0:0:8:
-%18a: -0x0p0:1:7:-0x0:
-%*18a: -0x0p0:0:7:
+%18a: -0x.0p0:1:8:-0x0:
+%*18a: -0x.0p0:0:8:
 %18a: -nan(09A_Zaz):1:14:-nan:
 %*18a: -nan(09A_Zaz):0:14:
 %18a: -nan():1:7:-nan:
@@ -644,8 +644,8 @@
 %*18a: nan():0:6:
 %18a: nan(09A_Zaz):1:13:nan:
 %*18a: nan(09A_Zaz):0:13:
-%18a: 0x0p0:1:6:0x0:
-%*18a: 0x0p0:0:6:
+%18a: 0x.0p0:1:7:0x0:
+%*18a: 0x.0p0:0:7:
 %18a: 0x0p+0:1:7:0x0:
 %*18a: 0x0p+0:0:7:
 %18a: 0x8p-129:1:9:0x1p-126:
@@ -664,8 +664,8 @@
 %*18a: +nan():0:7:
 %18a: +nan(09A_Zaz):1:14:nan:
 %*18a: +nan(09A_Zaz):0:14:
-%18a: +0x0p0:1:7:0x0:
-%*18a: +0x0p0:0:7:
+%18a: +0x.0p0:1:8:0x0:
+%*18a: +0x.0p0:0:8:
 %18a: +0x0p+0:1:8:0x0:
 %*18a: +0x0p+0:0:8:
 %18a: +0x8p-129:1:10:0x1p-126:
diff --git a/sysdeps/ieee754/flt-32/tst-scanf-format-float-aa.input b/sysdeps/ieee754/flt-32/tst-scanf-format-float-aa.input
index 2f23e31..9a01556 100644
--- a/sysdeps/ieee754/flt-32/tst-scanf-format-float-aa.input
+++ b/sysdeps/ieee754/flt-32/tst-scanf-format-float-aa.input
@@ -14,8 +14,8 @@
 %*A:-0X8P-129:0:9:
 %A:-0X0P+0:1:7:-0x0:
 %*A:-0X0P+0:0:7:
-%A:-0X0P0:1:6:-0x0:
-%*A:-0X0P0:0:6:
+%A:-0X.0P0:1:7:-0x0:
+%*A:-0X.0P0:0:7:
 %A:-NAN(09A_Zaz):1:13:-nan:
 %*A:-NAN(09A_Zaz):0:13:
 %A:-NAN():1:6:-nan:
@@ -24,8 +24,8 @@
 %*A:NAN():0:5:
 %A:NAN(09A_Zaz):1:12:nan:
 %*A:NAN(09A_Zaz):0:12:
-%A:0X0P0:1:5:0x0:
-%*A:0X0P0:0:5:
+%A:0X.0P0:1:6:0x0:
+%*A:0X.0P0:0:6:
 %A:0X0P+0:1:6:0x0:
 %*A:0X0P+0:0:6:
 %A:0X8P-129:1:8:0x1p-126:
@@ -44,8 +44,8 @@
 %*A:+NAN():0:6:
 %A:+NAN(09A_Zaz):1:13:nan:
 %*A:+NAN(09A_Zaz):0:13:
-%A:+0X0P0:1:6:0x0:
-%*A:+0X0P0:0:6:
+%A:+0X.0P0:1:7:0x0:
+%*A:+0X.0P0:0:7:
 %A:+0X0P+0:1:7:0x0:
 %*A:+0X0P+0:0:7:
 %A:+0X8P-129:1:9:0x1p-126:
@@ -76,8 +76,8 @@
 %*1A:-0X8P-129:0:-1:
 %1A:-0X0P+0:0:-1:
 %*1A:-0X0P+0:0:-1:
-%1A:-0X0P0:0:-1:
-%*1A:-0X0P0:0:-1:
+%1A:-0X.0P0:0:-1:
+%*1A:-0X.0P0:0:-1:
 %1A:-NAN(09A_Zaz):0:-1:
 %*1A:-NAN(09A_Zaz):0:-1:
 %1A:-NAN():0:-1:
@@ -86,8 +86,8 @@
 %*1A:NAN():0:-1:
 %1A:NAN(09A_Zaz):0:-1:
 %*1A:NAN(09A_Zaz):0:-1:
-%1A:0X0P0:1:1:0x0:
-%*1A:0X0P0:0:1:
+%1A:0X.0P0:1:1:0x0:
+%*1A:0X.0P0:0:1:
 %1A:0X0P+0:1:1:0x0:
 %*1A:0X0P+0:0:1:
 %1A:0X8P-129:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1A:+NAN():0:-1:
 %1A:+NAN(09A_Zaz):0:-1:
 %*1A:+NAN(09A_Zaz):0:-1:
-%1A:+0X0P0:0:-1:
-%*1A:+0X0P0:0:-1:
+%1A:+0X.0P0:0:-1:
+%*1A:+0X.0P0:0:-1:
 %1A:+0X0P+0:0:-1:
 %*1A:+0X0P+0:0:-1:
 %1A:+0X8P-129:0:-1:
@@ -138,8 +138,8 @@
 %*2A:-0X8P-129:0:2:
 %2A:-0X0P+0:1:2:-0x0:
 %*2A:-0X0P+0:0:2:
-%2A:-0X0P0:1:2:-0x0:
-%*2A:-0X0P0:0:2:
+%2A:-0X.0P0:1:2:-0x0:
+%*2A:-0X.0P0:0:2:
 %2A:-NAN(09A_Zaz):0:-1:
 %*2A:-NAN(09A_Zaz):0:-1:
 %2A:-NAN():0:-1:
@@ -148,8 +148,8 @@
 %*2A:NAN():0:-1:
 %2A:NAN(09A_Zaz):0:-1:
 %*2A:NAN(09A_Zaz):0:-1:
-%2A:0X0P0:0:-1:
-%*2A:0X0P0:0:-1:
+%2A:0X.0P0:0:-1:
+%*2A:0X.0P0:0:-1:
 %2A:0X0P+0:0:-1:
 %*2A:0X0P+0:0:-1:
 %2A:0X8P-129:0:-1:
@@ -168,8 +168,8 @@
 %*2A:+NAN():0:-1:
 %2A:+NAN(09A_Zaz):0:-1:
 %*2A:+NAN(09A_Zaz):0:-1:
-%2A:+0X0P0:1:2:0x0:
-%*2A:+0X0P0:0:2:
+%2A:+0X.0P0:1:2:0x0:
+%*2A:+0X.0P0:0:2:
 %2A:+0X0P+0:1:2:0x0:
 %*2A:+0X0P+0:0:2:
 %2A:+0X8P-129:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3A:-0X8P-129:0:-1:
 %3A:-0X0P+0:0:-1:
 %*3A:-0X0P+0:0:-1:
-%3A:-0X0P0:0:-1:
-%*3A:-0X0P0:0:-1:
+%3A:-0X.0P0:0:-1:
+%*3A:-0X.0P0:0:-1:
 %3A:-NAN(09A_Zaz):0:-1:
 %*3A:-NAN(09A_Zaz):0:-1:
 %3A:-NAN():0:-1:
@@ -210,8 +210,8 @@
 %*3A:NAN():0:3:
 %3A:NAN(09A_Zaz):1:3:nan:
 %*3A:NAN(09A_Zaz):0:3:
-%3A:0X0P0:1:3:0x0:
-%*3A:0X0P0:0:3:
+%3A:0X.0P0:0:-1:
+%*3A:0X.0P0:0:-1:
 %3A:0X0P+0:1:3:0x0:
 %*3A:0X0P+0:0:3:
 %3A:0X8P-129:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3A:+NAN():0:-1:
 %3A:+NAN(09A_Zaz):0:-1:
 %*3A:+NAN(09A_Zaz):0:-1:
-%3A:+0X0P0:0:-1:
-%*3A:+0X0P0:0:-1:
+%3A:+0X.0P0:0:-1:
+%*3A:+0X.0P0:0:-1:
 %3A:+0X0P+0:0:-1:
 %*3A:+0X0P+0:0:-1:
 %3A:+0X8P-129:0:-1:
@@ -262,8 +262,8 @@
 %*4A:-0X8P-129:0:4:
 %4A:-0X0P+0:1:4:-0x0:
 %*4A:-0X0P+0:0:4:
-%4A:-0X0P0:1:4:-0x0:
-%*4A:-0X0P0:0:4:
+%4A:-0X.0P0:0:-1:
+%*4A:-0X.0P0:0:-1:
 %4A:-NAN(09A_Zaz):1:4:-nan:
 %*4A:-NAN(09A_Zaz):0:4:
 %4A:-NAN():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4A:NAN():0:-1:
 %4A:NAN(09A_Zaz):0:-1:
 %*4A:NAN(09A_Zaz):0:-1:
-%4A:0X0P0:0:-1:
-%*4A:0X0P0:0:-1:
+%4A:0X.0P0:1:4:0x0:
+%*4A:0X.0P0:0:4:
 %4A:0X0P+0:0:-1:
 %*4A:0X0P+0:0:-1:
 %4A:0X8P-129:0:-1:
@@ -292,8 +292,8 @@
 %*4A:+NAN():0:4:
 %4A:+NAN(09A_Zaz):1:4:nan:
 %*4A:+NAN(09A_Zaz):0:4:
-%4A:+0X0P0:1:4:0x0:
-%*4A:+0X0P0:0:4:
+%4A:+0X.0P0:0:-1:
+%*4A:+0X.0P0:0:-1:
 %4A:+0X0P+0:1:4:0x0:
 %*4A:+0X0P+0:0:4:
 %4A:+0X8P-129:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5A:-0X8P-129:0:-1:
 %5A:-0X0P+0:0:-1:
 %*5A:-0X0P+0:0:-1:
-%5A:-0X0P0:0:-1:
-%*5A:-0X0P0:0:-1:
+%5A:-0X.0P0:1:5:-0x0:
+%*5A:-0X.0P0:0:5:
 %5A:-NAN(09A_Zaz):0:-1:
 %*5A:-NAN(09A_Zaz):0:-1:
 %5A:-NAN():0:-1:
@@ -334,8 +334,8 @@
 %*5A:NAN():0:5:
 %5A:NAN(09A_Zaz):0:-1:
 %*5A:NAN(09A_Zaz):0:-1:
-%5A:0X0P0:1:5:0x0:
-%*5A:0X0P0:0:5:
+%5A:0X.0P0:0:-1:
+%*5A:0X.0P0:0:-1:
 %5A:0X0P+0:0:-1:
 %*5A:0X0P+0:0:-1:
 %5A:0X8P-129:0:-1:
@@ -354,8 +354,8 @@
 %*5A:+NAN():0:-1:
 %5A:+NAN(09A_Zaz):0:-1:
 %*5A:+NAN(09A_Zaz):0:-1:
-%5A:+0X0P0:0:-1:
-%*5A:+0X0P0:0:-1:
+%5A:+0X.0P0:1:5:0x0:
+%*5A:+0X.0P0:0:5:
 %5A:+0X0P+0:0:-1:
 %*5A:+0X0P+0:0:-1:
 %5A:+0X8P-129:0:-1:
@@ -386,8 +386,8 @@
 %*6A:-0X8P-129:0:-1:
 %6A:-0X0P+0:0:-1:
 %*6A:-0X0P+0:0:-1:
-%6A:-0X0P0:1:6:-0x0:
-%*6A:-0X0P0:0:6:
+%6A:-0X.0P0:0:-1:
+%*6A:-0X.0P0:0:-1:
 %6A:-NAN(09A_Zaz):0:-1:
 %*6A:-NAN(09A_Zaz):0:-1:
 %6A:-NAN():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6A:NAN():0:5:
 %6A:NAN(09A_Zaz):0:-1:
 %*6A:NAN(09A_Zaz):0:-1:
-%6A:0X0P0:1:5:0x0:
-%*6A:0X0P0:0:5:
+%6A:0X.0P0:1:6:0x0:
+%*6A:0X.0P0:0:6:
 %6A:0X0P+0:1:6:0x0:
 %*6A:0X0P+0:0:6:
 %6A:0X8P-129:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6A:+NAN():0:6:
 %6A:+NAN(09A_Zaz):0:-1:
 %*6A:+NAN(09A_Zaz):0:-1:
-%6A:+0X0P0:1:6:0x0:
-%*6A:+0X0P0:0:6:
+%6A:+0X.0P0:0:-1:
+%*6A:+0X.0P0:0:-1:
 %6A:+0X0P+0:0:-1:
 %*6A:+0X0P+0:0:-1:
 %6A:+0X8P-129:0:-1:
@@ -448,8 +448,8 @@
 %*12A:-0X8P-129:0:9:
 %12A:-0X0P+0:1:7:-0x0:
 %*12A:-0X0P+0:0:7:
-%12A:-0X0P0:1:6:-0x0:
-%*12A:-0X0P0:0:6:
+%12A:-0X.0P0:1:7:-0x0:
+%*12A:-0X.0P0:0:7:
 %12A:-NAN(09A_Zaz):0:-1:
 %*12A:-NAN(09A_Zaz):0:-1:
 %12A:-NAN():1:6:-nan:
@@ -458,8 +458,8 @@
 %*12A:NAN():0:5:
 %12A:NAN(09A_Zaz):1:12:nan:
 %*12A:NAN(09A_Zaz):0:12:
-%12A:0X0P0:1:5:0x0:
-%*12A:0X0P0:0:5:
+%12A:0X.0P0:1:6:0x0:
+%*12A:0X.0P0:0:6:
 %12A:0X0P+0:1:6:0x0:
 %*12A:0X0P+0:0:6:
 %12A:0X8P-129:1:8:0x1p-126:
@@ -478,8 +478,8 @@
 %*12A:+NAN():0:6:
 %12A:+NAN(09A_Zaz):0:-1:
 %*12A:+NAN(09A_Zaz):0:-1:
-%12A:+0X0P0:1:6:0x0:
-%*12A:+0X0P0:0:6:
+%12A:+0X.0P0:1:7:0x0:
+%*12A:+0X.0P0:0:7:
 %12A:+0X0P+0:1:7:0x0:
 %*12A:+0X0P+0:0:7:
 %12A:+0X8P-129:1:9:0x1p-126:
@@ -510,8 +510,8 @@
 %*18A:-0X8P-129:0:9:
 %18A:-0X0P+0:1:7:-0x0:
 %*18A:-0X0P+0:0:7:
-%18A:-0X0P0:1:6:-0x0:
-%*18A:-0X0P0:0:6:
+%18A:-0X.0P0:1:7:-0x0:
+%*18A:-0X.0P0:0:7:
 %18A:-NAN(09A_Zaz):1:13:-nan:
 %*18A:-NAN(09A_Zaz):0:13:
 %18A:-NAN():1:6:-nan:
@@ -520,8 +520,8 @@
 %*18A:NAN():0:5:
 %18A:NAN(09A_Zaz):1:12:nan:
 %*18A:NAN(09A_Zaz):0:12:
-%18A:0X0P0:1:5:0x0:
-%*18A:0X0P0:0:5:
+%18A:0X.0P0:1:6:0x0:
+%*18A:0X.0P0:0:6:
 %18A:0X0P+0:1:6:0x0:
 %*18A:0X0P+0:0:6:
 %18A:0X8P-129:1:8:0x1p-126:
@@ -540,8 +540,8 @@
 %*18A:+NAN():0:6:
 %18A:+NAN(09A_Zaz):1:13:nan:
 %*18A:+NAN(09A_Zaz):0:13:
-%18A:+0X0P0:1:6:0x0:
-%*18A:+0X0P0:0:6:
+%18A:+0X.0P0:1:7:0x0:
+%*18A:+0X.0P0:0:7:
 %18A:+0X0P+0:1:7:0x0:
 %*18A:+0X0P+0:0:7:
 %18A:+0X8P-129:1:9:0x1p-126:
@@ -572,8 +572,8 @@
 %*5A: -0X8P-129:0:-1:
 %5A: -0X0P+0:0:-1:
 %*5A: -0X0P+0:0:-1:
-%5A: -0X0P0:0:-1:
-%*5A: -0X0P0:0:-1:
+%5A: -0X.0P0:1:6:-0x0:
+%*5A: -0X.0P0:0:6:
 %5A: -NAN(09A_Zaz):0:-1:
 %*5A: -NAN(09A_Zaz):0:-1:
 %5A: -NAN():0:-1:
@@ -582,8 +582,8 @@
 %*5A: NAN():0:6:
 %5A: NAN(09A_Zaz):0:-1:
 %*5A: NAN(09A_Zaz):0:-1:
-%5A: 0X0P0:1:6:0x0:
-%*5A: 0X0P0:0:6:
+%5A: 0X.0P0:0:-1:
+%*5A: 0X.0P0:0:-1:
 %5A: 0X0P+0:0:-1:
 %*5A: 0X0P+0:0:-1:
 %5A: 0X8P-129:0:-1:
@@ -602,8 +602,8 @@
 %*5A: +NAN():0:-1:
 %5A: +NAN(09A_Zaz):0:-1:
 %*5A: +NAN(09A_Zaz):0:-1:
-%5A: +0X0P0:0:-1:
-%*5A: +0X0P0:0:-1:
+%5A: +0X.0P0:1:6:0x0:
+%*5A: +0X.0P0:0:6:
 %5A: +0X0P+0:0:-1:
 %*5A: +0X0P+0:0:-1:
 %5A: +0X8P-129:0:-1:
@@ -634,8 +634,8 @@
 %*18A: -0X8P-129:0:10:
 %18A: -0X0P+0:1:8:-0x0:
 %*18A: -0X0P+0:0:8:
-%18A: -0X0P0:1:7:-0x0:
-%*18A: -0X0P0:0:7:
+%18A: -0X.0P0:1:8:-0x0:
+%*18A: -0X.0P0:0:8:
 %18A: -NAN(09A_Zaz):1:14:-nan:
 %*18A: -NAN(09A_Zaz):0:14:
 %18A: -NAN():1:7:-nan:
@@ -644,8 +644,8 @@
 %*18A: NAN():0:6:
 %18A: NAN(09A_Zaz):1:13:nan:
 %*18A: NAN(09A_Zaz):0:13:
-%18A: 0X0P0:1:6:0x0:
-%*18A: 0X0P0:0:6:
+%18A: 0X.0P0:1:7:0x0:
+%*18A: 0X.0P0:0:7:
 %18A: 0X0P+0:1:7:0x0:
 %*18A: 0X0P+0:0:7:
 %18A: 0X8P-129:1:9:0x1p-126:
@@ -664,8 +664,8 @@
 %*18A: +NAN():0:7:
 %18A: +NAN(09A_Zaz):1:14:nan:
 %*18A: +NAN(09A_Zaz):0:14:
-%18A: +0X0P0:1:7:0x0:
-%*18A: +0X0P0:0:7:
+%18A: +0X.0P0:1:8:0x0:
+%*18A: +0X.0P0:0:8:
 %18A: +0X0P+0:1:8:0x0:
 %*18A: +0X0P+0:0:8:
 %18A: +0X8P-129:1:10:0x1p-126:
diff --git a/sysdeps/ieee754/flt-32/tst-scanf-format-float-g.input b/sysdeps/ieee754/flt-32/tst-scanf-format-float-g.input
index 9e78ab6..4c03b52 100644
--- a/sysdeps/ieee754/flt-32/tst-scanf-format-float-g.input
+++ b/sysdeps/ieee754/flt-32/tst-scanf-format-float-g.input
@@ -14,8 +14,8 @@
 %*g:-0x8p-129:0:9:
 %g:-0x0p+0:1:7:-0x0:
 %*g:-0x0p+0:0:7:
-%g:-0x0p0:1:6:-0x0:
-%*g:-0x0p0:0:6:
+%g:-0x.0p0:1:7:-0x0:
+%*g:-0x.0p0:0:7:
 %g:-nan(09A_Zaz):1:13:-nan:
 %*g:-nan(09A_Zaz):0:13:
 %g:-nan():1:6:-nan:
@@ -24,8 +24,8 @@
 %*g:nan():0:5:
 %g:nan(09A_Zaz):1:12:nan:
 %*g:nan(09A_Zaz):0:12:
-%g:0x0p0:1:5:0x0:
-%*g:0x0p0:0:5:
+%g:0x.0p0:1:6:0x0:
+%*g:0x.0p0:0:6:
 %g:0x0p+0:1:6:0x0:
 %*g:0x0p+0:0:6:
 %g:0x8p-129:1:8:0x1p-126:
@@ -44,8 +44,8 @@
 %*g:+nan():0:6:
 %g:+nan(09A_Zaz):1:13:nan:
 %*g:+nan(09A_Zaz):0:13:
-%g:+0x0p0:1:6:0x0:
-%*g:+0x0p0:0:6:
+%g:+0x.0p0:1:7:0x0:
+%*g:+0x.0p0:0:7:
 %g:+0x0p+0:1:7:0x0:
 %*g:+0x0p+0:0:7:
 %g:+0x8p-129:1:9:0x1p-126:
@@ -76,8 +76,8 @@
 %*1g:-0x8p-129:0:-1:
 %1g:-0x0p+0:0:-1:
 %*1g:-0x0p+0:0:-1:
-%1g:-0x0p0:0:-1:
-%*1g:-0x0p0:0:-1:
+%1g:-0x.0p0:0:-1:
+%*1g:-0x.0p0:0:-1:
 %1g:-nan(09A_Zaz):0:-1:
 %*1g:-nan(09A_Zaz):0:-1:
 %1g:-nan():0:-1:
@@ -86,8 +86,8 @@
 %*1g:nan():0:-1:
 %1g:nan(09A_Zaz):0:-1:
 %*1g:nan(09A_Zaz):0:-1:
-%1g:0x0p0:1:1:0x0:
-%*1g:0x0p0:0:1:
+%1g:0x.0p0:1:1:0x0:
+%*1g:0x.0p0:0:1:
 %1g:0x0p+0:1:1:0x0:
 %*1g:0x0p+0:0:1:
 %1g:0x8p-129:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1g:+nan():0:-1:
 %1g:+nan(09A_Zaz):0:-1:
 %*1g:+nan(09A_Zaz):0:-1:
-%1g:+0x0p0:0:-1:
-%*1g:+0x0p0:0:-1:
+%1g:+0x.0p0:0:-1:
+%*1g:+0x.0p0:0:-1:
 %1g:+0x0p+0:0:-1:
 %*1g:+0x0p+0:0:-1:
 %1g:+0x8p-129:0:-1:
@@ -138,8 +138,8 @@
 %*2g:-0x8p-129:0:2:
 %2g:-0x0p+0:1:2:-0x0:
 %*2g:-0x0p+0:0:2:
-%2g:-0x0p0:1:2:-0x0:
-%*2g:-0x0p0:0:2:
+%2g:-0x.0p0:1:2:-0x0:
+%*2g:-0x.0p0:0:2:
 %2g:-nan(09A_Zaz):0:-1:
 %*2g:-nan(09A_Zaz):0:-1:
 %2g:-nan():0:-1:
@@ -148,8 +148,8 @@
 %*2g:nan():0:-1:
 %2g:nan(09A_Zaz):0:-1:
 %*2g:nan(09A_Zaz):0:-1:
-%2g:0x0p0:0:-1:
-%*2g:0x0p0:0:-1:
+%2g:0x.0p0:0:-1:
+%*2g:0x.0p0:0:-1:
 %2g:0x0p+0:0:-1:
 %*2g:0x0p+0:0:-1:
 %2g:0x8p-129:0:-1:
@@ -168,8 +168,8 @@
 %*2g:+nan():0:-1:
 %2g:+nan(09A_Zaz):0:-1:
 %*2g:+nan(09A_Zaz):0:-1:
-%2g:+0x0p0:1:2:0x0:
-%*2g:+0x0p0:0:2:
+%2g:+0x.0p0:1:2:0x0:
+%*2g:+0x.0p0:0:2:
 %2g:+0x0p+0:1:2:0x0:
 %*2g:+0x0p+0:0:2:
 %2g:+0x8p-129:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3g:-0x8p-129:0:-1:
 %3g:-0x0p+0:0:-1:
 %*3g:-0x0p+0:0:-1:
-%3g:-0x0p0:0:-1:
-%*3g:-0x0p0:0:-1:
+%3g:-0x.0p0:0:-1:
+%*3g:-0x.0p0:0:-1:
 %3g:-nan(09A_Zaz):0:-1:
 %*3g:-nan(09A_Zaz):0:-1:
 %3g:-nan():0:-1:
@@ -210,8 +210,8 @@
 %*3g:nan():0:3:
 %3g:nan(09A_Zaz):1:3:nan:
 %*3g:nan(09A_Zaz):0:3:
-%3g:0x0p0:1:3:0x0:
-%*3g:0x0p0:0:3:
+%3g:0x.0p0:0:-1:
+%*3g:0x.0p0:0:-1:
 %3g:0x0p+0:1:3:0x0:
 %*3g:0x0p+0:0:3:
 %3g:0x8p-129:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3g:+nan():0:-1:
 %3g:+nan(09A_Zaz):0:-1:
 %*3g:+nan(09A_Zaz):0:-1:
-%3g:+0x0p0:0:-1:
-%*3g:+0x0p0:0:-1:
+%3g:+0x.0p0:0:-1:
+%*3g:+0x.0p0:0:-1:
 %3g:+0x0p+0:0:-1:
 %*3g:+0x0p+0:0:-1:
 %3g:+0x8p-129:0:-1:
@@ -262,8 +262,8 @@
 %*4g:-0x8p-129:0:4:
 %4g:-0x0p+0:1:4:-0x0:
 %*4g:-0x0p+0:0:4:
-%4g:-0x0p0:1:4:-0x0:
-%*4g:-0x0p0:0:4:
+%4g:-0x.0p0:0:-1:
+%*4g:-0x.0p0:0:-1:
 %4g:-nan(09A_Zaz):1:4:-nan:
 %*4g:-nan(09A_Zaz):0:4:
 %4g:-nan():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4g:nan():0:-1:
 %4g:nan(09A_Zaz):0:-1:
 %*4g:nan(09A_Zaz):0:-1:
-%4g:0x0p0:0:-1:
-%*4g:0x0p0:0:-1:
+%4g:0x.0p0:1:4:0x0:
+%*4g:0x.0p0:0:4:
 %4g:0x0p+0:0:-1:
 %*4g:0x0p+0:0:-1:
 %4g:0x8p-129:0:-1:
@@ -292,8 +292,8 @@
 %*4g:+nan():0:4:
 %4g:+nan(09A_Zaz):1:4:nan:
 %*4g:+nan(09A_Zaz):0:4:
-%4g:+0x0p0:1:4:0x0:
-%*4g:+0x0p0:0:4:
+%4g:+0x.0p0:0:-1:
+%*4g:+0x.0p0:0:-1:
 %4g:+0x0p+0:1:4:0x0:
 %*4g:+0x0p+0:0:4:
 %4g:+0x8p-129:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5g:-0x8p-129:0:-1:
 %5g:-0x0p+0:0:-1:
 %*5g:-0x0p+0:0:-1:
-%5g:-0x0p0:0:-1:
-%*5g:-0x0p0:0:-1:
+%5g:-0x.0p0:1:5:-0x0:
+%*5g:-0x.0p0:0:5:
 %5g:-nan(09A_Zaz):0:-1:
 %*5g:-nan(09A_Zaz):0:-1:
 %5g:-nan():0:-1:
@@ -334,8 +334,8 @@
 %*5g:nan():0:5:
 %5g:nan(09A_Zaz):0:-1:
 %*5g:nan(09A_Zaz):0:-1:
-%5g:0x0p0:1:5:0x0:
-%*5g:0x0p0:0:5:
+%5g:0x.0p0:0:-1:
+%*5g:0x.0p0:0:-1:
 %5g:0x0p+0:0:-1:
 %*5g:0x0p+0:0:-1:
 %5g:0x8p-129:0:-1:
@@ -354,8 +354,8 @@
 %*5g:+nan():0:-1:
 %5g:+nan(09A_Zaz):0:-1:
 %*5g:+nan(09A_Zaz):0:-1:
-%5g:+0x0p0:0:-1:
-%*5g:+0x0p0:0:-1:
+%5g:+0x.0p0:1:5:0x0:
+%*5g:+0x.0p0:0:5:
 %5g:+0x0p+0:0:-1:
 %*5g:+0x0p+0:0:-1:
 %5g:+0x8p-129:0:-1:
@@ -386,8 +386,8 @@
 %*6g:-0x8p-129:0:-1:
 %6g:-0x0p+0:0:-1:
 %*6g:-0x0p+0:0:-1:
-%6g:-0x0p0:1:6:-0x0:
-%*6g:-0x0p0:0:6:
+%6g:-0x.0p0:0:-1:
+%*6g:-0x.0p0:0:-1:
 %6g:-nan(09A_Zaz):0:-1:
 %*6g:-nan(09A_Zaz):0:-1:
 %6g:-nan():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6g:nan():0:5:
 %6g:nan(09A_Zaz):0:-1:
 %*6g:nan(09A_Zaz):0:-1:
-%6g:0x0p0:1:5:0x0:
-%*6g:0x0p0:0:5:
+%6g:0x.0p0:1:6:0x0:
+%*6g:0x.0p0:0:6:
 %6g:0x0p+0:1:6:0x0:
 %*6g:0x0p+0:0:6:
 %6g:0x8p-129:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6g:+nan():0:6:
 %6g:+nan(09A_Zaz):0:-1:
 %*6g:+nan(09A_Zaz):0:-1:
-%6g:+0x0p0:1:6:0x0:
-%*6g:+0x0p0:0:6:
+%6g:+0x.0p0:0:-1:
+%*6g:+0x.0p0:0:-1:
 %6g:+0x0p+0:0:-1:
 %*6g:+0x0p+0:0:-1:
 %6g:+0x8p-129:0:-1:
@@ -448,8 +448,8 @@
 %*12g:-0x8p-129:0:9:
 %12g:-0x0p+0:1:7:-0x0:
 %*12g:-0x0p+0:0:7:
-%12g:-0x0p0:1:6:-0x0:
-%*12g:-0x0p0:0:6:
+%12g:-0x.0p0:1:7:-0x0:
+%*12g:-0x.0p0:0:7:
 %12g:-nan(09A_Zaz):0:-1:
 %*12g:-nan(09A_Zaz):0:-1:
 %12g:-nan():1:6:-nan:
@@ -458,8 +458,8 @@
 %*12g:nan():0:5:
 %12g:nan(09A_Zaz):1:12:nan:
 %*12g:nan(09A_Zaz):0:12:
-%12g:0x0p0:1:5:0x0:
-%*12g:0x0p0:0:5:
+%12g:0x.0p0:1:6:0x0:
+%*12g:0x.0p0:0:6:
 %12g:0x0p+0:1:6:0x0:
 %*12g:0x0p+0:0:6:
 %12g:0x8p-129:1:8:0x1p-126:
@@ -478,8 +478,8 @@
 %*12g:+nan():0:6:
 %12g:+nan(09A_Zaz):0:-1:
 %*12g:+nan(09A_Zaz):0:-1:
-%12g:+0x0p0:1:6:0x0:
-%*12g:+0x0p0:0:6:
+%12g:+0x.0p0:1:7:0x0:
+%*12g:+0x.0p0:0:7:
 %12g:+0x0p+0:1:7:0x0:
 %*12g:+0x0p+0:0:7:
 %12g:+0x8p-129:1:9:0x1p-126:
@@ -510,8 +510,8 @@
 %*18g:-0x8p-129:0:9:
 %18g:-0x0p+0:1:7:-0x0:
 %*18g:-0x0p+0:0:7:
-%18g:-0x0p0:1:6:-0x0:
-%*18g:-0x0p0:0:6:
+%18g:-0x.0p0:1:7:-0x0:
+%*18g:-0x.0p0:0:7:
 %18g:-nan(09A_Zaz):1:13:-nan:
 %*18g:-nan(09A_Zaz):0:13:
 %18g:-nan():1:6:-nan:
@@ -520,8 +520,8 @@
 %*18g:nan():0:5:
 %18g:nan(09A_Zaz):1:12:nan:
 %*18g:nan(09A_Zaz):0:12:
-%18g:0x0p0:1:5:0x0:
-%*18g:0x0p0:0:5:
+%18g:0x.0p0:1:6:0x0:
+%*18g:0x.0p0:0:6:
 %18g:0x0p+0:1:6:0x0:
 %*18g:0x0p+0:0:6:
 %18g:0x8p-129:1:8:0x1p-126:
@@ -540,8 +540,8 @@
 %*18g:+nan():0:6:
 %18g:+nan(09A_Zaz):1:13:nan:
 %*18g:+nan(09A_Zaz):0:13:
-%18g:+0x0p0:1:6:0x0:
-%*18g:+0x0p0:0:6:
+%18g:+0x.0p0:1:7:0x0:
+%*18g:+0x.0p0:0:7:
 %18g:+0x0p+0:1:7:0x0:
 %*18g:+0x0p+0:0:7:
 %18g:+0x8p-129:1:9:0x1p-126:
@@ -572,8 +572,8 @@
 %*5g: -0x8p-129:0:-1:
 %5g: -0x0p+0:0:-1:
 %*5g: -0x0p+0:0:-1:
-%5g: -0x0p0:0:-1:
-%*5g: -0x0p0:0:-1:
+%5g: -0x.0p0:1:6:-0x0:
+%*5g: -0x.0p0:0:6:
 %5g: -nan(09A_Zaz):0:-1:
 %*5g: -nan(09A_Zaz):0:-1:
 %5g: -nan():0:-1:
@@ -582,8 +582,8 @@
 %*5g: nan():0:6:
 %5g: nan(09A_Zaz):0:-1:
 %*5g: nan(09A_Zaz):0:-1:
-%5g: 0x0p0:1:6:0x0:
-%*5g: 0x0p0:0:6:
+%5g: 0x.0p0:0:-1:
+%*5g: 0x.0p0:0:-1:
 %5g: 0x0p+0:0:-1:
 %*5g: 0x0p+0:0:-1:
 %5g: 0x8p-129:0:-1:
@@ -602,8 +602,8 @@
 %*5g: +nan():0:-1:
 %5g: +nan(09A_Zaz):0:-1:
 %*5g: +nan(09A_Zaz):0:-1:
-%5g: +0x0p0:0:-1:
-%*5g: +0x0p0:0:-1:
+%5g: +0x.0p0:1:6:0x0:
+%*5g: +0x.0p0:0:6:
 %5g: +0x0p+0:0:-1:
 %*5g: +0x0p+0:0:-1:
 %5g: +0x8p-129:0:-1:
@@ -634,8 +634,8 @@
 %*18g: -0x8p-129:0:10:
 %18g: -0x0p+0:1:8:-0x0:
 %*18g: -0x0p+0:0:8:
-%18g: -0x0p0:1:7:-0x0:
-%*18g: -0x0p0:0:7:
+%18g: -0x.0p0:1:8:-0x0:
+%*18g: -0x.0p0:0:8:
 %18g: -nan(09A_Zaz):1:14:-nan:
 %*18g: -nan(09A_Zaz):0:14:
 %18g: -nan():1:7:-nan:
@@ -644,8 +644,8 @@
 %*18g: nan():0:6:
 %18g: nan(09A_Zaz):1:13:nan:
 %*18g: nan(09A_Zaz):0:13:
-%18g: 0x0p0:1:6:0x0:
-%*18g: 0x0p0:0:6:
+%18g: 0x.0p0:1:7:0x0:
+%*18g: 0x.0p0:0:7:
 %18g: 0x0p+0:1:7:0x0:
 %*18g: 0x0p+0:0:7:
 %18g: 0x8p-129:1:9:0x1p-126:
@@ -664,8 +664,8 @@
 %*18g: +nan():0:7:
 %18g: +nan(09A_Zaz):1:14:nan:
 %*18g: +nan(09A_Zaz):0:14:
-%18g: +0x0p0:1:7:0x0:
-%*18g: +0x0p0:0:7:
+%18g: +0x.0p0:1:8:0x0:
+%*18g: +0x.0p0:0:8:
 %18g: +0x0p+0:1:8:0x0:
 %*18g: +0x0p+0:0:8:
 %18g: +0x8p-129:1:10:0x1p-126:
diff --git a/sysdeps/ieee754/flt-32/tst-scanf-format-float-gg.input b/sysdeps/ieee754/flt-32/tst-scanf-format-float-gg.input
index 95f3af2..d0753bd 100644
--- a/sysdeps/ieee754/flt-32/tst-scanf-format-float-gg.input
+++ b/sysdeps/ieee754/flt-32/tst-scanf-format-float-gg.input
@@ -14,8 +14,8 @@
 %*G:-0X8P-129:0:9:
 %G:-0X0P+0:1:7:-0x0:
 %*G:-0X0P+0:0:7:
-%G:-0X0P0:1:6:-0x0:
-%*G:-0X0P0:0:6:
+%G:-0X.0P0:1:7:-0x0:
+%*G:-0X.0P0:0:7:
 %G:-NAN(09A_Zaz):1:13:-nan:
 %*G:-NAN(09A_Zaz):0:13:
 %G:-NAN():1:6:-nan:
@@ -24,8 +24,8 @@
 %*G:NAN():0:5:
 %G:NAN(09A_Zaz):1:12:nan:
 %*G:NAN(09A_Zaz):0:12:
-%G:0X0P0:1:5:0x0:
-%*G:0X0P0:0:5:
+%G:0X.0P0:1:6:0x0:
+%*G:0X.0P0:0:6:
 %G:0X0P+0:1:6:0x0:
 %*G:0X0P+0:0:6:
 %G:0X8P-129:1:8:0x1p-126:
@@ -44,8 +44,8 @@
 %*G:+NAN():0:6:
 %G:+NAN(09A_Zaz):1:13:nan:
 %*G:+NAN(09A_Zaz):0:13:
-%G:+0X0P0:1:6:0x0:
-%*G:+0X0P0:0:6:
+%G:+0X.0P0:1:7:0x0:
+%*G:+0X.0P0:0:7:
 %G:+0X0P+0:1:7:0x0:
 %*G:+0X0P+0:0:7:
 %G:+0X8P-129:1:9:0x1p-126:
@@ -76,8 +76,8 @@
 %*1G:-0X8P-129:0:-1:
 %1G:-0X0P+0:0:-1:
 %*1G:-0X0P+0:0:-1:
-%1G:-0X0P0:0:-1:
-%*1G:-0X0P0:0:-1:
+%1G:-0X.0P0:0:-1:
+%*1G:-0X.0P0:0:-1:
 %1G:-NAN(09A_Zaz):0:-1:
 %*1G:-NAN(09A_Zaz):0:-1:
 %1G:-NAN():0:-1:
@@ -86,8 +86,8 @@
 %*1G:NAN():0:-1:
 %1G:NAN(09A_Zaz):0:-1:
 %*1G:NAN(09A_Zaz):0:-1:
-%1G:0X0P0:1:1:0x0:
-%*1G:0X0P0:0:1:
+%1G:0X.0P0:1:1:0x0:
+%*1G:0X.0P0:0:1:
 %1G:0X0P+0:1:1:0x0:
 %*1G:0X0P+0:0:1:
 %1G:0X8P-129:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1G:+NAN():0:-1:
 %1G:+NAN(09A_Zaz):0:-1:
 %*1G:+NAN(09A_Zaz):0:-1:
-%1G:+0X0P0:0:-1:
-%*1G:+0X0P0:0:-1:
+%1G:+0X.0P0:0:-1:
+%*1G:+0X.0P0:0:-1:
 %1G:+0X0P+0:0:-1:
 %*1G:+0X0P+0:0:-1:
 %1G:+0X8P-129:0:-1:
@@ -138,8 +138,8 @@
 %*2G:-0X8P-129:0:2:
 %2G:-0X0P+0:1:2:-0x0:
 %*2G:-0X0P+0:0:2:
-%2G:-0X0P0:1:2:-0x0:
-%*2G:-0X0P0:0:2:
+%2G:-0X.0P0:1:2:-0x0:
+%*2G:-0X.0P0:0:2:
 %2G:-NAN(09A_Zaz):0:-1:
 %*2G:-NAN(09A_Zaz):0:-1:
 %2G:-NAN():0:-1:
@@ -148,8 +148,8 @@
 %*2G:NAN():0:-1:
 %2G:NAN(09A_Zaz):0:-1:
 %*2G:NAN(09A_Zaz):0:-1:
-%2G:0X0P0:0:-1:
-%*2G:0X0P0:0:-1:
+%2G:0X.0P0:0:-1:
+%*2G:0X.0P0:0:-1:
 %2G:0X0P+0:0:-1:
 %*2G:0X0P+0:0:-1:
 %2G:0X8P-129:0:-1:
@@ -168,8 +168,8 @@
 %*2G:+NAN():0:-1:
 %2G:+NAN(09A_Zaz):0:-1:
 %*2G:+NAN(09A_Zaz):0:-1:
-%2G:+0X0P0:1:2:0x0:
-%*2G:+0X0P0:0:2:
+%2G:+0X.0P0:1:2:0x0:
+%*2G:+0X.0P0:0:2:
 %2G:+0X0P+0:1:2:0x0:
 %*2G:+0X0P+0:0:2:
 %2G:+0X8P-129:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3G:-0X8P-129:0:-1:
 %3G:-0X0P+0:0:-1:
 %*3G:-0X0P+0:0:-1:
-%3G:-0X0P0:0:-1:
-%*3G:-0X0P0:0:-1:
+%3G:-0X.0P0:0:-1:
+%*3G:-0X.0P0:0:-1:
 %3G:-NAN(09A_Zaz):0:-1:
 %*3G:-NAN(09A_Zaz):0:-1:
 %3G:-NAN():0:-1:
@@ -210,8 +210,8 @@
 %*3G:NAN():0:3:
 %3G:NAN(09A_Zaz):1:3:nan:
 %*3G:NAN(09A_Zaz):0:3:
-%3G:0X0P0:1:3:0x0:
-%*3G:0X0P0:0:3:
+%3G:0X.0P0:0:-1:
+%*3G:0X.0P0:0:-1:
 %3G:0X0P+0:1:3:0x0:
 %*3G:0X0P+0:0:3:
 %3G:0X8P-129:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3G:+NAN():0:-1:
 %3G:+NAN(09A_Zaz):0:-1:
 %*3G:+NAN(09A_Zaz):0:-1:
-%3G:+0X0P0:0:-1:
-%*3G:+0X0P0:0:-1:
+%3G:+0X.0P0:0:-1:
+%*3G:+0X.0P0:0:-1:
 %3G:+0X0P+0:0:-1:
 %*3G:+0X0P+0:0:-1:
 %3G:+0X8P-129:0:-1:
@@ -262,8 +262,8 @@
 %*4G:-0X8P-129:0:4:
 %4G:-0X0P+0:1:4:-0x0:
 %*4G:-0X0P+0:0:4:
-%4G:-0X0P0:1:4:-0x0:
-%*4G:-0X0P0:0:4:
+%4G:-0X.0P0:0:-1:
+%*4G:-0X.0P0:0:-1:
 %4G:-NAN(09A_Zaz):1:4:-nan:
 %*4G:-NAN(09A_Zaz):0:4:
 %4G:-NAN():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4G:NAN():0:-1:
 %4G:NAN(09A_Zaz):0:-1:
 %*4G:NAN(09A_Zaz):0:-1:
-%4G:0X0P0:0:-1:
-%*4G:0X0P0:0:-1:
+%4G:0X.0P0:1:4:0x0:
+%*4G:0X.0P0:0:4:
 %4G:0X0P+0:0:-1:
 %*4G:0X0P+0:0:-1:
 %4G:0X8P-129:0:-1:
@@ -292,8 +292,8 @@
 %*4G:+NAN():0:4:
 %4G:+NAN(09A_Zaz):1:4:nan:
 %*4G:+NAN(09A_Zaz):0:4:
-%4G:+0X0P0:1:4:0x0:
-%*4G:+0X0P0:0:4:
+%4G:+0X.0P0:0:-1:
+%*4G:+0X.0P0:0:-1:
 %4G:+0X0P+0:1:4:0x0:
 %*4G:+0X0P+0:0:4:
 %4G:+0X8P-129:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5G:-0X8P-129:0:-1:
 %5G:-0X0P+0:0:-1:
 %*5G:-0X0P+0:0:-1:
-%5G:-0X0P0:0:-1:
-%*5G:-0X0P0:0:-1:
+%5G:-0X.0P0:1:5:-0x0:
+%*5G:-0X.0P0:0:5:
 %5G:-NAN(09A_Zaz):0:-1:
 %*5G:-NAN(09A_Zaz):0:-1:
 %5G:-NAN():0:-1:
@@ -334,8 +334,8 @@
 %*5G:NAN():0:5:
 %5G:NAN(09A_Zaz):0:-1:
 %*5G:NAN(09A_Zaz):0:-1:
-%5G:0X0P0:1:5:0x0:
-%*5G:0X0P0:0:5:
+%5G:0X.0P0:0:-1:
+%*5G:0X.0P0:0:-1:
 %5G:0X0P+0:0:-1:
 %*5G:0X0P+0:0:-1:
 %5G:0X8P-129:0:-1:
@@ -354,8 +354,8 @@
 %*5G:+NAN():0:-1:
 %5G:+NAN(09A_Zaz):0:-1:
 %*5G:+NAN(09A_Zaz):0:-1:
-%5G:+0X0P0:0:-1:
-%*5G:+0X0P0:0:-1:
+%5G:+0X.0P0:1:5:0x0:
+%*5G:+0X.0P0:0:5:
 %5G:+0X0P+0:0:-1:
 %*5G:+0X0P+0:0:-1:
 %5G:+0X8P-129:0:-1:
@@ -386,8 +386,8 @@
 %*6G:-0X8P-129:0:-1:
 %6G:-0X0P+0:0:-1:
 %*6G:-0X0P+0:0:-1:
-%6G:-0X0P0:1:6:-0x0:
-%*6G:-0X0P0:0:6:
+%6G:-0X.0P0:0:-1:
+%*6G:-0X.0P0:0:-1:
 %6G:-NAN(09A_Zaz):0:-1:
 %*6G:-NAN(09A_Zaz):0:-1:
 %6G:-NAN():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6G:NAN():0:5:
 %6G:NAN(09A_Zaz):0:-1:
 %*6G:NAN(09A_Zaz):0:-1:
-%6G:0X0P0:1:5:0x0:
-%*6G:0X0P0:0:5:
+%6G:0X.0P0:1:6:0x0:
+%*6G:0X.0P0:0:6:
 %6G:0X0P+0:1:6:0x0:
 %*6G:0X0P+0:0:6:
 %6G:0X8P-129:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6G:+NAN():0:6:
 %6G:+NAN(09A_Zaz):0:-1:
 %*6G:+NAN(09A_Zaz):0:-1:
-%6G:+0X0P0:1:6:0x0:
-%*6G:+0X0P0:0:6:
+%6G:+0X.0P0:0:-1:
+%*6G:+0X.0P0:0:-1:
 %6G:+0X0P+0:0:-1:
 %*6G:+0X0P+0:0:-1:
 %6G:+0X8P-129:0:-1:
@@ -448,8 +448,8 @@
 %*12G:-0X8P-129:0:9:
 %12G:-0X0P+0:1:7:-0x0:
 %*12G:-0X0P+0:0:7:
-%12G:-0X0P0:1:6:-0x0:
-%*12G:-0X0P0:0:6:
+%12G:-0X.0P0:1:7:-0x0:
+%*12G:-0X.0P0:0:7:
 %12G:-NAN(09A_Zaz):0:-1:
 %*12G:-NAN(09A_Zaz):0:-1:
 %12G:-NAN():1:6:-nan:
@@ -458,8 +458,8 @@
 %*12G:NAN():0:5:
 %12G:NAN(09A_Zaz):1:12:nan:
 %*12G:NAN(09A_Zaz):0:12:
-%12G:0X0P0:1:5:0x0:
-%*12G:0X0P0:0:5:
+%12G:0X.0P0:1:6:0x0:
+%*12G:0X.0P0:0:6:
 %12G:0X0P+0:1:6:0x0:
 %*12G:0X0P+0:0:6:
 %12G:0X8P-129:1:8:0x1p-126:
@@ -478,8 +478,8 @@
 %*12G:+NAN():0:6:
 %12G:+NAN(09A_Zaz):0:-1:
 %*12G:+NAN(09A_Zaz):0:-1:
-%12G:+0X0P0:1:6:0x0:
-%*12G:+0X0P0:0:6:
+%12G:+0X.0P0:1:7:0x0:
+%*12G:+0X.0P0:0:7:
 %12G:+0X0P+0:1:7:0x0:
 %*12G:+0X0P+0:0:7:
 %12G:+0X8P-129:1:9:0x1p-126:
@@ -510,8 +510,8 @@
 %*18G:-0X8P-129:0:9:
 %18G:-0X0P+0:1:7:-0x0:
 %*18G:-0X0P+0:0:7:
-%18G:-0X0P0:1:6:-0x0:
-%*18G:-0X0P0:0:6:
+%18G:-0X.0P0:1:7:-0x0:
+%*18G:-0X.0P0:0:7:
 %18G:-NAN(09A_Zaz):1:13:-nan:
 %*18G:-NAN(09A_Zaz):0:13:
 %18G:-NAN():1:6:-nan:
@@ -520,8 +520,8 @@
 %*18G:NAN():0:5:
 %18G:NAN(09A_Zaz):1:12:nan:
 %*18G:NAN(09A_Zaz):0:12:
-%18G:0X0P0:1:5:0x0:
-%*18G:0X0P0:0:5:
+%18G:0X.0P0:1:6:0x0:
+%*18G:0X.0P0:0:6:
 %18G:0X0P+0:1:6:0x0:
 %*18G:0X0P+0:0:6:
 %18G:0X8P-129:1:8:0x1p-126:
@@ -540,8 +540,8 @@
 %*18G:+NAN():0:6:
 %18G:+NAN(09A_Zaz):1:13:nan:
 %*18G:+NAN(09A_Zaz):0:13:
-%18G:+0X0P0:1:6:0x0:
-%*18G:+0X0P0:0:6:
+%18G:+0X.0P0:1:7:0x0:
+%*18G:+0X.0P0:0:7:
 %18G:+0X0P+0:1:7:0x0:
 %*18G:+0X0P+0:0:7:
 %18G:+0X8P-129:1:9:0x1p-126:
@@ -572,8 +572,8 @@
 %*5G: -0X8P-129:0:-1:
 %5G: -0X0P+0:0:-1:
 %*5G: -0X0P+0:0:-1:
-%5G: -0X0P0:0:-1:
-%*5G: -0X0P0:0:-1:
+%5G: -0X.0P0:1:6:-0x0:
+%*5G: -0X.0P0:0:6:
 %5G: -NAN(09A_Zaz):0:-1:
 %*5G: -NAN(09A_Zaz):0:-1:
 %5G: -NAN():0:-1:
@@ -582,8 +582,8 @@
 %*5G: NAN():0:6:
 %5G: NAN(09A_Zaz):0:-1:
 %*5G: NAN(09A_Zaz):0:-1:
-%5G: 0X0P0:1:6:0x0:
-%*5G: 0X0P0:0:6:
+%5G: 0X.0P0:0:-1:
+%*5G: 0X.0P0:0:-1:
 %5G: 0X0P+0:0:-1:
 %*5G: 0X0P+0:0:-1:
 %5G: 0X8P-129:0:-1:
@@ -602,8 +602,8 @@
 %*5G: +NAN():0:-1:
 %5G: +NAN(09A_Zaz):0:-1:
 %*5G: +NAN(09A_Zaz):0:-1:
-%5G: +0X0P0:0:-1:
-%*5G: +0X0P0:0:-1:
+%5G: +0X.0P0:1:6:0x0:
+%*5G: +0X.0P0:0:6:
 %5G: +0X0P+0:0:-1:
 %*5G: +0X0P+0:0:-1:
 %5G: +0X8P-129:0:-1:
@@ -634,8 +634,8 @@
 %*18G: -0X8P-129:0:10:
 %18G: -0X0P+0:1:8:-0x0:
 %*18G: -0X0P+0:0:8:
-%18G: -0X0P0:1:7:-0x0:
-%*18G: -0X0P0:0:7:
+%18G: -0X.0P0:1:8:-0x0:
+%*18G: -0X.0P0:0:8:
 %18G: -NAN(09A_Zaz):1:14:-nan:
 %*18G: -NAN(09A_Zaz):0:14:
 %18G: -NAN():1:7:-nan:
@@ -644,8 +644,8 @@
 %*18G: NAN():0:6:
 %18G: NAN(09A_Zaz):1:13:nan:
 %*18G: NAN(09A_Zaz):0:13:
-%18G: 0X0P0:1:6:0x0:
-%*18G: 0X0P0:0:6:
+%18G: 0X.0P0:1:7:0x0:
+%*18G: 0X.0P0:0:7:
 %18G: 0X0P+0:1:7:0x0:
 %*18G: 0X0P+0:0:7:
 %18G: 0X8P-129:1:9:0x1p-126:
@@ -664,8 +664,8 @@
 %*18G: +NAN():0:7:
 %18G: +NAN(09A_Zaz):1:14:nan:
 %*18G: +NAN(09A_Zaz):0:14:
-%18G: +0X0P0:1:7:0x0:
-%*18G: +0X0P0:0:7:
+%18G: +0X.0P0:1:8:0x0:
+%*18G: +0X.0P0:0:8:
 %18G: +0X0P+0:1:8:0x0:
 %*18G: +0X0P+0:0:8:
 %18G: +0X8P-129:1:10:0x1p-126:
diff --git a/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-a.input b/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-a.input
index 67d5b00..4dfd7b0 100644
--- a/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-a.input
+++ b/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-a.input
@@ -14,8 +14,8 @@
 %*La:-0x8p-16385:0:11:
 %La:-0x0p+0:1:7:-0x0:
 %*La:-0x0p+0:0:7:
-%La:-0x0p0:1:6:-0x0:
-%*La:-0x0p0:0:6:
+%La:-0x.0p0:1:7:-0x0:
+%*La:-0x.0p0:0:7:
 %La:-nan(09A_Zaz):1:13:-nan:
 %*La:-nan(09A_Zaz):0:13:
 %La:-nan():1:6:-nan:
@@ -24,8 +24,8 @@
 %*La:nan():0:5:
 %La:nan(09A_Zaz):1:12:nan:
 %*La:nan(09A_Zaz):0:12:
-%La:0x0p0:1:5:0x0:
-%*La:0x0p0:0:5:
+%La:0x.0p0:1:6:0x0:
+%*La:0x.0p0:0:6:
 %La:0x0p+0:1:6:0x0:
 %*La:0x0p+0:0:6:
 %La:0x8p-16385:1:10:0x1p-16382:
@@ -44,8 +44,8 @@
 %*La:+nan():0:6:
 %La:+nan(09A_Zaz):1:13:nan:
 %*La:+nan(09A_Zaz):0:13:
-%La:+0x0p0:1:6:0x0:
-%*La:+0x0p0:0:6:
+%La:+0x.0p0:1:7:0x0:
+%*La:+0x.0p0:0:7:
 %La:+0x0p+0:1:7:0x0:
 %*La:+0x0p+0:0:7:
 %La:+0x8p-16385:1:11:0x1p-16382:
@@ -76,8 +76,8 @@
 %*1La:-0x8p-16385:0:-1:
 %1La:-0x0p+0:0:-1:
 %*1La:-0x0p+0:0:-1:
-%1La:-0x0p0:0:-1:
-%*1La:-0x0p0:0:-1:
+%1La:-0x.0p0:0:-1:
+%*1La:-0x.0p0:0:-1:
 %1La:-nan(09A_Zaz):0:-1:
 %*1La:-nan(09A_Zaz):0:-1:
 %1La:-nan():0:-1:
@@ -86,8 +86,8 @@
 %*1La:nan():0:-1:
 %1La:nan(09A_Zaz):0:-1:
 %*1La:nan(09A_Zaz):0:-1:
-%1La:0x0p0:1:1:0x0:
-%*1La:0x0p0:0:1:
+%1La:0x.0p0:1:1:0x0:
+%*1La:0x.0p0:0:1:
 %1La:0x0p+0:1:1:0x0:
 %*1La:0x0p+0:0:1:
 %1La:0x8p-16385:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1La:+nan():0:-1:
 %1La:+nan(09A_Zaz):0:-1:
 %*1La:+nan(09A_Zaz):0:-1:
-%1La:+0x0p0:0:-1:
-%*1La:+0x0p0:0:-1:
+%1La:+0x.0p0:0:-1:
+%*1La:+0x.0p0:0:-1:
 %1La:+0x0p+0:0:-1:
 %*1La:+0x0p+0:0:-1:
 %1La:+0x8p-16385:0:-1:
@@ -138,8 +138,8 @@
 %*2La:-0x8p-16385:0:2:
 %2La:-0x0p+0:1:2:-0x0:
 %*2La:-0x0p+0:0:2:
-%2La:-0x0p0:1:2:-0x0:
-%*2La:-0x0p0:0:2:
+%2La:-0x.0p0:1:2:-0x0:
+%*2La:-0x.0p0:0:2:
 %2La:-nan(09A_Zaz):0:-1:
 %*2La:-nan(09A_Zaz):0:-1:
 %2La:-nan():0:-1:
@@ -148,8 +148,8 @@
 %*2La:nan():0:-1:
 %2La:nan(09A_Zaz):0:-1:
 %*2La:nan(09A_Zaz):0:-1:
-%2La:0x0p0:0:-1:
-%*2La:0x0p0:0:-1:
+%2La:0x.0p0:0:-1:
+%*2La:0x.0p0:0:-1:
 %2La:0x0p+0:0:-1:
 %*2La:0x0p+0:0:-1:
 %2La:0x8p-16385:0:-1:
@@ -168,8 +168,8 @@
 %*2La:+nan():0:-1:
 %2La:+nan(09A_Zaz):0:-1:
 %*2La:+nan(09A_Zaz):0:-1:
-%2La:+0x0p0:1:2:0x0:
-%*2La:+0x0p0:0:2:
+%2La:+0x.0p0:1:2:0x0:
+%*2La:+0x.0p0:0:2:
 %2La:+0x0p+0:1:2:0x0:
 %*2La:+0x0p+0:0:2:
 %2La:+0x8p-16385:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3La:-0x8p-16385:0:-1:
 %3La:-0x0p+0:0:-1:
 %*3La:-0x0p+0:0:-1:
-%3La:-0x0p0:0:-1:
-%*3La:-0x0p0:0:-1:
+%3La:-0x.0p0:0:-1:
+%*3La:-0x.0p0:0:-1:
 %3La:-nan(09A_Zaz):0:-1:
 %*3La:-nan(09A_Zaz):0:-1:
 %3La:-nan():0:-1:
@@ -210,8 +210,8 @@
 %*3La:nan():0:3:
 %3La:nan(09A_Zaz):1:3:nan:
 %*3La:nan(09A_Zaz):0:3:
-%3La:0x0p0:1:3:0x0:
-%*3La:0x0p0:0:3:
+%3La:0x.0p0:0:-1:
+%*3La:0x.0p0:0:-1:
 %3La:0x0p+0:1:3:0x0:
 %*3La:0x0p+0:0:3:
 %3La:0x8p-16385:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3La:+nan():0:-1:
 %3La:+nan(09A_Zaz):0:-1:
 %*3La:+nan(09A_Zaz):0:-1:
-%3La:+0x0p0:0:-1:
-%*3La:+0x0p0:0:-1:
+%3La:+0x.0p0:0:-1:
+%*3La:+0x.0p0:0:-1:
 %3La:+0x0p+0:0:-1:
 %*3La:+0x0p+0:0:-1:
 %3La:+0x8p-16385:0:-1:
@@ -262,8 +262,8 @@
 %*4La:-0x8p-16385:0:4:
 %4La:-0x0p+0:1:4:-0x0:
 %*4La:-0x0p+0:0:4:
-%4La:-0x0p0:1:4:-0x0:
-%*4La:-0x0p0:0:4:
+%4La:-0x.0p0:0:-1:
+%*4La:-0x.0p0:0:-1:
 %4La:-nan(09A_Zaz):1:4:-nan:
 %*4La:-nan(09A_Zaz):0:4:
 %4La:-nan():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4La:nan():0:-1:
 %4La:nan(09A_Zaz):0:-1:
 %*4La:nan(09A_Zaz):0:-1:
-%4La:0x0p0:0:-1:
-%*4La:0x0p0:0:-1:
+%4La:0x.0p0:1:4:0x0:
+%*4La:0x.0p0:0:4:
 %4La:0x0p+0:0:-1:
 %*4La:0x0p+0:0:-1:
 %4La:0x8p-16385:0:-1:
@@ -292,8 +292,8 @@
 %*4La:+nan():0:4:
 %4La:+nan(09A_Zaz):1:4:nan:
 %*4La:+nan(09A_Zaz):0:4:
-%4La:+0x0p0:1:4:0x0:
-%*4La:+0x0p0:0:4:
+%4La:+0x.0p0:0:-1:
+%*4La:+0x.0p0:0:-1:
 %4La:+0x0p+0:1:4:0x0:
 %*4La:+0x0p+0:0:4:
 %4La:+0x8p-16385:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5La:-0x8p-16385:0:-1:
 %5La:-0x0p+0:0:-1:
 %*5La:-0x0p+0:0:-1:
-%5La:-0x0p0:0:-1:
-%*5La:-0x0p0:0:-1:
+%5La:-0x.0p0:1:5:-0x0:
+%*5La:-0x.0p0:0:5:
 %5La:-nan(09A_Zaz):0:-1:
 %*5La:-nan(09A_Zaz):0:-1:
 %5La:-nan():0:-1:
@@ -334,8 +334,8 @@
 %*5La:nan():0:5:
 %5La:nan(09A_Zaz):0:-1:
 %*5La:nan(09A_Zaz):0:-1:
-%5La:0x0p0:1:5:0x0:
-%*5La:0x0p0:0:5:
+%5La:0x.0p0:0:-1:
+%*5La:0x.0p0:0:-1:
 %5La:0x0p+0:0:-1:
 %*5La:0x0p+0:0:-1:
 %5La:0x8p-16385:0:-1:
@@ -354,8 +354,8 @@
 %*5La:+nan():0:-1:
 %5La:+nan(09A_Zaz):0:-1:
 %*5La:+nan(09A_Zaz):0:-1:
-%5La:+0x0p0:0:-1:
-%*5La:+0x0p0:0:-1:
+%5La:+0x.0p0:1:5:0x0:
+%*5La:+0x.0p0:0:5:
 %5La:+0x0p+0:0:-1:
 %*5La:+0x0p+0:0:-1:
 %5La:+0x8p-16385:0:-1:
@@ -386,8 +386,8 @@
 %*6La:-0x8p-16385:0:-1:
 %6La:-0x0p+0:0:-1:
 %*6La:-0x0p+0:0:-1:
-%6La:-0x0p0:1:6:-0x0:
-%*6La:-0x0p0:0:6:
+%6La:-0x.0p0:0:-1:
+%*6La:-0x.0p0:0:-1:
 %6La:-nan(09A_Zaz):0:-1:
 %*6La:-nan(09A_Zaz):0:-1:
 %6La:-nan():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6La:nan():0:5:
 %6La:nan(09A_Zaz):0:-1:
 %*6La:nan(09A_Zaz):0:-1:
-%6La:0x0p0:1:5:0x0:
-%*6La:0x0p0:0:5:
+%6La:0x.0p0:1:6:0x0:
+%*6La:0x.0p0:0:6:
 %6La:0x0p+0:1:6:0x0:
 %*6La:0x0p+0:0:6:
 %6La:0x8p-16385:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6La:+nan():0:6:
 %6La:+nan(09A_Zaz):0:-1:
 %*6La:+nan(09A_Zaz):0:-1:
-%6La:+0x0p0:1:6:0x0:
-%*6La:+0x0p0:0:6:
+%6La:+0x.0p0:0:-1:
+%*6La:+0x.0p0:0:-1:
 %6La:+0x0p+0:0:-1:
 %*6La:+0x0p+0:0:-1:
 %6La:+0x8p-16385:0:-1:
@@ -448,8 +448,8 @@
 %*35La:-0x8p-16385:0:11:
 %35La:-0x0p+0:1:7:-0x0:
 %*35La:-0x0p+0:0:7:
-%35La:-0x0p0:1:6:-0x0:
-%*35La:-0x0p0:0:6:
+%35La:-0x.0p0:1:7:-0x0:
+%*35La:-0x.0p0:0:7:
 %35La:-nan(09A_Zaz):1:13:-nan:
 %*35La:-nan(09A_Zaz):0:13:
 %35La:-nan():1:6:-nan:
@@ -458,8 +458,8 @@
 %*35La:nan():0:5:
 %35La:nan(09A_Zaz):1:12:nan:
 %*35La:nan(09A_Zaz):0:12:
-%35La:0x0p0:1:5:0x0:
-%*35La:0x0p0:0:5:
+%35La:0x.0p0:1:6:0x0:
+%*35La:0x.0p0:0:6:
 %35La:0x0p+0:1:6:0x0:
 %*35La:0x0p+0:0:6:
 %35La:0x8p-16385:1:10:0x1p-16382:
@@ -478,8 +478,8 @@
 %*35La:+nan():0:6:
 %35La:+nan(09A_Zaz):1:13:nan:
 %*35La:+nan(09A_Zaz):0:13:
-%35La:+0x0p0:1:6:0x0:
-%*35La:+0x0p0:0:6:
+%35La:+0x.0p0:1:7:0x0:
+%*35La:+0x.0p0:0:7:
 %35La:+0x0p+0:1:7:0x0:
 %*35La:+0x0p+0:0:7:
 %35La:+0x8p-16385:1:11:0x1p-16382:
@@ -510,8 +510,8 @@
 %*53La:-0x8p-16385:0:11:
 %53La:-0x0p+0:1:7:-0x0:
 %*53La:-0x0p+0:0:7:
-%53La:-0x0p0:1:6:-0x0:
-%*53La:-0x0p0:0:6:
+%53La:-0x.0p0:1:7:-0x0:
+%*53La:-0x.0p0:0:7:
 %53La:-nan(09A_Zaz):1:13:-nan:
 %*53La:-nan(09A_Zaz):0:13:
 %53La:-nan():1:6:-nan:
@@ -520,8 +520,8 @@
 %*53La:nan():0:5:
 %53La:nan(09A_Zaz):1:12:nan:
 %*53La:nan(09A_Zaz):0:12:
-%53La:0x0p0:1:5:0x0:
-%*53La:0x0p0:0:5:
+%53La:0x.0p0:1:6:0x0:
+%*53La:0x.0p0:0:6:
 %53La:0x0p+0:1:6:0x0:
 %*53La:0x0p+0:0:6:
 %53La:0x8p-16385:1:10:0x1p-16382:
@@ -540,8 +540,8 @@
 %*53La:+nan():0:6:
 %53La:+nan(09A_Zaz):1:13:nan:
 %*53La:+nan(09A_Zaz):0:13:
-%53La:+0x0p0:1:6:0x0:
-%*53La:+0x0p0:0:6:
+%53La:+0x.0p0:1:7:0x0:
+%*53La:+0x.0p0:0:7:
 %53La:+0x0p+0:1:7:0x0:
 %*53La:+0x0p+0:0:7:
 %53La:+0x8p-16385:1:11:0x1p-16382:
@@ -572,8 +572,8 @@
 %*5La: -0x8p-16385:0:-1:
 %5La: -0x0p+0:0:-1:
 %*5La: -0x0p+0:0:-1:
-%5La: -0x0p0:0:-1:
-%*5La: -0x0p0:0:-1:
+%5La: -0x.0p0:1:6:-0x0:
+%*5La: -0x.0p0:0:6:
 %5La: -nan(09A_Zaz):0:-1:
 %*5La: -nan(09A_Zaz):0:-1:
 %5La: -nan():0:-1:
@@ -582,8 +582,8 @@
 %*5La: nan():0:6:
 %5La: nan(09A_Zaz):0:-1:
 %*5La: nan(09A_Zaz):0:-1:
-%5La: 0x0p0:1:6:0x0:
-%*5La: 0x0p0:0:6:
+%5La: 0x.0p0:0:-1:
+%*5La: 0x.0p0:0:-1:
 %5La: 0x0p+0:0:-1:
 %*5La: 0x0p+0:0:-1:
 %5La: 0x8p-16385:0:-1:
@@ -602,8 +602,8 @@
 %*5La: +nan():0:-1:
 %5La: +nan(09A_Zaz):0:-1:
 %*5La: +nan(09A_Zaz):0:-1:
-%5La: +0x0p0:0:-1:
-%*5La: +0x0p0:0:-1:
+%5La: +0x.0p0:1:6:0x0:
+%*5La: +0x.0p0:0:6:
 %5La: +0x0p+0:0:-1:
 %*5La: +0x0p+0:0:-1:
 %5La: +0x8p-16385:0:-1:
@@ -634,8 +634,8 @@
 %*53La: -0x8p-16385:0:12:
 %53La: -0x0p+0:1:8:-0x0:
 %*53La: -0x0p+0:0:8:
-%53La: -0x0p0:1:7:-0x0:
-%*53La: -0x0p0:0:7:
+%53La: -0x.0p0:1:8:-0x0:
+%*53La: -0x.0p0:0:8:
 %53La: -nan(09A_Zaz):1:14:-nan:
 %*53La: -nan(09A_Zaz):0:14:
 %53La: -nan():1:7:-nan:
@@ -644,8 +644,8 @@
 %*53La: nan():0:6:
 %53La: nan(09A_Zaz):1:13:nan:
 %*53La: nan(09A_Zaz):0:13:
-%53La: 0x0p0:1:6:0x0:
-%*53La: 0x0p0:0:6:
+%53La: 0x.0p0:1:7:0x0:
+%*53La: 0x.0p0:0:7:
 %53La: 0x0p+0:1:7:0x0:
 %*53La: 0x0p+0:0:7:
 %53La: 0x8p-16385:1:11:0x1p-16382:
@@ -664,8 +664,8 @@
 %*53La: +nan():0:7:
 %53La: +nan(09A_Zaz):1:14:nan:
 %*53La: +nan(09A_Zaz):0:14:
-%53La: +0x0p0:1:7:0x0:
-%*53La: +0x0p0:0:7:
+%53La: +0x.0p0:1:8:0x0:
+%*53La: +0x.0p0:0:8:
 %53La: +0x0p+0:1:8:0x0:
 %*53La: +0x0p+0:0:8:
 %53La: +0x8p-16385:1:12:0x1p-16382:
diff --git a/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-aa.input b/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-aa.input
index b3f26be..8bcd862 100644
--- a/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-aa.input
+++ b/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-aa.input
@@ -14,8 +14,8 @@
 %*LA:-0X8P-16385:0:11:
 %LA:-0X0P+0:1:7:-0x0:
 %*LA:-0X0P+0:0:7:
-%LA:-0X0P0:1:6:-0x0:
-%*LA:-0X0P0:0:6:
+%LA:-0X.0P0:1:7:-0x0:
+%*LA:-0X.0P0:0:7:
 %LA:-NAN(09A_Zaz):1:13:-nan:
 %*LA:-NAN(09A_Zaz):0:13:
 %LA:-NAN():1:6:-nan:
@@ -24,8 +24,8 @@
 %*LA:NAN():0:5:
 %LA:NAN(09A_Zaz):1:12:nan:
 %*LA:NAN(09A_Zaz):0:12:
-%LA:0X0P0:1:5:0x0:
-%*LA:0X0P0:0:5:
+%LA:0X.0P0:1:6:0x0:
+%*LA:0X.0P0:0:6:
 %LA:0X0P+0:1:6:0x0:
 %*LA:0X0P+0:0:6:
 %LA:0X8P-16385:1:10:0x1p-16382:
@@ -44,8 +44,8 @@
 %*LA:+NAN():0:6:
 %LA:+NAN(09A_Zaz):1:13:nan:
 %*LA:+NAN(09A_Zaz):0:13:
-%LA:+0X0P0:1:6:0x0:
-%*LA:+0X0P0:0:6:
+%LA:+0X.0P0:1:7:0x0:
+%*LA:+0X.0P0:0:7:
 %LA:+0X0P+0:1:7:0x0:
 %*LA:+0X0P+0:0:7:
 %LA:+0X8P-16385:1:11:0x1p-16382:
@@ -76,8 +76,8 @@
 %*1LA:-0X8P-16385:0:-1:
 %1LA:-0X0P+0:0:-1:
 %*1LA:-0X0P+0:0:-1:
-%1LA:-0X0P0:0:-1:
-%*1LA:-0X0P0:0:-1:
+%1LA:-0X.0P0:0:-1:
+%*1LA:-0X.0P0:0:-1:
 %1LA:-NAN(09A_Zaz):0:-1:
 %*1LA:-NAN(09A_Zaz):0:-1:
 %1LA:-NAN():0:-1:
@@ -86,8 +86,8 @@
 %*1LA:NAN():0:-1:
 %1LA:NAN(09A_Zaz):0:-1:
 %*1LA:NAN(09A_Zaz):0:-1:
-%1LA:0X0P0:1:1:0x0:
-%*1LA:0X0P0:0:1:
+%1LA:0X.0P0:1:1:0x0:
+%*1LA:0X.0P0:0:1:
 %1LA:0X0P+0:1:1:0x0:
 %*1LA:0X0P+0:0:1:
 %1LA:0X8P-16385:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1LA:+NAN():0:-1:
 %1LA:+NAN(09A_Zaz):0:-1:
 %*1LA:+NAN(09A_Zaz):0:-1:
-%1LA:+0X0P0:0:-1:
-%*1LA:+0X0P0:0:-1:
+%1LA:+0X.0P0:0:-1:
+%*1LA:+0X.0P0:0:-1:
 %1LA:+0X0P+0:0:-1:
 %*1LA:+0X0P+0:0:-1:
 %1LA:+0X8P-16385:0:-1:
@@ -138,8 +138,8 @@
 %*2LA:-0X8P-16385:0:2:
 %2LA:-0X0P+0:1:2:-0x0:
 %*2LA:-0X0P+0:0:2:
-%2LA:-0X0P0:1:2:-0x0:
-%*2LA:-0X0P0:0:2:
+%2LA:-0X.0P0:1:2:-0x0:
+%*2LA:-0X.0P0:0:2:
 %2LA:-NAN(09A_Zaz):0:-1:
 %*2LA:-NAN(09A_Zaz):0:-1:
 %2LA:-NAN():0:-1:
@@ -148,8 +148,8 @@
 %*2LA:NAN():0:-1:
 %2LA:NAN(09A_Zaz):0:-1:
 %*2LA:NAN(09A_Zaz):0:-1:
-%2LA:0X0P0:0:-1:
-%*2LA:0X0P0:0:-1:
+%2LA:0X.0P0:0:-1:
+%*2LA:0X.0P0:0:-1:
 %2LA:0X0P+0:0:-1:
 %*2LA:0X0P+0:0:-1:
 %2LA:0X8P-16385:0:-1:
@@ -168,8 +168,8 @@
 %*2LA:+NAN():0:-1:
 %2LA:+NAN(09A_Zaz):0:-1:
 %*2LA:+NAN(09A_Zaz):0:-1:
-%2LA:+0X0P0:1:2:0x0:
-%*2LA:+0X0P0:0:2:
+%2LA:+0X.0P0:1:2:0x0:
+%*2LA:+0X.0P0:0:2:
 %2LA:+0X0P+0:1:2:0x0:
 %*2LA:+0X0P+0:0:2:
 %2LA:+0X8P-16385:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3LA:-0X8P-16385:0:-1:
 %3LA:-0X0P+0:0:-1:
 %*3LA:-0X0P+0:0:-1:
-%3LA:-0X0P0:0:-1:
-%*3LA:-0X0P0:0:-1:
+%3LA:-0X.0P0:0:-1:
+%*3LA:-0X.0P0:0:-1:
 %3LA:-NAN(09A_Zaz):0:-1:
 %*3LA:-NAN(09A_Zaz):0:-1:
 %3LA:-NAN():0:-1:
@@ -210,8 +210,8 @@
 %*3LA:NAN():0:3:
 %3LA:NAN(09A_Zaz):1:3:nan:
 %*3LA:NAN(09A_Zaz):0:3:
-%3LA:0X0P0:1:3:0x0:
-%*3LA:0X0P0:0:3:
+%3LA:0X.0P0:0:-1:
+%*3LA:0X.0P0:0:-1:
 %3LA:0X0P+0:1:3:0x0:
 %*3LA:0X0P+0:0:3:
 %3LA:0X8P-16385:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3LA:+NAN():0:-1:
 %3LA:+NAN(09A_Zaz):0:-1:
 %*3LA:+NAN(09A_Zaz):0:-1:
-%3LA:+0X0P0:0:-1:
-%*3LA:+0X0P0:0:-1:
+%3LA:+0X.0P0:0:-1:
+%*3LA:+0X.0P0:0:-1:
 %3LA:+0X0P+0:0:-1:
 %*3LA:+0X0P+0:0:-1:
 %3LA:+0X8P-16385:0:-1:
@@ -262,8 +262,8 @@
 %*4LA:-0X8P-16385:0:4:
 %4LA:-0X0P+0:1:4:-0x0:
 %*4LA:-0X0P+0:0:4:
-%4LA:-0X0P0:1:4:-0x0:
-%*4LA:-0X0P0:0:4:
+%4LA:-0X.0P0:0:-1:
+%*4LA:-0X.0P0:0:-1:
 %4LA:-NAN(09A_Zaz):1:4:-nan:
 %*4LA:-NAN(09A_Zaz):0:4:
 %4LA:-NAN():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4LA:NAN():0:-1:
 %4LA:NAN(09A_Zaz):0:-1:
 %*4LA:NAN(09A_Zaz):0:-1:
-%4LA:0X0P0:0:-1:
-%*4LA:0X0P0:0:-1:
+%4LA:0X.0P0:1:4:0x0:
+%*4LA:0X.0P0:0:4:
 %4LA:0X0P+0:0:-1:
 %*4LA:0X0P+0:0:-1:
 %4LA:0X8P-16385:0:-1:
@@ -292,8 +292,8 @@
 %*4LA:+NAN():0:4:
 %4LA:+NAN(09A_Zaz):1:4:nan:
 %*4LA:+NAN(09A_Zaz):0:4:
-%4LA:+0X0P0:1:4:0x0:
-%*4LA:+0X0P0:0:4:
+%4LA:+0X.0P0:0:-1:
+%*4LA:+0X.0P0:0:-1:
 %4LA:+0X0P+0:1:4:0x0:
 %*4LA:+0X0P+0:0:4:
 %4LA:+0X8P-16385:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5LA:-0X8P-16385:0:-1:
 %5LA:-0X0P+0:0:-1:
 %*5LA:-0X0P+0:0:-1:
-%5LA:-0X0P0:0:-1:
-%*5LA:-0X0P0:0:-1:
+%5LA:-0X.0P0:1:5:-0x0:
+%*5LA:-0X.0P0:0:5:
 %5LA:-NAN(09A_Zaz):0:-1:
 %*5LA:-NAN(09A_Zaz):0:-1:
 %5LA:-NAN():0:-1:
@@ -334,8 +334,8 @@
 %*5LA:NAN():0:5:
 %5LA:NAN(09A_Zaz):0:-1:
 %*5LA:NAN(09A_Zaz):0:-1:
-%5LA:0X0P0:1:5:0x0:
-%*5LA:0X0P0:0:5:
+%5LA:0X.0P0:0:-1:
+%*5LA:0X.0P0:0:-1:
 %5LA:0X0P+0:0:-1:
 %*5LA:0X0P+0:0:-1:
 %5LA:0X8P-16385:0:-1:
@@ -354,8 +354,8 @@
 %*5LA:+NAN():0:-1:
 %5LA:+NAN(09A_Zaz):0:-1:
 %*5LA:+NAN(09A_Zaz):0:-1:
-%5LA:+0X0P0:0:-1:
-%*5LA:+0X0P0:0:-1:
+%5LA:+0X.0P0:1:5:0x0:
+%*5LA:+0X.0P0:0:5:
 %5LA:+0X0P+0:0:-1:
 %*5LA:+0X0P+0:0:-1:
 %5LA:+0X8P-16385:0:-1:
@@ -386,8 +386,8 @@
 %*6LA:-0X8P-16385:0:-1:
 %6LA:-0X0P+0:0:-1:
 %*6LA:-0X0P+0:0:-1:
-%6LA:-0X0P0:1:6:-0x0:
-%*6LA:-0X0P0:0:6:
+%6LA:-0X.0P0:0:-1:
+%*6LA:-0X.0P0:0:-1:
 %6LA:-NAN(09A_Zaz):0:-1:
 %*6LA:-NAN(09A_Zaz):0:-1:
 %6LA:-NAN():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6LA:NAN():0:5:
 %6LA:NAN(09A_Zaz):0:-1:
 %*6LA:NAN(09A_Zaz):0:-1:
-%6LA:0X0P0:1:5:0x0:
-%*6LA:0X0P0:0:5:
+%6LA:0X.0P0:1:6:0x0:
+%*6LA:0X.0P0:0:6:
 %6LA:0X0P+0:1:6:0x0:
 %*6LA:0X0P+0:0:6:
 %6LA:0X8P-16385:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6LA:+NAN():0:6:
 %6LA:+NAN(09A_Zaz):0:-1:
 %*6LA:+NAN(09A_Zaz):0:-1:
-%6LA:+0X0P0:1:6:0x0:
-%*6LA:+0X0P0:0:6:
+%6LA:+0X.0P0:0:-1:
+%*6LA:+0X.0P0:0:-1:
 %6LA:+0X0P+0:0:-1:
 %*6LA:+0X0P+0:0:-1:
 %6LA:+0X8P-16385:0:-1:
@@ -448,8 +448,8 @@
 %*35LA:-0X8P-16385:0:11:
 %35LA:-0X0P+0:1:7:-0x0:
 %*35LA:-0X0P+0:0:7:
-%35LA:-0X0P0:1:6:-0x0:
-%*35LA:-0X0P0:0:6:
+%35LA:-0X.0P0:1:7:-0x0:
+%*35LA:-0X.0P0:0:7:
 %35LA:-NAN(09A_Zaz):1:13:-nan:
 %*35LA:-NAN(09A_Zaz):0:13:
 %35LA:-NAN():1:6:-nan:
@@ -458,8 +458,8 @@
 %*35LA:NAN():0:5:
 %35LA:NAN(09A_Zaz):1:12:nan:
 %*35LA:NAN(09A_Zaz):0:12:
-%35LA:0X0P0:1:5:0x0:
-%*35LA:0X0P0:0:5:
+%35LA:0X.0P0:1:6:0x0:
+%*35LA:0X.0P0:0:6:
 %35LA:0X0P+0:1:6:0x0:
 %*35LA:0X0P+0:0:6:
 %35LA:0X8P-16385:1:10:0x1p-16382:
@@ -478,8 +478,8 @@
 %*35LA:+NAN():0:6:
 %35LA:+NAN(09A_Zaz):1:13:nan:
 %*35LA:+NAN(09A_Zaz):0:13:
-%35LA:+0X0P0:1:6:0x0:
-%*35LA:+0X0P0:0:6:
+%35LA:+0X.0P0:1:7:0x0:
+%*35LA:+0X.0P0:0:7:
 %35LA:+0X0P+0:1:7:0x0:
 %*35LA:+0X0P+0:0:7:
 %35LA:+0X8P-16385:1:11:0x1p-16382:
@@ -510,8 +510,8 @@
 %*53LA:-0X8P-16385:0:11:
 %53LA:-0X0P+0:1:7:-0x0:
 %*53LA:-0X0P+0:0:7:
-%53LA:-0X0P0:1:6:-0x0:
-%*53LA:-0X0P0:0:6:
+%53LA:-0X.0P0:1:7:-0x0:
+%*53LA:-0X.0P0:0:7:
 %53LA:-NAN(09A_Zaz):1:13:-nan:
 %*53LA:-NAN(09A_Zaz):0:13:
 %53LA:-NAN():1:6:-nan:
@@ -520,8 +520,8 @@
 %*53LA:NAN():0:5:
 %53LA:NAN(09A_Zaz):1:12:nan:
 %*53LA:NAN(09A_Zaz):0:12:
-%53LA:0X0P0:1:5:0x0:
-%*53LA:0X0P0:0:5:
+%53LA:0X.0P0:1:6:0x0:
+%*53LA:0X.0P0:0:6:
 %53LA:0X0P+0:1:6:0x0:
 %*53LA:0X0P+0:0:6:
 %53LA:0X8P-16385:1:10:0x1p-16382:
@@ -540,8 +540,8 @@
 %*53LA:+NAN():0:6:
 %53LA:+NAN(09A_Zaz):1:13:nan:
 %*53LA:+NAN(09A_Zaz):0:13:
-%53LA:+0X0P0:1:6:0x0:
-%*53LA:+0X0P0:0:6:
+%53LA:+0X.0P0:1:7:0x0:
+%*53LA:+0X.0P0:0:7:
 %53LA:+0X0P+0:1:7:0x0:
 %*53LA:+0X0P+0:0:7:
 %53LA:+0X8P-16385:1:11:0x1p-16382:
@@ -572,8 +572,8 @@
 %*5LA: -0X8P-16385:0:-1:
 %5LA: -0X0P+0:0:-1:
 %*5LA: -0X0P+0:0:-1:
-%5LA: -0X0P0:0:-1:
-%*5LA: -0X0P0:0:-1:
+%5LA: -0X.0P0:1:6:-0x0:
+%*5LA: -0X.0P0:0:6:
 %5LA: -NAN(09A_Zaz):0:-1:
 %*5LA: -NAN(09A_Zaz):0:-1:
 %5LA: -NAN():0:-1:
@@ -582,8 +582,8 @@
 %*5LA: NAN():0:6:
 %5LA: NAN(09A_Zaz):0:-1:
 %*5LA: NAN(09A_Zaz):0:-1:
-%5LA: 0X0P0:1:6:0x0:
-%*5LA: 0X0P0:0:6:
+%5LA: 0X.0P0:0:-1:
+%*5LA: 0X.0P0:0:-1:
 %5LA: 0X0P+0:0:-1:
 %*5LA: 0X0P+0:0:-1:
 %5LA: 0X8P-16385:0:-1:
@@ -602,8 +602,8 @@
 %*5LA: +NAN():0:-1:
 %5LA: +NAN(09A_Zaz):0:-1:
 %*5LA: +NAN(09A_Zaz):0:-1:
-%5LA: +0X0P0:0:-1:
-%*5LA: +0X0P0:0:-1:
+%5LA: +0X.0P0:1:6:0x0:
+%*5LA: +0X.0P0:0:6:
 %5LA: +0X0P+0:0:-1:
 %*5LA: +0X0P+0:0:-1:
 %5LA: +0X8P-16385:0:-1:
@@ -634,8 +634,8 @@
 %*53LA: -0X8P-16385:0:12:
 %53LA: -0X0P+0:1:8:-0x0:
 %*53LA: -0X0P+0:0:8:
-%53LA: -0X0P0:1:7:-0x0:
-%*53LA: -0X0P0:0:7:
+%53LA: -0X.0P0:1:8:-0x0:
+%*53LA: -0X.0P0:0:8:
 %53LA: -NAN(09A_Zaz):1:14:-nan:
 %*53LA: -NAN(09A_Zaz):0:14:
 %53LA: -NAN():1:7:-nan:
@@ -644,8 +644,8 @@
 %*53LA: NAN():0:6:
 %53LA: NAN(09A_Zaz):1:13:nan:
 %*53LA: NAN(09A_Zaz):0:13:
-%53LA: 0X0P0:1:6:0x0:
-%*53LA: 0X0P0:0:6:
+%53LA: 0X.0P0:1:7:0x0:
+%*53LA: 0X.0P0:0:7:
 %53LA: 0X0P+0:1:7:0x0:
 %*53LA: 0X0P+0:0:7:
 %53LA: 0X8P-16385:1:11:0x1p-16382:
@@ -664,8 +664,8 @@
 %*53LA: +NAN():0:7:
 %53LA: +NAN(09A_Zaz):1:14:nan:
 %*53LA: +NAN(09A_Zaz):0:14:
-%53LA: +0X0P0:1:7:0x0:
-%*53LA: +0X0P0:0:7:
+%53LA: +0X.0P0:1:8:0x0:
+%*53LA: +0X.0P0:0:8:
 %53LA: +0X0P+0:1:8:0x0:
 %*53LA: +0X0P+0:0:8:
 %53LA: +0X8P-16385:1:12:0x1p-16382:
diff --git a/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-g.input b/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-g.input
index fb5173c..0816d18 100644
--- a/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-g.input
+++ b/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-g.input
@@ -14,8 +14,8 @@
 %*Lg:-0x8p-16385:0:11:
 %Lg:-0x0p+0:1:7:-0x0:
 %*Lg:-0x0p+0:0:7:
-%Lg:-0x0p0:1:6:-0x0:
-%*Lg:-0x0p0:0:6:
+%Lg:-0x.0p0:1:7:-0x0:
+%*Lg:-0x.0p0:0:7:
 %Lg:-nan(09A_Zaz):1:13:-nan:
 %*Lg:-nan(09A_Zaz):0:13:
 %Lg:-nan():1:6:-nan:
@@ -24,8 +24,8 @@
 %*Lg:nan():0:5:
 %Lg:nan(09A_Zaz):1:12:nan:
 %*Lg:nan(09A_Zaz):0:12:
-%Lg:0x0p0:1:5:0x0:
-%*Lg:0x0p0:0:5:
+%Lg:0x.0p0:1:6:0x0:
+%*Lg:0x.0p0:0:6:
 %Lg:0x0p+0:1:6:0x0:
 %*Lg:0x0p+0:0:6:
 %Lg:0x8p-16385:1:10:0x1p-16382:
@@ -44,8 +44,8 @@
 %*Lg:+nan():0:6:
 %Lg:+nan(09A_Zaz):1:13:nan:
 %*Lg:+nan(09A_Zaz):0:13:
-%Lg:+0x0p0:1:6:0x0:
-%*Lg:+0x0p0:0:6:
+%Lg:+0x.0p0:1:7:0x0:
+%*Lg:+0x.0p0:0:7:
 %Lg:+0x0p+0:1:7:0x0:
 %*Lg:+0x0p+0:0:7:
 %Lg:+0x8p-16385:1:11:0x1p-16382:
@@ -76,8 +76,8 @@
 %*1Lg:-0x8p-16385:0:-1:
 %1Lg:-0x0p+0:0:-1:
 %*1Lg:-0x0p+0:0:-1:
-%1Lg:-0x0p0:0:-1:
-%*1Lg:-0x0p0:0:-1:
+%1Lg:-0x.0p0:0:-1:
+%*1Lg:-0x.0p0:0:-1:
 %1Lg:-nan(09A_Zaz):0:-1:
 %*1Lg:-nan(09A_Zaz):0:-1:
 %1Lg:-nan():0:-1:
@@ -86,8 +86,8 @@
 %*1Lg:nan():0:-1:
 %1Lg:nan(09A_Zaz):0:-1:
 %*1Lg:nan(09A_Zaz):0:-1:
-%1Lg:0x0p0:1:1:0x0:
-%*1Lg:0x0p0:0:1:
+%1Lg:0x.0p0:1:1:0x0:
+%*1Lg:0x.0p0:0:1:
 %1Lg:0x0p+0:1:1:0x0:
 %*1Lg:0x0p+0:0:1:
 %1Lg:0x8p-16385:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1Lg:+nan():0:-1:
 %1Lg:+nan(09A_Zaz):0:-1:
 %*1Lg:+nan(09A_Zaz):0:-1:
-%1Lg:+0x0p0:0:-1:
-%*1Lg:+0x0p0:0:-1:
+%1Lg:+0x.0p0:0:-1:
+%*1Lg:+0x.0p0:0:-1:
 %1Lg:+0x0p+0:0:-1:
 %*1Lg:+0x0p+0:0:-1:
 %1Lg:+0x8p-16385:0:-1:
@@ -138,8 +138,8 @@
 %*2Lg:-0x8p-16385:0:2:
 %2Lg:-0x0p+0:1:2:-0x0:
 %*2Lg:-0x0p+0:0:2:
-%2Lg:-0x0p0:1:2:-0x0:
-%*2Lg:-0x0p0:0:2:
+%2Lg:-0x.0p0:1:2:-0x0:
+%*2Lg:-0x.0p0:0:2:
 %2Lg:-nan(09A_Zaz):0:-1:
 %*2Lg:-nan(09A_Zaz):0:-1:
 %2Lg:-nan():0:-1:
@@ -148,8 +148,8 @@
 %*2Lg:nan():0:-1:
 %2Lg:nan(09A_Zaz):0:-1:
 %*2Lg:nan(09A_Zaz):0:-1:
-%2Lg:0x0p0:0:-1:
-%*2Lg:0x0p0:0:-1:
+%2Lg:0x.0p0:0:-1:
+%*2Lg:0x.0p0:0:-1:
 %2Lg:0x0p+0:0:-1:
 %*2Lg:0x0p+0:0:-1:
 %2Lg:0x8p-16385:0:-1:
@@ -168,8 +168,8 @@
 %*2Lg:+nan():0:-1:
 %2Lg:+nan(09A_Zaz):0:-1:
 %*2Lg:+nan(09A_Zaz):0:-1:
-%2Lg:+0x0p0:1:2:0x0:
-%*2Lg:+0x0p0:0:2:
+%2Lg:+0x.0p0:1:2:0x0:
+%*2Lg:+0x.0p0:0:2:
 %2Lg:+0x0p+0:1:2:0x0:
 %*2Lg:+0x0p+0:0:2:
 %2Lg:+0x8p-16385:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3Lg:-0x8p-16385:0:-1:
 %3Lg:-0x0p+0:0:-1:
 %*3Lg:-0x0p+0:0:-1:
-%3Lg:-0x0p0:0:-1:
-%*3Lg:-0x0p0:0:-1:
+%3Lg:-0x.0p0:0:-1:
+%*3Lg:-0x.0p0:0:-1:
 %3Lg:-nan(09A_Zaz):0:-1:
 %*3Lg:-nan(09A_Zaz):0:-1:
 %3Lg:-nan():0:-1:
@@ -210,8 +210,8 @@
 %*3Lg:nan():0:3:
 %3Lg:nan(09A_Zaz):1:3:nan:
 %*3Lg:nan(09A_Zaz):0:3:
-%3Lg:0x0p0:1:3:0x0:
-%*3Lg:0x0p0:0:3:
+%3Lg:0x.0p0:0:-1:
+%*3Lg:0x.0p0:0:-1:
 %3Lg:0x0p+0:1:3:0x0:
 %*3Lg:0x0p+0:0:3:
 %3Lg:0x8p-16385:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3Lg:+nan():0:-1:
 %3Lg:+nan(09A_Zaz):0:-1:
 %*3Lg:+nan(09A_Zaz):0:-1:
-%3Lg:+0x0p0:0:-1:
-%*3Lg:+0x0p0:0:-1:
+%3Lg:+0x.0p0:0:-1:
+%*3Lg:+0x.0p0:0:-1:
 %3Lg:+0x0p+0:0:-1:
 %*3Lg:+0x0p+0:0:-1:
 %3Lg:+0x8p-16385:0:-1:
@@ -262,8 +262,8 @@
 %*4Lg:-0x8p-16385:0:4:
 %4Lg:-0x0p+0:1:4:-0x0:
 %*4Lg:-0x0p+0:0:4:
-%4Lg:-0x0p0:1:4:-0x0:
-%*4Lg:-0x0p0:0:4:
+%4Lg:-0x.0p0:0:-1:
+%*4Lg:-0x.0p0:0:-1:
 %4Lg:-nan(09A_Zaz):1:4:-nan:
 %*4Lg:-nan(09A_Zaz):0:4:
 %4Lg:-nan():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4Lg:nan():0:-1:
 %4Lg:nan(09A_Zaz):0:-1:
 %*4Lg:nan(09A_Zaz):0:-1:
-%4Lg:0x0p0:0:-1:
-%*4Lg:0x0p0:0:-1:
+%4Lg:0x.0p0:1:4:0x0:
+%*4Lg:0x.0p0:0:4:
 %4Lg:0x0p+0:0:-1:
 %*4Lg:0x0p+0:0:-1:
 %4Lg:0x8p-16385:0:-1:
@@ -292,8 +292,8 @@
 %*4Lg:+nan():0:4:
 %4Lg:+nan(09A_Zaz):1:4:nan:
 %*4Lg:+nan(09A_Zaz):0:4:
-%4Lg:+0x0p0:1:4:0x0:
-%*4Lg:+0x0p0:0:4:
+%4Lg:+0x.0p0:0:-1:
+%*4Lg:+0x.0p0:0:-1:
 %4Lg:+0x0p+0:1:4:0x0:
 %*4Lg:+0x0p+0:0:4:
 %4Lg:+0x8p-16385:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5Lg:-0x8p-16385:0:-1:
 %5Lg:-0x0p+0:0:-1:
 %*5Lg:-0x0p+0:0:-1:
-%5Lg:-0x0p0:0:-1:
-%*5Lg:-0x0p0:0:-1:
+%5Lg:-0x.0p0:1:5:-0x0:
+%*5Lg:-0x.0p0:0:5:
 %5Lg:-nan(09A_Zaz):0:-1:
 %*5Lg:-nan(09A_Zaz):0:-1:
 %5Lg:-nan():0:-1:
@@ -334,8 +334,8 @@
 %*5Lg:nan():0:5:
 %5Lg:nan(09A_Zaz):0:-1:
 %*5Lg:nan(09A_Zaz):0:-1:
-%5Lg:0x0p0:1:5:0x0:
-%*5Lg:0x0p0:0:5:
+%5Lg:0x.0p0:0:-1:
+%*5Lg:0x.0p0:0:-1:
 %5Lg:0x0p+0:0:-1:
 %*5Lg:0x0p+0:0:-1:
 %5Lg:0x8p-16385:0:-1:
@@ -354,8 +354,8 @@
 %*5Lg:+nan():0:-1:
 %5Lg:+nan(09A_Zaz):0:-1:
 %*5Lg:+nan(09A_Zaz):0:-1:
-%5Lg:+0x0p0:0:-1:
-%*5Lg:+0x0p0:0:-1:
+%5Lg:+0x.0p0:1:5:0x0:
+%*5Lg:+0x.0p0:0:5:
 %5Lg:+0x0p+0:0:-1:
 %*5Lg:+0x0p+0:0:-1:
 %5Lg:+0x8p-16385:0:-1:
@@ -386,8 +386,8 @@
 %*6Lg:-0x8p-16385:0:-1:
 %6Lg:-0x0p+0:0:-1:
 %*6Lg:-0x0p+0:0:-1:
-%6Lg:-0x0p0:1:6:-0x0:
-%*6Lg:-0x0p0:0:6:
+%6Lg:-0x.0p0:0:-1:
+%*6Lg:-0x.0p0:0:-1:
 %6Lg:-nan(09A_Zaz):0:-1:
 %*6Lg:-nan(09A_Zaz):0:-1:
 %6Lg:-nan():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6Lg:nan():0:5:
 %6Lg:nan(09A_Zaz):0:-1:
 %*6Lg:nan(09A_Zaz):0:-1:
-%6Lg:0x0p0:1:5:0x0:
-%*6Lg:0x0p0:0:5:
+%6Lg:0x.0p0:1:6:0x0:
+%*6Lg:0x.0p0:0:6:
 %6Lg:0x0p+0:1:6:0x0:
 %*6Lg:0x0p+0:0:6:
 %6Lg:0x8p-16385:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6Lg:+nan():0:6:
 %6Lg:+nan(09A_Zaz):0:-1:
 %*6Lg:+nan(09A_Zaz):0:-1:
-%6Lg:+0x0p0:1:6:0x0:
-%*6Lg:+0x0p0:0:6:
+%6Lg:+0x.0p0:0:-1:
+%*6Lg:+0x.0p0:0:-1:
 %6Lg:+0x0p+0:0:-1:
 %*6Lg:+0x0p+0:0:-1:
 %6Lg:+0x8p-16385:0:-1:
@@ -448,8 +448,8 @@
 %*35Lg:-0x8p-16385:0:11:
 %35Lg:-0x0p+0:1:7:-0x0:
 %*35Lg:-0x0p+0:0:7:
-%35Lg:-0x0p0:1:6:-0x0:
-%*35Lg:-0x0p0:0:6:
+%35Lg:-0x.0p0:1:7:-0x0:
+%*35Lg:-0x.0p0:0:7:
 %35Lg:-nan(09A_Zaz):1:13:-nan:
 %*35Lg:-nan(09A_Zaz):0:13:
 %35Lg:-nan():1:6:-nan:
@@ -458,8 +458,8 @@
 %*35Lg:nan():0:5:
 %35Lg:nan(09A_Zaz):1:12:nan:
 %*35Lg:nan(09A_Zaz):0:12:
-%35Lg:0x0p0:1:5:0x0:
-%*35Lg:0x0p0:0:5:
+%35Lg:0x.0p0:1:6:0x0:
+%*35Lg:0x.0p0:0:6:
 %35Lg:0x0p+0:1:6:0x0:
 %*35Lg:0x0p+0:0:6:
 %35Lg:0x8p-16385:1:10:0x1p-16382:
@@ -478,8 +478,8 @@
 %*35Lg:+nan():0:6:
 %35Lg:+nan(09A_Zaz):1:13:nan:
 %*35Lg:+nan(09A_Zaz):0:13:
-%35Lg:+0x0p0:1:6:0x0:
-%*35Lg:+0x0p0:0:6:
+%35Lg:+0x.0p0:1:7:0x0:
+%*35Lg:+0x.0p0:0:7:
 %35Lg:+0x0p+0:1:7:0x0:
 %*35Lg:+0x0p+0:0:7:
 %35Lg:+0x8p-16385:1:11:0x1p-16382:
@@ -510,8 +510,8 @@
 %*53Lg:-0x8p-16385:0:11:
 %53Lg:-0x0p+0:1:7:-0x0:
 %*53Lg:-0x0p+0:0:7:
-%53Lg:-0x0p0:1:6:-0x0:
-%*53Lg:-0x0p0:0:6:
+%53Lg:-0x.0p0:1:7:-0x0:
+%*53Lg:-0x.0p0:0:7:
 %53Lg:-nan(09A_Zaz):1:13:-nan:
 %*53Lg:-nan(09A_Zaz):0:13:
 %53Lg:-nan():1:6:-nan:
@@ -520,8 +520,8 @@
 %*53Lg:nan():0:5:
 %53Lg:nan(09A_Zaz):1:12:nan:
 %*53Lg:nan(09A_Zaz):0:12:
-%53Lg:0x0p0:1:5:0x0:
-%*53Lg:0x0p0:0:5:
+%53Lg:0x.0p0:1:6:0x0:
+%*53Lg:0x.0p0:0:6:
 %53Lg:0x0p+0:1:6:0x0:
 %*53Lg:0x0p+0:0:6:
 %53Lg:0x8p-16385:1:10:0x1p-16382:
@@ -540,8 +540,8 @@
 %*53Lg:+nan():0:6:
 %53Lg:+nan(09A_Zaz):1:13:nan:
 %*53Lg:+nan(09A_Zaz):0:13:
-%53Lg:+0x0p0:1:6:0x0:
-%*53Lg:+0x0p0:0:6:
+%53Lg:+0x.0p0:1:7:0x0:
+%*53Lg:+0x.0p0:0:7:
 %53Lg:+0x0p+0:1:7:0x0:
 %*53Lg:+0x0p+0:0:7:
 %53Lg:+0x8p-16385:1:11:0x1p-16382:
@@ -572,8 +572,8 @@
 %*5Lg: -0x8p-16385:0:-1:
 %5Lg: -0x0p+0:0:-1:
 %*5Lg: -0x0p+0:0:-1:
-%5Lg: -0x0p0:0:-1:
-%*5Lg: -0x0p0:0:-1:
+%5Lg: -0x.0p0:1:6:-0x0:
+%*5Lg: -0x.0p0:0:6:
 %5Lg: -nan(09A_Zaz):0:-1:
 %*5Lg: -nan(09A_Zaz):0:-1:
 %5Lg: -nan():0:-1:
@@ -582,8 +582,8 @@
 %*5Lg: nan():0:6:
 %5Lg: nan(09A_Zaz):0:-1:
 %*5Lg: nan(09A_Zaz):0:-1:
-%5Lg: 0x0p0:1:6:0x0:
-%*5Lg: 0x0p0:0:6:
+%5Lg: 0x.0p0:0:-1:
+%*5Lg: 0x.0p0:0:-1:
 %5Lg: 0x0p+0:0:-1:
 %*5Lg: 0x0p+0:0:-1:
 %5Lg: 0x8p-16385:0:-1:
@@ -602,8 +602,8 @@
 %*5Lg: +nan():0:-1:
 %5Lg: +nan(09A_Zaz):0:-1:
 %*5Lg: +nan(09A_Zaz):0:-1:
-%5Lg: +0x0p0:0:-1:
-%*5Lg: +0x0p0:0:-1:
+%5Lg: +0x.0p0:1:6:0x0:
+%*5Lg: +0x.0p0:0:6:
 %5Lg: +0x0p+0:0:-1:
 %*5Lg: +0x0p+0:0:-1:
 %5Lg: +0x8p-16385:0:-1:
@@ -634,8 +634,8 @@
 %*53Lg: -0x8p-16385:0:12:
 %53Lg: -0x0p+0:1:8:-0x0:
 %*53Lg: -0x0p+0:0:8:
-%53Lg: -0x0p0:1:7:-0x0:
-%*53Lg: -0x0p0:0:7:
+%53Lg: -0x.0p0:1:8:-0x0:
+%*53Lg: -0x.0p0:0:8:
 %53Lg: -nan(09A_Zaz):1:14:-nan:
 %*53Lg: -nan(09A_Zaz):0:14:
 %53Lg: -nan():1:7:-nan:
@@ -644,8 +644,8 @@
 %*53Lg: nan():0:6:
 %53Lg: nan(09A_Zaz):1:13:nan:
 %*53Lg: nan(09A_Zaz):0:13:
-%53Lg: 0x0p0:1:6:0x0:
-%*53Lg: 0x0p0:0:6:
+%53Lg: 0x.0p0:1:7:0x0:
+%*53Lg: 0x.0p0:0:7:
 %53Lg: 0x0p+0:1:7:0x0:
 %*53Lg: 0x0p+0:0:7:
 %53Lg: 0x8p-16385:1:11:0x1p-16382:
@@ -664,8 +664,8 @@
 %*53Lg: +nan():0:7:
 %53Lg: +nan(09A_Zaz):1:14:nan:
 %*53Lg: +nan(09A_Zaz):0:14:
-%53Lg: +0x0p0:1:7:0x0:
-%*53Lg: +0x0p0:0:7:
+%53Lg: +0x.0p0:1:8:0x0:
+%*53Lg: +0x.0p0:0:8:
 %53Lg: +0x0p+0:1:8:0x0:
 %*53Lg: +0x0p+0:0:8:
 %53Lg: +0x8p-16385:1:12:0x1p-16382:
diff --git a/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-gg.input b/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-gg.input
index e9020af..1b6b895 100644
--- a/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-gg.input
+++ b/sysdeps/ieee754/ldbl-128/tst-scanf-format-ldouble-gg.input
@@ -14,8 +14,8 @@
 %*LG:-0X8P-16385:0:11:
 %LG:-0X0P+0:1:7:-0x0:
 %*LG:-0X0P+0:0:7:
-%LG:-0X0P0:1:6:-0x0:
-%*LG:-0X0P0:0:6:
+%LG:-0X.0P0:1:7:-0x0:
+%*LG:-0X.0P0:0:7:
 %LG:-NAN(09A_Zaz):1:13:-nan:
 %*LG:-NAN(09A_Zaz):0:13:
 %LG:-NAN():1:6:-nan:
@@ -24,8 +24,8 @@
 %*LG:NAN():0:5:
 %LG:NAN(09A_Zaz):1:12:nan:
 %*LG:NAN(09A_Zaz):0:12:
-%LG:0X0P0:1:5:0x0:
-%*LG:0X0P0:0:5:
+%LG:0X.0P0:1:6:0x0:
+%*LG:0X.0P0:0:6:
 %LG:0X0P+0:1:6:0x0:
 %*LG:0X0P+0:0:6:
 %LG:0X8P-16385:1:10:0x1p-16382:
@@ -44,8 +44,8 @@
 %*LG:+NAN():0:6:
 %LG:+NAN(09A_Zaz):1:13:nan:
 %*LG:+NAN(09A_Zaz):0:13:
-%LG:+0X0P0:1:6:0x0:
-%*LG:+0X0P0:0:6:
+%LG:+0X.0P0:1:7:0x0:
+%*LG:+0X.0P0:0:7:
 %LG:+0X0P+0:1:7:0x0:
 %*LG:+0X0P+0:0:7:
 %LG:+0X8P-16385:1:11:0x1p-16382:
@@ -76,8 +76,8 @@
 %*1LG:-0X8P-16385:0:-1:
 %1LG:-0X0P+0:0:-1:
 %*1LG:-0X0P+0:0:-1:
-%1LG:-0X0P0:0:-1:
-%*1LG:-0X0P0:0:-1:
+%1LG:-0X.0P0:0:-1:
+%*1LG:-0X.0P0:0:-1:
 %1LG:-NAN(09A_Zaz):0:-1:
 %*1LG:-NAN(09A_Zaz):0:-1:
 %1LG:-NAN():0:-1:
@@ -86,8 +86,8 @@
 %*1LG:NAN():0:-1:
 %1LG:NAN(09A_Zaz):0:-1:
 %*1LG:NAN(09A_Zaz):0:-1:
-%1LG:0X0P0:1:1:0x0:
-%*1LG:0X0P0:0:1:
+%1LG:0X.0P0:1:1:0x0:
+%*1LG:0X.0P0:0:1:
 %1LG:0X0P+0:1:1:0x0:
 %*1LG:0X0P+0:0:1:
 %1LG:0X8P-16385:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1LG:+NAN():0:-1:
 %1LG:+NAN(09A_Zaz):0:-1:
 %*1LG:+NAN(09A_Zaz):0:-1:
-%1LG:+0X0P0:0:-1:
-%*1LG:+0X0P0:0:-1:
+%1LG:+0X.0P0:0:-1:
+%*1LG:+0X.0P0:0:-1:
 %1LG:+0X0P+0:0:-1:
 %*1LG:+0X0P+0:0:-1:
 %1LG:+0X8P-16385:0:-1:
@@ -138,8 +138,8 @@
 %*2LG:-0X8P-16385:0:2:
 %2LG:-0X0P+0:1:2:-0x0:
 %*2LG:-0X0P+0:0:2:
-%2LG:-0X0P0:1:2:-0x0:
-%*2LG:-0X0P0:0:2:
+%2LG:-0X.0P0:1:2:-0x0:
+%*2LG:-0X.0P0:0:2:
 %2LG:-NAN(09A_Zaz):0:-1:
 %*2LG:-NAN(09A_Zaz):0:-1:
 %2LG:-NAN():0:-1:
@@ -148,8 +148,8 @@
 %*2LG:NAN():0:-1:
 %2LG:NAN(09A_Zaz):0:-1:
 %*2LG:NAN(09A_Zaz):0:-1:
-%2LG:0X0P0:0:-1:
-%*2LG:0X0P0:0:-1:
+%2LG:0X.0P0:0:-1:
+%*2LG:0X.0P0:0:-1:
 %2LG:0X0P+0:0:-1:
 %*2LG:0X0P+0:0:-1:
 %2LG:0X8P-16385:0:-1:
@@ -168,8 +168,8 @@
 %*2LG:+NAN():0:-1:
 %2LG:+NAN(09A_Zaz):0:-1:
 %*2LG:+NAN(09A_Zaz):0:-1:
-%2LG:+0X0P0:1:2:0x0:
-%*2LG:+0X0P0:0:2:
+%2LG:+0X.0P0:1:2:0x0:
+%*2LG:+0X.0P0:0:2:
 %2LG:+0X0P+0:1:2:0x0:
 %*2LG:+0X0P+0:0:2:
 %2LG:+0X8P-16385:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3LG:-0X8P-16385:0:-1:
 %3LG:-0X0P+0:0:-1:
 %*3LG:-0X0P+0:0:-1:
-%3LG:-0X0P0:0:-1:
-%*3LG:-0X0P0:0:-1:
+%3LG:-0X.0P0:0:-1:
+%*3LG:-0X.0P0:0:-1:
 %3LG:-NAN(09A_Zaz):0:-1:
 %*3LG:-NAN(09A_Zaz):0:-1:
 %3LG:-NAN():0:-1:
@@ -210,8 +210,8 @@
 %*3LG:NAN():0:3:
 %3LG:NAN(09A_Zaz):1:3:nan:
 %*3LG:NAN(09A_Zaz):0:3:
-%3LG:0X0P0:1:3:0x0:
-%*3LG:0X0P0:0:3:
+%3LG:0X.0P0:0:-1:
+%*3LG:0X.0P0:0:-1:
 %3LG:0X0P+0:1:3:0x0:
 %*3LG:0X0P+0:0:3:
 %3LG:0X8P-16385:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3LG:+NAN():0:-1:
 %3LG:+NAN(09A_Zaz):0:-1:
 %*3LG:+NAN(09A_Zaz):0:-1:
-%3LG:+0X0P0:0:-1:
-%*3LG:+0X0P0:0:-1:
+%3LG:+0X.0P0:0:-1:
+%*3LG:+0X.0P0:0:-1:
 %3LG:+0X0P+0:0:-1:
 %*3LG:+0X0P+0:0:-1:
 %3LG:+0X8P-16385:0:-1:
@@ -262,8 +262,8 @@
 %*4LG:-0X8P-16385:0:4:
 %4LG:-0X0P+0:1:4:-0x0:
 %*4LG:-0X0P+0:0:4:
-%4LG:-0X0P0:1:4:-0x0:
-%*4LG:-0X0P0:0:4:
+%4LG:-0X.0P0:0:-1:
+%*4LG:-0X.0P0:0:-1:
 %4LG:-NAN(09A_Zaz):1:4:-nan:
 %*4LG:-NAN(09A_Zaz):0:4:
 %4LG:-NAN():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4LG:NAN():0:-1:
 %4LG:NAN(09A_Zaz):0:-1:
 %*4LG:NAN(09A_Zaz):0:-1:
-%4LG:0X0P0:0:-1:
-%*4LG:0X0P0:0:-1:
+%4LG:0X.0P0:1:4:0x0:
+%*4LG:0X.0P0:0:4:
 %4LG:0X0P+0:0:-1:
 %*4LG:0X0P+0:0:-1:
 %4LG:0X8P-16385:0:-1:
@@ -292,8 +292,8 @@
 %*4LG:+NAN():0:4:
 %4LG:+NAN(09A_Zaz):1:4:nan:
 %*4LG:+NAN(09A_Zaz):0:4:
-%4LG:+0X0P0:1:4:0x0:
-%*4LG:+0X0P0:0:4:
+%4LG:+0X.0P0:0:-1:
+%*4LG:+0X.0P0:0:-1:
 %4LG:+0X0P+0:1:4:0x0:
 %*4LG:+0X0P+0:0:4:
 %4LG:+0X8P-16385:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5LG:-0X8P-16385:0:-1:
 %5LG:-0X0P+0:0:-1:
 %*5LG:-0X0P+0:0:-1:
-%5LG:-0X0P0:0:-1:
-%*5LG:-0X0P0:0:-1:
+%5LG:-0X.0P0:1:5:-0x0:
+%*5LG:-0X.0P0:0:5:
 %5LG:-NAN(09A_Zaz):0:-1:
 %*5LG:-NAN(09A_Zaz):0:-1:
 %5LG:-NAN():0:-1:
@@ -334,8 +334,8 @@
 %*5LG:NAN():0:5:
 %5LG:NAN(09A_Zaz):0:-1:
 %*5LG:NAN(09A_Zaz):0:-1:
-%5LG:0X0P0:1:5:0x0:
-%*5LG:0X0P0:0:5:
+%5LG:0X.0P0:0:-1:
+%*5LG:0X.0P0:0:-1:
 %5LG:0X0P+0:0:-1:
 %*5LG:0X0P+0:0:-1:
 %5LG:0X8P-16385:0:-1:
@@ -354,8 +354,8 @@
 %*5LG:+NAN():0:-1:
 %5LG:+NAN(09A_Zaz):0:-1:
 %*5LG:+NAN(09A_Zaz):0:-1:
-%5LG:+0X0P0:0:-1:
-%*5LG:+0X0P0:0:-1:
+%5LG:+0X.0P0:1:5:0x0:
+%*5LG:+0X.0P0:0:5:
 %5LG:+0X0P+0:0:-1:
 %*5LG:+0X0P+0:0:-1:
 %5LG:+0X8P-16385:0:-1:
@@ -386,8 +386,8 @@
 %*6LG:-0X8P-16385:0:-1:
 %6LG:-0X0P+0:0:-1:
 %*6LG:-0X0P+0:0:-1:
-%6LG:-0X0P0:1:6:-0x0:
-%*6LG:-0X0P0:0:6:
+%6LG:-0X.0P0:0:-1:
+%*6LG:-0X.0P0:0:-1:
 %6LG:-NAN(09A_Zaz):0:-1:
 %*6LG:-NAN(09A_Zaz):0:-1:
 %6LG:-NAN():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6LG:NAN():0:5:
 %6LG:NAN(09A_Zaz):0:-1:
 %*6LG:NAN(09A_Zaz):0:-1:
-%6LG:0X0P0:1:5:0x0:
-%*6LG:0X0P0:0:5:
+%6LG:0X.0P0:1:6:0x0:
+%*6LG:0X.0P0:0:6:
 %6LG:0X0P+0:1:6:0x0:
 %*6LG:0X0P+0:0:6:
 %6LG:0X8P-16385:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6LG:+NAN():0:6:
 %6LG:+NAN(09A_Zaz):0:-1:
 %*6LG:+NAN(09A_Zaz):0:-1:
-%6LG:+0X0P0:1:6:0x0:
-%*6LG:+0X0P0:0:6:
+%6LG:+0X.0P0:0:-1:
+%*6LG:+0X.0P0:0:-1:
 %6LG:+0X0P+0:0:-1:
 %*6LG:+0X0P+0:0:-1:
 %6LG:+0X8P-16385:0:-1:
@@ -448,8 +448,8 @@
 %*35LG:-0X8P-16385:0:11:
 %35LG:-0X0P+0:1:7:-0x0:
 %*35LG:-0X0P+0:0:7:
-%35LG:-0X0P0:1:6:-0x0:
-%*35LG:-0X0P0:0:6:
+%35LG:-0X.0P0:1:7:-0x0:
+%*35LG:-0X.0P0:0:7:
 %35LG:-NAN(09A_Zaz):1:13:-nan:
 %*35LG:-NAN(09A_Zaz):0:13:
 %35LG:-NAN():1:6:-nan:
@@ -458,8 +458,8 @@
 %*35LG:NAN():0:5:
 %35LG:NAN(09A_Zaz):1:12:nan:
 %*35LG:NAN(09A_Zaz):0:12:
-%35LG:0X0P0:1:5:0x0:
-%*35LG:0X0P0:0:5:
+%35LG:0X.0P0:1:6:0x0:
+%*35LG:0X.0P0:0:6:
 %35LG:0X0P+0:1:6:0x0:
 %*35LG:0X0P+0:0:6:
 %35LG:0X8P-16385:1:10:0x1p-16382:
@@ -478,8 +478,8 @@
 %*35LG:+NAN():0:6:
 %35LG:+NAN(09A_Zaz):1:13:nan:
 %*35LG:+NAN(09A_Zaz):0:13:
-%35LG:+0X0P0:1:6:0x0:
-%*35LG:+0X0P0:0:6:
+%35LG:+0X.0P0:1:7:0x0:
+%*35LG:+0X.0P0:0:7:
 %35LG:+0X0P+0:1:7:0x0:
 %*35LG:+0X0P+0:0:7:
 %35LG:+0X8P-16385:1:11:0x1p-16382:
@@ -510,8 +510,8 @@
 %*53LG:-0X8P-16385:0:11:
 %53LG:-0X0P+0:1:7:-0x0:
 %*53LG:-0X0P+0:0:7:
-%53LG:-0X0P0:1:6:-0x0:
-%*53LG:-0X0P0:0:6:
+%53LG:-0X.0P0:1:7:-0x0:
+%*53LG:-0X.0P0:0:7:
 %53LG:-NAN(09A_Zaz):1:13:-nan:
 %*53LG:-NAN(09A_Zaz):0:13:
 %53LG:-NAN():1:6:-nan:
@@ -520,8 +520,8 @@
 %*53LG:NAN():0:5:
 %53LG:NAN(09A_Zaz):1:12:nan:
 %*53LG:NAN(09A_Zaz):0:12:
-%53LG:0X0P0:1:5:0x0:
-%*53LG:0X0P0:0:5:
+%53LG:0X.0P0:1:6:0x0:
+%*53LG:0X.0P0:0:6:
 %53LG:0X0P+0:1:6:0x0:
 %*53LG:0X0P+0:0:6:
 %53LG:0X8P-16385:1:10:0x1p-16382:
@@ -540,8 +540,8 @@
 %*53LG:+NAN():0:6:
 %53LG:+NAN(09A_Zaz):1:13:nan:
 %*53LG:+NAN(09A_Zaz):0:13:
-%53LG:+0X0P0:1:6:0x0:
-%*53LG:+0X0P0:0:6:
+%53LG:+0X.0P0:1:7:0x0:
+%*53LG:+0X.0P0:0:7:
 %53LG:+0X0P+0:1:7:0x0:
 %*53LG:+0X0P+0:0:7:
 %53LG:+0X8P-16385:1:11:0x1p-16382:
@@ -572,8 +572,8 @@
 %*5LG: -0X8P-16385:0:-1:
 %5LG: -0X0P+0:0:-1:
 %*5LG: -0X0P+0:0:-1:
-%5LG: -0X0P0:0:-1:
-%*5LG: -0X0P0:0:-1:
+%5LG: -0X.0P0:1:6:-0x0:
+%*5LG: -0X.0P0:0:6:
 %5LG: -NAN(09A_Zaz):0:-1:
 %*5LG: -NAN(09A_Zaz):0:-1:
 %5LG: -NAN():0:-1:
@@ -582,8 +582,8 @@
 %*5LG: NAN():0:6:
 %5LG: NAN(09A_Zaz):0:-1:
 %*5LG: NAN(09A_Zaz):0:-1:
-%5LG: 0X0P0:1:6:0x0:
-%*5LG: 0X0P0:0:6:
+%5LG: 0X.0P0:0:-1:
+%*5LG: 0X.0P0:0:-1:
 %5LG: 0X0P+0:0:-1:
 %*5LG: 0X0P+0:0:-1:
 %5LG: 0X8P-16385:0:-1:
@@ -602,8 +602,8 @@
 %*5LG: +NAN():0:-1:
 %5LG: +NAN(09A_Zaz):0:-1:
 %*5LG: +NAN(09A_Zaz):0:-1:
-%5LG: +0X0P0:0:-1:
-%*5LG: +0X0P0:0:-1:
+%5LG: +0X.0P0:1:6:0x0:
+%*5LG: +0X.0P0:0:6:
 %5LG: +0X0P+0:0:-1:
 %*5LG: +0X0P+0:0:-1:
 %5LG: +0X8P-16385:0:-1:
@@ -634,8 +634,8 @@
 %*53LG: -0X8P-16385:0:12:
 %53LG: -0X0P+0:1:8:-0x0:
 %*53LG: -0X0P+0:0:8:
-%53LG: -0X0P0:1:7:-0x0:
-%*53LG: -0X0P0:0:7:
+%53LG: -0X.0P0:1:8:-0x0:
+%*53LG: -0X.0P0:0:8:
 %53LG: -NAN(09A_Zaz):1:14:-nan:
 %*53LG: -NAN(09A_Zaz):0:14:
 %53LG: -NAN():1:7:-nan:
@@ -644,8 +644,8 @@
 %*53LG: NAN():0:6:
 %53LG: NAN(09A_Zaz):1:13:nan:
 %*53LG: NAN(09A_Zaz):0:13:
-%53LG: 0X0P0:1:6:0x0:
-%*53LG: 0X0P0:0:6:
+%53LG: 0X.0P0:1:7:0x0:
+%*53LG: 0X.0P0:0:7:
 %53LG: 0X0P+0:1:7:0x0:
 %*53LG: 0X0P+0:0:7:
 %53LG: 0X8P-16385:1:11:0x1p-16382:
@@ -664,8 +664,8 @@
 %*53LG: +NAN():0:7:
 %53LG: +NAN(09A_Zaz):1:14:nan:
 %*53LG: +NAN(09A_Zaz):0:14:
-%53LG: +0X0P0:1:7:0x0:
-%*53LG: +0X0P0:0:7:
+%53LG: +0X.0P0:1:8:0x0:
+%*53LG: +0X.0P0:0:8:
 %53LG: +0X0P+0:1:8:0x0:
 %*53LG: +0X0P+0:0:8:
 %53LG: +0X8P-16385:1:12:0x1p-16382:
diff --git a/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-a.input b/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-a.input
index 6f3b84b..bb08ac7 100644
--- a/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-a.input
+++ b/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-a.input
@@ -14,8 +14,8 @@
 %*La:-0x8p-972:0:9:
 %La:-0x0p+0:1:7:-0x0:
 %*La:-0x0p+0:0:7:
-%La:-0x0p0:1:6:-0x0:
-%*La:-0x0p0:0:6:
+%La:-0x.0p0:1:7:-0x0:
+%*La:-0x.0p0:0:7:
 %La:-nan(09A_Zaz):1:13:-nan:
 %*La:-nan(09A_Zaz):0:13:
 %La:-nan():1:6:-nan:
@@ -24,8 +24,8 @@
 %*La:nan():0:5:
 %La:nan(09A_Zaz):1:12:nan:
 %*La:nan(09A_Zaz):0:12:
-%La:0x0p0:1:5:0x0:
-%*La:0x0p0:0:5:
+%La:0x.0p0:1:6:0x0:
+%*La:0x.0p0:0:6:
 %La:0x0p+0:1:6:0x0:
 %*La:0x0p+0:0:6:
 %La:0x8p-972:1:8:0x1p-969:
@@ -44,8 +44,8 @@
 %*La:+nan():0:6:
 %La:+nan(09A_Zaz):1:13:nan:
 %*La:+nan(09A_Zaz):0:13:
-%La:+0x0p0:1:6:0x0:
-%*La:+0x0p0:0:6:
+%La:+0x.0p0:1:7:0x0:
+%*La:+0x.0p0:0:7:
 %La:+0x0p+0:1:7:0x0:
 %*La:+0x0p+0:0:7:
 %La:+0x8p-972:1:9:0x1p-969:
@@ -76,8 +76,8 @@
 %*1La:-0x8p-972:0:-1:
 %1La:-0x0p+0:0:-1:
 %*1La:-0x0p+0:0:-1:
-%1La:-0x0p0:0:-1:
-%*1La:-0x0p0:0:-1:
+%1La:-0x.0p0:0:-1:
+%*1La:-0x.0p0:0:-1:
 %1La:-nan(09A_Zaz):0:-1:
 %*1La:-nan(09A_Zaz):0:-1:
 %1La:-nan():0:-1:
@@ -86,8 +86,8 @@
 %*1La:nan():0:-1:
 %1La:nan(09A_Zaz):0:-1:
 %*1La:nan(09A_Zaz):0:-1:
-%1La:0x0p0:1:1:0x0:
-%*1La:0x0p0:0:1:
+%1La:0x.0p0:1:1:0x0:
+%*1La:0x.0p0:0:1:
 %1La:0x0p+0:1:1:0x0:
 %*1La:0x0p+0:0:1:
 %1La:0x8p-972:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1La:+nan():0:-1:
 %1La:+nan(09A_Zaz):0:-1:
 %*1La:+nan(09A_Zaz):0:-1:
-%1La:+0x0p0:0:-1:
-%*1La:+0x0p0:0:-1:
+%1La:+0x.0p0:0:-1:
+%*1La:+0x.0p0:0:-1:
 %1La:+0x0p+0:0:-1:
 %*1La:+0x0p+0:0:-1:
 %1La:+0x8p-972:0:-1:
@@ -138,8 +138,8 @@
 %*2La:-0x8p-972:0:2:
 %2La:-0x0p+0:1:2:-0x0:
 %*2La:-0x0p+0:0:2:
-%2La:-0x0p0:1:2:-0x0:
-%*2La:-0x0p0:0:2:
+%2La:-0x.0p0:1:2:-0x0:
+%*2La:-0x.0p0:0:2:
 %2La:-nan(09A_Zaz):0:-1:
 %*2La:-nan(09A_Zaz):0:-1:
 %2La:-nan():0:-1:
@@ -148,8 +148,8 @@
 %*2La:nan():0:-1:
 %2La:nan(09A_Zaz):0:-1:
 %*2La:nan(09A_Zaz):0:-1:
-%2La:0x0p0:0:-1:
-%*2La:0x0p0:0:-1:
+%2La:0x.0p0:0:-1:
+%*2La:0x.0p0:0:-1:
 %2La:0x0p+0:0:-1:
 %*2La:0x0p+0:0:-1:
 %2La:0x8p-972:0:-1:
@@ -168,8 +168,8 @@
 %*2La:+nan():0:-1:
 %2La:+nan(09A_Zaz):0:-1:
 %*2La:+nan(09A_Zaz):0:-1:
-%2La:+0x0p0:1:2:0x0:
-%*2La:+0x0p0:0:2:
+%2La:+0x.0p0:1:2:0x0:
+%*2La:+0x.0p0:0:2:
 %2La:+0x0p+0:1:2:0x0:
 %*2La:+0x0p+0:0:2:
 %2La:+0x8p-972:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3La:-0x8p-972:0:-1:
 %3La:-0x0p+0:0:-1:
 %*3La:-0x0p+0:0:-1:
-%3La:-0x0p0:0:-1:
-%*3La:-0x0p0:0:-1:
+%3La:-0x.0p0:0:-1:
+%*3La:-0x.0p0:0:-1:
 %3La:-nan(09A_Zaz):0:-1:
 %*3La:-nan(09A_Zaz):0:-1:
 %3La:-nan():0:-1:
@@ -210,8 +210,8 @@
 %*3La:nan():0:3:
 %3La:nan(09A_Zaz):1:3:nan:
 %*3La:nan(09A_Zaz):0:3:
-%3La:0x0p0:1:3:0x0:
-%*3La:0x0p0:0:3:
+%3La:0x.0p0:0:-1:
+%*3La:0x.0p0:0:-1:
 %3La:0x0p+0:1:3:0x0:
 %*3La:0x0p+0:0:3:
 %3La:0x8p-972:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3La:+nan():0:-1:
 %3La:+nan(09A_Zaz):0:-1:
 %*3La:+nan(09A_Zaz):0:-1:
-%3La:+0x0p0:0:-1:
-%*3La:+0x0p0:0:-1:
+%3La:+0x.0p0:0:-1:
+%*3La:+0x.0p0:0:-1:
 %3La:+0x0p+0:0:-1:
 %*3La:+0x0p+0:0:-1:
 %3La:+0x8p-972:0:-1:
@@ -262,8 +262,8 @@
 %*4La:-0x8p-972:0:4:
 %4La:-0x0p+0:1:4:-0x0:
 %*4La:-0x0p+0:0:4:
-%4La:-0x0p0:1:4:-0x0:
-%*4La:-0x0p0:0:4:
+%4La:-0x.0p0:0:-1:
+%*4La:-0x.0p0:0:-1:
 %4La:-nan(09A_Zaz):1:4:-nan:
 %*4La:-nan(09A_Zaz):0:4:
 %4La:-nan():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4La:nan():0:-1:
 %4La:nan(09A_Zaz):0:-1:
 %*4La:nan(09A_Zaz):0:-1:
-%4La:0x0p0:0:-1:
-%*4La:0x0p0:0:-1:
+%4La:0x.0p0:1:4:0x0:
+%*4La:0x.0p0:0:4:
 %4La:0x0p+0:0:-1:
 %*4La:0x0p+0:0:-1:
 %4La:0x8p-972:0:-1:
@@ -292,8 +292,8 @@
 %*4La:+nan():0:4:
 %4La:+nan(09A_Zaz):1:4:nan:
 %*4La:+nan(09A_Zaz):0:4:
-%4La:+0x0p0:1:4:0x0:
-%*4La:+0x0p0:0:4:
+%4La:+0x.0p0:0:-1:
+%*4La:+0x.0p0:0:-1:
 %4La:+0x0p+0:1:4:0x0:
 %*4La:+0x0p+0:0:4:
 %4La:+0x8p-972:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5La:-0x8p-972:0:-1:
 %5La:-0x0p+0:0:-1:
 %*5La:-0x0p+0:0:-1:
-%5La:-0x0p0:0:-1:
-%*5La:-0x0p0:0:-1:
+%5La:-0x.0p0:1:5:-0x0:
+%*5La:-0x.0p0:0:5:
 %5La:-nan(09A_Zaz):0:-1:
 %*5La:-nan(09A_Zaz):0:-1:
 %5La:-nan():0:-1:
@@ -334,8 +334,8 @@
 %*5La:nan():0:5:
 %5La:nan(09A_Zaz):0:-1:
 %*5La:nan(09A_Zaz):0:-1:
-%5La:0x0p0:1:5:0x0:
-%*5La:0x0p0:0:5:
+%5La:0x.0p0:0:-1:
+%*5La:0x.0p0:0:-1:
 %5La:0x0p+0:0:-1:
 %*5La:0x0p+0:0:-1:
 %5La:0x8p-972:0:-1:
@@ -354,8 +354,8 @@
 %*5La:+nan():0:-1:
 %5La:+nan(09A_Zaz):0:-1:
 %*5La:+nan(09A_Zaz):0:-1:
-%5La:+0x0p0:0:-1:
-%*5La:+0x0p0:0:-1:
+%5La:+0x.0p0:1:5:0x0:
+%*5La:+0x.0p0:0:5:
 %5La:+0x0p+0:0:-1:
 %*5La:+0x0p+0:0:-1:
 %5La:+0x8p-972:0:-1:
@@ -386,8 +386,8 @@
 %*6La:-0x8p-972:0:-1:
 %6La:-0x0p+0:0:-1:
 %*6La:-0x0p+0:0:-1:
-%6La:-0x0p0:1:6:-0x0:
-%*6La:-0x0p0:0:6:
+%6La:-0x.0p0:0:-1:
+%*6La:-0x.0p0:0:-1:
 %6La:-nan(09A_Zaz):0:-1:
 %*6La:-nan(09A_Zaz):0:-1:
 %6La:-nan():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6La:nan():0:5:
 %6La:nan(09A_Zaz):0:-1:
 %*6La:nan(09A_Zaz):0:-1:
-%6La:0x0p0:1:5:0x0:
-%*6La:0x0p0:0:5:
+%6La:0x.0p0:1:6:0x0:
+%*6La:0x.0p0:0:6:
 %6La:0x0p+0:1:6:0x0:
 %*6La:0x0p+0:0:6:
 %6La:0x8p-972:1:6:0x1p-6:
@@ -416,8 +416,8 @@
 %*6La:+nan():0:6:
 %6La:+nan(09A_Zaz):0:-1:
 %*6La:+nan(09A_Zaz):0:-1:
-%6La:+0x0p0:1:6:0x0:
-%*6La:+0x0p0:0:6:
+%6La:+0x.0p0:0:-1:
+%*6La:+0x.0p0:0:-1:
 %6La:+0x0p+0:0:-1:
 %*6La:+0x0p+0:0:-1:
 %6La:+0x8p-972:0:-1:
@@ -448,8 +448,8 @@
 %*33La:-0x8p-972:0:9:
 %33La:-0x0p+0:1:7:-0x0:
 %*33La:-0x0p+0:0:7:
-%33La:-0x0p0:1:6:-0x0:
-%*33La:-0x0p0:0:6:
+%33La:-0x.0p0:1:7:-0x0:
+%*33La:-0x.0p0:0:7:
 %33La:-nan(09A_Zaz):1:13:-nan:
 %*33La:-nan(09A_Zaz):0:13:
 %33La:-nan():1:6:-nan:
@@ -458,8 +458,8 @@
 %*33La:nan():0:5:
 %33La:nan(09A_Zaz):1:12:nan:
 %*33La:nan(09A_Zaz):0:12:
-%33La:0x0p0:1:5:0x0:
-%*33La:0x0p0:0:5:
+%33La:0x.0p0:1:6:0x0:
+%*33La:0x.0p0:0:6:
 %33La:0x0p+0:1:6:0x0:
 %*33La:0x0p+0:0:6:
 %33La:0x8p-972:1:8:0x1p-969:
@@ -478,8 +478,8 @@
 %*33La:+nan():0:6:
 %33La:+nan(09A_Zaz):1:13:nan:
 %*33La:+nan(09A_Zaz):0:13:
-%33La:+0x0p0:1:6:0x0:
-%*33La:+0x0p0:0:6:
+%33La:+0x.0p0:1:7:0x0:
+%*33La:+0x.0p0:0:7:
 %33La:+0x0p+0:1:7:0x0:
 %*33La:+0x0p+0:0:7:
 %33La:+0x8p-972:1:9:0x1p-969:
@@ -510,8 +510,8 @@
 %*50La:-0x8p-972:0:9:
 %50La:-0x0p+0:1:7:-0x0:
 %*50La:-0x0p+0:0:7:
-%50La:-0x0p0:1:6:-0x0:
-%*50La:-0x0p0:0:6:
+%50La:-0x.0p0:1:7:-0x0:
+%*50La:-0x.0p0:0:7:
 %50La:-nan(09A_Zaz):1:13:-nan:
 %*50La:-nan(09A_Zaz):0:13:
 %50La:-nan():1:6:-nan:
@@ -520,8 +520,8 @@
 %*50La:nan():0:5:
 %50La:nan(09A_Zaz):1:12:nan:
 %*50La:nan(09A_Zaz):0:12:
-%50La:0x0p0:1:5:0x0:
-%*50La:0x0p0:0:5:
+%50La:0x.0p0:1:6:0x0:
+%*50La:0x.0p0:0:6:
 %50La:0x0p+0:1:6:0x0:
 %*50La:0x0p+0:0:6:
 %50La:0x8p-972:1:8:0x1p-969:
@@ -540,8 +540,8 @@
 %*50La:+nan():0:6:
 %50La:+nan(09A_Zaz):1:13:nan:
 %*50La:+nan(09A_Zaz):0:13:
-%50La:+0x0p0:1:6:0x0:
-%*50La:+0x0p0:0:6:
+%50La:+0x.0p0:1:7:0x0:
+%*50La:+0x.0p0:0:7:
 %50La:+0x0p+0:1:7:0x0:
 %*50La:+0x0p+0:0:7:
 %50La:+0x8p-972:1:9:0x1p-969:
@@ -572,8 +572,8 @@
 %*5La: -0x8p-972:0:-1:
 %5La: -0x0p+0:0:-1:
 %*5La: -0x0p+0:0:-1:
-%5La: -0x0p0:0:-1:
-%*5La: -0x0p0:0:-1:
+%5La: -0x.0p0:1:6:-0x0:
+%*5La: -0x.0p0:0:6:
 %5La: -nan(09A_Zaz):0:-1:
 %*5La: -nan(09A_Zaz):0:-1:
 %5La: -nan():0:-1:
@@ -582,8 +582,8 @@
 %*5La: nan():0:6:
 %5La: nan(09A_Zaz):0:-1:
 %*5La: nan(09A_Zaz):0:-1:
-%5La: 0x0p0:1:6:0x0:
-%*5La: 0x0p0:0:6:
+%5La: 0x.0p0:0:-1:
+%*5La: 0x.0p0:0:-1:
 %5La: 0x0p+0:0:-1:
 %*5La: 0x0p+0:0:-1:
 %5La: 0x8p-972:0:-1:
@@ -602,8 +602,8 @@
 %*5La: +nan():0:-1:
 %5La: +nan(09A_Zaz):0:-1:
 %*5La: +nan(09A_Zaz):0:-1:
-%5La: +0x0p0:0:-1:
-%*5La: +0x0p0:0:-1:
+%5La: +0x.0p0:1:6:0x0:
+%*5La: +0x.0p0:0:6:
 %5La: +0x0p+0:0:-1:
 %*5La: +0x0p+0:0:-1:
 %5La: +0x8p-972:0:-1:
@@ -634,8 +634,8 @@
 %*50La: -0x8p-972:0:10:
 %50La: -0x0p+0:1:8:-0x0:
 %*50La: -0x0p+0:0:8:
-%50La: -0x0p0:1:7:-0x0:
-%*50La: -0x0p0:0:7:
+%50La: -0x.0p0:1:8:-0x0:
+%*50La: -0x.0p0:0:8:
 %50La: -nan(09A_Zaz):1:14:-nan:
 %*50La: -nan(09A_Zaz):0:14:
 %50La: -nan():1:7:-nan:
@@ -644,8 +644,8 @@
 %*50La: nan():0:6:
 %50La: nan(09A_Zaz):1:13:nan:
 %*50La: nan(09A_Zaz):0:13:
-%50La: 0x0p0:1:6:0x0:
-%*50La: 0x0p0:0:6:
+%50La: 0x.0p0:1:7:0x0:
+%*50La: 0x.0p0:0:7:
 %50La: 0x0p+0:1:7:0x0:
 %*50La: 0x0p+0:0:7:
 %50La: 0x8p-972:1:9:0x1p-969:
@@ -664,8 +664,8 @@
 %*50La: +nan():0:7:
 %50La: +nan(09A_Zaz):1:14:nan:
 %*50La: +nan(09A_Zaz):0:14:
-%50La: +0x0p0:1:7:0x0:
-%*50La: +0x0p0:0:7:
+%50La: +0x.0p0:1:8:0x0:
+%*50La: +0x.0p0:0:8:
 %50La: +0x0p+0:1:8:0x0:
 %*50La: +0x0p+0:0:8:
 %50La: +0x8p-972:1:10:0x1p-969:
diff --git a/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-aa.input b/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-aa.input
index 5889e62..da539f1 100644
--- a/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-aa.input
+++ b/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-aa.input
@@ -14,8 +14,8 @@
 %*LA:-0X8P-972:0:9:
 %LA:-0X0P+0:1:7:-0x0:
 %*LA:-0X0P+0:0:7:
-%LA:-0X0P0:1:6:-0x0:
-%*LA:-0X0P0:0:6:
+%LA:-0X.0P0:1:7:-0x0:
+%*LA:-0X.0P0:0:7:
 %LA:-NAN(09A_Zaz):1:13:-nan:
 %*LA:-NAN(09A_Zaz):0:13:
 %LA:-NAN():1:6:-nan:
@@ -24,8 +24,8 @@
 %*LA:NAN():0:5:
 %LA:NAN(09A_Zaz):1:12:nan:
 %*LA:NAN(09A_Zaz):0:12:
-%LA:0X0P0:1:5:0x0:
-%*LA:0X0P0:0:5:
+%LA:0X.0P0:1:6:0x0:
+%*LA:0X.0P0:0:6:
 %LA:0X0P+0:1:6:0x0:
 %*LA:0X0P+0:0:6:
 %LA:0X8P-972:1:8:0x1p-969:
@@ -44,8 +44,8 @@
 %*LA:+NAN():0:6:
 %LA:+NAN(09A_Zaz):1:13:nan:
 %*LA:+NAN(09A_Zaz):0:13:
-%LA:+0X0P0:1:6:0x0:
-%*LA:+0X0P0:0:6:
+%LA:+0X.0P0:1:7:0x0:
+%*LA:+0X.0P0:0:7:
 %LA:+0X0P+0:1:7:0x0:
 %*LA:+0X0P+0:0:7:
 %LA:+0X8P-972:1:9:0x1p-969:
@@ -76,8 +76,8 @@
 %*1LA:-0X8P-972:0:-1:
 %1LA:-0X0P+0:0:-1:
 %*1LA:-0X0P+0:0:-1:
-%1LA:-0X0P0:0:-1:
-%*1LA:-0X0P0:0:-1:
+%1LA:-0X.0P0:0:-1:
+%*1LA:-0X.0P0:0:-1:
 %1LA:-NAN(09A_Zaz):0:-1:
 %*1LA:-NAN(09A_Zaz):0:-1:
 %1LA:-NAN():0:-1:
@@ -86,8 +86,8 @@
 %*1LA:NAN():0:-1:
 %1LA:NAN(09A_Zaz):0:-1:
 %*1LA:NAN(09A_Zaz):0:-1:
-%1LA:0X0P0:1:1:0x0:
-%*1LA:0X0P0:0:1:
+%1LA:0X.0P0:1:1:0x0:
+%*1LA:0X.0P0:0:1:
 %1LA:0X0P+0:1:1:0x0:
 %*1LA:0X0P+0:0:1:
 %1LA:0X8P-972:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1LA:+NAN():0:-1:
 %1LA:+NAN(09A_Zaz):0:-1:
 %*1LA:+NAN(09A_Zaz):0:-1:
-%1LA:+0X0P0:0:-1:
-%*1LA:+0X0P0:0:-1:
+%1LA:+0X.0P0:0:-1:
+%*1LA:+0X.0P0:0:-1:
 %1LA:+0X0P+0:0:-1:
 %*1LA:+0X0P+0:0:-1:
 %1LA:+0X8P-972:0:-1:
@@ -138,8 +138,8 @@
 %*2LA:-0X8P-972:0:2:
 %2LA:-0X0P+0:1:2:-0x0:
 %*2LA:-0X0P+0:0:2:
-%2LA:-0X0P0:1:2:-0x0:
-%*2LA:-0X0P0:0:2:
+%2LA:-0X.0P0:1:2:-0x0:
+%*2LA:-0X.0P0:0:2:
 %2LA:-NAN(09A_Zaz):0:-1:
 %*2LA:-NAN(09A_Zaz):0:-1:
 %2LA:-NAN():0:-1:
@@ -148,8 +148,8 @@
 %*2LA:NAN():0:-1:
 %2LA:NAN(09A_Zaz):0:-1:
 %*2LA:NAN(09A_Zaz):0:-1:
-%2LA:0X0P0:0:-1:
-%*2LA:0X0P0:0:-1:
+%2LA:0X.0P0:0:-1:
+%*2LA:0X.0P0:0:-1:
 %2LA:0X0P+0:0:-1:
 %*2LA:0X0P+0:0:-1:
 %2LA:0X8P-972:0:-1:
@@ -168,8 +168,8 @@
 %*2LA:+NAN():0:-1:
 %2LA:+NAN(09A_Zaz):0:-1:
 %*2LA:+NAN(09A_Zaz):0:-1:
-%2LA:+0X0P0:1:2:0x0:
-%*2LA:+0X0P0:0:2:
+%2LA:+0X.0P0:1:2:0x0:
+%*2LA:+0X.0P0:0:2:
 %2LA:+0X0P+0:1:2:0x0:
 %*2LA:+0X0P+0:0:2:
 %2LA:+0X8P-972:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3LA:-0X8P-972:0:-1:
 %3LA:-0X0P+0:0:-1:
 %*3LA:-0X0P+0:0:-1:
-%3LA:-0X0P0:0:-1:
-%*3LA:-0X0P0:0:-1:
+%3LA:-0X.0P0:0:-1:
+%*3LA:-0X.0P0:0:-1:
 %3LA:-NAN(09A_Zaz):0:-1:
 %*3LA:-NAN(09A_Zaz):0:-1:
 %3LA:-NAN():0:-1:
@@ -210,8 +210,8 @@
 %*3LA:NAN():0:3:
 %3LA:NAN(09A_Zaz):1:3:nan:
 %*3LA:NAN(09A_Zaz):0:3:
-%3LA:0X0P0:1:3:0x0:
-%*3LA:0X0P0:0:3:
+%3LA:0X.0P0:0:-1:
+%*3LA:0X.0P0:0:-1:
 %3LA:0X0P+0:1:3:0x0:
 %*3LA:0X0P+0:0:3:
 %3LA:0X8P-972:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3LA:+NAN():0:-1:
 %3LA:+NAN(09A_Zaz):0:-1:
 %*3LA:+NAN(09A_Zaz):0:-1:
-%3LA:+0X0P0:0:-1:
-%*3LA:+0X0P0:0:-1:
+%3LA:+0X.0P0:0:-1:
+%*3LA:+0X.0P0:0:-1:
 %3LA:+0X0P+0:0:-1:
 %*3LA:+0X0P+0:0:-1:
 %3LA:+0X8P-972:0:-1:
@@ -262,8 +262,8 @@
 %*4LA:-0X8P-972:0:4:
 %4LA:-0X0P+0:1:4:-0x0:
 %*4LA:-0X0P+0:0:4:
-%4LA:-0X0P0:1:4:-0x0:
-%*4LA:-0X0P0:0:4:
+%4LA:-0X.0P0:0:-1:
+%*4LA:-0X.0P0:0:-1:
 %4LA:-NAN(09A_Zaz):1:4:-nan:
 %*4LA:-NAN(09A_Zaz):0:4:
 %4LA:-NAN():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4LA:NAN():0:-1:
 %4LA:NAN(09A_Zaz):0:-1:
 %*4LA:NAN(09A_Zaz):0:-1:
-%4LA:0X0P0:0:-1:
-%*4LA:0X0P0:0:-1:
+%4LA:0X.0P0:1:4:0x0:
+%*4LA:0X.0P0:0:4:
 %4LA:0X0P+0:0:-1:
 %*4LA:0X0P+0:0:-1:
 %4LA:0X8P-972:0:-1:
@@ -292,8 +292,8 @@
 %*4LA:+NAN():0:4:
 %4LA:+NAN(09A_Zaz):1:4:nan:
 %*4LA:+NAN(09A_Zaz):0:4:
-%4LA:+0X0P0:1:4:0x0:
-%*4LA:+0X0P0:0:4:
+%4LA:+0X.0P0:0:-1:
+%*4LA:+0X.0P0:0:-1:
 %4LA:+0X0P+0:1:4:0x0:
 %*4LA:+0X0P+0:0:4:
 %4LA:+0X8P-972:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5LA:-0X8P-972:0:-1:
 %5LA:-0X0P+0:0:-1:
 %*5LA:-0X0P+0:0:-1:
-%5LA:-0X0P0:0:-1:
-%*5LA:-0X0P0:0:-1:
+%5LA:-0X.0P0:1:5:-0x0:
+%*5LA:-0X.0P0:0:5:
 %5LA:-NAN(09A_Zaz):0:-1:
 %*5LA:-NAN(09A_Zaz):0:-1:
 %5LA:-NAN():0:-1:
@@ -334,8 +334,8 @@
 %*5LA:NAN():0:5:
 %5LA:NAN(09A_Zaz):0:-1:
 %*5LA:NAN(09A_Zaz):0:-1:
-%5LA:0X0P0:1:5:0x0:
-%*5LA:0X0P0:0:5:
+%5LA:0X.0P0:0:-1:
+%*5LA:0X.0P0:0:-1:
 %5LA:0X0P+0:0:-1:
 %*5LA:0X0P+0:0:-1:
 %5LA:0X8P-972:0:-1:
@@ -354,8 +354,8 @@
 %*5LA:+NAN():0:-1:
 %5LA:+NAN(09A_Zaz):0:-1:
 %*5LA:+NAN(09A_Zaz):0:-1:
-%5LA:+0X0P0:0:-1:
-%*5LA:+0X0P0:0:-1:
+%5LA:+0X.0P0:1:5:0x0:
+%*5LA:+0X.0P0:0:5:
 %5LA:+0X0P+0:0:-1:
 %*5LA:+0X0P+0:0:-1:
 %5LA:+0X8P-972:0:-1:
@@ -386,8 +386,8 @@
 %*6LA:-0X8P-972:0:-1:
 %6LA:-0X0P+0:0:-1:
 %*6LA:-0X0P+0:0:-1:
-%6LA:-0X0P0:1:6:-0x0:
-%*6LA:-0X0P0:0:6:
+%6LA:-0X.0P0:0:-1:
+%*6LA:-0X.0P0:0:-1:
 %6LA:-NAN(09A_Zaz):0:-1:
 %*6LA:-NAN(09A_Zaz):0:-1:
 %6LA:-NAN():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6LA:NAN():0:5:
 %6LA:NAN(09A_Zaz):0:-1:
 %*6LA:NAN(09A_Zaz):0:-1:
-%6LA:0X0P0:1:5:0x0:
-%*6LA:0X0P0:0:5:
+%6LA:0X.0P0:1:6:0x0:
+%*6LA:0X.0P0:0:6:
 %6LA:0X0P+0:1:6:0x0:
 %*6LA:0X0P+0:0:6:
 %6LA:0X8P-972:1:6:0x1p-6:
@@ -416,8 +416,8 @@
 %*6LA:+NAN():0:6:
 %6LA:+NAN(09A_Zaz):0:-1:
 %*6LA:+NAN(09A_Zaz):0:-1:
-%6LA:+0X0P0:1:6:0x0:
-%*6LA:+0X0P0:0:6:
+%6LA:+0X.0P0:0:-1:
+%*6LA:+0X.0P0:0:-1:
 %6LA:+0X0P+0:0:-1:
 %*6LA:+0X0P+0:0:-1:
 %6LA:+0X8P-972:0:-1:
@@ -448,8 +448,8 @@
 %*33LA:-0X8P-972:0:9:
 %33LA:-0X0P+0:1:7:-0x0:
 %*33LA:-0X0P+0:0:7:
-%33LA:-0X0P0:1:6:-0x0:
-%*33LA:-0X0P0:0:6:
+%33LA:-0X.0P0:1:7:-0x0:
+%*33LA:-0X.0P0:0:7:
 %33LA:-NAN(09A_Zaz):1:13:-nan:
 %*33LA:-NAN(09A_Zaz):0:13:
 %33LA:-NAN():1:6:-nan:
@@ -458,8 +458,8 @@
 %*33LA:NAN():0:5:
 %33LA:NAN(09A_Zaz):1:12:nan:
 %*33LA:NAN(09A_Zaz):0:12:
-%33LA:0X0P0:1:5:0x0:
-%*33LA:0X0P0:0:5:
+%33LA:0X.0P0:1:6:0x0:
+%*33LA:0X.0P0:0:6:
 %33LA:0X0P+0:1:6:0x0:
 %*33LA:0X0P+0:0:6:
 %33LA:0X8P-972:1:8:0x1p-969:
@@ -478,8 +478,8 @@
 %*33LA:+NAN():0:6:
 %33LA:+NAN(09A_Zaz):1:13:nan:
 %*33LA:+NAN(09A_Zaz):0:13:
-%33LA:+0X0P0:1:6:0x0:
-%*33LA:+0X0P0:0:6:
+%33LA:+0X.0P0:1:7:0x0:
+%*33LA:+0X.0P0:0:7:
 %33LA:+0X0P+0:1:7:0x0:
 %*33LA:+0X0P+0:0:7:
 %33LA:+0X8P-972:1:9:0x1p-969:
@@ -510,8 +510,8 @@
 %*50LA:-0X8P-972:0:9:
 %50LA:-0X0P+0:1:7:-0x0:
 %*50LA:-0X0P+0:0:7:
-%50LA:-0X0P0:1:6:-0x0:
-%*50LA:-0X0P0:0:6:
+%50LA:-0X.0P0:1:7:-0x0:
+%*50LA:-0X.0P0:0:7:
 %50LA:-NAN(09A_Zaz):1:13:-nan:
 %*50LA:-NAN(09A_Zaz):0:13:
 %50LA:-NAN():1:6:-nan:
@@ -520,8 +520,8 @@
 %*50LA:NAN():0:5:
 %50LA:NAN(09A_Zaz):1:12:nan:
 %*50LA:NAN(09A_Zaz):0:12:
-%50LA:0X0P0:1:5:0x0:
-%*50LA:0X0P0:0:5:
+%50LA:0X.0P0:1:6:0x0:
+%*50LA:0X.0P0:0:6:
 %50LA:0X0P+0:1:6:0x0:
 %*50LA:0X0P+0:0:6:
 %50LA:0X8P-972:1:8:0x1p-969:
@@ -540,8 +540,8 @@
 %*50LA:+NAN():0:6:
 %50LA:+NAN(09A_Zaz):1:13:nan:
 %*50LA:+NAN(09A_Zaz):0:13:
-%50LA:+0X0P0:1:6:0x0:
-%*50LA:+0X0P0:0:6:
+%50LA:+0X.0P0:1:7:0x0:
+%*50LA:+0X.0P0:0:7:
 %50LA:+0X0P+0:1:7:0x0:
 %*50LA:+0X0P+0:0:7:
 %50LA:+0X8P-972:1:9:0x1p-969:
@@ -572,8 +572,8 @@
 %*5LA: -0X8P-972:0:-1:
 %5LA: -0X0P+0:0:-1:
 %*5LA: -0X0P+0:0:-1:
-%5LA: -0X0P0:0:-1:
-%*5LA: -0X0P0:0:-1:
+%5LA: -0X.0P0:1:6:-0x0:
+%*5LA: -0X.0P0:0:6:
 %5LA: -NAN(09A_Zaz):0:-1:
 %*5LA: -NAN(09A_Zaz):0:-1:
 %5LA: -NAN():0:-1:
@@ -582,8 +582,8 @@
 %*5LA: NAN():0:6:
 %5LA: NAN(09A_Zaz):0:-1:
 %*5LA: NAN(09A_Zaz):0:-1:
-%5LA: 0X0P0:1:6:0x0:
-%*5LA: 0X0P0:0:6:
+%5LA: 0X.0P0:0:-1:
+%*5LA: 0X.0P0:0:-1:
 %5LA: 0X0P+0:0:-1:
 %*5LA: 0X0P+0:0:-1:
 %5LA: 0X8P-972:0:-1:
@@ -602,8 +602,8 @@
 %*5LA: +NAN():0:-1:
 %5LA: +NAN(09A_Zaz):0:-1:
 %*5LA: +NAN(09A_Zaz):0:-1:
-%5LA: +0X0P0:0:-1:
-%*5LA: +0X0P0:0:-1:
+%5LA: +0X.0P0:1:6:0x0:
+%*5LA: +0X.0P0:0:6:
 %5LA: +0X0P+0:0:-1:
 %*5LA: +0X0P+0:0:-1:
 %5LA: +0X8P-972:0:-1:
@@ -634,8 +634,8 @@
 %*50LA: -0X8P-972:0:10:
 %50LA: -0X0P+0:1:8:-0x0:
 %*50LA: -0X0P+0:0:8:
-%50LA: -0X0P0:1:7:-0x0:
-%*50LA: -0X0P0:0:7:
+%50LA: -0X.0P0:1:8:-0x0:
+%*50LA: -0X.0P0:0:8:
 %50LA: -NAN(09A_Zaz):1:14:-nan:
 %*50LA: -NAN(09A_Zaz):0:14:
 %50LA: -NAN():1:7:-nan:
@@ -644,8 +644,8 @@
 %*50LA: NAN():0:6:
 %50LA: NAN(09A_Zaz):1:13:nan:
 %*50LA: NAN(09A_Zaz):0:13:
-%50LA: 0X0P0:1:6:0x0:
-%*50LA: 0X0P0:0:6:
+%50LA: 0X.0P0:1:7:0x0:
+%*50LA: 0X.0P0:0:7:
 %50LA: 0X0P+0:1:7:0x0:
 %*50LA: 0X0P+0:0:7:
 %50LA: 0X8P-972:1:9:0x1p-969:
@@ -664,8 +664,8 @@
 %*50LA: +NAN():0:7:
 %50LA: +NAN(09A_Zaz):1:14:nan:
 %*50LA: +NAN(09A_Zaz):0:14:
-%50LA: +0X0P0:1:7:0x0:
-%*50LA: +0X0P0:0:7:
+%50LA: +0X.0P0:1:8:0x0:
+%*50LA: +0X.0P0:0:8:
 %50LA: +0X0P+0:1:8:0x0:
 %*50LA: +0X0P+0:0:8:
 %50LA: +0X8P-972:1:10:0x1p-969:
diff --git a/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-g.input b/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-g.input
index 3254240..6edb02c 100644
--- a/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-g.input
+++ b/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-g.input
@@ -14,8 +14,8 @@
 %*Lg:-0x8p-972:0:9:
 %Lg:-0x0p+0:1:7:-0x0:
 %*Lg:-0x0p+0:0:7:
-%Lg:-0x0p0:1:6:-0x0:
-%*Lg:-0x0p0:0:6:
+%Lg:-0x.0p0:1:7:-0x0:
+%*Lg:-0x.0p0:0:7:
 %Lg:-nan(09A_Zaz):1:13:-nan:
 %*Lg:-nan(09A_Zaz):0:13:
 %Lg:-nan():1:6:-nan:
@@ -24,8 +24,8 @@
 %*Lg:nan():0:5:
 %Lg:nan(09A_Zaz):1:12:nan:
 %*Lg:nan(09A_Zaz):0:12:
-%Lg:0x0p0:1:5:0x0:
-%*Lg:0x0p0:0:5:
+%Lg:0x.0p0:1:6:0x0:
+%*Lg:0x.0p0:0:6:
 %Lg:0x0p+0:1:6:0x0:
 %*Lg:0x0p+0:0:6:
 %Lg:0x8p-972:1:8:0x1p-969:
@@ -44,8 +44,8 @@
 %*Lg:+nan():0:6:
 %Lg:+nan(09A_Zaz):1:13:nan:
 %*Lg:+nan(09A_Zaz):0:13:
-%Lg:+0x0p0:1:6:0x0:
-%*Lg:+0x0p0:0:6:
+%Lg:+0x.0p0:1:7:0x0:
+%*Lg:+0x.0p0:0:7:
 %Lg:+0x0p+0:1:7:0x0:
 %*Lg:+0x0p+0:0:7:
 %Lg:+0x8p-972:1:9:0x1p-969:
@@ -76,8 +76,8 @@
 %*1Lg:-0x8p-972:0:-1:
 %1Lg:-0x0p+0:0:-1:
 %*1Lg:-0x0p+0:0:-1:
-%1Lg:-0x0p0:0:-1:
-%*1Lg:-0x0p0:0:-1:
+%1Lg:-0x.0p0:0:-1:
+%*1Lg:-0x.0p0:0:-1:
 %1Lg:-nan(09A_Zaz):0:-1:
 %*1Lg:-nan(09A_Zaz):0:-1:
 %1Lg:-nan():0:-1:
@@ -86,8 +86,8 @@
 %*1Lg:nan():0:-1:
 %1Lg:nan(09A_Zaz):0:-1:
 %*1Lg:nan(09A_Zaz):0:-1:
-%1Lg:0x0p0:1:1:0x0:
-%*1Lg:0x0p0:0:1:
+%1Lg:0x.0p0:1:1:0x0:
+%*1Lg:0x.0p0:0:1:
 %1Lg:0x0p+0:1:1:0x0:
 %*1Lg:0x0p+0:0:1:
 %1Lg:0x8p-972:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1Lg:+nan():0:-1:
 %1Lg:+nan(09A_Zaz):0:-1:
 %*1Lg:+nan(09A_Zaz):0:-1:
-%1Lg:+0x0p0:0:-1:
-%*1Lg:+0x0p0:0:-1:
+%1Lg:+0x.0p0:0:-1:
+%*1Lg:+0x.0p0:0:-1:
 %1Lg:+0x0p+0:0:-1:
 %*1Lg:+0x0p+0:0:-1:
 %1Lg:+0x8p-972:0:-1:
@@ -138,8 +138,8 @@
 %*2Lg:-0x8p-972:0:2:
 %2Lg:-0x0p+0:1:2:-0x0:
 %*2Lg:-0x0p+0:0:2:
-%2Lg:-0x0p0:1:2:-0x0:
-%*2Lg:-0x0p0:0:2:
+%2Lg:-0x.0p0:1:2:-0x0:
+%*2Lg:-0x.0p0:0:2:
 %2Lg:-nan(09A_Zaz):0:-1:
 %*2Lg:-nan(09A_Zaz):0:-1:
 %2Lg:-nan():0:-1:
@@ -148,8 +148,8 @@
 %*2Lg:nan():0:-1:
 %2Lg:nan(09A_Zaz):0:-1:
 %*2Lg:nan(09A_Zaz):0:-1:
-%2Lg:0x0p0:0:-1:
-%*2Lg:0x0p0:0:-1:
+%2Lg:0x.0p0:0:-1:
+%*2Lg:0x.0p0:0:-1:
 %2Lg:0x0p+0:0:-1:
 %*2Lg:0x0p+0:0:-1:
 %2Lg:0x8p-972:0:-1:
@@ -168,8 +168,8 @@
 %*2Lg:+nan():0:-1:
 %2Lg:+nan(09A_Zaz):0:-1:
 %*2Lg:+nan(09A_Zaz):0:-1:
-%2Lg:+0x0p0:1:2:0x0:
-%*2Lg:+0x0p0:0:2:
+%2Lg:+0x.0p0:1:2:0x0:
+%*2Lg:+0x.0p0:0:2:
 %2Lg:+0x0p+0:1:2:0x0:
 %*2Lg:+0x0p+0:0:2:
 %2Lg:+0x8p-972:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3Lg:-0x8p-972:0:-1:
 %3Lg:-0x0p+0:0:-1:
 %*3Lg:-0x0p+0:0:-1:
-%3Lg:-0x0p0:0:-1:
-%*3Lg:-0x0p0:0:-1:
+%3Lg:-0x.0p0:0:-1:
+%*3Lg:-0x.0p0:0:-1:
 %3Lg:-nan(09A_Zaz):0:-1:
 %*3Lg:-nan(09A_Zaz):0:-1:
 %3Lg:-nan():0:-1:
@@ -210,8 +210,8 @@
 %*3Lg:nan():0:3:
 %3Lg:nan(09A_Zaz):1:3:nan:
 %*3Lg:nan(09A_Zaz):0:3:
-%3Lg:0x0p0:1:3:0x0:
-%*3Lg:0x0p0:0:3:
+%3Lg:0x.0p0:0:-1:
+%*3Lg:0x.0p0:0:-1:
 %3Lg:0x0p+0:1:3:0x0:
 %*3Lg:0x0p+0:0:3:
 %3Lg:0x8p-972:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3Lg:+nan():0:-1:
 %3Lg:+nan(09A_Zaz):0:-1:
 %*3Lg:+nan(09A_Zaz):0:-1:
-%3Lg:+0x0p0:0:-1:
-%*3Lg:+0x0p0:0:-1:
+%3Lg:+0x.0p0:0:-1:
+%*3Lg:+0x.0p0:0:-1:
 %3Lg:+0x0p+0:0:-1:
 %*3Lg:+0x0p+0:0:-1:
 %3Lg:+0x8p-972:0:-1:
@@ -262,8 +262,8 @@
 %*4Lg:-0x8p-972:0:4:
 %4Lg:-0x0p+0:1:4:-0x0:
 %*4Lg:-0x0p+0:0:4:
-%4Lg:-0x0p0:1:4:-0x0:
-%*4Lg:-0x0p0:0:4:
+%4Lg:-0x.0p0:0:-1:
+%*4Lg:-0x.0p0:0:-1:
 %4Lg:-nan(09A_Zaz):1:4:-nan:
 %*4Lg:-nan(09A_Zaz):0:4:
 %4Lg:-nan():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4Lg:nan():0:-1:
 %4Lg:nan(09A_Zaz):0:-1:
 %*4Lg:nan(09A_Zaz):0:-1:
-%4Lg:0x0p0:0:-1:
-%*4Lg:0x0p0:0:-1:
+%4Lg:0x.0p0:1:4:0x0:
+%*4Lg:0x.0p0:0:4:
 %4Lg:0x0p+0:0:-1:
 %*4Lg:0x0p+0:0:-1:
 %4Lg:0x8p-972:0:-1:
@@ -292,8 +292,8 @@
 %*4Lg:+nan():0:4:
 %4Lg:+nan(09A_Zaz):1:4:nan:
 %*4Lg:+nan(09A_Zaz):0:4:
-%4Lg:+0x0p0:1:4:0x0:
-%*4Lg:+0x0p0:0:4:
+%4Lg:+0x.0p0:0:-1:
+%*4Lg:+0x.0p0:0:-1:
 %4Lg:+0x0p+0:1:4:0x0:
 %*4Lg:+0x0p+0:0:4:
 %4Lg:+0x8p-972:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5Lg:-0x8p-972:0:-1:
 %5Lg:-0x0p+0:0:-1:
 %*5Lg:-0x0p+0:0:-1:
-%5Lg:-0x0p0:0:-1:
-%*5Lg:-0x0p0:0:-1:
+%5Lg:-0x.0p0:1:5:-0x0:
+%*5Lg:-0x.0p0:0:5:
 %5Lg:-nan(09A_Zaz):0:-1:
 %*5Lg:-nan(09A_Zaz):0:-1:
 %5Lg:-nan():0:-1:
@@ -334,8 +334,8 @@
 %*5Lg:nan():0:5:
 %5Lg:nan(09A_Zaz):0:-1:
 %*5Lg:nan(09A_Zaz):0:-1:
-%5Lg:0x0p0:1:5:0x0:
-%*5Lg:0x0p0:0:5:
+%5Lg:0x.0p0:0:-1:
+%*5Lg:0x.0p0:0:-1:
 %5Lg:0x0p+0:0:-1:
 %*5Lg:0x0p+0:0:-1:
 %5Lg:0x8p-972:0:-1:
@@ -354,8 +354,8 @@
 %*5Lg:+nan():0:-1:
 %5Lg:+nan(09A_Zaz):0:-1:
 %*5Lg:+nan(09A_Zaz):0:-1:
-%5Lg:+0x0p0:0:-1:
-%*5Lg:+0x0p0:0:-1:
+%5Lg:+0x.0p0:1:5:0x0:
+%*5Lg:+0x.0p0:0:5:
 %5Lg:+0x0p+0:0:-1:
 %*5Lg:+0x0p+0:0:-1:
 %5Lg:+0x8p-972:0:-1:
@@ -386,8 +386,8 @@
 %*6Lg:-0x8p-972:0:-1:
 %6Lg:-0x0p+0:0:-1:
 %*6Lg:-0x0p+0:0:-1:
-%6Lg:-0x0p0:1:6:-0x0:
-%*6Lg:-0x0p0:0:6:
+%6Lg:-0x.0p0:0:-1:
+%*6Lg:-0x.0p0:0:-1:
 %6Lg:-nan(09A_Zaz):0:-1:
 %*6Lg:-nan(09A_Zaz):0:-1:
 %6Lg:-nan():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6Lg:nan():0:5:
 %6Lg:nan(09A_Zaz):0:-1:
 %*6Lg:nan(09A_Zaz):0:-1:
-%6Lg:0x0p0:1:5:0x0:
-%*6Lg:0x0p0:0:5:
+%6Lg:0x.0p0:1:6:0x0:
+%*6Lg:0x.0p0:0:6:
 %6Lg:0x0p+0:1:6:0x0:
 %*6Lg:0x0p+0:0:6:
 %6Lg:0x8p-972:1:6:0x1p-6:
@@ -416,8 +416,8 @@
 %*6Lg:+nan():0:6:
 %6Lg:+nan(09A_Zaz):0:-1:
 %*6Lg:+nan(09A_Zaz):0:-1:
-%6Lg:+0x0p0:1:6:0x0:
-%*6Lg:+0x0p0:0:6:
+%6Lg:+0x.0p0:0:-1:
+%*6Lg:+0x.0p0:0:-1:
 %6Lg:+0x0p+0:0:-1:
 %*6Lg:+0x0p+0:0:-1:
 %6Lg:+0x8p-972:0:-1:
@@ -448,8 +448,8 @@
 %*33Lg:-0x8p-972:0:9:
 %33Lg:-0x0p+0:1:7:-0x0:
 %*33Lg:-0x0p+0:0:7:
-%33Lg:-0x0p0:1:6:-0x0:
-%*33Lg:-0x0p0:0:6:
+%33Lg:-0x.0p0:1:7:-0x0:
+%*33Lg:-0x.0p0:0:7:
 %33Lg:-nan(09A_Zaz):1:13:-nan:
 %*33Lg:-nan(09A_Zaz):0:13:
 %33Lg:-nan():1:6:-nan:
@@ -458,8 +458,8 @@
 %*33Lg:nan():0:5:
 %33Lg:nan(09A_Zaz):1:12:nan:
 %*33Lg:nan(09A_Zaz):0:12:
-%33Lg:0x0p0:1:5:0x0:
-%*33Lg:0x0p0:0:5:
+%33Lg:0x.0p0:1:6:0x0:
+%*33Lg:0x.0p0:0:6:
 %33Lg:0x0p+0:1:6:0x0:
 %*33Lg:0x0p+0:0:6:
 %33Lg:0x8p-972:1:8:0x1p-969:
@@ -478,8 +478,8 @@
 %*33Lg:+nan():0:6:
 %33Lg:+nan(09A_Zaz):1:13:nan:
 %*33Lg:+nan(09A_Zaz):0:13:
-%33Lg:+0x0p0:1:6:0x0:
-%*33Lg:+0x0p0:0:6:
+%33Lg:+0x.0p0:1:7:0x0:
+%*33Lg:+0x.0p0:0:7:
 %33Lg:+0x0p+0:1:7:0x0:
 %*33Lg:+0x0p+0:0:7:
 %33Lg:+0x8p-972:1:9:0x1p-969:
@@ -510,8 +510,8 @@
 %*50Lg:-0x8p-972:0:9:
 %50Lg:-0x0p+0:1:7:-0x0:
 %*50Lg:-0x0p+0:0:7:
-%50Lg:-0x0p0:1:6:-0x0:
-%*50Lg:-0x0p0:0:6:
+%50Lg:-0x.0p0:1:7:-0x0:
+%*50Lg:-0x.0p0:0:7:
 %50Lg:-nan(09A_Zaz):1:13:-nan:
 %*50Lg:-nan(09A_Zaz):0:13:
 %50Lg:-nan():1:6:-nan:
@@ -520,8 +520,8 @@
 %*50Lg:nan():0:5:
 %50Lg:nan(09A_Zaz):1:12:nan:
 %*50Lg:nan(09A_Zaz):0:12:
-%50Lg:0x0p0:1:5:0x0:
-%*50Lg:0x0p0:0:5:
+%50Lg:0x.0p0:1:6:0x0:
+%*50Lg:0x.0p0:0:6:
 %50Lg:0x0p+0:1:6:0x0:
 %*50Lg:0x0p+0:0:6:
 %50Lg:0x8p-972:1:8:0x1p-969:
@@ -540,8 +540,8 @@
 %*50Lg:+nan():0:6:
 %50Lg:+nan(09A_Zaz):1:13:nan:
 %*50Lg:+nan(09A_Zaz):0:13:
-%50Lg:+0x0p0:1:6:0x0:
-%*50Lg:+0x0p0:0:6:
+%50Lg:+0x.0p0:1:7:0x0:
+%*50Lg:+0x.0p0:0:7:
 %50Lg:+0x0p+0:1:7:0x0:
 %*50Lg:+0x0p+0:0:7:
 %50Lg:+0x8p-972:1:9:0x1p-969:
@@ -572,8 +572,8 @@
 %*5Lg: -0x8p-972:0:-1:
 %5Lg: -0x0p+0:0:-1:
 %*5Lg: -0x0p+0:0:-1:
-%5Lg: -0x0p0:0:-1:
-%*5Lg: -0x0p0:0:-1:
+%5Lg: -0x.0p0:1:6:-0x0:
+%*5Lg: -0x.0p0:0:6:
 %5Lg: -nan(09A_Zaz):0:-1:
 %*5Lg: -nan(09A_Zaz):0:-1:
 %5Lg: -nan():0:-1:
@@ -582,8 +582,8 @@
 %*5Lg: nan():0:6:
 %5Lg: nan(09A_Zaz):0:-1:
 %*5Lg: nan(09A_Zaz):0:-1:
-%5Lg: 0x0p0:1:6:0x0:
-%*5Lg: 0x0p0:0:6:
+%5Lg: 0x.0p0:0:-1:
+%*5Lg: 0x.0p0:0:-1:
 %5Lg: 0x0p+0:0:-1:
 %*5Lg: 0x0p+0:0:-1:
 %5Lg: 0x8p-972:0:-1:
@@ -602,8 +602,8 @@
 %*5Lg: +nan():0:-1:
 %5Lg: +nan(09A_Zaz):0:-1:
 %*5Lg: +nan(09A_Zaz):0:-1:
-%5Lg: +0x0p0:0:-1:
-%*5Lg: +0x0p0:0:-1:
+%5Lg: +0x.0p0:1:6:0x0:
+%*5Lg: +0x.0p0:0:6:
 %5Lg: +0x0p+0:0:-1:
 %*5Lg: +0x0p+0:0:-1:
 %5Lg: +0x8p-972:0:-1:
@@ -634,8 +634,8 @@
 %*50Lg: -0x8p-972:0:10:
 %50Lg: -0x0p+0:1:8:-0x0:
 %*50Lg: -0x0p+0:0:8:
-%50Lg: -0x0p0:1:7:-0x0:
-%*50Lg: -0x0p0:0:7:
+%50Lg: -0x.0p0:1:8:-0x0:
+%*50Lg: -0x.0p0:0:8:
 %50Lg: -nan(09A_Zaz):1:14:-nan:
 %*50Lg: -nan(09A_Zaz):0:14:
 %50Lg: -nan():1:7:-nan:
@@ -644,8 +644,8 @@
 %*50Lg: nan():0:6:
 %50Lg: nan(09A_Zaz):1:13:nan:
 %*50Lg: nan(09A_Zaz):0:13:
-%50Lg: 0x0p0:1:6:0x0:
-%*50Lg: 0x0p0:0:6:
+%50Lg: 0x.0p0:1:7:0x0:
+%*50Lg: 0x.0p0:0:7:
 %50Lg: 0x0p+0:1:7:0x0:
 %*50Lg: 0x0p+0:0:7:
 %50Lg: 0x8p-972:1:9:0x1p-969:
@@ -664,8 +664,8 @@
 %*50Lg: +nan():0:7:
 %50Lg: +nan(09A_Zaz):1:14:nan:
 %*50Lg: +nan(09A_Zaz):0:14:
-%50Lg: +0x0p0:1:7:0x0:
-%*50Lg: +0x0p0:0:7:
+%50Lg: +0x.0p0:1:8:0x0:
+%*50Lg: +0x.0p0:0:8:
 %50Lg: +0x0p+0:1:8:0x0:
 %*50Lg: +0x0p+0:0:8:
 %50Lg: +0x8p-972:1:10:0x1p-969:
diff --git a/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-gg.input b/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-gg.input
index 4df9b04..6e24bbd 100644
--- a/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-gg.input
+++ b/sysdeps/ieee754/ldbl-128ibm/tst-scanf-format-ldouble-gg.input
@@ -14,8 +14,8 @@
 %*LG:-0X8P-972:0:9:
 %LG:-0X0P+0:1:7:-0x0:
 %*LG:-0X0P+0:0:7:
-%LG:-0X0P0:1:6:-0x0:
-%*LG:-0X0P0:0:6:
+%LG:-0X.0P0:1:7:-0x0:
+%*LG:-0X.0P0:0:7:
 %LG:-NAN(09A_Zaz):1:13:-nan:
 %*LG:-NAN(09A_Zaz):0:13:
 %LG:-NAN():1:6:-nan:
@@ -24,8 +24,8 @@
 %*LG:NAN():0:5:
 %LG:NAN(09A_Zaz):1:12:nan:
 %*LG:NAN(09A_Zaz):0:12:
-%LG:0X0P0:1:5:0x0:
-%*LG:0X0P0:0:5:
+%LG:0X.0P0:1:6:0x0:
+%*LG:0X.0P0:0:6:
 %LG:0X0P+0:1:6:0x0:
 %*LG:0X0P+0:0:6:
 %LG:0X8P-972:1:8:0x1p-969:
@@ -44,8 +44,8 @@
 %*LG:+NAN():0:6:
 %LG:+NAN(09A_Zaz):1:13:nan:
 %*LG:+NAN(09A_Zaz):0:13:
-%LG:+0X0P0:1:6:0x0:
-%*LG:+0X0P0:0:6:
+%LG:+0X.0P0:1:7:0x0:
+%*LG:+0X.0P0:0:7:
 %LG:+0X0P+0:1:7:0x0:
 %*LG:+0X0P+0:0:7:
 %LG:+0X8P-972:1:9:0x1p-969:
@@ -76,8 +76,8 @@
 %*1LG:-0X8P-972:0:-1:
 %1LG:-0X0P+0:0:-1:
 %*1LG:-0X0P+0:0:-1:
-%1LG:-0X0P0:0:-1:
-%*1LG:-0X0P0:0:-1:
+%1LG:-0X.0P0:0:-1:
+%*1LG:-0X.0P0:0:-1:
 %1LG:-NAN(09A_Zaz):0:-1:
 %*1LG:-NAN(09A_Zaz):0:-1:
 %1LG:-NAN():0:-1:
@@ -86,8 +86,8 @@
 %*1LG:NAN():0:-1:
 %1LG:NAN(09A_Zaz):0:-1:
 %*1LG:NAN(09A_Zaz):0:-1:
-%1LG:0X0P0:1:1:0x0:
-%*1LG:0X0P0:0:1:
+%1LG:0X.0P0:1:1:0x0:
+%*1LG:0X.0P0:0:1:
 %1LG:0X0P+0:1:1:0x0:
 %*1LG:0X0P+0:0:1:
 %1LG:0X8P-972:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1LG:+NAN():0:-1:
 %1LG:+NAN(09A_Zaz):0:-1:
 %*1LG:+NAN(09A_Zaz):0:-1:
-%1LG:+0X0P0:0:-1:
-%*1LG:+0X0P0:0:-1:
+%1LG:+0X.0P0:0:-1:
+%*1LG:+0X.0P0:0:-1:
 %1LG:+0X0P+0:0:-1:
 %*1LG:+0X0P+0:0:-1:
 %1LG:+0X8P-972:0:-1:
@@ -138,8 +138,8 @@
 %*2LG:-0X8P-972:0:2:
 %2LG:-0X0P+0:1:2:-0x0:
 %*2LG:-0X0P+0:0:2:
-%2LG:-0X0P0:1:2:-0x0:
-%*2LG:-0X0P0:0:2:
+%2LG:-0X.0P0:1:2:-0x0:
+%*2LG:-0X.0P0:0:2:
 %2LG:-NAN(09A_Zaz):0:-1:
 %*2LG:-NAN(09A_Zaz):0:-1:
 %2LG:-NAN():0:-1:
@@ -148,8 +148,8 @@
 %*2LG:NAN():0:-1:
 %2LG:NAN(09A_Zaz):0:-1:
 %*2LG:NAN(09A_Zaz):0:-1:
-%2LG:0X0P0:0:-1:
-%*2LG:0X0P0:0:-1:
+%2LG:0X.0P0:0:-1:
+%*2LG:0X.0P0:0:-1:
 %2LG:0X0P+0:0:-1:
 %*2LG:0X0P+0:0:-1:
 %2LG:0X8P-972:0:-1:
@@ -168,8 +168,8 @@
 %*2LG:+NAN():0:-1:
 %2LG:+NAN(09A_Zaz):0:-1:
 %*2LG:+NAN(09A_Zaz):0:-1:
-%2LG:+0X0P0:1:2:0x0:
-%*2LG:+0X0P0:0:2:
+%2LG:+0X.0P0:1:2:0x0:
+%*2LG:+0X.0P0:0:2:
 %2LG:+0X0P+0:1:2:0x0:
 %*2LG:+0X0P+0:0:2:
 %2LG:+0X8P-972:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3LG:-0X8P-972:0:-1:
 %3LG:-0X0P+0:0:-1:
 %*3LG:-0X0P+0:0:-1:
-%3LG:-0X0P0:0:-1:
-%*3LG:-0X0P0:0:-1:
+%3LG:-0X.0P0:0:-1:
+%*3LG:-0X.0P0:0:-1:
 %3LG:-NAN(09A_Zaz):0:-1:
 %*3LG:-NAN(09A_Zaz):0:-1:
 %3LG:-NAN():0:-1:
@@ -210,8 +210,8 @@
 %*3LG:NAN():0:3:
 %3LG:NAN(09A_Zaz):1:3:nan:
 %*3LG:NAN(09A_Zaz):0:3:
-%3LG:0X0P0:1:3:0x0:
-%*3LG:0X0P0:0:3:
+%3LG:0X.0P0:0:-1:
+%*3LG:0X.0P0:0:-1:
 %3LG:0X0P+0:1:3:0x0:
 %*3LG:0X0P+0:0:3:
 %3LG:0X8P-972:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3LG:+NAN():0:-1:
 %3LG:+NAN(09A_Zaz):0:-1:
 %*3LG:+NAN(09A_Zaz):0:-1:
-%3LG:+0X0P0:0:-1:
-%*3LG:+0X0P0:0:-1:
+%3LG:+0X.0P0:0:-1:
+%*3LG:+0X.0P0:0:-1:
 %3LG:+0X0P+0:0:-1:
 %*3LG:+0X0P+0:0:-1:
 %3LG:+0X8P-972:0:-1:
@@ -262,8 +262,8 @@
 %*4LG:-0X8P-972:0:4:
 %4LG:-0X0P+0:1:4:-0x0:
 %*4LG:-0X0P+0:0:4:
-%4LG:-0X0P0:1:4:-0x0:
-%*4LG:-0X0P0:0:4:
+%4LG:-0X.0P0:0:-1:
+%*4LG:-0X.0P0:0:-1:
 %4LG:-NAN(09A_Zaz):1:4:-nan:
 %*4LG:-NAN(09A_Zaz):0:4:
 %4LG:-NAN():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4LG:NAN():0:-1:
 %4LG:NAN(09A_Zaz):0:-1:
 %*4LG:NAN(09A_Zaz):0:-1:
-%4LG:0X0P0:0:-1:
-%*4LG:0X0P0:0:-1:
+%4LG:0X.0P0:1:4:0x0:
+%*4LG:0X.0P0:0:4:
 %4LG:0X0P+0:0:-1:
 %*4LG:0X0P+0:0:-1:
 %4LG:0X8P-972:0:-1:
@@ -292,8 +292,8 @@
 %*4LG:+NAN():0:4:
 %4LG:+NAN(09A_Zaz):1:4:nan:
 %*4LG:+NAN(09A_Zaz):0:4:
-%4LG:+0X0P0:1:4:0x0:
-%*4LG:+0X0P0:0:4:
+%4LG:+0X.0P0:0:-1:
+%*4LG:+0X.0P0:0:-1:
 %4LG:+0X0P+0:1:4:0x0:
 %*4LG:+0X0P+0:0:4:
 %4LG:+0X8P-972:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5LG:-0X8P-972:0:-1:
 %5LG:-0X0P+0:0:-1:
 %*5LG:-0X0P+0:0:-1:
-%5LG:-0X0P0:0:-1:
-%*5LG:-0X0P0:0:-1:
+%5LG:-0X.0P0:1:5:-0x0:
+%*5LG:-0X.0P0:0:5:
 %5LG:-NAN(09A_Zaz):0:-1:
 %*5LG:-NAN(09A_Zaz):0:-1:
 %5LG:-NAN():0:-1:
@@ -334,8 +334,8 @@
 %*5LG:NAN():0:5:
 %5LG:NAN(09A_Zaz):0:-1:
 %*5LG:NAN(09A_Zaz):0:-1:
-%5LG:0X0P0:1:5:0x0:
-%*5LG:0X0P0:0:5:
+%5LG:0X.0P0:0:-1:
+%*5LG:0X.0P0:0:-1:
 %5LG:0X0P+0:0:-1:
 %*5LG:0X0P+0:0:-1:
 %5LG:0X8P-972:0:-1:
@@ -354,8 +354,8 @@
 %*5LG:+NAN():0:-1:
 %5LG:+NAN(09A_Zaz):0:-1:
 %*5LG:+NAN(09A_Zaz):0:-1:
-%5LG:+0X0P0:0:-1:
-%*5LG:+0X0P0:0:-1:
+%5LG:+0X.0P0:1:5:0x0:
+%*5LG:+0X.0P0:0:5:
 %5LG:+0X0P+0:0:-1:
 %*5LG:+0X0P+0:0:-1:
 %5LG:+0X8P-972:0:-1:
@@ -386,8 +386,8 @@
 %*6LG:-0X8P-972:0:-1:
 %6LG:-0X0P+0:0:-1:
 %*6LG:-0X0P+0:0:-1:
-%6LG:-0X0P0:1:6:-0x0:
-%*6LG:-0X0P0:0:6:
+%6LG:-0X.0P0:0:-1:
+%*6LG:-0X.0P0:0:-1:
 %6LG:-NAN(09A_Zaz):0:-1:
 %*6LG:-NAN(09A_Zaz):0:-1:
 %6LG:-NAN():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6LG:NAN():0:5:
 %6LG:NAN(09A_Zaz):0:-1:
 %*6LG:NAN(09A_Zaz):0:-1:
-%6LG:0X0P0:1:5:0x0:
-%*6LG:0X0P0:0:5:
+%6LG:0X.0P0:1:6:0x0:
+%*6LG:0X.0P0:0:6:
 %6LG:0X0P+0:1:6:0x0:
 %*6LG:0X0P+0:0:6:
 %6LG:0X8P-972:1:6:0x1p-6:
@@ -416,8 +416,8 @@
 %*6LG:+NAN():0:6:
 %6LG:+NAN(09A_Zaz):0:-1:
 %*6LG:+NAN(09A_Zaz):0:-1:
-%6LG:+0X0P0:1:6:0x0:
-%*6LG:+0X0P0:0:6:
+%6LG:+0X.0P0:0:-1:
+%*6LG:+0X.0P0:0:-1:
 %6LG:+0X0P+0:0:-1:
 %*6LG:+0X0P+0:0:-1:
 %6LG:+0X8P-972:0:-1:
@@ -448,8 +448,8 @@
 %*33LG:-0X8P-972:0:9:
 %33LG:-0X0P+0:1:7:-0x0:
 %*33LG:-0X0P+0:0:7:
-%33LG:-0X0P0:1:6:-0x0:
-%*33LG:-0X0P0:0:6:
+%33LG:-0X.0P0:1:7:-0x0:
+%*33LG:-0X.0P0:0:7:
 %33LG:-NAN(09A_Zaz):1:13:-nan:
 %*33LG:-NAN(09A_Zaz):0:13:
 %33LG:-NAN():1:6:-nan:
@@ -458,8 +458,8 @@
 %*33LG:NAN():0:5:
 %33LG:NAN(09A_Zaz):1:12:nan:
 %*33LG:NAN(09A_Zaz):0:12:
-%33LG:0X0P0:1:5:0x0:
-%*33LG:0X0P0:0:5:
+%33LG:0X.0P0:1:6:0x0:
+%*33LG:0X.0P0:0:6:
 %33LG:0X0P+0:1:6:0x0:
 %*33LG:0X0P+0:0:6:
 %33LG:0X8P-972:1:8:0x1p-969:
@@ -478,8 +478,8 @@
 %*33LG:+NAN():0:6:
 %33LG:+NAN(09A_Zaz):1:13:nan:
 %*33LG:+NAN(09A_Zaz):0:13:
-%33LG:+0X0P0:1:6:0x0:
-%*33LG:+0X0P0:0:6:
+%33LG:+0X.0P0:1:7:0x0:
+%*33LG:+0X.0P0:0:7:
 %33LG:+0X0P+0:1:7:0x0:
 %*33LG:+0X0P+0:0:7:
 %33LG:+0X8P-972:1:9:0x1p-969:
@@ -510,8 +510,8 @@
 %*50LG:-0X8P-972:0:9:
 %50LG:-0X0P+0:1:7:-0x0:
 %*50LG:-0X0P+0:0:7:
-%50LG:-0X0P0:1:6:-0x0:
-%*50LG:-0X0P0:0:6:
+%50LG:-0X.0P0:1:7:-0x0:
+%*50LG:-0X.0P0:0:7:
 %50LG:-NAN(09A_Zaz):1:13:-nan:
 %*50LG:-NAN(09A_Zaz):0:13:
 %50LG:-NAN():1:6:-nan:
@@ -520,8 +520,8 @@
 %*50LG:NAN():0:5:
 %50LG:NAN(09A_Zaz):1:12:nan:
 %*50LG:NAN(09A_Zaz):0:12:
-%50LG:0X0P0:1:5:0x0:
-%*50LG:0X0P0:0:5:
+%50LG:0X.0P0:1:6:0x0:
+%*50LG:0X.0P0:0:6:
 %50LG:0X0P+0:1:6:0x0:
 %*50LG:0X0P+0:0:6:
 %50LG:0X8P-972:1:8:0x1p-969:
@@ -540,8 +540,8 @@
 %*50LG:+NAN():0:6:
 %50LG:+NAN(09A_Zaz):1:13:nan:
 %*50LG:+NAN(09A_Zaz):0:13:
-%50LG:+0X0P0:1:6:0x0:
-%*50LG:+0X0P0:0:6:
+%50LG:+0X.0P0:1:7:0x0:
+%*50LG:+0X.0P0:0:7:
 %50LG:+0X0P+0:1:7:0x0:
 %*50LG:+0X0P+0:0:7:
 %50LG:+0X8P-972:1:9:0x1p-969:
@@ -572,8 +572,8 @@
 %*5LG: -0X8P-972:0:-1:
 %5LG: -0X0P+0:0:-1:
 %*5LG: -0X0P+0:0:-1:
-%5LG: -0X0P0:0:-1:
-%*5LG: -0X0P0:0:-1:
+%5LG: -0X.0P0:1:6:-0x0:
+%*5LG: -0X.0P0:0:6:
 %5LG: -NAN(09A_Zaz):0:-1:
 %*5LG: -NAN(09A_Zaz):0:-1:
 %5LG: -NAN():0:-1:
@@ -582,8 +582,8 @@
 %*5LG: NAN():0:6:
 %5LG: NAN(09A_Zaz):0:-1:
 %*5LG: NAN(09A_Zaz):0:-1:
-%5LG: 0X0P0:1:6:0x0:
-%*5LG: 0X0P0:0:6:
+%5LG: 0X.0P0:0:-1:
+%*5LG: 0X.0P0:0:-1:
 %5LG: 0X0P+0:0:-1:
 %*5LG: 0X0P+0:0:-1:
 %5LG: 0X8P-972:0:-1:
@@ -602,8 +602,8 @@
 %*5LG: +NAN():0:-1:
 %5LG: +NAN(09A_Zaz):0:-1:
 %*5LG: +NAN(09A_Zaz):0:-1:
-%5LG: +0X0P0:0:-1:
-%*5LG: +0X0P0:0:-1:
+%5LG: +0X.0P0:1:6:0x0:
+%*5LG: +0X.0P0:0:6:
 %5LG: +0X0P+0:0:-1:
 %*5LG: +0X0P+0:0:-1:
 %5LG: +0X8P-972:0:-1:
@@ -634,8 +634,8 @@
 %*50LG: -0X8P-972:0:10:
 %50LG: -0X0P+0:1:8:-0x0:
 %*50LG: -0X0P+0:0:8:
-%50LG: -0X0P0:1:7:-0x0:
-%*50LG: -0X0P0:0:7:
+%50LG: -0X.0P0:1:8:-0x0:
+%*50LG: -0X.0P0:0:8:
 %50LG: -NAN(09A_Zaz):1:14:-nan:
 %*50LG: -NAN(09A_Zaz):0:14:
 %50LG: -NAN():1:7:-nan:
@@ -644,8 +644,8 @@
 %*50LG: NAN():0:6:
 %50LG: NAN(09A_Zaz):1:13:nan:
 %*50LG: NAN(09A_Zaz):0:13:
-%50LG: 0X0P0:1:6:0x0:
-%*50LG: 0X0P0:0:6:
+%50LG: 0X.0P0:1:7:0x0:
+%*50LG: 0X.0P0:0:7:
 %50LG: 0X0P+0:1:7:0x0:
 %*50LG: 0X0P+0:0:7:
 %50LG: 0X8P-972:1:9:0x1p-969:
@@ -664,8 +664,8 @@
 %*50LG: +NAN():0:7:
 %50LG: +NAN(09A_Zaz):1:14:nan:
 %*50LG: +NAN(09A_Zaz):0:14:
-%50LG: +0X0P0:1:7:0x0:
-%*50LG: +0X0P0:0:7:
+%50LG: +0X.0P0:1:8:0x0:
+%*50LG: +0X.0P0:0:8:
 %50LG: +0X0P+0:1:8:0x0:
 %*50LG: +0X0P+0:0:8:
 %50LG: +0X8P-972:1:10:0x1p-969:
diff --git a/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-a.input b/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-a.input
index 1813a18..54bef04 100644
--- a/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-a.input
+++ b/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-a.input
@@ -14,8 +14,8 @@
 %*La:-0x8p-16385:0:11:
 %La:-0x0p+0:1:7:-0x0:
 %*La:-0x0p+0:0:7:
-%La:-0x0p0:1:6:-0x0:
-%*La:-0x0p0:0:6:
+%La:-0x.0p0:1:7:-0x0:
+%*La:-0x.0p0:0:7:
 %La:-nan(09A_Zaz):1:13:-nan:
 %*La:-nan(09A_Zaz):0:13:
 %La:-nan():1:6:-nan:
@@ -24,8 +24,8 @@
 %*La:nan():0:5:
 %La:nan(09A_Zaz):1:12:nan:
 %*La:nan(09A_Zaz):0:12:
-%La:0x0p0:1:5:0x0:
-%*La:0x0p0:0:5:
+%La:0x.0p0:1:6:0x0:
+%*La:0x.0p0:0:6:
 %La:0x0p+0:1:6:0x0:
 %*La:0x0p+0:0:6:
 %La:0x8p-16385:1:10:0x1p-16382:
@@ -44,8 +44,8 @@
 %*La:+nan():0:6:
 %La:+nan(09A_Zaz):1:13:nan:
 %*La:+nan(09A_Zaz):0:13:
-%La:+0x0p0:1:6:0x0:
-%*La:+0x0p0:0:6:
+%La:+0x.0p0:1:7:0x0:
+%*La:+0x.0p0:0:7:
 %La:+0x0p+0:1:7:0x0:
 %*La:+0x0p+0:0:7:
 %La:+0x8p-16385:1:11:0x1p-16382:
@@ -76,8 +76,8 @@
 %*1La:-0x8p-16385:0:-1:
 %1La:-0x0p+0:0:-1:
 %*1La:-0x0p+0:0:-1:
-%1La:-0x0p0:0:-1:
-%*1La:-0x0p0:0:-1:
+%1La:-0x.0p0:0:-1:
+%*1La:-0x.0p0:0:-1:
 %1La:-nan(09A_Zaz):0:-1:
 %*1La:-nan(09A_Zaz):0:-1:
 %1La:-nan():0:-1:
@@ -86,8 +86,8 @@
 %*1La:nan():0:-1:
 %1La:nan(09A_Zaz):0:-1:
 %*1La:nan(09A_Zaz):0:-1:
-%1La:0x0p0:1:1:0x0:
-%*1La:0x0p0:0:1:
+%1La:0x.0p0:1:1:0x0:
+%*1La:0x.0p0:0:1:
 %1La:0x0p+0:1:1:0x0:
 %*1La:0x0p+0:0:1:
 %1La:0x8p-16385:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1La:+nan():0:-1:
 %1La:+nan(09A_Zaz):0:-1:
 %*1La:+nan(09A_Zaz):0:-1:
-%1La:+0x0p0:0:-1:
-%*1La:+0x0p0:0:-1:
+%1La:+0x.0p0:0:-1:
+%*1La:+0x.0p0:0:-1:
 %1La:+0x0p+0:0:-1:
 %*1La:+0x0p+0:0:-1:
 %1La:+0x8p-16385:0:-1:
@@ -138,8 +138,8 @@
 %*2La:-0x8p-16385:0:2:
 %2La:-0x0p+0:1:2:-0x0:
 %*2La:-0x0p+0:0:2:
-%2La:-0x0p0:1:2:-0x0:
-%*2La:-0x0p0:0:2:
+%2La:-0x.0p0:1:2:-0x0:
+%*2La:-0x.0p0:0:2:
 %2La:-nan(09A_Zaz):0:-1:
 %*2La:-nan(09A_Zaz):0:-1:
 %2La:-nan():0:-1:
@@ -148,8 +148,8 @@
 %*2La:nan():0:-1:
 %2La:nan(09A_Zaz):0:-1:
 %*2La:nan(09A_Zaz):0:-1:
-%2La:0x0p0:0:-1:
-%*2La:0x0p0:0:-1:
+%2La:0x.0p0:0:-1:
+%*2La:0x.0p0:0:-1:
 %2La:0x0p+0:0:-1:
 %*2La:0x0p+0:0:-1:
 %2La:0x8p-16385:0:-1:
@@ -168,8 +168,8 @@
 %*2La:+nan():0:-1:
 %2La:+nan(09A_Zaz):0:-1:
 %*2La:+nan(09A_Zaz):0:-1:
-%2La:+0x0p0:1:2:0x0:
-%*2La:+0x0p0:0:2:
+%2La:+0x.0p0:1:2:0x0:
+%*2La:+0x.0p0:0:2:
 %2La:+0x0p+0:1:2:0x0:
 %*2La:+0x0p+0:0:2:
 %2La:+0x8p-16385:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3La:-0x8p-16385:0:-1:
 %3La:-0x0p+0:0:-1:
 %*3La:-0x0p+0:0:-1:
-%3La:-0x0p0:0:-1:
-%*3La:-0x0p0:0:-1:
+%3La:-0x.0p0:0:-1:
+%*3La:-0x.0p0:0:-1:
 %3La:-nan(09A_Zaz):0:-1:
 %*3La:-nan(09A_Zaz):0:-1:
 %3La:-nan():0:-1:
@@ -210,8 +210,8 @@
 %*3La:nan():0:3:
 %3La:nan(09A_Zaz):1:3:nan:
 %*3La:nan(09A_Zaz):0:3:
-%3La:0x0p0:1:3:0x0:
-%*3La:0x0p0:0:3:
+%3La:0x.0p0:0:-1:
+%*3La:0x.0p0:0:-1:
 %3La:0x0p+0:1:3:0x0:
 %*3La:0x0p+0:0:3:
 %3La:0x8p-16385:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3La:+nan():0:-1:
 %3La:+nan(09A_Zaz):0:-1:
 %*3La:+nan(09A_Zaz):0:-1:
-%3La:+0x0p0:0:-1:
-%*3La:+0x0p0:0:-1:
+%3La:+0x.0p0:0:-1:
+%*3La:+0x.0p0:0:-1:
 %3La:+0x0p+0:0:-1:
 %*3La:+0x0p+0:0:-1:
 %3La:+0x8p-16385:0:-1:
@@ -262,8 +262,8 @@
 %*4La:-0x8p-16385:0:4:
 %4La:-0x0p+0:1:4:-0x0:
 %*4La:-0x0p+0:0:4:
-%4La:-0x0p0:1:4:-0x0:
-%*4La:-0x0p0:0:4:
+%4La:-0x.0p0:0:-1:
+%*4La:-0x.0p0:0:-1:
 %4La:-nan(09A_Zaz):1:4:-nan:
 %*4La:-nan(09A_Zaz):0:4:
 %4La:-nan():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4La:nan():0:-1:
 %4La:nan(09A_Zaz):0:-1:
 %*4La:nan(09A_Zaz):0:-1:
-%4La:0x0p0:0:-1:
-%*4La:0x0p0:0:-1:
+%4La:0x.0p0:1:4:0x0:
+%*4La:0x.0p0:0:4:
 %4La:0x0p+0:0:-1:
 %*4La:0x0p+0:0:-1:
 %4La:0x8p-16385:0:-1:
@@ -292,8 +292,8 @@
 %*4La:+nan():0:4:
 %4La:+nan(09A_Zaz):1:4:nan:
 %*4La:+nan(09A_Zaz):0:4:
-%4La:+0x0p0:1:4:0x0:
-%*4La:+0x0p0:0:4:
+%4La:+0x.0p0:0:-1:
+%*4La:+0x.0p0:0:-1:
 %4La:+0x0p+0:1:4:0x0:
 %*4La:+0x0p+0:0:4:
 %4La:+0x8p-16385:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5La:-0x8p-16385:0:-1:
 %5La:-0x0p+0:0:-1:
 %*5La:-0x0p+0:0:-1:
-%5La:-0x0p0:0:-1:
-%*5La:-0x0p0:0:-1:
+%5La:-0x.0p0:1:5:-0x0:
+%*5La:-0x.0p0:0:5:
 %5La:-nan(09A_Zaz):0:-1:
 %*5La:-nan(09A_Zaz):0:-1:
 %5La:-nan():0:-1:
@@ -334,8 +334,8 @@
 %*5La:nan():0:5:
 %5La:nan(09A_Zaz):0:-1:
 %*5La:nan(09A_Zaz):0:-1:
-%5La:0x0p0:1:5:0x0:
-%*5La:0x0p0:0:5:
+%5La:0x.0p0:0:-1:
+%*5La:0x.0p0:0:-1:
 %5La:0x0p+0:0:-1:
 %*5La:0x0p+0:0:-1:
 %5La:0x8p-16385:0:-1:
@@ -354,8 +354,8 @@
 %*5La:+nan():0:-1:
 %5La:+nan(09A_Zaz):0:-1:
 %*5La:+nan(09A_Zaz):0:-1:
-%5La:+0x0p0:0:-1:
-%*5La:+0x0p0:0:-1:
+%5La:+0x.0p0:1:5:0x0:
+%*5La:+0x.0p0:0:5:
 %5La:+0x0p+0:0:-1:
 %*5La:+0x0p+0:0:-1:
 %5La:+0x8p-16385:0:-1:
@@ -386,8 +386,8 @@
 %*6La:-0x8p-16385:0:-1:
 %6La:-0x0p+0:0:-1:
 %*6La:-0x0p+0:0:-1:
-%6La:-0x0p0:1:6:-0x0:
-%*6La:-0x0p0:0:6:
+%6La:-0x.0p0:0:-1:
+%*6La:-0x.0p0:0:-1:
 %6La:-nan(09A_Zaz):0:-1:
 %*6La:-nan(09A_Zaz):0:-1:
 %6La:-nan():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6La:nan():0:5:
 %6La:nan(09A_Zaz):0:-1:
 %*6La:nan(09A_Zaz):0:-1:
-%6La:0x0p0:1:5:0x0:
-%*6La:0x0p0:0:5:
+%6La:0x.0p0:1:6:0x0:
+%*6La:0x.0p0:0:6:
 %6La:0x0p+0:1:6:0x0:
 %*6La:0x0p+0:0:6:
 %6La:0x8p-16385:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6La:+nan():0:6:
 %6La:+nan(09A_Zaz):0:-1:
 %*6La:+nan(09A_Zaz):0:-1:
-%6La:+0x0p0:1:6:0x0:
-%*6La:+0x0p0:0:6:
+%6La:+0x.0p0:0:-1:
+%*6La:+0x.0p0:0:-1:
 %6La:+0x0p+0:0:-1:
 %*6La:+0x0p+0:0:-1:
 %6La:+0x8p-16385:0:-1:
@@ -448,8 +448,8 @@
 %*22La:-0x8p-16385:0:11:
 %22La:-0x0p+0:1:7:-0x0:
 %*22La:-0x0p+0:0:7:
-%22La:-0x0p0:1:6:-0x0:
-%*22La:-0x0p0:0:6:
+%22La:-0x.0p0:1:7:-0x0:
+%*22La:-0x.0p0:0:7:
 %22La:-nan(09A_Zaz):1:13:-nan:
 %*22La:-nan(09A_Zaz):0:13:
 %22La:-nan():1:6:-nan:
@@ -458,8 +458,8 @@
 %*22La:nan():0:5:
 %22La:nan(09A_Zaz):1:12:nan:
 %*22La:nan(09A_Zaz):0:12:
-%22La:0x0p0:1:5:0x0:
-%*22La:0x0p0:0:5:
+%22La:0x.0p0:1:6:0x0:
+%*22La:0x.0p0:0:6:
 %22La:0x0p+0:1:6:0x0:
 %*22La:0x0p+0:0:6:
 %22La:0x8p-16385:1:10:0x1p-16382:
@@ -478,8 +478,8 @@
 %*22La:+nan():0:6:
 %22La:+nan(09A_Zaz):1:13:nan:
 %*22La:+nan(09A_Zaz):0:13:
-%22La:+0x0p0:1:6:0x0:
-%*22La:+0x0p0:0:6:
+%22La:+0x.0p0:1:7:0x0:
+%*22La:+0x.0p0:0:7:
 %22La:+0x0p+0:1:7:0x0:
 %*22La:+0x0p+0:0:7:
 %22La:+0x8p-16385:1:11:0x1p-16382:
@@ -510,8 +510,8 @@
 %*37La:-0x8p-16385:0:11:
 %37La:-0x0p+0:1:7:-0x0:
 %*37La:-0x0p+0:0:7:
-%37La:-0x0p0:1:6:-0x0:
-%*37La:-0x0p0:0:6:
+%37La:-0x.0p0:1:7:-0x0:
+%*37La:-0x.0p0:0:7:
 %37La:-nan(09A_Zaz):1:13:-nan:
 %*37La:-nan(09A_Zaz):0:13:
 %37La:-nan():1:6:-nan:
@@ -520,8 +520,8 @@
 %*37La:nan():0:5:
 %37La:nan(09A_Zaz):1:12:nan:
 %*37La:nan(09A_Zaz):0:12:
-%37La:0x0p0:1:5:0x0:
-%*37La:0x0p0:0:5:
+%37La:0x.0p0:1:6:0x0:
+%*37La:0x.0p0:0:6:
 %37La:0x0p+0:1:6:0x0:
 %*37La:0x0p+0:0:6:
 %37La:0x8p-16385:1:10:0x1p-16382:
@@ -540,8 +540,8 @@
 %*37La:+nan():0:6:
 %37La:+nan(09A_Zaz):1:13:nan:
 %*37La:+nan(09A_Zaz):0:13:
-%37La:+0x0p0:1:6:0x0:
-%*37La:+0x0p0:0:6:
+%37La:+0x.0p0:1:7:0x0:
+%*37La:+0x.0p0:0:7:
 %37La:+0x0p+0:1:7:0x0:
 %*37La:+0x0p+0:0:7:
 %37La:+0x8p-16385:1:11:0x1p-16382:
@@ -572,8 +572,8 @@
 %*5La: -0x8p-16385:0:-1:
 %5La: -0x0p+0:0:-1:
 %*5La: -0x0p+0:0:-1:
-%5La: -0x0p0:0:-1:
-%*5La: -0x0p0:0:-1:
+%5La: -0x.0p0:1:6:-0x0:
+%*5La: -0x.0p0:0:6:
 %5La: -nan(09A_Zaz):0:-1:
 %*5La: -nan(09A_Zaz):0:-1:
 %5La: -nan():0:-1:
@@ -582,8 +582,8 @@
 %*5La: nan():0:6:
 %5La: nan(09A_Zaz):0:-1:
 %*5La: nan(09A_Zaz):0:-1:
-%5La: 0x0p0:1:6:0x0:
-%*5La: 0x0p0:0:6:
+%5La: 0x.0p0:0:-1:
+%*5La: 0x.0p0:0:-1:
 %5La: 0x0p+0:0:-1:
 %*5La: 0x0p+0:0:-1:
 %5La: 0x8p-16385:0:-1:
@@ -602,8 +602,8 @@
 %*5La: +nan():0:-1:
 %5La: +nan(09A_Zaz):0:-1:
 %*5La: +nan(09A_Zaz):0:-1:
-%5La: +0x0p0:0:-1:
-%*5La: +0x0p0:0:-1:
+%5La: +0x.0p0:1:6:0x0:
+%*5La: +0x.0p0:0:6:
 %5La: +0x0p+0:0:-1:
 %*5La: +0x0p+0:0:-1:
 %5La: +0x8p-16385:0:-1:
@@ -634,8 +634,8 @@
 %*37La: -0x8p-16385:0:12:
 %37La: -0x0p+0:1:8:-0x0:
 %*37La: -0x0p+0:0:8:
-%37La: -0x0p0:1:7:-0x0:
-%*37La: -0x0p0:0:7:
+%37La: -0x.0p0:1:8:-0x0:
+%*37La: -0x.0p0:0:8:
 %37La: -nan(09A_Zaz):1:14:-nan:
 %*37La: -nan(09A_Zaz):0:14:
 %37La: -nan():1:7:-nan:
@@ -644,8 +644,8 @@
 %*37La: nan():0:6:
 %37La: nan(09A_Zaz):1:13:nan:
 %*37La: nan(09A_Zaz):0:13:
-%37La: 0x0p0:1:6:0x0:
-%*37La: 0x0p0:0:6:
+%37La: 0x.0p0:1:7:0x0:
+%*37La: 0x.0p0:0:7:
 %37La: 0x0p+0:1:7:0x0:
 %*37La: 0x0p+0:0:7:
 %37La: 0x8p-16385:1:11:0x1p-16382:
@@ -664,8 +664,8 @@
 %*37La: +nan():0:7:
 %37La: +nan(09A_Zaz):1:14:nan:
 %*37La: +nan(09A_Zaz):0:14:
-%37La: +0x0p0:1:7:0x0:
-%*37La: +0x0p0:0:7:
+%37La: +0x.0p0:1:8:0x0:
+%*37La: +0x.0p0:0:8:
 %37La: +0x0p+0:1:8:0x0:
 %*37La: +0x0p+0:0:8:
 %37La: +0x8p-16385:1:12:0x1p-16382:
diff --git a/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-aa.input b/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-aa.input
index 26bc713..bd596a7 100644
--- a/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-aa.input
+++ b/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-aa.input
@@ -14,8 +14,8 @@
 %*LA:-0X8P-16385:0:11:
 %LA:-0X0P+0:1:7:-0x0:
 %*LA:-0X0P+0:0:7:
-%LA:-0X0P0:1:6:-0x0:
-%*LA:-0X0P0:0:6:
+%LA:-0X.0P0:1:7:-0x0:
+%*LA:-0X.0P0:0:7:
 %LA:-NAN(09A_Zaz):1:13:-nan:
 %*LA:-NAN(09A_Zaz):0:13:
 %LA:-NAN():1:6:-nan:
@@ -24,8 +24,8 @@
 %*LA:NAN():0:5:
 %LA:NAN(09A_Zaz):1:12:nan:
 %*LA:NAN(09A_Zaz):0:12:
-%LA:0X0P0:1:5:0x0:
-%*LA:0X0P0:0:5:
+%LA:0X.0P0:1:6:0x0:
+%*LA:0X.0P0:0:6:
 %LA:0X0P+0:1:6:0x0:
 %*LA:0X0P+0:0:6:
 %LA:0X8P-16385:1:10:0x1p-16382:
@@ -44,8 +44,8 @@
 %*LA:+NAN():0:6:
 %LA:+NAN(09A_Zaz):1:13:nan:
 %*LA:+NAN(09A_Zaz):0:13:
-%LA:+0X0P0:1:6:0x0:
-%*LA:+0X0P0:0:6:
+%LA:+0X.0P0:1:7:0x0:
+%*LA:+0X.0P0:0:7:
 %LA:+0X0P+0:1:7:0x0:
 %*LA:+0X0P+0:0:7:
 %LA:+0X8P-16385:1:11:0x1p-16382:
@@ -76,8 +76,8 @@
 %*1LA:-0X8P-16385:0:-1:
 %1LA:-0X0P+0:0:-1:
 %*1LA:-0X0P+0:0:-1:
-%1LA:-0X0P0:0:-1:
-%*1LA:-0X0P0:0:-1:
+%1LA:-0X.0P0:0:-1:
+%*1LA:-0X.0P0:0:-1:
 %1LA:-NAN(09A_Zaz):0:-1:
 %*1LA:-NAN(09A_Zaz):0:-1:
 %1LA:-NAN():0:-1:
@@ -86,8 +86,8 @@
 %*1LA:NAN():0:-1:
 %1LA:NAN(09A_Zaz):0:-1:
 %*1LA:NAN(09A_Zaz):0:-1:
-%1LA:0X0P0:1:1:0x0:
-%*1LA:0X0P0:0:1:
+%1LA:0X.0P0:1:1:0x0:
+%*1LA:0X.0P0:0:1:
 %1LA:0X0P+0:1:1:0x0:
 %*1LA:0X0P+0:0:1:
 %1LA:0X8P-16385:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1LA:+NAN():0:-1:
 %1LA:+NAN(09A_Zaz):0:-1:
 %*1LA:+NAN(09A_Zaz):0:-1:
-%1LA:+0X0P0:0:-1:
-%*1LA:+0X0P0:0:-1:
+%1LA:+0X.0P0:0:-1:
+%*1LA:+0X.0P0:0:-1:
 %1LA:+0X0P+0:0:-1:
 %*1LA:+0X0P+0:0:-1:
 %1LA:+0X8P-16385:0:-1:
@@ -138,8 +138,8 @@
 %*2LA:-0X8P-16385:0:2:
 %2LA:-0X0P+0:1:2:-0x0:
 %*2LA:-0X0P+0:0:2:
-%2LA:-0X0P0:1:2:-0x0:
-%*2LA:-0X0P0:0:2:
+%2LA:-0X.0P0:1:2:-0x0:
+%*2LA:-0X.0P0:0:2:
 %2LA:-NAN(09A_Zaz):0:-1:
 %*2LA:-NAN(09A_Zaz):0:-1:
 %2LA:-NAN():0:-1:
@@ -148,8 +148,8 @@
 %*2LA:NAN():0:-1:
 %2LA:NAN(09A_Zaz):0:-1:
 %*2LA:NAN(09A_Zaz):0:-1:
-%2LA:0X0P0:0:-1:
-%*2LA:0X0P0:0:-1:
+%2LA:0X.0P0:0:-1:
+%*2LA:0X.0P0:0:-1:
 %2LA:0X0P+0:0:-1:
 %*2LA:0X0P+0:0:-1:
 %2LA:0X8P-16385:0:-1:
@@ -168,8 +168,8 @@
 %*2LA:+NAN():0:-1:
 %2LA:+NAN(09A_Zaz):0:-1:
 %*2LA:+NAN(09A_Zaz):0:-1:
-%2LA:+0X0P0:1:2:0x0:
-%*2LA:+0X0P0:0:2:
+%2LA:+0X.0P0:1:2:0x0:
+%*2LA:+0X.0P0:0:2:
 %2LA:+0X0P+0:1:2:0x0:
 %*2LA:+0X0P+0:0:2:
 %2LA:+0X8P-16385:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3LA:-0X8P-16385:0:-1:
 %3LA:-0X0P+0:0:-1:
 %*3LA:-0X0P+0:0:-1:
-%3LA:-0X0P0:0:-1:
-%*3LA:-0X0P0:0:-1:
+%3LA:-0X.0P0:0:-1:
+%*3LA:-0X.0P0:0:-1:
 %3LA:-NAN(09A_Zaz):0:-1:
 %*3LA:-NAN(09A_Zaz):0:-1:
 %3LA:-NAN():0:-1:
@@ -210,8 +210,8 @@
 %*3LA:NAN():0:3:
 %3LA:NAN(09A_Zaz):1:3:nan:
 %*3LA:NAN(09A_Zaz):0:3:
-%3LA:0X0P0:1:3:0x0:
-%*3LA:0X0P0:0:3:
+%3LA:0X.0P0:0:-1:
+%*3LA:0X.0P0:0:-1:
 %3LA:0X0P+0:1:3:0x0:
 %*3LA:0X0P+0:0:3:
 %3LA:0X8P-16385:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3LA:+NAN():0:-1:
 %3LA:+NAN(09A_Zaz):0:-1:
 %*3LA:+NAN(09A_Zaz):0:-1:
-%3LA:+0X0P0:0:-1:
-%*3LA:+0X0P0:0:-1:
+%3LA:+0X.0P0:0:-1:
+%*3LA:+0X.0P0:0:-1:
 %3LA:+0X0P+0:0:-1:
 %*3LA:+0X0P+0:0:-1:
 %3LA:+0X8P-16385:0:-1:
@@ -262,8 +262,8 @@
 %*4LA:-0X8P-16385:0:4:
 %4LA:-0X0P+0:1:4:-0x0:
 %*4LA:-0X0P+0:0:4:
-%4LA:-0X0P0:1:4:-0x0:
-%*4LA:-0X0P0:0:4:
+%4LA:-0X.0P0:0:-1:
+%*4LA:-0X.0P0:0:-1:
 %4LA:-NAN(09A_Zaz):1:4:-nan:
 %*4LA:-NAN(09A_Zaz):0:4:
 %4LA:-NAN():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4LA:NAN():0:-1:
 %4LA:NAN(09A_Zaz):0:-1:
 %*4LA:NAN(09A_Zaz):0:-1:
-%4LA:0X0P0:0:-1:
-%*4LA:0X0P0:0:-1:
+%4LA:0X.0P0:1:4:0x0:
+%*4LA:0X.0P0:0:4:
 %4LA:0X0P+0:0:-1:
 %*4LA:0X0P+0:0:-1:
 %4LA:0X8P-16385:0:-1:
@@ -292,8 +292,8 @@
 %*4LA:+NAN():0:4:
 %4LA:+NAN(09A_Zaz):1:4:nan:
 %*4LA:+NAN(09A_Zaz):0:4:
-%4LA:+0X0P0:1:4:0x0:
-%*4LA:+0X0P0:0:4:
+%4LA:+0X.0P0:0:-1:
+%*4LA:+0X.0P0:0:-1:
 %4LA:+0X0P+0:1:4:0x0:
 %*4LA:+0X0P+0:0:4:
 %4LA:+0X8P-16385:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5LA:-0X8P-16385:0:-1:
 %5LA:-0X0P+0:0:-1:
 %*5LA:-0X0P+0:0:-1:
-%5LA:-0X0P0:0:-1:
-%*5LA:-0X0P0:0:-1:
+%5LA:-0X.0P0:1:5:-0x0:
+%*5LA:-0X.0P0:0:5:
 %5LA:-NAN(09A_Zaz):0:-1:
 %*5LA:-NAN(09A_Zaz):0:-1:
 %5LA:-NAN():0:-1:
@@ -334,8 +334,8 @@
 %*5LA:NAN():0:5:
 %5LA:NAN(09A_Zaz):0:-1:
 %*5LA:NAN(09A_Zaz):0:-1:
-%5LA:0X0P0:1:5:0x0:
-%*5LA:0X0P0:0:5:
+%5LA:0X.0P0:0:-1:
+%*5LA:0X.0P0:0:-1:
 %5LA:0X0P+0:0:-1:
 %*5LA:0X0P+0:0:-1:
 %5LA:0X8P-16385:0:-1:
@@ -354,8 +354,8 @@
 %*5LA:+NAN():0:-1:
 %5LA:+NAN(09A_Zaz):0:-1:
 %*5LA:+NAN(09A_Zaz):0:-1:
-%5LA:+0X0P0:0:-1:
-%*5LA:+0X0P0:0:-1:
+%5LA:+0X.0P0:1:5:0x0:
+%*5LA:+0X.0P0:0:5:
 %5LA:+0X0P+0:0:-1:
 %*5LA:+0X0P+0:0:-1:
 %5LA:+0X8P-16385:0:-1:
@@ -386,8 +386,8 @@
 %*6LA:-0X8P-16385:0:-1:
 %6LA:-0X0P+0:0:-1:
 %*6LA:-0X0P+0:0:-1:
-%6LA:-0X0P0:1:6:-0x0:
-%*6LA:-0X0P0:0:6:
+%6LA:-0X.0P0:0:-1:
+%*6LA:-0X.0P0:0:-1:
 %6LA:-NAN(09A_Zaz):0:-1:
 %*6LA:-NAN(09A_Zaz):0:-1:
 %6LA:-NAN():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6LA:NAN():0:5:
 %6LA:NAN(09A_Zaz):0:-1:
 %*6LA:NAN(09A_Zaz):0:-1:
-%6LA:0X0P0:1:5:0x0:
-%*6LA:0X0P0:0:5:
+%6LA:0X.0P0:1:6:0x0:
+%*6LA:0X.0P0:0:6:
 %6LA:0X0P+0:1:6:0x0:
 %*6LA:0X0P+0:0:6:
 %6LA:0X8P-16385:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6LA:+NAN():0:6:
 %6LA:+NAN(09A_Zaz):0:-1:
 %*6LA:+NAN(09A_Zaz):0:-1:
-%6LA:+0X0P0:1:6:0x0:
-%*6LA:+0X0P0:0:6:
+%6LA:+0X.0P0:0:-1:
+%*6LA:+0X.0P0:0:-1:
 %6LA:+0X0P+0:0:-1:
 %*6LA:+0X0P+0:0:-1:
 %6LA:+0X8P-16385:0:-1:
@@ -448,8 +448,8 @@
 %*22LA:-0X8P-16385:0:11:
 %22LA:-0X0P+0:1:7:-0x0:
 %*22LA:-0X0P+0:0:7:
-%22LA:-0X0P0:1:6:-0x0:
-%*22LA:-0X0P0:0:6:
+%22LA:-0X.0P0:1:7:-0x0:
+%*22LA:-0X.0P0:0:7:
 %22LA:-NAN(09A_Zaz):1:13:-nan:
 %*22LA:-NAN(09A_Zaz):0:13:
 %22LA:-NAN():1:6:-nan:
@@ -458,8 +458,8 @@
 %*22LA:NAN():0:5:
 %22LA:NAN(09A_Zaz):1:12:nan:
 %*22LA:NAN(09A_Zaz):0:12:
-%22LA:0X0P0:1:5:0x0:
-%*22LA:0X0P0:0:5:
+%22LA:0X.0P0:1:6:0x0:
+%*22LA:0X.0P0:0:6:
 %22LA:0X0P+0:1:6:0x0:
 %*22LA:0X0P+0:0:6:
 %22LA:0X8P-16385:1:10:0x1p-16382:
@@ -478,8 +478,8 @@
 %*22LA:+NAN():0:6:
 %22LA:+NAN(09A_Zaz):1:13:nan:
 %*22LA:+NAN(09A_Zaz):0:13:
-%22LA:+0X0P0:1:6:0x0:
-%*22LA:+0X0P0:0:6:
+%22LA:+0X.0P0:1:7:0x0:
+%*22LA:+0X.0P0:0:7:
 %22LA:+0X0P+0:1:7:0x0:
 %*22LA:+0X0P+0:0:7:
 %22LA:+0X8P-16385:1:11:0x1p-16382:
@@ -510,8 +510,8 @@
 %*37LA:-0X8P-16385:0:11:
 %37LA:-0X0P+0:1:7:-0x0:
 %*37LA:-0X0P+0:0:7:
-%37LA:-0X0P0:1:6:-0x0:
-%*37LA:-0X0P0:0:6:
+%37LA:-0X.0P0:1:7:-0x0:
+%*37LA:-0X.0P0:0:7:
 %37LA:-NAN(09A_Zaz):1:13:-nan:
 %*37LA:-NAN(09A_Zaz):0:13:
 %37LA:-NAN():1:6:-nan:
@@ -520,8 +520,8 @@
 %*37LA:NAN():0:5:
 %37LA:NAN(09A_Zaz):1:12:nan:
 %*37LA:NAN(09A_Zaz):0:12:
-%37LA:0X0P0:1:5:0x0:
-%*37LA:0X0P0:0:5:
+%37LA:0X.0P0:1:6:0x0:
+%*37LA:0X.0P0:0:6:
 %37LA:0X0P+0:1:6:0x0:
 %*37LA:0X0P+0:0:6:
 %37LA:0X8P-16385:1:10:0x1p-16382:
@@ -540,8 +540,8 @@
 %*37LA:+NAN():0:6:
 %37LA:+NAN(09A_Zaz):1:13:nan:
 %*37LA:+NAN(09A_Zaz):0:13:
-%37LA:+0X0P0:1:6:0x0:
-%*37LA:+0X0P0:0:6:
+%37LA:+0X.0P0:1:7:0x0:
+%*37LA:+0X.0P0:0:7:
 %37LA:+0X0P+0:1:7:0x0:
 %*37LA:+0X0P+0:0:7:
 %37LA:+0X8P-16385:1:11:0x1p-16382:
@@ -572,8 +572,8 @@
 %*5LA: -0X8P-16385:0:-1:
 %5LA: -0X0P+0:0:-1:
 %*5LA: -0X0P+0:0:-1:
-%5LA: -0X0P0:0:-1:
-%*5LA: -0X0P0:0:-1:
+%5LA: -0X.0P0:1:6:-0x0:
+%*5LA: -0X.0P0:0:6:
 %5LA: -NAN(09A_Zaz):0:-1:
 %*5LA: -NAN(09A_Zaz):0:-1:
 %5LA: -NAN():0:-1:
@@ -582,8 +582,8 @@
 %*5LA: NAN():0:6:
 %5LA: NAN(09A_Zaz):0:-1:
 %*5LA: NAN(09A_Zaz):0:-1:
-%5LA: 0X0P0:1:6:0x0:
-%*5LA: 0X0P0:0:6:
+%5LA: 0X.0P0:0:-1:
+%*5LA: 0X.0P0:0:-1:
 %5LA: 0X0P+0:0:-1:
 %*5LA: 0X0P+0:0:-1:
 %5LA: 0X8P-16385:0:-1:
@@ -602,8 +602,8 @@
 %*5LA: +NAN():0:-1:
 %5LA: +NAN(09A_Zaz):0:-1:
 %*5LA: +NAN(09A_Zaz):0:-1:
-%5LA: +0X0P0:0:-1:
-%*5LA: +0X0P0:0:-1:
+%5LA: +0X.0P0:1:6:0x0:
+%*5LA: +0X.0P0:0:6:
 %5LA: +0X0P+0:0:-1:
 %*5LA: +0X0P+0:0:-1:
 %5LA: +0X8P-16385:0:-1:
@@ -634,8 +634,8 @@
 %*37LA: -0X8P-16385:0:12:
 %37LA: -0X0P+0:1:8:-0x0:
 %*37LA: -0X0P+0:0:8:
-%37LA: -0X0P0:1:7:-0x0:
-%*37LA: -0X0P0:0:7:
+%37LA: -0X.0P0:1:8:-0x0:
+%*37LA: -0X.0P0:0:8:
 %37LA: -NAN(09A_Zaz):1:14:-nan:
 %*37LA: -NAN(09A_Zaz):0:14:
 %37LA: -NAN():1:7:-nan:
@@ -644,8 +644,8 @@
 %*37LA: NAN():0:6:
 %37LA: NAN(09A_Zaz):1:13:nan:
 %*37LA: NAN(09A_Zaz):0:13:
-%37LA: 0X0P0:1:6:0x0:
-%*37LA: 0X0P0:0:6:
+%37LA: 0X.0P0:1:7:0x0:
+%*37LA: 0X.0P0:0:7:
 %37LA: 0X0P+0:1:7:0x0:
 %*37LA: 0X0P+0:0:7:
 %37LA: 0X8P-16385:1:11:0x1p-16382:
@@ -664,8 +664,8 @@
 %*37LA: +NAN():0:7:
 %37LA: +NAN(09A_Zaz):1:14:nan:
 %*37LA: +NAN(09A_Zaz):0:14:
-%37LA: +0X0P0:1:7:0x0:
-%*37LA: +0X0P0:0:7:
+%37LA: +0X.0P0:1:8:0x0:
+%*37LA: +0X.0P0:0:8:
 %37LA: +0X0P+0:1:8:0x0:
 %*37LA: +0X0P+0:0:8:
 %37LA: +0X8P-16385:1:12:0x1p-16382:
diff --git a/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-g.input b/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-g.input
index 7c32ba1..eccc3b0 100644
--- a/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-g.input
+++ b/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-g.input
@@ -14,8 +14,8 @@
 %*Lg:-0x8p-16385:0:11:
 %Lg:-0x0p+0:1:7:-0x0:
 %*Lg:-0x0p+0:0:7:
-%Lg:-0x0p0:1:6:-0x0:
-%*Lg:-0x0p0:0:6:
+%Lg:-0x.0p0:1:7:-0x0:
+%*Lg:-0x.0p0:0:7:
 %Lg:-nan(09A_Zaz):1:13:-nan:
 %*Lg:-nan(09A_Zaz):0:13:
 %Lg:-nan():1:6:-nan:
@@ -24,8 +24,8 @@
 %*Lg:nan():0:5:
 %Lg:nan(09A_Zaz):1:12:nan:
 %*Lg:nan(09A_Zaz):0:12:
-%Lg:0x0p0:1:5:0x0:
-%*Lg:0x0p0:0:5:
+%Lg:0x.0p0:1:6:0x0:
+%*Lg:0x.0p0:0:6:
 %Lg:0x0p+0:1:6:0x0:
 %*Lg:0x0p+0:0:6:
 %Lg:0x8p-16385:1:10:0x1p-16382:
@@ -44,8 +44,8 @@
 %*Lg:+nan():0:6:
 %Lg:+nan(09A_Zaz):1:13:nan:
 %*Lg:+nan(09A_Zaz):0:13:
-%Lg:+0x0p0:1:6:0x0:
-%*Lg:+0x0p0:0:6:
+%Lg:+0x.0p0:1:7:0x0:
+%*Lg:+0x.0p0:0:7:
 %Lg:+0x0p+0:1:7:0x0:
 %*Lg:+0x0p+0:0:7:
 %Lg:+0x8p-16385:1:11:0x1p-16382:
@@ -76,8 +76,8 @@
 %*1Lg:-0x8p-16385:0:-1:
 %1Lg:-0x0p+0:0:-1:
 %*1Lg:-0x0p+0:0:-1:
-%1Lg:-0x0p0:0:-1:
-%*1Lg:-0x0p0:0:-1:
+%1Lg:-0x.0p0:0:-1:
+%*1Lg:-0x.0p0:0:-1:
 %1Lg:-nan(09A_Zaz):0:-1:
 %*1Lg:-nan(09A_Zaz):0:-1:
 %1Lg:-nan():0:-1:
@@ -86,8 +86,8 @@
 %*1Lg:nan():0:-1:
 %1Lg:nan(09A_Zaz):0:-1:
 %*1Lg:nan(09A_Zaz):0:-1:
-%1Lg:0x0p0:1:1:0x0:
-%*1Lg:0x0p0:0:1:
+%1Lg:0x.0p0:1:1:0x0:
+%*1Lg:0x.0p0:0:1:
 %1Lg:0x0p+0:1:1:0x0:
 %*1Lg:0x0p+0:0:1:
 %1Lg:0x8p-16385:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1Lg:+nan():0:-1:
 %1Lg:+nan(09A_Zaz):0:-1:
 %*1Lg:+nan(09A_Zaz):0:-1:
-%1Lg:+0x0p0:0:-1:
-%*1Lg:+0x0p0:0:-1:
+%1Lg:+0x.0p0:0:-1:
+%*1Lg:+0x.0p0:0:-1:
 %1Lg:+0x0p+0:0:-1:
 %*1Lg:+0x0p+0:0:-1:
 %1Lg:+0x8p-16385:0:-1:
@@ -138,8 +138,8 @@
 %*2Lg:-0x8p-16385:0:2:
 %2Lg:-0x0p+0:1:2:-0x0:
 %*2Lg:-0x0p+0:0:2:
-%2Lg:-0x0p0:1:2:-0x0:
-%*2Lg:-0x0p0:0:2:
+%2Lg:-0x.0p0:1:2:-0x0:
+%*2Lg:-0x.0p0:0:2:
 %2Lg:-nan(09A_Zaz):0:-1:
 %*2Lg:-nan(09A_Zaz):0:-1:
 %2Lg:-nan():0:-1:
@@ -148,8 +148,8 @@
 %*2Lg:nan():0:-1:
 %2Lg:nan(09A_Zaz):0:-1:
 %*2Lg:nan(09A_Zaz):0:-1:
-%2Lg:0x0p0:0:-1:
-%*2Lg:0x0p0:0:-1:
+%2Lg:0x.0p0:0:-1:
+%*2Lg:0x.0p0:0:-1:
 %2Lg:0x0p+0:0:-1:
 %*2Lg:0x0p+0:0:-1:
 %2Lg:0x8p-16385:0:-1:
@@ -168,8 +168,8 @@
 %*2Lg:+nan():0:-1:
 %2Lg:+nan(09A_Zaz):0:-1:
 %*2Lg:+nan(09A_Zaz):0:-1:
-%2Lg:+0x0p0:1:2:0x0:
-%*2Lg:+0x0p0:0:2:
+%2Lg:+0x.0p0:1:2:0x0:
+%*2Lg:+0x.0p0:0:2:
 %2Lg:+0x0p+0:1:2:0x0:
 %*2Lg:+0x0p+0:0:2:
 %2Lg:+0x8p-16385:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3Lg:-0x8p-16385:0:-1:
 %3Lg:-0x0p+0:0:-1:
 %*3Lg:-0x0p+0:0:-1:
-%3Lg:-0x0p0:0:-1:
-%*3Lg:-0x0p0:0:-1:
+%3Lg:-0x.0p0:0:-1:
+%*3Lg:-0x.0p0:0:-1:
 %3Lg:-nan(09A_Zaz):0:-1:
 %*3Lg:-nan(09A_Zaz):0:-1:
 %3Lg:-nan():0:-1:
@@ -210,8 +210,8 @@
 %*3Lg:nan():0:3:
 %3Lg:nan(09A_Zaz):1:3:nan:
 %*3Lg:nan(09A_Zaz):0:3:
-%3Lg:0x0p0:1:3:0x0:
-%*3Lg:0x0p0:0:3:
+%3Lg:0x.0p0:0:-1:
+%*3Lg:0x.0p0:0:-1:
 %3Lg:0x0p+0:1:3:0x0:
 %*3Lg:0x0p+0:0:3:
 %3Lg:0x8p-16385:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3Lg:+nan():0:-1:
 %3Lg:+nan(09A_Zaz):0:-1:
 %*3Lg:+nan(09A_Zaz):0:-1:
-%3Lg:+0x0p0:0:-1:
-%*3Lg:+0x0p0:0:-1:
+%3Lg:+0x.0p0:0:-1:
+%*3Lg:+0x.0p0:0:-1:
 %3Lg:+0x0p+0:0:-1:
 %*3Lg:+0x0p+0:0:-1:
 %3Lg:+0x8p-16385:0:-1:
@@ -262,8 +262,8 @@
 %*4Lg:-0x8p-16385:0:4:
 %4Lg:-0x0p+0:1:4:-0x0:
 %*4Lg:-0x0p+0:0:4:
-%4Lg:-0x0p0:1:4:-0x0:
-%*4Lg:-0x0p0:0:4:
+%4Lg:-0x.0p0:0:-1:
+%*4Lg:-0x.0p0:0:-1:
 %4Lg:-nan(09A_Zaz):1:4:-nan:
 %*4Lg:-nan(09A_Zaz):0:4:
 %4Lg:-nan():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4Lg:nan():0:-1:
 %4Lg:nan(09A_Zaz):0:-1:
 %*4Lg:nan(09A_Zaz):0:-1:
-%4Lg:0x0p0:0:-1:
-%*4Lg:0x0p0:0:-1:
+%4Lg:0x.0p0:1:4:0x0:
+%*4Lg:0x.0p0:0:4:
 %4Lg:0x0p+0:0:-1:
 %*4Lg:0x0p+0:0:-1:
 %4Lg:0x8p-16385:0:-1:
@@ -292,8 +292,8 @@
 %*4Lg:+nan():0:4:
 %4Lg:+nan(09A_Zaz):1:4:nan:
 %*4Lg:+nan(09A_Zaz):0:4:
-%4Lg:+0x0p0:1:4:0x0:
-%*4Lg:+0x0p0:0:4:
+%4Lg:+0x.0p0:0:-1:
+%*4Lg:+0x.0p0:0:-1:
 %4Lg:+0x0p+0:1:4:0x0:
 %*4Lg:+0x0p+0:0:4:
 %4Lg:+0x8p-16385:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5Lg:-0x8p-16385:0:-1:
 %5Lg:-0x0p+0:0:-1:
 %*5Lg:-0x0p+0:0:-1:
-%5Lg:-0x0p0:0:-1:
-%*5Lg:-0x0p0:0:-1:
+%5Lg:-0x.0p0:1:5:-0x0:
+%*5Lg:-0x.0p0:0:5:
 %5Lg:-nan(09A_Zaz):0:-1:
 %*5Lg:-nan(09A_Zaz):0:-1:
 %5Lg:-nan():0:-1:
@@ -334,8 +334,8 @@
 %*5Lg:nan():0:5:
 %5Lg:nan(09A_Zaz):0:-1:
 %*5Lg:nan(09A_Zaz):0:-1:
-%5Lg:0x0p0:1:5:0x0:
-%*5Lg:0x0p0:0:5:
+%5Lg:0x.0p0:0:-1:
+%*5Lg:0x.0p0:0:-1:
 %5Lg:0x0p+0:0:-1:
 %*5Lg:0x0p+0:0:-1:
 %5Lg:0x8p-16385:0:-1:
@@ -354,8 +354,8 @@
 %*5Lg:+nan():0:-1:
 %5Lg:+nan(09A_Zaz):0:-1:
 %*5Lg:+nan(09A_Zaz):0:-1:
-%5Lg:+0x0p0:0:-1:
-%*5Lg:+0x0p0:0:-1:
+%5Lg:+0x.0p0:1:5:0x0:
+%*5Lg:+0x.0p0:0:5:
 %5Lg:+0x0p+0:0:-1:
 %*5Lg:+0x0p+0:0:-1:
 %5Lg:+0x8p-16385:0:-1:
@@ -386,8 +386,8 @@
 %*6Lg:-0x8p-16385:0:-1:
 %6Lg:-0x0p+0:0:-1:
 %*6Lg:-0x0p+0:0:-1:
-%6Lg:-0x0p0:1:6:-0x0:
-%*6Lg:-0x0p0:0:6:
+%6Lg:-0x.0p0:0:-1:
+%*6Lg:-0x.0p0:0:-1:
 %6Lg:-nan(09A_Zaz):0:-1:
 %*6Lg:-nan(09A_Zaz):0:-1:
 %6Lg:-nan():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6Lg:nan():0:5:
 %6Lg:nan(09A_Zaz):0:-1:
 %*6Lg:nan(09A_Zaz):0:-1:
-%6Lg:0x0p0:1:5:0x0:
-%*6Lg:0x0p0:0:5:
+%6Lg:0x.0p0:1:6:0x0:
+%*6Lg:0x.0p0:0:6:
 %6Lg:0x0p+0:1:6:0x0:
 %*6Lg:0x0p+0:0:6:
 %6Lg:0x8p-16385:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6Lg:+nan():0:6:
 %6Lg:+nan(09A_Zaz):0:-1:
 %*6Lg:+nan(09A_Zaz):0:-1:
-%6Lg:+0x0p0:1:6:0x0:
-%*6Lg:+0x0p0:0:6:
+%6Lg:+0x.0p0:0:-1:
+%*6Lg:+0x.0p0:0:-1:
 %6Lg:+0x0p+0:0:-1:
 %*6Lg:+0x0p+0:0:-1:
 %6Lg:+0x8p-16385:0:-1:
@@ -448,8 +448,8 @@
 %*22Lg:-0x8p-16385:0:11:
 %22Lg:-0x0p+0:1:7:-0x0:
 %*22Lg:-0x0p+0:0:7:
-%22Lg:-0x0p0:1:6:-0x0:
-%*22Lg:-0x0p0:0:6:
+%22Lg:-0x.0p0:1:7:-0x0:
+%*22Lg:-0x.0p0:0:7:
 %22Lg:-nan(09A_Zaz):1:13:-nan:
 %*22Lg:-nan(09A_Zaz):0:13:
 %22Lg:-nan():1:6:-nan:
@@ -458,8 +458,8 @@
 %*22Lg:nan():0:5:
 %22Lg:nan(09A_Zaz):1:12:nan:
 %*22Lg:nan(09A_Zaz):0:12:
-%22Lg:0x0p0:1:5:0x0:
-%*22Lg:0x0p0:0:5:
+%22Lg:0x.0p0:1:6:0x0:
+%*22Lg:0x.0p0:0:6:
 %22Lg:0x0p+0:1:6:0x0:
 %*22Lg:0x0p+0:0:6:
 %22Lg:0x8p-16385:1:10:0x1p-16382:
@@ -478,8 +478,8 @@
 %*22Lg:+nan():0:6:
 %22Lg:+nan(09A_Zaz):1:13:nan:
 %*22Lg:+nan(09A_Zaz):0:13:
-%22Lg:+0x0p0:1:6:0x0:
-%*22Lg:+0x0p0:0:6:
+%22Lg:+0x.0p0:1:7:0x0:
+%*22Lg:+0x.0p0:0:7:
 %22Lg:+0x0p+0:1:7:0x0:
 %*22Lg:+0x0p+0:0:7:
 %22Lg:+0x8p-16385:1:11:0x1p-16382:
@@ -510,8 +510,8 @@
 %*37Lg:-0x8p-16385:0:11:
 %37Lg:-0x0p+0:1:7:-0x0:
 %*37Lg:-0x0p+0:0:7:
-%37Lg:-0x0p0:1:6:-0x0:
-%*37Lg:-0x0p0:0:6:
+%37Lg:-0x.0p0:1:7:-0x0:
+%*37Lg:-0x.0p0:0:7:
 %37Lg:-nan(09A_Zaz):1:13:-nan:
 %*37Lg:-nan(09A_Zaz):0:13:
 %37Lg:-nan():1:6:-nan:
@@ -520,8 +520,8 @@
 %*37Lg:nan():0:5:
 %37Lg:nan(09A_Zaz):1:12:nan:
 %*37Lg:nan(09A_Zaz):0:12:
-%37Lg:0x0p0:1:5:0x0:
-%*37Lg:0x0p0:0:5:
+%37Lg:0x.0p0:1:6:0x0:
+%*37Lg:0x.0p0:0:6:
 %37Lg:0x0p+0:1:6:0x0:
 %*37Lg:0x0p+0:0:6:
 %37Lg:0x8p-16385:1:10:0x1p-16382:
@@ -540,8 +540,8 @@
 %*37Lg:+nan():0:6:
 %37Lg:+nan(09A_Zaz):1:13:nan:
 %*37Lg:+nan(09A_Zaz):0:13:
-%37Lg:+0x0p0:1:6:0x0:
-%*37Lg:+0x0p0:0:6:
+%37Lg:+0x.0p0:1:7:0x0:
+%*37Lg:+0x.0p0:0:7:
 %37Lg:+0x0p+0:1:7:0x0:
 %*37Lg:+0x0p+0:0:7:
 %37Lg:+0x8p-16385:1:11:0x1p-16382:
@@ -572,8 +572,8 @@
 %*5Lg: -0x8p-16385:0:-1:
 %5Lg: -0x0p+0:0:-1:
 %*5Lg: -0x0p+0:0:-1:
-%5Lg: -0x0p0:0:-1:
-%*5Lg: -0x0p0:0:-1:
+%5Lg: -0x.0p0:1:6:-0x0:
+%*5Lg: -0x.0p0:0:6:
 %5Lg: -nan(09A_Zaz):0:-1:
 %*5Lg: -nan(09A_Zaz):0:-1:
 %5Lg: -nan():0:-1:
@@ -582,8 +582,8 @@
 %*5Lg: nan():0:6:
 %5Lg: nan(09A_Zaz):0:-1:
 %*5Lg: nan(09A_Zaz):0:-1:
-%5Lg: 0x0p0:1:6:0x0:
-%*5Lg: 0x0p0:0:6:
+%5Lg: 0x.0p0:0:-1:
+%*5Lg: 0x.0p0:0:-1:
 %5Lg: 0x0p+0:0:-1:
 %*5Lg: 0x0p+0:0:-1:
 %5Lg: 0x8p-16385:0:-1:
@@ -602,8 +602,8 @@
 %*5Lg: +nan():0:-1:
 %5Lg: +nan(09A_Zaz):0:-1:
 %*5Lg: +nan(09A_Zaz):0:-1:
-%5Lg: +0x0p0:0:-1:
-%*5Lg: +0x0p0:0:-1:
+%5Lg: +0x.0p0:1:6:0x0:
+%*5Lg: +0x.0p0:0:6:
 %5Lg: +0x0p+0:0:-1:
 %*5Lg: +0x0p+0:0:-1:
 %5Lg: +0x8p-16385:0:-1:
@@ -634,8 +634,8 @@
 %*37Lg: -0x8p-16385:0:12:
 %37Lg: -0x0p+0:1:8:-0x0:
 %*37Lg: -0x0p+0:0:8:
-%37Lg: -0x0p0:1:7:-0x0:
-%*37Lg: -0x0p0:0:7:
+%37Lg: -0x.0p0:1:8:-0x0:
+%*37Lg: -0x.0p0:0:8:
 %37Lg: -nan(09A_Zaz):1:14:-nan:
 %*37Lg: -nan(09A_Zaz):0:14:
 %37Lg: -nan():1:7:-nan:
@@ -644,8 +644,8 @@
 %*37Lg: nan():0:6:
 %37Lg: nan(09A_Zaz):1:13:nan:
 %*37Lg: nan(09A_Zaz):0:13:
-%37Lg: 0x0p0:1:6:0x0:
-%*37Lg: 0x0p0:0:6:
+%37Lg: 0x.0p0:1:7:0x0:
+%*37Lg: 0x.0p0:0:7:
 %37Lg: 0x0p+0:1:7:0x0:
 %*37Lg: 0x0p+0:0:7:
 %37Lg: 0x8p-16385:1:11:0x1p-16382:
@@ -664,8 +664,8 @@
 %*37Lg: +nan():0:7:
 %37Lg: +nan(09A_Zaz):1:14:nan:
 %*37Lg: +nan(09A_Zaz):0:14:
-%37Lg: +0x0p0:1:7:0x0:
-%*37Lg: +0x0p0:0:7:
+%37Lg: +0x.0p0:1:8:0x0:
+%*37Lg: +0x.0p0:0:8:
 %37Lg: +0x0p+0:1:8:0x0:
 %*37Lg: +0x0p+0:0:8:
 %37Lg: +0x8p-16385:1:12:0x1p-16382:
diff --git a/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-gg.input b/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-gg.input
index 15f8ea1..ac47819 100644
--- a/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-gg.input
+++ b/sysdeps/ieee754/ldbl-96/tst-scanf-format-ldouble-gg.input
@@ -14,8 +14,8 @@
 %*LG:-0X8P-16385:0:11:
 %LG:-0X0P+0:1:7:-0x0:
 %*LG:-0X0P+0:0:7:
-%LG:-0X0P0:1:6:-0x0:
-%*LG:-0X0P0:0:6:
+%LG:-0X.0P0:1:7:-0x0:
+%*LG:-0X.0P0:0:7:
 %LG:-NAN(09A_Zaz):1:13:-nan:
 %*LG:-NAN(09A_Zaz):0:13:
 %LG:-NAN():1:6:-nan:
@@ -24,8 +24,8 @@
 %*LG:NAN():0:5:
 %LG:NAN(09A_Zaz):1:12:nan:
 %*LG:NAN(09A_Zaz):0:12:
-%LG:0X0P0:1:5:0x0:
-%*LG:0X0P0:0:5:
+%LG:0X.0P0:1:6:0x0:
+%*LG:0X.0P0:0:6:
 %LG:0X0P+0:1:6:0x0:
 %*LG:0X0P+0:0:6:
 %LG:0X8P-16385:1:10:0x1p-16382:
@@ -44,8 +44,8 @@
 %*LG:+NAN():0:6:
 %LG:+NAN(09A_Zaz):1:13:nan:
 %*LG:+NAN(09A_Zaz):0:13:
-%LG:+0X0P0:1:6:0x0:
-%*LG:+0X0P0:0:6:
+%LG:+0X.0P0:1:7:0x0:
+%*LG:+0X.0P0:0:7:
 %LG:+0X0P+0:1:7:0x0:
 %*LG:+0X0P+0:0:7:
 %LG:+0X8P-16385:1:11:0x1p-16382:
@@ -76,8 +76,8 @@
 %*1LG:-0X8P-16385:0:-1:
 %1LG:-0X0P+0:0:-1:
 %*1LG:-0X0P+0:0:-1:
-%1LG:-0X0P0:0:-1:
-%*1LG:-0X0P0:0:-1:
+%1LG:-0X.0P0:0:-1:
+%*1LG:-0X.0P0:0:-1:
 %1LG:-NAN(09A_Zaz):0:-1:
 %*1LG:-NAN(09A_Zaz):0:-1:
 %1LG:-NAN():0:-1:
@@ -86,8 +86,8 @@
 %*1LG:NAN():0:-1:
 %1LG:NAN(09A_Zaz):0:-1:
 %*1LG:NAN(09A_Zaz):0:-1:
-%1LG:0X0P0:1:1:0x0:
-%*1LG:0X0P0:0:1:
+%1LG:0X.0P0:1:1:0x0:
+%*1LG:0X.0P0:0:1:
 %1LG:0X0P+0:1:1:0x0:
 %*1LG:0X0P+0:0:1:
 %1LG:0X8P-16385:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1LG:+NAN():0:-1:
 %1LG:+NAN(09A_Zaz):0:-1:
 %*1LG:+NAN(09A_Zaz):0:-1:
-%1LG:+0X0P0:0:-1:
-%*1LG:+0X0P0:0:-1:
+%1LG:+0X.0P0:0:-1:
+%*1LG:+0X.0P0:0:-1:
 %1LG:+0X0P+0:0:-1:
 %*1LG:+0X0P+0:0:-1:
 %1LG:+0X8P-16385:0:-1:
@@ -138,8 +138,8 @@
 %*2LG:-0X8P-16385:0:2:
 %2LG:-0X0P+0:1:2:-0x0:
 %*2LG:-0X0P+0:0:2:
-%2LG:-0X0P0:1:2:-0x0:
-%*2LG:-0X0P0:0:2:
+%2LG:-0X.0P0:1:2:-0x0:
+%*2LG:-0X.0P0:0:2:
 %2LG:-NAN(09A_Zaz):0:-1:
 %*2LG:-NAN(09A_Zaz):0:-1:
 %2LG:-NAN():0:-1:
@@ -148,8 +148,8 @@
 %*2LG:NAN():0:-1:
 %2LG:NAN(09A_Zaz):0:-1:
 %*2LG:NAN(09A_Zaz):0:-1:
-%2LG:0X0P0:0:-1:
-%*2LG:0X0P0:0:-1:
+%2LG:0X.0P0:0:-1:
+%*2LG:0X.0P0:0:-1:
 %2LG:0X0P+0:0:-1:
 %*2LG:0X0P+0:0:-1:
 %2LG:0X8P-16385:0:-1:
@@ -168,8 +168,8 @@
 %*2LG:+NAN():0:-1:
 %2LG:+NAN(09A_Zaz):0:-1:
 %*2LG:+NAN(09A_Zaz):0:-1:
-%2LG:+0X0P0:1:2:0x0:
-%*2LG:+0X0P0:0:2:
+%2LG:+0X.0P0:1:2:0x0:
+%*2LG:+0X.0P0:0:2:
 %2LG:+0X0P+0:1:2:0x0:
 %*2LG:+0X0P+0:0:2:
 %2LG:+0X8P-16385:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3LG:-0X8P-16385:0:-1:
 %3LG:-0X0P+0:0:-1:
 %*3LG:-0X0P+0:0:-1:
-%3LG:-0X0P0:0:-1:
-%*3LG:-0X0P0:0:-1:
+%3LG:-0X.0P0:0:-1:
+%*3LG:-0X.0P0:0:-1:
 %3LG:-NAN(09A_Zaz):0:-1:
 %*3LG:-NAN(09A_Zaz):0:-1:
 %3LG:-NAN():0:-1:
@@ -210,8 +210,8 @@
 %*3LG:NAN():0:3:
 %3LG:NAN(09A_Zaz):1:3:nan:
 %*3LG:NAN(09A_Zaz):0:3:
-%3LG:0X0P0:1:3:0x0:
-%*3LG:0X0P0:0:3:
+%3LG:0X.0P0:0:-1:
+%*3LG:0X.0P0:0:-1:
 %3LG:0X0P+0:1:3:0x0:
 %*3LG:0X0P+0:0:3:
 %3LG:0X8P-16385:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3LG:+NAN():0:-1:
 %3LG:+NAN(09A_Zaz):0:-1:
 %*3LG:+NAN(09A_Zaz):0:-1:
-%3LG:+0X0P0:0:-1:
-%*3LG:+0X0P0:0:-1:
+%3LG:+0X.0P0:0:-1:
+%*3LG:+0X.0P0:0:-1:
 %3LG:+0X0P+0:0:-1:
 %*3LG:+0X0P+0:0:-1:
 %3LG:+0X8P-16385:0:-1:
@@ -262,8 +262,8 @@
 %*4LG:-0X8P-16385:0:4:
 %4LG:-0X0P+0:1:4:-0x0:
 %*4LG:-0X0P+0:0:4:
-%4LG:-0X0P0:1:4:-0x0:
-%*4LG:-0X0P0:0:4:
+%4LG:-0X.0P0:0:-1:
+%*4LG:-0X.0P0:0:-1:
 %4LG:-NAN(09A_Zaz):1:4:-nan:
 %*4LG:-NAN(09A_Zaz):0:4:
 %4LG:-NAN():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4LG:NAN():0:-1:
 %4LG:NAN(09A_Zaz):0:-1:
 %*4LG:NAN(09A_Zaz):0:-1:
-%4LG:0X0P0:0:-1:
-%*4LG:0X0P0:0:-1:
+%4LG:0X.0P0:1:4:0x0:
+%*4LG:0X.0P0:0:4:
 %4LG:0X0P+0:0:-1:
 %*4LG:0X0P+0:0:-1:
 %4LG:0X8P-16385:0:-1:
@@ -292,8 +292,8 @@
 %*4LG:+NAN():0:4:
 %4LG:+NAN(09A_Zaz):1:4:nan:
 %*4LG:+NAN(09A_Zaz):0:4:
-%4LG:+0X0P0:1:4:0x0:
-%*4LG:+0X0P0:0:4:
+%4LG:+0X.0P0:0:-1:
+%*4LG:+0X.0P0:0:-1:
 %4LG:+0X0P+0:1:4:0x0:
 %*4LG:+0X0P+0:0:4:
 %4LG:+0X8P-16385:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5LG:-0X8P-16385:0:-1:
 %5LG:-0X0P+0:0:-1:
 %*5LG:-0X0P+0:0:-1:
-%5LG:-0X0P0:0:-1:
-%*5LG:-0X0P0:0:-1:
+%5LG:-0X.0P0:1:5:-0x0:
+%*5LG:-0X.0P0:0:5:
 %5LG:-NAN(09A_Zaz):0:-1:
 %*5LG:-NAN(09A_Zaz):0:-1:
 %5LG:-NAN():0:-1:
@@ -334,8 +334,8 @@
 %*5LG:NAN():0:5:
 %5LG:NAN(09A_Zaz):0:-1:
 %*5LG:NAN(09A_Zaz):0:-1:
-%5LG:0X0P0:1:5:0x0:
-%*5LG:0X0P0:0:5:
+%5LG:0X.0P0:0:-1:
+%*5LG:0X.0P0:0:-1:
 %5LG:0X0P+0:0:-1:
 %*5LG:0X0P+0:0:-1:
 %5LG:0X8P-16385:0:-1:
@@ -354,8 +354,8 @@
 %*5LG:+NAN():0:-1:
 %5LG:+NAN(09A_Zaz):0:-1:
 %*5LG:+NAN(09A_Zaz):0:-1:
-%5LG:+0X0P0:0:-1:
-%*5LG:+0X0P0:0:-1:
+%5LG:+0X.0P0:1:5:0x0:
+%*5LG:+0X.0P0:0:5:
 %5LG:+0X0P+0:0:-1:
 %*5LG:+0X0P+0:0:-1:
 %5LG:+0X8P-16385:0:-1:
@@ -386,8 +386,8 @@
 %*6LG:-0X8P-16385:0:-1:
 %6LG:-0X0P+0:0:-1:
 %*6LG:-0X0P+0:0:-1:
-%6LG:-0X0P0:1:6:-0x0:
-%*6LG:-0X0P0:0:6:
+%6LG:-0X.0P0:0:-1:
+%*6LG:-0X.0P0:0:-1:
 %6LG:-NAN(09A_Zaz):0:-1:
 %*6LG:-NAN(09A_Zaz):0:-1:
 %6LG:-NAN():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6LG:NAN():0:5:
 %6LG:NAN(09A_Zaz):0:-1:
 %*6LG:NAN(09A_Zaz):0:-1:
-%6LG:0X0P0:1:5:0x0:
-%*6LG:0X0P0:0:5:
+%6LG:0X.0P0:1:6:0x0:
+%*6LG:0X.0P0:0:6:
 %6LG:0X0P+0:1:6:0x0:
 %*6LG:0X0P+0:0:6:
 %6LG:0X8P-16385:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6LG:+NAN():0:6:
 %6LG:+NAN(09A_Zaz):0:-1:
 %*6LG:+NAN(09A_Zaz):0:-1:
-%6LG:+0X0P0:1:6:0x0:
-%*6LG:+0X0P0:0:6:
+%6LG:+0X.0P0:0:-1:
+%*6LG:+0X.0P0:0:-1:
 %6LG:+0X0P+0:0:-1:
 %*6LG:+0X0P+0:0:-1:
 %6LG:+0X8P-16385:0:-1:
@@ -448,8 +448,8 @@
 %*22LG:-0X8P-16385:0:11:
 %22LG:-0X0P+0:1:7:-0x0:
 %*22LG:-0X0P+0:0:7:
-%22LG:-0X0P0:1:6:-0x0:
-%*22LG:-0X0P0:0:6:
+%22LG:-0X.0P0:1:7:-0x0:
+%*22LG:-0X.0P0:0:7:
 %22LG:-NAN(09A_Zaz):1:13:-nan:
 %*22LG:-NAN(09A_Zaz):0:13:
 %22LG:-NAN():1:6:-nan:
@@ -458,8 +458,8 @@
 %*22LG:NAN():0:5:
 %22LG:NAN(09A_Zaz):1:12:nan:
 %*22LG:NAN(09A_Zaz):0:12:
-%22LG:0X0P0:1:5:0x0:
-%*22LG:0X0P0:0:5:
+%22LG:0X.0P0:1:6:0x0:
+%*22LG:0X.0P0:0:6:
 %22LG:0X0P+0:1:6:0x0:
 %*22LG:0X0P+0:0:6:
 %22LG:0X8P-16385:1:10:0x1p-16382:
@@ -478,8 +478,8 @@
 %*22LG:+NAN():0:6:
 %22LG:+NAN(09A_Zaz):1:13:nan:
 %*22LG:+NAN(09A_Zaz):0:13:
-%22LG:+0X0P0:1:6:0x0:
-%*22LG:+0X0P0:0:6:
+%22LG:+0X.0P0:1:7:0x0:
+%*22LG:+0X.0P0:0:7:
 %22LG:+0X0P+0:1:7:0x0:
 %*22LG:+0X0P+0:0:7:
 %22LG:+0X8P-16385:1:11:0x1p-16382:
@@ -510,8 +510,8 @@
 %*37LG:-0X8P-16385:0:11:
 %37LG:-0X0P+0:1:7:-0x0:
 %*37LG:-0X0P+0:0:7:
-%37LG:-0X0P0:1:6:-0x0:
-%*37LG:-0X0P0:0:6:
+%37LG:-0X.0P0:1:7:-0x0:
+%*37LG:-0X.0P0:0:7:
 %37LG:-NAN(09A_Zaz):1:13:-nan:
 %*37LG:-NAN(09A_Zaz):0:13:
 %37LG:-NAN():1:6:-nan:
@@ -520,8 +520,8 @@
 %*37LG:NAN():0:5:
 %37LG:NAN(09A_Zaz):1:12:nan:
 %*37LG:NAN(09A_Zaz):0:12:
-%37LG:0X0P0:1:5:0x0:
-%*37LG:0X0P0:0:5:
+%37LG:0X.0P0:1:6:0x0:
+%*37LG:0X.0P0:0:6:
 %37LG:0X0P+0:1:6:0x0:
 %*37LG:0X0P+0:0:6:
 %37LG:0X8P-16385:1:10:0x1p-16382:
@@ -540,8 +540,8 @@
 %*37LG:+NAN():0:6:
 %37LG:+NAN(09A_Zaz):1:13:nan:
 %*37LG:+NAN(09A_Zaz):0:13:
-%37LG:+0X0P0:1:6:0x0:
-%*37LG:+0X0P0:0:6:
+%37LG:+0X.0P0:1:7:0x0:
+%*37LG:+0X.0P0:0:7:
 %37LG:+0X0P+0:1:7:0x0:
 %*37LG:+0X0P+0:0:7:
 %37LG:+0X8P-16385:1:11:0x1p-16382:
@@ -572,8 +572,8 @@
 %*5LG: -0X8P-16385:0:-1:
 %5LG: -0X0P+0:0:-1:
 %*5LG: -0X0P+0:0:-1:
-%5LG: -0X0P0:0:-1:
-%*5LG: -0X0P0:0:-1:
+%5LG: -0X.0P0:1:6:-0x0:
+%*5LG: -0X.0P0:0:6:
 %5LG: -NAN(09A_Zaz):0:-1:
 %*5LG: -NAN(09A_Zaz):0:-1:
 %5LG: -NAN():0:-1:
@@ -582,8 +582,8 @@
 %*5LG: NAN():0:6:
 %5LG: NAN(09A_Zaz):0:-1:
 %*5LG: NAN(09A_Zaz):0:-1:
-%5LG: 0X0P0:1:6:0x0:
-%*5LG: 0X0P0:0:6:
+%5LG: 0X.0P0:0:-1:
+%*5LG: 0X.0P0:0:-1:
 %5LG: 0X0P+0:0:-1:
 %*5LG: 0X0P+0:0:-1:
 %5LG: 0X8P-16385:0:-1:
@@ -602,8 +602,8 @@
 %*5LG: +NAN():0:-1:
 %5LG: +NAN(09A_Zaz):0:-1:
 %*5LG: +NAN(09A_Zaz):0:-1:
-%5LG: +0X0P0:0:-1:
-%*5LG: +0X0P0:0:-1:
+%5LG: +0X.0P0:1:6:0x0:
+%*5LG: +0X.0P0:0:6:
 %5LG: +0X0P+0:0:-1:
 %*5LG: +0X0P+0:0:-1:
 %5LG: +0X8P-16385:0:-1:
@@ -634,8 +634,8 @@
 %*37LG: -0X8P-16385:0:12:
 %37LG: -0X0P+0:1:8:-0x0:
 %*37LG: -0X0P+0:0:8:
-%37LG: -0X0P0:1:7:-0x0:
-%*37LG: -0X0P0:0:7:
+%37LG: -0X.0P0:1:8:-0x0:
+%*37LG: -0X.0P0:0:8:
 %37LG: -NAN(09A_Zaz):1:14:-nan:
 %*37LG: -NAN(09A_Zaz):0:14:
 %37LG: -NAN():1:7:-nan:
@@ -644,8 +644,8 @@
 %*37LG: NAN():0:6:
 %37LG: NAN(09A_Zaz):1:13:nan:
 %*37LG: NAN(09A_Zaz):0:13:
-%37LG: 0X0P0:1:6:0x0:
-%*37LG: 0X0P0:0:6:
+%37LG: 0X.0P0:1:7:0x0:
+%*37LG: 0X.0P0:0:7:
 %37LG: 0X0P+0:1:7:0x0:
 %*37LG: 0X0P+0:0:7:
 %37LG: 0X8P-16385:1:11:0x1p-16382:
@@ -664,8 +664,8 @@
 %*37LG: +NAN():0:7:
 %37LG: +NAN(09A_Zaz):1:14:nan:
 %*37LG: +NAN(09A_Zaz):0:14:
-%37LG: +0X0P0:1:7:0x0:
-%*37LG: +0X0P0:0:7:
+%37LG: +0X.0P0:1:8:0x0:
+%*37LG: +0X.0P0:0:8:
 %37LG: +0X0P+0:1:8:0x0:
 %*37LG: +0X0P+0:0:8:
 %37LG: +0X8P-16385:1:12:0x1p-16382:
diff --git a/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-a.input b/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-a.input
index 59f3dff..1ada692 100644
--- a/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-a.input
+++ b/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-a.input
@@ -14,8 +14,8 @@
 %*La:-0x8p-1025:0:10:
 %La:-0x0p+0:1:7:-0x0:
 %*La:-0x0p+0:0:7:
-%La:-0x0p0:1:6:-0x0:
-%*La:-0x0p0:0:6:
+%La:-0x.0p0:1:7:-0x0:
+%*La:-0x.0p0:0:7:
 %La:-nan(09A_Zaz):1:13:-nan:
 %*La:-nan(09A_Zaz):0:13:
 %La:-nan():1:6:-nan:
@@ -24,8 +24,8 @@
 %*La:nan():0:5:
 %La:nan(09A_Zaz):1:12:nan:
 %*La:nan(09A_Zaz):0:12:
-%La:0x0p0:1:5:0x0:
-%*La:0x0p0:0:5:
+%La:0x.0p0:1:6:0x0:
+%*La:0x.0p0:0:6:
 %La:0x0p+0:1:6:0x0:
 %*La:0x0p+0:0:6:
 %La:0x8p-1025:1:9:0x1p-1022:
@@ -44,8 +44,8 @@
 %*La:+nan():0:6:
 %La:+nan(09A_Zaz):1:13:nan:
 %*La:+nan(09A_Zaz):0:13:
-%La:+0x0p0:1:6:0x0:
-%*La:+0x0p0:0:6:
+%La:+0x.0p0:1:7:0x0:
+%*La:+0x.0p0:0:7:
 %La:+0x0p+0:1:7:0x0:
 %*La:+0x0p+0:0:7:
 %La:+0x8p-1025:1:10:0x1p-1022:
@@ -76,8 +76,8 @@
 %*1La:-0x8p-1025:0:-1:
 %1La:-0x0p+0:0:-1:
 %*1La:-0x0p+0:0:-1:
-%1La:-0x0p0:0:-1:
-%*1La:-0x0p0:0:-1:
+%1La:-0x.0p0:0:-1:
+%*1La:-0x.0p0:0:-1:
 %1La:-nan(09A_Zaz):0:-1:
 %*1La:-nan(09A_Zaz):0:-1:
 %1La:-nan():0:-1:
@@ -86,8 +86,8 @@
 %*1La:nan():0:-1:
 %1La:nan(09A_Zaz):0:-1:
 %*1La:nan(09A_Zaz):0:-1:
-%1La:0x0p0:1:1:0x0:
-%*1La:0x0p0:0:1:
+%1La:0x.0p0:1:1:0x0:
+%*1La:0x.0p0:0:1:
 %1La:0x0p+0:1:1:0x0:
 %*1La:0x0p+0:0:1:
 %1La:0x8p-1025:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1La:+nan():0:-1:
 %1La:+nan(09A_Zaz):0:-1:
 %*1La:+nan(09A_Zaz):0:-1:
-%1La:+0x0p0:0:-1:
-%*1La:+0x0p0:0:-1:
+%1La:+0x.0p0:0:-1:
+%*1La:+0x.0p0:0:-1:
 %1La:+0x0p+0:0:-1:
 %*1La:+0x0p+0:0:-1:
 %1La:+0x8p-1025:0:-1:
@@ -138,8 +138,8 @@
 %*2La:-0x8p-1025:0:2:
 %2La:-0x0p+0:1:2:-0x0:
 %*2La:-0x0p+0:0:2:
-%2La:-0x0p0:1:2:-0x0:
-%*2La:-0x0p0:0:2:
+%2La:-0x.0p0:1:2:-0x0:
+%*2La:-0x.0p0:0:2:
 %2La:-nan(09A_Zaz):0:-1:
 %*2La:-nan(09A_Zaz):0:-1:
 %2La:-nan():0:-1:
@@ -148,8 +148,8 @@
 %*2La:nan():0:-1:
 %2La:nan(09A_Zaz):0:-1:
 %*2La:nan(09A_Zaz):0:-1:
-%2La:0x0p0:0:-1:
-%*2La:0x0p0:0:-1:
+%2La:0x.0p0:0:-1:
+%*2La:0x.0p0:0:-1:
 %2La:0x0p+0:0:-1:
 %*2La:0x0p+0:0:-1:
 %2La:0x8p-1025:0:-1:
@@ -168,8 +168,8 @@
 %*2La:+nan():0:-1:
 %2La:+nan(09A_Zaz):0:-1:
 %*2La:+nan(09A_Zaz):0:-1:
-%2La:+0x0p0:1:2:0x0:
-%*2La:+0x0p0:0:2:
+%2La:+0x.0p0:1:2:0x0:
+%*2La:+0x.0p0:0:2:
 %2La:+0x0p+0:1:2:0x0:
 %*2La:+0x0p+0:0:2:
 %2La:+0x8p-1025:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3La:-0x8p-1025:0:-1:
 %3La:-0x0p+0:0:-1:
 %*3La:-0x0p+0:0:-1:
-%3La:-0x0p0:0:-1:
-%*3La:-0x0p0:0:-1:
+%3La:-0x.0p0:0:-1:
+%*3La:-0x.0p0:0:-1:
 %3La:-nan(09A_Zaz):0:-1:
 %*3La:-nan(09A_Zaz):0:-1:
 %3La:-nan():0:-1:
@@ -210,8 +210,8 @@
 %*3La:nan():0:3:
 %3La:nan(09A_Zaz):1:3:nan:
 %*3La:nan(09A_Zaz):0:3:
-%3La:0x0p0:1:3:0x0:
-%*3La:0x0p0:0:3:
+%3La:0x.0p0:0:-1:
+%*3La:0x.0p0:0:-1:
 %3La:0x0p+0:1:3:0x0:
 %*3La:0x0p+0:0:3:
 %3La:0x8p-1025:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3La:+nan():0:-1:
 %3La:+nan(09A_Zaz):0:-1:
 %*3La:+nan(09A_Zaz):0:-1:
-%3La:+0x0p0:0:-1:
-%*3La:+0x0p0:0:-1:
+%3La:+0x.0p0:0:-1:
+%*3La:+0x.0p0:0:-1:
 %3La:+0x0p+0:0:-1:
 %*3La:+0x0p+0:0:-1:
 %3La:+0x8p-1025:0:-1:
@@ -262,8 +262,8 @@
 %*4La:-0x8p-1025:0:4:
 %4La:-0x0p+0:1:4:-0x0:
 %*4La:-0x0p+0:0:4:
-%4La:-0x0p0:1:4:-0x0:
-%*4La:-0x0p0:0:4:
+%4La:-0x.0p0:0:-1:
+%*4La:-0x.0p0:0:-1:
 %4La:-nan(09A_Zaz):1:4:-nan:
 %*4La:-nan(09A_Zaz):0:4:
 %4La:-nan():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4La:nan():0:-1:
 %4La:nan(09A_Zaz):0:-1:
 %*4La:nan(09A_Zaz):0:-1:
-%4La:0x0p0:0:-1:
-%*4La:0x0p0:0:-1:
+%4La:0x.0p0:1:4:0x0:
+%*4La:0x.0p0:0:4:
 %4La:0x0p+0:0:-1:
 %*4La:0x0p+0:0:-1:
 %4La:0x8p-1025:0:-1:
@@ -292,8 +292,8 @@
 %*4La:+nan():0:4:
 %4La:+nan(09A_Zaz):1:4:nan:
 %*4La:+nan(09A_Zaz):0:4:
-%4La:+0x0p0:1:4:0x0:
-%*4La:+0x0p0:0:4:
+%4La:+0x.0p0:0:-1:
+%*4La:+0x.0p0:0:-1:
 %4La:+0x0p+0:1:4:0x0:
 %*4La:+0x0p+0:0:4:
 %4La:+0x8p-1025:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5La:-0x8p-1025:0:-1:
 %5La:-0x0p+0:0:-1:
 %*5La:-0x0p+0:0:-1:
-%5La:-0x0p0:0:-1:
-%*5La:-0x0p0:0:-1:
+%5La:-0x.0p0:1:5:-0x0:
+%*5La:-0x.0p0:0:5:
 %5La:-nan(09A_Zaz):0:-1:
 %*5La:-nan(09A_Zaz):0:-1:
 %5La:-nan():0:-1:
@@ -334,8 +334,8 @@
 %*5La:nan():0:5:
 %5La:nan(09A_Zaz):0:-1:
 %*5La:nan(09A_Zaz):0:-1:
-%5La:0x0p0:1:5:0x0:
-%*5La:0x0p0:0:5:
+%5La:0x.0p0:0:-1:
+%*5La:0x.0p0:0:-1:
 %5La:0x0p+0:0:-1:
 %*5La:0x0p+0:0:-1:
 %5La:0x8p-1025:0:-1:
@@ -354,8 +354,8 @@
 %*5La:+nan():0:-1:
 %5La:+nan(09A_Zaz):0:-1:
 %*5La:+nan(09A_Zaz):0:-1:
-%5La:+0x0p0:0:-1:
-%*5La:+0x0p0:0:-1:
+%5La:+0x.0p0:1:5:0x0:
+%*5La:+0x.0p0:0:5:
 %5La:+0x0p+0:0:-1:
 %*5La:+0x0p+0:0:-1:
 %5La:+0x8p-1025:0:-1:
@@ -386,8 +386,8 @@
 %*6La:-0x8p-1025:0:-1:
 %6La:-0x0p+0:0:-1:
 %*6La:-0x0p+0:0:-1:
-%6La:-0x0p0:1:6:-0x0:
-%*6La:-0x0p0:0:6:
+%6La:-0x.0p0:0:-1:
+%*6La:-0x.0p0:0:-1:
 %6La:-nan(09A_Zaz):0:-1:
 %*6La:-nan(09A_Zaz):0:-1:
 %6La:-nan():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6La:nan():0:5:
 %6La:nan(09A_Zaz):0:-1:
 %*6La:nan(09A_Zaz):0:-1:
-%6La:0x0p0:1:5:0x0:
-%*6La:0x0p0:0:5:
+%6La:0x.0p0:1:6:0x0:
+%*6La:0x.0p0:0:6:
 %6La:0x0p+0:1:6:0x0:
 %*6La:0x0p+0:0:6:
 %6La:0x8p-1025:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6La:+nan():0:6:
 %6La:+nan(09A_Zaz):0:-1:
 %*6La:+nan(09A_Zaz):0:-1:
-%6La:+0x0p0:1:6:0x0:
-%*6La:+0x0p0:0:6:
+%6La:+0x.0p0:0:-1:
+%*6La:+0x.0p0:0:-1:
 %6La:+0x0p+0:0:-1:
 %*6La:+0x0p+0:0:-1:
 %6La:+0x8p-1025:0:-1:
@@ -448,8 +448,8 @@
 %*20La:-0x8p-1025:0:10:
 %20La:-0x0p+0:1:7:-0x0:
 %*20La:-0x0p+0:0:7:
-%20La:-0x0p0:1:6:-0x0:
-%*20La:-0x0p0:0:6:
+%20La:-0x.0p0:1:7:-0x0:
+%*20La:-0x.0p0:0:7:
 %20La:-nan(09A_Zaz):1:13:-nan:
 %*20La:-nan(09A_Zaz):0:13:
 %20La:-nan():1:6:-nan:
@@ -458,8 +458,8 @@
 %*20La:nan():0:5:
 %20La:nan(09A_Zaz):1:12:nan:
 %*20La:nan(09A_Zaz):0:12:
-%20La:0x0p0:1:5:0x0:
-%*20La:0x0p0:0:5:
+%20La:0x.0p0:1:6:0x0:
+%*20La:0x.0p0:0:6:
 %20La:0x0p+0:1:6:0x0:
 %*20La:0x0p+0:0:6:
 %20La:0x8p-1025:1:9:0x1p-1022:
@@ -478,8 +478,8 @@
 %*20La:+nan():0:6:
 %20La:+nan(09A_Zaz):1:13:nan:
 %*20La:+nan(09A_Zaz):0:13:
-%20La:+0x0p0:1:6:0x0:
-%*20La:+0x0p0:0:6:
+%20La:+0x.0p0:1:7:0x0:
+%*20La:+0x.0p0:0:7:
 %20La:+0x0p+0:1:7:0x0:
 %*20La:+0x0p+0:0:7:
 %20La:+0x8p-1025:1:10:0x1p-1022:
@@ -510,8 +510,8 @@
 %*32La:-0x8p-1025:0:10:
 %32La:-0x0p+0:1:7:-0x0:
 %*32La:-0x0p+0:0:7:
-%32La:-0x0p0:1:6:-0x0:
-%*32La:-0x0p0:0:6:
+%32La:-0x.0p0:1:7:-0x0:
+%*32La:-0x.0p0:0:7:
 %32La:-nan(09A_Zaz):1:13:-nan:
 %*32La:-nan(09A_Zaz):0:13:
 %32La:-nan():1:6:-nan:
@@ -520,8 +520,8 @@
 %*32La:nan():0:5:
 %32La:nan(09A_Zaz):1:12:nan:
 %*32La:nan(09A_Zaz):0:12:
-%32La:0x0p0:1:5:0x0:
-%*32La:0x0p0:0:5:
+%32La:0x.0p0:1:6:0x0:
+%*32La:0x.0p0:0:6:
 %32La:0x0p+0:1:6:0x0:
 %*32La:0x0p+0:0:6:
 %32La:0x8p-1025:1:9:0x1p-1022:
@@ -540,8 +540,8 @@
 %*32La:+nan():0:6:
 %32La:+nan(09A_Zaz):1:13:nan:
 %*32La:+nan(09A_Zaz):0:13:
-%32La:+0x0p0:1:6:0x0:
-%*32La:+0x0p0:0:6:
+%32La:+0x.0p0:1:7:0x0:
+%*32La:+0x.0p0:0:7:
 %32La:+0x0p+0:1:7:0x0:
 %*32La:+0x0p+0:0:7:
 %32La:+0x8p-1025:1:10:0x1p-1022:
@@ -572,8 +572,8 @@
 %*5La: -0x8p-1025:0:-1:
 %5La: -0x0p+0:0:-1:
 %*5La: -0x0p+0:0:-1:
-%5La: -0x0p0:0:-1:
-%*5La: -0x0p0:0:-1:
+%5La: -0x.0p0:1:6:-0x0:
+%*5La: -0x.0p0:0:6:
 %5La: -nan(09A_Zaz):0:-1:
 %*5La: -nan(09A_Zaz):0:-1:
 %5La: -nan():0:-1:
@@ -582,8 +582,8 @@
 %*5La: nan():0:6:
 %5La: nan(09A_Zaz):0:-1:
 %*5La: nan(09A_Zaz):0:-1:
-%5La: 0x0p0:1:6:0x0:
-%*5La: 0x0p0:0:6:
+%5La: 0x.0p0:0:-1:
+%*5La: 0x.0p0:0:-1:
 %5La: 0x0p+0:0:-1:
 %*5La: 0x0p+0:0:-1:
 %5La: 0x8p-1025:0:-1:
@@ -602,8 +602,8 @@
 %*5La: +nan():0:-1:
 %5La: +nan(09A_Zaz):0:-1:
 %*5La: +nan(09A_Zaz):0:-1:
-%5La: +0x0p0:0:-1:
-%*5La: +0x0p0:0:-1:
+%5La: +0x.0p0:1:6:0x0:
+%*5La: +0x.0p0:0:6:
 %5La: +0x0p+0:0:-1:
 %*5La: +0x0p+0:0:-1:
 %5La: +0x8p-1025:0:-1:
@@ -634,8 +634,8 @@
 %*32La: -0x8p-1025:0:11:
 %32La: -0x0p+0:1:8:-0x0:
 %*32La: -0x0p+0:0:8:
-%32La: -0x0p0:1:7:-0x0:
-%*32La: -0x0p0:0:7:
+%32La: -0x.0p0:1:8:-0x0:
+%*32La: -0x.0p0:0:8:
 %32La: -nan(09A_Zaz):1:14:-nan:
 %*32La: -nan(09A_Zaz):0:14:
 %32La: -nan():1:7:-nan:
@@ -644,8 +644,8 @@
 %*32La: nan():0:6:
 %32La: nan(09A_Zaz):1:13:nan:
 %*32La: nan(09A_Zaz):0:13:
-%32La: 0x0p0:1:6:0x0:
-%*32La: 0x0p0:0:6:
+%32La: 0x.0p0:1:7:0x0:
+%*32La: 0x.0p0:0:7:
 %32La: 0x0p+0:1:7:0x0:
 %*32La: 0x0p+0:0:7:
 %32La: 0x8p-1025:1:10:0x1p-1022:
@@ -664,8 +664,8 @@
 %*32La: +nan():0:7:
 %32La: +nan(09A_Zaz):1:14:nan:
 %*32La: +nan(09A_Zaz):0:14:
-%32La: +0x0p0:1:7:0x0:
-%*32La: +0x0p0:0:7:
+%32La: +0x.0p0:1:8:0x0:
+%*32La: +0x.0p0:0:8:
 %32La: +0x0p+0:1:8:0x0:
 %*32La: +0x0p+0:0:8:
 %32La: +0x8p-1025:1:11:0x1p-1022:
diff --git a/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-aa.input b/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-aa.input
index 4cce198..4e255d6 100644
--- a/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-aa.input
+++ b/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-aa.input
@@ -14,8 +14,8 @@
 %*LA:-0X8P-1025:0:10:
 %LA:-0X0P+0:1:7:-0x0:
 %*LA:-0X0P+0:0:7:
-%LA:-0X0P0:1:6:-0x0:
-%*LA:-0X0P0:0:6:
+%LA:-0X.0P0:1:7:-0x0:
+%*LA:-0X.0P0:0:7:
 %LA:-NAN(09A_Zaz):1:13:-nan:
 %*LA:-NAN(09A_Zaz):0:13:
 %LA:-NAN():1:6:-nan:
@@ -24,8 +24,8 @@
 %*LA:NAN():0:5:
 %LA:NAN(09A_Zaz):1:12:nan:
 %*LA:NAN(09A_Zaz):0:12:
-%LA:0X0P0:1:5:0x0:
-%*LA:0X0P0:0:5:
+%LA:0X.0P0:1:6:0x0:
+%*LA:0X.0P0:0:6:
 %LA:0X0P+0:1:6:0x0:
 %*LA:0X0P+0:0:6:
 %LA:0X8P-1025:1:9:0x1p-1022:
@@ -44,8 +44,8 @@
 %*LA:+NAN():0:6:
 %LA:+NAN(09A_Zaz):1:13:nan:
 %*LA:+NAN(09A_Zaz):0:13:
-%LA:+0X0P0:1:6:0x0:
-%*LA:+0X0P0:0:6:
+%LA:+0X.0P0:1:7:0x0:
+%*LA:+0X.0P0:0:7:
 %LA:+0X0P+0:1:7:0x0:
 %*LA:+0X0P+0:0:7:
 %LA:+0X8P-1025:1:10:0x1p-1022:
@@ -76,8 +76,8 @@
 %*1LA:-0X8P-1025:0:-1:
 %1LA:-0X0P+0:0:-1:
 %*1LA:-0X0P+0:0:-1:
-%1LA:-0X0P0:0:-1:
-%*1LA:-0X0P0:0:-1:
+%1LA:-0X.0P0:0:-1:
+%*1LA:-0X.0P0:0:-1:
 %1LA:-NAN(09A_Zaz):0:-1:
 %*1LA:-NAN(09A_Zaz):0:-1:
 %1LA:-NAN():0:-1:
@@ -86,8 +86,8 @@
 %*1LA:NAN():0:-1:
 %1LA:NAN(09A_Zaz):0:-1:
 %*1LA:NAN(09A_Zaz):0:-1:
-%1LA:0X0P0:1:1:0x0:
-%*1LA:0X0P0:0:1:
+%1LA:0X.0P0:1:1:0x0:
+%*1LA:0X.0P0:0:1:
 %1LA:0X0P+0:1:1:0x0:
 %*1LA:0X0P+0:0:1:
 %1LA:0X8P-1025:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1LA:+NAN():0:-1:
 %1LA:+NAN(09A_Zaz):0:-1:
 %*1LA:+NAN(09A_Zaz):0:-1:
-%1LA:+0X0P0:0:-1:
-%*1LA:+0X0P0:0:-1:
+%1LA:+0X.0P0:0:-1:
+%*1LA:+0X.0P0:0:-1:
 %1LA:+0X0P+0:0:-1:
 %*1LA:+0X0P+0:0:-1:
 %1LA:+0X8P-1025:0:-1:
@@ -138,8 +138,8 @@
 %*2LA:-0X8P-1025:0:2:
 %2LA:-0X0P+0:1:2:-0x0:
 %*2LA:-0X0P+0:0:2:
-%2LA:-0X0P0:1:2:-0x0:
-%*2LA:-0X0P0:0:2:
+%2LA:-0X.0P0:1:2:-0x0:
+%*2LA:-0X.0P0:0:2:
 %2LA:-NAN(09A_Zaz):0:-1:
 %*2LA:-NAN(09A_Zaz):0:-1:
 %2LA:-NAN():0:-1:
@@ -148,8 +148,8 @@
 %*2LA:NAN():0:-1:
 %2LA:NAN(09A_Zaz):0:-1:
 %*2LA:NAN(09A_Zaz):0:-1:
-%2LA:0X0P0:0:-1:
-%*2LA:0X0P0:0:-1:
+%2LA:0X.0P0:0:-1:
+%*2LA:0X.0P0:0:-1:
 %2LA:0X0P+0:0:-1:
 %*2LA:0X0P+0:0:-1:
 %2LA:0X8P-1025:0:-1:
@@ -168,8 +168,8 @@
 %*2LA:+NAN():0:-1:
 %2LA:+NAN(09A_Zaz):0:-1:
 %*2LA:+NAN(09A_Zaz):0:-1:
-%2LA:+0X0P0:1:2:0x0:
-%*2LA:+0X0P0:0:2:
+%2LA:+0X.0P0:1:2:0x0:
+%*2LA:+0X.0P0:0:2:
 %2LA:+0X0P+0:1:2:0x0:
 %*2LA:+0X0P+0:0:2:
 %2LA:+0X8P-1025:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3LA:-0X8P-1025:0:-1:
 %3LA:-0X0P+0:0:-1:
 %*3LA:-0X0P+0:0:-1:
-%3LA:-0X0P0:0:-1:
-%*3LA:-0X0P0:0:-1:
+%3LA:-0X.0P0:0:-1:
+%*3LA:-0X.0P0:0:-1:
 %3LA:-NAN(09A_Zaz):0:-1:
 %*3LA:-NAN(09A_Zaz):0:-1:
 %3LA:-NAN():0:-1:
@@ -210,8 +210,8 @@
 %*3LA:NAN():0:3:
 %3LA:NAN(09A_Zaz):1:3:nan:
 %*3LA:NAN(09A_Zaz):0:3:
-%3LA:0X0P0:1:3:0x0:
-%*3LA:0X0P0:0:3:
+%3LA:0X.0P0:0:-1:
+%*3LA:0X.0P0:0:-1:
 %3LA:0X0P+0:1:3:0x0:
 %*3LA:0X0P+0:0:3:
 %3LA:0X8P-1025:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3LA:+NAN():0:-1:
 %3LA:+NAN(09A_Zaz):0:-1:
 %*3LA:+NAN(09A_Zaz):0:-1:
-%3LA:+0X0P0:0:-1:
-%*3LA:+0X0P0:0:-1:
+%3LA:+0X.0P0:0:-1:
+%*3LA:+0X.0P0:0:-1:
 %3LA:+0X0P+0:0:-1:
 %*3LA:+0X0P+0:0:-1:
 %3LA:+0X8P-1025:0:-1:
@@ -262,8 +262,8 @@
 %*4LA:-0X8P-1025:0:4:
 %4LA:-0X0P+0:1:4:-0x0:
 %*4LA:-0X0P+0:0:4:
-%4LA:-0X0P0:1:4:-0x0:
-%*4LA:-0X0P0:0:4:
+%4LA:-0X.0P0:0:-1:
+%*4LA:-0X.0P0:0:-1:
 %4LA:-NAN(09A_Zaz):1:4:-nan:
 %*4LA:-NAN(09A_Zaz):0:4:
 %4LA:-NAN():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4LA:NAN():0:-1:
 %4LA:NAN(09A_Zaz):0:-1:
 %*4LA:NAN(09A_Zaz):0:-1:
-%4LA:0X0P0:0:-1:
-%*4LA:0X0P0:0:-1:
+%4LA:0X.0P0:1:4:0x0:
+%*4LA:0X.0P0:0:4:
 %4LA:0X0P+0:0:-1:
 %*4LA:0X0P+0:0:-1:
 %4LA:0X8P-1025:0:-1:
@@ -292,8 +292,8 @@
 %*4LA:+NAN():0:4:
 %4LA:+NAN(09A_Zaz):1:4:nan:
 %*4LA:+NAN(09A_Zaz):0:4:
-%4LA:+0X0P0:1:4:0x0:
-%*4LA:+0X0P0:0:4:
+%4LA:+0X.0P0:0:-1:
+%*4LA:+0X.0P0:0:-1:
 %4LA:+0X0P+0:1:4:0x0:
 %*4LA:+0X0P+0:0:4:
 %4LA:+0X8P-1025:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5LA:-0X8P-1025:0:-1:
 %5LA:-0X0P+0:0:-1:
 %*5LA:-0X0P+0:0:-1:
-%5LA:-0X0P0:0:-1:
-%*5LA:-0X0P0:0:-1:
+%5LA:-0X.0P0:1:5:-0x0:
+%*5LA:-0X.0P0:0:5:
 %5LA:-NAN(09A_Zaz):0:-1:
 %*5LA:-NAN(09A_Zaz):0:-1:
 %5LA:-NAN():0:-1:
@@ -334,8 +334,8 @@
 %*5LA:NAN():0:5:
 %5LA:NAN(09A_Zaz):0:-1:
 %*5LA:NAN(09A_Zaz):0:-1:
-%5LA:0X0P0:1:5:0x0:
-%*5LA:0X0P0:0:5:
+%5LA:0X.0P0:0:-1:
+%*5LA:0X.0P0:0:-1:
 %5LA:0X0P+0:0:-1:
 %*5LA:0X0P+0:0:-1:
 %5LA:0X8P-1025:0:-1:
@@ -354,8 +354,8 @@
 %*5LA:+NAN():0:-1:
 %5LA:+NAN(09A_Zaz):0:-1:
 %*5LA:+NAN(09A_Zaz):0:-1:
-%5LA:+0X0P0:0:-1:
-%*5LA:+0X0P0:0:-1:
+%5LA:+0X.0P0:1:5:0x0:
+%*5LA:+0X.0P0:0:5:
 %5LA:+0X0P+0:0:-1:
 %*5LA:+0X0P+0:0:-1:
 %5LA:+0X8P-1025:0:-1:
@@ -386,8 +386,8 @@
 %*6LA:-0X8P-1025:0:-1:
 %6LA:-0X0P+0:0:-1:
 %*6LA:-0X0P+0:0:-1:
-%6LA:-0X0P0:1:6:-0x0:
-%*6LA:-0X0P0:0:6:
+%6LA:-0X.0P0:0:-1:
+%*6LA:-0X.0P0:0:-1:
 %6LA:-NAN(09A_Zaz):0:-1:
 %*6LA:-NAN(09A_Zaz):0:-1:
 %6LA:-NAN():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6LA:NAN():0:5:
 %6LA:NAN(09A_Zaz):0:-1:
 %*6LA:NAN(09A_Zaz):0:-1:
-%6LA:0X0P0:1:5:0x0:
-%*6LA:0X0P0:0:5:
+%6LA:0X.0P0:1:6:0x0:
+%*6LA:0X.0P0:0:6:
 %6LA:0X0P+0:1:6:0x0:
 %*6LA:0X0P+0:0:6:
 %6LA:0X8P-1025:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6LA:+NAN():0:6:
 %6LA:+NAN(09A_Zaz):0:-1:
 %*6LA:+NAN(09A_Zaz):0:-1:
-%6LA:+0X0P0:1:6:0x0:
-%*6LA:+0X0P0:0:6:
+%6LA:+0X.0P0:0:-1:
+%*6LA:+0X.0P0:0:-1:
 %6LA:+0X0P+0:0:-1:
 %*6LA:+0X0P+0:0:-1:
 %6LA:+0X8P-1025:0:-1:
@@ -448,8 +448,8 @@
 %*20LA:-0X8P-1025:0:10:
 %20LA:-0X0P+0:1:7:-0x0:
 %*20LA:-0X0P+0:0:7:
-%20LA:-0X0P0:1:6:-0x0:
-%*20LA:-0X0P0:0:6:
+%20LA:-0X.0P0:1:7:-0x0:
+%*20LA:-0X.0P0:0:7:
 %20LA:-NAN(09A_Zaz):1:13:-nan:
 %*20LA:-NAN(09A_Zaz):0:13:
 %20LA:-NAN():1:6:-nan:
@@ -458,8 +458,8 @@
 %*20LA:NAN():0:5:
 %20LA:NAN(09A_Zaz):1:12:nan:
 %*20LA:NAN(09A_Zaz):0:12:
-%20LA:0X0P0:1:5:0x0:
-%*20LA:0X0P0:0:5:
+%20LA:0X.0P0:1:6:0x0:
+%*20LA:0X.0P0:0:6:
 %20LA:0X0P+0:1:6:0x0:
 %*20LA:0X0P+0:0:6:
 %20LA:0X8P-1025:1:9:0x1p-1022:
@@ -478,8 +478,8 @@
 %*20LA:+NAN():0:6:
 %20LA:+NAN(09A_Zaz):1:13:nan:
 %*20LA:+NAN(09A_Zaz):0:13:
-%20LA:+0X0P0:1:6:0x0:
-%*20LA:+0X0P0:0:6:
+%20LA:+0X.0P0:1:7:0x0:
+%*20LA:+0X.0P0:0:7:
 %20LA:+0X0P+0:1:7:0x0:
 %*20LA:+0X0P+0:0:7:
 %20LA:+0X8P-1025:1:10:0x1p-1022:
@@ -510,8 +510,8 @@
 %*32LA:-0X8P-1025:0:10:
 %32LA:-0X0P+0:1:7:-0x0:
 %*32LA:-0X0P+0:0:7:
-%32LA:-0X0P0:1:6:-0x0:
-%*32LA:-0X0P0:0:6:
+%32LA:-0X.0P0:1:7:-0x0:
+%*32LA:-0X.0P0:0:7:
 %32LA:-NAN(09A_Zaz):1:13:-nan:
 %*32LA:-NAN(09A_Zaz):0:13:
 %32LA:-NAN():1:6:-nan:
@@ -520,8 +520,8 @@
 %*32LA:NAN():0:5:
 %32LA:NAN(09A_Zaz):1:12:nan:
 %*32LA:NAN(09A_Zaz):0:12:
-%32LA:0X0P0:1:5:0x0:
-%*32LA:0X0P0:0:5:
+%32LA:0X.0P0:1:6:0x0:
+%*32LA:0X.0P0:0:6:
 %32LA:0X0P+0:1:6:0x0:
 %*32LA:0X0P+0:0:6:
 %32LA:0X8P-1025:1:9:0x1p-1022:
@@ -540,8 +540,8 @@
 %*32LA:+NAN():0:6:
 %32LA:+NAN(09A_Zaz):1:13:nan:
 %*32LA:+NAN(09A_Zaz):0:13:
-%32LA:+0X0P0:1:6:0x0:
-%*32LA:+0X0P0:0:6:
+%32LA:+0X.0P0:1:7:0x0:
+%*32LA:+0X.0P0:0:7:
 %32LA:+0X0P+0:1:7:0x0:
 %*32LA:+0X0P+0:0:7:
 %32LA:+0X8P-1025:1:10:0x1p-1022:
@@ -572,8 +572,8 @@
 %*5LA: -0X8P-1025:0:-1:
 %5LA: -0X0P+0:0:-1:
 %*5LA: -0X0P+0:0:-1:
-%5LA: -0X0P0:0:-1:
-%*5LA: -0X0P0:0:-1:
+%5LA: -0X.0P0:1:6:-0x0:
+%*5LA: -0X.0P0:0:6:
 %5LA: -NAN(09A_Zaz):0:-1:
 %*5LA: -NAN(09A_Zaz):0:-1:
 %5LA: -NAN():0:-1:
@@ -582,8 +582,8 @@
 %*5LA: NAN():0:6:
 %5LA: NAN(09A_Zaz):0:-1:
 %*5LA: NAN(09A_Zaz):0:-1:
-%5LA: 0X0P0:1:6:0x0:
-%*5LA: 0X0P0:0:6:
+%5LA: 0X.0P0:0:-1:
+%*5LA: 0X.0P0:0:-1:
 %5LA: 0X0P+0:0:-1:
 %*5LA: 0X0P+0:0:-1:
 %5LA: 0X8P-1025:0:-1:
@@ -602,8 +602,8 @@
 %*5LA: +NAN():0:-1:
 %5LA: +NAN(09A_Zaz):0:-1:
 %*5LA: +NAN(09A_Zaz):0:-1:
-%5LA: +0X0P0:0:-1:
-%*5LA: +0X0P0:0:-1:
+%5LA: +0X.0P0:1:6:0x0:
+%*5LA: +0X.0P0:0:6:
 %5LA: +0X0P+0:0:-1:
 %*5LA: +0X0P+0:0:-1:
 %5LA: +0X8P-1025:0:-1:
@@ -634,8 +634,8 @@
 %*32LA: -0X8P-1025:0:11:
 %32LA: -0X0P+0:1:8:-0x0:
 %*32LA: -0X0P+0:0:8:
-%32LA: -0X0P0:1:7:-0x0:
-%*32LA: -0X0P0:0:7:
+%32LA: -0X.0P0:1:8:-0x0:
+%*32LA: -0X.0P0:0:8:
 %32LA: -NAN(09A_Zaz):1:14:-nan:
 %*32LA: -NAN(09A_Zaz):0:14:
 %32LA: -NAN():1:7:-nan:
@@ -644,8 +644,8 @@
 %*32LA: NAN():0:6:
 %32LA: NAN(09A_Zaz):1:13:nan:
 %*32LA: NAN(09A_Zaz):0:13:
-%32LA: 0X0P0:1:6:0x0:
-%*32LA: 0X0P0:0:6:
+%32LA: 0X.0P0:1:7:0x0:
+%*32LA: 0X.0P0:0:7:
 %32LA: 0X0P+0:1:7:0x0:
 %*32LA: 0X0P+0:0:7:
 %32LA: 0X8P-1025:1:10:0x1p-1022:
@@ -664,8 +664,8 @@
 %*32LA: +NAN():0:7:
 %32LA: +NAN(09A_Zaz):1:14:nan:
 %*32LA: +NAN(09A_Zaz):0:14:
-%32LA: +0X0P0:1:7:0x0:
-%*32LA: +0X0P0:0:7:
+%32LA: +0X.0P0:1:8:0x0:
+%*32LA: +0X.0P0:0:8:
 %32LA: +0X0P+0:1:8:0x0:
 %*32LA: +0X0P+0:0:8:
 %32LA: +0X8P-1025:1:11:0x1p-1022:
diff --git a/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-g.input b/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-g.input
index 2aba539..7731f4d 100644
--- a/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-g.input
+++ b/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-g.input
@@ -14,8 +14,8 @@
 %*Lg:-0x8p-1025:0:10:
 %Lg:-0x0p+0:1:7:-0x0:
 %*Lg:-0x0p+0:0:7:
-%Lg:-0x0p0:1:6:-0x0:
-%*Lg:-0x0p0:0:6:
+%Lg:-0x.0p0:1:7:-0x0:
+%*Lg:-0x.0p0:0:7:
 %Lg:-nan(09A_Zaz):1:13:-nan:
 %*Lg:-nan(09A_Zaz):0:13:
 %Lg:-nan():1:6:-nan:
@@ -24,8 +24,8 @@
 %*Lg:nan():0:5:
 %Lg:nan(09A_Zaz):1:12:nan:
 %*Lg:nan(09A_Zaz):0:12:
-%Lg:0x0p0:1:5:0x0:
-%*Lg:0x0p0:0:5:
+%Lg:0x.0p0:1:6:0x0:
+%*Lg:0x.0p0:0:6:
 %Lg:0x0p+0:1:6:0x0:
 %*Lg:0x0p+0:0:6:
 %Lg:0x8p-1025:1:9:0x1p-1022:
@@ -44,8 +44,8 @@
 %*Lg:+nan():0:6:
 %Lg:+nan(09A_Zaz):1:13:nan:
 %*Lg:+nan(09A_Zaz):0:13:
-%Lg:+0x0p0:1:6:0x0:
-%*Lg:+0x0p0:0:6:
+%Lg:+0x.0p0:1:7:0x0:
+%*Lg:+0x.0p0:0:7:
 %Lg:+0x0p+0:1:7:0x0:
 %*Lg:+0x0p+0:0:7:
 %Lg:+0x8p-1025:1:10:0x1p-1022:
@@ -76,8 +76,8 @@
 %*1Lg:-0x8p-1025:0:-1:
 %1Lg:-0x0p+0:0:-1:
 %*1Lg:-0x0p+0:0:-1:
-%1Lg:-0x0p0:0:-1:
-%*1Lg:-0x0p0:0:-1:
+%1Lg:-0x.0p0:0:-1:
+%*1Lg:-0x.0p0:0:-1:
 %1Lg:-nan(09A_Zaz):0:-1:
 %*1Lg:-nan(09A_Zaz):0:-1:
 %1Lg:-nan():0:-1:
@@ -86,8 +86,8 @@
 %*1Lg:nan():0:-1:
 %1Lg:nan(09A_Zaz):0:-1:
 %*1Lg:nan(09A_Zaz):0:-1:
-%1Lg:0x0p0:1:1:0x0:
-%*1Lg:0x0p0:0:1:
+%1Lg:0x.0p0:1:1:0x0:
+%*1Lg:0x.0p0:0:1:
 %1Lg:0x0p+0:1:1:0x0:
 %*1Lg:0x0p+0:0:1:
 %1Lg:0x8p-1025:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1Lg:+nan():0:-1:
 %1Lg:+nan(09A_Zaz):0:-1:
 %*1Lg:+nan(09A_Zaz):0:-1:
-%1Lg:+0x0p0:0:-1:
-%*1Lg:+0x0p0:0:-1:
+%1Lg:+0x.0p0:0:-1:
+%*1Lg:+0x.0p0:0:-1:
 %1Lg:+0x0p+0:0:-1:
 %*1Lg:+0x0p+0:0:-1:
 %1Lg:+0x8p-1025:0:-1:
@@ -138,8 +138,8 @@
 %*2Lg:-0x8p-1025:0:2:
 %2Lg:-0x0p+0:1:2:-0x0:
 %*2Lg:-0x0p+0:0:2:
-%2Lg:-0x0p0:1:2:-0x0:
-%*2Lg:-0x0p0:0:2:
+%2Lg:-0x.0p0:1:2:-0x0:
+%*2Lg:-0x.0p0:0:2:
 %2Lg:-nan(09A_Zaz):0:-1:
 %*2Lg:-nan(09A_Zaz):0:-1:
 %2Lg:-nan():0:-1:
@@ -148,8 +148,8 @@
 %*2Lg:nan():0:-1:
 %2Lg:nan(09A_Zaz):0:-1:
 %*2Lg:nan(09A_Zaz):0:-1:
-%2Lg:0x0p0:0:-1:
-%*2Lg:0x0p0:0:-1:
+%2Lg:0x.0p0:0:-1:
+%*2Lg:0x.0p0:0:-1:
 %2Lg:0x0p+0:0:-1:
 %*2Lg:0x0p+0:0:-1:
 %2Lg:0x8p-1025:0:-1:
@@ -168,8 +168,8 @@
 %*2Lg:+nan():0:-1:
 %2Lg:+nan(09A_Zaz):0:-1:
 %*2Lg:+nan(09A_Zaz):0:-1:
-%2Lg:+0x0p0:1:2:0x0:
-%*2Lg:+0x0p0:0:2:
+%2Lg:+0x.0p0:1:2:0x0:
+%*2Lg:+0x.0p0:0:2:
 %2Lg:+0x0p+0:1:2:0x0:
 %*2Lg:+0x0p+0:0:2:
 %2Lg:+0x8p-1025:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3Lg:-0x8p-1025:0:-1:
 %3Lg:-0x0p+0:0:-1:
 %*3Lg:-0x0p+0:0:-1:
-%3Lg:-0x0p0:0:-1:
-%*3Lg:-0x0p0:0:-1:
+%3Lg:-0x.0p0:0:-1:
+%*3Lg:-0x.0p0:0:-1:
 %3Lg:-nan(09A_Zaz):0:-1:
 %*3Lg:-nan(09A_Zaz):0:-1:
 %3Lg:-nan():0:-1:
@@ -210,8 +210,8 @@
 %*3Lg:nan():0:3:
 %3Lg:nan(09A_Zaz):1:3:nan:
 %*3Lg:nan(09A_Zaz):0:3:
-%3Lg:0x0p0:1:3:0x0:
-%*3Lg:0x0p0:0:3:
+%3Lg:0x.0p0:0:-1:
+%*3Lg:0x.0p0:0:-1:
 %3Lg:0x0p+0:1:3:0x0:
 %*3Lg:0x0p+0:0:3:
 %3Lg:0x8p-1025:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3Lg:+nan():0:-1:
 %3Lg:+nan(09A_Zaz):0:-1:
 %*3Lg:+nan(09A_Zaz):0:-1:
-%3Lg:+0x0p0:0:-1:
-%*3Lg:+0x0p0:0:-1:
+%3Lg:+0x.0p0:0:-1:
+%*3Lg:+0x.0p0:0:-1:
 %3Lg:+0x0p+0:0:-1:
 %*3Lg:+0x0p+0:0:-1:
 %3Lg:+0x8p-1025:0:-1:
@@ -262,8 +262,8 @@
 %*4Lg:-0x8p-1025:0:4:
 %4Lg:-0x0p+0:1:4:-0x0:
 %*4Lg:-0x0p+0:0:4:
-%4Lg:-0x0p0:1:4:-0x0:
-%*4Lg:-0x0p0:0:4:
+%4Lg:-0x.0p0:0:-1:
+%*4Lg:-0x.0p0:0:-1:
 %4Lg:-nan(09A_Zaz):1:4:-nan:
 %*4Lg:-nan(09A_Zaz):0:4:
 %4Lg:-nan():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4Lg:nan():0:-1:
 %4Lg:nan(09A_Zaz):0:-1:
 %*4Lg:nan(09A_Zaz):0:-1:
-%4Lg:0x0p0:0:-1:
-%*4Lg:0x0p0:0:-1:
+%4Lg:0x.0p0:1:4:0x0:
+%*4Lg:0x.0p0:0:4:
 %4Lg:0x0p+0:0:-1:
 %*4Lg:0x0p+0:0:-1:
 %4Lg:0x8p-1025:0:-1:
@@ -292,8 +292,8 @@
 %*4Lg:+nan():0:4:
 %4Lg:+nan(09A_Zaz):1:4:nan:
 %*4Lg:+nan(09A_Zaz):0:4:
-%4Lg:+0x0p0:1:4:0x0:
-%*4Lg:+0x0p0:0:4:
+%4Lg:+0x.0p0:0:-1:
+%*4Lg:+0x.0p0:0:-1:
 %4Lg:+0x0p+0:1:4:0x0:
 %*4Lg:+0x0p+0:0:4:
 %4Lg:+0x8p-1025:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5Lg:-0x8p-1025:0:-1:
 %5Lg:-0x0p+0:0:-1:
 %*5Lg:-0x0p+0:0:-1:
-%5Lg:-0x0p0:0:-1:
-%*5Lg:-0x0p0:0:-1:
+%5Lg:-0x.0p0:1:5:-0x0:
+%*5Lg:-0x.0p0:0:5:
 %5Lg:-nan(09A_Zaz):0:-1:
 %*5Lg:-nan(09A_Zaz):0:-1:
 %5Lg:-nan():0:-1:
@@ -334,8 +334,8 @@
 %*5Lg:nan():0:5:
 %5Lg:nan(09A_Zaz):0:-1:
 %*5Lg:nan(09A_Zaz):0:-1:
-%5Lg:0x0p0:1:5:0x0:
-%*5Lg:0x0p0:0:5:
+%5Lg:0x.0p0:0:-1:
+%*5Lg:0x.0p0:0:-1:
 %5Lg:0x0p+0:0:-1:
 %*5Lg:0x0p+0:0:-1:
 %5Lg:0x8p-1025:0:-1:
@@ -354,8 +354,8 @@
 %*5Lg:+nan():0:-1:
 %5Lg:+nan(09A_Zaz):0:-1:
 %*5Lg:+nan(09A_Zaz):0:-1:
-%5Lg:+0x0p0:0:-1:
-%*5Lg:+0x0p0:0:-1:
+%5Lg:+0x.0p0:1:5:0x0:
+%*5Lg:+0x.0p0:0:5:
 %5Lg:+0x0p+0:0:-1:
 %*5Lg:+0x0p+0:0:-1:
 %5Lg:+0x8p-1025:0:-1:
@@ -386,8 +386,8 @@
 %*6Lg:-0x8p-1025:0:-1:
 %6Lg:-0x0p+0:0:-1:
 %*6Lg:-0x0p+0:0:-1:
-%6Lg:-0x0p0:1:6:-0x0:
-%*6Lg:-0x0p0:0:6:
+%6Lg:-0x.0p0:0:-1:
+%*6Lg:-0x.0p0:0:-1:
 %6Lg:-nan(09A_Zaz):0:-1:
 %*6Lg:-nan(09A_Zaz):0:-1:
 %6Lg:-nan():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6Lg:nan():0:5:
 %6Lg:nan(09A_Zaz):0:-1:
 %*6Lg:nan(09A_Zaz):0:-1:
-%6Lg:0x0p0:1:5:0x0:
-%*6Lg:0x0p0:0:5:
+%6Lg:0x.0p0:1:6:0x0:
+%*6Lg:0x.0p0:0:6:
 %6Lg:0x0p+0:1:6:0x0:
 %*6Lg:0x0p+0:0:6:
 %6Lg:0x8p-1025:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6Lg:+nan():0:6:
 %6Lg:+nan(09A_Zaz):0:-1:
 %*6Lg:+nan(09A_Zaz):0:-1:
-%6Lg:+0x0p0:1:6:0x0:
-%*6Lg:+0x0p0:0:6:
+%6Lg:+0x.0p0:0:-1:
+%*6Lg:+0x.0p0:0:-1:
 %6Lg:+0x0p+0:0:-1:
 %*6Lg:+0x0p+0:0:-1:
 %6Lg:+0x8p-1025:0:-1:
@@ -448,8 +448,8 @@
 %*20Lg:-0x8p-1025:0:10:
 %20Lg:-0x0p+0:1:7:-0x0:
 %*20Lg:-0x0p+0:0:7:
-%20Lg:-0x0p0:1:6:-0x0:
-%*20Lg:-0x0p0:0:6:
+%20Lg:-0x.0p0:1:7:-0x0:
+%*20Lg:-0x.0p0:0:7:
 %20Lg:-nan(09A_Zaz):1:13:-nan:
 %*20Lg:-nan(09A_Zaz):0:13:
 %20Lg:-nan():1:6:-nan:
@@ -458,8 +458,8 @@
 %*20Lg:nan():0:5:
 %20Lg:nan(09A_Zaz):1:12:nan:
 %*20Lg:nan(09A_Zaz):0:12:
-%20Lg:0x0p0:1:5:0x0:
-%*20Lg:0x0p0:0:5:
+%20Lg:0x.0p0:1:6:0x0:
+%*20Lg:0x.0p0:0:6:
 %20Lg:0x0p+0:1:6:0x0:
 %*20Lg:0x0p+0:0:6:
 %20Lg:0x8p-1025:1:9:0x1p-1022:
@@ -478,8 +478,8 @@
 %*20Lg:+nan():0:6:
 %20Lg:+nan(09A_Zaz):1:13:nan:
 %*20Lg:+nan(09A_Zaz):0:13:
-%20Lg:+0x0p0:1:6:0x0:
-%*20Lg:+0x0p0:0:6:
+%20Lg:+0x.0p0:1:7:0x0:
+%*20Lg:+0x.0p0:0:7:
 %20Lg:+0x0p+0:1:7:0x0:
 %*20Lg:+0x0p+0:0:7:
 %20Lg:+0x8p-1025:1:10:0x1p-1022:
@@ -510,8 +510,8 @@
 %*32Lg:-0x8p-1025:0:10:
 %32Lg:-0x0p+0:1:7:-0x0:
 %*32Lg:-0x0p+0:0:7:
-%32Lg:-0x0p0:1:6:-0x0:
-%*32Lg:-0x0p0:0:6:
+%32Lg:-0x.0p0:1:7:-0x0:
+%*32Lg:-0x.0p0:0:7:
 %32Lg:-nan(09A_Zaz):1:13:-nan:
 %*32Lg:-nan(09A_Zaz):0:13:
 %32Lg:-nan():1:6:-nan:
@@ -520,8 +520,8 @@
 %*32Lg:nan():0:5:
 %32Lg:nan(09A_Zaz):1:12:nan:
 %*32Lg:nan(09A_Zaz):0:12:
-%32Lg:0x0p0:1:5:0x0:
-%*32Lg:0x0p0:0:5:
+%32Lg:0x.0p0:1:6:0x0:
+%*32Lg:0x.0p0:0:6:
 %32Lg:0x0p+0:1:6:0x0:
 %*32Lg:0x0p+0:0:6:
 %32Lg:0x8p-1025:1:9:0x1p-1022:
@@ -540,8 +540,8 @@
 %*32Lg:+nan():0:6:
 %32Lg:+nan(09A_Zaz):1:13:nan:
 %*32Lg:+nan(09A_Zaz):0:13:
-%32Lg:+0x0p0:1:6:0x0:
-%*32Lg:+0x0p0:0:6:
+%32Lg:+0x.0p0:1:7:0x0:
+%*32Lg:+0x.0p0:0:7:
 %32Lg:+0x0p+0:1:7:0x0:
 %*32Lg:+0x0p+0:0:7:
 %32Lg:+0x8p-1025:1:10:0x1p-1022:
@@ -572,8 +572,8 @@
 %*5Lg: -0x8p-1025:0:-1:
 %5Lg: -0x0p+0:0:-1:
 %*5Lg: -0x0p+0:0:-1:
-%5Lg: -0x0p0:0:-1:
-%*5Lg: -0x0p0:0:-1:
+%5Lg: -0x.0p0:1:6:-0x0:
+%*5Lg: -0x.0p0:0:6:
 %5Lg: -nan(09A_Zaz):0:-1:
 %*5Lg: -nan(09A_Zaz):0:-1:
 %5Lg: -nan():0:-1:
@@ -582,8 +582,8 @@
 %*5Lg: nan():0:6:
 %5Lg: nan(09A_Zaz):0:-1:
 %*5Lg: nan(09A_Zaz):0:-1:
-%5Lg: 0x0p0:1:6:0x0:
-%*5Lg: 0x0p0:0:6:
+%5Lg: 0x.0p0:0:-1:
+%*5Lg: 0x.0p0:0:-1:
 %5Lg: 0x0p+0:0:-1:
 %*5Lg: 0x0p+0:0:-1:
 %5Lg: 0x8p-1025:0:-1:
@@ -602,8 +602,8 @@
 %*5Lg: +nan():0:-1:
 %5Lg: +nan(09A_Zaz):0:-1:
 %*5Lg: +nan(09A_Zaz):0:-1:
-%5Lg: +0x0p0:0:-1:
-%*5Lg: +0x0p0:0:-1:
+%5Lg: +0x.0p0:1:6:0x0:
+%*5Lg: +0x.0p0:0:6:
 %5Lg: +0x0p+0:0:-1:
 %*5Lg: +0x0p+0:0:-1:
 %5Lg: +0x8p-1025:0:-1:
@@ -634,8 +634,8 @@
 %*32Lg: -0x8p-1025:0:11:
 %32Lg: -0x0p+0:1:8:-0x0:
 %*32Lg: -0x0p+0:0:8:
-%32Lg: -0x0p0:1:7:-0x0:
-%*32Lg: -0x0p0:0:7:
+%32Lg: -0x.0p0:1:8:-0x0:
+%*32Lg: -0x.0p0:0:8:
 %32Lg: -nan(09A_Zaz):1:14:-nan:
 %*32Lg: -nan(09A_Zaz):0:14:
 %32Lg: -nan():1:7:-nan:
@@ -644,8 +644,8 @@
 %*32Lg: nan():0:6:
 %32Lg: nan(09A_Zaz):1:13:nan:
 %*32Lg: nan(09A_Zaz):0:13:
-%32Lg: 0x0p0:1:6:0x0:
-%*32Lg: 0x0p0:0:6:
+%32Lg: 0x.0p0:1:7:0x0:
+%*32Lg: 0x.0p0:0:7:
 %32Lg: 0x0p+0:1:7:0x0:
 %*32Lg: 0x0p+0:0:7:
 %32Lg: 0x8p-1025:1:10:0x1p-1022:
@@ -664,8 +664,8 @@
 %*32Lg: +nan():0:7:
 %32Lg: +nan(09A_Zaz):1:14:nan:
 %*32Lg: +nan(09A_Zaz):0:14:
-%32Lg: +0x0p0:1:7:0x0:
-%*32Lg: +0x0p0:0:7:
+%32Lg: +0x.0p0:1:8:0x0:
+%*32Lg: +0x.0p0:0:8:
 %32Lg: +0x0p+0:1:8:0x0:
 %*32Lg: +0x0p+0:0:8:
 %32Lg: +0x8p-1025:1:11:0x1p-1022:
diff --git a/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-gg.input b/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-gg.input
index b34ed6b..e6b51bc 100644
--- a/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-gg.input
+++ b/sysdeps/ieee754/ldbl-opt/tst-scanf-format-ldouble-gg.input
@@ -14,8 +14,8 @@
 %*LG:-0X8P-1025:0:10:
 %LG:-0X0P+0:1:7:-0x0:
 %*LG:-0X0P+0:0:7:
-%LG:-0X0P0:1:6:-0x0:
-%*LG:-0X0P0:0:6:
+%LG:-0X.0P0:1:7:-0x0:
+%*LG:-0X.0P0:0:7:
 %LG:-NAN(09A_Zaz):1:13:-nan:
 %*LG:-NAN(09A_Zaz):0:13:
 %LG:-NAN():1:6:-nan:
@@ -24,8 +24,8 @@
 %*LG:NAN():0:5:
 %LG:NAN(09A_Zaz):1:12:nan:
 %*LG:NAN(09A_Zaz):0:12:
-%LG:0X0P0:1:5:0x0:
-%*LG:0X0P0:0:5:
+%LG:0X.0P0:1:6:0x0:
+%*LG:0X.0P0:0:6:
 %LG:0X0P+0:1:6:0x0:
 %*LG:0X0P+0:0:6:
 %LG:0X8P-1025:1:9:0x1p-1022:
@@ -44,8 +44,8 @@
 %*LG:+NAN():0:6:
 %LG:+NAN(09A_Zaz):1:13:nan:
 %*LG:+NAN(09A_Zaz):0:13:
-%LG:+0X0P0:1:6:0x0:
-%*LG:+0X0P0:0:6:
+%LG:+0X.0P0:1:7:0x0:
+%*LG:+0X.0P0:0:7:
 %LG:+0X0P+0:1:7:0x0:
 %*LG:+0X0P+0:0:7:
 %LG:+0X8P-1025:1:10:0x1p-1022:
@@ -76,8 +76,8 @@
 %*1LG:-0X8P-1025:0:-1:
 %1LG:-0X0P+0:0:-1:
 %*1LG:-0X0P+0:0:-1:
-%1LG:-0X0P0:0:-1:
-%*1LG:-0X0P0:0:-1:
+%1LG:-0X.0P0:0:-1:
+%*1LG:-0X.0P0:0:-1:
 %1LG:-NAN(09A_Zaz):0:-1:
 %*1LG:-NAN(09A_Zaz):0:-1:
 %1LG:-NAN():0:-1:
@@ -86,8 +86,8 @@
 %*1LG:NAN():0:-1:
 %1LG:NAN(09A_Zaz):0:-1:
 %*1LG:NAN(09A_Zaz):0:-1:
-%1LG:0X0P0:1:1:0x0:
-%*1LG:0X0P0:0:1:
+%1LG:0X.0P0:1:1:0x0:
+%*1LG:0X.0P0:0:1:
 %1LG:0X0P+0:1:1:0x0:
 %*1LG:0X0P+0:0:1:
 %1LG:0X8P-1025:1:1:0x0:
@@ -106,8 +106,8 @@
 %*1LG:+NAN():0:-1:
 %1LG:+NAN(09A_Zaz):0:-1:
 %*1LG:+NAN(09A_Zaz):0:-1:
-%1LG:+0X0P0:0:-1:
-%*1LG:+0X0P0:0:-1:
+%1LG:+0X.0P0:0:-1:
+%*1LG:+0X.0P0:0:-1:
 %1LG:+0X0P+0:0:-1:
 %*1LG:+0X0P+0:0:-1:
 %1LG:+0X8P-1025:0:-1:
@@ -138,8 +138,8 @@
 %*2LG:-0X8P-1025:0:2:
 %2LG:-0X0P+0:1:2:-0x0:
 %*2LG:-0X0P+0:0:2:
-%2LG:-0X0P0:1:2:-0x0:
-%*2LG:-0X0P0:0:2:
+%2LG:-0X.0P0:1:2:-0x0:
+%*2LG:-0X.0P0:0:2:
 %2LG:-NAN(09A_Zaz):0:-1:
 %*2LG:-NAN(09A_Zaz):0:-1:
 %2LG:-NAN():0:-1:
@@ -148,8 +148,8 @@
 %*2LG:NAN():0:-1:
 %2LG:NAN(09A_Zaz):0:-1:
 %*2LG:NAN(09A_Zaz):0:-1:
-%2LG:0X0P0:0:-1:
-%*2LG:0X0P0:0:-1:
+%2LG:0X.0P0:0:-1:
+%*2LG:0X.0P0:0:-1:
 %2LG:0X0P+0:0:-1:
 %*2LG:0X0P+0:0:-1:
 %2LG:0X8P-1025:0:-1:
@@ -168,8 +168,8 @@
 %*2LG:+NAN():0:-1:
 %2LG:+NAN(09A_Zaz):0:-1:
 %*2LG:+NAN(09A_Zaz):0:-1:
-%2LG:+0X0P0:1:2:0x0:
-%*2LG:+0X0P0:0:2:
+%2LG:+0X.0P0:1:2:0x0:
+%*2LG:+0X.0P0:0:2:
 %2LG:+0X0P+0:1:2:0x0:
 %*2LG:+0X0P+0:0:2:
 %2LG:+0X8P-1025:1:2:0x0:
@@ -200,8 +200,8 @@
 %*3LG:-0X8P-1025:0:-1:
 %3LG:-0X0P+0:0:-1:
 %*3LG:-0X0P+0:0:-1:
-%3LG:-0X0P0:0:-1:
-%*3LG:-0X0P0:0:-1:
+%3LG:-0X.0P0:0:-1:
+%*3LG:-0X.0P0:0:-1:
 %3LG:-NAN(09A_Zaz):0:-1:
 %*3LG:-NAN(09A_Zaz):0:-1:
 %3LG:-NAN():0:-1:
@@ -210,8 +210,8 @@
 %*3LG:NAN():0:3:
 %3LG:NAN(09A_Zaz):1:3:nan:
 %*3LG:NAN(09A_Zaz):0:3:
-%3LG:0X0P0:1:3:0x0:
-%*3LG:0X0P0:0:3:
+%3LG:0X.0P0:0:-1:
+%*3LG:0X.0P0:0:-1:
 %3LG:0X0P+0:1:3:0x0:
 %*3LG:0X0P+0:0:3:
 %3LG:0X8P-1025:1:3:0x1p3:
@@ -230,8 +230,8 @@
 %*3LG:+NAN():0:-1:
 %3LG:+NAN(09A_Zaz):0:-1:
 %*3LG:+NAN(09A_Zaz):0:-1:
-%3LG:+0X0P0:0:-1:
-%*3LG:+0X0P0:0:-1:
+%3LG:+0X.0P0:0:-1:
+%*3LG:+0X.0P0:0:-1:
 %3LG:+0X0P+0:0:-1:
 %*3LG:+0X0P+0:0:-1:
 %3LG:+0X8P-1025:0:-1:
@@ -262,8 +262,8 @@
 %*4LG:-0X8P-1025:0:4:
 %4LG:-0X0P+0:1:4:-0x0:
 %*4LG:-0X0P+0:0:4:
-%4LG:-0X0P0:1:4:-0x0:
-%*4LG:-0X0P0:0:4:
+%4LG:-0X.0P0:0:-1:
+%*4LG:-0X.0P0:0:-1:
 %4LG:-NAN(09A_Zaz):1:4:-nan:
 %*4LG:-NAN(09A_Zaz):0:4:
 %4LG:-NAN():1:4:-nan:
@@ -272,8 +272,8 @@
 %*4LG:NAN():0:-1:
 %4LG:NAN(09A_Zaz):0:-1:
 %*4LG:NAN(09A_Zaz):0:-1:
-%4LG:0X0P0:0:-1:
-%*4LG:0X0P0:0:-1:
+%4LG:0X.0P0:1:4:0x0:
+%*4LG:0X.0P0:0:4:
 %4LG:0X0P+0:0:-1:
 %*4LG:0X0P+0:0:-1:
 %4LG:0X8P-1025:0:-1:
@@ -292,8 +292,8 @@
 %*4LG:+NAN():0:4:
 %4LG:+NAN(09A_Zaz):1:4:nan:
 %*4LG:+NAN(09A_Zaz):0:4:
-%4LG:+0X0P0:1:4:0x0:
-%*4LG:+0X0P0:0:4:
+%4LG:+0X.0P0:0:-1:
+%*4LG:+0X.0P0:0:-1:
 %4LG:+0X0P+0:1:4:0x0:
 %*4LG:+0X0P+0:0:4:
 %4LG:+0X8P-1025:1:4:0x1p3:
@@ -324,8 +324,8 @@
 %*5LG:-0X8P-1025:0:-1:
 %5LG:-0X0P+0:0:-1:
 %*5LG:-0X0P+0:0:-1:
-%5LG:-0X0P0:0:-1:
-%*5LG:-0X0P0:0:-1:
+%5LG:-0X.0P0:1:5:-0x0:
+%*5LG:-0X.0P0:0:5:
 %5LG:-NAN(09A_Zaz):0:-1:
 %*5LG:-NAN(09A_Zaz):0:-1:
 %5LG:-NAN():0:-1:
@@ -334,8 +334,8 @@
 %*5LG:NAN():0:5:
 %5LG:NAN(09A_Zaz):0:-1:
 %*5LG:NAN(09A_Zaz):0:-1:
-%5LG:0X0P0:1:5:0x0:
-%*5LG:0X0P0:0:5:
+%5LG:0X.0P0:0:-1:
+%*5LG:0X.0P0:0:-1:
 %5LG:0X0P+0:0:-1:
 %*5LG:0X0P+0:0:-1:
 %5LG:0X8P-1025:0:-1:
@@ -354,8 +354,8 @@
 %*5LG:+NAN():0:-1:
 %5LG:+NAN(09A_Zaz):0:-1:
 %*5LG:+NAN(09A_Zaz):0:-1:
-%5LG:+0X0P0:0:-1:
-%*5LG:+0X0P0:0:-1:
+%5LG:+0X.0P0:1:5:0x0:
+%*5LG:+0X.0P0:0:5:
 %5LG:+0X0P+0:0:-1:
 %*5LG:+0X0P+0:0:-1:
 %5LG:+0X8P-1025:0:-1:
@@ -386,8 +386,8 @@
 %*6LG:-0X8P-1025:0:-1:
 %6LG:-0X0P+0:0:-1:
 %*6LG:-0X0P+0:0:-1:
-%6LG:-0X0P0:1:6:-0x0:
-%*6LG:-0X0P0:0:6:
+%6LG:-0X.0P0:0:-1:
+%*6LG:-0X.0P0:0:-1:
 %6LG:-NAN(09A_Zaz):0:-1:
 %*6LG:-NAN(09A_Zaz):0:-1:
 %6LG:-NAN():1:6:-nan:
@@ -396,8 +396,8 @@
 %*6LG:NAN():0:5:
 %6LG:NAN(09A_Zaz):0:-1:
 %*6LG:NAN(09A_Zaz):0:-1:
-%6LG:0X0P0:1:5:0x0:
-%*6LG:0X0P0:0:5:
+%6LG:0X.0P0:1:6:0x0:
+%*6LG:0X.0P0:0:6:
 %6LG:0X0P+0:1:6:0x0:
 %*6LG:0X0P+0:0:6:
 %6LG:0X8P-1025:1:6:0x1p2:
@@ -416,8 +416,8 @@
 %*6LG:+NAN():0:6:
 %6LG:+NAN(09A_Zaz):0:-1:
 %*6LG:+NAN(09A_Zaz):0:-1:
-%6LG:+0X0P0:1:6:0x0:
-%*6LG:+0X0P0:0:6:
+%6LG:+0X.0P0:0:-1:
+%*6LG:+0X.0P0:0:-1:
 %6LG:+0X0P+0:0:-1:
 %*6LG:+0X0P+0:0:-1:
 %6LG:+0X8P-1025:0:-1:
@@ -448,8 +448,8 @@
 %*20LG:-0X8P-1025:0:10:
 %20LG:-0X0P+0:1:7:-0x0:
 %*20LG:-0X0P+0:0:7:
-%20LG:-0X0P0:1:6:-0x0:
-%*20LG:-0X0P0:0:6:
+%20LG:-0X.0P0:1:7:-0x0:
+%*20LG:-0X.0P0:0:7:
 %20LG:-NAN(09A_Zaz):1:13:-nan:
 %*20LG:-NAN(09A_Zaz):0:13:
 %20LG:-NAN():1:6:-nan:
@@ -458,8 +458,8 @@
 %*20LG:NAN():0:5:
 %20LG:NAN(09A_Zaz):1:12:nan:
 %*20LG:NAN(09A_Zaz):0:12:
-%20LG:0X0P0:1:5:0x0:
-%*20LG:0X0P0:0:5:
+%20LG:0X.0P0:1:6:0x0:
+%*20LG:0X.0P0:0:6:
 %20LG:0X0P+0:1:6:0x0:
 %*20LG:0X0P+0:0:6:
 %20LG:0X8P-1025:1:9:0x1p-1022:
@@ -478,8 +478,8 @@
 %*20LG:+NAN():0:6:
 %20LG:+NAN(09A_Zaz):1:13:nan:
 %*20LG:+NAN(09A_Zaz):0:13:
-%20LG:+0X0P0:1:6:0x0:
-%*20LG:+0X0P0:0:6:
+%20LG:+0X.0P0:1:7:0x0:
+%*20LG:+0X.0P0:0:7:
 %20LG:+0X0P+0:1:7:0x0:
 %*20LG:+0X0P+0:0:7:
 %20LG:+0X8P-1025:1:10:0x1p-1022:
@@ -510,8 +510,8 @@
 %*32LG:-0X8P-1025:0:10:
 %32LG:-0X0P+0:1:7:-0x0:
 %*32LG:-0X0P+0:0:7:
-%32LG:-0X0P0:1:6:-0x0:
-%*32LG:-0X0P0:0:6:
+%32LG:-0X.0P0:1:7:-0x0:
+%*32LG:-0X.0P0:0:7:
 %32LG:-NAN(09A_Zaz):1:13:-nan:
 %*32LG:-NAN(09A_Zaz):0:13:
 %32LG:-NAN():1:6:-nan:
@@ -520,8 +520,8 @@
 %*32LG:NAN():0:5:
 %32LG:NAN(09A_Zaz):1:12:nan:
 %*32LG:NAN(09A_Zaz):0:12:
-%32LG:0X0P0:1:5:0x0:
-%*32LG:0X0P0:0:5:
+%32LG:0X.0P0:1:6:0x0:
+%*32LG:0X.0P0:0:6:
 %32LG:0X0P+0:1:6:0x0:
 %*32LG:0X0P+0:0:6:
 %32LG:0X8P-1025:1:9:0x1p-1022:
@@ -540,8 +540,8 @@
 %*32LG:+NAN():0:6:
 %32LG:+NAN(09A_Zaz):1:13:nan:
 %*32LG:+NAN(09A_Zaz):0:13:
-%32LG:+0X0P0:1:6:0x0:
-%*32LG:+0X0P0:0:6:
+%32LG:+0X.0P0:1:7:0x0:
+%*32LG:+0X.0P0:0:7:
 %32LG:+0X0P+0:1:7:0x0:
 %*32LG:+0X0P+0:0:7:
 %32LG:+0X8P-1025:1:10:0x1p-1022:
@@ -572,8 +572,8 @@
 %*5LG: -0X8P-1025:0:-1:
 %5LG: -0X0P+0:0:-1:
 %*5LG: -0X0P+0:0:-1:
-%5LG: -0X0P0:0:-1:
-%*5LG: -0X0P0:0:-1:
+%5LG: -0X.0P0:1:6:-0x0:
+%*5LG: -0X.0P0:0:6:
 %5LG: -NAN(09A_Zaz):0:-1:
 %*5LG: -NAN(09A_Zaz):0:-1:
 %5LG: -NAN():0:-1:
@@ -582,8 +582,8 @@
 %*5LG: NAN():0:6:
 %5LG: NAN(09A_Zaz):0:-1:
 %*5LG: NAN(09A_Zaz):0:-1:
-%5LG: 0X0P0:1:6:0x0:
-%*5LG: 0X0P0:0:6:
+%5LG: 0X.0P0:0:-1:
+%*5LG: 0X.0P0:0:-1:
 %5LG: 0X0P+0:0:-1:
 %*5LG: 0X0P+0:0:-1:
 %5LG: 0X8P-1025:0:-1:
@@ -602,8 +602,8 @@
 %*5LG: +NAN():0:-1:
 %5LG: +NAN(09A_Zaz):0:-1:
 %*5LG: +NAN(09A_Zaz):0:-1:
-%5LG: +0X0P0:0:-1:
-%*5LG: +0X0P0:0:-1:
+%5LG: +0X.0P0:1:6:0x0:
+%*5LG: +0X.0P0:0:6:
 %5LG: +0X0P+0:0:-1:
 %*5LG: +0X0P+0:0:-1:
 %5LG: +0X8P-1025:0:-1:
@@ -634,8 +634,8 @@
 %*32LG: -0X8P-1025:0:11:
 %32LG: -0X0P+0:1:8:-0x0:
 %*32LG: -0X0P+0:0:8:
-%32LG: -0X0P0:1:7:-0x0:
-%*32LG: -0X0P0:0:7:
+%32LG: -0X.0P0:1:8:-0x0:
+%*32LG: -0X.0P0:0:8:
 %32LG: -NAN(09A_Zaz):1:14:-nan:
 %*32LG: -NAN(09A_Zaz):0:14:
 %32LG: -NAN():1:7:-nan:
@@ -644,8 +644,8 @@
 %*32LG: NAN():0:6:
 %32LG: NAN(09A_Zaz):1:13:nan:
 %*32LG: NAN(09A_Zaz):0:13:
-%32LG: 0X0P0:1:6:0x0:
-%*32LG: 0X0P0:0:6:
+%32LG: 0X.0P0:1:7:0x0:
+%*32LG: 0X.0P0:0:7:
 %32LG: 0X0P+0:1:7:0x0:
 %*32LG: 0X0P+0:0:7:
 %32LG: 0X8P-1025:1:10:0x1p-1022:
@@ -664,8 +664,8 @@
 %*32LG: +NAN():0:7:
 %32LG: +NAN(09A_Zaz):1:14:nan:
 %*32LG: +NAN(09A_Zaz):0:14:
-%32LG: +0X0P0:1:7:0x0:
-%*32LG: +0X0P0:0:7:
+%32LG: +0X.0P0:1:8:0x0:
+%*32LG: +0X.0P0:0:8:
 %32LG: +0X0P+0:1:8:0x0:
 %*32LG: +0X0P+0:0:8:
 %32LG: +0X8P-1025:1:11:0x1p-1022: