Author: barbier
Date: 2004-10-08 18:59:51 -0500 (Fri, 08 Oct 2004)
New Revision: 1930
Added:
trunk/debian/patches/099j_xkb_new_layouts.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/MANIFEST.alpha.in
trunk/debian/MANIFEST.amd64.in
trunk/debian/MANIFEST.arm.in
trunk/debian/MANIFEST.hppa.in
trunk/debian/MANIFEST.hurd-i386.in
trunk/debian/MANIFEST.i386.in
trunk/debian/MANIFEST.ia64.in
trunk/debian/MANIFEST.m68k.in
trunk/debian/MANIFEST.mips.in
trunk/debian/MANIFEST.mipsel.in
trunk/debian/MANIFEST.powerpc.in
trunk/debian/MANIFEST.s390.in
trunk/debian/MANIFEST.sparc.in
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
trunk/debian/xlibs.install
Log:
* Add several multi-layout aware layouts:
+ ca contains several variants: 'fr' is meant as a replacement for
ca_enhanced, 'fr-legacy' is another variant, and 'multi' is an
implementation of CAN/CSA-Z243.200-92. This norm requires two groups,
so it is in fact divided into 'multi' and 'multi-2gr'.
By default, 'ca' loads both 'multi' and 'multi-2gr' variants to provide
a full featured keyboard. When it is combined with other layouts,
the simpler variant 'fr' is used, but others can be explicitly
specified. Closes: #245371, #252068, #258575
This new layout also fixes ISO_Level3_Shift, which was mapped to
RCTL instead of RALT. Closes: #274457
+ jp also requires a combination of two variants. When this is
the only loaded layout, the full combination is defined. When
it is combined with others, both 'jp106' and 'latin' variants must
be explicitly defined.
+ hu layout has been simplified, some variants have been removed.
Closes: #263561, #269929
+ ch replaces de_CH and fr_CH.
+ mn and vn are simple layouts.
The patch to remove handling of us_intl from rules/xfree86 has been
moved from 099z_xkb_fix_rules_xfree86 to 099j_xkb_new_layouts.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/CHANGESETS 2004-10-08 23:59:51 UTC (rev 1930)
@@ -71,4 +71,25 @@
Stigge for catching this. (Closes: #268997)
1927
+Add several multi-layout aware layouts:
++ ca contains several variants: 'fr' is meant as a replacement for
+ ca_enhanced, 'fr-legacy' is another variant, and 'multi' is an
+ implementation of CAN/CSA-Z243.200-92. This norm requires two groups,
+ so it is in fact divided into 'multi' and 'multi-2gr'.
+ By default, 'ca' loads both 'multi' and 'multi-2gr' variants to provide
+ a full featured keyboard. When it is combined with other layouts,
+ the simpler variant 'fr' is used, but others can be explicitly
+ specified. Closes: #245371, #252068, #258575
+ This new layout also fixes ISO_Level3_Shift, which was mapped to
+ RCTL instead of RALT. Closes: #274457
++ jp also requires a combination of two variants. When this is
+ the only loaded layout, the full combination is defined. When
+ it is combined with others, both 'jp106' and 'latin' variants must
+ be explicitly defined.
++ ch replaces de_CH and fr_CH.
++ hu layout has been simplified, some variants have been removed.
+ Closes: #263561, #269929
++ mn and vn are simple layouts.
+ 1928
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/MANIFEST.alpha.in 2004-10-08 23:59:51 UTC (rev 1930)
@@ -307,6 +307,8 @@
etc/X11/xkb/symbols/pc/bg
etc/X11/xkb/symbols/pc/br
etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
etc/X11/xkb/symbols/pc/cz
etc/X11/xkb/symbols/pc/cz_qwerty
etc/X11/xkb/symbols/pc/de
@@ -326,6 +328,7 @@
etc/X11/xkb/symbols/pc/guj
etc/X11/xkb/symbols/pc/gur
etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
etc/X11/xkb/symbols/pc/ie
etc/X11/xkb/symbols/pc/il
etc/X11/xkb/symbols/pc/il_phonetic
@@ -333,6 +336,7 @@
etc/X11/xkb/symbols/pc/is
etc/X11/xkb/symbols/pc/it
etc/X11/xkb/symbols/pc/iu
+etc/X11/xkb/symbols/pc/jp
etc/X11/xkb/symbols/pc/kan
etc/X11/xkb/symbols/pc/la
etc/X11/xkb/symbols/pc/latin
@@ -342,6 +346,7 @@
etc/X11/xkb/symbols/pc/mk
etc/X11/xkb/symbols/pc/ml
etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
etc/X11/xkb/symbols/pc/mt
etc/X11/xkb/symbols/pc/mt_us
etc/X11/xkb/symbols/pc/nl
@@ -372,6 +377,7 @@
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
etc/X11/xkb/symbols/pc/us_intl
+etc/X11/xkb/symbols/pc/vn
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/MANIFEST.amd64.in 2004-10-08 23:59:51 UTC (rev 1930)
@@ -307,6 +307,8 @@
etc/X11/xkb/symbols/pc/bg
etc/X11/xkb/symbols/pc/br
etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
etc/X11/xkb/symbols/pc/cz
etc/X11/xkb/symbols/pc/cz_qwerty
etc/X11/xkb/symbols/pc/de
@@ -326,6 +328,7 @@
etc/X11/xkb/symbols/pc/guj
etc/X11/xkb/symbols/pc/gur
etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
etc/X11/xkb/symbols/pc/ie
etc/X11/xkb/symbols/pc/il
etc/X11/xkb/symbols/pc/il_phonetic
@@ -333,6 +336,7 @@
etc/X11/xkb/symbols/pc/is
etc/X11/xkb/symbols/pc/it
etc/X11/xkb/symbols/pc/iu
+etc/X11/xkb/symbols/pc/jp
etc/X11/xkb/symbols/pc/kan
etc/X11/xkb/symbols/pc/la
etc/X11/xkb/symbols/pc/latin
@@ -342,6 +346,7 @@
etc/X11/xkb/symbols/pc/mk
etc/X11/xkb/symbols/pc/ml
etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
etc/X11/xkb/symbols/pc/mt
etc/X11/xkb/symbols/pc/mt_us
etc/X11/xkb/symbols/pc/nl
@@ -372,6 +377,7 @@
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
etc/X11/xkb/symbols/pc/us_intl
+etc/X11/xkb/symbols/pc/vn
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: trunk/debian/MANIFEST.arm.in
===================================================================
--- trunk/debian/MANIFEST.arm.in 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/MANIFEST.arm.in 2004-10-08 23:59:51 UTC (rev 1930)
@@ -307,6 +307,8 @@
etc/X11/xkb/symbols/pc/bg
etc/X11/xkb/symbols/pc/br
etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
etc/X11/xkb/symbols/pc/cz
etc/X11/xkb/symbols/pc/cz_qwerty
etc/X11/xkb/symbols/pc/de
@@ -326,6 +328,7 @@
etc/X11/xkb/symbols/pc/guj
etc/X11/xkb/symbols/pc/gur
etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
etc/X11/xkb/symbols/pc/ie
etc/X11/xkb/symbols/pc/il
etc/X11/xkb/symbols/pc/il_phonetic
@@ -333,6 +336,7 @@
etc/X11/xkb/symbols/pc/is
etc/X11/xkb/symbols/pc/it
etc/X11/xkb/symbols/pc/iu
+etc/X11/xkb/symbols/pc/jp
etc/X11/xkb/symbols/pc/kan
etc/X11/xkb/symbols/pc/la
etc/X11/xkb/symbols/pc/latin
@@ -342,6 +346,7 @@
etc/X11/xkb/symbols/pc/mk
etc/X11/xkb/symbols/pc/ml
etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
etc/X11/xkb/symbols/pc/mt
etc/X11/xkb/symbols/pc/mt_us
etc/X11/xkb/symbols/pc/nl
@@ -372,6 +377,7 @@
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
etc/X11/xkb/symbols/pc/us_intl
+etc/X11/xkb/symbols/pc/vn
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: trunk/debian/MANIFEST.hppa.in
===================================================================
--- trunk/debian/MANIFEST.hppa.in 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/MANIFEST.hppa.in 2004-10-08 23:59:51 UTC (rev 1930)
@@ -307,6 +307,8 @@
etc/X11/xkb/symbols/pc/bg
etc/X11/xkb/symbols/pc/br
etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
etc/X11/xkb/symbols/pc/cz
etc/X11/xkb/symbols/pc/cz_qwerty
etc/X11/xkb/symbols/pc/de
@@ -326,6 +328,7 @@
etc/X11/xkb/symbols/pc/guj
etc/X11/xkb/symbols/pc/gur
etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
etc/X11/xkb/symbols/pc/ie
etc/X11/xkb/symbols/pc/il
etc/X11/xkb/symbols/pc/il_phonetic
@@ -333,6 +336,7 @@
etc/X11/xkb/symbols/pc/is
etc/X11/xkb/symbols/pc/it
etc/X11/xkb/symbols/pc/iu
+etc/X11/xkb/symbols/pc/jp
etc/X11/xkb/symbols/pc/kan
etc/X11/xkb/symbols/pc/la
etc/X11/xkb/symbols/pc/latin
@@ -342,6 +346,7 @@
etc/X11/xkb/symbols/pc/mk
etc/X11/xkb/symbols/pc/ml
etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
etc/X11/xkb/symbols/pc/mt
etc/X11/xkb/symbols/pc/mt_us
etc/X11/xkb/symbols/pc/nl
@@ -372,6 +377,7 @@
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
etc/X11/xkb/symbols/pc/us_intl
+etc/X11/xkb/symbols/pc/vn
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: trunk/debian/MANIFEST.hurd-i386.in
===================================================================
--- trunk/debian/MANIFEST.hurd-i386.in 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/MANIFEST.hurd-i386.in 2004-10-08 23:59:51 UTC (rev 1930)
@@ -307,6 +307,8 @@
etc/X11/xkb/symbols/pc/bg
etc/X11/xkb/symbols/pc/br
etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
etc/X11/xkb/symbols/pc/cz
etc/X11/xkb/symbols/pc/cz_qwerty
etc/X11/xkb/symbols/pc/de
@@ -326,6 +328,7 @@
etc/X11/xkb/symbols/pc/guj
etc/X11/xkb/symbols/pc/gur
etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
etc/X11/xkb/symbols/pc/ie
etc/X11/xkb/symbols/pc/il
etc/X11/xkb/symbols/pc/il_phonetic
@@ -333,6 +336,7 @@
etc/X11/xkb/symbols/pc/is
etc/X11/xkb/symbols/pc/it
etc/X11/xkb/symbols/pc/iu
+etc/X11/xkb/symbols/pc/jp
etc/X11/xkb/symbols/pc/kan
etc/X11/xkb/symbols/pc/la
etc/X11/xkb/symbols/pc/latin
@@ -342,6 +346,7 @@
etc/X11/xkb/symbols/pc/mk
etc/X11/xkb/symbols/pc/ml
etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
etc/X11/xkb/symbols/pc/mt
etc/X11/xkb/symbols/pc/mt_us
etc/X11/xkb/symbols/pc/nl
@@ -372,6 +377,7 @@
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
etc/X11/xkb/symbols/pc/us_intl
+etc/X11/xkb/symbols/pc/vn
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: trunk/debian/MANIFEST.i386.in
===================================================================
--- trunk/debian/MANIFEST.i386.in 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/MANIFEST.i386.in 2004-10-08 23:59:51 UTC (rev 1930)
@@ -307,6 +307,8 @@
etc/X11/xkb/symbols/pc/bg
etc/X11/xkb/symbols/pc/br
etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
etc/X11/xkb/symbols/pc/cz
etc/X11/xkb/symbols/pc/cz_qwerty
etc/X11/xkb/symbols/pc/de
@@ -326,6 +328,7 @@
etc/X11/xkb/symbols/pc/guj
etc/X11/xkb/symbols/pc/gur
etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
etc/X11/xkb/symbols/pc/ie
etc/X11/xkb/symbols/pc/il
etc/X11/xkb/symbols/pc/il_phonetic
@@ -333,6 +336,7 @@
etc/X11/xkb/symbols/pc/is
etc/X11/xkb/symbols/pc/it
etc/X11/xkb/symbols/pc/iu
+etc/X11/xkb/symbols/pc/jp
etc/X11/xkb/symbols/pc/kan
etc/X11/xkb/symbols/pc/la
etc/X11/xkb/symbols/pc/latin
@@ -342,6 +346,7 @@
etc/X11/xkb/symbols/pc/mk
etc/X11/xkb/symbols/pc/ml
etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
etc/X11/xkb/symbols/pc/mt
etc/X11/xkb/symbols/pc/mt_us
etc/X11/xkb/symbols/pc/nl
@@ -372,6 +377,7 @@
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
etc/X11/xkb/symbols/pc/us_intl
+etc/X11/xkb/symbols/pc/vn
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/MANIFEST.ia64.in 2004-10-08 23:59:51 UTC (rev 1930)
@@ -307,6 +307,8 @@
etc/X11/xkb/symbols/pc/bg
etc/X11/xkb/symbols/pc/br
etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
etc/X11/xkb/symbols/pc/cz
etc/X11/xkb/symbols/pc/cz_qwerty
etc/X11/xkb/symbols/pc/de
@@ -326,6 +328,7 @@
etc/X11/xkb/symbols/pc/guj
etc/X11/xkb/symbols/pc/gur
etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
etc/X11/xkb/symbols/pc/ie
etc/X11/xkb/symbols/pc/il
etc/X11/xkb/symbols/pc/il_phonetic
@@ -333,6 +336,7 @@
etc/X11/xkb/symbols/pc/is
etc/X11/xkb/symbols/pc/it
etc/X11/xkb/symbols/pc/iu
+etc/X11/xkb/symbols/pc/jp
etc/X11/xkb/symbols/pc/kan
etc/X11/xkb/symbols/pc/la
etc/X11/xkb/symbols/pc/latin
@@ -342,6 +346,7 @@
etc/X11/xkb/symbols/pc/mk
etc/X11/xkb/symbols/pc/ml
etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
etc/X11/xkb/symbols/pc/mt
etc/X11/xkb/symbols/pc/mt_us
etc/X11/xkb/symbols/pc/nl
@@ -372,6 +377,7 @@
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
etc/X11/xkb/symbols/pc/us_intl
+etc/X11/xkb/symbols/pc/vn
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: trunk/debian/MANIFEST.m68k.in
===================================================================
--- trunk/debian/MANIFEST.m68k.in 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/MANIFEST.m68k.in 2004-10-08 23:59:51 UTC (rev 1930)
@@ -307,6 +307,8 @@
etc/X11/xkb/symbols/pc/bg
etc/X11/xkb/symbols/pc/br
etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
etc/X11/xkb/symbols/pc/cz
etc/X11/xkb/symbols/pc/cz_qwerty
etc/X11/xkb/symbols/pc/de
@@ -326,6 +328,7 @@
etc/X11/xkb/symbols/pc/guj
etc/X11/xkb/symbols/pc/gur
etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
etc/X11/xkb/symbols/pc/ie
etc/X11/xkb/symbols/pc/il
etc/X11/xkb/symbols/pc/il_phonetic
@@ -333,6 +336,7 @@
etc/X11/xkb/symbols/pc/is
etc/X11/xkb/symbols/pc/it
etc/X11/xkb/symbols/pc/iu
+etc/X11/xkb/symbols/pc/jp
etc/X11/xkb/symbols/pc/kan
etc/X11/xkb/symbols/pc/la
etc/X11/xkb/symbols/pc/latin
@@ -342,6 +346,7 @@
etc/X11/xkb/symbols/pc/mk
etc/X11/xkb/symbols/pc/ml
etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
etc/X11/xkb/symbols/pc/mt
etc/X11/xkb/symbols/pc/mt_us
etc/X11/xkb/symbols/pc/nl
@@ -372,6 +377,7 @@
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
etc/X11/xkb/symbols/pc/us_intl
+etc/X11/xkb/symbols/pc/vn
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: trunk/debian/MANIFEST.mips.in
===================================================================
--- trunk/debian/MANIFEST.mips.in 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/MANIFEST.mips.in 2004-10-08 23:59:51 UTC (rev 1930)
@@ -307,6 +307,8 @@
etc/X11/xkb/symbols/pc/bg
etc/X11/xkb/symbols/pc/br
etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
etc/X11/xkb/symbols/pc/cz
etc/X11/xkb/symbols/pc/cz_qwerty
etc/X11/xkb/symbols/pc/de
@@ -326,6 +328,7 @@
etc/X11/xkb/symbols/pc/guj
etc/X11/xkb/symbols/pc/gur
etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
etc/X11/xkb/symbols/pc/ie
etc/X11/xkb/symbols/pc/il
etc/X11/xkb/symbols/pc/il_phonetic
@@ -333,6 +336,7 @@
etc/X11/xkb/symbols/pc/is
etc/X11/xkb/symbols/pc/it
etc/X11/xkb/symbols/pc/iu
+etc/X11/xkb/symbols/pc/jp
etc/X11/xkb/symbols/pc/kan
etc/X11/xkb/symbols/pc/la
etc/X11/xkb/symbols/pc/latin
@@ -342,6 +346,7 @@
etc/X11/xkb/symbols/pc/mk
etc/X11/xkb/symbols/pc/ml
etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
etc/X11/xkb/symbols/pc/mt
etc/X11/xkb/symbols/pc/mt_us
etc/X11/xkb/symbols/pc/nl
@@ -372,6 +377,7 @@
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
etc/X11/xkb/symbols/pc/us_intl
+etc/X11/xkb/symbols/pc/vn
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: trunk/debian/MANIFEST.mipsel.in
===================================================================
--- trunk/debian/MANIFEST.mipsel.in 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/MANIFEST.mipsel.in 2004-10-08 23:59:51 UTC (rev 1930)
@@ -307,6 +307,8 @@
etc/X11/xkb/symbols/pc/bg
etc/X11/xkb/symbols/pc/br
etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
etc/X11/xkb/symbols/pc/cz
etc/X11/xkb/symbols/pc/cz_qwerty
etc/X11/xkb/symbols/pc/de
@@ -326,6 +328,7 @@
etc/X11/xkb/symbols/pc/guj
etc/X11/xkb/symbols/pc/gur
etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
etc/X11/xkb/symbols/pc/ie
etc/X11/xkb/symbols/pc/il
etc/X11/xkb/symbols/pc/il_phonetic
@@ -333,6 +336,7 @@
etc/X11/xkb/symbols/pc/is
etc/X11/xkb/symbols/pc/it
etc/X11/xkb/symbols/pc/iu
+etc/X11/xkb/symbols/pc/jp
etc/X11/xkb/symbols/pc/kan
etc/X11/xkb/symbols/pc/la
etc/X11/xkb/symbols/pc/latin
@@ -342,6 +346,7 @@
etc/X11/xkb/symbols/pc/mk
etc/X11/xkb/symbols/pc/ml
etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
etc/X11/xkb/symbols/pc/mt
etc/X11/xkb/symbols/pc/mt_us
etc/X11/xkb/symbols/pc/nl
@@ -372,6 +377,7 @@
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
etc/X11/xkb/symbols/pc/us_intl
+etc/X11/xkb/symbols/pc/vn
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: trunk/debian/MANIFEST.powerpc.in
===================================================================
--- trunk/debian/MANIFEST.powerpc.in 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/MANIFEST.powerpc.in 2004-10-08 23:59:51 UTC (rev 1930)
@@ -307,6 +307,8 @@
etc/X11/xkb/symbols/pc/bg
etc/X11/xkb/symbols/pc/br
etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
etc/X11/xkb/symbols/pc/cz
etc/X11/xkb/symbols/pc/cz_qwerty
etc/X11/xkb/symbols/pc/de
@@ -326,6 +328,7 @@
etc/X11/xkb/symbols/pc/guj
etc/X11/xkb/symbols/pc/gur
etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
etc/X11/xkb/symbols/pc/ie
etc/X11/xkb/symbols/pc/il
etc/X11/xkb/symbols/pc/il_phonetic
@@ -333,6 +336,7 @@
etc/X11/xkb/symbols/pc/is
etc/X11/xkb/symbols/pc/it
etc/X11/xkb/symbols/pc/iu
+etc/X11/xkb/symbols/pc/jp
etc/X11/xkb/symbols/pc/kan
etc/X11/xkb/symbols/pc/la
etc/X11/xkb/symbols/pc/latin
@@ -342,6 +346,7 @@
etc/X11/xkb/symbols/pc/mk
etc/X11/xkb/symbols/pc/ml
etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
etc/X11/xkb/symbols/pc/mt
etc/X11/xkb/symbols/pc/mt_us
etc/X11/xkb/symbols/pc/nl
@@ -372,6 +377,7 @@
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
etc/X11/xkb/symbols/pc/us_intl
+etc/X11/xkb/symbols/pc/vn
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: trunk/debian/MANIFEST.s390.in
===================================================================
--- trunk/debian/MANIFEST.s390.in 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/MANIFEST.s390.in 2004-10-08 23:59:51 UTC (rev 1930)
@@ -302,6 +302,8 @@
etc/X11/xkb/symbols/pc/bg
etc/X11/xkb/symbols/pc/br
etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
etc/X11/xkb/symbols/pc/cz
etc/X11/xkb/symbols/pc/cz_qwerty
etc/X11/xkb/symbols/pc/de
@@ -321,6 +323,7 @@
etc/X11/xkb/symbols/pc/guj
etc/X11/xkb/symbols/pc/gur
etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
etc/X11/xkb/symbols/pc/ie
etc/X11/xkb/symbols/pc/il
etc/X11/xkb/symbols/pc/il_phonetic
@@ -328,6 +331,7 @@
etc/X11/xkb/symbols/pc/is
etc/X11/xkb/symbols/pc/it
etc/X11/xkb/symbols/pc/iu
+etc/X11/xkb/symbols/pc/jp
etc/X11/xkb/symbols/pc/kan
etc/X11/xkb/symbols/pc/la
etc/X11/xkb/symbols/pc/latin
@@ -337,6 +341,7 @@
etc/X11/xkb/symbols/pc/mk
etc/X11/xkb/symbols/pc/ml
etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
etc/X11/xkb/symbols/pc/mt
etc/X11/xkb/symbols/pc/mt_us
etc/X11/xkb/symbols/pc/nl
@@ -367,6 +372,7 @@
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
etc/X11/xkb/symbols/pc/us_intl
+etc/X11/xkb/symbols/pc/vn
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: trunk/debian/MANIFEST.sparc.in
===================================================================
--- trunk/debian/MANIFEST.sparc.in 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/MANIFEST.sparc.in 2004-10-08 23:59:51 UTC (rev 1930)
@@ -307,6 +307,8 @@
etc/X11/xkb/symbols/pc/bg
etc/X11/xkb/symbols/pc/br
etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
etc/X11/xkb/symbols/pc/cz
etc/X11/xkb/symbols/pc/cz_qwerty
etc/X11/xkb/symbols/pc/de
@@ -326,6 +328,7 @@
etc/X11/xkb/symbols/pc/guj
etc/X11/xkb/symbols/pc/gur
etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
etc/X11/xkb/symbols/pc/ie
etc/X11/xkb/symbols/pc/il
etc/X11/xkb/symbols/pc/il_phonetic
@@ -333,6 +336,7 @@
etc/X11/xkb/symbols/pc/is
etc/X11/xkb/symbols/pc/it
etc/X11/xkb/symbols/pc/iu
+etc/X11/xkb/symbols/pc/jp
etc/X11/xkb/symbols/pc/kan
etc/X11/xkb/symbols/pc/la
etc/X11/xkb/symbols/pc/latin
@@ -342,6 +346,7 @@
etc/X11/xkb/symbols/pc/mk
etc/X11/xkb/symbols/pc/ml
etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
etc/X11/xkb/symbols/pc/mt
etc/X11/xkb/symbols/pc/mt_us
etc/X11/xkb/symbols/pc/nl
@@ -372,6 +377,7 @@
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
etc/X11/xkb/symbols/pc/us_intl
+etc/X11/xkb/symbols/pc/vn
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/TODO 2004-10-08 23:59:51 UTC (rev 1930)
@@ -17,7 +17,6 @@
4.3.0.dfsg.1-9
--------------
-* Add multi-layout aware hu, ca, and ca_enhanced layouts [DB].
* Add FAQ entry describing what has become of the XFree86 3.x packages.
* Update xlibs's package description stop implying that *no* packages have
up-to-date dependencies on it (xbase-clients does, due to xkbcomp, which is
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/changelog 2004-10-08 23:59:51 UTC (rev 1930)
@@ -36,6 +36,26 @@
* Make Sun keyboards load srvr_ctrl(xfree86) symbol definitions to have
access to standard Ctrl+Alt key sequences. (Closes: #236086)
+ * Add several multi-layout aware layouts:
+ + ca contains several variants: 'fr' is meant as a replacement for
+ ca_enhanced, 'fr-legacy' is another variant, and 'multi' is an
+ implementation of CAN/CSA-Z243.200-92. This norm requires two groups,
+ so it is in fact divided into 'multi' and 'multi-2gr'.
+ By default, 'ca' loads both 'multi' and 'multi-2gr' variants to provide
+ a full featured keyboard. When it is combined with other layouts,
+ the simpler variant 'fr' is used, but others can be explicitly
+ specified. Closes: #245371, #252068, #258575
+ This new layout also fixes ISO_Level3_Shift, which was mapped to
+ RCTL instead of RALT. Closes: #274457
+ + jp also requires a combination of two variants. When this is
+ the only loaded layout, the full combination is defined. When
+ it is combined with others, both 'jp106' and 'latin' variants must
+ be explicitly defined.
+ + hu layout has been simplified, some variants have been removed.
+ Closes: #263561, #269929
+ + ch replaces de_CH and fr_CH.
+ + mn and vn are simple layouts.
+
Changes by Fabio M. Di Nitto:
* Update wacom input driver from http://linuxwacom.sourceforge.net/ up to
Added: trunk/debian/patches/099j_xkb_new_layouts.diff
===================================================================
--- trunk/debian/patches/099j_xkb_new_layouts.diff 2004-10-08 23:03:24 UTC
(rev 1929)
+++ trunk/debian/patches/099j_xkb_new_layouts.diff 2004-10-08 23:59:51 UTC
(rev 1930)
@@ -0,0 +1,1255 @@
+$Id$
+
+This patch by Denis Barbier.
+
+rules/xfree86:
+ + Remove ca, hu, mn and vn layouts from $oldlayouts.
+ + Remove special case that causes PC keyboard models with the us_intl
+ layout to load the us layout and add the us_intl layout to it.
+
+symbols/group:
+ + Add "rctrl_switch" needed by the ca layout.
+
+symbols/pc/Imakefile:
+ + Add ca, ch, hu, jp, mn and vn.
+
+symbols/pc/us:
+ + Add two new variants: 'intl' and 'alt-intl'. The latter is a strict
+ replacement for us_intl, which will become obsolete soon. Providing
+ all alternatives will help users to migrate to the new files.
+
+Layouts were taken (2004-10-08) from
+ http://freedesktop.org/cgi-bin/viewcvs.cgi/xlibs/xkbdesc/symbols/
+and customized to fix include paths and default level3 key.
+Ca, ch and hu layout needed patches, which have been submitted to their
+bugzilla.
+
+diff -ruN xc-old/programs/xkbcomp/rules/xfree86
xc/programs/xkbcomp/rules/xfree86
+--- xc-old/programs/xkbcomp/rules/xfree86 2004-10-08 22:36:45.000000000
+0000
++++ xc/programs/xkbcomp/rules/xfree86 2004-10-08 22:38:10.000000000 +0000
+@@ -9,7 +9,7 @@
+ //
+
+ // Layouts that still need be composed by old rules
+-! $oldlayouts = az bs ca ca_enhanced de_CH fr_CH hu hu_qwerty lt_std mn vn
hr_US
++! $oldlayouts = az bs ca_enhanced de_CH fr_CH hu_qwerty lt_std hr_US
+
+ // If you want non-latin layouts implicitly include the en_US layout
+ // uncomment lines below
+@@ -65,18 +65,20 @@
+ ! model layout = symbols
+ pc98 nec/jp = nec/jp(pc98)
+ abnt2 br = us(pc101)+br
+- $pcmodels us_intl = us(%m)+us_intl
+ $mac us = macintosh/us(extended)
+ $mac en_US = macintosh/us(extended)
+ $mac * = macintosh/us(extended)+macintosh/%l%(v)
+ $pcmodels intl = us(%mcompose)
+ * intl = us(pc104compose)
+- * jp = jp
+ $pcmodels $oldlayouts = en_US(%m)+%l%(v)
+ $pcmodels $nonlatin = pc/pc(%m)+pc/us+pc/%l%(v):2
++ $pcmodels ca =
pc/pc(%m)+pc/ca(multi)+pc/ca(multi-2gr):2+group(rctrl_switch)
++ $pcmodels jp = pc/pc(pc102)+pc/jp(latin)+pc/jp:2
+ $pcmodels * = pc/pc(%m)+pc/%l%(v)
+ * $oldlayouts = en_US(pc105)+%l%(v)
+ * $nonlatin = pc/pc(pc105)+pc/us+pc/%l%(v):2
++ * ca =
pc/pc(pc105)+pc/ca(multi)+pc/ca(multi-2gr):2+group(rctrl_switch)
++ * jp = pc/pc(pc102)+pc/jp(latin)+pc/jp:2
+ * * = pc/pc(pc105)+pc/%l%(v)
+
+ ! model layout[1] = symbols
+diff -ruN xc-old/programs/xkbcomp/symbols/group
xc/programs/xkbcomp/symbols/group
+--- xc-old/programs/xkbcomp/symbols/group 2004-10-08 22:36:45.000000000
+0000
++++ xc/programs/xkbcomp/symbols/group 2004-10-08 22:38:10.000000000 +0000
+@@ -63,6 +63,15 @@
+ };
+ };
+
++// Right Ctrl key temporary chooses the second keyboard group.
++// Needed mainly for Canadian keyboard
++partial modifier_keys
++xkb_symbols "rctrl_switch" {
++ key <RCTL> {
++ symbols[Group1]= [ Mode_switch ]
++ };
++};
++
+ // using the group(toggle) map, pressing the right alt key switches to
+ // the next sequential group (until the next explicit group change).
+ partial modifier_keys
+diff -ruN xc-old/programs/xkbcomp/symbols/pc/Imakefile
xc/programs/xkbcomp/symbols/pc/Imakefile
+--- xc-old/programs/xkbcomp/symbols/pc/Imakefile 2004-10-08
22:36:37.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/Imakefile 2004-10-08 22:38:10.000000000
+0000
+@@ -4,16 +4,17 @@
+
+ DATAFILES = al am ar \
+ be ben bg br by \
+- cz cz_qwerty \
++ ca ch cz cz_qwerty \
+ de dev dk dvorak \
+ ee el en_US es \
+ fi fr fr-latin9 \
+ gb ge_la ge_ru guj gur \
+- hr \
++ hr hu \
+ ie il il_phonetic ir is it iu \
++ jp \
+ kan \
+ la latin lo lt lv \
+- mk ml mm mt mt_us \
++ mk ml mm mn mt mt_us \
+ nl no \
+ ogham ori \
+ pc pl pl2 pt \
+@@ -21,6 +22,7 @@
+ sapmi se si sk sk_qwerty sr syr syr_phonetic \
+ tel th th_tis th_pat tj tml tr \
+ ua us us_intl \
++ vn \
+ yu
+
+ all::
+diff -ruN xc-old/programs/xkbcomp/symbols/pc/ca
xc/programs/xkbcomp/symbols/pc/ca
+--- xc-old/programs/xkbcomp/symbols/pc/ca 1970-01-01 00:00:00.000000000
+0000
++++ xc/programs/xkbcomp/symbols/pc/ca 2004-10-08 22:57:21.000000000 +0000
+@@ -0,0 +1,204 @@
++
++default partial
++xkb_symbols "fr" {
++ name[Group1] = "Canadian French";
++
++ key <TLDE> { [ numbersign, bar, backslash ] };
++ key <AE01> { [ 1, exclam, plusminus ] };
++ key <AE02> { [ 2, quotedbl, at ] };
++ key <AE03> { [ 3, slash, sterling ] };
++ key <AE04> { [ 4, dollar, cent ] };
++ key <AE05> { [ 5, percent, currency ] };
++ key <AE06> { [ 6, question, notsign ] };
++ key <AE07> { [ 7, ampersand, brokenbar ] };
++ key <AE08> { [ 8, asterisk, twosuperior ] };
++ key <AE09> { [ 9, parenleft, threesuperior ] };
++ key <AE10> { [ 0, parenright, onequarter ] };
++ key <AE11> { [ minus, underscore, onehalf ] };
++ key <AE12> { [ equal, plus, threequarters ] };
++
++ key <AD01> { [ q, Q ] };
++ key <AD02> { [ w, W ] };
++ key <AD03> { [ e, E ] };
++ key <AD04> { [ r, R ] };
++ key <AD05> { [ t, T ] };
++ key <AD06> { [ y, Y ] };
++ key <AD07> { [ u, U ] };
++ key <AD08> { [ i, I ] };
++ key <AD09> { [ o, O, section ] };
++ key <AD10> { [ p, P, paragraph ] };
++ key <AD11> { [dead_circumflex, dead_circumflex, bracketleft ]
};
++ key <AD12> { [ dead_cedilla, dead_diaeresis, bracketright ]
};
++
++ key <AC01> { [ a, A ] };
++ key <AC02> { [ s, S ] };
++ key <AC03> { [ d, D ] };
++ key <AC04> { [ f, F ] };
++ key <AC05> { [ g, G ] };
++ key <AC06> { [ h, H ] };
++ key <AC07> { [ j, J ] };
++ key <AC08> { [ k, K ] };
++ key <AC09> { [ l, L ] };
++ key <AC10> { [ semicolon, colon, asciitilde ] };
++ key <AC11> { [dead_grave, dead_grave, braceleft ] };
++ key <BKSL> { [ less, greater, braceright ] };
++
++ key <LSGT> { [guillemotleft, guillemotright, degree] };
++ key <AB01> { [ z, Z ] };
++ key <AB02> { [ x, X ] };
++ key <AB03> { [ c, C ] };
++ key <AB04> { [ v, V ] };
++ key <AB05> { [ b, B ] };
++ key <AB06> { [ n, N ] };
++ key <AB07> { [ m, M, mu ] };
++ key <AB08> { [ comma, apostrophe, macron ] };
++ key <AB09> { [ period, period, hyphen ] };
++ key <AB10> { [ eacute, Eacute, dead_acute ] };
++
++ key <SPCE> { [ space, space, nobreakspace ] };
++
++ include "level3(ralt_switch_multikey)"
++};
++
++partial
++xkb_symbols "fr-legacy" {
++
++ name[Group1] = "Canadian French (Legacy)";
++
++ include "pc/ca(fr)"
++
++ key <TLDE> { [ degree, degree, notsign ] };
++ key <AE01> { [ 1, exclam, onesuperior ] };
++
++ key <AE03> { [ 3, numbersign, threesuperior ] };
++ key <AE04> { [ 4, dollar, onequarter ] };
++ key <AE05> { [ 5, percent, onehalf ] };
++ key <AE06> { [ 6, question, threequarters ] };
++ key <AE07> { [ 7, ampersand, braceleft ] };
++ key <AE08> { [ 8, asterisk, bracketleft ] };
++ key <AE09> { [ 9, parenleft, bracketright, plusminus ]
};
++ key <AE10> { [ 0, parenright, braceright ] };
++ key <AE11> { [ minus, underscore, bar, questiondown]
};
++ key <AE12> { [ equal, plus, dead_cedilla ] };
++
++ key <AD04> { [ r, R, paragraph, registered ]
};
++ key <AD06> { [ y, Y, yen ] };
++ key <AD09> { [ o, O, oslash, Ooblique
] };
++ key <AD10> { [ p, P, thorn, THORN ]
};
++ key <AD11> { [dead_circumflex, dead_circumflex, degree ]
};
++ key <AD12> { [ ccedilla, Ccedilla, dead_tilde, dead_diaeresis ]
};
++
++ key <AC01> { [ a, A, ae, AE ]
};
++ key <AC02> { [ s, S, ssharp, section ]
};
++ key <AC03> { [ d, D, eth, ETH ]
};
++ key <AC04> { [ f, F, ordfeminine ] };
++ key <AC10> { [ semicolon, colon, dead_acute, dead_acute ]
};
++ key <AC11> { [ egrave, Egrave ] };
++ key <BKSL> { [ agrave, Agrave, dead_grave ] };
++
++ key <LSGT> { [ ugrave, Ugrave, backslash, bar ]
};
++ key <AB01> { [ z, Z, guillemotleft ] };
++ key <AB02> { [ x, X, guillemotright ] };
++ key <AB03> { [ c, C, cent, copyright ]
};
++ key <AB07> { [ m, M, mu, masculine ]
};
++ key <AB08> { [ comma, apostrophe, less ] };
++ key <AB09> { [ period, period, greater ] };
++ key <AB10> { [ eacute, Eacute, slash ] };
++};
++
++partial
++xkb_symbols "multi" {
++
++ name[Group1] = "Canadian Multilingual";
++
++ include "pc/ca(fr)"
++
++ key <TLDE> { [ slash, backslash, bar ] };
++ key <AE01> { [ 1, exclam ] };
++ key <AE02> { [ 2, at ] };
++ key <AE03> { [ 3, numbersign ] };
++ key <AE04> { [ 4, dollar ] };
++ key <AE05> { [ 5, percent ] };
++ key <AE06> { [ 6, question ] };
++ key <AE07> { [ 7, ampersand, braceleft ] };
++ key <AE08> { [ 8, asterisk, braceright ] };
++ key <AE09> { [ 9, parenleft, bracketleft ] };
++ key <AE10> { [ 0, parenright, bracketright ] };
++ key <AE11> { [ minus, underscore ] };
++ key <AE12> { [ equal, plus, notsign ] };
++
++ key <AD09> { [ o, O ] };
++ key <AD10> { [ p, P ] };
++ key <AD11> { [dead_circumflex, dead_diaeresis, dead_grave ]
};
++ key <AD12> { [ ccedilla, Ccedilla, asciitilde ] };
++
++ key <AC10> { [ semicolon, colon, degree ] };
++ key <AC11> { [ egrave, Egrave ] };
++ key <BKSL> { [ agrave, Agrave ] };
++
++ key <LSGT> { [ ugrave, Ugrave ] };
++ key <AB01> { [ z, Z, guillemotleft ] };
++ key <AB02> { [ x, X, guillemotright ] };
++ key <AB08> { [ comma, apostrophe, less ] };
++ key <AB09> { [ period, quotedbl, greater ] };
++ key <AB10> { [ eacute, Eacute ] };
++};
++
++partial
++xkb_symbols "multi-2gr" {
++
++ name[Group1] = "Canadian Multilingual group2";
++
++ key <TLDE> { [ VoidSymbol, hyphen ] };
++ key <AE01> { [ onesuperior, exclamdown ] };
++ key <AE02> { [ twosuperior, VoidSymbol ] };
++ key <AE03> { [ threesuperior, sterling ] };
++ key <AE04> { [ onequarter, currency ] };
++ key <AE05> { [ onehalf,threeeighths ] };
++ key <AE06> { [ threequarters, fiveeighths ] };
++ key <AE07> { [ VoidSymbol,seveneighths ] };
++ key <AE08> { [ VoidSymbol, trademark ] };
++ key <AE09> { [ VoidSymbol, plusminus ] };
++
++ key <AE11> { [ VoidSymbol, questiondown] };
++ key <AE12> { [ dead_cedilla, dead_ogonek ] };
++
++ key <AD01> { [ VoidSymbol, Greek_OMEGA ] };
++ key <AD02> { [ lstroke, Lstroke ] };
++ key <AD03> { [ oe, OE ] };
++ key <AD04> { [ paragraph, registered ] };
++ key <AD05> { [ U0167, U0166 ] };
++ key <AD06> { [ U2190, yen ] };
++ key <AD07> { [ U2193, U2191 ] };
++ key <AD08> { [ U2192, idotless ] };
++ key <AD09> { [ oslash, Ooblique ] };
++ key <AD10> { [ thorn, THORN ] };
++ key <AD11> { [ VoidSymbol, dead_abovering ] };
++ key <AD12> { [ dead_tilde, dead_macron ] };
++
++ key <AC01> { [ ae, AE ] };
++ key <AC02> { [ ssharp, section ] };
++ key <AC03> { [ eth, ETH ] };
++ key <AC04> { [ VoidSymbol, ordfeminine ] };
++ key <AC05> { [ eng, ENG ] };
++ key <AC06> { [ hstroke, Hstroke ] };
++ key <AC07> { [ U0133, U0132 ] };
++ key <AC08> { [ kra, VoidSymbol ] };
++ key <AC09> { [ U0140, U013F ] };
++ key <AC10> { [ dead_acute, dead_doubleacute ] };
++ key <AC11> { [ VoidSymbol, dead_caron ] };
++ key <BKSL> { [ VoidSymbol, dead_breve ] };
++
++
++ key <LSGT> { [ VoidSymbol, brokenbar ] };
++
++ key <AB03> { [ cent, copyright ] };
++ key <AB04> { [ leftdoublequotemark, leftsinglequotemark ]
};
++ key <AB05> { [ rightdoublequotemark, rightsinglequotemark ]
};
++ key <AB06> { [ U0149, U266A ] };
++ key <AB07> { [ mu, masculine ] };
++ key <AB08> { [ U2015, multiply ] };
++ key <AB09> { [ periodcentered, division ] };
++ key <AB10> { [ VoidSymbol, dead_abovedot ] };
++
++};
+diff -ruN xc-old/programs/xkbcomp/symbols/pc/ch
xc/programs/xkbcomp/symbols/pc/ch
+--- xc-old/programs/xkbcomp/symbols/pc/ch 1970-01-01 00:00:00.000000000
+0000
++++ xc/programs/xkbcomp/symbols/pc/ch 2004-10-08 22:32:44.000000000 +0000
+@@ -0,0 +1,116 @@
++// $Xorg: ch,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
++
++
++
++
++// $XFree86: xc/programs/xkbcomp/symbols/ch,v 3.6 2002/11/25 14:05:06 eich
Exp $
++
++partial default alphanumeric_keys
++xkb_symbols "basic" {
++
++ include "pc/latin"
++
++ // Alphanumeric section
++ name[Group1]= "Swiss (German)";
++ key <TLDE> { [ section, degree ] };
++ key <AE01> { [ 1, plus, bar, exclamdown ] };
++ key <AE02> { [ 2, quotedbl, at, oneeighth ] };
++ key <AE03> { [ 3, asterisk, numbersign ] };
++ key <AE04> { [ 4, ccedilla ] };
++ key <AE05> { [ 5, percent ] };
++ key <AE06> { [ 6, ampersand, notsign ] };
++ key <AE07> { [ 7, slash, brokenbar ] };
++ key <AE08> { [ 8, parenleft, cent ] };
++ key <AE09> { [ 9, parenright ] };
++ key <AE10> { [ 0, equal ] };
++ key <AE11> { [ apostrophe, question, dead_acute ] };
++ key <AE12> { [ dead_circumflex, dead_grave, dead_tilde ] };
++
++ key <AD03> { [ e, E, EuroSign ] };
++ key <AD06> { [ z, Z ] };
++ key <AD11> { [ udiaeresis, egrave, bracketleft ] };
++ key <AD12> { [ dead_diaeresis, exclam, bracketright ] };
++
++ key <AC10> { [ odiaeresis, eacute ] };
++ key <AC11> { [ adiaeresis, agrave, braceleft ] };
++ key <BKSL> { [ dollar, sterling, braceright ] };
++
++ key <LSGT> { [ less, greater, backslash, brokenbar ] };
++ key <AB01> { [ y, Y ] };
++ key <AB08> { [ comma, semicolon ] };
++ key <AB09> { [ period, colon ] };
++ key <AB10> { [ minus, underscore ] };
++
++ include "level3(ralt_switch_multikey)"
++};
++
++partial alphanumeric_keys
++xkb_symbols "de" {
++ include "pc/ch(basic)"
++};
++
++partial alphanumeric_keys
++xkb_symbols "de_Sundeadkeys" {
++ // modify the default Swiss German layout to use Sun dead keys
++ include "pc/ch(basic)"
++ key <AE11> { [ apostrophe, question, SunFA_Acute ] };
++ key <AE12> { [ SunFA_Circum, SunFA_Grave, SunFA_Tilde ] };
++ key <AD12> { [ SunFA_Diaeresis, exclam, bracketright ] };
++};
++
++partial alphanumeric_keys
++xkb_symbols "de_sundeadkeys" {
++ include "pc/ch(de_Sundeadkeys)"
++};
++
++partial alphanumeric_keys
++xkb_symbols "de_nodeadkeys" {
++ // modify the default Swiss German layout not to have any dead keys
++ include "pc/ch(basic)"
++ key <AE11> { [ apostrophe, question, acute ] };
++ key <AE12> { [ asciicircum, grave, asciitilde ] };
++ key <AD12> { [ diaeresis, exclam, bracketright ] };
++};
++
++partial alphanumeric_keys
++xkb_symbols "fr" {
++
++ // Describes the differences between a very simple US/ASCII
++ // keyboard and a very simple Swiss/French keybaord
++
++ include "pc/ch(basic)"
++ name[Group1]= "Swiss (French)";
++
++ override key <AD11> {
++ [ egrave, udiaeresis, bracketleft ]
++ };
++ override key <AC10> {
++ [ eacute, odiaeresis ]
++ };
++ override key <AC11> {
++ [ agrave, adiaeresis, braceleft ]
++ };
++};
++
++partial alphanumeric_keys
++xkb_symbols "fr_Sundeadkeys" {
++ // modify the default Swiss French layout to use Sun dead keys
++ include "pc/ch(fr)"
++ key <AE11> { [ apostrophe, question, SunFA_Acute ] };
++ key <AE12> { [ SunFA_Circum, SunFA_Grave, SunFA_Tilde ] };
++ key <AD12> { [ SunFA_Diaeresis, exclam, bracketright ] };
++};
++
++partial alphanumeric_keys
++xkb_symbols "fr_sundeadkeys" {
++ include "pc/ch(fr_Sundeadkeys)"
++};
++
++partial alphanumeric_keys
++xkb_symbols "fr_nodeadkeys" {
++ // modify the default Swiss French layout not to have any dead keys
++ include "pc/ch(fr)"
++ key <AE11> { [ apostrophe, question, acute ] };
++ key <AE12> { [ asciicircum, grave, asciitilde ] };
++ key <AD12> { [ diaeresis, exclam, bracketright ] };
++};
+diff -ruN xc-old/programs/xkbcomp/symbols/pc/hu
xc/programs/xkbcomp/symbols/pc/hu
+--- xc-old/programs/xkbcomp/symbols/pc/hu 1970-01-01 00:00:00.000000000
+0000
++++ xc/programs/xkbcomp/symbols/pc/hu 2004-10-08 22:31:48.000000000 +0000
+@@ -0,0 +1,428 @@
++// New style XKB layout for some widely used Hungarian keyboard layouts
++//
++// Based on old style 'xkb/symbols/hu"
++//
++// $XKeyboardConfig: xkbdesc/symbols/hu,v 1.3 2004/09/14 19:14:36 svu Exp $
++// (C) 2002-2004 So�s P�ter <[EMAIL PROTECTED]>
++//
++// Permission is granted to anyone to use, distribute and modify
++// this file in any way, provided that the above copyright notice
++// is left intact and the author of the modification summarizes
++// the changes in this header.
++//
++// This file is distributed without any expressed or implied warranty.
++//
++// Changes:
++// 2004-04-17 - Moved to new style (only Unicode based layouts)
++// - Added consistent dead key support
++// - Fixed abovedot
++// - Added adiaeresis
++// - Added EuroSign and cent symbol
++
++
++// Default layout
++default partial
++xkb_symbols "basic" {
++ include "pc/hu(102_qwertz_comma_dead)"
++};
++
++// Standard layout
++partial
++xkb_symbols "standard" {
++ include "pc/hu(102_qwertz_comma_dead)"
++};
++
++// Standard layout without dead key support
++partial
++xkb_symbols "nodeadkeys" {
++ include "pc/hu(102_qwertz_comma_nodead)"
++};
++
++// Qwerty layout
++partial
++xkb_symbols "qwerty" {
++ include "pc/hu(101_qwerty_comma_dead)"
++};
++
++// Main layouts
++
++// 101_qwertz_comma_dead
++// 101 key qwertz layout
++// with decimal comma on keypad
++// and with dead key support
++partial
++xkb_symbols "101_qwertz_comma_dead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_101)"
++ include "pc/hu(def_qwertz)"
++ include "keypad(comma)"
++ include "pc/hu(def_dead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 101_qwertz_comma_nodead
++// 101 key qwertz layout
++// with decimal comma on keypad
++// and without dead key support
++partial
++xkb_symbols "101_qwertz_comma_nodead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_101)"
++ include "pc/hu(def_qwertz)"
++ include "keypad(comma)"
++ include "pc/hu(def_nodead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 101_qwertz_dot_dead
++// 101 key qwertz layout
++// with decimal dot on keypad
++// and with dead key support
++partial
++xkb_symbols "101_qwertz_dot_dead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_101)"
++ include "pc/hu(def_qwertz)"
++ include "pc/hu(def_dot)"
++ include "pc/hu(def_dead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 101_qwertz_dot_nodead
++// 101 key qwertz layout
++// with decimal dot on keypad
++// and without dead key support
++partial
++xkb_symbols "101_qwertz_dot_nodead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_101)"
++ include "pc/hu(def_qwertz)"
++ include "pc/hu(def_dot)"
++ include "pc/hu(def_nodead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 101_qwerty_comma_dead
++// 101 key qwerty layout
++// with decimal comma on keypad
++// and with dead key support
++partial
++xkb_symbols "101_qwerty_comma_dead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_101)"
++ include "pc/hu(def_qwerty)"
++ include "keypad(comma)"
++ include "pc/hu(def_dead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 101_qwerty_comma_nodead
++// 101 key qwerty layout
++// with decimal comma on keypad
++// and without dead key support
++partial
++xkb_symbols "101_qwerty_comma_nodead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_101)"
++ include "pc/hu(def_qwerty)"
++ include "keypad(comma)"
++ include "pc/hu(def_nodead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 101_qwerty_dot_dead
++// 101 key qwerty layout
++// with decimal dot on keypad
++// and with dead key support
++partial
++xkb_symbols "101_qwerty_dot_dead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_101)"
++ include "pc/hu(def_qwerty)"
++ include "pc/hu(def_dot)"
++ include "pc/hu(def_dead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 101_qwerty_dot_nodead
++// 101 key qwerty layout
++// with decimal dot on keypad
++// and without dead key support
++partial
++xkb_symbols "101_qwerty_dot_nodead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_101)"
++ include "pc/hu(def_qwerty)"
++ include "pc/hu(def_dot)"
++ include "pc/hu(def_nodead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 102_qwertz_comma_dead
++// 102 key qwertz layout
++// with decimal comma on keypad
++// and with dead key support
++partial
++xkb_symbols "102_qwertz_comma_dead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_102)"
++ include "pc/hu(def_qwertz)"
++ include "pc/hu(def_comma)"
++ include "pc/hu(def_dead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 102_qwertz_comma_nodead
++// 102 key qwertz layout
++// with decimal comma on keypad
++// and without dead key support
++partial
++xkb_symbols "102_qwertz_comma_nodead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_102)"
++ include "pc/hu(def_qwertz)"
++ include "pc/hu(def_comma)"
++ include "pc/hu(def_nodead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 102_qwertz_dot_dead
++// 102 key qwertz layout
++// with decimal dot on keypad
++// and with dead key support
++partial
++xkb_symbols "102_qwertz_dot_dead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_102)"
++ include "pc/hu(def_qwertz)"
++ include "pc/hu(def_dot)"
++ include "pc/hu(def_dead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 102_qwertz_dot_nodead
++// 102 key qwertz layout
++// with decimal dot on keypad
++// and without dead key support
++partial
++xkb_symbols "102_qwertz_dot_nodead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_102)"
++ include "pc/hu(def_qwertz)"
++ include "pc/hu(def_dot)"
++ include "pc/hu(def_nodead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 102_qwerty_comma_dead
++// 102 key qwerty layout
++// with decimal comma on keypad
++// and with dead key support
++partial
++xkb_symbols "102_qwerty_comma_dead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_102)"
++ include "pc/hu(def_qwerty)"
++ include "pc/hu(def_comma)"
++ include "pc/hu(def_dead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 102_qwerty_comma_nodead
++// 102 key qwerty layout
++// with decimal comma on keypad
++// and without dead key support
++partial
++xkb_symbols "102_qwerty_comma_nodead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_102)"
++ include "pc/hu(def_qwerty)"
++ include "pc/hu(def_comma)"
++ include "pc/hu(def_nodead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 102_qwerty_dot_dead
++// 102 key qwerty layout
++// with decimal dot on keypad
++// and with dead key support
++partial
++xkb_symbols "102_qwerty_dot_dead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_102)"
++ include "pc/hu(def_qwerty)"
++ include "pc/hu(def_dot)"
++ include "pc/hu(def_dead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// 102_qwerty_dot_nodead
++// 102 key qwerty layout
++// with decimal dot on keypad
++// and without dead key support
++partial
++xkb_symbols "102_qwerty_dot_nodead" {
++ name[Group1] = "Hungarian";
++ include "pc/latin"
++ include "pc/hu(def_102)"
++ include "pc/hu(def_qwerty)"
++ include "pc/hu(def_dot)"
++ include "pc/hu(def_nodead)"
++ include "pc/hu(def_common)"
++ include "level3(ralt_switch_multikey)"
++};
++
++// Partial layouts
++
++// def_102:
++// The standard Hungarian 102 key layout
++hidden partial alphanumeric_keys
++xkb_symbols "def_102" {
++ key <TLDE> { [ 0, section, notsign
] };
++ key <LSGT> { [ iacute, Iacute, less,
greater ] };
++
++};
++
++// def_101:
++// An alternative layout for 101 key keyboards
++hidden partial alphanumeric_keys
++xkb_symbols "def_101" {
++ key <TLDE> { [ iacute, Iacute, 0,
section ] };
++ key <LSGT> { [ less, greater
] };
++};
++
++// def_qwertz:
++// The standard Hungaryan qwertz layout
++hidden partial alphanumeric_keys
++xkb_symbols "def_qwertz" {
++ key <AD06> { [ z, Z
] };
++ key <AB01> { [ y, Y, greater
] };
++};
++
++
++// def_qwerty:
++// The qwerty layout for people who familiar with the standard US layout
++hidden partial alphanumeric_keys
++xkb_symbols "def_qwerty" {
++ key <AD06> { [ y, Y
] };
++ key <AB01> { [ z, Z, greater
] };
++};
++
++// def_comma:
++// The Hungarian standard is the comma on the keypad not decimal dot
++hidden partial keypad_keys
++xkb_symbols "def_comma" {
++ key <KPDL> { [ KP_Delete, comma ] };
++};
++
++// def_dot:
++// The Hungarian standard is the comma on the keypad not decimal dot,
++// but programmers hate it
++hidden partial keypad_keys
++xkb_symbols "def_dot" {
++ key <KPDL> { [ KP_Delete, KP_Decimal
] };
++};
++
++
++// def_dead:
++// Dead keys support part
++hidden partial alphanumeric_keys
++xkb_symbols "def_dead" {
++ key <AE01> { [ 1, apostrophe, asciitilde,
dead_tilde ] };
++ key <AE02> { [ 2, quotedbl, dead_caron,
caron ] };
++ key <AE03> { [ 3, plus, asciicircum,
dead_circumflex ] };
++ key <AE04> { [ 4, exclam, dead_breve,
breve ] };
++ key <AE05> { [ 5, percent, dead_abovering,
degree ] };
++ key <AE06> { [ 6, slash, dead_ogonek,
ogonek ] };
++ key <AE07> { [ 7, equal, grave,
dead_grave ] };
++ key <AE08> { [ 8, parenleft, dead_abovedot,
abovedot ] };
++ key <AE09> { [ 9, parenright, dead_acute,
acute ] };
++ key <AE10> { [ odiaeresis, Odiaeresis, dead_doubleacute,
doubleacute ] };
++ key <AE11> { [ udiaeresis, Udiaeresis, dead_diaeresis,
diaeresis ] };
++ key <AE12> { [ oacute, Oacute, dead_cedilla,
cedilla ] };
++};
++
++// def_nodead:
++// Without dead keys support
++hidden partial alphanumeric_keys
++xkb_symbols "def_nodead" {
++ key <AE01> { [ 1, apostrophe, asciitilde
] };
++ key <AE02> { [ 2, quotedbl, caron
] };
++ key <AE03> { [ 3, plus, asciicircum
] };
++ key <AE04> { [ 4, exclam, breve
] };
++ key <AE05> { [ 5, percent, degree
] };
++ key <AE06> { [ 6, slash, ogonek
] };
++ key <AE07> { [ 7, equal, grave
] };
++ key <AE08> { [ 8, parenleft, abovedot
] };
++ key <AE09> { [ 9, parenright, acute
] };
++ key <AE10> { [ odiaeresis, Odiaeresis, doubleacute
] };
++ key <AE11> { [ udiaeresis, Udiaeresis, diaeresis
] };
++ key <AE12> { [ oacute, Oacute, cedilla
] };
++};
++
++
++// def_common:
++// The common part of all Hungarian layout above
++hidden partial alphanumeric_keys
++xkb_symbols "def_common" {
++ key <AD01> { [ q, Q, backslash
] };
++ key <AD02> { [ w, W, bar
] };
++ key <AD07> { [ u, U, EuroSign
] };
++ key <AD08> { [ i, I, Iacute,
iacute ] };
++ key <AD11> { [ odoubleacute, Odoubleacute, division
] };
++ key <AD12> { [ uacute, Uacute, multiply
] };
++
++ key <AC01> { [ a, A, adiaeresis,
Adiaeresis ] };
++ key <AC02> { [ s, S, dstroke
] };
++ key <AC03> { [ d, D, Dstroke
] };
++ key <AC04> { [ f, F, bracketleft
] };
++ key <AC05> { [ g, G, bracketright
] };
++ key <AC07> { [ j, J, iacute,
Iacute ] };
++ key <AC08> { [ k, K, lstroke
] };
++ key <AC09> { [ l, L, Lstroke
] };
++ key <AC10> { [ eacute, Eacute, dollar,
cent ] };
++ key <AC11> { [ aacute, Aacute, ssharp
] };
++
++ key <BKSL> { [ udoubleacute, Udoubleacute, currency
] };
++
++ key <AB02> { [ x, X, numbersign
] };
++ key <AB03> { [ c, C, ampersand
] };
++ key <AB04> { [ v, V, at
] };
++ key <AB05> { [ b, B, braceleft
] };
++ key <AB06> { [ n, N, braceright
] };
++ key <AB07> { [ m, M, less
] };
++ key <AB08> { [ comma, question, semicolon
] };
++ key <AB09> { [ period, colon, greater
] };
++ key <AB10> { [ minus, underscore, asterisk
] };
++
++};
+diff -ruN xc-old/programs/xkbcomp/symbols/pc/jp
xc/programs/xkbcomp/symbols/pc/jp
+--- xc-old/programs/xkbcomp/symbols/pc/jp 1970-01-01 00:00:00.000000000
+0000
++++ xc/programs/xkbcomp/symbols/pc/jp 2004-10-08 22:38:10.000000000 +0000
+@@ -0,0 +1,142 @@
++// based on:
++// symbols for a Japanese 106 keyboard(by [EMAIL PROTECTED])
++
++default xkb_symbols "jp106" {
++ include "srvr_ctrl(xfree86)"
++
++ name[Group1]= "Japanese";
++
++ // Alphanumeric section
++ key <HZTG> {
++ type="PC_SYSRQ",
++ symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
++ };
++ key <AE01> { [ kana_NU ] };
++ key <AE02> { [ kana_FU ] };
++ key <AE03> { [ kana_A, kana_a ] };
++ key <AE04> { [ kana_U, kana_u ] };
++ key <AE05> { [ kana_E, kana_e ] };
++ key <AE06> { [ kana_O, kana_o ] };
++ key <AE07> { [ kana_YA, kana_ya ] };
++ key <AE08> { [ kana_YU, kana_yu ] };
++ key <AE09> { [ kana_YO, kana_yo ] };
++ key <AE10> { [ kana_WA, kana_WO ] };
++ key <AE11> { [ kana_HO ] };
++ key <AE12> { [ kana_HE ] };
++ key <AE13> { [ prolongedsound ] };
++
++ key <AD01> { [ kana_TA ] };
++ key <AD02> { [ kana_TE ] };
++ key <AD03> { [ kana_I, kana_i ] };
++ key <AD04> { [ kana_SU ] };
++ key <AD05> { [ kana_KA ] };
++ key <AD06> { [ kana_N ] };
++ key <AD07> { [ kana_NA ] };
++ key <AD08> { [ kana_NI ] };
++ key <AD09> { [ kana_RA ] };
++ key <AD10> { [ kana_SE ] };
++ key <AD11> { [ voicedsound ] };
++ key <AD12> { [ semivoicedsound, kana_openingbracket ] };
++
++ key <CAPS> { [ Eisu_toggle, Caps_Lock ] };
++ key <AC01> { [ kana_CHI ] };
++ key <AC02> { [ kana_TO ] };
++ key <AC03> { [ kana_SHI ] };
++ key <AC04> { [ kana_HA ] };
++ key <AC05> { [ kana_KI ] };
++ key <AC06> { [ kana_KU ] };
++ key <AC07> { [ kana_MA ] };
++ key <AC08> { [ kana_NO ] };
++ key <AC09> { [ kana_RI ] };
++ key <AC10> { [ kana_RE ] };
++ key <AC11> { [ kana_KE ] };
++ key <AC12> { [ kana_MU, kana_closingbracket ] };
++
++ key <AB01> { [ kana_TSU, kana_tsu ] };
++ key <AB02> { [ kana_SA ] };
++ key <AB03> { [ kana_SO ] };
++ key <AB04> { [ kana_HI ] };
++ key <AB05> { [ kana_KO ] };
++ key <AB06> { [ kana_MI ] };
++ key <AB07> { [ kana_MO ] };
++ key <AB08> { [ kana_NE, kana_comma ] };
++ key <AB09> { [ kana_RU, kana_fullstop ] };
++ key <AB10> { [ kana_ME, kana_middledot ] };
++ key <AB11> { [ kana_RO ] };
++
++ key <NFER> { [ Muhenkan ] };
++
++ key <XFER> {
++ type="PC_SYSRQ",
++ symbols[Group1]= [ Henkan, Mode_switch ]
++ };
++ key <HKTG> {
++ type="PC_SYSRQ",
++ symbols[Group1]= [ Hiragana_Katakana, Romaji ]
++ };
++
++ // End alphanumeric section
++
++ key <PRSC> {
++ type= "PC_SYSRQ",
++ symbols[Group1]= [ Print, Execute ]
++ };
++ key <SYRQ> {
++ type= "PC_SYSRQ",
++ symbols[Group1]= [ Print, Execute ]
++ };
++};
++
++// latin part of jp keyboard map
++partial hidden
++xkb_symbols "latin" {
++
++ include "pc/us"
++ // Alphanumeric section
++ key <HZTG> {
++ type="PC_SYSRQ",
++ symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
++ };
++
++ key <AE02> { [ 2, quotedbl ] };
++
++ key <AE06> { [ 6, ampersand ] };
++ key <AE07> { [ 7, apostrophe ] };
++ key <AE08> { [ 8, parenleft ] };
++ key <AE09> { [ 9, parenright ] };
++ key <AE10> { [ 0,asciitilde ] };
++ key <AE11> { [ minus, equal ] };
++ key <AE12> { [ asciicircum, asciitilde] };
++ key <AE13> { [ backslash, bar ] };
++
++ key <AD11> { [ at, grave ] };
++ key <AD12> { [ bracketleft, braceleft ] };
++
++ key <CAPS> { [ Eisu_toggle, Caps_Lock ] };
++
++ key <AC10> { [ semicolon, plus ] };
++ key <AC11> { [ colon, asterisk ] };
++ key <AC12> { [ bracketright, braceright ] };
++
++ key <AB11> { [ backslash, underscore], [ kana_RO ] };
++
++ key <NFER> { [ Muhenkan ] };
++
++ key <XFER> {
++ type="PC_SYSRQ",
++ symbols[Group1]= [ Henkan, Mode_switch ]
++ };
++ key <HKTG> {
++ type="PC_SYSRQ",
++ symbols[Group1]= [ Hiragana_Katakana, Romaji ]
++ };
++
++ key <PRSC> {
++ type= "PC_SYSRQ",
++ symbols[Group1]= [ Print, Execute ]
++ };
++ key <SYRQ> {
++ type= "PC_SYSRQ",
++ symbols[Group1]= [ Print, Execute ]
++ };
++};
+diff -ruN xc-old/programs/xkbcomp/symbols/pc/mn
xc/programs/xkbcomp/symbols/pc/mn
+--- xc-old/programs/xkbcomp/symbols/pc/mn 1970-01-01 00:00:00.000000000
+0000
++++ xc/programs/xkbcomp/symbols/pc/mn 2004-10-08 22:38:10.000000000 +0000
+@@ -0,0 +1,68 @@
++// based on:
++// Mongolian standard keyboard
++// Author Sanlig Badral <[EMAIL PROTECTED]>
++// 2002/12/7 Version 1.0
++
++partial default alphanumeric_keys
++xkb_symbols "basic" {
++
++ name[Group1]= "Mongolian";
++
++ key <TLDE> { [ equal, plus, degree
] };
++ key <AE01> { [ 1, numerosign, multiply
] };
++ key <AE02> { [ 2, minus, division
] };
++ key <AE03> { [ 3, quotedbl, plusminus ] };
++ key <AE04> { [ 4, U20ae, notsign ] };
++ key <AE05> { [ 5, colon, NoSymbol ] };
++ key <AE06> { [ 6, period, notequal ] };
++ key <AE07> { [ 7, underscore, ampersand ] };
++ key <AE08> { [ 8, comma, asterisk ] };
++ key <AE09> { [ 9, percent, bracketleft ] };
++ key <AE10> { [ 0, question, bracketright ] };
++ key <AE11> { [ Cyrillic_ie, Cyrillic_IE, X
] };
++ key <AE12> { [ Cyrillic_shcha, Cyrillic_SHCHA, L ] };
++
++ key <AD01> { [ Cyrillic_ef, Cyrillic_EF, apostrophe
] };
++ key <AD02> { [ Cyrillic_tse, Cyrillic_TSE, grave ] };
++ key <AD03> { [ Cyrillic_u, Cyrillic_U, EuroSign
] };
++ key <AD04> { [ Cyrillic_zhe, Cyrillic_ZHE, registered
] };
++ key <AD05> { [ Cyrillic_e, Cyrillic_E, trademark
] };
++ key <AD06> { [ Cyrillic_en, Cyrillic_EN, yen
] };
++ key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE,
doublelowquotemark ] };
++ key <AD08> { [ Cyrillic_sha, Cyrillic_SHA,
leftdoublequotemark ] };
++ key <AD09> { [
Cyrillic_u_straight,Cyrillic_U_straight,rightdoublequotemark] };
++ key <AD10> { [ Cyrillic_ze, Cyrillic_ZE, NoSymbol
] };
++ key <AD11> { [ Cyrillic_ka, Cyrillic_KA, braceleft
] };
++ key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, braceright
] };
++
++ key <AC01> { [ Cyrillic_shorti, Cyrillic_SHORTI, mu
] };
++ key <AC02> { [ Cyrillic_yeru, Cyrillic_YERU, sterling
] };
++ key <AC03> { [ Cyrillic_be, Cyrillic_BE, dollar
] };
++ key <AC04> { [ Cyrillic_o_bar, Cyrillic_O_bar, rightdoublequotemark
] };
++ key <AC05> { [ Cyrillic_a, Cyrillic_A, Cyrillic_yeru
] };
++ key <AC06> { [ Cyrillic_ha, Cyrillic_HA, Cyrillic_YERU
] };
++ key <AC07> { [ Cyrillic_er, Cyrillic_ER, Cyrillic_e
] };
++ key <AC08> { [ Cyrillic_o, Cyrillic_O, Cyrillic_E
] };
++ key <AC09> { [ Cyrillic_el, Cyrillic_EL, numerosign
] };
++ key <AC10> { [ Cyrillic_de, Cyrillic_DE, section
] };
++ key <AC11> { [ Cyrillic_pe, Cyrillic_PE, ellipsis
] };
++ key <BKSL> { [ exclam, bar, bar ] };
++
++ key <LSGT> { [ parenleft, parenright, NoSymbol ] };
++ key <AB01> { [ Cyrillic_ya, Cyrillic_YA, emdash
] };
++ key <AB02> { [ Cyrillic_che, Cyrillic_CHE, endash
] };
++ key <AB03> { [ Cyrillic_io, Cyrillic_IO, copyright
] };
++ key <AB04> { [ Cyrillic_es, Cyrillic_ES, NoSymbol
] };
++ key <AB05> { [ Cyrillic_em, Cyrillic_EM, NoSymbol
] };
++ key <AB06> { [ Cyrillic_i, Cyrillic_I, less
] };
++ key <AB07> { [ Cyrillic_te, Cyrillic_TE, greater
] };
++ key <AB08> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, guillemotleft
] };
++ key <AB09> { [ Cyrillic_ve, Cyrillic_VE, guillemotright
] };
++ key <AB10> { [ Cyrillic_yu, Cyrillic_YU, backslash
] };
++
++ // End alphanumeric section
++
++ key <SPCE> { [ space, space, nobreakspace
] };
++
++ include "level3(ralt_switch_multikey)"
++};
+diff -ruN xc-old/programs/xkbcomp/symbols/pc/us
xc/programs/xkbcomp/symbols/pc/us
+--- xc-old/programs/xkbcomp/symbols/pc/us 2004-10-08 22:36:37.000000000
+0000
++++ xc/programs/xkbcomp/symbols/pc/us 2004-10-08 22:38:10.000000000 +0000
+@@ -1,5 +1,6 @@
+ //
+-// $XFree86: xc/programs/xkbcomp/symbols/pc/us,v 1.4 2003/04/19 12:22:12
pascal Exp $
++// $XdotOrg: xc/programs/xkbcomp/symbols/us,v 1.1.4.3 2004/03/05 13:41:33
eich Exp $
++// $XFree86: xc/programs/xkbcomp/symbols/us,v 1.6 2003/10/31 14:32:05 pascal
Exp $
+
+ default
+ partial hidden alphanumeric_keys modifier_keys
+@@ -63,3 +64,112 @@
+ key <BKSL> { [ backslash, bar ] };
+ // End alphanumeric section
+ };
++
++
++partial alphanumeric_keys
++xkb_symbols "intl" {
++
++ name[Group1]= "US International";
++
++ include "pc/us(basic)"
++
++ // Alphanumeric section
++ key <TLDE> { [dead_grave, dead_tilde, grave, asciitilde ] };
++ key <AE01> { [ 1, exclam, exclamdown, onesuperior ] };
++ key <AE02> { [ 2, at, twosuperior, dead_doubleacute ] };
++ key <AE03> { [ 3, numbersign, threesuperior, dead_macron ] };
++ key <AE04> { [ 4, dollar, currency, sterling ] };
++ key <AE05> { [ 5, percent, EuroSign ] };
++ key <AE06> { [ 6, dead_circumflex, onequarter, asciicircum ] };
++ key <AE07> { [ 7, ampersand, onehalf, dead_horn ] };
++ key <AE08> { [ 8, asterisk, threequarters, dead_ogonek ] };
++ key <AE09> { [ 9, parenleft, leftsinglequotemark, dead_breve ] };
++ key <AE10> { [ 0, parenright, rightsinglequotemark, dead_abovering
] };
++ key <AE11> { [ minus, underscore, yen, dead_belowdot ] };
++ key <AE12> { [ equal, plus, multiply, division ] };
++
++ key <AD01> { [ q, Q, adiaeresis, Adiaeresis ] };
++ key <AD02> { [ w, W, aring, Aring ] };
++ key <AD03> { [ e, E, eacute, Eacute ] };
++ key <AD04> { [ r, R, registered, registered ] };
++ key <AD05> { [ t, T, thorn, THORN ] };
++ key <AD06> { [ y, Y, udiaeresis, Udiaeresis ] };
++ key <AD07> { [ u, U, uacute, Uacute ] };
++ key <AD08> { [ i, I, iacute, Iacute ] };
++ key <AD09> { [ o, O, oacute, Oacute ] };
++ key <AD10> { [ p, P, odiaeresis, Odiaeresis ] };
++ key <AD11> { [ bracketleft, braceleft, guillemotleft, guillemotleft ] };
++ key <AD12> { [bracketright, braceright, guillemotright,guillemotright ] };
++
++ key <AC01> { [ a, A, aacute, Aacute ] };
++ key <AC02> { [ s, S, ssharp, section ] };
++ key <AC03> { [ d, D, eth, ETH ] };
++
++ key <AC09> { [ l, L, oslash, Ooblique ] };
++ key <AC10> { [ semicolon, colon, paragraph, degree ] };
++ key <AC11> { [dead_acute, dead_diaeresis, quotedbl, apostrophe ] };
++
++ key <AB01> { [ z, Z, ae, AE ] };
++ key <AB03> { [ c, C, copyright, cent ] };
++ key <AB06> { [ n, N, ntilde, Ntilde ] };
++ key <AB07> { [ m, M, mu, mu ] };
++ key <AB08> { [ comma, less, ccedilla, Ccedilla ] };
++ key <AB09> { [ period, greater, dead_abovedot, dead_caron ] };
++ key <AB10> { [ slash, question, questiondown, dead_hook ] };
++ key <BKSL> { [ backslash, bar, notsign, brokenbar ] };
++
++ include "level3(ralt_switch_multikey)"
++};
++
++// Based on symbols/us_intl keyboard map:
++// Dead-keys definition for a very simple US/ASCII layout.
++// by Conectiva (http://www.conectiva.com.br)
++// modified by Ricardo Y. Igarashi ([EMAIL PROTECTED])
++
++// Added the following deadkeys, to make it truly international:
++//
++// dead_macron: on AltGr-minus
++// dead_breve: on AltGr-parenleft
++// dead_abovedot: on AltGr-period
++// dead_abovering: on AltGr-0
++// dead_doubleacute: on AltGr-equal (as quotedbl is already used)
++// dead_caron: on AltGr-less (AltGr-shift-comma)
++// dead_cedilla: on AltGr-comma
++// dead_ogonek: on AltGr-semicolon
++// dead_belowdot: on AltGr-underscore (AltGr-shift-minus)
++// dead_hook: on AltGr-question
++// dead_horn: on AltGr-plus (AltGr-shift-equal)
++// dead_diaeresis: on AltGr-colon (Alt-shift-semicolon)
++//
++// those were already there:
++// dead_grave
++// dead_acute
++// dead_circumflex
++// dead_tilde
++// dead_diaeresis
++
++partial alphanumeric_keys
++xkb_symbols "alt-intl" {
++
++ name[Group1]= "US/ASCII";
++ include "pc/us"
++
++ key <TLDE> { [ dead_grave, dead_tilde, grave, asciitilde ] };
++ key <AE05> { [ 5, percent, EuroSign ] };
++ key <AE06> { [ 6, dead_circumflex, asciicircum, asciicircum ] };
++ key <AE09> { [ 9, parenleft, dead_breve, dead_breve ] };
++ key <AE10> { [ 0, parenright, dead_abovering, dead_abovering] };
++ key <AE11> { [ minus, underscore, dead_macron, dead_belowdot ]
};
++ key <AE12> { [ equal, plus, dead_doubleacute, dead_horn ] };
++
++ key <AD03> { [ e, E, EuroSign, cent
] };
++
++ key <AC10> { [ semicolon, colon, dead_ogonek, dead_diaeresis ] };
++ key <AC11> { [ dead_acute, dead_diaeresis, apostrophe, quotedbl ] };
++
++ key <AB08> { [ comma, less, dead_cedilla, dead_caron ] };
++ key <AB09> { [ period, greater, dead_abovedot, dead_circumflex ] };
++ key <AB10> { [ slash, question, dead_hook, dead_hook
] };
++
++ include "level3(ralt_switch_multikey)"
++};
+diff -ruN xc-old/programs/xkbcomp/symbols/pc/vn
xc/programs/xkbcomp/symbols/pc/vn
+--- xc-old/programs/xkbcomp/symbols/pc/vn 1970-01-01 00:00:00.000000000
+0000
++++ xc/programs/xkbcomp/symbols/pc/vn 2004-10-08 22:38:10.000000000 +0000
+@@ -0,0 +1,37 @@
++// based on:
++// vn, TCVN 5712:1993
++// Le Hong Boi <[EMAIL PROTECTED]>
++// August 1999
++// Further modified by Ashley Clark <[EMAIL PROTECTED]>
++// July 2000 for X 4.0
++
++
++partial default alphanumeric_keys
++xkb_symbols "basic" {
++
++ include "pc/us"
++
++ name[Group1]= "Vietnamese";
++
++ // Alphanumeric section
++ key <TLDE> { [ quoteleft, asciitilde ] };
++ key <AE01> { [ 1, exclam, abreve, Abreve ] };
++ key <AE02> { [ 2, at, acircumflex, Acircumflex ] };
++ key <AE03> { [ 3, numbersign, ecircumflex, Ecircumflex ] };
++ key <AE04> { [ 4, dollar, ocircumflex, Ocircumflex ] };
++ key <AE05> { [ 5, percent, dead_grave, percent ] };
++ key <AE06> { [ 6, asciicircum,dead_hook, asciicircum ] };
++ key <AE07> { [ 7, ampersand, dead_tilde, ampersand ] };
++ key <AE08> { [ 8, asterisk, dead_acute, asterisk ] };
++ key <AE09> { [ 9, parenlef, dead_belowdot,parenleft ] };
++ key <AE10> { [ 0, parenright, dstroke, Dstroke ] };
++ key <AE11> { [ minus, underscore ] };
++ key <AE12> { [ equal, plus, DongSign ] };
++
++ key <AD11> { [ bracketleft, braceleft, U01b0, U01af ] }; //
U horn
++ key <AD12> { [ bracketright, braceright, U01a1, U01a0 ] }; // O horn
++
++ // End alphanumeric section
++
++ include "level3(ralt_switch_multikey)"
++};
Modified: trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
===================================================================
--- trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-10-08
23:03:24 UTC (rev 1929)
+++ trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-10-08
23:59:51 UTC (rev 1930)
@@ -10,8 +10,6 @@
Lajos). (Closes: #247463, #270810)
+ Support the lv3:ralt_switch option, which exists in xfree86.lst but was
forgotten in this file.
- + Remove special case that causes PC keyboard models with the us_intl
- layout to load the us layout and add the us_intl layout to it.
rules/xfree86.{lst,xml}:
+ Replace the options altwin:meta_super and altwin:meta_hyper with the
@@ -19,26 +17,18 @@
+ Synchronize these files.
diff -ruN xc-old/programs/xkbcomp/rules/xfree86
xc/programs/xkbcomp/rules/xfree86
---- xc-old/programs/xkbcomp/rules/xfree86 Thu Sep 16 17:03:12 2004
-+++ xc/programs/xkbcomp/rules/xfree86 Fri Sep 17 14:26:43 2004
+--- xc-old/programs/xkbcomp/rules/xfree86 2004-10-07 21:34:56.000000000
+0000
++++ xc/programs/xkbcomp/rules/xfree86 2004-10-07 21:36:31.000000000 +0000
@@ -9,7 +9,7 @@
//
// Layouts that still need be composed by old rules
--! $oldlayouts = az bs ca ca_enhanced de_CH fr_CH hu hu_qwerty lt_std mn vn
hr_US
-+! $oldlayouts = az bs ca ca_enhanced czsk de_CH fr_CH hr_US hu hu_US
hu_qwerty jp lt_a lt_p lt_std mn ro2 ru_yawerty se_FI se_NO se_SE tr_f vn
+-! $oldlayouts = az bs ca_enhanced de_CH fr_CH hu_qwerty lt_std hr_US
++! $oldlayouts = az bs ca_enhanced czsk de_CH fr_CH hr_US hu_US hu_qwerty lt_a
lt_p lt_std ro2 ru_yawerty se_FI se_NO se_SE tr_f
// If you want non-latin layouts implicitly include the en_US layout
// uncomment lines below
-@@ -65,7 +65,6 @@
- ! model layout = symbols
- pc98 nec/jp = nec/jp(pc98)
- abnt2 br = us(pc101)+br
-- $pcmodels us_intl = us(%m)+us_intl
- $mac us = macintosh/us(extended)
- $mac en_US = macintosh/us(extended)
- $mac * = macintosh/us(extended)+macintosh/%l%(v)
-@@ -157,6 +156,7 @@
+@@ -158,6 +158,7 @@
lv3:win_switch = +level3(win_switch)
lv3:lwin_switch = +level3(lwin_switch)
lv3:rwin_switch = +level3(rwin_switch)
@@ -47,8 +37,8 @@
ctrl:swapcaps = +ctrl(swapcaps)
ctrl:ctrl_ac = +ctrl(ctrl_ac)
diff -ruN xc-old/programs/xkbcomp/rules/xfree86.lst
xc/programs/xkbcomp/rules/xfree86.lst
---- xc-old/programs/xkbcomp/rules/xfree86.lst 2004-09-18 07:18:23.000000000
+0000
-+++ xc/programs/xkbcomp/rules/xfree86.lst 2004-09-18 07:26:12.000000000
+0000
+--- xc-old/programs/xkbcomp/rules/xfree86.lst 2004-10-07 21:34:55.000000000
+0000
++++ xc/programs/xkbcomp/rules/xfree86.lst 2004-10-07 21:42:28.000000000
+0000
@@ -140,11 +140,14 @@
gur Gurmukhi
dev Hindi
@@ -64,7 +54,15 @@
it Italian
jp Japanese
kan Kannada
-@@ -198,7 +201,8 @@
+@@ -176,6 +179,7 @@
+ sk_qwerty Slovak (qwerty)
+ es Spanish
+ se Swedish
++ ch Swiss
+ fr_CH Swiss French
+ de_CH Swiss German
+ syr Syriac
+@@ -198,7 +202,8 @@
! option
grp Group Shift/Lock behavior
@@ -74,7 +72,7 @@
grp:lwin_switch Left Win-key switches group while pressed
grp:rwin_switch Right Win-key switches group while pressed
grp:win_switch Both Win-keys switch group while pressed
-@@ -225,6 +229,7 @@
+@@ -225,6 +230,7 @@
lv3:win_switch Press any of Win-keys to choose 3rd level
lv3:lwin_switch Press Left Win-key to choose 3rd level
lv3:rwin_switch Press Right Win-key to choose 3rd level
@@ -82,7 +80,7 @@
ctrl Control Key Position
ctrl:nocaps Make CapsLock an additional Control
ctrl:swapcaps Swap Control and Caps Lock
-@@ -245,8 +250,8 @@
+@@ -245,8 +251,8 @@
altwin:meta_alt Alt and Meta on the Alt keys (default).
altwin:meta_win Meta is mapped to the Win-keys.
altwin:left_meta_win Meta is mapped to the left Win-key.
@@ -94,8 +92,8 @@
compose:ralt Right Alt is Compose
compose:rwin Right Win-key is Compose
diff -ruN xc-old/programs/xkbcomp/rules/xfree86.xml
xc/programs/xkbcomp/rules/xfree86.xml
---- xc-old/programs/xkbcomp/rules/xfree86.xml 2004-09-18 07:18:23.000000000
+0000
-+++ xc/programs/xkbcomp/rules/xfree86.xml 2004-09-18 07:26:45.000000000
+0000
+--- xc-old/programs/xkbcomp/rules/xfree86.xml 2004-10-07 21:34:55.000000000
+0000
++++ xc/programs/xkbcomp/rules/xfree86.xml 2004-10-07 22:11:54.000000000
+0000
@@ -276,8 +276,14 @@
</model>
<model>
@@ -138,21 +136,83 @@
<name>honeywell_euroboard</name>
<description>Honeywell Euroboard</description>
</configItem>
-@@ -905,6 +923,13 @@
+@@ -845,51 +863,26 @@
+ <variantList>
+ <variant>
+ <configItem>
+- <name>alternate</name>
+- <description>ca(alternate) - No decription</description>
+- <description xml:lang="bg">ca(alternate) - без
описание</description>
+- <description xml:lang="ru">альтернативная</description>
++ <name>fr</name>
++ <description>French</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>nodeadkeys</name>
+- <description>Eliminate dead keys</description>
+- <description xml:lang="bg">Изключи специалните клавиши (dead
keys)</description>
+- <description xml:lang="ru">Исключить специальные клавиши (dead
keys)</description>
++ <name>fr-legacy</name>
++ <description>French (legacy)</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>sundeadkeys</name>
+- <description>ca(sundeadkeys) - No decription</description>
+- <description xml:lang="bg">ca(sundeadkeys) - без
описание</description>
+- <description xml:lang="ru">sundeadkeys</description>
++ <name>multi</name>
++ <description>Multilingual</description>
+ </configItem>
+ </variant>
+- </variantList>
+- </layout>
+- <layout>
+- <configItem>
+- <name>ca_enhanced</name>
+- <description>French Canadian</description>
+- <description xml:lang="ru">Французская Канадская</description>
+- </configItem>
+- <variantList>
+ <variant>
+ <configItem>
+- <name>Sundeadkeys</name>
+- <description>ca_enhanced(Sundeadkeys) - No
decription</description>
+- <description xml:lang="bg">ca_enhanced(Sundeadkeys) - без
описание</description>
+- <description xml:lang="ru">Sundeadkeys</description>
+- </configItem>
+- </variant>
+- <variant>
+- <configItem>
+- <name>basic</name>
+- <description>ca_enhanced(basic) - No decription</description>
+- <description xml:lang="bg">ca_enhanced(basic) - без
описание</description>
+- <description xml:lang="ru">простая</description>
++ <name>multi-2gr</name>
++ <description>Multilingual, second part</description>
+ </configItem>
+ </variant>
+ </variantList>
+@@ -901,7 +894,14 @@
+ <description xml:lang="bg">хърватска</description>
+ <description xml:lang="ru">Хорватская</description>
+ </configItem>
+- <variantList/>
++ <variantList>
++ <variant>
++ <configItem>
++ <name>us</name>
++ <description>US keyboard with Croatian letters</description>
++ </configItem>
++ </variant>
++ </variantList>
</layout>
<layout>
<configItem>
-+ <name>hr_US</name>
-+ <description>Croatian (US)</description>
-+ </configItem>
-+ <variantList/>
-+ </layout>
-+ <layout>
-+ <configItem>
- <name>cz</name>
- <description>Czech</description>
- <description xml:lang="bg">чехшка</description>
-@@ -1033,14 +1058,6 @@
+@@ -1033,14 +1033,6 @@
</layout>
<layout>
<configItem>
@@ -167,21 +227,220 @@
<name>fi</name>
<description>Finnish</description>
<description xml:lang="bg">финландска</description>
-@@ -1389,6 +1406,13 @@
+@@ -1229,174 +1221,126 @@
+ <configItem>
+ <name>hu</name>
+ <description>Hungarian</description>
+- <description xml:lang="bg">унгарска</description>
+- <description xml:lang="ru">Венгерская</description>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+- <name>Sundeadkeys</name>
+- <description>hu(Sundeadkeys) - No decription</description>
+- <description xml:lang="bg">hu(Sundeadkeys) - без
описание</description>
+- <description xml:lang="ru">Sundeadkeys</description>
++ <name>standard</name>
++ <description>Standard</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>l2_101_qwerty_comma</name>
+- <description>hu(l2_101_qwerty_comma) - No
decription</description>
+- <description xml:lang="bg">hu(l2_101_qwerty_comma) - без
описание</description>
+- <description xml:lang="ru">Latin2 pc101, qwerty,
запятая</description>
++ <name>nodeadkeys</name>
++ <description>Eliminate dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>l2_101_qwerty_dot</name>
+- <description>hu(l2_101_qwerty_dot) - No decription</description>
+- <description xml:lang="bg">hu(l2_101_qwerty_dot) - без
описание</description>
+- <description xml:lang="ru">Latin2 pc101, qwerty,
точка</description>
++ <name>qwerty</name>
++ <description>qwerty</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>l2_101_qwertz_comma</name>
+- <description>hu(l2_101_qwertz_comma) - No
decription</description>
+- <description xml:lang="bg">hu(l2_101_qwertz_comma) - без
описание</description>
+- <description xml:lang="ru">Latin2 pc101, qwertz,
запятая</description>
++ <name>101_qwertz_comma_dead</name>
++ <description>101/qwertz/comma/Dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>l2_101_qwertz_dot</name>
+- <description>hu(l2_101_qwertz_dot) - No decription</description>
+- <description xml:lang="bg">hu(l2_101_qwertz_dot) - без
описание</description>
+- <description xml:lang="ru">Latin2 pc101, qwertz,
точка</description>
++ <name>101_qwertz_comma_nodead</name>
++ <description>101/qwertz/comma/Eliminate dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>l2_102_qwerty_comma</name>
+- <description>hu(l2_102_qwerty_comma) - No
decription</description>
+- <description xml:lang="bg">hu(l2_102_qwerty_comma) - без
описание</description>
+- <description xml:lang="ru">Latin2 pc102, qwerty,
запятая</description>
++ <name>101_qwertz_dot_dead</name>
++ <description>101/qwertz/dot/Dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>l2_102_qwerty_dot</name>
+- <description>hu(l2_102_qwerty_dot) - No decription</description>
+- <description xml:lang="bg">hu(l2_102_qwerty_dot) - без
описание</description>
+- <description xml:lang="ru">Latin2 pc102, qwerty,
точка</description>
++ <name>101_qwertz_dot_nodead</name>
++ <description>101/qwertz/dot/Eliminate dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>l2_102_qwertz_comma</name>
+- <description>hu(l2_102_qwertz_comma) - No
decription</description>
+- <description xml:lang="bg">hu(l2_102_qwertz_comma) - без
описание</description>
+- <description xml:lang="ru">Latin2 pc102, qwertz,
запятая</description>
++ <name>101_qwerty_comma_dead</name>
++ <description>101/qwerty/comma/Dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>l2_102_qwertz_dot</name>
+- <description>hu(l2_102_qwertz_dot) - No decription</description>
+- <description xml:lang="bg">hu(l2_102_qwertz_dot) - без
описание</description>
+- <description xml:lang="ru">Latin2 pc102, qwertz,
точка</description>
++ <name>101_qwerty_comma_nodead</name>
++ <description>101/qwerty/comma/Eliminate dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>nodeadkeys</name>
+- <description>Eliminate dead keys</description>
+- <description xml:lang="bg">Изключи специалните клавиши (dead
keys)</description>
+- <description xml:lang="ru">Исключить специальные клавиши (dead
keys)</description>
++ <name>101_qwerty_dot_dead</name>
++ <description>101/qwerty/dot/Dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>standard</name>
+- <description>hu(standard) - No decription</description>
+- <description xml:lang="bg">hu(standard) - без
описание</description>
+- <description xml:lang="ru">стандартная</description>
++ <name>101_qwerty_dot_nodead</name>
++ <description>101/qwerty/dot/Eliminate dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>uni_101_qwerty_comma</name>
+- <description>hu(uni_101_qwerty_comma) - No
decription</description>
+- <description xml:lang="bg">hu(uni_101_qwerty_comma) - без
описание</description>
+- <description xml:lang="ru">Unicode pc101, qwerty,
запятая</description>
++ <name>102_qwertz_comma_dead</name>
++ <description>102/qwertz/comma/Dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>uni_101_qwerty_dot</name>
+- <description>hu(uni_101_qwerty_dot) - No decription</description>
+- <description xml:lang="bg">hu(uni_101_qwerty_dot) - без
описание</description>
+- <description xml:lang="ru">Unicode pc101, qwerty,
точка</description>
++ <name>102_qwertz_comma_nodead</name>
++ <description>102/qwertz/comma/Eliminate dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>uni_101_qwertz_comma</name>
+- <description>hu(uni_101_qwertz_comma) - No
decription</description>
+- <description xml:lang="bg">hu(uni_101_qwertz_comma) - без
описание</description>
+- <description xml:lang="ru">Unicode pc101, qwertz,
запятая</description>
++ <name>102_qwertz_dot_dead</name>
++ <description>102/qwertz/dot/Dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>uni_101_qwertz_dot</name>
+- <description>hu(uni_101_qwertz_dot) - No decription</description>
+- <description xml:lang="bg">hu(uni_101_qwertz_dot) - без
описание</description>
+- <description xml:lang="ru">Unicode pc101, qwertz,
точка</description>
++ <name>102_qwertz_dot_nodead</name>
++ <description>102/qwertz/dot/Eliminate dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>uni_102_qwerty_comma</name>
+- <description>hu(uni_102_qwerty_comma) - No
decription</description>
+- <description xml:lang="bg">hu(uni_102_qwerty_comma) - без
описание</description>
+- <description xml:lang="ru">Unicode pc102, qwerty,
запятая</description>
++ <name>102_qwerty_comma_dead</name>
++ <description>102/qwerty/comma/Dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>uni_102_qwerty_dot</name>
+- <description>hu(uni_102_qwerty_dot) - No decription</description>
+- <description xml:lang="bg">hu(uni_102_qwerty_dot) - без
описание</description>
+- <description xml:lang="ru">Unicode pc102, qwerty,
точка</description>
++ <name>102_qwerty_comma_nodead</name>
++ <description>102/qwerty/comma/Eliminate dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>uni_102_qwertz_comma</name>
+- <description>hu(uni_102_qwertz_comma) - No
decription</description>
+- <description xml:lang="bg">hu(uni_102_qwertz_comma) - без
описание</description>
+- <description xml:lang="ru">Unicode pc102, qwertz,
запятая</description>
++ <name>102_qwerty_dot_dead</name>
++ <description>102/qwerty/dot/Dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>uni_102_qwertz_dot</name>
+- <description>hu(uni_102_qwertz_dot) - No decription</description>
+- <description xml:lang="bg">hu(uni_102_qwertz_dot) - без
описание</description>
+- <description xml:lang="ru">Unicode pc102, qwertz,
точка</description>
++ <name>102_qwerty_dot_nodead</name>
++ <description>102/qwerty/dot/Eliminate dead keys</description>
+ </configItem>
+ </variant>
+ </variantList>
</layout>
<layout>
<configItem>
-+ <name>hu_US</name>
-+ <description>Hungarian (US)</description>
-+ </configItem>
-+ <variantList/>
-+ </layout>
-+ <layout>
-+ <configItem>
- <name>hu_qwerty</name>
- <description>Hungarian (qwerty)</description>
- <description xml:lang="ru">Венгерская (qwerty)</description>
-@@ -1431,6 +1455,50 @@
+- <name>hu_qwerty</name>
+- <description>Hungarian (qwerty)</description>
+- <description xml:lang="ru">Венгерская (qwerty)</description>
+- </configItem>
+- <variantList/>
+- </layout>
+- <layout>
+- <configItem>
+ <name>is</name>
+ <description>Icelandic</description>
+ <description xml:lang="bg">исландска</description>
+@@ -1431,6 +1375,50 @@
</layout>
<layout>
<configItem>
@@ -232,7 +491,7 @@
<name>il</name>
<description>Israeli</description>
<description xml:lang="bg">израелска</description>
-@@ -1455,6 +1523,13 @@
+@@ -1455,6 +1443,13 @@
</layout>
<layout>
<configItem>
@@ -246,10 +505,85 @@
<name>it</name>
<description>Italian</description>
<description xml:lang="bg">италианска</description>
-@@ -2168,52 +2244,6 @@
+@@ -1948,52 +1943,44 @@
</layout>
<layout>
<configItem>
+- <name>fr_CH</name>
+- <description>Swiss French</description>
+- <description xml:lang="bg">швейцарска френска</description>
+- <description xml:lang="ru">Французская (Швейцария)</description>
++ <name>ch</name>
++ <description>Swiss</description>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+- <name>Sundeadkeys</name>
+- <description>fr_CH(Sundeadkeys) - No decription</description>
+- <description xml:lang="bg">fr_CH(Sundeadkeys) - без
описание</description>
+- <description xml:lang="ru">Sundeadkeys</description>
++ <name>de</name>
++ <description>German</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>nodeadkeys</name>
+- <description>Eliminate dead keys</description>
+- <description xml:lang="bg">Изключи специалните клавиши (dead
keys)</description>
+- <description xml:lang="ru">Исключить специальные клавиши (dead
keys)</description>
++ <name>de_nodeadkeys</name>
++ <description>German, eliminate dead keys</description>
+ </configItem>
+ </variant>
+- </variantList>
+- </layout>
+- <layout>
+- <configItem>
+- <name>de_CH</name>
+- <description>Swiss German</description>
+- <description xml:lang="bg">швейцарска немска</description>
+- <description xml:lang="ru">Немецкая (Швейцария)</description>
+- </configItem>
+- <variantList>
+ <variant>
+ <configItem>
+- <name>Sundeadkeys</name>
+- <description>de_CH(Sundeadkeys) - No decription</description>
+- <description xml:lang="bg">de_CH(Sundeadkeys) - без
описание</description>
+- <description xml:lang="ru">Sundeadkeys</description>
++ <name>de_sundeadkeys</name>
++ <description>German, Sun dead keys</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+- <name>nodeadkeys</name>
+- <description>Eliminate dead keys</description>
+- <description xml:lang="bg">Изключи специалните клавиши (dead
keys)</description>
+- <description xml:lang="ru">Исключить специальные клавиши (dead
keys)</description>
++ <name>fr</name>
++ <description>French</description>
++ </configItem>
++ </variant>
++ <variant>
++ <configItem>
++ <name>fr_nodeadkeys</name>
++ <description>French, eliminate dead keys</description>
++ </configItem>
++ </variant>
++ <variant>
++ <configItem>
++ <name>fr_sundeadkeys</name>
++ <description>French, Sun dead keys</description>
+ </configItem>
+ </variant>
+ </variantList>
+@@ -2168,52 +2155,6 @@
+ </layout>
+ <layout>
+ <configItem>
- <name>ie</name>
- <description>ie - No decription</description>
- <description xml:lang="ru">Ирландская</description>
@@ -299,7 +633,7 @@
<name>sapmi</name>
<description>sapmi - No decription</description>
<description xml:lang="bg">sapmi - без описание</description>
-@@ -2257,8 +2287,14 @@
+@@ -2257,8 +2198,14 @@
</configItem>
<option>
<configItem>
@@ -315,7 +649,7 @@
<description xml:lang="bg">Десният Alt сменя групата докато е
натиснат</description>
<description xml:lang="ru">Правая клавиша Alt переключает группу на
время нажатия</description>
</configItem>
-@@ -2464,6 +2500,12 @@
+@@ -2464,6 +2411,12 @@
<description xml:lang="ru">Выбор 3-го уровня нажатием правой
клавиши Win</description>
</configItem>
</option>
@@ -328,7 +662,7 @@
</group>
<group allowMultipleSelection="false">
<configItem>
-@@ -2617,7 +2659,7 @@
+@@ -2617,7 +2570,7 @@
</option>
<option>
<configItem>
@@ -337,7 +671,7 @@
<description>Super is mapped to the Win-keys
(default).</description>
<description xml:lang="bg">Win клавишите функционират като
Super</description>
<description xml:lang="ru">Super соответствует клавишам Win (по
умолчанию)</description>
-@@ -2625,7 +2667,7 @@
+@@ -2625,7 +2578,7 @@
</option>
<option>
<configItem>
Modified: trunk/debian/xlibs.install
===================================================================
--- trunk/debian/xlibs.install 2004-10-08 23:03:24 UTC (rev 1929)
+++ trunk/debian/xlibs.install 2004-10-08 23:59:51 UTC (rev 1930)
@@ -226,6 +226,8 @@
etc/X11/xkb/symbols/pc/bg
etc/X11/xkb/symbols/pc/br
etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
etc/X11/xkb/symbols/pc/cz
etc/X11/xkb/symbols/pc/cz_qwerty
etc/X11/xkb/symbols/pc/de
@@ -245,6 +247,7 @@
etc/X11/xkb/symbols/pc/guj
etc/X11/xkb/symbols/pc/gur
etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
etc/X11/xkb/symbols/pc/ie
etc/X11/xkb/symbols/pc/il
etc/X11/xkb/symbols/pc/il_phonetic
@@ -252,6 +255,7 @@
etc/X11/xkb/symbols/pc/is
etc/X11/xkb/symbols/pc/it
etc/X11/xkb/symbols/pc/iu
+etc/X11/xkb/symbols/pc/jp
etc/X11/xkb/symbols/pc/kan
etc/X11/xkb/symbols/pc/la
etc/X11/xkb/symbols/pc/latin
@@ -261,6 +265,7 @@
etc/X11/xkb/symbols/pc/mk
etc/X11/xkb/symbols/pc/ml
etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
etc/X11/xkb/symbols/pc/mt
etc/X11/xkb/symbols/pc/mt_us
etc/X11/xkb/symbols/pc/nl
@@ -291,6 +296,7 @@
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
etc/X11/xkb/symbols/pc/us_intl
+etc/X11/xkb/symbols/pc/vn
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
