libxtrans xkeyboard-config xserver mesa plink glproto git update 21 Sep 2014

plink revision 10233
xserver          commit 28337cb14e4347e1dd7936c5393a22e042866687
xkeyboard-config commit 48e1c0b351b6711edc0f167cbb81e4424b75291a
glproto          commit bd3d751e1eb17efb39f65093271bb4ac071aa9e0
libxtrans        commit fb7f198c88e97d22c8c89e76e9cd06b2b2720a96
mesa             commit 4eb2bbefd2bf0359aff7ebbb8e931a1c7833606f

1 files changed, 12 insertions, 15 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/apl b/xorg-server/xkeyboard-config/symbols/apl
index c60f11723..4d81ac295 100644
--- a/xorg-server/xkeyboard-config/symbols/apl
+++ b/xorg-server/xkeyboard-config/symbols/apl
@@ -62,9 +62,9 @@ xkb_symbols "basic" {
 // ┃       ┃       ┃       ┃                                   ┃       ┃       ┃       ┃
 // ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
 
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "common" {
-	name[Group1]= "APL";
+	name[Group1]= "APL keyboard symbols";
 
 	key <AB01> { [	U2282		] }; // Z: ⊂ -- Subset Of
 	key <AB02> { [	U2283		] }; // X: ⊃ -- Superset Of
@@ -129,7 +129,7 @@ xkb_symbols "common" {
 
 partial alphanumeric_keys
 xkb_symbols "unified" {
-	name[Group1]= "APL Keyboard Symbols: Unified Layout";
+	name[Group1]= "APL keyboard symbols (unified)";
 
 	include "apl(common)"
 
@@ -162,7 +162,7 @@ xkb_symbols "unified" {
 
 partial alphanumeric_keys
 xkb_symbols "sax" {
-	name[Group1]= "APL Keyboard Symbols";
+	name[Group1]= "APL keyboard symbols (sax)";
 
 	include "apl(unified)"
 
@@ -224,7 +224,7 @@ xkb_symbols "sax" {
 
 partial alphanumeric_keys
 xkb_symbols "apl2" {
-	name[Group1]= "APL Keyboard Symbols: IBM APL2";
+	name[Group1]= "APL keyboard symbols (IBM APL2)";
 
 	include "apl(common)"
 
@@ -284,7 +284,7 @@ xkb_symbols "apl2" {
 
 partial alphanumeric_keys
 xkb_symbols "aplplusII" {
-	name[Group1]= "APL Keyboard Symbols: Manugistics APL*PLUS II";
+	name[Group1]= "APL keyboard symbols (Manugistics APL*PLUS II)";
 	// AFS - short for APL Functional Symbol
 
 	include "apl(apl2)"
@@ -321,7 +321,7 @@ xkb_symbols "aplplusII" {
 
 partial alphanumeric_keys
 xkb_symbols "aplx" {
-	name[Group1]= "APL Keyboard Symbols: APLX Unified APL Layout";
+	name[Group1]= "APL keyboard symbols (APLX unified)";
 
 	include "apl(unified)"
 
@@ -372,9 +372,8 @@ xkb_symbols "aplx" {
 // the alphabet and similar. If this keyboard is placed as the 2nd layout then it can
 // be reached with a latching shift to increase group by one.
 
-partial alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "dyalog_base" {
-	name[Group1]="APL";
 
 
 // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
@@ -445,9 +444,8 @@ xkb_symbols "dyalog_base" {
 	key <TLDE> { [ U22c4,		currency] };	// diamond
 };
 
-partial keypad_keys
+hidden partial keypad_keys
 xkb_symbols "dyalog_box" {
-	name[Group1]="Dyalog box";
 
 // ┌───┬───┬───┬───┐
 // │   │   │   │   │
@@ -473,10 +471,9 @@ xkb_symbols "dyalog_box" {
 	key <KP9>  { [ U2510 ] };	// box drawing light down and left
 	key <KPDL> { [ U2502 ] };	// box drawing light vertical
 
-}; 
+};
 
-xkb_symbols "dyalog_codes" {
-	name[Group1]="Dyalog Codes";
+hidden xkb_symbols "dyalog_codes" {
 
 //	Layout of private use area for this. In the style of the Unicode book
 //
@@ -613,6 +610,6 @@ xkb_symbols "dyalog" {
 	include "apl(dyalog_base)"
 	include "apl(dyalog_box)"
 	include "apl(dyalog_codes)"
-	name[Group1] = "Dyalog APL complete";
+	name[Group1] = "APL keyboard symbols (Dyalog)";
 };