Attachment 3358 Details for Bug 4411 – add ca_enhanced, remove ca special-casing

[patch] add ca_enhanced, remove ca special-casing

foo (text/plain), 2.42 KB, created by Daniel Stone on 2005-09-22 01:45:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Stone

Created: 2005-09-22 01:45:36 UTC

Size: 2.42 KB

patch

obsolete

>--- xkeyboard-config-0.6.orig/rules/base
>+++ xkeyboard-config-0.6/rules/base
>@@ -300,8 +300,6 @@
>  $pcmodels      intl   			=       us(%mcompose)
>   *		intl			=	us(pc104compose)
>   *		jp			=	pc(pc102)+jp(latin)+jp:2
>- $pcmodels      ca     			=       pc(%m)+ca(multi)+ca(multi-2gr):2+group(rctrl_switch)
>-  *             ca     			=       pc(pc105)+ca(multi)+ca(multi-2gr):2+group(rctrl_switch)
>  $pcmodels $nonlatin			=	pc(%m)+us+%l%(v):2
>  $pcmodels	*			=	pc(%m)+%l%(v)
>   *	   $nonlatin			=	pc(pc105)+us+%l%(v):2
>--- xkeyboard-config-0.6.orig/rules/base.xml.in
>+++ xkeyboard-config-0.6/rules/base.xml.in
>@@ -997,6 +997,13 @@
>     </layout>
>     <layout>
>       <configItem>
>+        <name>ca_enhanced</name>
>+        <_shortDescription>CaE</_shortDescription>
>+        <_description>Canada (Multilingual)</_description>
>+      </configItem>
>+    </layout>
>+    <layout>
>+      <configItem>
>         <name>ca</name>
>         <_shortDescription>Can</_shortDescription>
>         <_description>Canada</_description>
>@@ -1004,6 +1011,12 @@
>       <variantList>
>         <variant>
>           <configItem>
>+            <name>fr</name>
>+            <_description>French</_description>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>             <name>fr-dvorak</name>
>             <_description>French Dvorak</_description>
>           </configItem>
>--- xkeyboard-config-0.6.orig/rules/base.ml_s.part
>+++ xkeyboard-config-0.6/rules/base.ml_s.part
>@@ -9,8 +9,8 @@
>  $pcmodels      intl   			=       us(%mcompose)
>   *		intl			=	us(pc104compose)
>   *		jp			=	pc(pc102)+jp(latin)+jp:2
>- $pcmodels      ca     			=       pc(%m)+ca(multi)+ca(multi-2gr):2+group(rctrl_switch)
>-  *             ca     			=       pc(pc105)+ca(multi)+ca(multi-2gr):2+group(rctrl_switch)
>+ $pcmodels    ca_enhanced     =   pc(%m)+ca(fr)+group(rctrl_switch)
>+ *         ca_enhanced     =   pc(pc105)+ca(fr)+group(rctrl_switch)
>  $pcmodels $nonlatin			=	pc(%m)+us+%l%(v):2
>  $pcmodels	*			=	pc(%m)+%l%(v)
>   *	   $nonlatin			=	pc(pc105)+us+%l%(v):2
>--- xkeyboard-config-0.6.orig/symbols/ca
>+++ xkeyboard-config-0.6/symbols/ca
>@@ -1,6 +1,15 @@
> // $XKeyboardConfig: xkbdesc/symbols/ca,v 1.10 2005/07/31 00:28:39 svu Exp $
> 
> default partial
>+xkb_symbols "default" {
>+    name[Group1] = "Canada - Multilingual";
>+
>+    include "ca(multi)"
>+    include "ca(multi-2gr):2"
>+    include "group(rctrl_switch)"
>+};
>+
>+partial
> xkb_symbols "fr" {
>     name[Group1] = "Canada";
>

Actions: View | Splinter Review

Attachments on bug 4411: 3358 | 5792 | 5868

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.