svn merge ^/branches/released .

1 files changed, 47 insertions, 46 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/np b/xorg-server/xkeyboard-config/symbols/np
index 635fa348a..9cb14c873 100644
--- a/xorg-server/xkeyboard-config/symbols/np
+++ b/xorg-server/xkeyboard-config/symbols/np
@@ -65,56 +65,57 @@ xkb_symbols "basic" {
 };

 

 partial alphanumeric_keys

-xkb_symbols "olpc" {

 

+xkb_symbols "olpc" {

 // Contact: Walter Bender <walter@laptop.org>

 

   include "np"

-      key <TLDE> { [      grave,     asciitilde 	]	};

-      key <AE01> { [      0x1000967	 		]	}; // Nepali digit one

-      key <AE02> { [      0x1000968			]	}; // Nepali digit two

-      key <AE03> { [      0x1000969 	 		]	}; // Nepali digit three

-      key <AE04> { [      0x100096A  	 		]	}; // Nepali digit four

-      key <AE05> { [      0x100096B  	 		]	}; // Nepali digit five

-      key <AE06> { [      0x100096C,  sterling 	 	]	}; // Nepali digit six

-      key <AE07> { [      0x100096D,  eurosign 	 	]	}; // Nepali digit seven

-      key <AE08> { [      0x100096e  	 		]	}; // Nepali digit eight

-      key <AE09> { [      0x100096F	 		]	}; // Nepali digit nine

-      key <AE10> { [      0x1000966			]	}; // Nepali digit zero

-      key <AE12> { [      0x1000950,  0x1000903 	]	}; // OM, SIGN VISARGA

-

-      key <AD01> { [      0x100091C,  0x100091D 	]	}; // JA, JHA

-      key <AD02> { [      0x1000917,  0x1000918       	]	}; // GA, GHA

-      key <AD03> { [      0x100092F,  0x100091E 	]	}; // YA, YNA

-      key <AD04> { [      0x1000938,  0x1000936       	]	}; // SA, SHA

-      key <AD05> { [      0x100090F,  0x1000910		]	}; // E, AI

-      key <AD06> { [      0x100091B,  0x100091A         ]       }; // CHHA, CHA

-      key <AD07> { [      0x100092A,  0x100092B 	]	}; // PA, PHA

-      key <AD08> { [      0x1000947,  0x1000948       	]	}; // VOWEL SIGN E, VOWEL SIGN AI

-      key <AD09> { [      0x100094B,  0x100093E		]	}; // VOWEL SIGN O, VOWEL SIGN AA

-      key <AD10> { [      0x1000924,  0x1000925       	]	}; // TA, THA

-      key <AD11> { [      0x1000909,  0x100090A 	]	}; // HRSHWA U, DIRGHA UU

-      key <AD12> { [      0x100093F,  0x1000940 	]	}; // VOWEL SIGN HRSHWA I, VOWEL SIGN DIRGHA II

-

-      key <AC01> { [      0x100092E,  0x1000902         ]       }; // MA, SIGN ANUSVARA

-      key <AC02> { [      0x1000907,  0x1000908		]	}; // HRSHWA I, DIRGHA II

-      key <AC03> { [      0x1000928,  0x1000923         ]       }; // NA, NNA

-      key <AC04> { [      0x100094D,  0x1000921		]       }; // VIRAMA (HALANTA?), DDA

-      key <AC05> { [      0x100091F,  0x1000920       	]	}; // TTA, TTHA

-      key <AC06> { [      0x1000926,  0x1000927       	]	}; // DA, DHA

-      key <AC07> { [      0x100093E,  0x1000901       	]	}; // SIGN AA, SIGN CANDRABINDU

-      key <AC08> { [      0x1000930,  0x1000943       	]	}; // RA, VOWEL SIGN VOCALIC R

-      key <AC09> { [      0x1000915,  0x1000916 	]	}; // KA, KHA

-

-      key <AB01> { [      0x1000937,  0x100090B		]	}; // SSA, VOCALIC R (RRI)

-      key <AB02> { [      0x100092C,  0x100092D		]       }; // BA, BHA

-      key <AB03> { [      0x1000941,  0x1000942       	]	}; // VOWEL SIGN HRSHWA U, VOWEL SIGN DIRGHA U (UU)

-      key <AB04> { [      0x1000939,  0x1000922 	]	}; // HA, DDHA

-      key <AB05> { [      0x1000913,  0x1000914		]	}; // O, AU

-      key <AB06> { [      0x1000905,  0x1000906		]	}; // A, AA

-      key <AB07> { [      0x1000932,  0x1000919 	]	}; // LA, NGA

-      key <AB08> { [      comma,  0x1000935		]       }; // VA

-      key <AB09> { [      0x1000964,  0x1000965		]       }; // PURNA VIRAM, DIRGHA VIRAM

+      key <TLDE> { [      0x100091E,  0x1000965 	]	}; // NYA; double danda

+      key <AE01> { [      0x1000967,  0x10FFFFD	]	}; // Nepali digit one; U091C+U094D+U091E

+      key <AE02> { [      0x1000968,  0x1000908		]	}; // Nepali digit two;      key <AE03> { [      0x1000969,  0x1000918 	]	}; // Nepali digit three;

+      key <AE04> { [      0x100096A,  0x10FFFFC  	]	}; // Nepali digit four; U0926+U094D+U0927

+      key <AE05> { [      0x100096B,  0x100091B  	]	}; // Nepali digit five

+      key <AE06> { [      0x100096C,  0x100091F  	]	}; // Nepali digit six

+      key <AE07> { [      0x100096D,  0x1000920  	]	}; // Nepali digit seven

+      key <AE08> { [      0x100096e,  0x1000921  	]	}; // Nepali digit eight

+      key <AE09> { [      0x100096F,  0x1000922	 	]	}; // Nepali digit nine

+      key <AE10> { [      0x1000966,  0x1000923		]	}; // Nepali digit zero

+      key <AE11> { [      0x1000914,  0x1000913         ]       }; // O, AU

+      key <AE12> { [      0x100200C,  0x1000902 	]       }; // ZERO-WIDTH-NON-JOINER (ZWNJ); SIGN ANUSVARA

+      key <BKSL> { [      0x100094D,  0x100200D 	]	}; // SIGN VIRAMA; ZERO-WIDTH-JOINER (ZWJ)

+      key <AD01> { [      0x10FFFFB,  0x10FFFFA 	]	}; // U0924+U094D+U0930; U0924+U094D+U0924

+      key <AD02> { [      0x1000927,  0x10FFFF9   	]	}; // DHA; U0921+U094D+U0922

+      key <AD03> { [      0x100092D,  0x1000910 	]	}; // BHA, AI

+      key <AD04> { [      0x100091A,  0x10FFFF8       ]	}; // CA; U0926+U094D+U0935

+      key <AD05> { [      0x1000924,  0x10FFFF7		]	}; // TA; U091F+U094D+U091F

+      key <AD06> { [      0x1000925,  0x10FFFF6   ]       }; // THA; U0920+U094D+U0920

+      key <AD07> { [      0x1000917,  0x100090A 	]	}; // GA, UU

+      key <AD08> { [      0x1000937,  0x10FFFF5    	]	}; // SSA; U0915+U094D+U0937

+      key <AD09> { [      0x100092F,  0x1000907 	]	}; // YA, I

+      key <AD10> { [      0x1000909,  0x100090F 	]	}; // U, E

+      key <AD11> { [      0x10FFFF4,  0x1000943 	]	}; // U0928+U094D+ZWJ; VOWEL SIGN VOCALIC R

+      key <AD12> { [      0x1000947,  0x1000948 	]	}; // SIGN E; SIGN AI

+      key <AC01> { [      0x100092C,  0x1000906         ]       }; // BA, AA

+      key <AC02> { [      0x1000915,  0x10FFFF3	]	}; // KA; U0919+U094D+U0915

+      key <AC03> { [      0x100092E,  0x10FFFF2      ]       }; // MA; U0919+U094D+U0917

+      key <AC04> { [      0x100093E,  0x1000901		]       }; // CANDRABINDU, VOWEL SIGN AA

+      key <AC05> { [      0x1000928,  0x10FFFF1      	]	}; // NA; U0926+U094D+U0926

+      key <AC06> { [      0x100091C,  0x100091D       	]	}; // JA, JHA

+      key <AC07> { [      0x1000935,  0x100094B       	]	}; // VA, VOWEL SIGN O

+      key <AC08> { [      0x100092A,  0x100092B       	]	}; // PA, PHA

+      key <AC09> { [      0x100093F,  0x1000940 	]	}; // VOWEL SIGN I, VOWEL SIGN II

+      key <AC10> { [      0x1000938,  0x10FFFF0 	]	}; // SA; U091F+U094D+U0920

+      key <AC11> { [      0x1000941,  0x1000942 	]	}; // VOWEL SIGN U, VOWEL SIGN UU

+      key <AB01> { [      0x1000936,  0x10FFFEF	]	}; // SHA; U0915+U094D+U0915

+      key <AB02> { [      0x1000939,  0x10FFFEE	]       }; // HA; U0939+U094D+U092F

+      key <AB03> { [      0x1000905, 0x100090B         	]	}; // A; U0909+U090B

+      key <AB04> { [      0x1000916,  0x1000950 	]	}; // KHA, OM

+      key <AB05> { [      0x1000926,  0x100094C		]	}; // DA, VOWEL SIGN AU

+      key <AB06> { [      0x1000932,  0x10FFFED	]	}; // LA; U0926+U094D+U092F

+      key <AB07> { [      0x1000903,  0x10FFFEC 	]	}; // SIGN VISARGA; U0921+U094D+U0921

+      key <AB08> { [      0x100093D,  0x1000919		]       }; // SIGN AVAGRHA; NGA

+      key <AB09> { [      0x1000964,  0x10FFFEB	]       }; // DANDA; U0936+U094D+U0930

+      key <AB10> { [      0x1000930,  0x10FFFEA   		]       }; // RA; U0930+U0941

 

       include "group(olpc)"

 };