From aa785c715d31161fa33fe31f32937751a70e065d Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Thu, 16 Oct 2014 19:49:14 +0300 Subject: [PATCH 1/3] symbols/macintosh_vndr: add some "default" annotations It's nicer when the default is explicit, even if it is the first. It also enables an optimization in libxkbcommon, whereby it doesn't spend efforts parsing the rest of the file if no explicit map is given. Signed-off-by: Ran Benita --- symbols/macintosh_vndr/ch | 1 + symbols/macintosh_vndr/dk | 2 +- symbols/macintosh_vndr/it | 1 + symbols/macintosh_vndr/us | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/symbols/macintosh_vndr/ch b/symbols/macintosh_vndr/ch index 7948ab1..2f0b4cf 100644 --- a/symbols/macintosh_vndr/ch +++ b/symbols/macintosh_vndr/ch @@ -3,6 +3,7 @@ // Andreas Tobler // modified for Swiss German Apple Extended Keyboard II +default partial alphanumeric_keys xkb_symbols "extended" { diff --git a/symbols/macintosh_vndr/dk b/symbols/macintosh_vndr/dk index e464519..d3ba80d 100644 --- a/symbols/macintosh_vndr/dk +++ b/symbols/macintosh_vndr/dk @@ -1,4 +1,4 @@ -partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US diff --git a/symbols/macintosh_vndr/it b/symbols/macintosh_vndr/it index 3784b0e..17f78e9 100644 --- a/symbols/macintosh_vndr/it +++ b/symbols/macintosh_vndr/it @@ -1,3 +1,4 @@ +default xkb_symbols "extended" { name[Group1]= "Italy - Mac"; diff --git a/symbols/macintosh_vndr/us b/symbols/macintosh_vndr/us index 81e4b77..d4e4af1 100644 --- a/symbols/macintosh_vndr/us +++ b/symbols/macintosh_vndr/us @@ -1,6 +1,6 @@ // symbols definition for a Macintosh "Extended" keyboard -xkb_symbols "extended" { +default xkb_symbols "extended" { name[Group1]= "USA"; key { [ Escape ] }; -- 2.1.2