added 2 esperanto options, b.fd.o#18142

diff --git a/ChangeLog b/ChangeLog
index c5c7d40..76b9bc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
        https://bugs.freedesktop.org/show_bug.cgi?id=4411
        * rules/base.xml.in: generalized Fujitsu-Siemens Amilo laptops, also
        closing http://bugs.freedesktop.org/show_bug.cgi?id=5694
+       * rules/base.o_s.part, rules/base.xml.in, symbols/epo: added a couple
+       of Esperanto options,
+       http://bugs.freedesktop.org/show_bug.cgi?id=18142
 
 2008-11-27  Sergey Udaltsov
 

diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 2be7160..4fe0187 100644 (file)
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -93,4 +93,6 @@
   kpdl:kposs            =      +kpdl(kposs)
   kpdl:semi             =      +kpdl(semi)
   shift:breaks_caps     =      +shift(breaks_caps)
+  esperanto:qwerty      =      +epo(qwerty)
+  esperanto:dvorak      =      +epo(dvorak)
 

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 76f6310..31b7727 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4772,5 +4772,23 @@
        </configItem>
       </option>
     </group>
+    <group allowMultipleSelection="false">
+      <configItem>
+        <name>esperanto</name>
+        <_description>Adding Esperanto circumflexes (supersigno)</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>esperanto:qwerty</name>
+          <_description>Add circumflexes (supersigno) to the corresponding key in a Qwerty keyboard.</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>esperanto:dvorak</name>
+          <_description>Add circumflexes (supersigno) to the corresponding key in a Dvorak keyboard.</_description>
+       </configItem>
+      </option>
+    </group>
   </optionList>
 </xkbConfigRegistry>

diff --git a/symbols/epo b/symbols/epo
index a1c9c60..c9b2d57 100644 (file)
--- a/symbols/epo
+++ b/symbols/epo
@@ -113,3 +113,29 @@ xkb_symbols "legacy" {
 
   include "level3(ralt_switch)"
 };
+
+// Add Esperanto supersignos to the corresponding key in a Qwerty keyboard.
+// This is a generic "component" that is not used to the other layouts in this
+// file but it is meant to be applied to any layout. If you have any questions
+// ask J. Pablo Fernández <pupeno@pupeno.com>.
+partial
+xkb_symbols "qwerty" {
+    key <AB03> { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] };
+    key <AC05> { [ NoSymbol, NoSymbol, gcircumflex, Gcircumflex ] };
+    key <AC06> { [ NoSymbol, NoSymbol, hcircumflex, Hcircumflex ] };
+    key <AC07> { [ NoSymbol, NoSymbol, jcircumflex, Jcircumflex ] };
+    key <AC02> { [ NoSymbol, NoSymbol, scircumflex, Scircumflex ] };
+    key <AD07> { [ NoSymbol, NoSymbol,      ubreve,      Ubreve ] };
+};
+
+// Add Esperanto supersignos to the corresponding key in a Dvorak keyboard.
+// Same comment as the Qwerty one above applies.
+partial
+xkb_symbols "dvorak" {
+    key <AD08> { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] };
+    key <AD07> { [ NoSymbol, NoSymbol, gcircumflex, Gcircumflex ] };
+    key <AC07> { [ NoSymbol, NoSymbol, hcircumflex, Hcircumflex ] };
+    key <AB03> { [ NoSymbol, NoSymbol, jcircumflex, Jcircumflex ] };
+    key <AC10> { [ NoSymbol, NoSymbol, scircumflex, Scircumflex ] };
+    key <AC04> { [ NoSymbol, NoSymbol,      ubreve,      Ubreve ] };
+};