From d5e8f7c4b20bc682358c88ae8d17b5ed9e6e841d Mon Sep 17 00:00:00 2001
From: Sergey Udaltsov <sergey.udaltsov@gmail.com>
Date: Wed, 3 Oct 2018 00:54:45 +0100
Subject: New "French (US)" variant

https://bugs.freedesktop.org/show_bug.cgi?id=107148
---
 rules/base.xml.in |  6 ++++++
 symbols/fr        | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 1d1185a4..c9d49167 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -3227,6 +3227,12 @@
             </languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>French (US keyboard with French letters)</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
diff --git a/symbols/fr b/symbols/fr
index 263ba09b..00553306 100644
--- a/symbols/fr
+++ b/symbols/fr
@@ -979,6 +979,39 @@ xkb_symbols "geo" {
 
 };
 
+// US keyboard made French
+//
+// Copyright (C) 2018, Florent Gallaire <f@gallai.re>
+partial alphanumeric_keys
+xkb_symbols "us" {
+
+    include "us(euro)"
+    name[Group1]= "French (US keyboard with French letters)";
+
+    key <AB01> { [	   z,          Z,   acircumflex,      Acircumflex ] }; // â Â
+    key <AB03> { [	   c,          C,      ccedilla,         Ccedilla ] }; // ç Ç
+
+    key <AC01> { [	   a,          A,        agrave,           Agrave ] }; // à À
+    key <AC02> { [	   s,          S,            ae,               AE ] }; // æ Æ
+    key <AC03> { [	   d,          D,   ecircumflex,      Ecircumflex ] }; // ê Ê
+    key <AC04> { [	   f,          F,    ediaeresis,       Ediaeresis ] }; // ë Ë
+    key <AC06> { [	   h,          H,    udiaeresis,       Udiaeresis ] }; // ü Ü
+    key <AC07> { [	   j,          J,   ucircumflex,      Ucircumflex ] }; // û Û
+    key <AC08> { [	   k,          K,   icircumflex,      Icircumflex ] }; // î Î
+
+    key <AD03> { [	   e,          E,        eacute,           Eacute ] }; // é É
+    key <AD04> { [	   r,          R,        egrave,           Egrave ] }; // è È
+    key <AD06> { [	   y,          Y,    ydiaeresis,       Ydiaeresis ] }; // ÿ Ÿ
+    key <AD07> { [	   u,          U,        ugrave,           Ugrave ] }; // ù Ù
+    key <AD08> { [	   i,          I,    idiaeresis,       Idiaeresis ] }; // ï Ï
+    key <AD09> { [	   o,          O,   ocircumflex,      Ocircumflex ] }; // ô Ô
+    key <AD10> { [	   p,          P,            oe,               OE ] }; // œ Œ
+    key <AD11> { [ bracketleft,  braceleft,  guillemotleft,  leftdoublequotemark ] }; // « “
+    key <AD12> { [bracketright, braceright, guillemotright, rightdoublequotemark ] }; // » ”
+
+    key <AE04> { [        4,     dollar,      EuroSign,         currency ] }; // € ¤
+};
+
 // EXTRAS:
 
 partial alphanumeric_keys
-- 
cgit v1.2.3