symbols/jp: order the two main layouts first, the three options last

1 files changed, 37 insertions, 36 deletions

diff --git a/symbols/jp b/symbols/jp
index 911ddf3..2f70197 100644
--- a/symbols/jp
+++ b/symbols/jp
@@ -13,6 +13,17 @@ xkb_symbols "106" {
     key <AE13>	{[ backslash, bar	]};
 };
 
+partial alphanumeric_keys
+xkb_symbols "OADG109A" {
+
+    include "jp(common)"
+
+    name[Group1]= "Japanese (OADG 109A)";
+
+    key <AE10>	{[ 0		]};
+    key <AE13>	{[ yen, bar	]};
+};
+
 // Keys that are common to 106-key and 109-key keyboards.
 hidden partial alphanumeric_keys
 xkb_symbols "common" {
@@ -78,23 +89,6 @@ xkb_symbols "common" {
     key <PRSC>	{[ Print, Execute ], type[group1]= "PC_ALT_LEVEL2" };
 };
 
-// Kludge for overriding the XF86AudioMedia symbol for non-evdev machines.
-partial alphanumeric_keys
-xkb_symbols "henkan" {
-    key <XFER>	{[ Henkan, Mode_switch ], type[group1]="PC_ALT_LEVEL2" };
-};
-
-partial alphanumeric_keys
-xkb_symbols "OADG109A" {
-
-    include "jp(common)"
-
-    name[Group1]= "Japanese (OADG 109A)";
-
-    key <AE10>	{[ 0		]};
-    key <AE13>	{[ yen, bar	]};
-};
-
 // 86 keys with kana map
 partial alphanumeric_keys
 xkb_symbols "kana86" {
@@ -180,20 +174,6 @@ xkb_symbols "kana" {
     key <PRSC>	{[ Print, Execute ], type[group1]= "PC_ALT_LEVEL2" };
 };
 
-// Option for a Nicola-F-style Backspace key.
-partial alphanumeric_keys
-xkb_symbols "nicola_f_bs" {
-    key <AE10>	{[ 0, underscore        ]};
-
-    key <AD11>	{[ colon, asterisk      ]};
-
-    key <AC11>	{[ BackSpace, BackSpace ]};
-    key <AC12>	{[ Escape               ]};
-    key <BKSP>	{[ bracketright, braceright ]};
-
-    key <AB11>	{[ at, grave            ]};
-};
-
 partial alphanumeric_keys
 xkb_symbols "mac" {
 
@@ -205,11 +185,6 @@ xkb_symbols "mac" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "hztg_escape" {
-    replace key <HZTG>	{[ Escape ]};
-};
-
-partial alphanumeric_keys
 xkb_symbols "dvorak" {
 
     include "jp(OADG109A)"
@@ -253,6 +228,32 @@ xkb_symbols "dvorak" {
 };
 
 
+// Kludge for overriding the XF86AudioMedia symbol for non-evdev machines.
+partial alphanumeric_keys
+xkb_symbols "henkan" {
+    key <XFER>	{[ Henkan, Mode_switch ], type[group1]="PC_ALT_LEVEL2" };
+};
+
+// Option for a Nicola-F-style Backspace key.
+partial alphanumeric_keys
+xkb_symbols "nicola_f_bs" {
+    key <AE10>	{[ 0, underscore        ]};
+
+    key <AD11>	{[ colon, asterisk      ]};
+
+    key <AC11>	{[ BackSpace, BackSpace ]};
+    key <AC12>	{[ Escape               ]};
+    key <BKSP>	{[ bracketright, braceright ]};
+
+    key <AB11>	{[ at, grave            ]};
+};
+
+partial alphanumeric_keys
+xkb_symbols "hztg_escape" {
+    replace key <HZTG>	{[ Escape ]};
+};
+
+
 // EXTRAS:
 
 partial alphanumeric_keys