From 77ccc95b93196533b9cabb627691b5453a40beaf Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Thu, 26 Jun 2014 16:19:56 +0200
Subject: [PATCH] migrated normal de_CH layout to v2

---
 uhr-de_CH.js | 63 ++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 51 insertions(+), 12 deletions(-)

diff --git a/uhr-de_CH.js b/uhr-de_CH.js
index 5e6cedb..edccee3 100644
--- a/uhr-de_CH.js
+++ b/uhr-de_CH.js
@@ -12,19 +12,58 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+var h = {
+	"_es_isch": {1:[1,2,4,5,6,7]},
+	"_ab": {4:[1,2]},
+	"_vor": {3:[9,10,11]},
+	"_haubi": {4:[4,5,6,7,8]},
+	"_5": {1:[9,10,11]},
+	"_10": {2:[9,10,11]},
+	"_15": {2:[1,2,3,4,5,6]},
+	"_20": {3:[1,2,3,4,5,6]}
+};
 var layout = {
+	"version": 2,
 	"language": 'Bärndütsch',
-	"values": [
-		[l('E', 'on'), l('S', 'on'),l('K'),l('I', 'on'),l('S', 'on'),l('C', 'on'),l('H', 'on'),l('A'),m('F', 5, 25, 35, 55),m('Ü', 5, 25, 35, 55),m('F', 5, 25, 35, 55)],
-		[m('V', 15, 45), m('I', 15, 45),m('E', 15, 45),m('R', 15, 45),m('T', 15, 45),m('U', 15, 45),l('B'),l('F'),m('Z', 10, 50),m('Ä', 10, 50),m('Ä', 10, 50)],
-		[m('Z', 20, 40), m('W', 20, 40),m('Ä', 20, 40),m('N', 20, 40),m('Z', 20, 40),m('G', 20, 40),l('S'),l('I'),m('V', 25, 40, 45, 50, 55),m('O', 25, 40, 45, 50, 55),m('R', 25, 40, 45, 50, 55)],
-		[m('A', 5, 10, 15, 20, 35), m('B', 5, 10, 15, 20, 35),l('O'),m('H', 25, 30, 35),m('A', 25, 30, 35),m('U', 25, 30, 35),m('B', 25, 30, 35),m('I', 25, 30, 35),l('E'),l('G'),l('E')],
-		[h('E', 1), h('I', 1),h('S', 1),h('Z', 2),h('W', 2),h('Ö', 2),h('I', 2),l('S'),h('D', 3),h('R', 3),h('Ü', 3)],
-		[h('V', 4), h('I', 4),h('E', 4),h('R', 4),h('I', 4),h('F', 5),h('Ü', 5),h('F', 5),h('I', 5),l('Q'),l('T')],
-		[h('S', 6), h('Ä', 6),h('C', 6),h('H', 6),h('S', 6),h('I', 6),h('S', 7),h('I', 7),h('B', 7),h('N', 7),h('I', 7)],
-		[h('A', 8), h('C', 8),h('H', 8),h('T', 8),h('I', 8),h('N', 9),h('Ü', 9),h('N', 9),h('I', 9),l('E'),l('L')],
-		[h('Z', 10), h('Ä', 10),h('N', 10),h('I', 10),l('E'),l('R'),l('B'),h('E', 11),h('U', 11),h('F', 11),h('I', 11)],
-		[h('Z', 12), h('W', 12),h('Ö', 12),h('U', 12),h('F', 12),h('I', 12),l('N'),l('A'),l('U'),l('H'),l('R')]
-	]
+	"letters": [
+		'ESKISCHAFÜF',
+		'VIERTUBFZÄÄ',
+		'ZWÄNZGSIVOR',
+		'ABOHAUBIEGE',
+		'EISZWÖISDRÜ',
+		'VIERIFÜFIQT',
+		'SÄCHSISIBNI',
+		'ACHTINÜNIEL',
+		'ZÄNIERBEUFI',
+		'ZWÖUFINAUHR'
+		],
+	"permanent": h._es_isch,
+	"minutes": {
+		"5,6,7,8,9": [h._5, h._ab],
+		"10,11,12,13,14": [h._10, h._ab],
+		"15,16,17,18,19": [h._15, h._ab],
+		"20,21,22,23,24": [h._20, h._ab],
+		"25,26,27,28,29": [h._5, h._vor, h._haubi],
+		"30,31,32,33,34": [h._haubi],
+		"35,36,37,38,39": [h._5, h._ab, h._haubi],
+		"40,41,42,43,44": [h._20, h._vor],
+		"45,46,47,48,48": [h._15, h._vor],
+		"50,51,52,53,54": [h._10, h._vor],
+		"55,56,57,58,59": [h._5, h._vor]
+	},
+	"hours": {
+		"1": {5:[1,2,3]},
+		"2": {5:[4,5,6,7]},
+		"3": {5:[9,10,11]},
+		"4": {6:[1,2,3,4,5]},
+		"5": {6:[6,7,8,9]},
+		"6": {7:[1,2,3,4,5,6]},
+		"7": {7:[7,8,9,10,11]},
+		"8": {8:[1,2,3,4,5]},
+		"9": {8:[6,7,8,9]},
+		"10": {9:[1,2,3,4]},
+		"11": {9:[8,9,10,11]},
+		"12": {10:[1,2,3,4,5,6]}
+	}
 };
 window._uhr.languages['de_CH'] = layout;