Attachment 98426 Details for Bug 77980 – Implementation

[patch] Implementation

0001-Implement-Aus-der-Neo-Welt-.-This-implementation-is-.patch (text/plain), 11.89 KB, created by Andreas Wettstein on 2014-05-04 18:16:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Wettstein

Created: 2014-05-04 18:16:46 UTC

Size: 11.89 KB

patch

obsolete

>From 8a169f9f62321d098b7b26633539c582593a0038 Mon Sep 17 00:00:00 2001
>From: Andreas Wettstein <wettstae@gmail.com>
>Date: Sat, 26 Apr 2014 20:15:20 +0200
>Subject: [PATCH] Implement "Aus der Neo-Welt".  This implementation is based
> on the existing Neo 2 layout, and only adjusts the letters, period and comma.
>
>Signed-off-by: Andreas Wettstein <wettstae@gmail.com>
>---
> rules/base.extras.xml.in      |  6 +++++
> rules/compat/base.l1v1_c.part |  1 +
> rules/compat/base.l2v2_c.part |  1 +
> rules/compat/base.l3v3_c.part |  1 +
> rules/compat/base.l4v4_c.part |  1 +
> rules/compat/base.lv_c.part   |  1 +
> symbols/de                    | 55 +++++++++++++++++++++++++++++++++++++++++++
> symbols/sun_vndr/de           | 10 ++++++++
> 8 files changed, 76 insertions(+)
>
>diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in
>index dd73393..cc9a2fb 100644
>--- a/rules/base.extras.xml.in
>+++ b/rules/base.extras.xml.in
>@@ -120,6 +120,12 @@
>             <_description>German (Sun Type 6/7)</_description>
>           </configItem>
>         </variant>
>+        <variant>
>+          <configItem>
>+            <name>AdNW</name>
>+            <_description>German (Aus der Neo-Welt)</_description>
>+          </configItem>
>+        </variant>
>       </variantList>
>     </layout>
>     <layout>
>diff --git a/rules/compat/base.l1v1_c.part b/rules/compat/base.l1v1_c.part
>index 9d274df..c963779 100644
>--- a/rules/compat/base.l1v1_c.part
>+++ b/rules/compat/base.l1v1_c.part
>@@ -1,2 +1,3 @@
>   de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
>+  de		AdNW			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
>   jp       $sun_compat =   complete+japan(kana_lock)
>diff --git a/rules/compat/base.l2v2_c.part b/rules/compat/base.l2v2_c.part
>index b7d6e30..f730618 100644
>--- a/rules/compat/base.l2v2_c.part
>+++ b/rules/compat/base.l2v2_c.part
>@@ -1,2 +1,3 @@
>   de		neo			=	+caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
>+  de		AdNW			=	+caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
>   jp       $sun_compat  =   +complete+japan(kana_lock):2
>diff --git a/rules/compat/base.l3v3_c.part b/rules/compat/base.l3v3_c.part
>index 360b4c4..b09ac4d 100644
>--- a/rules/compat/base.l3v3_c.part
>+++ b/rules/compat/base.l3v3_c.part
>@@ -1,2 +1,3 @@
>   de		neo			=	+caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
>+  de		AdNW			=	+caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
>   jp       $sun_compat  =   +complete+japan(kana_lock):3
>diff --git a/rules/compat/base.l4v4_c.part b/rules/compat/base.l4v4_c.part
>index 6633312..2e43666 100644
>--- a/rules/compat/base.l4v4_c.part
>+++ b/rules/compat/base.l4v4_c.part
>@@ -1,2 +1,3 @@
>   de		neo			=	+caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
>+  de		AdNW			=	+caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
>   jp       $sun_compat  =   +complete+japan(kana_lock):4
>diff --git a/rules/compat/base.lv_c.part b/rules/compat/base.lv_c.part
>index 927ff06..7b8b698 100644
>--- a/rules/compat/base.lv_c.part
>+++ b/rules/compat/base.lv_c.part
>@@ -1,2 +1,3 @@
>   de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
>+  de		AdNW			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
>   jp        $sun_compat =   complete+japan(kana_lock)
>diff --git a/symbols/de b/symbols/de
>index 150c081..ed0e96c 100644
>--- a/symbols/de
>+++ b/symbols/de
>@@ -462,6 +462,47 @@ xkb_symbols "neo_base" {
>     key <KPDL> { [ KP_Separator,            period,                  comma,                   minutes,                 KP_Delete,               KP_Delete,               seconds,                 NoSymbol                 ] };
> };
> 
>+partial alphanumeric_keys
>+xkb_symbols "AdNW_base" {
>+    include "de(neo_base)"
>+
>+    key.type[Group1] = "EIGHT_LEVEL";
>+    key <AD04> { [ period,                  enfilledcircbullet,      NoSymbol,                U03D1,                   NoSymbol,                NoSymbol,                U21A6,                   NoSymbol                 ] };
>+    key <AB04> { [ comma,                   endash,                  NoSymbol,                U03F1,                   NoSymbol,                NoSymbol,                U21D2,                   NoSymbol                 ] };
>+
>+    key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
>+    key <AD01> { [ k,                       K,                       NoSymbol,                Greek_kappa,             NoSymbol,                NoSymbol,                multiply,                NoSymbol                 ] };
>+    key <AD02> { [ u,                       U,                       NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol,                includedin,              NoSymbol                 ] };
>+    key <AD03> { [ udiaeresis,              Udiaeresis,              NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol,                union,                   NoSymbol                 ] };
>+    key <AD05> { [ adiaeresis,              Adiaeresis,              NoSymbol,                Greek_eta,               NoSymbol,                NoSymbol,                U2135,                   NoSymbol                 ] };
>+    key <AD06> { [ v,                       V,                       NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol,                radical,                 NoSymbol                 ] };
>+    key <AD07> { [ g,                       G,                       NoSymbol,                Greek_gamma,             NoSymbol,                NoSymbol,                Greek_GAMMA,             NoSymbol                 ] };
>+    key <AD08> { [ c,                       C,                       NoSymbol,                Greek_chi,               NoSymbol,                NoSymbol,                U2102,                   NoSymbol                 ] };
>+    key <AD09> { [ l,                       L,                       NoSymbol,                Greek_lambda,            NoSymbol,                NoSymbol,                Greek_LAMBDA,            NoSymbol                 ] };
>+    key <AD10> { [ j,                       J,                       NoSymbol,                Greek_theta,             NoSymbol,                NoSymbol,                Greek_THETA,             NoSymbol                 ] };
>+    key <AD11> { [ f,                       F,                       NoSymbol,                Greek_phi,               NoSymbol,                NoSymbol,                Greek_PHI,               NoSymbol                 ] };
>+    key <AC01> { [ h,                       H,                       NoSymbol,                Greek_psi,               NoSymbol,                NoSymbol,                Greek_PSI,               NoSymbol                 ] };
>+    key <AC02> { [ i,                       I,                       NoSymbol,                Greek_iota,              NoSymbol,                NoSymbol,                integral,                NoSymbol                 ] };
>+    key <AC03> { [ e,                       E,                       NoSymbol,                Greek_epsilon,           NoSymbol,                NoSymbol,                U2203,                   NoSymbol                 ] };
>+    key <AC04> { [ a,                       A,                       NoSymbol,                Greek_alpha,             NoSymbol,                NoSymbol,                U2200,                   NoSymbol                 ] };
>+    key <AC05> { [ o,                       O,                       NoSymbol,                Greek_omicron,           NoSymbol,                NoSymbol,                elementof,               NoSymbol                 ] };
>+    key <AC06> { [ d,                       D,                       NoSymbol,                Greek_delta,             NoSymbol,                NoSymbol,                Greek_DELTA,             NoSymbol                 ] };
>+    key <AC07> { [ t,                       T,                       NoSymbol,                Greek_tau,               NoSymbol,                NoSymbol,                partialderivative,       NoSymbol                 ] };
>+    key <AC08> { [ r,                       R,                       NoSymbol,                Greek_rho,               NoSymbol,                NoSymbol,                U211D,                   NoSymbol                 ] };
>+    key <AC09> { [ n,                       N,                       NoSymbol,                Greek_nu,                NoSymbol,                NoSymbol,                U2115,                   NoSymbol                 ] };
>+    key <AC10> { [ s,                       S,                       NoSymbol,                Greek_sigma,             NoSymbol,                NoSymbol,                Greek_SIGMA,             NoSymbol                 ] };
>+    key <AC11> { [ ssharp,                  U1E9E,                   NoSymbol,                Greek_finalsmallsigma,   NoSymbol,                NoSymbol,                jot,                     NoSymbol                 ] };
>+    key <AB01> { [ x,                       X,                       NoSymbol,                Greek_xi,                NoSymbol,                NoSymbol,                Greek_XI,                NoSymbol                 ] };
>+    key <AB02> { [ y,                       Y,                       NoSymbol,                Greek_upsilon,           NoSymbol,                NoSymbol,                nabla,                   NoSymbol                 ] };
>+    key <AB03> { [ odiaeresis,              odiaeresis,              NoSymbol,                U03F5,                   NoSymbol,                NoSymbol,                intersection,            NoSymbol                 ] };
>+    key <AB05> { [ q,                       Q,                       NoSymbol,                U03D5,                   NoSymbol,                NoSymbol,                U211A,                   NoSymbol                 ] };
>+    key <AB06> { [ b,                       B,                       NoSymbol,                Greek_beta,              NoSymbol,                NoSymbol,                U21D0,                   NoSymbol                 ] };
>+    key <AB07> { [ p,                       P,                       NoSymbol,                Greek_pi,                NoSymbol,                NoSymbol,                Greek_PI,                NoSymbol                 ] };
>+    key <AB08> { [ w,                       W,                       NoSymbol,                Greek_omega,             NoSymbol,                NoSymbol,                Greek_OMEGA,             NoSymbol                 ] };
>+    key <AB09> { [ m,                       M,                       NoSymbol,                Greek_mu,                NoSymbol,                NoSymbol,                ifonlyif,                NoSymbol                 ] };
>+    key <AB10> { [ z,                       Z,                       NoSymbol,                Greek_zeta,              NoSymbol,                NoSymbol,                U2124,                   NoSymbol                 ] };
>+};
>+
> partial alphanumeric_keys modifier_keys keypad_keys
> xkb_symbols "neo" {
> 
>@@ -476,6 +517,20 @@ xkb_symbols "neo" {
>     include "level5(ralt_switch)"
> };
> 
>+partial alphanumeric_keys modifier_keys keypad_keys
>+xkb_symbols "AdNW" {
>+
>+    include "de(AdNW_base)"
>+
>+    name[Group1]= "German (Aus der Neo-Welt)";
>+
>+    include "shift(both_capslock)"
>+    include "level3(caps_switch)"
>+    include "level3(bksl_switch)"
>+    include "level5(lsgt_switch)"
>+    include "level5(ralt_switch)"
>+};
>+
> // Copied from macintosh_vndr/de
> // olh@suse.de   very close to MacOS map
> 
>diff --git a/symbols/sun_vndr/de b/symbols/sun_vndr/de
>index 7736088..ac10c72 100644
>--- a/symbols/sun_vndr/de
>+++ b/symbols/sun_vndr/de
>@@ -121,6 +121,16 @@ partial alphanumeric_keys
> };
> 
> partial alphanumeric_keys
>+	xkb_symbols "AdNW" {
>+	include "de(AdNW)"
>+};
>+
>+partial alphanumeric_keys
>+	xkb_symbols "AdNW_base" {
>+	include "de(AdNW_base)"
>+};
>+
>+partial alphanumeric_keys
> 	xkb_symbols "neo" {
> 	include "de(neo)"
> };
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 77980: 98055 | 98426

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.