symbols/fr: Describe for Occitan only the keys that differ from oss layout.

Also align some of them properly.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

diff --git a/symbols/fr b/symbols/fr
index 590bc5ae8d1ef7d86fec2ce69d874a4ebf7ee826..6bdedb6071cf6c8ba1b67fda2b4226c0345de9ba 100644 (file)
--- a/symbols/fr
+++ b/symbols/fr
@@ -818,26 +818,8 @@ xkb_symbols "oci" {
 
     name[Group1]= "Occitan";
 
-    // First row
-    key <TLDE> { [      twosuperior,    threesuperior,          onesuperior,          dead_cedilla ] }; // ² ³ ¹ ¸ 
-    key <AE01> { [        ampersand,                1,           dead_caron,           dead_ogonek ] }; // & 1 ˇ ̨
-    key <AE02> { [           eacute,                2,           asciitilde,                Eacute ] }; // é 2 ~ É
-    key <AE03> { [         quotedbl,                3,           numbersign,            dead_breve ] }; // " 3 # ˘
-    key <AE04> { [       apostrophe,                4,            braceleft,             0x1002014 ] }; // ' 4 { — (tiret cadratin)
-    key <AE05> { [        parenleft,                5,          bracketleft,             0x1002013 ] }; // ( 5 [ – (tiret demi-cadratin)
-    key <AE06> { [            minus,                6,                  bar,             0x1002011 ] }; // - 6 | ‑ (tiret insécable)
-    key <AE07> { [           egrave,                7,                grave,                Egrave ] }; // è 7 ` È
-    key <AE08> { [       underscore,                8,            backslash,             trademark ] }; // _ 8 \ ™
-    key <AE09> { [         ccedilla,                9,          asciicircum,              Ccedilla ] }; // ç 9 ^ Ç
-    key <AE10> { [           agrave,                0,                   at,                Agrave ] }; // à 0 @ À
-    key <AE11> { [       parenright,           degree,         bracketright,              notequal ] }; // ) ° ] ≠ 
-    key <AE12> { [            equal,             plus,           braceright,             plusminus ] }; // = + } ±
-
-    // Second row
     key <AD01> { [                a,                A,               aacute,                Aacute ] }; // a A á Á
     key <AD02> { [                z,                Z,                   ae,                    AE ] }; // z Z æ Æ
-    key <AD03> { [                e,                E,             EuroSign,                  cent ] }; // e E € ¢
-    key <AD04> { [                r,                R,          ecircumflex,           Ecircumflex ] }; // r R ê Ê
     key <AD05> { [                t,                T,           ediaeresis,            Ediaeresis ] }; // t T ë Ë
     key <AD06> { [                y,                Y,          ucircumflex,           Ucircumflex ] }; // y Y û Û
     key <AD07> { [                u,                U,               uacute,                Uacute ] }; // u U ú Ú
@@ -845,34 +827,15 @@ xkb_symbols "oci" {
     key <AD09> { [                o,                O,               oacute,                Oacute ] }; // o O ó Ó
     key <AD10> { [                p,                P,               ograve,                Ograve ] }; // p P ò Ò
     key <AD11> { [  dead_circumflex,   dead_diaeresis,                   oe,                    OE ] }; // ^ ̈ ̃ œ Œ
-    key <AD12> { [           dollar,         sterling,               oslash,              Ooblique ] }; // $ £ ø Ø
 
-    // Third row
-    key <AC01> { [                q,                Q,           adiaeresis,            Adiaeresis ] }; // q Q ä Ä
-    key <AC02> { [                s,                S,               ssharp,    doublelowquotemark ] }; // s S ß „ 
-    key <AC03> { [                d,                D,           acircumflex,          Acircumflex ] }; // d D â Â
-    key <AC04> { [                f,                F,  leftsinglequotemark,    singlelowquotemark ] }; // f F ‘ ‚
-    key <AC05> { [                g,                G, rightsinglequotemark,                   yen ] }; // g G ’ ¥
+    key <AC03> { [                d,                D,          acircumflex,           Acircumflex ] }; // d D â Â
     key <AC06> { [                h,                H,           udiaeresis,            Udiaeresis ] }; // h H ü Ü
-    key <AC07> { [                j,                J,          icircumflex,            Icircumflex] }; // j J î Î
-    key <AC08> { [                k,                K,           idiaeresis,             Idiaeresis] }; // k K ï Ï
+    key <AC07> { [                j,                J,          icircumflex,           Icircumflex ] }; // j J î Î
+    key <AC08> { [                k,                K,           idiaeresis,            Idiaeresis ] }; // k K ï Ï
     key <AC09> { [                l,                L,          ocircumflex,           Ocircumflex ] }; // l L ô Ô
-    key <AC10> { [                m,                M,           odiaeresis,            Odiaeresis ] }; // m M ö Ö
-    key <AC11> { [           ugrave,          percent,           dead_acute,                Ugrave ] }; // ù % ' Ù
-    key <BKSL> { [         asterisk,               mu,           dead_grave,           dead_macron ] }; // * µ ` ̄
 
-    // Fourth row
-    key <LSGT>  { [             less,          greater,        lessthanequal,      greaterthanequal ] }; // < > ≤ ≥
-    key <AB01>  { [                w,                W,        guillemotleft,   leftdoublequotemark ] }; // w W « “
-    key <AB02>  { [                x,                X,       guillemotright,  rightdoublequotemark ] }; // x X » ”
-    key <AB03>  { [                c,                C,            copyright,            registered ] }; // c C © ®
-    key <AB04>  { [                v,                V,            rightarrow,            leftarrow ] }; // v V → ← 
-    key <AB05>  { [                b,                B,            downarrow,               uparrow ] }; // b B ↓ ↑
-    key <AB06>  { [                n,                N,              ntilde,                 Ntilde ] }; // n N ñ Ñ
-    key <AB07>  { [            comma,         question,         questiondown,             0x1002026 ] }; // , ? ¿ …
-    key <AB08>  { [        semicolon,           period,             multiply,             0x10022C5 ] }; // ; . × ⋅
-    key <AB09>  { [            colon,            slash,             division,             0x1002215 ] }; // : / ÷ ∕
-    key <AB10>  { [           exclam,          section,           exclamdown,             0x1002212 ] }; // ! § ¡ −
+    key <AB04>  { [                v,                V,           rightarrow,             leftarrow ] }; // v V → ←
+    key <AB06>  { [                n,                N,               ntilde,                Ntilde ] }; // n N ñ Ñ
 };
 
 // Marc.Shapiro@inria.fr 19-sep-1998