Convert Bosnian keymap to multi-layout compatible form.

1 files changed, 41 insertions, 74 deletions

diff --git a/symbols/bs b/symbols/bs
index 43d32c5e..97bd48e3 100644
--- a/symbols/bs
+++ b/symbols/bs
@@ -6,86 +6,53 @@
 default partial alphanumeric_keys 
 xkb_symbols "basic" {
 
+    include "latin"
     // Alphanumeric section
     name[Group1]= "Bosnian";
-    key <TLDE> {	[ dead_cedilla,	dead_diaeresis	]	};
-    key <AE01> {	[         1,	exclam		],
-			[ asciitilde,	dead_tilde	]	};
-    key <AE02> {	[	  2,	quotedbl	],
-			[ dead_caron,	caron		]	};
-    key <AE03> {	[	  3,	numbersign	],
-			[ asciicircum,	dead_circumflex	]	};
-    key <AE04> {	[	  4,	dollar		],
-			[ dead_breve,	breve		]	};
-    key <AE05> {	[	  5,	percent		],
-			[ degree,	dead_abovering 	]	};
-    key <AE06> {	[	  6,	ampersand	],
-			[ dead_ogonek,	ogonek		]	};
-    key <AE07> {	[	  7,	slash		],
-			[ quoteleft,	dead_grave	]	};
-    key <AE08> {	[	  8,	parenleft	],
-			[ dead_abovedot, abovedot	]	};
-    key <AE09> {	[	  9,	parenright	],
-			[ dead_acute,	quoteright	]	};
-    key <AE10> {	[	  0,	equal		],
-			[ dead_doubleacute, doubleacute	]	};
-    key <AE11> {	[ apostrophe, 	question	],
-			[ dead_diaeresis, diaeresis	]	};
-    key <AE12> {	[ plus,		 asterisk	],
-			[ dead_cedilla, cedilla		]	};
 
-    key <AD01> {	[	  q,	Q 		],
-			[ backslash			]	};
-    key <AD02> {	[	  w,	W 		],
-			[ bar				]	};
-    key <AD03> {	[	  e,	E		],
-			[  EuroSign			]	};
-    key <AD05> {	[	  t,	T		]	};
-    key <AD06> {	[	  z,	Z		]	};
-    key <AD07> {	[	  u,	U		]	};
-    key <AD08> {	[	  i,	I		]	};
-    key <AD11> {	[ scaron,	Scaron		],
-			[ division	 		]	};
-    key <AD12> {	[      dstroke,	Dstroke		],
-			[ multiply,	dead_macron	]	};
-    key <AC04> {	[	  f,	F		],
-			[ bracketleft			]	};
-    key <AC05> {	[	  g,	G		],
-			[ bracketright			]	};
-    key <AC08> {	[	  k,	K		],
-			[ lstroke			]	};
-    key <AC09> {	[	  l,	L		],
-			[ Lstroke			]	};
-    key <AC10> {	[ ccaron,	Ccaron		]	};
-    key <AC11> {	[ cacute,	Cacute		],
-			[ ssharp			]	};
-
-    key <LSGT> {	[      less,	greater		],
-			[       bar			]	};
-    key <AB01> {	[	  y,	Y 		]	};
-    key <AB04> {	[	  v,	V 		],
-			[ at				]	};
-    key <AB05> {	[	  b,	B 		],
-			[ braceleft			]	};
-    key <AB06> {	[	  n,	N 		],
-			[ braceright			]	};
-    key <AB07> {	[	  m,	M		],
-			[ section			]	};
-    key <AB08> {	[     comma,	semicolon	]	};
-    key <AB09> {	[    period,	colon		],
-			[ periodcentered		]	};
-    key <AB10> {	[     minus,	underscore	]	};
-    key <BKSL> {	[ zcaron,	Zcaron		],
-			[ currency			]	};
-    key <RALT> {	[ Mode_switch,	Multi_key	]	};
+    key <TLDE> { [ dead_cedilla,	   dead_diaeresis	]	};
+    key <AE01> { [        1,   exclam,     asciitilde,	     dead_tilde	] };
+    key <AE02> { [	  2,   quotedbl,   dead_caron,	     caron	] };
+    key <AE03> { [	  3,   numbersign, asciicircum,	dead_circumflex	] };
+    key <AE04> { [	  4,   dollar,     dead_breve,	     breve	] };
+    key <AE05> { [	  5,   percent,    degree,	 dead_abovering	] };
+    key <AE06> { [	  6,   ampersand,  dead_ogonek,	     ogonek	] };
+    key <AE07> { [	  7,   slash,      quoteleft,	     dead_grave	] };
+    key <AE08> { [	  8,   parenleft,  dead_abovedot,    abovedot	] };
+    key <AE09> { [	  9,   parenright, dead_acute,	     quoteright	] };
+    key <AE10> { [	  0,   equal,      dead_doubleacute, doubleacute] };
+    key <AE11> { [ apostrophe, question,   dead_diaeresis,   diaeresis	] };
+    key <AE12> { [ plus,       asterisk,   dead_cedilla,     cedilla	] };
+
+    key <AD01> { [	  q,   Q,       backslash   ] };
+    key <AD02> { [	  w,   W,       bar	    ] };
+    key <AD03> { [	  e,   E,       EuroSign    ] };
+    key <AD05> { [	  t,   T	] };
+    key <AD06> { [	  z,   Z	] };
+    key <AD07> { [	  u,   U	] };
+    key <AD08> { [	  i,   I	] };
+    key <AD11> { [   scaron,   Scaron,  division    ] };
+    key <AD12> { [  dstroke,   Dstroke, multiply,   dead_macron ] };
+    key <AC04> { [	  f,   F,       bracketleft ] };
+    key <AC05> { [	  g,   G,       bracketright] };
+    key <AC08> { [	  k,   K,       lstroke     ] };
+    key <AC09> { [	  l,   L,       Lstroke     ] };
+    key <AC10> { [   ccaron,   Ccaron	] };
+    key <AC11> { [   cacute,   Cacute,  ssharp      ] };
+
+    key <LSGT> { [     less,	greater,bar         ] };
+    key <AB01> { [	  y,	Y 	] };
+    key <AB04> { [	  v,	V,      at          ] };
+    key <AB05> { [	  b,	B,      braceleft   ] };
+    key <AB06> { [	  n,	N,      braceright  ] };
+    key <AB07> { [	  m,	M,      section     ] };
+    key <AB08> { [    comma,	semicolon           ] };
+    key <AB09> { [    period,	colon,  periodcentered] };
+    key <AB10> { [     minus,	underscore          ] };
+    key <BKSL> { [    zcaron,	Zcaron, currency    ] };
 
     // End alphanumeric section
 
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
 };