Attachment 124587 Details for Bug 96578 – diff -u cm-new cm: Update to cm(mmuock)

[patch] diff -u cm-new cm: Update to cm(mmuock)

cm-diff (text/plain), 11.53 KB, created by Tano Fotang on 2016-06-18 13:31:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tano Fotang

Created: 2016-06-18 13:31:56 UTC

Size: 11.53 KB

patch

obsolete

>--- cm-new	2016-06-18 14:12:16.881553708 +0100
>+++ cm	2016-06-18 14:12:24.513612724 +0100
>@@ -1,13 +1,4 @@
> // ========== Cameroon Keyboards ==========
>-
>-
>-// ----------------------------------------------------------------------------
>-// This comment was added by <fotang at mmuock dot org>, on 18-Jun-2016:
>-//  
>-// All comments below this one, were in the original cm file;they do not
>-// apply to the Mmuock keyboard which is defined towards the end of this file.
>-// ----------------------------------------------------------------------------
>-
> // ****** For Instructions, see "Use of Cameroon Keyboards" section	below ******
> 
> 
>@@ -333,8 +324,9 @@
> modifier_map Mod5	{ ISO_Level3_Latch };
> };
> 
>+// EXTRAS:
> 
>-// ------- begin Mmuock alphabet layout ------------------------------------------
>+// ------- begin Mmuock keyboard map ------------------------------------------
> //   This layout is used for the Mmuock alphabet as described in the book
> //   _The Sound of Mmuock: Orthography (2. ed.)_ [isbn: 978-9956-645-28-1].
> //   Mmuock is the language of the Mmuock (local: MuÃ²k) people of Western
>@@ -342,7 +334,7 @@
> // 
> //      Author: Tano Fotang <fotang at mmuock dot org>
> //     Created: 2014-06-24
>-//     Version: 1.2
>+//     Version: 1.1
> //
> // CHANGES v 1.0:
> //	2014-07-06 corrected shifted level3 of <AC11> to quotedbl
>@@ -356,23 +348,11 @@
> //               keep the original latin mappings except for those few that we
> //               want to overwrite for our own keyboard.
> //
>-// CHANGES v 1.2:
>-// 2016-06-17  1- added dead keys dead_macron, dead_acute, and dead_grave for
>-//                tones 1, 3, and 4, for compatibility with the Keyman version.
>-//             2- rearranged combining diacritics for tones 0 to 5 such that
>-//                the diacritics are on consequetive keys (AC01 to AC05).
>-//             3- moved tone 8 to level 3 of AE12.
>-//             4- moved layout definition out of the EXTRAS section.
>-//             5- for a cleaner keyboard,
>-//                replaced tÌ£he included latin layout with us(basic).
>-//
>-//
> // NOTES:
>-// 0. This map is based on the Latin alphabet layout for the US keyboard.
>+// 0. This map is based on the Latin layout for the US keyboard.
> //
> // 1. We use combining diacritical marks to create tone markings. There are 13
>-//    tones that need to be indicated, although the first 5 are usually enough
>-//    to represent the rest in simplified orthography.
>+//    tones that need to be indicated.
> //
> // 2. When composing Mmuock text, about every fourth symbol is for tone. To
> //    facilitate easy and fast input, the combining diacritics are placed on
>@@ -383,18 +363,18 @@
> // 3. Symbols that are used infrequently (`r', `h', `É', `Ç', etc.) are placed
> //    in level3. Additionally, the letter eng (`Å'), although commonly used, 
> //    is found in level3 because it can alternatively be represented by <ng>.
>-//    (Indeed, the keyman version of keyboard actually replaces <ng> with `Å'.)
>+//    (Indeed, the keyman keyboard actually replaces <ng> with `Å'.)
> //
> // 4. The unshifted AB10 key (normally assigned to the slash `/') is used as
> //    level 3 switch since the slash is not used in the ordinary course of
> //    typing Mmuock text. 
> //
>-// 5. The 'Cameroon Multilingual' keyboards that are defined elsewhere, do not
>-//    fit our needs because: (a) they are based on a different alphabet, (b) the
>-//    vast majority of their symbols are not used in Mmuock, and (c) for the few
>-//    symbols that are used in Mmuock, their placings are not egonomic for 
>-//    typing Mmuock as the _PRIMARY_ language. The aim of this keyboard, is
>-//    to give priority to symbols that are actually used in the Mmuock alphabet.
>+// 5. The 'Cameroon Multilingual' keyboard that is defined elsewhere, does not
>+//    fit our needs because: (a) it is based on a different alphabet, (b) the
>+//    vast majority of its symbols are not used in Mmuock, and (c) for the few
>+//    symbols that are shared, the placing of the symbols is not egonomic for 
>+//    typing Mmuock as the _PRIMARY_ language. The aim of this keyboard, is to
>+//    give priority to symbols that are actually used in the Mmuock alphabet.
> //
> // 6. The following fonts have been found to produce the best results with this
> //    keyboard:
>@@ -404,7 +384,7 @@
> //      Ubuntu (except light)            8/10
> //      Droid (except sans mono)         7/10
> //      Gentium, Gentium Alt           6.5/10
>-//    In the terminal emulator, the following font variants have been tested:
>+//    In the terminal emulator, the following font variants are most suitable:
> //      Ubuntu Mono                      9/10
> //      Unifont (Medium)                 9/10
> //      DejaVu Sans Mono               7.5/10
>@@ -412,21 +392,19 @@
> //   These fonts are all freely available.
> // 
> // ------the layout-----------
>-//
>-//   âââââââ
>-//   â 2 4 â   2 = Shift,  4 = Level3 + Shift
>-//   â 1 3 â   1 = Normal, 3 = Level3
>-//   âââââââ
>+// Note: this drawing does not show the symbols that are mapped by the included
>+// latin sybols files. Shown are only the symbols that are requiired by the
>+// Mmuock keyboard.
> //
> //   âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ²ââââââââââ
>-//   â ~ ~ â !   â @   â #   â $   â %   â ^   â &   | *   â (   â )   â _ â â +   Ì£â â« Back- â
>-// AEâ ` ` â 1   â 2   â 3   â 4   â 5   â 6  Â Ìâ 7  Â Ìâ 8  Â Ìâ 9  Â Ìâ 0  Â Ìâ Â¯ - â =   Ìâ  space  â
>+//   â ~   â !   â @   â #   â $   â %   â ^   â &   | *   â (   â )   â _   â +   â â« Back- â
>+// AEâ `   â 1   â 2   â 3   â 4   â 5   â 6  Â Ìâ 7  Â Ìâ 8  Â Ìâ 9  Â Ìâ 0  Â Ìâ -   â =   â  space  â
> //   â¢ââââââ·ââ±ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââºââ³ââââââââ«
> //   â       â Q   â W   â E Æ â Å  R â T   â Y   â U Î© â I Æ â O Î¦ â P â â Ã { â Î£ } â Enter â
> // ADâTab â¹  â q   â w   â e Ç â Å¡ r â t   â y   â u Ï â i É â o Ï â p Ï â Ã¸ [ â Ï ] â   â   â
> //   â£ââââââââ»â±âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââºâ      â
> //   â        â A   â S   â D   â F   â G   â Â Ì H â J   â K   â L   â Å : â " â â Ã | â      â
>-// ACâCaps â¬  â a  Â Ìâ s  Â Ì| d   Ì| f  Â Ì| g  Â Ì| Â Ì£ h â j  Â Ìâ k  Â Ìâ l  Â Ìâ Å ; â ' â â Ã¦ \ â      â
>+// ACâCaps â¬  â a   â s  Â Ì| d  Â Ì| f  Â Ì| g  Â Ì| Â Ì£ h â j  Â Ìâ k  Â Ìâ l  Â Ìâ Å ; â ' â â Ã¦ \ â      â
> //   â£âââââââââ¹âââââ¬â´âââââ¬â´âââââ¬â´âââââ¬â´âââââ¬â´âââââ¬â´âââââ¬â´âââââ¬â´âââââ¬â´âââââ¬â´âââââ²â·ââââââ»âââââââ«
> //   â             â Z Ç² â X   â C   â V   â B   â N Å â M   â < Â« â > Â» â ?   â             â
> // ABâShift â§      â z Ç³ â x   â c   â v   â b   â n Å â m   â , â¹ â . âº â   / âShift â§      â
>@@ -439,17 +417,15 @@
> partial alphanumeric_keys
> xkb_symbols "mmuock" {
> 
>-   include "us(basic)"
>+   include "latin"
>    include "level3(ralt_switch)"
> 
>    name[Group1]= "Mmuock";
>    key <AE06> { [          6, asciicircum,          U0302                ] }; // tone 10
>    key <AE07> { [          7,   ampersand,          U0311                ] }; // tone 12
>-   key <AE08> { [          8,    asterisk,          U030D                ] }; // tone 13
>-   key <AE09> { [          9,   parenleft,          U0307                ] }; // tone 7
>-   key <AE10> { [          0,  parenright,          U030A                ] }; // tone 6
>-   key <AE11> { [dead_macron,  underscore,          minus,        endash ] };
>-   key <AE12> { [      equal,        plus,          U030B, dead_belowdot ] }; // U030B = tone 8
>+   key <AE08> { [          8,    asterisk,          U030D,     trademark ] }; // tone 13
>+   key <AE09> { [          9,   parenleft,          U0313,     plusminus ] }; // tone 14
>+   key <AE10> { [          0,  parenright,          U030A,        degree ] }; // tone 6
>    key <AD03> { [          e,           E,          U01DD,         U018E ] }; // U01DD = reversed E
>    key <AD04> { [     scaron,      Scaron,              r,             R ] };
>    key <AD07> { [          u,           U,    Greek_omega,   Greek_OMEGA ] };
>@@ -458,18 +434,17 @@
>    key <AD10> { [          p,           P,       Greek_pi,      Greek_PI ] };
>    key <AD11> { [     oslash,    Ooblique,    bracketleft,     braceleft ] };
>    key <AD12> { [Greek_sigma, Greek_SIGMA,   bracketright,    braceright ] }; 
>-   key <AC01> { [          a,           A,          U0303                ] }; // tone 0
>-   key <AC02> { [          s,           S,          U0304                ] }; // tone 1
>-   key <AC03> { [          d,           D,          U0301                ] }; // tone 3
>-   key <AC04> { [          f,           F,          U0300                ] }; // tone 4
>-   key <AC05> { [          g,           G,          U030C                ] }; // tone 5
>+   key <AC02> { [          s,           S,          U0303                ] }; // tone 1
>+   key <AC03> { [          d,           D,          U0300                ] }; // tone 4
>+   key <AC04> { [          f,           F,          U030C                ] }; // tone 5
>+   key <AC05> { [          g,           G,          U0308                ] }; // tone 7
>    key <AC06> { [      U0323,       U0307,              h,             H ] }; // COMBINING DOT BELOW, ABOVE
>    key <AC07> { [          j,           J,          U0306                ] }; // tone 9
>    key <AC08> { [          k,           K,          U030F                ] }; // tone 11
>-   key <AC09> { [          l,           L,          U0308                ] }; // tone 14
>+   key <AC09> { [          l,           L,          U0304                ] }; // tone 0
>    key <AC10> { [         oe,          OE,      semicolon,         colon ] };
>-   key <AC11> { [ dead_acute,    quotedbl,     apostrophe                ] };
>-   key <TLDE> { [ dead_grave,  dead_tilde,          grave,    asciitilde ] };
>+   key <AC11> { [      U0301,       U030B,     apostrophe,      quotedbl ] }; // tone 3, 8
>+   key <TLDE> { [      grave,  dead_tilde                                ] };
>    key <AB01> { [          z,           Z,          U01F3,         U01F2 ] }; // U01F3 = letter dz
>    key <AB06> { [          n,           N,            eng,           ENG ] };
>    key <AB08> { [      comma,        less,  guillemotleft,         U2039 ] };
>@@ -482,9 +457,9 @@
> partial modifier_keys
> xkb_symbols "solidus_switch" {
>    key <AB10> {
>-     symbols[Group1] = [ ISO_Level3_Latch, question, slash, dead_abovedot ]
>+     symbols[Group1] = [ ISO_Level3_Latch, question, slash, NoSymbol ]
>    };
>    modifier_map Mod5	{ ISO_Level3_Latch };
> };
>-// ------- end of Mmuock keyboard map --------------------------------------------
>+// ------- end Mmuock keyboard map --------------------------------------------
>

Actions: View | Splinter Review

Attachments on bug 96578: 124587 | 124588

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.