xkeyboard-config git update 27-3-2010

1 files changed, 222 insertions, 213 deletions

diff --git a/xorg-server/xkbdata.src/symbols/jp b/xorg-server/xkbdata.src/symbols/jp
index 694090cb5..7a4016fc5 100644
--- a/xorg-server/xkbdata.src/symbols/jp
+++ b/xorg-server/xkbdata.src/symbols/jp
@@ -1,213 +1,222 @@
-// $XKeyboardConfig$
-
-// based on:
-// symbols for a Japanese 106 keyboard(by tsuka@kawalab.dnj.ynu.ac.jp)
-
-// jp106 keyboard map
-partial default alphanumeric_keys
-xkb_symbols "106" {
-    include "jp(common)"
-    name[Group1]= "Japan";
-
-    key <AE10> { [ 0, asciitilde	] };
-    key <AE13> { [ backslash, bar 	] };
-};
-
-// common latin part of jp keyboard map
-partial hidden alphanumeric_keys
-xkb_symbols "common" {
-    // "Common" keys for jp 106/109A layout
-
-    // Alphanumeric section
-    key <HZTG> {
-	type[Group1]="PC_ALT_LEVEL2",
-	symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
-    };
-
-    key <AE01> { [ 1, exclam		] };
-    key <AE02> { [ 2, quotedbl		] };
-    key <AE03> { [ 3, numbersign	] };
-    key <AE04> { [ 4, dollar		] };
-    key <AE05> { [ 5, percent		] };
-    key <AE06> { [ 6, ampersand		] };
-    key <AE07> { [ 7, apostrophe	] };
-    key <AE08> { [ 8, parenleft		] };
-    key <AE09> { [ 9, parenright	] };
-    key <AE11> { [ minus, equal		] };
-    key <AE12> { [ asciicircum,	asciitilde] };
-
-    key <AD01> { [ q, Q			] };
-    key <AD02> { [ w, W			] };
-    key <AD03> { [ e, E			] };
-    key <AD04> { [ r, R			] };
-    key <AD05> { [ t, T			] };
-    key <AD06> { [ y, Y			] };
-    key <AD07> { [ u, U			] };
-    key <AD08> { [ i, I			] };
-    key <AD09> { [ o, O			] };
-    key <AD10> { [ p, P			] };
-    key <AD11> { [ at, grave		] };
-    key <AD12> { [ bracketleft,	braceleft ] };
-
-    key <CAPS> { [ Eisu_toggle, Caps_Lock ] };
-
-    key <AC01> { [ a, A			] };
-    key <AC02> { [ s, S			] };
-    key <AC03> { [ d, D			] };
-    key <AC04> { [ f, F			] };
-    key <AC05> { [ g, G			] };
-    key <AC06> { [ h, H			] };
-    key <AC07> { [ j, J			] };
-    key <AC08> { [ k, K			] };
-    key <AC09> { [ l, L			] };
-    key <AC10> { [ semicolon, plus	] };
-    key <AC11> { [ colon, asterisk	] };
-    key <AC12> { [ bracketright, braceright ] };
-
-    key <AB01> { [ z, Z			] };
-    key <AB02> { [ x, X			] };
-    key <AB03> { [ c, C			] };
-    key <AB04> { [ v, V			] };
-    key <AB05> { [ b, B			] };
-    key <AB06> { [ n, N			] };
-    key <AB07> { [ m, M			] };
-    key <AB08> { [ comma,  less		] };
-    key <AB09> { [ period, greater	] };
-    key <AB10> { [ slash, question	] };
-    key <AB11> { [ backslash, underscore] };
-    key <LCTL> { [ Control_L		] };
-
-    key <NFER> { [ Muhenkan		] };
-
-    key <XFER> {
-	type[Group1]="PC_ALT_LEVEL2",
-	symbols[Group1]= [ Henkan, Mode_switch ]
-    };
-    key <HKTG> {
-	type[Group1]="PC_ALT_LEVEL2",
-	symbols[Group1]= [ Hiragana_Katakana, Romaji ]
-    };
-
-    key <EISU> {
-       type[Group1]="PC_ALT_LEVEL2",
-       symbols[Group1]= [ Eisu_toggle ]
-    };
-
-    key <KANA> {
-       type[Group1]="PC_ALT_LEVEL2",
-       symbols[Group1]= [ Hiragana_Katakana ]
-    };
-
-
-    key <PRSC> {
-        type[Group1]= "PC_ALT_LEVEL2",
-        symbols[Group1]= [ Print, Execute ]
-    };
-};
-
-// OADG109A map
-partial alphanumeric_keys
-xkb_symbols "OADG109A" {
-
-    include "jp(common)"
-    name[Group1]= "Japan - OADG 109A";
-
-    key <AE10> { [ 0		] };
-    key <AE13> { [ yen, bar 	] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "kana" {
-
-    name[Group1]= "Japan - Kana";
-
-    // Alphanumeric section
-    key <HZTG> {
-	type[Group1]="PC_ALT_LEVEL2",
-	symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
-    };
-    key <AE01> { [ kana_NU		]	};
-    key <AE02> { [ kana_FU		]	};
-    key <AE03> { [ kana_A, kana_a	]	};
-    key <AE04> { [ kana_U, kana_u	]	};
-    key <AE05> { [ kana_E, kana_e	]	};
-    key <AE06> { [ kana_O, kana_o	]	};
-    key <AE07> { [ kana_YA, kana_ya	]	};
-    key <AE08> { [ kana_YU, kana_yu	]	};
-    key <AE09> { [ kana_YO, kana_yo	]	};
-    key <AE10> { [ kana_WA, kana_WO	]	};
-    key <AE11> { [ kana_HO		]	};
-    key <AE12> { [ kana_HE		]	};
-    key <AE13> { [ prolongedsound	]	};
-
-    key <AD01> { [ kana_TA		]	};
-    key <AD02> { [ kana_TE		]	};
-    key <AD03> { [ kana_I, kana_i	]	};
-    key <AD04> { [ kana_SU		]	};
-    key <AD05> { [ kana_KA		]	};
-    key <AD06> { [ kana_N		]	};
-    key <AD07> { [ kana_NA		]	};
-    key <AD08> { [ kana_NI		]	};
-    key <AD09> { [ kana_RA		]	};
-    key <AD10> { [ kana_SE		]	};
-    key <AD11> { [ voicedsound	]	};
-    key <AD12> { [ semivoicedsound, kana_openingbracket ] };
-
-    key <CAPS> { [ Eisu_toggle, Caps_Lock ]	};
-    key <AC01> { [ kana_CHI		]	};
-    key <AC02> { [ kana_TO		]	};
-    key <AC03> { [ kana_SHI		]	};
-    key <AC04> { [ kana_HA		]	};
-    key <AC05> { [ kana_KI		]	};
-    key <AC06> { [ kana_KU		]	};
-    key <AC07> { [ kana_MA		]	};
-    key <AC08> { [ kana_NO		]	};
-    key <AC09> { [ kana_RI		]	};
-    key <AC10> { [ kana_RE		]	};
-    key <AC11> { [ kana_KE		]	};
-    key <AC12> { [ kana_MU, kana_closingbracket ] };
-
-    key <AB01> { [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ kana_SA		]	};
-    key <AB03> { [ kana_SO		]	};
-    key <AB04> { [ kana_HI		]	};
-    key <AB05> { [ kana_KO		]	};
-    key <AB06> { [ kana_MI		]	};
-    key <AB07> { [ kana_MO		]	};
-    key <AB08> { [ kana_NE, kana_comma ]	};
-    key <AB09> { [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ kana_ME, kana_middledot ]	};
-    key <AB11> { [ kana_RO		]	};
-    key <LCTL> { [ Control_L		]	};
-
-    key <NFER> { [ Muhenkan		]	};
-
-    key <XFER> {
-	type[Group1]="PC_ALT_LEVEL2",
-	symbols[Group1]= [ Henkan, Mode_switch ]
-    };
-    key <HKTG> {
-	type[Group1]="PC_ALT_LEVEL2",
-	symbols[Group1]= [ Hiragana_Katakana, Romaji ]
-    };
-
-    // End alphanumeric section
-
-    key <PRSC> {
-        type[Group1]= "PC_ALT_LEVEL2",
-        symbols[Group1]= [ Print, Execute ]
-    };
-};
-
-partial alphanumeric_keys
-xkb_symbols "nicola_f_bs" {
-    key <BKSP> {
-       type="",
-       symbols[Group1]= [ bracketright, braceright ]
-    };
-    key <AE10> { [ 0,underscore         ] };
-    key <AD11> { [ colon, asterisk      ] };
-    key <AC11> { [ BackSpace, BackSpace ] };
-    key <AC12> { [ Escape               ] };
-    key <AB11> { [ at, grave            ] };
-};
+// $XKeyboardConfig$

+

+// based on:

+// symbols for a Japanese 106 keyboard(by tsuka@kawalab.dnj.ynu.ac.jp)

+

+// jp106 keyboard map

+partial default alphanumeric_keys

+xkb_symbols "106" {

+    include "jp(common)"

+    name[Group1]= "Japan";

+

+    key <AE10> { [ 0, asciitilde	] };

+    key <AE13> { [ backslash, bar 	] };

+};

+

+// common latin part of jp keyboard map

+partial hidden alphanumeric_keys

+xkb_symbols "common" {

+    // "Common" keys for jp 106/109A layout

+

+    // Alphanumeric section

+    key <HZTG> {

+	type[Group1]="PC_ALT_LEVEL2",

+	symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]

+    };

+

+    key <AE01> { [ 1, exclam		] };

+    key <AE02> { [ 2, quotedbl		] };

+    key <AE03> { [ 3, numbersign	] };

+    key <AE04> { [ 4, dollar		] };

+    key <AE05> { [ 5, percent		] };

+    key <AE06> { [ 6, ampersand		] };

+    key <AE07> { [ 7, apostrophe	] };

+    key <AE08> { [ 8, parenleft		] };

+    key <AE09> { [ 9, parenright	] };

+    key <AE11> { [ minus, equal		] };

+    key <AE12> { [ asciicircum,	asciitilde] };

+

+    key <AD01> { [ q, Q			] };

+    key <AD02> { [ w, W			] };

+    key <AD03> { [ e, E			] };

+    key <AD04> { [ r, R			] };

+    key <AD05> { [ t, T			] };

+    key <AD06> { [ y, Y			] };

+    key <AD07> { [ u, U			] };

+    key <AD08> { [ i, I			] };

+    key <AD09> { [ o, O			] };

+    key <AD10> { [ p, P			] };

+    key <AD11> { [ at, grave		] };

+    key <AD12> { [ bracketleft,	braceleft ] };

+

+    key <CAPS> { [ Eisu_toggle, Caps_Lock ] };

+

+    key <AC01> { [ a, A			] };

+    key <AC02> { [ s, S			] };

+    key <AC03> { [ d, D			] };

+    key <AC04> { [ f, F			] };

+    key <AC05> { [ g, G			] };

+    key <AC06> { [ h, H			] };

+    key <AC07> { [ j, J			] };

+    key <AC08> { [ k, K			] };

+    key <AC09> { [ l, L			] };

+    key <AC10> { [ semicolon, plus	] };

+    key <AC11> { [ colon, asterisk	] };

+    key <AC12> { [ bracketright, braceright ] };

+

+    key <AB01> { [ z, Z			] };

+    key <AB02> { [ x, X			] };

+    key <AB03> { [ c, C			] };

+    key <AB04> { [ v, V			] };

+    key <AB05> { [ b, B			] };

+    key <AB06> { [ n, N			] };

+    key <AB07> { [ m, M			] };

+    key <AB08> { [ comma,  less		] };

+    key <AB09> { [ period, greater	] };

+    key <AB10> { [ slash, question	] };

+    key <AB11> { [ backslash, underscore] };

+    key <LCTL> { [ Control_L		] };

+

+    key <NFER> { [ Muhenkan		] };

+

+    key <XFER> {

+	type[Group1]="PC_ALT_LEVEL2",

+	symbols[Group1]= [ Henkan, Mode_switch ]

+    };

+    key <HKTG> {

+	type[Group1]="PC_ALT_LEVEL2",

+	symbols[Group1]= [ Hiragana_Katakana, Romaji ]

+    };

+

+    key <EISU> {

+       type[Group1]="PC_ALT_LEVEL2",

+       symbols[Group1]= [ Eisu_toggle ]

+    };

+

+    key <KANA> {

+       type[Group1]="PC_ALT_LEVEL2",

+       symbols[Group1]= [ Hiragana_Katakana ]

+    };

+

+

+    key <PRSC> {

+        type[Group1]= "PC_ALT_LEVEL2",

+        symbols[Group1]= [ Print, Execute ]

+    };

+};

+

+// OADG109A map

+partial alphanumeric_keys

+xkb_symbols "OADG109A" {

+

+    include "jp(common)"

+    name[Group1]= "Japan - OADG 109A";

+

+    key <AE10> { [ 0		] };

+    key <AE13> { [ yen, bar 	] };

+};

+

+partial alphanumeric_keys

+xkb_symbols "kana" {

+

+    name[Group1]= "Japan - Kana";

+

+    // Alphanumeric section

+    key <HZTG> {

+	type[Group1]="PC_ALT_LEVEL2",

+	symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]

+    };

+    key <AE01> { [ kana_NU		]	};

+    key <AE02> { [ kana_FU		]	};

+    key <AE03> { [ kana_A, kana_a	]	};

+    key <AE04> { [ kana_U, kana_u	]	};

+    key <AE05> { [ kana_E, kana_e	]	};

+    key <AE06> { [ kana_O, kana_o	]	};

+    key <AE07> { [ kana_YA, kana_ya	]	};

+    key <AE08> { [ kana_YU, kana_yu	]	};

+    key <AE09> { [ kana_YO, kana_yo	]	};

+    key <AE10> { [ kana_WA, kana_WO	]	};

+    key <AE11> { [ kana_HO		]	};

+    key <AE12> { [ kana_HE		]	};

+    key <AE13> { [ prolongedsound	]	};

+

+    key <AD01> { [ kana_TA		]	};

+    key <AD02> { [ kana_TE		]	};

+    key <AD03> { [ kana_I, kana_i	]	};

+    key <AD04> { [ kana_SU		]	};

+    key <AD05> { [ kana_KA		]	};

+    key <AD06> { [ kana_N		]	};

+    key <AD07> { [ kana_NA		]	};

+    key <AD08> { [ kana_NI		]	};

+    key <AD09> { [ kana_RA		]	};

+    key <AD10> { [ kana_SE		]	};

+    key <AD11> { [ voicedsound	]	};

+    key <AD12> { [ semivoicedsound, kana_openingbracket ] };

+

+    key <CAPS> { [ Eisu_toggle, Caps_Lock ]	};

+    key <AC01> { [ kana_CHI		]	};

+    key <AC02> { [ kana_TO		]	};

+    key <AC03> { [ kana_SHI		]	};

+    key <AC04> { [ kana_HA		]	};

+    key <AC05> { [ kana_KI		]	};

+    key <AC06> { [ kana_KU		]	};

+    key <AC07> { [ kana_MA		]	};

+    key <AC08> { [ kana_NO		]	};

+    key <AC09> { [ kana_RI		]	};

+    key <AC10> { [ kana_RE		]	};

+    key <AC11> { [ kana_KE		]	};

+    key <AC12> { [ kana_MU, kana_closingbracket ] };

+

+    key <AB01> { [ kana_TSU, kana_tsu	]	};

+    key <AB02> { [ kana_SA		]	};

+    key <AB03> { [ kana_SO		]	};

+    key <AB04> { [ kana_HI		]	};

+    key <AB05> { [ kana_KO		]	};

+    key <AB06> { [ kana_MI		]	};

+    key <AB07> { [ kana_MO		]	};

+    key <AB08> { [ kana_NE, kana_comma ]	};

+    key <AB09> { [ kana_RU, kana_fullstop ]	};

+    key <AB10> { [ kana_ME, kana_middledot ]	};

+    key <AB11> { [ kana_RO		]	};

+    key <LCTL> { [ Control_L		]	};

+

+    key <NFER> { [ Muhenkan		]	};

+

+    key <XFER> {

+	type[Group1]="PC_ALT_LEVEL2",

+	symbols[Group1]= [ Henkan, Mode_switch ]

+    };

+    key <HKTG> {

+	type[Group1]="PC_ALT_LEVEL2",

+	symbols[Group1]= [ Hiragana_Katakana, Romaji ]

+    };

+

+    // End alphanumeric section

+

+    key <PRSC> {

+        type[Group1]= "PC_ALT_LEVEL2",

+        symbols[Group1]= [ Print, Execute ]

+    };

+};

+

+partial alphanumeric_keys

+xkb_symbols "nicola_f_bs" {

+    key <BKSP> {

+       type="",

+       symbols[Group1]= [ bracketright, braceright ]

+    };

+    key <AE10> { [ 0,underscore         ] };

+    key <AD11> { [ colon, asterisk      ] };

+    key <AC11> { [ BackSpace, BackSpace ] };

+    key <AC12> { [ Escape               ] };

+    key <AB11> { [ at, grave            ] };

+};

+

+// Copied from macintosh_vndr/jp

+partial alphanumeric_keys

+xkb_symbols "mac" {

+    name[Group1]	= "Japan - Macintosh";

+    include "jp(kana)"

+

+    replace key <CAPS> { [ Caps_Lock ] };

+};