svn merge file:///D:/svnrepos/vcxsrv/branches/released .

1 files changed, 183 insertions, 67 deletions

diff --git a/xorg-server/xkbdata.src/symbols/pk b/xorg-server/xkbdata.src/symbols/pk
index 43ee86241..320e1c2a7 100644
--- a/xorg-server/xkbdata.src/symbols/pk
+++ b/xorg-server/xkbdata.src/symbols/pk
@@ -7,81 +7,197 @@
 //Notice:
 //Alt key combinations are yet to be put in. The unavailable keys are those which do not have a corresponding //glyph in unicode.
 
+// based on a keyboard map from an 'xkb/symbols/ur' file
+// $XFree86$
+
 partial default alphanumeric_keys
-xkb_symbols "urd" {
+xkb_symbols "urd-phonetic" {
+
    name[Group1]= "Pakistan";
 
-   // Keys '~' - '='
-   //  All keys checked and complete
-   key <TLDE> {  [ 0x10006d4 ] };
-   key <AE01> {  [ 0x1000661, exclam ] };
-   key <AE02> {  [ 0x1000662, 0x1000040 ] };
-   key <AE03> {  [ 0x1000663, 0x1000023 ] };
-   key <AE04> {  [ 0x10006f4, 0x1000024 ] };
-   key <AE05> {  [ 0x10006f5, 0x1000025 ] };
-   key <AE06> {  [ 0x1000666, 0x100005e ] };
-   key <AE07> {  [ 0x1000667, 0x1000026 ] };
-   key <AE08> {  [ 0x1000668, asterisk ] };
-   key <AE09> {  [ 0x1000669, parenleft ] };
-   key <AE10> {  [ 0x1000660, parenright ] };
-   key <AE11> {  [ minus, 0x100005f ] };
-   key <AE12> {  [ equal, plus ] };
+   key <TLDE> {  [     0x100064b  ,       0x100007E, 0x100200C     ]     };
+   key <AE01> {  [     0x1000031  ,       0x1000021      ]     };
+   key <AE02> {  [     0x1000032  ,       0x1000040      ]     };
+   key <AE03> {  [     0x1000033  ,       0x1000023      ]     };
+   key <AE04> {  [     0x1000034  ,       0x1000024      ]     };
+   key <AE05> {  [     0x1000035  ,       0x1000025      ]     };
+   key <AE06> {  [     0x1000036  ,       0x100005E      ]     };
+   key <AE07> {  [     0x1000037  ,       0x1000026      ]     };
+   key <AE08> {  [     0x1000038  ,       0x100002A      ]     };
+   key <AE09> {  [     0x1000039  ,       0x1000029      ]     };
+   key <AE10> {  [     0x1000030  ,       0x1000028      ]     };
+   key <AE11> {  [     0x100002D  ,       0x100005F      ]     };
+   key <AE12> {  [     0x100003D  ,       0x100002B      ]     };
+   key <AD01> {  [     0x1000642  ,       0x1000652, 0x100200D     ]     };
+   key <AD02> {  [     0x1000648  ,       0x1000624, 0x100200C     ]     };
+   key <AD03> {  [     0x1000639  ,       0x1000670      ]     };
+   key <AD04> {  [     0x1000631  ,       0x1000691      ]     };
+   key <AD05> {  [     0x100062a  ,       0x1000679      ]     };
+   key <AD06> {  [     0x10006d2  ,       0x100064E      ]     };
+   key <AD07> {  [     0x1000621  ,       0x1000626      ]     };
+   key <AD08> {  [     0x10006cc  ,       0x1000650      ]     };
+   key <AD09> {  [     0x10006c1  ,       0x10006c3      ]     };
+   key <AD10> {  [     0x100067e  ,       0x100064f      ]     };
+   key <AD11> {  [     0x100005d  ,       0x100007D      ]     };
+   key <AD12> {  [     0x100005b  ,       0x100007B      ]     };
 
-   //Keys 'Q' - ']'
-   //Checked but incomplete with three shift sequences not available
-   key <AD01> {  [  Arabic_qaf, 0x10006e1 ] };
-   key <AD02> {  [  0x1000648, 0x100fdf9  ] }; //shift key not available
-   key <AD03> {  [  0x1000639, 0x100fdf7  ] }; //shift key not available
-   key <AD04> {  [  0x1000631, 0x1000691  ] };
-   key <AD05> {  [  Arabic_teh, 0x1000679  ] };
-   key <AD06> {  [  0x10006d2, 0x100fe7c  ] };
-   key <AD07> {  [  0x1000621,  0x100064c ] };
-   key <AD08> {  [  0x10006cc, 0x1000656  ] }; //shift key not available
-   key <AD09> {  [  0x1000647, 0x1000629  ] };
-   key <AD10> {  [  0x100067e, 0x100064f  ] };
-   key <AD12> {  [  bracketright, braceright  ] };
-   key <AD11> {  [  bracketleft, braceleft  ] };
+   key <AC01> {  [     0x1000627  ,       0x1000622    ]     };
+   key <AC02> {  [     0x1000633  ,       0x1000635      ]     };
+   key <AC03> {  [     0x100062f  ,       0x1000688      ]     };
+   key <AC04> {  [     0x1000641  ,       0x1000651  ]     };
+   key <AC05> {  [     0x10006af  ,       0x100063a      ]     };
+   key <AC06> {  [     0x100062D,       0x10006BE      ]     };
+   key <AC07> {  [     0x100062c  ,       0x1000636      ]     };
+   key <AC08> {  [     0x10006a9  ,       0x100062e      ]     };
+   key <AC09> {  [     0x1000644  ,       0x1000654 ]     };
+   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };
+   key <AC11> {  [     0x1000027  ,       0x1000022       ]     };
+   key <BKSL> {  [     0x100005C,        0x100007C      ]     };
 
+   key <LSGT> {  [            bar ,       brokenbar      ]     };
+   key <AB01> {  [     0x1000632  ,       0x1000630, 0x100200E    ]     };
+   key <AB02> {  [     0x1000634  ,       0x1000698, 0x100202A      ]     };
+   key <AB03> {  [     0x1000686  ,       0x100062b, 0x100202D     ]     };
+   key <AB04> {  [     0x1000637  ,       0x1000638, 0x100202C      ]     };
+   key <AB05> {  [     0x1000628  ,       0x100002e, 0x100202E      ]     };
+   key <AB06> {  [     0x1000646  ,       0x10006ba, 0x100202B      ]     };
+   key <AB07> {  [     0x1000645  ,       0x1000658, 0x100200F     ]     };
+   key <AB08> {  [     0x100060c  ,       0x100003c      ]     };
+   key <AB09> {  [     0x10006d4  ,       0x100003E      ]     };
+   key <AB10> {  [     0x100002f  ,       0x100061f      ]     };
 
-   // Keys 'A' - '''
-   // Checked but incomplete with two shift sequences not available
-   key <AC01> { [  0x1000627, 0x1000622  ] };
-   key <AC02> { [  Arabic_seen, 0x1000635  ] };
-   key <AC03> { [  0x100062f, 0x1000688  ] };
-   key <AC04> { [  0x1000641, 0x1000670  ] };
-   key <AC05> { [  0x10006af, 0x100063a  ] };
-   key <AC06> { [  0x10006be, 0x100062d ] };
-   key <AC07> { [  0x100062c, 0x1000636  ] };
-   key <AC08> { [  0x10006a9,  0x100062e  ] };
-   key <AC09> { [  0x1000644, 0x1000612 ] };//shift key not available
-   key <AC10> { [  0x100061b, 0x100003a  ] };
-   key <AC11> { [  0x1000027  ] }; // shift key not available
-
-
-   // These two are fine
-   key <BKSL> { [  backslash, bar  ] };
-   key <SPCE> { [  space  ] };
+//   key <RALT> {  [ Mode_switch, Multi_key ] };
 
+   include "level3(ralt_switch)"
 
-   // Keys: 'Z' - '/'
-   //Keys checked with two shift sequences not available
-   key <AB01> { [  Arabic_zain, Arabic_thal  ] };
-   key <AB02> {  [  0x1000634, 0x1000698  ] };
-   key <AB03> {  [ 0x1000686 , 0x100062b  ] };
-   key <AB04> {  [  0x1000637, 0x1000638  ] };
-   key <AB05> {  [  0x1000628, 0x1000628  ] };//shift key unavailable
-   key <AB06> {  [  0x1000646, 0x10006ba  ] };
-   key <AB07> {  [  0x1000645, 0x1000645  ] };//shift key not available
-   key <AB08> {  [  0x100060c, 0x100064e  ] };
-   key <AB09> {  [  0x10006d4, 0x1000650  ] };
-   key <AB10> {  [  slash, Arabic_question_mark  ] };
-
-   //End alphanumeric key mappings
-
-   //Begin modifier mappings
-
-   modifier_map Shift {Shift_L, Shift_R };
-   modifier_map Lock {Caps_Lock };
+   // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "urd-crulp" {
+
+   name[Group1]= "Pakistan - CRULP";
+// www.crulp.org phonetic v1.1
+
+   key <TLDE> {  [     0x100007E  ,       0x100064B      ]     };
+   key <AE01> {  [     0x10006F1  ,       0x1000031, 0x1000021   ]     };
+   key <AE02> {  [     0x10006F2  ,       0x1000032, 0x1000040      ]     };
+   key <AE03> {  [     0x10006F3  ,       0x1000033, 0x1000023      ]     };
+   key <AE04> {  [     0x10006F4  ,       0x1000034      ]     };
+   key <AE05> {  [     0x10006F5  ,       0x1000035, 0x100066A      ]     };
+   key <AE06> {  [     0x10006F6  ,       0x1000036     ]     };
+   key <AE07> {  [     0x10006F7  ,       0x1000037, 0x1000026       ]     };
+   key <AE08> {  [     0x10006F8  ,       0x1000038, 0x100002A      ]     };
+   key <AE09> {  [     0x10006F9  ,       0x1000039, 0x1000029      ]     };
+   key <AE10> {  [     0x10006F0  ,       0x1000030, 0x1000028      ]     };
+   key <AE11> {  [     0x100002D  ,       0x100005F 	     ]     };
+   key <AE12> {  [     0x100003D  ,       0x100002B      ]     };   
+   key <AD01> {  [     0x1000642  ,       0x1000652  ]     };
+   key <AD02> {  [     0x1000648  ,       0x1000651, 0x1000602    ]     };
+   key <AD03> {  [     0x1000639  ,       0x1000670, 0x1000656      ]     };
+   key <AD04> {  [     0x1000631  ,       0x1000691, 0x1000613      ]     };
+   key <AD05> {  [     0x100062a  ,       0x1000679, 0x1000614      ]     };
+   key <AD06> {  [     0x10006d2  ,       0x100064E, 0x1000601      ]     };
+   key <AD07> {  [     0x1000621  ,       0x1000626, 0x1000654      ]     };
+   key <AD08> {  [     0x10006cc  ,       0x1000650,  0x1000611      ]     };
+   key <AD09> {  [     0x10006c1  ,       0x10006c3      ]     };
+   key <AD10> {  [     0x100067e  ,       0x100064f,  0x1000657      ]     };
+   key <AD11> {  [     0x100005d  ,       0x100007D      ]     };
+   key <AD12> {  [     0x100005b  ,       0x100007B      ]     };
+
+   key <AC01> {  [     0x1000627  ,       0x1000622, 0x100FDF2    ]     };
+   key <AC02> {  [     0x1000633  ,       0x1000635, 0x1000610    ]     };
+   key <AC03> {  [     0x100062f  ,       0x1000688, 0x100FDFA     ]     };
+   key <AC04> {  [     0x1000641  ,       0x1000651  ]     };
+   key <AC05> {  [     0x10006af  ,       0x100063a      ]     };
+   key <AC06> {  [     0x100062D,       0x10006BE, 0x1000612      ]     };
+   key <AC07> {  [     0x100062c  ,       0x1000636, 0x100FDFB      ]     };
+   key <AC08> {  [     0x10006a9  ,       0x100062e      ]     };
+   key <AC09> {  [     0x1000644  ,       0x1000654 ]     };
+   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };
+   key <AC11> {  [     0x1000027  ,       0x1000022       ]     };
+   key <BKSL> {  [     0x100005C,        0x100007C      ]     };
+
+   key <LSGT> {  [            bar ,       brokenbar      ]     };
+   key <AB01> {  [     0x1000632  ,       0x1000630, 0x100060F    ]     };
+   key <AB02> {  [     0x1000634  ,       0x1000698, 0x100060E      ]     };
+   key <AB03> {  [     0x1000686  ,       0x100062b, 0x1000603	     ]     };
+   key <AB04> {  [     0x1000637  ,       0x1000638      ]     };
+   key <AB05> {  [     0x1000628  ,       0x100002e, 0x100FDFD	      ]     };
+   key <AB06> {  [     0x1000646  ,       0x10006ba, 0x1000600	      ]     };
+   key <AB07> {  [     0x1000645  ,       0x1000658    ]     };
+   key <AB08> {  [     0x100060c  ,       0x100003c, 0x100003C      ]     };
+   key <AB09> {  [     0x10006d4  ,       0x100066B, 0x100003E      ]     };
+   key <AB10> {  [     0x100002f   ,       0x100061F      ]     };
+
+//   key <RALT> {  [ Mode_switch, Multi_key ] };
+
+   include "level3(ralt_switch)"
+
+   // End alphanumeric section
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "urd-nla" {
+   name[Group1]= "Pakistan - NLA";
+// www.nla.gov.pk
+
+   key <TLDE> {  [     0x1000060  ,       0x100007E, 0x100200C     ]     };
+   key <AE01> {  [     0x1000031  ,       0x1000021      ]     };
+   key <AE02> {  [     0x1000032  ,       0x1000040      ]     };
+   key <AE03> {  [     0x1000033  ,       0x1000023      ]     };
+   key <AE04> {  [     0x1000034  ,       0x1000024      ]     };
+   key <AE05> {  [     0x1000035  ,       0x100066A      ]     };
+   key <AE06> {  [     0x1000036  ,       0x100005E      ]     };
+   key <AE07> {  [     0x1000037  ,       0x10006D6      ]     };
+   key <AE08> {  [     0x1000038  ,       0x100066D      ]     };
+   key <AE09> {  [     0x1000039  ,       0x1000029      ]     };
+   key <AE10> {  [     0x1000030  ,       0x1000028      ]     };
+   key <AE11> {  [     0x100002D ,        0x100005F      ]     };
+   key <AE12> {  [     0x100003D  ,       0x100002B      ]     };
+   key <AD01> {  [     0x1000637  ,       0x1000638, 0x100200D      ]     };
+   key <AD02> {  [     0x1000635  ,       0x1000636, 0x100200C     ]     };
+   key <AD03> {  [     0x10006BE  ,       0x1000630      ]     };
+   key <AD04> {  [     0x100062F ,        0x1000688     ]     };
+   key <AD05> {  [     0x1000679  ,       0x100062B      ]     };
+   key <AD06> {  [     0x100067E  ,       0x1000651      ]     };
+   key <AD07> {  [     0x100062A  ,       0x10006C3      ]     };
+   key <AD08> {  [     0x1000628  ,       0x1000640      ]     };
+   key <AD09> {  [     0x100062C  ,       0x1000686      ]     };
+   key <AD10> {  [     0x100062D  ,       0x100062E      ]     };
+   key <AD11> {  [     0x100005d  ,       0x100007D      ]     };
+   key <AD12> {  [     0x100005b  ,       0x100007B      ]     };
+
+   key <AC01> {  [     0x1000645  ,       0x1000698      ]     };
+   key <AC02> {  [     0x1000648  ,       0x1000632      ]     };
+   key <AC03> {  [     0x1000631  ,       0x1000691      ]     };
+   key <AC04> {  [     0x1000646  ,       0x10006BA      ]     };
+   key <AC05> {  [     0x1000644  ,       0x10006C2      ]     };
+   key <AC06> {  [     0x10006C1  ,       0x1000621      ]     };
+   key <AC07> {  [     0x1000627  ,       0x1000622      ]     };
+   key <AC08> {  [     0x10006a9  ,       0x10006AF      ]     };
+   key <AC09> {  [     0x10006CC  ,       0x100064A      ]     };
+   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };
+   key <AC11> {  [     0x1000027  ,       0x1000022       ]     };
+   key <BKSL> {  [     0x100005C ,        0x100007C      ]     };
+
+   key <LSGT> {  [            bar ,       brokenbar      ]     };
+   key <AB01> {  [     0x1000642  ,       0x100200D, 0x100200E     ]     };
+   key <AB02> {  [     0x1000641  ,       0x100200C, 0x100202A      ]     };
+   key <AB03> {  [     0x10006D2  ,       0x10006D3, 0x100202D     ]     };
+   key <AB04> {  [     0x1000633  ,       0x100200E, 0x100202C      ]     };
+   key <AB05> {  [     0x1000634  ,       0x1000624, 0x100202E      ]     };
+   key <AB06> {  [     0x100063A  ,       0x1000626, 0x100202B      ]     };
+   key <AB07> {  [     0x1000639  ,       0x100200F, 0x100200F      ]     };
+   key <AB08> {  [     0x100060c  ,       0x100003E      ]     };
+   key <AB09> {  [     0x10006d4  ,       0x100003C      ]     };
+   key <AB10> {  [     0x100002F  ,       0x100061f      ]     };
+
+   
+   include "level3(ralt_switch)"
+
+   // End alphanumeric section
 };
 
 partial alphanumeric_keys