keymap-dump: don't write spaces between multiple-syms-per-level

This can get a bit unwieldy.

Signed-off-by: Ran Benita <ran234@gmail.com>

diff --git a/src/keymap-dump.c b/src/keymap-dump.c
index 3fa99b1..3312dce 100644 (file)
--- a/src/keymap-dump.c
+++ b/src/keymap-dump.c
@@ -593,7 +593,7 @@ write_keysyms(struct xkb_keymap *keymap, struct buf *buf,
                 if (s != 0)
                     write_buf(buf, ", ");
                 xkb_keysym_get_name(syms[s], out_buf, OUT_BUF_LEN);
-                write_buf(buf, "%15s", out_buf);
+                write_buf(buf, "%s", out_buf);
             }
             write_buf(buf, " }");
         }

diff --git a/test/data/keymaps/stringcomp.data b/test/data/keymaps/stringcomp.data
index 42ff170..6d2f3e6 100644 (file)
--- a/test/data/keymaps/stringcomp.data
+++ b/test/data/keymaps/stringcomp.data
@@ -1125,7 +1125,7 @@ xkb_keymap {
                key <AE06> {
                        type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        type[group4]= "EIGHT_LEVEL",
-                       symbols[Group1]= [ {               H,               E,               L,               L,               O },     asciicircum ],
+                       symbols[Group1]= [ { H, E, L, L, O },     asciicircum ],
                        symbols[Group2]= [               6,           colon ],
                        symbols[Group3]= [               6,        question,         notsign,        NoSymbol,   threequarters,     fiveeighths,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               6,          dollar,            cent,           U26a5,        sterling,        NoSymbol,           U2225,        NoSymbol ]
@@ -1133,7 +1133,7 @@ xkb_keymap {
                key <AE07> {
                        type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        type[group4]= "EIGHT_LEVEL",
-                       symbols[Group1]= [ {               Y,               E,               S,           space,               T,               H,               I,               S,           space,               I,               S,           space,               D,               O,               G },       ampersand ],
+                       symbols[Group1]= [ { Y, E, S, space, T, H, I, S, space, I, S, space, D, O, G },       ampersand ],
                        symbols[Group2]= [               7,        question ],
                        symbols[Group3]= [               7,       ampersand,       braceleft,        NoSymbol,        NoSymbol,    seveneighths,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               7,        EuroSign,             yen,            U3f0,        currency,        NoSymbol,      rightarrow,        NoSymbol ]