Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)

* fixes from tmk's repo

* rename keyboard to keyboards

4 files changed, 2955 insertions, 0 deletions

diff --git a/keyboards/ergodox_ez/keymaps/german-manuneo/compile_keymap.py b/keyboards/ergodox_ez/keymaps/german-manuneo/compile_keymap.py
new file mode 100644
index 0000000000..7076a6ecb2
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/german-manuneo/compile_keymap.py
@@ -0,0 +1,710 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""Compiler for keymap.c files
+
+This scrip will generate a keymap.c file from a simple
+markdown file with a specific layout.
+
+Usage:
+    python compile_keymap.py INPUT_PATH [OUTPUT_PATH]
+"""
+from __future__ import division
+from __future__ import print_function
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import os
+import io
+import re
+import sys
+import json
+import unicodedata
+import collections
+import itertools as it
+
+PY2 = sys.version_info.major == 2
+
+if PY2:
+    chr = unichr
+
+
+KEYBOARD_LAYOUTS = {
+    # These map positions in the parsed layout to
+    # positions in the KEYMAP MATRIX
+    'ergodox_ez': [
+        [ 0,  1,  2,  3,  4,  5,  6],  [38, 39, 40, 41, 42, 43, 44],
+        [ 7,  8,  9, 10, 11, 12, 13],  [45, 46, 47, 48, 49, 50, 51],
+        [14, 15, 16, 17, 18, 19    ],  [    52, 53, 54, 55, 56, 57],
+        [20, 21, 22, 23, 24, 25, 26],  [58, 59, 60, 61, 62, 63, 64],
+        [27, 28, 29, 30, 31        ],  [        65, 66, 67, 68, 69],
+        [                    32, 33],  [70, 71                    ],
+        [                        34],  [72                        ],
+        [                35, 36, 37],  [73, 74, 75                ],
+    ]
+}
+
+ROW_INDENTS = {
+    'ergodox_ez': [0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 5, 0, 6, 0, 4, 0]
+}
+
+BLANK_LAYOUTS = [
+# Compact Layout
+"""
+.------------------------------------.------------------------------------.
+|     |    |    |    |    |    |     |     |    |    |    |    |    |     |
+!-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
+|     |    |    |    |    |    |     |     |    |    |    |    |    |     |
+!-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
+|     |    |    |    |    |    |-----!-----!    |    |    |    |    |     |
+!-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
+|     |    |    |    |    |    |     |     |    |    |    |    |    |     |
+'-----+----+----+----+----+----------'----------+----+----+----+----+-----'
+ |    |    |    |    |    |                     !    |    |    |    |    |
+ '------------------------'                     '------------------------'
+                        .-----------. .-----------.
+                        |     |     | !     |     |
+                  .-----+-----+-----! !-----+-----+-----.
+                  !     !     |     | !     |     !     !
+                  !     !     !-----! !-----!     !     !
+                  |     |     |     | !     |     |     |
+                  '-----------------' '-----------------'
+""",
+
+# Wide Layout
+"""
+.---------------------------------------------. .---------------------------------------------.
+|       |     |     |     |     |     |       | !       |     |     |     |     |     |       |
+!-------+-----+-----+-----+-----+-------------! !-------+-----+-----+-----+-----+-----+-------!
+|       |     |     |     |     |     |       | !       |     |     |     |     |     |       |
+!-------+-----+-----+-----x-----x-----!       ! !       !-----x-----x-----+-----+-----+-------!
+|       |     |     |     |     |     |-------! !-------!     |     |     |     |     |       |
+!-------+-----+-----+-----x-----x-----!       ! !       !-----x-----x-----+-----+-----+-------!
+|       |     |     |     |     |     |       | !       |     |     |     |     |     |       |
+'-------+-----+-----+-----+-----+-------------' '-------------+-----+-----+-----+-----+-------'
+ |      |     |     |     |     |                             !     |     |     |     |      |
+ '------------------------------'                             '------------------------------'
+                              .---------------. .---------------.
+                              |       |       | !       |       |
+                      .-------+-------+-------! !-------+-------+-------.
+                      !       !       |       | !       |       !       !
+                      !       !       !-------! !-------!       !       !
+                      |       |       |       | !       |       |       |
+                      '-----------------------' '-----------------------'
+""",
+]
+
+
+DEFAULT_CONFIG = {
+    "keymaps_includes": [
+        "keymap_common.h",
+    ],
+    'filler': "-+.'!:x",
+    'separator': "|",
+    'default_key_prefix': ["KC_"],
+}
+
+
+SECTIONS = [
+    'layout_config',
+    'layers',
+]
+
+
+#       Markdown Parsing
+
+ONELINE_COMMENT_RE = re.compile(r"""
+    ^                       # comment must be at the start of the line
+    \s*                     # arbitrary whitespace
+    //                      # start of the comment
+    (.*)                    # the comment
+    $                       # until the end of line
+""", re.MULTILINE | re.VERBOSE
+)
+
+INLINE_COMMENT_RE = re.compile(r"""
+    ([\,\"\[\]\{\}\d])      # anythig that might end a expression
+    \s+                     # comment must be preceded by whitespace
+    //                      # start of the comment
+    \s                      # and succeded by whitespace
+    (?:[^\"\]\}\{\[]*)      # the comment (except things which might be json)
+    $                       # until the end of line
+""", re.MULTILINE | re.VERBOSE)
+
+TRAILING_COMMA_RE = re.compile(r"""
+    ,                       # the comma
+    (?:\s*)                 # arbitrary whitespace
+    $                       # only works if the trailing comma is followed by newline
+    (\s*)                   # arbitrary whitespace
+    ([\]\}])                # end of an array or object
+""", re.MULTILINE | re.VERBOSE)
+
+
+def loads(raw_data):
+    if isinstance(raw_data, bytes):
+        raw_data = raw_data.decode('utf-8')
+
+    raw_data = ONELINE_COMMENT_RE.sub(r"", raw_data)
+    raw_data = INLINE_COMMENT_RE.sub(r"\1", raw_data)
+    raw_data = TRAILING_COMMA_RE.sub(r"\1\2", raw_data)
+    return json.loads(raw_data)
+
+
+def parse_config(path):
+    def reset_section():
+        section.update({
+            'name': section.get('name', ""),
+            'sub_name': "",
+            'start_line': -1,
+            'end_line': -1,
+            'code_lines': [],
+        })
+
+    def start_section(line_index, line):
+        end_section()
+        if line.startswith("# "):
+            name = line[2:]
+        elif line.startswith("## "):
+            name = line[3:]
+        else:
+            name = ""
+
+        name = name.strip().replace(" ", "_").lower()
+        if name in SECTIONS:
+            section['name'] = name
+        else:
+            section['sub_name'] = name
+        section['start_line'] = line_index
+
+    def end_section():
+        if section['start_line'] >= 0:
+            if section['name'] == 'layout_config':
+                config.update(loads("\n".join(
+                    section['code_lines']
+                )))
+            elif section['sub_name'].startswith('layer'):
+                layer_name = section['sub_name']
+                config['layer_lines'][layer_name] = section['code_lines']
+
+        reset_section()
+
+    def amend_section(line_index, line):
+        section['end_line'] = line_index
+        section['code_lines'].append(line)
+
+    config = DEFAULT_CONFIG.copy()
+    config.update({
+        'layer_lines': collections.OrderedDict(),
+        'macro_ids': {'UM'},
+        'unicode_macros': {},
+    })
+
+    section = {}
+    reset_section()
+
+    with io.open(path, encoding="utf-8") as fh:
+        for i, line in enumerate(fh):
+            if line.startswith("#"):
+                start_section(i, line)
+            elif line.startswith("    "):
+                amend_section(i, line[4:])
+            else:
+                # TODO: maybe parse description
+                pass
+
+    end_section()
+    assert 'layout' in config
+    return config
+
+#       header file parsing
+
+IF0_RE = re.compile(r"""
+    ^
+    #if 0
+    $.*?
+    #endif
+""", re.MULTILINE | re.DOTALL | re.VERBOSE)
+
+
+COMMENT_RE = re.compile(r"""
+    /\*
+    .*?
+    \*/"
+""", re.MULTILINE | re.DOTALL | re.VERBOSE)
+
+
+def read_header_file(path):
+    with io.open(path, encoding="utf-8") as fh:
+        data = fh.read()
+    data, _ = COMMENT_RE.subn("", data)
+    data, _ = IF0_RE.subn("", data)
+    return data
+
+
+def regex_partial(re_str_fmt, flags):
+    def partial(*args, **kwargs):
+        re_str = re_str_fmt.format(*args, **kwargs)
+        return re.compile(re_str, flags)
+    return partial
+
+
+KEYDEF_REP = regex_partial(r"""
+    #define
+    \s
+    (
+        (?:{})          # the prefixes
+        (?:\w+)         # the key name
+    )                   # capture group end
+""", re.MULTILINE | re.DOTALL | re.VERBOSE)
+
+
+ENUM_RE = re.compile(r"""
+    (
+        enum
+        \s\w+\s
+        \{
+        .*?             # the enum content
+        \}
+        ;
+    )                   # capture group end
+""", re.MULTILINE | re.DOTALL | re.VERBOSE)
+
+
+ENUM_KEY_REP = regex_partial(r"""
+    (
+        {}              # the prefixes
+        \w+             # the key name
+    )                   # capture group end
+""", re.MULTILINE | re.DOTALL | re.VERBOSE)
+
+
+def parse_keydefs(config, data):
+    prefix_options = "|".join(config['key_prefixes'])
+    keydef_re = KEYDEF_REP(prefix_options)
+    enum_key_re = ENUM_KEY_REP(prefix_options)
+    for match in keydef_re.finditer(data):
+        yield match.groups()[0]
+
+    for enum_match in ENUM_RE.finditer(data):
+        enum = enum_match.groups()[0]
+        for key_match in enum_key_re.finditer(enum):
+            yield key_match.groups()[0]
+
+
+def parse_valid_keys(config, out_path):
+    basepath = os.path.abspath(os.path.join(os.path.dirname(out_path)))
+    dirpaths = []
+    subpaths = []
+    while len(subpaths) < 6:
+        path = os.path.join(basepath, *subpaths)
+        dirpaths.append(path)
+        dirpaths.append(os.path.join(path, "tmk_core", "common"))
+        dirpaths.append(os.path.join(path, "quantum"))
+        subpaths.append('..')
+
+    includes = set(config['keymaps_includes'])
+    includes.add("keycode.h")
+
+    valid_keycodes = set()
+    for dirpath, include in it.product(dirpaths, includes):
+        include_path = os.path.join(dirpath, include)
+        if os.path.exists(include_path):
+            header_data = read_header_file(include_path)
+            valid_keycodes.update(
+                parse_keydefs(config, header_data)
+            )
+    return valid_keycodes
+
+
+#       Keymap Parsing
+
+def iter_raw_codes(layer_lines, filler, separator):
+    filler_re = re.compile("[" + filler + " ]")
+    for line in layer_lines:
+        line, _ = filler_re.subn("", line.strip())
+        if not line:
+            continue
+        codes = line.split(separator)
+        for code in codes[1:-1]:
+            yield code
+
+
+def iter_indexed_codes(raw_codes, key_indexes):
+    key_rows = {}
+    key_indexes_flat = []
+
+    for row_index, key_indexes in enumerate(key_indexes):
+        for key_index in key_indexes:
+            key_rows[key_index] = row_index
+        key_indexes_flat.extend(key_indexes)
+    assert len(raw_codes) == len(key_indexes_flat)
+    for raw_code, key_index in zip(raw_codes, key_indexes_flat):
+        # we keep track of the row mostly for layout purposes
+        yield raw_code, key_index, key_rows[key_index]
+
+
+LAYER_CHANGE_RE = re.compile(r"""
+    (DF|TG|MO)\(\d+\)
+""", re.VERBOSE)
+
+
+MACRO_RE = re.compile(r"""
+    M\(\w+\)
+""", re.VERBOSE)
+
+
+UNICODE_RE = re.compile(r"""
+    U[0-9A-F]{4}
+""", re.VERBOSE)
+
+
+NON_CODE = re.compile(r"""
+    ^[^A-Z0-9_]$
+""", re.VERBOSE)
+
+
+def parse_uni_code(raw_code):
+    macro_id = "UC_" + (
+        unicodedata.name(raw_code)
+        .replace(" ", "_")
+        .replace("-", "_")
+    )
+    code = "M({})".format(macro_id)
+    uc_hex = "{:04X}".format(ord(raw_code))
+    return code, macro_id, uc_hex
+
+
+def parse_key_code(raw_code, key_prefixes, valid_keycodes):
+    if raw_code in valid_keycodes:
+        return raw_code
+
+    for prefix in key_prefixes:
+        code = prefix + raw_code
+        if code in valid_keycodes:
+            return code
+
+
+def parse_code(raw_code, key_prefixes, valid_keycodes):
+    if not raw_code:
+        return 'KC_TRNS', None, None
+
+    if LAYER_CHANGE_RE.match(raw_code):
+        return raw_code, None, None
+
+    if MACRO_RE.match(raw_code):
+        macro_id = raw_code[2:-1]
+        return raw_code, macro_id, None
+
+    if UNICODE_RE.match(raw_code):
+        hex_code = raw_code[1:]
+        return parse_uni_code(chr(int(hex_code, 16)))
+
+    if NON_CODE.match(raw_code):
+        return parse_uni_code(raw_code)
+
+    code = parse_key_code(raw_code, key_prefixes, valid_keycodes)
+    return code, None, None
+
+
+def parse_keymap(config, key_indexes, layer_lines, valid_keycodes):
+    keymap = {}
+    raw_codes = list(iter_raw_codes(
+        layer_lines, config['filler'], config['separator']
+    ))
+    indexed_codes = iter_indexed_codes(raw_codes, key_indexes)
+    key_prefixes = config['key_prefixes']
+    for raw_code, key_index, row_index in indexed_codes:
+        code, macro_id, uc_hex = parse_code(
+            raw_code, key_prefixes, valid_keycodes
+        )
+        # TODO: line numbers for invalid codes
+        err_msg = "Could not parse key '{}' on row {}".format(
+            raw_code, row_index
+        )
+        assert code is not None, err_msg
+        # print(repr(raw_code), repr(code), macro_id, uc_hex)
+        if macro_id:
+            config['macro_ids'].add(macro_id)
+        if uc_hex:
+            config['unicode_macros'][macro_id] = uc_hex
+        keymap[key_index] = (code, row_index)
+    return keymap
+
+
+def parse_keymaps(config, valid_keycodes):
+    keymaps = collections.OrderedDict()
+    key_indexes = config.get(
+        'key_indexes', KEYBOARD_LAYOUTS[config['layout']]
+    )
+    # TODO: maybe validate key_indexes
+
+    for layer_name, layer_lines, in config['layer_lines'].items():
+        keymaps[layer_name] = parse_keymap(
+            config, key_indexes, layer_lines, valid_keycodes
+        )
+    return keymaps
+
+#       keymap.c output
+
+USERCODE = """
+// Runs just one time when the keyboard initializes.
+void matrix_init_user(void) {
+
+};
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_user(void) {
+    uint8_t layer = biton32(layer_state);
+
+    ergodox_board_led_off();
+    ergodox_right_led_1_off();
+    ergodox_right_led_2_off();
+    ergodox_right_led_3_off();
+    switch (layer) {
+        case L1:
+            ergodox_right_led_1_on();
+            break;
+        case L2:
+            ergodox_right_led_2_on();
+            break;
+        case L3:
+            ergodox_right_led_3_on();
+            break;
+        case L4:
+            ergodox_right_led_1_on();
+            ergodox_right_led_2_on();
+            break;
+        case L5:
+            ergodox_right_led_1_on();
+            ergodox_right_led_3_on();
+            break;
+        // case L6:
+        //     ergodox_right_led_2_on();
+        //     ergodox_right_led_3_on();
+        //     break;
+        // case L7:
+        //     ergodox_right_led_1_on();
+        //     ergodox_right_led_2_on();
+        //     ergodox_right_led_3_on();
+        //     break;
+        default:
+            ergodox_board_led_off();
+            break;
+    }
+};
+"""
+
+MACROCODE = """
+#define UC_MODE_WIN 0
+#define UC_MODE_LINUX 1
+#define UC_MODE_OSX 2
+
+// TODO: allow default mode to be configured
+static uint16_t unicode_mode = UC_MODE_WIN;
+
+uint16_t hextokeycode(uint8_t hex) {{
+    if (hex == 0x0) {{
+        return KC_P0;
+    }}
+    if (hex < 0xA) {{
+        return KC_P1 + (hex - 0x1);
+    }}
+    return KC_A + (hex - 0xA);
+}}
+
+void unicode_action_function(uint16_t hi, uint16_t lo) {{
+    switch (unicode_mode) {{
+    case UC_MODE_WIN:
+        register_code(KC_LALT);
+
+        register_code(KC_PPLS);
+        unregister_code(KC_PPLS);
+
+        register_code(hextokeycode((hi & 0xF0) >> 4));
+        unregister_code(hextokeycode((hi & 0xF0) >> 4));
+        register_code(hextokeycode((hi & 0x0F)));
+        unregister_code(hextokeycode((hi & 0x0F)));
+        register_code(hextokeycode((lo & 0xF0) >> 4));
+        unregister_code(hextokeycode((lo & 0xF0) >> 4));
+        register_code(hextokeycode((lo & 0x0F)));
+        unregister_code(hextokeycode((lo & 0x0F)));
+
+        unregister_code(KC_LALT);
+        break;
+    case UC_MODE_LINUX:
+        register_code(KC_LCTL);
+        register_code(KC_LSFT);
+
+        register_code(KC_U);
+        unregister_code(KC_U);
+
+        register_code(hextokeycode((hi & 0xF0) >> 4));
+        unregister_code(hextokeycode((hi & 0xF0) >> 4));
+        register_code(hextokeycode((hi & 0x0F)));
+        unregister_code(hextokeycode((hi & 0x0F)));
+        register_code(hextokeycode((lo & 0xF0) >> 4));
+        unregister_code(hextokeycode((lo & 0xF0) >> 4));
+        register_code(hextokeycode((lo & 0x0F)));
+        unregister_code(hextokeycode((lo & 0x0F)));
+
+        unregister_code(KC_LCTL);
+        unregister_code(KC_LSFT);
+        break;
+    case UC_MODE_OSX:
+        break;
+    }}
+}}
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {{
+    if (!record->event.pressed) {{
+        return MACRO_NONE;
+    }}
+    // MACRODOWN only works in this function
+    switch(id) {{
+        case UM:
+            unicode_mode = (unicode_mode + 1) % 2;
+            break;
+{macro_cases}
+{unicode_macro_cases}
+        default:
+            break;
+    }}
+    return MACRO_NONE;
+}};
+"""
+
+
+UNICODE_MACRO_TEMPLATE = """
+case {macro_id}:
+    unicode_action_function(0x{hi:02x}, 0x{lo:02x});
+    break;
+""".strip()
+
+
+def unicode_macro_cases(config):
+    for macro_id, uc_hex in config['unicode_macros'].items():
+        hi = int(uc_hex, 16) >> 8
+        lo = int(uc_hex, 16) & 0xFF
+        unimacro_keys = ", ".join(
+            "T({})".format(
+                "KP_" + digit if digit.isdigit() else digit
+            ) for digit in uc_hex
+        )
+        yield UNICODE_MACRO_TEMPLATE.format(
+            macro_id=macro_id, hi=hi, lo=lo
+        )
+
+
+def iter_keymap_lines(keymap, row_indents=None):
+    col_widths = {}
+    col = 0
+    # first pass, figure out the column widths
+    prev_row_index = None
+    for code, row_index in keymap.values():
+        if row_index != prev_row_index:
+            col = 0
+            if row_indents:
+                col = row_indents[row_index]
+        col_widths[col] = max(len(code), col_widths.get(col, 0))
+        prev_row_index = row_index
+        col += 1
+
+    # second pass, yield the cell values
+    col = 0
+    prev_row_index = None
+    for key_index in sorted(keymap):
+        code, row_index = keymap[key_index]
+        if row_index != prev_row_index:
+            col = 0
+            yield "\n"
+            if row_indents:
+                for indent_col in range(row_indents[row_index]):
+                    pad = " " * (col_widths[indent_col] - 4)
+                    yield (" /*-*/" + pad)
+                col = row_indents[row_index]
+        else:
+            yield pad
+        yield " {}".format(code)
+        if key_index < len(keymap) - 1:
+            yield ","
+            # This will be yielded on the next iteration when
+            # we know that we're not at the end of a line.
+            pad = " " * (col_widths[col] - len(code))
+        prev_row_index = row_index
+        col += 1
+
+
+def iter_keymap_parts(config, keymaps):
+    # includes
+    for include_path in config['keymaps_includes']:
+        yield '#include "{}"\n'.format(include_path)
+
+    yield "\n"
+
+    # definitions
+    for i, macro_id in enumerate(sorted(config['macro_ids'])):
+        yield "#define {} {}\n".format(macro_id, i)
+
+    yield "\n"
+
+    for i, layer_name in enumerate(config['layer_lines']):
+        yield '#define L{0:<3} {0:<5}  // {1}\n'.format(i, layer_name)
+
+    yield "\n"
+
+    # keymaps
+    yield "const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {\n"
+
+    for i, layer_name in enumerate(config['layer_lines']):
+        # comment
+        layer_lines = config['layer_lines'][layer_name]
+        prefixed_lines = " * " + " * ".join(layer_lines)
+        yield "/*\n{} */\n".format(prefixed_lines)
+
+        # keymap codes
+        keymap = keymaps[layer_name]
+        row_indents = ROW_INDENTS.get(config['layout'])
+        keymap_lines = "".join(iter_keymap_lines(keymap, row_indents))
+        yield "[L{0}] = KEYMAP({1}\n),\n".format(i, keymap_lines)
+
+    yield "};\n\n"
+
+    # no idea what this is for
+    yield "const uint16_t PROGMEM fn_actions[] = {};\n"
+
+    # macros
+    yield MACROCODE.format(
+        macro_cases="",
+        unicode_macro_cases="\n".join(unicode_macro_cases(config)),
+    )
+
+    # TODO: dynamically create blinking lights
+    yield USERCODE
+
+
+def main(argv=sys.argv[1:]):
+    if not argv or '-h' in argv or '--help' in argv:
+        print(__doc__)
+        return 0
+
+    in_path = os.path.abspath(argv[0])
+    if not os.path.exists(in_path):
+        print("No such file '{}'".format(in_path))
+        return 1
+
+    if len(argv) > 1:
+        out_path = os.path.abspath(argv[1])
+    else:
+        dirname = os.path.dirname(in_path)
+        out_path = os.path.join(dirname, "keymap.c")
+
+    config = parse_config(in_path)
+    valid_keys = parse_valid_keys(config, out_path)
+    keymaps = parse_keymaps(config, valid_keys)
+
+    with io.open(out_path, mode="w", encoding="utf-8") as fh:
+        for part in iter_keymap_parts(config, keymaps):
+            fh.write(part)
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/keyboards/ergodox_ez/keymaps/german-manuneo/compiled.hex b/keyboards/ergodox_ez/keymaps/german-manuneo/compiled.hex
new file mode 100644
index 0000000000..bef079b16a
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/german-manuneo/compiled.hex
@@ -0,0 +1,1274 @@
+:100000000C9427040C946B040C946B040C946B04F8

+:100010000C946B040C946B040C946B040C946B04A4

+:100020000C946B040C946B040C9403110C94D51178

+:100030000C946B040C946B040C946B040C946B0484

+:100040000C946B040C94DF250C946B040C946B04DF

+:100050000C946B040C94721F0C946B040C946B0442

+:100060000C946B040C946B040C946B040C946B0454

+:100070000C946B040C946B040C946B040C946B0444

+:100080000C946B040C946B040C946B040C946B0434

+:100090000C946B040C946B040C946B040C946B0424

+:1000A0000C946B040C946B040C946B040F08DC0729

+:1000B000C707210848087B085D0863087808A60878

+:1000C0009B0866089E08B20757088F089808D9074A

+:1000D000D0071E081508FD07D30792072A088008D5

+:1000E00089089508030833081208AC0786085108E8

+:1000F000F40709080008E8078C08F7079D0754086B

+:10010000EE072D088C071808CA07B807E207DF07B3

+:10011000360806087208A307F1071B088F07240892

+:100120006F0875083F08C1075A08AF07D607BB0715

+:1001300030086008A10895070C08270869083908E5

+:10014000BE0792084E08A907FA07C4074508CD075D

+:100150006C08A6073C084B089807B507AB0883084E

+:10016000E507A0074208EB0780074212641252130A

+:1001700064125213A912CC12521321133413031612

+:1001800003163216321668168816B917B917931661

+:10019000B91743174317AA17B917B917B317501749

+:1001A0005017501750175017501750175017501717

+:1001B00050175017501750175017501750176217F5

+:1001C0006F1776177D178717055204520152035295

+:1001D000010000001E001B0018002F000100290074

+:1001E0001F0013000C003300E300E10020000900B1

+:1001F00004003400E2002A0021001A000800060072

+:10020000E000650022000A00120019000000490009

+:100210002E004A0000004D00000002542E0202543D

+:1002200000002B0000005E3023000B0016000500CC

+:1002300000004C0024000D0011001000E4004B00F1

+:1002400025000E0015003600E6002C0026000F00E9

+:100250001700370050002800270014000700520044

+:1002600051004E0035001C002D001D004F00000005

+:100270000100010001000100010000001E02300227

+:1002800038020100010001001F0264143800300030

+:1002900001000100200224022302270201000100C4

+:1002A000010024142514010001000100010027149D

+:1002B00026140100000001000100010000000100FF

+:1002C0000000010001000100000001000000010029

+:1002D0000100310021022D14000001000100640022

+:1002E00025022202010001000100640226023602FA

+:1002F0000100010001000100301437023830010014

+:1003000035021F02310255300230010001000100A8

+:100310002D0201003D30000001000100010001003C

+:10032000010000003A00010001000100010001008D

+:100330003B00010001000100010001003C00010040

+:1003400001000100010001003D0001000100010069

+:10035000010001003E000100010001000000010059

+:100360004400010000000100000001004500010000

+:1003700000005300000001003F00010001000100E7

+:100380000000010040005F005C00590062000100B5

+:10039000410060005D005A008500010042006100DC

+:1003A0005E005B00630001004300550056005700EB

+:1003B0005800010067005400560057005800000024

+:1003C0000100010001000100010000004D30393042

+:1003D00001005B3001000100513058303C303B30AF

+:1003E000010001005030013014145D3001000100A3

+:1003F0004A30593008145C30010001004930573050

+:100400000430003000000100053001000000010050

+:1004100000000100010001000000010000000100D7

+:100420004F305A3037301E02000001004E300100BC

+:100430004B30010001000100483056305430533039

+:10044000010001004C30010003303A30010001008E

+:100450005230010001000100010001000100010013

+:100460000100010001000000010001000100010085

+:100470000100000042302030343001000100010052

+:1004800046302E30263033300100010045302D300B

+:100490001E3001000100010040302B3022300100ED

+:1004A000010001003F3025302C3001000000010028

+:1004B0000100010000000100000001000100010036

+:1004C00000000100000001004430233031301F30B3

+:1004D00000000100433035302A302930010001008E

+:1004E0003E3027303030010001000100413028301B

+:1004F00032300100010001004730010021300100CD

+:10050000010001000100363024302F3001000000CE

+:10051000010001000100010001000000010008309D

+:100520001B30010001000100010015300D301A30B0

+:10053000010001000100143006300100010001003B

+:10054000010012300A3001000100010001000C30EE

+:100550001330010000000100010001000000010053

+:100560000000010001000100000001000000010086

+:1005700001000B30183007300000010001001C3072

+:10058000113010300100010001000E301730010061

+:100590000100010001000F301930010001000100CD

+:1005A00001000100093001000100010001001D30BF

+:1005B00001001630010000000100010001000100EF

+:1005C0000100000001000100010001000100010024

+:1005D0000100010001000100010001000100010013

+:1005E0000100010001000100010001000100010003

+:1005F00001000100010001000100010000000100F4

+:1006000001000100000001000000010001000100E4

+:1006100000000100000001000100010001000100D4

+:1006200000000100010001000100010001000100C3

+:1006300001000100010001000100010001000100B2

+:1006400001000100010001000100010001000100A2

+:100650000100010001000100010001000100000093

+:1006600016034500720067006F0044006F007800B9

+:10067000200045005A000000160345007200670084

+:100680006F0044006F007800200045005A00000011

+:100690000403090409026D00040100A0FA09040022

+:1006A000000103010100092111010001223F00079F

+:1006B00005810308000A0904010001030102000981

+:1006C0002111010001224D000705820308000A09DB

+:1006D000040200010300000009211101000122367B

+:1006E000000705830308000A090403000103000052

+:1006F00000092111010001223900070584031000BF

+:10070000011201100100000008EDFE0713010001B5

+:1007100002000105010906A101050719E029E715F5

+:100720000025019508750181020508190129059523

+:1007300005750191029501750391010507190029BD

+:100740007715002501957875018102C005010980A2

+:10075000A101850216010026B7001A01002AB70080

+:10076000751095018100C0050C0901A101850316D2

+:100770000100269C021A01002A9C02751095018135

+:1007800000C005010902A1010901A1000509190123

+:10079000290515002501950575018102950175034F

+:1007A00081010501093009311581257F9502750800

+:1007B000810609381581257F950175088106050C8C

+:1007C0000A38021581257F950175088106C0C0058C

+:1007D000010906A101050719E029E7150025019582

+:1007E0000875018102950175088101050819012923

+:1007F000059505750191029501750391010507198C

+:100800000029FF150025FF950675088100C000002E

+:10081000000000000000000000010204060A0F179B

+:10082000202C3A4A5D71879DB3C7DAE9F5FCFFFCDD

+:10083000F5E9DAC7B39D87715D4A3A2C20170F0A94

+:100840000604020100000000000000000000112466

+:100850001FBECFEFDAE0DEBFCDBF04B603FE24C07B

+:100860008091FD019091FE01A091FF01B0910002E5

+:100870008730904BA740B04BB9F41092FD01109215

+:10088000FE011092FF011092000214BE84B7877F10

+:1008900084BF88E10FB6F8948093600010926000E6

+:1008A0000FBEE0E0FFE3099511E0A0E0B1E0ECE469

+:1008B000FFE402C005900D92A433B107D9F711E00F

+:1008C000A4E3B1E001C01D92AD3FB107E1F70E9482

+:1008D000470E0C94A4270C9400001092B9008AE0F3

+:1008E0008093B800089594EA9093BC009091BC0066

+:1008F00097FFFCCF9091B900987F983021F090310C

+:1009000011F081E008958093BB0084E88093BC00DF

+:100910008091BC0087FFFCCF8091B900887F88312F

+:1009200011F0803471F780E0089584E98093BC0071

+:100930008091BC0084FDFCCF08958093BB0084E8C7

+:100940008093BC008091BC0087FFFCCF9091B900E0

+:10095000987F81E0983209F480E0089584E88093DC

+:10096000BC008091BC0087FFFCCF8091BB00089544

+:1009700080910101811115C080E40E94730480936D

+:10098000010181110CC082E10E949D04809301014C

+:10099000811105C08FEF0E949D04809301010E9488

+:1009A000950484B1807F84B985B1807F85B98AB18F

+:1009B000837F8AB98BB1837F8BB93E98469808951F

+:1009C0000E947306809301010E94B80480B38C706A

+:1009D00080BB81B3836F81BBA5E3B1E0E3E4F1E0C9

+:1009E0008EE08E0F11921D928E13FCCF0C945D063B

+:1009F000BF92CF92DF92EF92FF920F931F93CF930C

+:100A0000DF9380910101882379F0809134018F5F19

+:100A100080933401811108C00E9473068093010104

+:100A2000811102C00E94050605E311E0C0E0D0E09C

+:100A3000DD24D39482E0C82EEE24E394F12CC73059

+:100A4000D10500F580910101811164C080E40E940C

+:100A5000730480930101811112C082E10E949D0400

+:100A60008093010181110BC0C7010C2E01C0880FBA

+:100A70000A94EAF780950E949D04809301010E94E8

+:100A8000950448C0CA30A1F028F4C83059F0C930E4

+:100A900061F005C0CC3089F070F0CD3089F0209A3B

+:100AA000289810C0219A29980DC0229A2A980AC025

+:100AB000239A2B9807C0529A01C0539A5B9802C0A0

+:100AC0003E9A469890EA9A95F1F79FB1799902C0BB

+:100AD00082E001C080E091709D25982B7C9902C036

+:100AE00084E001C080E0892B7D9902C038E001C01C

+:100AF00030E0832B7E9902C020E101C020E0822BF0

+:100B00009FB19095991F9927991F9295990F907E63

+:100B1000892B0FC080910101811149C080E40E949E

+:100B2000730480930101882379F1B12C0E9495040C

+:100B30008B2DF8019081981719F08083C0920001E5

+:100B40000E94B80421960F5F1F4FCE30D10509F0E7

+:100B500076CF80910001882361F18150809300015C

+:100B6000882339F08FE99FE00197F1F700C000007A

+:100B700020C0A3E4B1E0E5E3F1E0CF01825F919111

+:100B80009D938E13FCCF15C083E10E949D0480933A

+:100B900001018111CACF81E40E9473048093010195

+:100BA0008111C3CF0E94AE04B82EB094BFCF80E0B5

+:100BB000C0CF0E94030681E0DF91CF911F910F917A

+:100BC000FF90EF90DF90CF90BF900895E82FF0E076

+:100BD000ED5BFE4F8081089508950F931F93CF938F

+:100BE000DF93C3E4D1E010E00C2F025F899190E025

+:100BF0000E94981E180F0C13F9CF812FDF91CF910F

+:100C00001F910F9108950C94B50856985E982598F9

+:100C10002D9826982E9827982F988FEF90E09093F4

+:100C200089008093880090938B0080938A00909332

+:100C30008D0080938C00259A2D9A2FEF80E792E00B

+:100C4000215080409040E1F700C00000269A2E9A83

+:100C50002FEF80E792E0215080409040E1F700C004

+:100C60000000279A2F9A2FEF80E792E021508040D2

+:100C70009040E1F700C0000025982D982FEF80E705

+:100C800092E0215080409040E1F700C0000026989B

+:100C90002E982FEF80E792E0215080409040E1F7BE

+:100CA00000C0000027982F9856985E9825982D9898

+:100CB00026982E9827982F98089589EA8093800087

+:100CC00089E08093810024982C983F988AB18F7492

+:100CD0008AB96E98479A8BB1806B8BB9769A0E94CD

+:100CE00005060C94B40880E28093010180915101C3

+:100CF00081110EC00E946D0481E0809351012FEF9D

+:100D000083ED90E3215080409040E1F700C0000067

+:100D100080E40E9473048093010181112EC00E941F

+:100D20009D0480930101811128C00E949D0480933D

+:100D30000101811122C08FE30E949D048093010173

+:100D400081111BC00E94950480E40E94730480936B

+:100D50000101811112C08CE00E949D048093010169

+:100D600081110BC00E949D0480930101811105C077

+:100D70008FE30E949D04809301010E94950480915D

+:100D800001010895882359F0282F30E08A3020F49B

+:100D9000C901885A9F4F0895C9010697089582E6B0

+:100DA00090E008950F931F93CF93DF938C01EB0195

+:100DB0008091520190915301009709F448C0019726

+:100DC00009F089C080EE0E94A71481EE0E94A7144A

+:100DD00088E10E94A71488E10E946F15C801807FF6

+:100DE000992724E0969587952A95E1F70E94C206F7

+:100DF000182F0E94A714812F0E946F15802F8F70CB

+:100E00000E94C206182F0E94A714812F0E946F15FE

+:100E1000CE01807F992734E0969587953A95E1F742

+:100E20000E94C206D82F0E94A7148D2F0E946F1512

+:100E30008C2F8F700E94C206C82F0E94A7148C2F7F

+:100E40000E946F1580EE0E946F1581EE3EC082EE0B

+:100E50000E94A71487E50E94A71487E50E946F15DA

+:100E6000C801807F992744E0969587954A95E1F7D8

+:100E70000E94C206182F0E94A714812F0E946F158E

+:100E8000802F8F700E94C206182F0E94A714812FF6

+:100E90000E946F15CE01807F992754E09695879523

+:100EA0005A95E1F70E94C206D82F0E94A7148D2FF1

+:100EB0000E946F158C2F8F700E94C206C82F0E944F

+:100EC000A7148C2F0E946F1582EEDF91CF911F9196

+:100ED0000F910C946F15DF91CF911F910F91089591

+:100EE000FC018281882309F43CC1862F90E08F3574

+:100EF000910508F036C1FC01EA5AFF4F0C945427C3

+:100F0000809152019091530101968170992790939D

+:100F100053018093520125C16FEB70E019C160E964

+:100F200070E008C061EA70E013C163E870E00BC1D3

+:100F30006BE570E081E290E012C16BEB70E008C1FC

+:100F400063E570E0F7CF6EEB70E002C164E070E043

+:100F5000D4C069EB70E001C162EB70E0F9C065E8F4

+:100F600070E0F1C069E970E0F3C065E570E0E2CFE0

+:100F700068EC70E0EDC069E870E0E5C064E770E03F

+:100F8000E2C062E970E0D6CF66E770E0DCC063E9FA

+:100F900070E0D0CF60EC70E0DBC062EB70E0DDC0F1

+:100FA00069EA70E0D5C068EA70E0D2C064E870E039

+:100FB000CAC06DE970E0CCC067EF70E0CEC063ECF2

+:100FC00070E0C6C061EC70E0C3C069E570E0B2CF0C

+:100FD00063EB70E0BDC064E570E0ACCF6DEB70E03A

+:100FE000B7C066EB70E0B4C065EB70E0B1C06AEB0F

+:100FF00070E0AEC067E770E0A6C060EA70E0A8C02D

+:1010000062EC70E0A5C06EE970E0A2C068EB70E031

+:101010009FC067EB70E09CC062E870E094C063E43E

+:1010200070E06BC061EB70E093C066EA70E090C066

+:1010300066EC70E08DC06EE170E05FC06FE970E05B

+:1010400087C068E070E059C067ED70E086C060E876

+:1010500070E079C063EA70E07BC069EC70E078C052

+:1010600061E870E070C066E970E072C064EC70E046

+:101070006FC065E770E067C063E070E03EC061EBA1

+:1010800070E06BC06EEB70E068C063EB70E065C051

+:1010900065E070E032C061E970E04CCF69E770E074

+:1010A00052C064EB70E054C06