From 64223704e0e88a86721a3429f44d5d8f0525428c Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@puri.sm>
Date: Wed, 10 Jul 2019 15:35:49 +0000
Subject: [PATCH] Update symbols to more closely resemble #38

---
 data/keyboards/geometry/compact.xml |  4 ++--
 data/keyboards/symbols/us.xml       | 24 ++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/data/keyboards/geometry/compact.xml b/data/keyboards/geometry/compact.xml
index 36eb61c4..6a766c6c 100644
--- a/data/keyboards/geometry/compact.xml
+++ b/data/keyboards/geometry/compact.xml
@@ -103,10 +103,10 @@
   <section angle="0">
     <bounds x="0" y="0" width="608.7804" height="201.3658"/>
     <row orientation="1">
-      <key keycode="37" name="LCTL" oref="altline">
+      <key keycode="66" name="ALTGR" oref="altline">
 	<bounds x="62.43902" y="162.3414" width="48.39024" height="37.46341"/>
       </key>
-      <key keycode="66" name="ALTGR" oref="altline">
+      <key keycode="150" name="I150" oref="altline">
 	<bounds x="113.9512" y="162.3414" width="48.39024" height="37.46341"/>
       </key>
       <key keycode="65" name="SPCE" oref="spaceline">
diff --git a/data/keyboards/symbols/us.xml b/data/keyboards/symbols/us.xml
index fc7ee482..6207b900 100644
--- a/data/keyboards/symbols/us.xml
+++ b/data/keyboards/symbols/us.xml
@@ -103,21 +103,25 @@
     <keysym keyval="113">q</keysym>
     <keysym keyval="81">Q</keysym>
     <keysym keyval="49">1</keysym>
+    <keysym keyval="126">asciitilde</keysym>
   </key>
   <key keycode="25" name="AD02">
     <keysym keyval="119">w</keysym>
     <keysym keyval="87">W</keysym>
     <keysym keyval="50">2</keysym>
+    <keysym keyval="96">quoteleft</keysym>
   </key>
   <key keycode="26" name="AD03">
     <keysym keyval="101">e</keysym>
     <keysym keyval="69">E</keysym>
     <keysym keyval="51">3</keysym>
+    <keysym keyval="124">bar</keysym>
   </key>
   <key keycode="27" name="AD04">
     <keysym keyval="114">r</keysym>
     <keysym keyval="82">R</keysym>
     <keysym keyval="52">4</keysym>
+    <keysym keyval="183">middledot</keysym>
   </key>
   <key keycode="28" name="AD05">
     <keysym keyval="116">t</keysym>
@@ -168,45 +172,54 @@
     <keysym keyval="97">a</keysym>
     <keysym keyval="65">A</keysym>
     <keysym keyval="64">at</keysym>
+    <keysym keyval="169">copyright</keysym>
   </key>
   <key keycode="39" name="AC02">
     <keysym keyval="115">s</keysym>
     <keysym keyval="83">S</keysym>
     <keysym keyval="35">numbersign</keysym>
+    <keysym keyval="174">registeredtrademark</keysym>
   </key>
   <key keycode="40" name="AC03">
     <keysym keyval="100">d</keysym>
     <keysym keyval="68">D</keysym>
     <keysym keyval="36">dollar</keysym>
+    <keysym keyval="163">poundsign</keysym>
   </key>
   <key keycode="41" name="AC04">
     <keysym keyval="102">f</keysym>
     <keysym keyval="70">F</keysym>
     <keysym keyval="37">percent</keysym>
+    <text>€</text>
   </key>
   <key keycode="42" name="AC05">
     <keysym keyval="103">g</keysym>
     <keysym keyval="71">G</keysym>
     <keysym keyval="38">ampersand</keysym>
+    <keysym keyval="165">yensign</keysym>
   </key>
   <key keycode="43" name="AC06">
     <keysym keyval="104">h</keysym>
     <keysym keyval="72">H</keysym>
     <keysym keyval="45">minus</keysym>
+    <keysym keyval="94">asciicircum</keysym>
   </key>
   <key keycode="44" name="AC07">
     <keysym keyval="106">j</keysym>
     <keysym keyval="74">J</keysym>
-    <keysym keyval="95">underscore</keysym>
+    <keysym keyval="43">plus</keysym>
+    <keysym keyval="176">degreesign</keysym>
   </key>
   <key keycode="45" name="AC08">
     <keysym keyval="107">k</keysym>
     <keysym keyval="75">K</keysym>
+    <keysym keyval="40">parenleft</keysym>
     <keysym keyval="123">braceleft</keysym>
   </key>
   <key keycode="46" name="AC09">
     <keysym keyval="108">l</keysym>
     <keysym keyval="76">L</keysym>
+    <keysym keyval="41">parenright</keysym>
     <keysym keyval="125">braceright</keysym>
   </key>
   <key keycode="47" name="AC10">
@@ -226,37 +239,44 @@
   <key keycode="52" name="AB01">
     <keysym keyval="122">z</keysym>
     <keysym keyval="90">Z</keysym>
-    <keysym keyval="43">plus</keysym>
+    <keysym keyval="44">comma</keysym>
+    <keysym keyval="92">backslash</keysym>
   </key>
   <key keycode="53" name="AB02">
     <keysym keyval="120">x</keysym>
     <keysym keyval="88">X</keysym>
     <keysym keyval="34">quotedbl</keysym>
+    <keysym keyval="47">slash</keysym>
   </key>
   <key keycode="54" name="AB03">
     <keysym keyval="99">c</keysym>
     <keysym keyval="67">C</keysym>
     <keysym keyval="39">quoteright</keysym>
+    <keysym keyval="60">less</keysym>
   </key>
   <key keycode="55" name="AB04">
     <keysym keyval="118">v</keysym>
     <keysym keyval="86">V</keysym>
     <keysym keyval="58">colon</keysym>
+    <keysym keyval="62">greater</keysym>
   </key>
   <key keycode="56" name="AB05">
     <keysym keyval="98">b</keysym>
     <keysym keyval="66">B</keysym>
     <keysym keyval="59">semicolon</keysym>
+    <keysym keyval="61">equal</keysym>
   </key>
   <key keycode="57" name="AB06">
     <keysym keyval="110">n</keysym>
     <keysym keyval="78">N</keysym>
     <keysym keyval="33">exclam</keysym>
+    <keysym keyval="91">bracketleft</keysym>
   </key>
   <key keycode="58" name="AB07">
     <keysym keyval="109">m</keysym>
     <keysym keyval="77">M</keysym>
     <keysym keyval="63">question</keysym>
+    <keysym keyval="93">bracketright</keysym>
   </key>
   <key keycode="59" name="AB08">
     <keysym keyval="44">comma</keysym>