[Xorg-commit] xc/programs/xkbcomp/symbols/pc dz,NONE,1.1.1.1.2.1 Imakefile,1.1.4.2,1.1.4.3 am,1.1.4.1,1.1.4.2 dvorak,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/xkbcomp/symbols/pc
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/xkbcomp/symbols/pc

Modified Files:
      Tag: XORG-CURRENT
	Imakefile am dvorak 
Added Files:
      Tag: XORG-CURRENT
	dz 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


--- NEW FILE: dz ---
//
// Dzongkha / Tibetan layout for Bhutanese keyboard
//
/////////////////////////////////////////////////////////////////
//
//   Based on the official layout for Dzongkha
//   approved by the Department of Information Technology &
//   Dzongkha Development Authority of the Government of Bhutan
//
//   Copyright (C) 2004, Gregory Mokhin <mokhin at bog.msu.ru>
//   Layout map provided by Chris Fynn
///////////////////////////////////////////////////////////////// 
//   Version 0.97.     Last modified: 09 Jan 2004
/////////////////////////////////////////////////////////////////

partial default alphanumeric_keys
xkb_symbols "basic" {
      name[Group1]= "Dzongkha";

      key <TLDE> { [      U0F09, U0F0A, U0F6C, U0F6B ]	};
      
// numbers e.a.
      key <AE01> { [      U0F21, U0F04, 1, exclam ]	};
      key <AE02> { [      U0F22, U0F05, 2, at     ]	};
      key <AE03> { [      U0F23, U0F06, 3, numbersign ]	};
      key <AE04> { [      U0F24, U0F24, 4, dollar  ]	};
      key <AE05> { [      U0F25, U0F25, 5, percent ]	};
      key <AE06> { [      U0F26, U0F08, 6, U0F01 ]	};
      key <AE07> { [      U0F27, U0F38, 7, ampersand ]	};
      key <AE08> { [      U0F28, U0F34, 8, asterisk ]	};
      key <AE09> { [      U0F29, U0F3C, 9, parenleft ]	};
      key <AE10> { [      U0F20, U0F3D, 0, parenright ]	};
      key <AE11> { [      U0F14, U0F7F, minus, underscore ]	};
      key <AE12> { [      U0F0D, U0F11, equal, plus ]	};

// consonants ( ka kha ga nga )
      key <AD01> { [      U0F40, U0F90, U0F88  ]	};
      key <AD02> { [      U0F41, U0F91, U0F89  ]	};
      key <AD03> { [      U0F42, U0F92 ]	};
      key <AD04> { [      U0F44, U0F94, U0F83, U0F82  ]	};

// vowels ( i u e o )
      key <AD05> { [      U0F72, U0F80, U0F1A  ]	};
      key <AD06> { [      U0F74, U0F84, U0F1B  ]	};
      key <AD07> { [      U0F7A, U0F7B, U0F1C  ]	};
      key <AD08> { [      U0F7C, U0F7D, U0F1D, U0F17  ]	};

// consonants ( ca cha ja nya )
      key <AD09> { [      U0F45, U0F95, U0F1E, U0F18   ]	};
      key <AD10> { [      U0F46, U0F96, U0F1F, U0F19   ]	};
      key <AD11> { [      U0F47, U0F97, bracketleft, U0F3E ]	};
      key <AD12> { [      U0F49, U0F99, bracketright, U0F3F  ]	};

// consonants ( ta tha da na pa pha ba ma tsa tsha dza wa )
      key <AC01> { [      U0F4F, U0F9F, U0F4A, U0F9A ]	};
      key <AC02> { [      U0F50, U0FA0, U0F4B, U0F9B ]	};
      key <AC03> { [      U0F51, U0FA1, U0F4C, U0F9C ]	};
      key <AC04> { [      U0F53, U0FA3, U0F4E, U0F9E ]	};
      key <AC05> { [      U0F54, U0FA4, U2039, U00AB ]	};
      key <AC06> { [      U0F55, U0FA5, U203A, U00BB ]	};
      key <AC07> { [      U0F56, U0FA6, U0F37, U0F35 ]	};
      key <AC08> { [      U0F58, U0FA8, U0F7E ]	};
      key <AC09> { [      U0F59, U0FA9, U0F39 ]	};
      key <AC10> { [      U0F5A, U0FAA, colon, semicolon ]	};
      key <AC11> { [      U0F5B, U0FAB, apostrophe, quotedbl ]	};
      
// TODO: BKSL and LSGT are from gb layout, are there any variants?
      key <BKSL> { [      U0F5D, U0FAD, backslash, U0FBA ]	};
      key <LSGT> { [      U0F0D, U0F11, U0F10, U0F0F ]	};

// consonants ( zha za 'a ya ra la sha sa ha a )
      key <AB01> { [      U0F5E, U0FAE, U0F13, U0F36 ]	};
      key <AB02> { [      U0F5F, U0FAF, U0FBE, U0FBF ]	};
      key <AB03> { [      U0F60, U0F71, U0F03, U0FB0 ]	};
      key <AB04> { [      U0F61, U0FB1, U0F12, U0FBB ]	};
      key <AB05> { [      U0F62, U0FB2, U0F6A, U0FBC ]	};
      key <AB06> { [      U0F63, U0FB3, U0F8A, U0F88 ]	};
      key <AB07> { [      U0F64, U0FB4, U0F65, U0FB5 ]	};
      key <AB08> { [      U0F66, U0FB6, comma, less ]	};
      key <AB09> { [      U0F67, U0FB7, period, greater ]	};
      key <AB10> { [      U0F68, U0FB8, slash, question ]	};

// space
      key <SPCE> { [ U0F0B, space, U0F0C, U00A0 ] };

    include "level3(ralt_switch_multikey)"
};

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/symbols/pc/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile	20 Dec 2003 00:28:32 -0000	1.1.4.2
+++ b/Imakefile	23 Feb 2004 21:38:01 -0000	1.1.4.3
@@ -1,12 +1,11 @@
 XCOMM
-XCOMM $XdotOrg$
-XCOMM $XFree86: xc/programs/xkbcomp/symbols/pc/Imakefile,v 1.14 2003/12/09 00:10:39 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/symbols/pc/Imakefile,v 1.15 2004/01/17 14:59:37 pascal Exp $
 XCOMM
 
      DATAFILES = al am ar \
 		be ben bg br by \
 		cz cz_qwerty \
-		de dev dk dvorak \
+		de dev dk dvorak dz \
 		ee el en_US es \
 		fi fr fr-latin9 \
 		gb ge_la ge_ru guj gur \

Index: am
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/symbols/pc/am,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/am	26 Nov 2003 22:49:12 -0000	1.1.4.1
+++ b/am	23 Feb 2004 21:38:01 -0000	1.1.4.2
@@ -1,7 +1,7 @@
 
 // based on a keyboard map from an 'xkb/symbols/am' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/am,v 1.4 2003/05/29 12:41:58 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/pc/am,v 1.5 2003/12/30 13:26:26 pascal Exp $
 
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
@@ -130,9 +130,9 @@
     key <AE02> {	[ 0x1000569,  0x1000539 ]	};
     key <AE03> {	[ 0x1000583,  0x1000553 ]	};
     key <AE05> {	[ 0x100057b,  0x100054b ]	};
-    key <AE06> {	[ parenright, parenleft ]	};
-    key <AE07> {	[ 0x1000587,  percent   ]	};
-    key <AE08> {	[ 0x100057c,  0x100054c ]	};
+    key <AE06> {	[ 0x1000582,  0x1000552 ]	};
+    key <AE07> {	[ 0x1000587,  0x1000587 ]	};
+    key <AE08> {	[ 0x1000580,  0x1000550 ]	};
     key <AE09> {	[ 0x1000579,  0x1000549 ]	};
     key <AE10> {	[ 0x1000573,  0x1000543 ]	};
     key <AE12> {	[ 0x100056a,  0x100053a ]	};
@@ -140,7 +140,7 @@
     key <LatQ> {	[ 0x1000584,  0x1000554 ]	};
     key <LatW> {	[ 0x1000578,  0x1000548 ]	};
     key <LatE> {	[ 0x1000565,  0x1000535 ]	};
-    key <LatR> {	[ 0x1000580,  0x1000550 ]	};
+    key <LatR> {	[ 0x100057c,  0x100054c ]	};
     key <LatT> {	[ 0x100057f,  0x100054f ]	};
     key <LatY> {	[ 0x1000568,  0x1000538 ]	};
     key <LatU> {	[ 0x1000582,  0x1000552 ]	};
@@ -159,7 +159,8 @@
     key <LatJ> {	[ 0x1000575,  0x1000545 ]	};
     key <LatK> {	[ 0x100056f,  0x100053f ]	};
     key <LatL> {	[ 0x100056c,  0x100053c ]	};
-    key <AC10> {	[ 0x1000589,  0x1002026 ]	};
+    key <AC10> {	[ semicolon,  0x1000589 ]	};
+    key <AC11> {	[ 0x100055b,  0x1000022 ]	};
 
     key <LatZ> {	[ 0x1000566,  0x1000536 ]	};
     key <LatX> {	[ 0x1000572,  0x1000542 ]	};
@@ -168,6 +169,6 @@
     key <LatB> {	[ 0x1000562,  0x1000532 ]	};
     key <LatN> {	[ 0x1000576,  0x1000546 ]	};
     key <LatM> {	[ 0x1000574,  0x1000544 ]	};
-    key <AB10> {	[ slash    ,  0x100055e ]	};
+    key <AB10> {	[ 0x1002026,  0x100055e ]	};
 
 };

Index: dvorak
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/symbols/pc/dvorak,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/dvorak	20 Dec 2003 00:28:32 -0000	1.1.4.2
+++ b/dvorak	23 Feb 2004 21:38:01 -0000	1.1.4.3
@@ -1,8 +1,7 @@
 
 // based on a keyboard map from an 'xkb/symbols/dk' file
 //
-// $XdotOrg$
-// $XFree86: xc/programs/xkbcomp/symbols/pc/dvorak,v 1.4 2003/12/18 14:14:39 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/pc/dvorak,v 1.6 2004/01/03 16:38:26 herrb Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
@@ -208,7 +207,7 @@
     key <AC11>  { [          w,        W,       paragraph,      paragraph ] };
     key <BKSL>  { [     ugrave,   Ugrave,       masculine,    ordfeminine ] };
 
-    key <AB01>  { [ apostrophe, underscore     dead_acute,         macron ] };
+    key <AB01>  { [ apostrophe, underscore,    dead_acute,         macron ] };
     key <AB02>  { [          q,        Q,   guillemotleft,  guillemotleft ] };
     key <AB03>  { [     comma, semicolon,  guillemotright, guillemotright ] };
     key <AB04>  { [          i,        I,     icircumflex,    Icircumflex ] };
@@ -226,3 +225,54 @@
 };
 
 
+// Polish Dvorak keymaps
+// by Rafal Rzepecki <divide at users.sf.net>
+
+// The default keymap "pl" places Polish quotes on quotemark key and 
+// moves the dead symbols from there to "1/!" key. If you are used to default 
+// dead keys placement, you could use "pl_altquotes"; in this layout 
+// dead keys remain in the old place, whereas Polish quotes are placed on the
+// "1/!" key. If you do not use Polish quotes at all, you can use "pl_basic" map.
+
+// Basic Polish keymap (without Polish quotes)
+partial alphanumeric_keys 
+xkb_symbols "pl_basic" {
+    include "pc/dvorak(basic)"
+    
+    name[Group1] = "Polish Dvorak";
+
+    key <AD08> { [	    c,	C,	cacute,	Cacute		]	};
+    key <AD10> { [	    l,	L,     lstroke, Lstroke		]	};
+    key <AC01> { [	    a,	A,     aogonek, Aogonek		]	};
+    key <AC02> { [	    o,	O,      oacute, Oacute		]	};
+    key <AC03> { [	    e,	E,     eogonek, Eogonek		]	};
+    key <AC09> { [	    n,	N,      nacute, Nacute		]	};
+    key <AC10> { [	    s,	S,      sacute, Sacute		]	};
+    key <AB09> { [	    v,	V,      zacute, Zacute		]	};
+    key <AB10> { [	    z,	Z,   zabovedot, Zabovedot	]	};
+    
+    // this to allow writing ALL CAPS with a Shift key
+    include "level3(ralt_switch)"
+
+    // use one of compose:* options to choose Multi_key, if you will,
+    // or layout +level3(ralt_switch_multikey) to revert standard behaviour
+};
+
+// Default Polish keymap with Polish quotes on quotemark key
+partial alphanumeric_keys
+xkb_symbols "pl" {
+    include "pc/dvorak(pl_basic)"
+    
+    key <AD01> { [  apostrophe,	quotedbl, doublelowquotemark, rightdoublequotemark	] };
+
+    // Dead symbols moved to this key
+    key <AE01> { [	    1,	exclam, dead_acute, dead_diaeresis 		]	};
+};
+
+// Polish keymap with Polish quotes on key "1/!"
+partial alphanumeric_keys
+xkb_symbols "pl_altquotes" {
+    include "pc/dvorak(pl_basic)"
+
+    key <AE01> { [	    1,	exclam, doublelowquotemark, rightdoublequotemark	]	};
+};