Merge remote-tracking branch 'origin/master' into develop

lib/python/qmk/keyboard.py

@@ -162,13 +162,12 @@ def render_layout(layout_data, render_ascii, key_labels=None):
     """
     textpad = [array('u', ' ' * 200) for x in range(100)]
     style = 'ascii' if render_ascii else 'unicode'
-    box_chars = BOX_DRAWING_CHARACTERS[style]
 
     for key in layout_data:
-        x = ceil(key.get('x', 0) * 4)
+        x = key.get('x', 0)
-        y = ceil(key.get('y', 0) * 3)
+        y = key.get('y', 0)
-        w = ceil(key.get('w', 1) * 4)
+        w = key.get('w', 1)
-        h = ceil(key.get('h', 1) * 3)
+        h = key.get('h', 1)
 
         if key_labels:
             label = key_labels.pop(0)
@@ -177,6 +176,38 @@ def render_layout(layout_data, render_ascii, key_labels=None):
         else:
             label = key.get('label', '')
 
+        if x >= 0.25 and w == 1.25 and h == 2:
+            render_key_isoenter(textpad, x, y, w, h, label, style)
+        else:
+            render_key_rect(textpad, x, y, w, h, label, style)
+
+    lines = []
+    for line in textpad:
+        if line.tounicode().strip():
+            lines.append(line.tounicode().rstrip())
+
+    return '\n'.join(lines)
+
+
+def render_layouts(info_json, render_ascii):
+    """Renders all the layouts from an `info_json` structure.
+    """
+    layouts = {}
+
+    for layout in info_json['layouts']:
+        layout_data = info_json['layouts'][layout]['layout']
+        layouts[layout] = render_layout(layout_data, render_ascii)
+
+    return layouts
+
+
+def render_key_rect(textpad, x, y, w, h, label, style):
+    box_chars = BOX_DRAWING_CHARACTERS[style]
+    x = ceil(x * 4)
+    y = ceil(y * 3)
+    w = ceil(w * 4)
+    h = ceil(h * 3)
+
     label_len = w - 2
     label_leftover = label_len - len(label)
 
@@ -198,21 +229,34 @@ def render_layout(layout_data, render_ascii, key_labels=None):
         textpad[y + i + 2][x:x + w] = mid_line
     textpad[y + h - 1][x:x + w] = bot_line
 
-    lines = []
-    for line in textpad:
-        if line.tounicode().strip():
-            lines.append(line.tounicode().rstrip())
 
-    return '\n'.join(lines)
+def render_key_isoenter(textpad, x, y, w, h, label, style):
+    box_chars = BOX_DRAWING_CHARACTERS[style]
+    x = ceil(x * 4)
+    y = ceil(y * 3)
+    w = ceil(w * 4)
+    h = ceil(h * 3)
 
+    label_len = w - 1
+    label_leftover = label_len - len(label)
 
-def render_layouts(info_json, render_ascii):
+    if len(label) > label_len:
-    """Renders all the layouts from an `info_json` structure.
+        label = label[:label_len]
-    """
-    layouts = {}
 
-    for layout in info_json['layouts']:
+    label_blank = ' ' * (label_len-1)  # noqa: yapf insists there be no whitespace around - and *
-        layout_data = info_json['layouts'][layout]['layout']
+    label_border_top = box_chars['h'] * label_len
-        layouts[layout] = render_layout(layout_data, render_ascii)
+    label_border_bottom = box_chars['h'] * (label_len-1)  # noqa
+    label_middle = label + ' '*label_leftover  # noqa
 
-    return layouts
+    top_line = array('u', box_chars['tl'] + label_border_top + box_chars['tr'])
+    lab_line = array('u', box_chars['v'] + label_middle + box_chars['v'])
+    crn_line = array('u', box_chars['bl'] + box_chars['tr'] + label_blank + box_chars['v'])
+    mid_line = array('u', box_chars['v'] + label_blank + box_chars['v'])
+    bot_line = array('u', box_chars['bl'] + label_border_bottom + box_chars['br'])
+
+    textpad[y][x - 1:x + w] = top_line
+    textpad[y + 1][x - 1:x + w] = lab_line
+    textpad[y + 2][x - 1:x + w] = crn_line
+    textpad[y + 3][x:x + w] = mid_line
+    textpad[y + 4][x:x + w] = mid_line
+    textpad[y + h - 1][x:x + w] = bot_line