Attachment 16199 Details for Bug 15727 – Unified diff for symbols/us and rules/base.xml.in; apply with `patch -p0 < us-dvp.diff`

[patch] Unified diff for symbols/us and rules/base.xml.in; apply with `patch -p0 < us-dvp.diff`

us-dvp.diff (text/plain), 5.97 KB, created by Roland Kaufmann on 2008-04-26 12:08:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Kaufmann

Created: 2008-04-26 12:08:41 UTC

Size: 5.97 KB

patch

obsolete

>diff -U 8 -r xkeyboard-config/rules/base.xml.in xkeyboard-config.us-dvp/rules/base.xml.in
>--- xkeyboard-config/rules/base.xml.in	2008-04-26 20:32:53.000000000 +0200
>+++ xkeyboard-config.us-dvp/rules/base.xml.in	2008-04-26 21:00:14.000000000 +0200
>@@ -1160,16 +1160,22 @@
>         <variant>
>           <configItem>
>             <name>dvorak-classic</name>
>             <_description>Classic Dvorak</_description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>+            <name>dvp</name>
>+            <_description>Programmer Dvorak</_description>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>             <name>rus</name>
>             <_description>Russian phonetic</_description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>             <name>mac</name>
>             <_description>Macintosh</_description>
>diff -U 8 -r xkeyboard-config/symbols/us xkeyboard-config.us-dvp/symbols/us
>--- xkeyboard-config/symbols/us	2008-01-25 00:21:07.000000000 +0100
>+++ xkeyboard-config.us-dvp/symbols/us	2008-04-26 21:00:19.000000000 +0200
>@@ -489,16 +489,78 @@
>     key <AB06> { [	    b,	B		]	};
>     key <AB07> { [	    m,	M		]	};
>     key <AB08> { [	    w,	W		]	};
>     key <AB09> { [	    v,	V		]	};
>     key <AB10> { [	    z,	Z		]	};
>     key <BKSL> { [  backslash,  bar             ]       };
> };
> 
>+// Programmer Dvorak, by Roland Kaufmann <rlndkfmn at gmail dot com>
>+// License: BSD, available at <http://www.kaufmann.no/roland/dvorak/license.html>
>+// Main features: Numbers are in shift position (like French), symbols have been
>+// placed in locations that give good hand-alternation and finger rolling with
>+// symbols that usually follows, accented characters are possible for I18N.
>+partial alphanumeric_keys
>+xkb_symbols "dvp" {
>+    include "us(dvorak)"
>+
>+    name[Group1] = "USA - Programmer Dvorak";
>+
>+    //             Unmodified       Shift           AltGr            Shift+AltGr
>+    // symbols row, left side
>+    key <TLDE> { [ dollar,          asciitilde,     dead_tilde                  ] };
>+    key <AE01> { [ ampersand,       percent                                     ] };
>+    key <AE02> { [ bracketleft,     7,              currency                    ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
>+    key <AE03> { [ braceleft,       5,              cent                        ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
>+    key <AE04> { [ braceright,      3,              yen                         ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
>+    key <AE05> { [ parenleft,       1,              EuroSign                    ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
>+    key <AE06> { [ equal,           9,              sterling                    ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
>+
>+    // symbols row, right side
>+    key <AE07> { [ asterisk,        0                                           ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
>+    key <AE08> { [ parenright,      2,              onehalf                     ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
>+    key <AE09> { [ plus,            4                                           ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
>+    key <AE10> { [ bracketright,    6                                           ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
>+    key <AE11> { [ exclam,          8,              exclamdown                  ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
>+    key <AE12> { [ numbersign,      grave,          dead_grave                  ] };
>+    key <BKSP> { [ BackSpace                                                    ] };
>+
>+    // upper row, left side
>+    key <AD01> { [ semicolon,       colon,          dead_diaeresis              ] };
>+    key <AD02> { [ comma,           less,           guillemotleft               ] };
>+    key <AD03> { [ period,          greater,        guillemotright              ] };
>+    key <AD04> { [ p,               P,              paragraph,       section    ] };
>+    key <AD05> { [ y,               Y,              udiaeresis,      Udiaeresis ] };
>+
>+    // upper row, right side
>+    key <AD08> { [ c,               C,              ccedilla,        Ccedilla   ] };
>+    key <AD09> { [ r,               R,              registered,      trademark  ] };
>+    key <AD11> { [ slash,           question,       questiondown                ] };
>+    key <AD12> { [ at,              asciicircum,    dead_circumflex, dead_caron ] };
>+
>+    // home row, left side
>+    key <AC01> { [ a,               A,              aring,           Aring      ] };
>+    key <AC02> { [ o,               O,              oslash,          Ooblique   ] };
>+    key <AC03> { [ e,               E,              ae,              AE         ] };
>+    key <AC04> { [ u,               U,              eacute,          Eacute     ] };
>+
>+    // home row, right side
>+    key <AC06> { [ d,               D,              eth,             ETH        ] };
>+    key <AC07> { [ h,               H,              dead_acute                  ] };
>+    key <AC08> { [ t,               T,              thorn,           THORN      ] };
>+    key <AC09> { [ n,               N,              ntilde,          Ntilde     ] };
>+    key <AC10> { [ s,               S,              ssharp                      ] };
>+    key <AC11> { [ minus,           underscore,     hyphen                      ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
>+    key <BKSL> { [ backslash,       bar                                         ] };
>+
>+    // lower row, left side
>+    key <AB01> { [ apostrophe,      quotedbl,       dead_acute                  ] };
>+};
>+
> // phonetic layout for Russian letters on an US keyboard
> // by Ivan Popov <pin@konvalo.org> 2005-07-17
> 
> // level3 modifier is a shortcut to the "us" meaning of the keys where
> // we place cyrillic letters, handy for accessing the corresponding
> // punctuation marks.
> // It is important to have access to punctuation marks, and the rest of
> // alphabetical keys are added for being consequent so that the users

Actions: View | Splinter Review

Attachments on bug 15727: 16199

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.