symbols/fr: fill in some more missing symbols in the Mac layout

Seventeen years ago, commit abb0ca5beb copied the Mac layouts from
the vendor folder to the main symbols files.  But just four months
later, commit a1d5b68925 improved the vendor's French Mac layout,
but forgot to do the same for its copy.

Also, a further improvement from https://bugs.freedesktop.org/9865
(adding half-guillemets and removing the unneeded redefinitions of
basic keys like ESC and TAB) was never applied.

So... copy most of the extensions from the vendor French Mac layout
to its descendant, fill in some more missing symbols with educated
guesses, and remove obsolete comments.

(By the way, the placement in this layout of the letters with grave,
circumflex, and diaeresis is absolutely atrocious: without any logic.
Also: why have Igrave and Ograve when 1) French does not use those,
and 2) the lowercase igrave and ograve are missing?  Furthermore,
French does sometimes use ü and Ü, but these characters are absent
in this layout. :/ )

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

1 files changed, 20 insertions, 21 deletions

diff --git a/symbols/fr b/symbols/fr
index 974ad429..b8f58af8 100644
--- a/symbols/fr
+++ b/symbols/fr
@@ -886,39 +886,38 @@ xkb_symbols "mac" {
 
     name[Group1]= "French (Macintosh)";
 
-    key <TLDE> {	[          at, numbersign, periodcentered,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
+    key <TLDE> {	[          at, numbersign, periodcentered,  Ydiaeresis	]	};
     key <AE01> {	[   ampersand,    1,   VoidSymbol,    dead_acute	]	}; // MISSING: Apple
     key <AE02> {	[      eacute,    2,   ediaeresis,        Eacute	]	};
-    key <AE03> {	[    quotedbl,    3,   VoidSymbol,    VoidSymbol	] 	}; // CHECK all quotemarks
-    key <AE04> {	[  apostrophe,    4,   VoidSymbol,    VoidSymbol	] 	};
+    key <AE03> {	[    quotedbl,    3, leftdoublequotemark, rightdoublequotemark ]};
+    key <AE04> {	[  apostrophe,    4, leftsinglequotemark, rightsinglequotemark ]};
     key <AE05> {	[   parenleft,    5,    braceleft,   bracketleft	]	};
- // CHECK section
     key <AE06> {	[     section,    6,    paragraph,         aring	]	};
     key <AE07> {	[      egrave,    7, guillemotleft, guillemotright	]	};
     key <AE08> {	[      exclam,    8,   exclamdown,   Ucircumflex	]	};
     key <AE09> {	[    ccedilla,    9,     Ccedilla,        Aacute	]	};
-    key <AE10> {	[      agrave,    0,       oslash,    VoidSymbol	]	}; // MISSING: Oslash
+    key <AE10> {	[      agrave,    0,       oslash,        Oslash	]	};
     key <AE11> {	[  parenright, degree, braceright,  bracketright	]	};
-    key <AE12> {	[       minus, underscore, emdash,        endash	]	}; // CHECK dashes
+    key <AE12> {	[       minus, underscore, emdash,        endash	]	};
 
     key <AD01> {	[           a,  A,           ae,          AE	]	};
     key <AD02> {	[           z,  Z,  Acircumflex,       Aring	]	};
     key <AD03> {	[           e,  E,  ecircumflex, Ecircumflex	]	};
     key <AD04> {	[           r,  R,   registered,    currency	]	};
-    key <AD05> {	[           t,  T,   VoidSymbol,  VoidSymbol	]	};
-    key <AD06> {	[           y,  Y,       Uacute,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
-    key <AD07> {	[           u,  U,   VoidSymbol, ordfeminine	]	}; // MISSING: ordmasculine?
+    key <AD05> {	[           t,  T,       dagger,   trademark	]	};
+    key <AD06> {	[           y,  Y,       Uacute,  Ydiaeresis	]	};
+    key <AD07> {	[           u,  U,    masculine, ordfeminine	]	};
     key <AD08> {	[           i,  I,  icircumflex,  idiaeresis	]	};
-    key <AD09> {	[           o,  O,           oe,          OE	]	}; // MISSING: oe, OE lacking in Latin1; eherlent ok in Latin9
-    key <AD10> {	[           p,  P,   VoidSymbol,  VoidSymbol	]	};
+    key <AD09> {	[           o,  O,           oe,          OE	]	};
+    key <AD10> {	[           p,  P,     Greek_pi,    Greek_PI	]	};
     key <AD11> {	[dead_circumflex,dead_diaeresis, ocircumflex, Ocircumflex	]	};
-    key <AD12> {	[      dollar, asterisk,   EuroSign, yen	]	}; // eherlent : EuroSign in Latin9
+    key <AD12> {	[      dollar, asterisk,  EuroSign,      yen	]	};
 
     key <AC01> {	[         q, Q, acircumflex,         Agrave	]	};
     key <AC02> {	[         s, S,      Ograve,     VoidSymbol	]	};
-    key <AC03> {	[         d, D,  VoidSymbol,     VoidSymbol	]	};
-    key <AC04> {	[         f, F,  VoidSymbol, periodcentered	]	}; // MISSING: oblong script f??
-    key <AC05> {	[         g, G,  VoidSymbol,     VoidSymbol	]	}; // MISSING: kerned fi, fl
+    key <AC03> {	[         d, D, Greek_delta,    Greek_DELTA	]	};
+    key <AC04> {	[         f, F,       U0192, periodcentered	]	}; // ƒ ·
+    key <AC05> {	[         g, G,       UFB01,          UFB02	]	}; // fi fl
     key <AC06> {	[         h, H,      Igrave,    Icircumflex	]	};
     key <AC07> {	[         j, J,  Idiaeresis,         Iacute	]	};
     key <AC08> {	[         k, K,      Egrave,     Ediaeresis	]	};
@@ -927,17 +926,17 @@ xkb_symbols "mac" {
     key <AC11> {	[    ugrave,percent, Ugrave,    ucircumflex	]	}; // MISSING: per-mille
     key <BKSL> {	[ dead_grave, sterling,  at,     numbersign	]	};
 
-    key <LSGT> {	[      less, greater, VoidSymbol, VoidSymbol	]	};
+    key <LSGT> {	[      less, greater, lessthanequal, greaterthanequal ]	};
     key <AB01> {	[         w, W,      U2039,        U203A	]	}; // ‹ ›
-    key <AB02> {	[         x, X, VoidSymbol,   VoidSymbol	]	}; // CHECK similarequal; MISSING: extra-slanted slash
+    key <AB02> {	[         x, X, similarequal,      U2044	]	}; // ≃ ⁄
     key <AB03> {	[         c, C,  copyright,         cent	]	};
-    key <AB04> {	[         v, V,    diamond,  leftradical	]	}; // CHECK diamond, leftradical
-    key <AB05> {	[         b, B,     ssharp,        U1E9E	]	}; // CHECK: Greek_beta or ssharp?; MISSING: oblong script s
+    key <AB04> {	[         v, V,    diamond,      radical	]	}; // CHECK diamond
+    key <AB05> {	[         b, B,     ssharp,     integral	]	};
     key <AB06> {	[         n, N,  dead_tilde,  asciitilde	]	};
     key <AB07> {	[     comma,  question, VoidSymbol,  questiondown	]	};
-    key <AB08> {	[ semicolon,  period, VoidSymbol,  periodcentered	]	};
+    key <AB08> {	[ semicolon,  period,  ellipsis,   periodcentered	]	};
     key <AB09> {	[     colon,  slash,   division,        backslash	]	};
-    key <AB10> {	[     equal,   plus, VoidSymbol,        plusminus	]	};
+    key <AB10> {	[     equal,   plus,   notequal,        plusminus	]	};
 
     key <SPCE> {	[     space,  space, nobreakspace,   nobreakspace	]	};