symbols/fr: tweak comments by not using combining accents when not needed

Also correct the description of how to type the dead tilde,
and trim some pointless ASCII art.

1 files changed, 20 insertions, 21 deletions

diff --git a/symbols/fr b/symbols/fr
index bbc6a644..5432d1d9 100644
--- a/symbols/fr
+++ b/symbols/fr
@@ -121,7 +121,7 @@ xkb_symbols "oss" {
 
     // First row
     key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,          dead_cedilla ] }; // ² ³ ¹ ¸
-    key <AE01>	{ [        ampersand,                1,           dead_caron,           dead_ogonek ] }; // & 1 ˇ  ̨
+    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)
@@ -145,7 +145,7 @@ xkb_symbols "oss" {
     key <AD08>	{ [                i,                I,          icircumflex,           Icircumflex ] }; // i I î Î
     key <AD09>	{ [                o,                O,                   oe,                    OE ] }; // o O œ Œ
     key <AD10>	{ [                p,                P,          ocircumflex,           Ocircumflex ] }; // p P ô Ô
-    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,           dead_tilde,        dead_abovering ] }; // ^  ̈  ̃ ˚
+    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,           dead_tilde,        dead_abovering ] }; // ^ ¨ ˜ ˚
     key <AD12>	{ [           dollar,         sterling,               oslash,                Oslash ] }; // $ £ ø Ø
 
     // Third row
@@ -159,8 +159,8 @@ xkb_symbols "oss" {
     key <AC08>	{ [                k,                K,           idiaeresis,            Idiaeresis ] }; // k K ï Ï
     key <AC09>	{ [                l,                L,            0x1000140,             0x100013F ] }; // 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 ] }; // * µ `  ̄
+    key <AC11>	{ [           ugrave,          percent,           dead_acute,                Ugrave ] }; // ù % ´ Ù
+    key <BKSL>	{ [         asterisk,               mu,           dead_grave,           dead_macron ] }; // * µ ` ¯
 
     // Fourth row
     key <LSGT>  { [             less,          greater,        lessthanequal,      greaterthanequal ] }; // < > ≤ ≥
@@ -188,7 +188,7 @@ xkb_symbols "oss_latin9" {
 
     // First row
     key <AE01>	{ [        ampersand,                1,           dead_caron,          dead_cedilla ] }; // & 1 ˇ ¸
-    key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_tilde ] }; // " 3 # ~
+    key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_tilde ] }; // " 3 # ˜
     key <AE04>	{ [       apostrophe,                4,            braceleft,            underscore ] }; // ' 4 { _
     key <AE05>	{ [        parenleft,                5,          bracketleft,                 minus ] }; // ( 5 [ -
     key <AE06>	{ [            minus,                6,                  bar,                 minus ] }; // - 6 | -
@@ -225,12 +225,12 @@ xkb_symbols "oss_nodeadkeys" {
     name[Group1]="French (alt., no dead keys)";
 
     key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,               cedilla ] }; // ² ³ ¹ ¸
-    key <AE01>	{ [        ampersand,                1,                caron,                ogonek ] }; // & 1 ˇ ̨
+    key <AE01>	{ [        ampersand,                1,                caron,                ogonek ] }; // & 1 ˇ ˛
     key <AE03>	{ [         quotedbl,                3,           numbersign,                 breve ] }; // " 3 # ˘
 
-    key <AD11>	{ [      asciicircum,        diaeresis,           asciitilde,                 Aring ] }; // ^ ̈ ̃ Å
+    key <AD11>	{ [      asciicircum,        diaeresis,           asciitilde,                 Aring ] }; // ^ ¨ ~ Å
     key <AC11>	{ [           ugrave,          percent,                acute,                Ugrave ] }; // ù % ' Ù
-    key <BKSL>	{ [         asterisk,               mu,                grave,                macron ] }; // * µ ` ̄
+    key <BKSL>	{ [         asterisk,               mu,                grave,                macron ] }; // * µ ` ¯
 };
 
 
@@ -260,10 +260,10 @@ xkb_symbols "oss_nodeadkeys" {
 // Les accents circonflexes des principales voyelles sont obtenus avec
 // la touche Alt_Gr, les trémas sont obtenus par Alt_Gr + Shift.
 //
-//  ____                                     _________ _____________ _______
-// | S A| S = Shift,  A = AltGr + Shift     | Imprime | Arrêt défil | Pause |
-// | s a| s = normal, a = AltGr             |  Exec   |             | Halte |
-//  ¯¯¯¯                                     ¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯
+//  ____
+// | S A| S = Shift,  A = AltGr + Shift
+// | s a| s = normal, a = AltGr
+//  ¯¯¯¯
 //  ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ _______
 // | œ "| 1 ·| 2 É| 3 ,| 4 '| 5 "| 6 || 7 È| 8 ¯| 9 Ç| 0 À| ° ÿ| + °| <--   |
 // | Œ "| & '| é ~| " #| ' {| ( [| - || è `| _ \| ç ^| à @| ) ]| = }|       |
@@ -281,14 +281,13 @@ xkb_symbols "oss_nodeadkeys" {
 // | Ctrl | Super| Alt  | Space    Nobreakspace | AltGr | Super|Menu | Ctrl |
 //  ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯ ¯¯¯¯¯¯
 //
-//
 //		Si les touches mortes fonctionnent, utiliser les accents dits
 //		« morts », i.e. fonctionnant comme l'accent circonflexe & le
 //		tréma des machines à écrire ; sont disponibles :
 //
 // (^) : accent circonflexe,
 // Shift+(^) : tréma,
-// Shift+AltGr+(^) : tilde,
+// AltGr+(^) : tilde,
 // AltGr+(1) : accent aigu,
 // AltGr+(7) : accent grave
 //
@@ -444,20 +443,20 @@ xkb_symbols "bepo" {
     key <AD09> { [               l,            L,    dead_stroke                 ] }; // l L /
     key <AD10> { [               j,            J,          U0133,          U0132 ] }; // j J ij IJ
     key <AD11> { [               z,            Z,          schwa,          SCHWA ] }; // z Z ə Ə
-    key <AD12> { [               w,            W,     dead_breve                 ] }; // w W ̆
+    key <AD12> { [               w,            W,     dead_breve                 ] }; // w W ˘
 
     // Third row
     key <AC01> { [               a,            A,             ae,             AE ] }; // a A æ Æ
     key <AC02> { [               u,            U,         ugrave,         Ugrave ] }; // u U ù Ù
-    key <AC03> { [               i,            I, dead_diaeresis,  dead_abovedot ] }; // i I  ̈ ˙
+    key <AC03> { [               i,            I, dead_diaeresis,  dead_abovedot ] }; // i I ¨ ˙
     key <AC04> { [               e,            E,       EuroSign,  dead_currency ] }; // e E € ¤
     key <AC05> { [           comma,    semicolon, rightsinglequotemark, dead_horn] }; // , ; ’  ̛
     key <AC06> { [               c,            C,      copyright,          U017F ] }; // c C © ſ
     key <AC07> { [               t,            T,          thorn,          THORN ] }; // t T þ Þ
     key <AC08> { [               s,            S,         ssharp,          U1E9E ] }; // s S ß ẞ
     key <AC09> { [               r,            R,     registered,      trademark ] }; // r R ® ™
-    key <AC10> { [               n,            N,     dead_tilde                 ] }; // n N ~
-    key <AC11> { [               m,            M,    dead_macron,      masculine ] }; // m M  ̄ º
+    key <AC10> { [               n,            N,     dead_tilde                 ] }; // n N ˜
+    key <AC11> { [               m,            M,    dead_macron,      masculine ] }; // m M ¯ º
     key <BKSL> { [        ccedilla,     Ccedilla,   dead_cedilla, dead_belowcomma ]}; // ç Ç ¸ ,
 
     // Fourth row
@@ -471,7 +470,7 @@ xkb_symbols "bepo" {
     key <AB07> { [               q,            Q, dead_abovering,  dead_belowdot ] }; // q Q ˚  ̣
     key <AB08> { [               g,            G,     dead_greek                 ] }; // g G µ
     key <AB09> { [               h,            H,         dagger,   doubledagger ] }; // h H † ‡
-    key <AB10> { [               f,            F,    dead_ogonek,    ordfeminine ] }; // f F  ̨ ª
+    key <AB10> { [               f,            F,    dead_ogonek,    ordfeminine ] }; // f F ˛ ª
 
     key <SPCE> { [           space, nobreakspace,     underscore,          U202F ] }; // ␣ (espace insécable) _ (espace insécable fin)
 };
@@ -503,12 +502,12 @@ xkb_symbols "bepo_latin9" {
     key <AD11> { [               z,            Z                                 ] }; // z Z
     key <AD12> { [               w,            W                                 ] }; // w W
 
-    key <AC03> { [               i,            I, dead_diaeresis                 ] }; // i I ̈
+    key <AC03> { [               i,            I, dead_diaeresis                 ] }; // i I ¨
     key <AC05> { [           comma,    semicolon,          comma,      dead_horn ] }; // , ; ,  ̛
     key <AC06> { [               c,            C,      copyright                 ] }; // c C ©
     key <AC08> { [               s,            S,         ssharp,          U1E9E ] }; // s S ß ẞ
     key <AC09> { [               r,            R,     registered                 ] }; // r R ®
-    key <AC11> { [               m,            M,         macron,      masculine ] }; // m M ̄ º
+    key <AC11> { [               m,            M,         macron,      masculine ] }; // m M ¯ º
 
     key <AB02> { [               y,            Y,      braceleft                 ] }; // y Y {
     key <AB03> { [               x,            X,     braceright                 ] }; // x X }