Attachment 4320 Details for Bug 5507 – A patch for XKeyboardConfig version of the XKB files

[patch] A patch for XKeyboardConfig version of the XKB files

xkbdesc.diff (text/plain), 4.37 KB, created by Anton Zinoviev on 2006-01-11 09:02:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anton Zinoviev

Created: 2006-01-11 09:02:09 UTC

Size: 4.37 KB

patch

obsolete

>diff -Naur xkbdesc.orig/rules/base.lists.part xkbdesc.new/rules/base.lists.part
>--- xkbdesc.orig/rules/base.lists.part	2005-10-20 21:43:50.000000000 +0300
>+++ xkbdesc.new/rules/base.lists.part	2006-01-11 00:04:12.000000000 +0200
>@@ -9,6 +9,8 @@
> ! $maclaptop = ibook powerbook
> ! $mac = macintosh macintosh_old ibook powerbook
> 
>+! $macvendorlayouts = ch de dk es fi fr gb is it nl no pt se us
>+
> ! $azerty = be fr
> ! $qwertz = al cz de hr hu ro si sk 
> 
>diff -Naur xkbdesc.orig/rules/base.m_k.part xkbdesc.new/rules/base.m_k.part
>--- xkbdesc.orig/rules/base.m_k.part	2004-07-20 04:29:47.000000000 +0300
>+++ xkbdesc.new/rules/base.m_k.part	2006-01-11 00:04:12.000000000 +0200
>@@ -1,3 +1,7 @@
>+  amiga		=	amiga(de)
>+  ataritt	=	ataritt(de)
>+  sun4		=	sun(type4_euro)
>+  sun5		=	sun(type5_euro)
>   macintosh_old	=	macintosh
>   powerpcps2	=	powerpcps2
>   pc98		=	xfree98(pc98)
>diff -Naur xkbdesc.orig/rules/base.ml1_s.part xkbdesc.new/rules/base.ml1_s.part
>--- xkbdesc.orig/rules/base.ml1_s.part	2004-07-20 04:49:29.000000000 +0300
>+++ xkbdesc.new/rules/base.ml1_s.part	2006-01-11 00:04:12.000000000 +0200
>@@ -1,2 +1,10 @@
>+  ataritt	*			=	xfree68_vndr/ataritt(us)+%l[1]%(v[1])
>+  amiga		*			=	xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
>+  sun4		*			=	latin+sun_vndr/us(sun4)+%l[1]%(v[1])
>+  sun5		*			=	latin+sun_vndr/us(sun5)+%l[1]%(v[1])
>+  old_macintosh	us			=	macintosh_vndr/us(extended)
>+  old_macintosh	$macvendorlayouts	=	macintosh_vndr/us(extended)+macintosh_vndr/%l[1]%(v[1])
>+  old_macintosh	*			=	macintosh_vndr/us(extended)+%l[1]%(v[1])
>+ $mac		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l[1]%(v[1])
>  $pcmodels	*			=	pc(%m)+%l[1]%(v[1])
>   *		*			=	pc(pc105)+%l[1]%(v[1])
>diff -Naur xkbdesc.orig/rules/base.ml_s.part xkbdesc.new/rules/base.ml_s.part
>--- xkbdesc.orig/rules/base.ml_s.part	2005-09-22 02:08:33.000000000 +0300
>+++ xkbdesc.new/rules/base.ml_s.part	2006-01-11 00:04:12.000000000 +0200
>@@ -1,15 +1,24 @@
>+  ataritt	$nonlatin		=	xfree68_vndr/ataritt(us)+%l%(v):2
>+  ataritt	*			=	xfree68_vndr/ataritt(us)+%l%(v)
>+  amiga		$nonlatin		=	xfree68_vndr/amiga(usa1)+%l%(v):2
>+  amiga		*			=	xfree68_vndr/amiga(usa1)+%l%(v)
>+  sun4		$nonlatin		=	latin+sun_vndr/us(sun4)+%l%(v):2
>+  sun4		*			=	latin+sun_vndr/us(sun4)+%l%(v)
>+  sun5		$nonlatin		=	latin+sun_vndr/us(sun5)+%l%(v):2
>+  sun5		*			=	latin+sun_vndr/us(sun5)+%l%(v)
>   pc98		nec/jp			=	nec_vndr/jp(pc98)
>   abnt2		br			=	pc(pc104)+br
>- $maclaptop	us			=	macintosh_vndr/us(extended)+macintosh_vndr/apple(laptop_bad_switch)
>- $maclaptop	en_US			=	macintosh_vndr/us(extended)+macintosh_vndr/apple(laptop_bad_switch)
>- $maclaptop	*			=	macintosh_vndr/us(extended)+apple(laptop_bad_switch)+macintosh_vndr/%l%(v)
>- $mac		us			=	macintosh_vndr/us(extended)
>- $mac		en_US			=	macintosh_vndr/us(extended)
>- $mac		*			=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
>+  old_macintosh	us			=	macintosh_vndr/us(extended)
>+  old_macintosh	en_US			=	macintosh_vndr/us(extended)
>+  old_macintosh	$macvendorlayouts	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
>+  old_macintosh	$nonlatin		=	macintosh_vndr/us(extended)+%l%(v):2
>+  old_macintosh	*			=	macintosh_vndr/us(extended)+%l%(v)
>+ $mac		en_US			=	pc(pc105)+macintosh_vndr/us(extended)
>+ $mac		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l%(v)
>  $pcmodels      intl   			=       us(%mcompose)
>   *		intl			=	us(pc104compose)
>   *		jp			=	pc(pc102)+jp(latin)+jp:2
>- $pcmodels $nonlatin			=	pc(%m)+us+%l%(v):2
>+ $pcmodels	$nonlatin		=	pc(%m)+us+%l%(v):2
>  $pcmodels	*			=	pc(%m)+%l%(v)
>-  *	   $nonlatin			=	pc(pc105)+us+%l%(v):2
>+  *	   	$nonlatin		=	pc(pc105)+us+%l%(v):2
>   *		*			=	pc(pc105)+%l%(v)
>diff -Naur xkbdesc.orig/rules/base.mlv_s.part xkbdesc.new/rules/base.mlv_s.part
>--- xkbdesc.orig/rules/base.mlv_s.part	2004-07-21 04:21:05.000000000 +0300
>+++ xkbdesc.new/rules/base.mlv_s.part	2006-01-11 00:04:12.000000000 +0200
>@@ -1,2 +1 @@
>- $maclaptop	*		nodeadkeys	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)+macintosh_vndr/apple(laptop_bad_switch)
>- $mac		*		nodeadkeys	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
>+ $mac		$macvendorlayouts	nodeadkeys	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
>diff -Naur xkbdesc.orig/rules/base.m_s.part xkbdesc.new/rules/base.m_s.part
>--- xkbdesc.orig/rules/base.m_s.part	2004-07-20 04:29:47.000000000 +0300
>+++ xkbdesc.new/rules/base.m_s.part	2006-01-11 00:04:12.000000000 +0200
>@@ -1 +1,2 @@
>+  $maclaptop	=	+macintosh_vndr/apple(laptop_bad_switch)
>   $inetkbds     =       +inet(%m)

Actions: View | Splinter Review

Attachments on bug 5507: 4241 | 4320

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.