Update Neo-layout to the final version, released 2010-03-28

10 files changed, 79 insertions, 1 deletions

diff --git a/rules/HDR b/rules/HDR
index 3f3919d..769b8fc 100644
--- a/rules/HDR
+++ b/rules/HDR
@@ -15,6 +15,11 @@
 ! model		layout[3]	variant[3]	=	symbols
 ! model		layout[4]	variant[4]	=	symbols
 ! model		=	symbols
+! layout	variant		=	compat
+! layout[1]	variant[1]	=	compat
+! layout[2]	variant[2]	=	compat
+! layout[3]	variant[3]	=	compat
+! layout[4]	variant[4]	=	compat
 ! model		layout		=	compat
 ! model		layout[1]	=	compat
 ! model		=	types
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 5f39217..6ca04e7 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -41,6 +41,11 @@ HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
 HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
 HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
 HDR base.m_s.part \
+HDR compat/base.lv_c.part   \
+HDR compat/base.l1v1_c.part \
+HDR compat/base.l2v2_c.part \
+HDR compat/base.l3v3_c.part \
+HDR compat/base.l4v4_c.part \
 HDR base.ml_c.part \
 HDR base.ml1_c.part \
 HDR base.m_t.part \
@@ -72,6 +77,11 @@ HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
 HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
 HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
 HDR evdev.m_s.part \
+HDR compat/base.lv_c.part   \
+HDR compat/base.l1v1_c.part \
+HDR compat/base.l2v2_c.part \
+HDR compat/base.l3v3_c.part \
+HDR compat/base.l4v4_c.part \
 HDR base.ml_c.part \
 HDR base.ml1_c.part \
 HDR base.m_t.part \
@@ -104,6 +114,11 @@ HDR extras/base.ml2v2_s.part \
 HDR extras/base.ml3v3_s.part \
 HDR extras/base.ml4v4_s.part \
 HDR base.m_s.part \
+HDR \
+HDR \
+HDR \
+HDR \
+HDR \
 HDR base.ml_c.part \
 HDR base.ml1_c.part \
 HDR base.m_t.part \
@@ -134,6 +149,11 @@ HDR extras/base.ml2v2_s.part \
 HDR extras/base.ml3v3_s.part \
 HDR extras/base.ml4v4_s.part \
 HDR evdev.m_s.part \
+HDR \
+HDR \
+HDR \
+HDR \
+HDR \
 HDR base.ml_c.part \
 HDR base.ml1_c.part \
 HDR base.m_t.part \
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 06ee452..79f61d9 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -110,5 +110,12 @@
   esperanto:dvorak      =	+epo(dvorak)
   terminate:ctrl_alt_bksp =	+terminate(ctrl_alt_bksp)
   apple:alupckeys	=	+macintosh_vndr/apple(alupckeys)
+  shift:both_capslock                =       +shift(both_capslock)
+  shift:lshift_both_capslock         =       +shift(lshift_both_capslock)
+  shift:rshift_both_capslock         =       +shift(rshift_both_capslock)
+  lv3:caps_switch                    =       +level3(caps_switch)
+  lv3:bksl_switch                    =       +level3(bksl_switch)
+  lv5:lsgt_switch_lock            =       +level5(lsgt_switch_lock)
+  lv5:ralt_switch_lock            =       +level5(ralt_switch_lock)
 
 
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 50f6989..0892381 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4705,6 +4705,18 @@
           <_description>Enter on keypad</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>lv3:caps_switch</name>
+          <description>CapsLock</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:bksl_switch</name>
+          <description>&lt;BKSL&gt;-Key</description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="false">
       <!-- Tweaking the position of the "Ctrl" key -->
@@ -5157,6 +5169,12 @@
           <_description>Enable extra typographic characters</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>shift:both_capslock</name>
+          <description>Both Shift-Keys together toggle CapsLock</description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <!-- Special shortcuts for the Euro character -->
@@ -5189,6 +5207,24 @@
         </configItem>
       </option>
     </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>lv5</name>
+        <description>5th level options</description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>lv5:lsgt_switch_lock</name>
+          <description>&lt;LSGT&gt;-Key chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:ralt_switch_lock</name>
+          <description>Right Alt chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+    </group>
     <group allowMultipleSelection="false">
       <!-- Let space output NBSP, NNBSP, ZWNJ, and ZWJ for the desired level -->
       <configItem>
diff --git a/rules/compat/Makefile.am b/rules/compat/Makefile.am
index 1032c41..0872634 100644
--- a/rules/compat/Makefile.am
+++ b/rules/compat/Makefile.am
@@ -1,7 +1,12 @@
 
 transform_files=layoutsMapping.lst variantsMapping.lst
 
-dist_parts=base.o_s.part
+dist_parts=base.o_s.part \
+base.lv_c.part \
+base.l1v1_c.part \
+base.l2v2_c.part \
+base.l3v3_c.part \
+base.l4v4_c.part
 
 scripts_dir=$(srcdir)/../bin
 
diff --git a/rules/compat/base.l1v1_c.part b/rules/compat/base.l1v1_c.part
new file mode 100644
index 0000000..64ff0f2
--- /dev/null
+++ b/rules/compat/base.l1v1_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
diff --git a/rules/compat/base.l2v2_c.part b/rules/compat/base.l2v2_c.part
new file mode 100644
index 0000000..fea61be
--- /dev/null
+++ b/rules/compat/base.l2v2_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
diff --git a/rules/compat/base.l3v3_c.part b/rules/compat/base.l3v3_c.part
new file mode 100644
index 0000000..5a1fb2f
--- /dev/null
+++ b/rules/compat/base.l3v3_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
diff --git a/rules/compat/base.l4v4_c.part b/rules/compat/base.l4v4_c.part
new file mode 100644
index 0000000..ac8a911
--- /dev/null
+++ b/rules/compat/base.l4v4_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
diff --git a/rules/compat/base.lv_c.part b/rules/compat/base.lv_c.part
new file mode 100644
index 0000000..64ff0f2
--- /dev/null
+++ b/rules/compat/base.lv_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)