kbd-model-map: add mapping 'es-dvorak'

And update test-keymap-util accordingly.

While at it, make sure to use tabs everywhere.

diff --git a/src/locale/kbd-model-map b/src/locale/kbd-model-map
index 8fa984f83b37a5f36d57b9159877f5a84a5037b6..81d55853ca618cd12ecfe299b659d359b10f617d 100644 (file)
--- a/src/locale/kbd-model-map
+++ b/src/locale/kbd-model-map
@@ -1,4 +1,4 @@
-# Generated from system-config-keyboard's model list
+# Originally generated from system-config-keyboard's model list.
 # consolelayout                xlayout xmodel          xvariant        xoptions
 sg                     ch      pc105           de_nodeadkeys   terminate:ctrl_alt_bksp
 nl                     nl      pc105           -               terminate:ctrl_alt_bksp
@@ -63,6 +63,7 @@ by                    by,us   pc105           -               terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
 il                     il      pc105           -               terminate:ctrl_alt_bksp
 kazakh                 kz,us   pc105           -               terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
 lt.baltic              lt      pc105           -               terminate:ctrl_alt_bksp
-lt.l4                  lt      pc105           -               terminate:ctrl_alt_bksp
+lt.l4                  lt      pc105           -               terminate:ctrl_alt_bksp
 lt                     lt      pc105           -               terminate:ctrl_alt_bksp
 khmer                  kh,us   pc105           -               terminate:ctrl_alt_bksp
+es-dvorak              es      microsoftpro    dvorak          terminate:ctrl_alt_bksp

diff --git a/src/locale/test-keymap-util.c b/src/locale/test-keymap-util.c
index bded12239949fc7fa1ece113cf365a0272b8a529..6f60aba38ce53ab7607ac7207986964a3c9f587e 100644 (file)
--- a/src/locale/test-keymap-util.c
+++ b/src/locale/test-keymap-util.c
@@ -93,9 +93,9 @@ static void test_vconsole_convert_to_x11(void) {
         log_info("/* test with known variant, new mapping (es:dvorak) */");
         assert_se(free_and_strdup(&c.vc_keymap, "es-dvorak") >= 0);
 
-        assert_se(vconsole_convert_to_x11(&c) == 0); // FIXME
+        assert_se(vconsole_convert_to_x11(&c) == 1);
         assert_se(streq(c.x11_layout, "es"));
-        assert_se(c.x11_variant == NULL); // FIXME: "dvorak"
+        assert_se(streq(c.x11_variant, "dvorak"));
 
         log_info("/* test with old mapping (fr:latin9) */");
         assert_se(free_and_strdup(&c.vc_keymap, "fr-latin9") >= 0);