shift_toggle -> shifts_toggle

6 files changed, 11 insertions, 8 deletions

diff --git a/rules/Makefile.am b/rules/Makefile.am
index b80efa5a..46f649b9 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -30,9 +30,10 @@ HDR compat/base.l4_s.part  base.l4_s.part  \
 HDR compat/base.l2v2_s.part \
 HDR compat/base.l3v3_s.part \
 HDR compat/base.l4v4_s.part \
-HDR base.m_s.part   HDR base.ml_c.part        HDR base.ml1_c.part \
+HDR base.m_s.part  HDR base.ml_c.part        HDR base.ml1_c.part \
 HDR base.m_t.part \
-HDR base.o_s.part   HDR base.o_c.part         HDR base.o_t.part
+HDR compat/base.o_s.part base.o_s.part \
+HDR base.o_c.part HDR base.o_t.part
 else
 base_parts = base.hdr.part  base.lists.part \
 HDR base.m_k.part   HDR base.l1_k.part  HDR base.l_k.part  \
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index a5ccfbdd..729b6210 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -4,7 +4,7 @@
   grp:lwin_switch	=	+group(lwin_switch)
   grp:rwin_switch	=	+group(rwin_switch)
   grp:toggle		=	+group(toggle)
-  grp:shift_toggle	=	+group(shift_toggle)
+  grp:shifts_toggle	=	+group(shifts_toggle)
   grp:ctrls_toggle	=	+group(ctrls_toggle)
   grp:alts_toggle	=	+group(alts_toggle)
   grp:ctrl_shift_toggle	=	+group(ctrl_shift_toggle)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index ee61b4ff..493601a4 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -2165,7 +2165,7 @@
       </option>
       <option>
         <configItem>
-          <name>grp:shift_toggle</name>
+          <name>grp:shifts_toggle</name>
           <_description>Both Shift keys together change group.</_description>
         </configItem>
       </option>
diff --git a/rules/compat/Makefile.am b/rules/compat/Makefile.am
index 410ab018..f1929725 100644
--- a/rules/compat/Makefile.am
+++ b/rules/compat/Makefile.am
@@ -3,6 +3,7 @@ transform_files=layoutRename.lst variantRename.lst
 
 transform_scripts=ln_s.sh lnv_s.sh ml_s.sh mlv_s.sh ml1_s.sh ml1v1_s.sh 
 
+dist_parts=base.o_s.part
 
 if USE_COMPAT_RULES
 
@@ -10,7 +11,7 @@ noinst_SCRIPTS=base.l2_s.part base.l3_s.part base.l4_s.part \
 base.l2v2_s.part base.l3v3_s.part base.l4v4_s.part \
 base.ml_s.part base.ml1_s.part \
 base.mlv_s.part base.ml1v1_s.part \
-base.ml_s.part
+base.ml_s.part $(dist_parts)
 
 else
 
@@ -48,4 +49,4 @@ base.mlv_s.part: mlv_s.sh
 base.ml1v1_s.part: ml1v1_s.sh
 	sh $<
 
-EXTRA_DIST=base.lists.part $(transform_files) $(transform_scripts)
+EXTRA_DIST=base.lists.part $(transform_files) $(transform_scripts) $(dist_parts)
diff --git a/rules/compat/base.o_s.part b/rules/compat/base.o_s.part
new file mode 100644
index 00000000..8f1e9e45
--- /dev/null
+++ b/rules/compat/base.o_s.part
@@ -0,0 +1 @@
+  grp:shift_toggle	=	+group(shifts_toggle)
diff --git a/symbols/group b/symbols/group
index 4164f955..3dfc04ac 100644
--- a/symbols/group
+++ b/symbols/group
@@ -84,12 +84,12 @@ xkb_symbols "toggle" {
     };
 };
 
-// using the group(shift_toggle) map, pressing both shift keys together
+// using the group(shifts_toggle) map, pressing both shift keys together
 // locks the next or previous sequential keyboard group 
 // (depending on which shift is pressed first - right or left, 
 // correspongingly)
 partial modifier_keys 
-xkb_symbols "shift_toggle" {
+xkb_symbols "shifts_toggle" {
     key <LFSH>	{	[	Shift_L,	ISO_Prev_Group ]	};
     key <RTSH>	{	[	Shift_R,	ISO_Next_Group ]	};
 };