Commit 4a59c84e43116f4a05922c273b037fe91df9d0f6
2013-02-25T12:09:17
keymap-dump: remove some ugly empty lines xkbcomp prints them too, but that's just annoying. Also xkb_keycodes doesn't have it already. Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71
diff --git a/src/keymap-dump.c b/src/keymap-dump.c
index 380980b..256b036 100644
--- a/src/keymap-dump.c
+++ b/src/keymap-dump.c
@@ -185,10 +185,10 @@ static bool
write_types(struct xkb_keymap *keymap, struct buf *buf)
{
if (keymap->types_section_name)
- write_buf(buf, "xkb_types \"%s\" {\n\n",
+ write_buf(buf, "xkb_types \"%s\" {\n",
keymap->types_section_name);
else
- write_buf(buf, "xkb_types {\n\n");
+ write_buf(buf, "xkb_types {\n");
write_vmods(keymap, buf);
@@ -414,10 +414,10 @@ write_compat(struct xkb_keymap *keymap, struct buf *buf)
const struct xkb_led *led;
if (keymap->compat_section_name)
- write_buf(buf, "xkb_compatibility \"%s\" {\n\n",
+ write_buf(buf, "xkb_compatibility \"%s\" {\n",
keymap->compat_section_name);
else
- write_buf(buf, "xkb_compatibility {\n\n");
+ write_buf(buf, "xkb_compatibility {\n");
write_vmods(keymap, buf);
@@ -495,10 +495,10 @@ write_symbols(struct xkb_keymap *keymap, struct buf *buf)
xkb_layout_index_t group;
if (keymap->symbols_section_name)
- write_buf(buf, "xkb_symbols \"%s\" {\n\n",
+ write_buf(buf, "xkb_symbols \"%s\" {\n",
keymap->symbols_section_name);
else
- write_buf(buf, "xkb_symbols {\n\n");
+ write_buf(buf, "xkb_symbols {\n");
for (group = 0; group < keymap->num_group_names; group++)
if (keymap->group_names[group])
diff --git a/test/data/keymaps/stringcomp.data b/test/data/keymaps/stringcomp.data
index 54e7099..7d21eb5 100644
--- a/test/data/keymaps/stringcomp.data
+++ b/test/data/keymaps/stringcomp.data
@@ -294,7 +294,6 @@ xkb_keycodes "evdev_aliases(qwerty)" {
};
xkb_types "complete" {
-
virtual_modifiers NumLock,Alt,LevelThree,LAlt,RAlt,RControl,LControl,ScrollLock,LevelFive,AltGr,Meta,Super,Hyper;
type "ONE_LEVEL" {
@@ -589,7 +588,6 @@ xkb_types "complete" {
};
xkb_compatibility "complete_caps(caps_lock)_4_misc(assign_shift_left_action)_4_level5(level5_lock)_4" {
-
virtual_modifiers NumLock,Alt,LevelThree,LAlt,RAlt,RControl,LControl,ScrollLock,LevelFive,AltGr,Meta,Super,Hyper;
interpret.useModMapMods= AnyLevel;
@@ -1073,7 +1071,6 @@ xkb_compatibility "complete_caps(caps_lock)_4_misc(assign_shift_left_action)_4_l
};
xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
-
name[group1]="English (US)";
name[group2]="Russian";
name[group3]="Canadian Multilingual";