From a0208e056389c8d9d21f9b0d8bf093e087809b21 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 14 Mar 2009 00:25:10 +0000
Subject: [PATCH] unmodified declarations first in key maps

---
 Shiar_Sheet/Keyboard.pm |  3 +-
 keys.inc.pl             | 96 ++++++++++++++++++++---------------------
 2 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 6ba2a4a..58d7da2 100644
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -110,13 +110,12 @@ sub print_rows {
 
 	for (my $row = 0; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
 		my $keyrow = $keyrows{$self->{map}}->[$row];
-		my @caserows = 0 .. $#$keyrow;
 
 		print qq{<li class="row row$row"><ul>\n};
 		for my $modefull (@moderows) {
 			my $mode = $modefull;
 			my @showcase = $mode =~ s/(\d+)(?:-(\d+))?$//
-				? (map {3 - $_} split //, $row == 0 && $2 || $1) : @caserows;
+				? (map {$_ - 1} split //, $row == 0 && $2 || $1) : (2, 1, 0);
 			my $modekeys = $self->{keys}{$mode};
 
 			for my $case (@showcase) {
diff --git a/keys.inc.pl b/keys.inc.pl
index 03f1040..3def8bd 100644
--- a/keys.inc.pl
+++ b/keys.inc.pl
@@ -2,113 +2,113 @@ use utf8;
 my @num = qw(^0 ^0 ^@ ^0 ^0 ^0 ^^ ^0 ^0 ^0 ^0);
 
 dvorak => [[
-	[@num, qw/                           ^[ ^] /],
-	[qw/ ~  !  @  #  $  %  ^  &  *  (  )  {  } /],
 	[qw/ `  1  2  3  4  5  6  7  8  9  0  [  ] /],
+	[qw/ ~  !  @  #  $  %  ^  &  *  (  )  {  } /],
+	[@num, qw/                           ^[ ^] /],
 ], [
-	[qw/^0 ^0 ^0 ^p ^y ^f ^g ^c ^r ^l ^? ^0 /],
-	[qw/ "  <  >  P  Y  F  G  C  R  L  ?  + /],
 	[qw( '  ,  .  p  y  f  g  c  r  l  /  = )],
+	[qw/ "  <  >  P  Y  F  G  C  R  L  ?  + /],
+	[qw/^0 ^0 ^0 ^p ^y ^f ^g ^c ^r ^l ^? ^0 /],
 ], [
-	[qw/^a ^o ^e ^u ^i ^d ^h ^t ^n ^s ^_ ^\\ /],
-	[qw/ A  O  E  U  I  D  H  T  N  S  _   | /],
 	[qw/ a  o  e  u  i  d  h  t  n  s  -  \\ /],
+	[qw/ A  O  E  U  I  D  H  T  N  S  _   | /],
+	[qw/^a ^o ^e ^u ^i ^d ^h ^t ^n ^s ^_ ^\\ /],
 ], [
-	[qw/^0 ^q ^j ^k ^x ^b ^m ^w ^v ^z /],
-	[qw/ :  Q  J  K  X  B  M  W  V  Z /],
 	[qw/ ;  q  j  k  x  b  m  w  v  z /],
+	[qw/ :  Q  J  K  X  B  M  W  V  Z /],
+	[qw/^0 ^q ^j ^k ^x ^b ^m ^w ^v ^z /],
 ]],
 
 qwerty => [[
-	[@num, qw/                           ^_ ^0 /],
-	[qw/ ~  !  @  #  $  %  ^  &  *  (  )  _  + /],
 	[qw/ `  1  2  3  4  5  6  7  8  9  0  -  = /],
+	[qw/ ~  !  @  #  $  %  ^  &  *  (  )  _  + /],
+	[@num, qw/                           ^_ ^0 /],
 ], [
-	[qw/^q ^w ^e ^r ^t ^y ^u ^i ^o ^p ^[ ^] /],
-	[qw/ Q  W  E  R  T  Y  U  I  O  P  {  } /],
 	[qw/ q  w  e  r  t  y  u  i  o  p  [  ] /],
+	[qw/ Q  W  E  R  T  Y  U  I  O  P  {  } /],
+	[qw/^q ^w ^e ^r ^t ^y ^u ^i ^o ^p ^[ ^] /],
 ], [
-	[qw/^a ^s ^d ^f ^g ^h ^j ^k ^l ^0 ^0 ^\\ /],
-	[qw/ A  S  D  F  G  H  J  K  L  :  "   | /],
 	[qw/ a  s  d  f  g  h  j  k  l  ;  '  \\ /],
+	[qw/ A  S  D  F  G  H  J  K  L  :  "   | /],
+	[qw/^a ^s ^d ^f ^g ^h ^j ^k ^l ^0 ^0 ^\\ /],
 ], [
-	[qw(^z ^x ^c ^v ^b ^n ^m ^0 ^0 ^? )],
-	[qw( Z  X  C  V  B  N  M  <  >  ? )],
 	[qw( z  x  c  v  b  n  m  ,  .  / )],
+	[qw( Z  X  C  V  B  N  M  <  >  ? )],
+	[qw(^z ^x ^c ^v ^b ^n ^m ^0 ^0 ^? )],
 ]],
 
 qwertz => [[
+	[qw/ ^  1  2  3  4  5  6  7  8  9  0 /, $ascii ? ('ss', '^0') : ('ß', '´') ],
+	[$ascii ? '^0' : '°', qw{ !  " }, $ascii ? '^0' : '§', qw{ $  %  &  /  (  )  =  ?  ` }],
 	[qw/^^ ^0 ^0 ^0 ^0 ^0 ^0  {  [  ]  }              \\         ^0 /],
 #	[qw{ °  !  "  §  $  %  &  /  (  )  =               ?          ` }],
-	[$ascii ? '^0' : '°', qw{ !  " }, $ascii ? '^0' : '§', qw{ $  %  &  /  (  )  =  ?  ` }],
-	[qw/ ^  1  2  3  4  5  6  7  8  9  0 /, $ascii ? ('ss', '^0') : ('ß', '´') ],
 ], [
+	[qw/ q  w  e  r  t  z  u  i  o  p /, $ascii ? 'ue' : 'ü', '+' ],
+	[qw/ Q  W  E  R  T  Z  U  I  O  P /, $ascii ? 'UE' : 'Ü', '*' ],
 	[qw/ @ ^w ^e ^r ^t ^z ^u ^i ^o ^p              ^0     ~      /],
 	#    ^ show altgr-Q instead
-	[qw/ Q  W  E  R  T  Z  U  I  O  P /, $ascii ? 'UE' : 'Ü', '*' ],
-	[qw/ q  w  e  r  t  z  u  i  o  p /, $ascii ? 'ue' : 'ü', '+' ],
 ], [
-	[qw/^a ^s ^d ^f ^g ^h ^j ^k ^l               ^0    ^0                 ^0 /],
-	[qw/ A  S  D  F  G  H  J  K  L /, $ascii ? ('OE', 'AE') : ('Ö', 'Ä'), "'" ],
 	[qw/ a  s  d  f  g  h  j  k  l /, $ascii ? ('oe', 'ae') : ('ö', 'ä'), '#' ],
+	[qw/ A  S  D  F  G  H  J  K  L /, $ascii ? ('OE', 'AE') : ('Ö', 'Ä'), "'" ],
+	[qw/^a ^s ^d ^f ^g ^h ^j ^k ^l               ^0    ^0                 ^0 /],
 ], [
-	[qw/^y ^x ^c ^v ^b ^n ^m ^0 ^0 ^_  | /],
-	[qw/ Y  X  C  V  B  N  M  ;  :  _  > /],
 	[qw/ y  x  c  v  b  n  m  ,  .  -  < /],
+	[qw/ Y  X  C  V  B  N  M  ;  :  _  > /],
+	[qw/^y ^x ^c ^v ^b ^n ^m ^0 ^0 ^_  | /],
 ]],
 
 azerty => [[
-	[qw/^\\ ^0  ~  #  {  [  |  ` \\ ^0 ^@  ]  } /], # °→^]
+	[qw/  <  & /, $ascii ? 'e\'' : 'é', qw/ "  '  (  - ^_  _ /, $ascii ? 'c,' : 'ç', qw/ @  )  = /],
 	[qw/  >  1  2  3  4 ^[  6  7  8  9  0 ^]  + /], # 5 unused atm
 #	[qw/  <  &  é  "  '  (  - ^_  _  ç  @  )  = /], # à→@→^@, è→^_
-	[qw/  <  & /, $ascii ? 'e\'' : 'é', qw/ "  '  (  - ^_  _ /, $ascii ? 'c,' : 'ç', qw/ @  )  = /],
+	[qw/^\\ ^0  ~  #  {  [  |  ` \\ ^0 ^@  ]  } /], # °→^]
 ], [
-	[qw/^a ^z ^e ^r ^t ^y ^u ^i ^o ^p ^^ /, $ascii ? 'Cu' : '¤'],
-	[qw/ A  Z  E  R  T  Y  U  I  O  P /, $ascii ? (":'", 'Pd') : ('¨', '£')],
 	[qw/ a  z  e  r  t  y  u  i  o  p  ^  $ /],
+	[qw/ A  Z  E  R  T  Y  U  I  O  P /, $ascii ? (":'", 'Pd') : ('¨', '£')],
+	[qw/^a ^z ^e ^r ^t ^y ^u ^i ^o ^p ^^ /, $ascii ? 'Cu' : '¤'],
 ], [
-	[qw/^q ^s ^d ^f ^g ^h ^j ^k ^l ^m ^0 ^0 /],
-	[qw/ Q  S  D  F  G  H  J  K  L  M /, '%', $ascii ? 'My' : 'µ'],
 	[qw/ q  s  d  f  g  h  j  k  l  m /, $ascii ? 'u!' : 'ù', '*'],
+	[qw/ Q  S  D  F  G  H  J  K  L  M /, '%', $ascii ? 'My' : 'µ'],
+	[qw/^q ^s ^d ^f ^g ^h ^j ^k ^l ^m ^0 ^0 /],
 ], [
-	[qw(^w ^x ^c ^v ^b ^n ^? ^0 ^0                    ^0 )],
-	[qw( W  X  C  V  B  N  ?  .  / ), $ascii ? 'SE' : '§' ],
 	[qw( w  x  c  v  b  n  ,  ;  :                     ! )],
+	[qw( W  X  C  V  B  N  ?  .  / ), $ascii ? 'SE' : '§' ],
+	[qw(^w ^x ^c ^v ^b ^n ^? ^0 ^0                    ^0 )],
 ]],
 
 arensito => [[
-	[@num, qw/                           ^[ ^] /],
-	[qw/ ~  !  @  #  $  %  ^  &  *  (  )  {  } /],
 	[qw/ `  1  2  3  4  5  6  7  8  9  0  [  ] /],
+	[qw/ ~  !  @  #  $  %  ^  &  *  (  )  {  } /],
+	[@num, qw/                           ^[ ^] /],
 ], [
-	[qw(^q ^l ^0 ^p ^0 ^0 ^f ^u ^d ^k ^? ^0 )],
-	[qw( Q  L  "  P  <  >  F  U  D  K  ?  + )],
 	[qw( q  l  '  p  ,  .  f  u  d  k  /  = )],
+	[qw( Q  L  "  P  <  >  F  U  D  K  ?  + )],
+	[qw(^q ^l ^0 ^p ^0 ^0 ^f ^u ^d ^k ^? ^0 )],
 ], [
-	[qw/^a ^r ^e ^n ^b ^g ^s ^i ^t ^o ^_ ^\\ /],
-	[qw/ A  R  E  N  B  G  S  I  T  O  _   | /],
 	[qw/ a  r  e  n  b  g  s  i  t  o  -  \\ /],
+	[qw/ A  R  E  N  B  G  S  I  T  O  _   | /],
+	[qw/^a ^r ^e ^n ^b ^g ^s ^i ^t ^o ^_ ^\\ /],
 ], [
-	[qw/^z ^w ^0 ^h ^j ^v ^c ^y ^m ^x /],
-	[qw/ Z  W  :  H  J  V  C  Y  M  X /],
 	[qw/ z  w  ;  h  j  v  c  y  m  x /],
+	[qw/ Z  W  :  H  J  V  C  Y  M  X /],
+	[qw/^z ^w ^0 ^h ^j ^v ^c ^y ^m ^x /],
 ]],
 
 abc => [[
-	[@num, qw/                           ^_ ^0 /],
-	[qw/ ~  !  @  #  $  %  ^  &  *  (  )  _  + /],
 	[qw/ `  1  2  3  4  5  6  7  8  9  0  -  = /],
+	[qw/ ~  !  @  #  $  %  ^  &  *  (  )  _  + /],
+	[@num, qw/                           ^_ ^0 /],
 ], [
-	[qw/^a ^b ^c ^d ^e ^f ^g ^h ^i ^j ^[ ^] /],
-	[qw/ A  B  C  D  E  F  G  H  I  J  {  } /],
 	[qw/ a  b  c  d  e  f  g  h  i  j  [  ] /],
+	[qw/ A  B  C  D  E  F  G  H  I  J  {  } /],
+	[qw/^a ^b ^c ^d ^e ^f ^g ^h ^i ^j ^[ ^] /],
 ], [
-	[qw/^k ^l ^m ^n ^o ^p ^q ^r ^s ^0 ^0 ^\\ /],
-	[qw/ K  L  M  N  O  P  Q  R  S  :  "   | /],
 	[qw/ k  l  m  n  o  p  q  r  s  ;  '  \\ /],
+	[qw/ K  L  M  N  O  P  Q  R  S  :  "   | /],
+	[qw/^k ^l ^m ^n ^o ^p ^q ^r ^s ^0 ^0 ^\\ /],
 ], [
-	[qw'^t ^u ^v ^w ^x ^y ^z ^0 ^0 ^? '],
-	[qw' T  U  V  W  X  Y  Z  <  >  ? '],
 	[qw' t  u  v  w  x  y  z  ,  .  / '],
+	[qw' T  U  V  W  X  Y  Z  <  >  ? '],
+	[qw'^t ^u ^v ^w ^x ^y ^z ^0 ^0 ^? '],
 ]],
 
-- 
2.30.0