Merge branch 'release/debian/1%5.2.0Beta2.1-1' into masterHEADdebian/1%5.2.0Beta2.1-1master

9 files changed, 4281 insertions, 2068 deletions

diff --git a/app/help/CMakeLists.txt b/app/help/CMakeLists.txt
index 2b7efa7..34c8d33 100644
--- a/app/help/CMakeLists.txt
+++ b/app/help/CMakeLists.txt
@@ -1,9 +1,8 @@
 PROJECT(help)
 
-ADD_EXECUTABLE(genhelp genhelp.c)
+ADD_EXECUTABLE(genhelp genhelp.c cJSON.c cJSON.h)
 
 ADD_EXECUTABLE(genmessages genmessages.c)
-GET_TARGET_PROPERTY(genmessages_EXE genmessages LOCATION)
 
 IF(XTRKCAD_USE_GETTEXT)
 	SET(GENMESSAGES_OPTS "-i18n")
@@ -14,7 +13,7 @@ ENDIF(XTRKCAD_USE_GETTEXT)
 ADD_CUSTOM_COMMAND(
 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/messages.h ${CMAKE_CURRENT_BINARY_DIR}/messages.but
 	DEPENDS genmessages ${CMAKE_CURRENT_SOURCE_DIR}/messages.in
-	COMMAND ${genmessages_EXE} ${GENMESSAGES_OPTS} ${CMAKE_CURRENT_SOURCE_DIR}/messages.in ${CMAKE_CURRENT_BINARY_DIR}/messages.but
+	COMMAND genmessages ${GENMESSAGES_OPTS} ${CMAKE_CURRENT_SOURCE_DIR}/messages.in ${CMAKE_CURRENT_BINARY_DIR}/messages.but
 	)
 
 ADD_CUSTOM_TARGET(Help ALL
diff --git a/app/help/cJSON.c b/app/help/cJSON.c
new file mode 100644
index 0000000..1733811
--- /dev/null
+++ b/app/help/cJSON.c
@@ -0,0 +1,2932 @@
+/*
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+/* cJSON */
+/* JSON parser in C. */
+
+/* disable warnings about old C89 functions in MSVC */
+#if !defined(_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+#ifdef __GNUC__
+#pragma GCC visibility push(default)
+#endif
+#if defined(_MSC_VER)
+#pragma warning (push)
+/* disable warning about single line comments in system headers */
+#pragma warning (disable : 4001)
+#endif
+
+#include <string.h>
+#include <stdio.h>
+#include <math.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <ctype.h>
+
+#ifdef ENABLE_LOCALES
+#include <locale.h>
+#endif
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
+#ifdef __GNUC__
+#pragma GCC visibility pop
+#endif
+
+#include "cJSON.h"
+
+/* define our own boolean type */
+#define true ((cJSON_bool)1)
+#define false ((cJSON_bool)0)
+
+typedef struct {
+    const unsigned char *json;
+    size_t position;
+} error;
+static error global_error = { NULL, 0 };
+
+CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void)
+{
+    return (const char*) (global_error.json + global_error.position);
+}
+
+CJSON_PUBLIC(char *) cJSON_GetStringValue(cJSON *item) {
+    if (!cJSON_IsString(item)) {
+        return NULL;
+    }
+
+    return item->valuestring;
+}
+
+/* This is a safeguard to prevent copy-pasters from using incompatible C and header files */
+#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 8)
+    #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
+#endif
+
+CJSON_PUBLIC(const char*) cJSON_Version(void)
+{
+    static char version[15];
+    sprintf(version, "%i.%i.%i", CJSON_VERSION_MAJOR, CJSON_VERSION_MINOR, CJSON_VERSION_PATCH);
+
+    return version;
+}
+
+/* Case insensitive string comparison, doesn't consider two NULL pointers equal though */
+static int case_insensitive_strcmp(const unsigned char *string1, const unsigned char *string2)
+{
+    if ((string1 == NULL) || (string2 == NULL))
+    {
+        return 1;
+    }
+
+    if (string1 == string2)
+    {
+        return 0;
+    }
+
+    for(; tolower(*string1) == tolower(*string2); (void)string1++, string2++)
+    {
+        if (*string1 == '\0')
+        {
+            return 0;
+        }
+    }
+
+    return tolower(*string1) - tolower(*string2);
+}
+
+typedef struct internal_hooks
+{
+    void *(CJSON_CDECL *allocate)(size_t size);
+    void (CJSON_CDECL *deallocate)(void *pointer);
+    void *(CJSON_CDECL *reallocate)(void *pointer, size_t size);
+} internal_hooks;
+
+#if defined(_MSC_VER)
+/* work around MSVC error C2322: '...' address of dillimport '...' is not static */
+static void * CJSON_CDECL internal_malloc(size_t size)
+{
+    return malloc(size);
+}
+static void CJSON_CDECL internal_free(void *pointer)
+{
+    free(pointer);
+}
+static void * CJSON_CDECL internal_realloc(void *pointer, size_t size)
+{
+    return realloc(pointer, size);
+}
+#else
+#define internal_malloc malloc
+#define internal_free free
+#define internal_realloc realloc
+#endif
+
+static internal_hooks global_hooks = { internal_malloc, internal_free, internal_realloc };
+
+static unsigned char* cJSON_strdup(const unsigned char* string, const internal_hooks * const hooks)
+{
+    size_t length = 0;
+    unsigned char *copy = NULL;
+
+    if (string == NULL)
+    {
+        return NULL;
+    }
+
+    length = strlen((const char*)string) + sizeof("");
+    copy = (unsigned char*)hooks->allocate(length);
+    if (copy == NULL)
+    {
+        return NULL;
+    }
+    memcpy(copy, string, length);
+
+    return copy;
+}
+
+CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks)
+{
+    if (hooks == NULL)
+    {
+        /* Reset hooks */
+        global_hooks.allocate = malloc;
+        global_hooks.deallocate = free;
+        global_hooks.reallocate = realloc;
+        return;
+    }
+
+    global_hooks.allocate = malloc;
+    if (hooks->malloc_fn != NULL)
+    {
+        global_hooks.allocate = hooks->malloc_fn;
+    }
+
+    global_hooks.deallocate = free;
+    if (hooks->free_fn != NULL)
+    {
+        global_hooks.deallocate = hooks->free_fn;
+    }
+
+    /* use realloc only if both free and malloc are used */
+    global_hooks.reallocate = NULL;
+    if ((global_hooks.allocate == malloc) && (global_hooks.deallocate == free))
+    {
+        global_hooks.reallocate = realloc;
+    }
+}
+
+/* Internal constructor. */
+static cJSON *cJSON_New_Item(const internal_hooks * const hooks)
+{
+    cJSON* node = (cJSON*)hooks->allocate(sizeof(cJSON));
+    if (node)
+    {
+        memset(node, '\0', sizeof(cJSON));
+    }
+
+    return node;
+}
+
+/* Delete a cJSON structure. */
+CJSON_PUBLIC(void) cJSON_Delete(cJSON *item)
+{
+    cJSON *next = NULL;
+    while (item != NULL)
+    {
+        next = item->next;
+        if (!(item->type & cJSON_IsReference) && (item->child != NULL))
+        {
+            cJSON_Delete(item->child);
+        }
+        if (!(item->type & cJSON_IsReference) && (item->valuestring != NULL))
+        {
+            global_hooks.deallocate(item->valuestring);
+        }
+        if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
+        {
+            global_hooks.deallocate(item->string);
+        }
+        global_hooks.deallocate(item);
+        item = next;
+    }
+}
+
+/* get the decimal point character of the current locale */
+static unsigned char get_decimal_point(void)
+{
+#ifdef ENABLE_LOCALES
+    struct lconv *lconv = localeconv();
+    return (unsigned char) lconv->decimal_point[0];
+#else
+    return '.';
+#endif
+}
+
+typedef struct
+{
+    const unsigned char *content;
+    size_t length;
+    size_t offset;
+    size_t depth; /* How deeply nested (in arrays/objects) is the input at the current offset. */
+    internal_hooks hooks;
+} parse_buffer;
+
+/* check if the given size is left to read in a given parse buffer (starting with 1) */
+#define can_read(buffer, size) ((buffer != NULL) && (((buffer)->offset + size) <= (buffer)->length))
+/* check if the buffer can be accessed at the given index (starting with 0) */
+#define can_access_at_index(buffer, index) ((buffer != NULL) && (((buffer)->offset + index) < (buffer)->length))
+#define cannot_access_at_index(buffer, index) (!can_access_at_index(buffer, index))
+/* get a pointer to the buffer at the position */
+#define buffer_at_offset(buffer) ((buffer)->content + (buffer)->offset)
+
+/* Parse the input text to generate a number, and populate the result into item. */
+static cJSON_bool parse_number(cJSON * const item, parse_buffer * const input_buffer)
+{
+    double number = 0;
+    unsigned char *after_end = NULL;
+    unsigned char number_c_string[64];
+    unsigned char decimal_point = get_decimal_point();
+    size_t i = 0;
+
+    if ((input_buffer == NULL) || (input_buffer->content == NULL))
+    {
+        return false;
+    }
+
+    /* copy the number into a temporary buffer and replace '.' with the decimal point
+     * of the current locale (for strtod)
+     * This also takes care of '\0' not necessarily being available for marking the end of the input */
+    for (i = 0; (i < (sizeof(number_c_string) - 1)) && can_access_at_index(input_buffer, i); i++)
+    {
+        switch (buffer_at_offset(input_buffer)[i])
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            case '+':
+            case '-':
+            case 'e':
+            case 'E':
+                number_c_string[i] = buffer_at_offset(input_buffer)[i];
+                break;
+
+            case '.':
+                number_c_string[i] = decimal_point;
+                break;
+
+            default:
+                goto loop_end;
+        }
+    }
+loop_end:
+    number_c_string[i] = '\0';
+
+    number = strtod((const char*)number_c_string, (char**)&after_end);
+    if (number_c_string == after_end)
+    {
+        return false; /* parse_error */
+    }
+
+    item->valuedouble = number;
+
+    /* use saturation in case of overflow */
+    if (number >= INT_MAX)
+    {
+        item->valueint = INT_MAX;
+    }
+    else if (number <= (double)INT_MIN)
+    {
+        item->valueint = INT_MIN;
+    }
+    else
+    {
+        item->valueint = (int)number;
+    }
+
+    item->type = cJSON_Number;
+
+    input_buffer->offset += (size_t)(after_end - number_c_string);
+    return true;
+}
+
+/* don't ask me, but the original cJSON_SetNumberValue returns an integer or double */
+CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number)
+{
+    if (number >= INT_MAX)
+    {
+        object->valueint = INT_MAX;
+    }
+    else if (number <= (double)INT_MIN)
+    {
+        object->valueint = INT_MIN;
+    }
+    else
+    {
+        object->valueint = (int)number;
+    }
+
+    return object->valuedouble = number;
+}
+
+typedef struct
+{
+    unsigned char *buffer;
+    size_t length;
+    size_t offset;
+    size_t depth; /* current nesting depth (for formatted printing) */
+    cJSON_bool noalloc;
+    cJSON_bool format; /* is this print a formatted print */
+    internal_hooks hooks;
+} printbuffer;
+
+/* realloc printbuffer if necessary to have at least "needed" bytes more */
+static unsigned char* ensure(printbuffer * const p, size_t needed)
+{
+    unsigned char *newbuffer = NULL;
+    size_t newsize = 0;
+
+    if ((p == NULL) || (p->buffer == NULL))
+    {
+        return NULL;
+    }
+
+    if ((p->length > 0) && (p->offset >= p->length))
+    {
+        /* make sure that offset is valid */
+        return NULL;
+    }
+
+    if (needed > INT_MAX)
+    {
+        /* sizes bigger than INT_MAX are currently not supported */
+        return NULL;
+    }
+
+    needed += p->offset + 1;
+    if (needed <= p->length)
+    {
+        return p->buffer + p->offset;
+    }
+
+    if (p->noalloc) {
+        return NULL;
+    }
+
+    /* calculate new buffer size */
+    if (needed > (INT_MAX / 2))
+    {
+        /* overflow of int, use INT_MAX if possible */
+        if (needed <= INT_MAX)
+        {
+            newsize = INT_MAX;
+        }
+        else
+        {
+            return NULL;
+        }
+    }
+    else
+    {
+        newsize = needed * 2;
+    }
+
+    if (p->hooks.reallocate != NULL)
+    {
+        /* reallocate with realloc if available */
+        newbuffer = (unsigned char*)p->hooks.reallocate(p->buffer, newsize);
+        if (newbuffer == NULL)
+        {
+            p->hooks.deallocate(p->buffer);
+            p->length = 0;
+            p->buffer = NULL;
+
+            return NULL;
+        }
+    }
+    else
+    {
+        /* otherwise reallocate manually */
+        newbuffer = (unsigned char*)p->hooks.allocate(newsize);
+        if (!newbuffer)
+        {
+            p->hooks.deallocate(p->buffer);
+            p->length = 0;
+            p->buffer = NULL;
+
+            return NULL;
+        }
+        if (newbuffer)
+        {
+            memcpy(newbuffer, p->buffer, p->offset + 1);
+        }
+        p->hooks.deallocate(p->buffer);
+    }
+    p->length = newsize;
+    p->buffer = newbuffer;
+
+    return newbuffer + p->offset;
+}
+
+/* calculate the new length of the string in a printbuffer and update the offset */
+static void update_offset(printbuffer * const buffer)
+{
+    const unsigned char *buffer_pointer = NULL;
+    if ((buffer == NULL) || (buffer->buffer == NULL))
+    {
+        return;
+    }
+    buffer_pointer = buffer->buffer + buffer->offset;
+
+    buffer->offset += strlen((const char*)buffer_pointer);
+}
+
+/* Render the number nicely from the given item into a string. */
+static cJSON_bool print_number(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    double d = item->valuedouble;
+    int length = 0;
+    size_t i = 0;
+    unsigned char number_buffer[26]; /* temporary buffer to print the number into */
+    unsigned char decimal_point = get_decimal_point();
+    double test;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* This checks for NaN and Infinity */
+    if ((d * 0) != 0)
+    {
+        length = sprintf((char*)number_buffer, "null");
+    }
+    else
+    {
+        /* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */
+        length = sprintf((char*)number_buffer, "%1.15g", d);
+
+        /* Check whether the original double can be recovered */
+        if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || ((double)test != d))
+        {
+            /* If not, print with 17 decimal places of precision */
+            length = sprintf((char*)number_buffer, "%1.17g", d);
+        }
+    }
+
+    /* sprintf failed or buffer overrun occured */
+    if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1)))
+    {
+        return false;
+    }
+
+    /* reserve appropriate space in the output */
+    output_pointer = ensure(output_buffer, (size_t)length + sizeof(""));
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    /* copy the printed number to the output and replace locale
+     * dependent decimal point with '.' */
+    for (i = 0; i < ((size_t)length); i++)
+    {
+        if (number_buffer[i] == decimal_point)
+        {
+            output_pointer[i] = '.';
+            continue;
+        }
+
+        output_pointer[i] = number_buffer[i];
+    }
+    output_pointer[i] = '\0';
+
+    output_buffer->offset += (size_t)length;
+
+    return true;
+}
+
+/* parse 4 digit hexadecimal number */
+static unsigned parse_hex4(const unsigned char * const input)
+{
+    unsigned int h = 0;
+    size_t i = 0;
+
+    for (i = 0; i < 4; i++)
+    {
+        /* parse digit */
+        if ((input[i] >= '0') && (input[i] <= '9'))
+        {
+            h += (unsigned int) input[i] - '0';
+        }
+        else if ((input[i] >= 'A') && (input[i] <= 'F'))
+        {
+            h += (unsigned int) 10 + input[i] - 'A';
+        }
+        else if ((input[i] >= 'a') && (input[i] <= 'f'))
+        {
+            h += (unsigned int) 10 + input[i] - 'a';
+        }
+        else /* invalid */
+        {
+            return 0;
+        }
+
+        if (i < 3)
+        {
+            /* shift left to make place for the next nibble */
+            h = h << 4;
+        }
+    }
+
+    return h;
+}
+
+/* converts a UTF-16 literal to UTF-8
+ * A literal can be one or two sequences of the form \uXXXX */
+static unsigned char utf16_literal_to_utf8(const unsigned char * const input_pointer, const unsigned char * const input_end, unsigned char **output_pointer)
+{
+    long unsigned int codepoint = 0;
+    unsigned int first_code = 0;
+    const unsigned char *first_sequence = input_pointer;
+    unsigned char utf8_length = 0;
+    unsigned char utf8_position = 0;
+    unsigned char sequence_length = 0;
+    unsigned char first_byte_mark = 0;
+
+    if ((input_end - first_sequence) < 6)
+    {
+        /* input ends unexpectedly */
+        goto fail;
+    }
+
+    /* get the first utf16 sequence */
+    first_code = parse_hex4(first_sequence + 2);
+
+    /* check that the code is valid */
+    if (((first_code >= 0xDC00) && (first_code <= 0xDFFF)))
+    {
+        goto fail;
+    }
+
+    /* UTF16 surrogate pair */
+    if ((first_code >= 0xD800) && (first_code <= 0xDBFF))
+    {
+        const unsigned char *second_sequence = first_sequence + 6;
+        unsigned int second_code = 0;
+        sequence_length = 12; /* \uXXXX\uXXXX */
+
+        if ((input_end - second_sequence) < 6)
+        {
+            /* input ends unexpectedly */
+            goto fail;
+        }
+
+        if ((second_sequence[0] != '\\') || (second_sequence[1] != 'u'))
+        {
+            /* missing second half of the surrogate pair */
+            goto fail;
+        }
+
+        /* get the second utf16 sequence */
+        second_code = parse_hex4(second_sequence + 2);
+        /* check that the code is valid */
+        if ((second_code < 0xDC00) || (second_code > 0xDFFF))
+        {
+            /* invalid second half of the surrogate pair */
+            goto fail;
+        }
+
+
+        /* calculate the unicode codepoint from the surrogate pair */
+        codepoint = 0x10000 + (((first_code & 0x3FF) << 10) | (second_code & 0x3FF));
+    }
+    else
+    {
+        sequence_length = 6; /* \uXXXX */
+        codepoint = first_code;
+    }
+
+    /* encode as UTF-8
+     * takes at maximum 4 bytes to encode:
+     * 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
+    if (codepoint < 0x80)
+    {
+        /* normal ascii, encoding 0xxxxxxx */
+        utf8_length = 1;
+    }
+    else if (codepoint < 0x800)
+    {
+        /* two bytes, encoding 110xxxxx 10xxxxxx */
+        utf8_length = 2;
+        first_byte_mark = 0xC0; /* 11000000 */
+    }
+    else if (codepoint < 0x10000)
+    {
+        /* three bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx */
+        utf8_length = 3;
+        first_byte_mark = 0xE0; /* 11100000 */
+    }
+    else if (codepoint <= 0x10FFFF)
+    {
+        /* four bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx 10xxxxxx */
+        utf8_length = 4;
+        first_byte_mark = 0xF0; /* 11110000 */
+    }
+    else
+    {
+        /* invalid unicode codepoint */
+        goto fail;
+    }
+
+    /* encode as utf8 */
+    for (utf8_position = (unsigned char)(utf8_length - 1); utf8_position > 0; utf8_position--)
+    {
+        /* 10xxxxxx */
+        (*output_pointer)[utf8_position] = (unsigned char)((codepoint | 0x80) & 0xBF);
+        codepoint >>= 6;
+    }
+    /* encode first byte */
+    if (utf8_length > 1)
+    {
+        (*output_pointer)[0] = (unsigned char)((codepoint | first_byte_mark) & 0xFF);
+    }
+    else
+    {
+        (*output_pointer)[0] = (unsigned char)(codepoint & 0x7F);
+    }
+
+    *output_pointer += utf8_length;
+
+    return sequence_length;
+
+fail:
+    return 0;
+}
+
+/* Parse the input text into an unescaped cinput, and populate item. */
+static cJSON_bool parse_string(cJSON * const item, parse_buffer * const input_buffer)
+{
+    const unsigned char *input_pointer = buffer_at_offset(input_buffer) + 1;
+    const unsigned char *input_end = buffer_at_offset(input_buffer) + 1;
+    unsigned char *output_pointer = NULL;
+    unsigned char *output = NULL;
+
+    /* not a string */
+    if (buffer_at_offset(input_buffer)[0] != '\"')
+    {
+        goto fail;
+    }
+
+    {
+        /* calculate approximate size of the output (overestimate) */
+        size_t allocation_length = 0;
+        size_t skipped_bytes = 0;
+        while (((size_t)(input_end - input_buffer->content) < input_buffer->length) && (*input_end != '\"'))
+        {
+            /* is escape sequence */
+            if (input_end[0] == '\\')
+            {
+                if ((size_t)(input_end + 1 - input_buffer->content) >= input_buffer->length)
+                {
+                    /* prevent buffer overflow when last input character is a backslash */
+                    goto fail;
+                }
+                skipped_bytes++;
+                input_end++;
+            }
+            input_end++;
+        }
+        if (((size_t)(input_end - input_buffer->content) >= input_buffer->length) || (*input_end != '\"'))
+        {
+            goto fail; /* string ended unexpectedly */
+        }
+
+        /* This is at most how much we need for the output */
+        allocation_length = (size_t) (input_end - buffer_at_offset(input_buffer)) - skipped_bytes;
+        output = (unsigned char*)input_buffer->hooks.allocate(allocation_length + sizeof(""));
+        if (output == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+    }
+
+    output_pointer = output;
+    /* loop through the string literal */
+    while (input_pointer < input_end)
+    {
+        if (*input_pointer != '\\')
+        {
+            *output_pointer++ = *input_pointer++;
+        }
+        /* escape sequence */
+        else
+        {
+            unsigned char sequence_length = 2;
+            if ((input_end - input_pointer) < 1)
+            {
+                goto fail;
+            }
+
+            switch (input_pointer[1])
+            {
+                case 'b':
+                    *output_pointer++ = '\b';
+                    break;
+                case 'f':
+                    *output_pointer++ = '\f';
+                    break;
+                case 'n':
+                    *output_pointer++ = '\n';
+                    break;
+                case 'r':
+                    *output_pointer++ = '\r';
+                    break;
+                case 't':
+                    *output_pointer++ = '\t';
+                    break;
+                case '\"':
+                case '\\':
+                case '/':
+                    *output_pointer++ = input_pointer[1];
+                    break;
+
+                /* UTF-16 literal */
+                case 'u':
+                    sequence_length = utf16_literal_to_utf8(input_pointer, input_end, &output_pointer);
+                    if (sequence_length == 0)
+                    {
+                        /* failed to convert UTF16-literal to UTF-8 */
+                        goto fail;
+                    }
+                    break;
+
+                default:
+                    goto fail;
+            }
+            input_pointer += sequence_length;
+        }
+    }
+
+    /* zero terminate the output */
+    *output_pointer = '\0';
+
+    item->type = cJSON_String;
+    item->valuestring = (char*)output;
+
+    input_buffer->offset = (size_t) (input_end - input_buffer->content);
+    input_buffer->offset++;
+
+    return true;
+
+fail:
+    if (output != NULL)
+    {
+        input_buffer->hooks.deallocate(output);
+    }
+
+    if (input_pointer != NULL)
+    {
+        input_buffer->offset = (size_t)(input_pointer - input_buffer->content);
+    }
+
+    return false;
+}
+
+/* Render the cstring provided to an escaped version that can be printed. */
+static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffer * const output_buffer)
+{
+    const unsigned char *input_pointer = NULL;
+    unsigned char *output = NULL;
+    unsigned char *output_pointer = NULL;
+    size_t output_length = 0;
+    /* numbers of additional characters needed for escaping */
+    size_t escape_characters = 0;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* empty string */
+    if (input == NULL)
+    {
+        output = ensure(output_buffer, sizeof("\"\""));
+        if (output == NULL)
+        {
+            return false;
+        }
+        strcpy((char*)output, "\"\"");
+
+        return true;
+    }
+
+    /* set "flag" to 1 if something needs to be escaped */
+    for (input_pointer = input; *input_pointer; input_pointer++)
+    {
+        switch (*input_pointer)
+        {
+            case '\"':
+            case '\\':
+            case '\b':
+            case '\f':
+            case '\n':
+            case '\r':
+            case '\t':
+                /* one character escape sequence */
+                escape_characters++;
+                break;
+            default:
+                if (*input_pointer < 32)
+                {
+                    /* UTF-16 escape sequence uXXXX */
+                    escape_characters += 5;
+                }
+                break;
+        }
+    }
+    output_length = (size_t)(input_pointer - input) + escape_characters;
+
+    output = ensure(output_buffer, output_length + sizeof("\"\""));
+    if (output == NULL)
+    {
+        return false;
+    }
+
+    /* no characters have to be escaped */
+    if (escape_characters == 0)
+    {
+        output[0] = '\"';
+        memcpy(output + 1, input, output_length);
+        output[output_length + 1] = '\"';
+        output[output_length + 2] = '\0';
+
+        return true;
+    }
+
+    output[0] = '\"';
+    output_pointer = output + 1;
+    /* copy the string */
+    for (input_pointer = input; *input_pointer != '\0'; (void)input_pointer++, output_pointer++)
+    {
+        if ((*input_pointer > 31) && (*input_pointer != '\"') && (*input_pointer != '\\'))
+        {
+            /* normal character, copy */
+            *output_pointer = *input_pointer;
+        }
+        else
+        {
+            /* character needs to be escaped */
+            *output_pointer++ = '\\';
+            switch (*input_pointer)
+            {
+                case '\\':
+                    *output_pointer = '\\';
+                    break;
+                case '\"':
+                    *output_pointer = '\"';
+                    break;
+                case '\b':
+                    *output_pointer = 'b';
+                    break;
+                case '\f':
+                    *output_pointer = 'f';
+                    break;
+                case '\n':
+                    *output_pointer = 'n';
+                    break;
+                case '\r':
+                    *output_pointer = 'r';
+                    break;
+                case '\t':
+                    *output_pointer = 't';
+                    break;
+                default:
+                    /* escape and print as unicode codepoint */
+                    sprintf((char*)output_pointer, "u%04x", *input_pointer);
+                    output_pointer += 4;
+                    break;
+            }
+        }
+    }
+    output[output_length + 1] = '\"';
+    output[output_length + 2] = '\0';
+
+    return true;
+}
+
+/* Invoke print_string_ptr (which is useful) on an item. */
+static cJSON_bool print_string(const cJSON * const item, printbuffer * const p)
+{
+    return print_string_ptr((unsigned char*)item->valuestring, p);
+}
+
+/* Predeclare these prototypes. */
+static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer);
+static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer);
+static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer);
+
+/* Utility to jump whitespace and cr/lf */
+static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer)
+{
+    if ((buffer == NULL) || (buffer->content == NULL))
+    {
+        return NULL;
+    }
+
+    while (can_access_at_index(buffer, 0) && (buffer_at_offset(buffer)[0] <= 32))
+    {
+       buffer->offset++;
+    }
+
+    if (buffer->offset == buffer->length)
+    {
+        buffer->offset--;
+    }
+
+    return buffer;
+}
+
+/* skip the UTF-8 BOM (byte order mark) if it is at the beginning of a buffer */
+static parse_buffer *skip_utf8_bom(parse_buffer * const buffer)
+{
+    if ((buffer == NULL) || (buffer->content == NULL) || (buffer->offset != 0))
+    {
+        return NULL;
+    }
+
+    if (can_access_at_index(buffer, 4) && (strncmp((const char*)buffer_at_offset(buffer), "\xEF\xBB\xBF", 3) == 0))
+    {
+        buffer->offset += 3;
+    }
+
+    return buffer;
+}
+
+/* Parse an object - create a new root, and populate. */
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated)
+{
+    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
+    cJSON *item = NULL;
+
+    /* reset error position */
+    global_error.json = NULL;
+    global_error.position = 0;
+
+    if (value == NULL)
+    {
+        goto fail;
+    }
+
+    buffer.content = (const unsigned char*)value;
+    buffer.length = strlen((const char*)value) + sizeof("");
+    buffer.offset = 0;
+    buffer.hooks = global_hooks;
+
+    item = cJSON_New_Item(&global_hooks);
+    if (item == NULL) /* memory fail */
+    {
+        goto fail;
+    }
+
+    if (!parse_value(item, buffer_skip_whitespace(skip_utf8_bom(&buffer))))
+    {
+        /* parse failure. ep is set. */
+        goto fail;
+    }
+
+    /* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */
+    if (require_null_terminated)
+    {
+        buffer_skip_whitespace(&buffer);
+        if ((buffer.offset >= buffer.length) || buffer_at_offset(&buffer)[0] != '\0')
+        {
+            goto fail;
+        }
+    }
+    if (return_parse_end)
+    {
+        *return_parse_end = (const char*)buffer_at_offset(&buffer);
+    }
+
+    return item;
+
+fail:
+    if (item != NULL)
+    {
+        cJSON_Delete(item);
+    }
+
+    if (value != NULL)
+    {
+        error local_error;
+        local_error.json = (const unsigned char*)value;
+        local_error.position = 0;
+
+        if (buffer.offset < buffer.length)
+        {
+            local_error.position = buffer.offset;
+        }
+        else if (buffer.length > 0)
+        {
+            local_error.position = buffer.length - 1;
+        }
+
+        if (return_parse_end != NULL)
+        {
+            *return_parse_end = (const char*)local_error.json + local_error.position;
+        }
+
+        global_error = local_error;
+    }
+
+    return NULL;
+}
+
+/* Default options for cJSON_Parse */
+CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value)
+{
+    return cJSON_ParseWithOpts(value, 0, 0);
+}
+
+#define cjson_min(a, b) ((a < b) ? a : b)
+
+static unsigned char *print(const cJSON * const item, cJSON_bool format, const internal_hooks * const hooks)
+{
+    static const size_t default_buffer_size = 256;
+    printbuffer buffer[1];
+    unsigned char *printed = NULL;
+
+    memset(buffer, 0, sizeof(buffer));
+
+    /* create buffer */
+    buffer->buffer = (unsigned char*) hooks->allocate(default_buffer_size);
+    buffer->length = default_buffer_size;
+    buffer->format = format;
+    buffer->hooks = *hooks;
+    if (buffer->buffer == NULL)
+    {
+        goto fail;
+    }
+
+    /* print the value */
+    if (!print_value(item, buffer))
+    {
+        goto fail;
+    }
+    update_offset(buffer);
+
+    /* check if reallocate is available */
+    if (hooks->reallocate != NULL)
+    {
+        printed = (unsigned char*) hooks->reallocate(buffer->buffer, buffer->offset + 1);
+        if (printed == NULL) {
+            goto fail;
+        }
+        buffer->buffer = NULL;
+    }
+    else /* otherwise copy the JSON over to a new buffer */
+    {
+        printed = (unsigned char*) hooks->allocate(buffer->offset + 1);
+        if (printed == NULL)
+        {
+            goto fail;
+        }
+        memcpy(printed, buffer->buffer, cjson_min(buffer->length, buffer->offset + 1));
+        printed[buffer->offset] = '\0'; /* just to be sure */
+
+        /* free the buffer */
+        hooks->deallocate(buffer->buffer);
+    }
+
+    return printed;
+
+fail:
+    if (buffer->buffer != NULL)
+    {
+        hooks->deallocate(buffer->buffer);
+    }
+
+    if (printed != NULL)
+    {
+        hooks->deallocate(printed);
+    }
+
+    return NULL;
+}
+
+/* Render a cJSON item/entity/structure to text. */
+CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item)
+{
+    return (char*)print(item, true, &global_hooks);
+}
+
+CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item)
+{
+    return (char*)print(item, false, &global_hooks);
+}
+
+CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt)
+{
+    printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
+
+    if (prebuffer < 0)
+    {
+        return NULL;
+    }
+
+    p.buffer = (unsigned char*)global_hooks.allocate((size_t)prebuffer);
+    if (!p.buffer)
+    {
+        return NULL;
+    }
+
+    p.length = (size_t)prebuffer;
+    p.offset = 0;
+    p.noalloc = false;
+    p.format = fmt;
+    p.hooks = global_hooks;
+
+    if (!print_value(item, &p))
+    {
+        global_hooks.deallocate(p.buffer);
+        return NULL;
+    }
+
+    return (char*)p.buffer;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buf, const int len, const cJSON_bool fmt)
+{
+    printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
+
+    if ((len < 0) || (buf == NULL))
+    {
+        return false;
+    }
+
+    p.buffer = (unsigned char*)buf;
+    p.length = (size_t)len;
+    p.offset = 0;
+    p.noalloc = true;
+    p.format = fmt;
+    p.hooks = global_hooks;
+
+    return print_value(item, &p);
+}
+
+/* Parser core - when encountering text, process appropriately. */
+static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer)
+{
+    if ((input_buffer == NULL) || (input_buffer->content == NULL))
+    {
+        return false; /* no input */
+    }
+
+    /* parse the different types of values */
+    /* null */
+    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "null", 4) == 0))
+    {
+        item->type = cJSON_NULL;
+        input_buffer->offset += 4;
+        return true;
+    }
+    /* false */
+    if (can_read(input_buffer, 5) && (strncmp((const char*)buffer_at_offset(input_buffer), "false", 5) == 0))
+    {
+        item->type = cJSON_False;
+        input_buffer->offset += 5;
+        return true;
+    }
+    /* true */
+    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "true", 4) == 0))
+    {
+        item->type = cJSON_True;
+        item->valueint = 1;
+        input_buffer->offset += 4;
+        return true;
+    }
+    /* string */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '\"'))
+    {
+        return parse_string(item, input_buffer);
+    }
+    /* number */
+    if (can_access_at_index(input_buffer, 0) && ((buffer_at_offset(input_buffer)[0] == '-') || ((buffer_at_offset(input_buffer)[0] >= '0') && (buffer_at_offset(input_buffer)[0] <= '9'))))
+    {
+        return parse_number(item, input_buffer);
+    }
+    /* array */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '['))
+    {
+        return parse_array(item, input_buffer);
+    }
+    /* object */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '{'))
+    {
+        return parse_object(item, input_buffer);
+    }
+
+    return false;
+}
+
+/* Render a value to text. */
+static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output = NULL;
+
+    if ((item == NULL) || (output_buffer == NULL))
+    {
+        return false;
+    }
+
+    switch ((item->type) & 0xFF)
+    {
+        case cJSON_NULL:
+            output = ensure(output_buffer, 5);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "null");
+            return true;
+
+        case cJSON_False:
+            output = ensure(output_buffer, 6);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "false");
+            return true;
+
+        case cJSON_True:
+            output = ensure(output_buffer, 5);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "true");
+            return true;
+
+        case cJSON_Number:
+            return print_number(item, output_buffer);
+
+        case cJSON_Raw:
+        {
+            size_t raw_length = 0;
+            if (item->valuestring == NULL)
+            {
+                return false;
+            }
+
+            raw_length = strlen(item->valuestring) + sizeof("");
+            output = ensure(output_buffer, raw_length);
+            if (output == NULL)
+            {
+                return false;
+            }
+            memcpy(output, item->valuestring, raw_length);
+            return true;
+        }
+
+        case cJSON_String:
+            return print_string(item, output_buffer);
+
+        case cJSON_Array:
+            return print_array(item, output_buffer);
+
+        case cJSON_Object:
+            return print_object(item, output_buffer);
+
+        default:
+            return false;
+    }
+}
+
+/* Build an array from input text. */
+static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer)
+{
+    cJSON *head = NULL; /* head of the linked list */
+    cJSON *current_item = NULL;
+
+    if (input_buffer->depth >= CJSON_NESTING_LIMIT)
+    {
+        return false; /* to deeply nested */
+    }
+    input_buffer->depth++;
+
+    if (buffer_at_offset(input_buffer)[0] != '[')
+    {
+        /* not an array */
+        goto fail;
+    }
+
+    input_buffer->offset++;
+    buffer_skip_whitespace(input_buffer);
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ']'))
+    {
+        /* empty array */
+        goto success;
+    }
+
+    /* check if we skipped to the end of the buffer */
+    if (cannot_access_at_index(input_buffer, 0))
+    {
+        input_buffer->offset--;
+        goto fail;
+    }
+
+    /* step back to character in front of the first element */
+    input_buffer->offset--;
+    /* loop through the comma separated array elements */
+    do
+    {
+        /* allocate next item */
+        cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks));
+        if (new_item == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+
+        /* attach next item to list */
+        if (head == NULL)
+        {
+            /* start the linked list */
+            current_item = head = new_item;
+        }
+        else
+        {
+            /* add to the end and advance */
+            current_item->next = new_item;
+            new_item->prev = current_item;
+            current_item = new_item;
+        }
+
+        /* parse next value */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_value(current_item, input_buffer))
+        {
+            goto fail; /* failed to parse value */
+        }
+        buffer_skip_whitespace(input_buffer);
+    }
+    while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
+
+    if (cannot_access_at_index(input_buffer, 0) || buffer_at_offset(input_buffer)[0] != ']')
+    {
+        goto fail; /* expected end of array */
+    }
+
+success:
+    input_buffer->depth--;
+
+    item->type = cJSON_Array;
+    item->child = head;
+
+    input_buffer->offset++;
+
+    return true;
+
+fail:
+    if (head != NULL)
+    {
+        cJSON_Delete(head);
+    }
+
+    return false;
+}
+
+/* Render an array to text */
+static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    size_t length = 0;
+    cJSON *current_element = item->child;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* Compose the output array. */
+    /* opening square bracket */
+    output_pointer = ensure(output_buffer, 1);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    *output_pointer = '[';
+    output_buffer->offset++;
+    output_buffer->depth++;
+
+    while (current_element != NULL)
+    {
+        if (!print_value(current_element, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+        if (current_element->next)
+        {
+            length = (size_t) (output_buffer->format ? 2 : 1);
+            output_pointer = ensure(output_buffer, length + 1);
+            if (output_pointer == NULL)
+            {
+                return false;
+            }
+            *output_pointer++ = ',';
+            if(output_buffer->format)
+            {
+                *output_pointer++ = ' ';
+            }
+            *output_pointer = '\0';
+            output_buffer->offset += length;
+        }
+        current_element = current_element->next;
+    }
+
+    output_pointer = ensure(output_buffer, 2);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+    *output_pointer++ = ']';
+    *output_pointer = '\0';
+    output_buffer->depth--;
+
+    return true;
+}
+
+/* Build an object from the text. */
+static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer)
+{
+    cJSON *head = NULL; /* linked list head */
+    cJSON *current_item = NULL;
+
+    if (input_buffer->depth >= CJSON_NESTING_LIMIT)
+    {
+        return false; /* to deeply nested */
+    }
+    input_buffer->depth++;
+
+    if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '{'))
+    {
+        goto fail; /* not an object */
+    }
+
+    input_buffer->offset++;
+    buffer_skip_whitespace(input_buffer);
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '}'))
+    {
+        goto success; /* empty object */
+    }
+
+    /* check if we skipped to the end of the buffer */
+    if (cannot_access_at_index(input_buffer, 0))
+    {
+        input_buffer->offset--;
+        goto fail;
+    }
+
+    /* step back to character in front of the first element */
+    input_buffer->offset--;
+    /* loop through the comma separated array elements */
+    do
+    {
+        /* allocate next item */
+        cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks));
+        if (new_item == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+
+        /* attach next item to list */
+        if (head == NULL)
+        {
+            /* start the linked list */
+            current_item = head = new_item;
+        }
+        else
+        {
+            /* add to the end and advance */
+            current_item->next = new_item;
+            new_item->prev = current_item;
+            current_item = new_item;
+        }
+
+        /* parse the name of the child */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_string(current_item, input_buffer))
+        {
+            goto fail; /* faile to parse name */
+        }
+        buffer_skip_whitespace(input_buffer);
+
+        /* swap valuestring and string, because we parsed the name */
+        current_item->string = current_item->valuestring;
+        current_item->valuestring = NULL;
+
+        if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != ':'))
+        {
+            goto fail; /* invalid object */
+        }
+
+        /* parse the value */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_value(current_item, input_buffer))
+        {
+            goto fail; /* failed to parse value */
+        }
+        buffer_skip_whitespace(input_buffer);
+    }
+    while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
+
+    if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '}'))
+    {
+        goto fail; /* expected end of object */
+    }
+
+success:
+    input_buffer->depth--;
+
+    item->type = cJSON_Object;
+    item->child = head;
+
+    input_buffer->offset++;
+    return true;
+
+fail:
+    if (head != NULL)
+    {
+        cJSON_Delete(head);
+    }
+
+    return false;
+}
+
+/* Render an object to text. */
+static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    size_t length = 0;
+    cJSON *current_item = item->child;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* Compose the output: */
+    length = (size_t) (output_buffer->format ? 2 : 1); /* fmt: {\n */
+    output_pointer = ensure(output_buffer, length + 1);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    *output_pointer++ = '{';
+    output_buffer->depth++;
+    if (output_buffer->format)
+    {
+        *output_pointer++ = '\n';
+    }
+    output_buffer->offset += length;
+
+    while (current_item)
+    {
+        if (output_buffer->format)
+        {
+            size_t i;
+            output_pointer = ensure(output_buffer, output_buffer->depth);
+            if (output_pointer == NULL)
+            {
+                return false;
+            }
+            for (i = 0; i < output_buffer->depth; i++)
+            {
+                *output_pointer++ = '\t';
+            }
+            output_buffer->offset += output_buffer->depth;
+        }
+
+        /* print key */
+        if (!print_string_ptr((unsigned char*)current_item->string, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+
+        length = (size_t) (output_buffer->format ? 2 : 1);
+        output_pointer = ensure(output_buffer, length);
+        if (output_pointer == NULL)
+        {
+            return false;
+        }
+        *output_pointer++ = ':';
+        if (output_buffer->format)
+        {
+            *output_pointer++ = '\t';
+        }
+        output_buffer->offset += length;
+
+        /* print value */
+        if (!print_value(current_item, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+
+        /* print comma if not last */
+        length = ((size_t)(output_buffer->format ? 1 : 0) + (size_t)(current_item->next ? 1 : 0));
+        output_pointer = ensure(output_buffer, length + 1);
+        if (output_pointer == NULL)
+        {
+            return false;
+        }
+        if (current_item->next)
+        {
+            *output_pointer++ = ',';
+        }
+
+        if (output_buffer->format)
+        {
+            *output_pointer++ = '\n';
+        }
+        *output_pointer = '\0';
+        output_buffer->offset += length;
+
+        current_item = current_item->next;
+    }
+
+    output_pointer = ensure(output_buffer, output_buffer->format ? (output_buffer->depth + 1) : 2);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+    if (output_buffer->format)
+    {
+        size_t i;
+        for (i = 0; i < (output_buffer->depth - 1); i++)
+        {
+            *output_pointer++ = '\t';
+        }
+    }
+    *output_pointer++ = '}';
+    *output_pointer = '\0';
+    output_buffer->depth--;
+
+    return true;
+}
+
+/* Get Array size/item / object item. */
+CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array)
+{
+    cJSON *child = NULL;
+    size_t size = 0;
+
+    if (array == NULL)
+    {
+        return 0;
+    }
+
+    child = array->child;
+
+    while(child != NULL)
+    {
+        size++;
+        child = child->next;
+    }
+
+    /* FIXME: Can overflow here. Cannot be fixed without breaking the API */
+
+    return (int)size;
+}
+
+static cJSON* get_array_item(const cJSON *array, size_t index)
+{
+    cJSON *current_child = NULL;
+
+    if (array == NULL)
+    {
+        return NULL;
+    }
+
+    current_child = array->child;
+    while ((current_child != NULL) && (index > 0))
+    {
+        index--;
+        current_child = current_child->next;
+    }
+
+    return current_child;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index)
+{
+    if (index < 0)
+    {
+        return NULL;
+    }
+
+    return get_array_item(array, (size_t)index);
+}
+
+static cJSON *get_object_item(const cJSON * const object, const char * const name, const cJSON_bool case_sensitive)
+{
+    cJSON *current_element = NULL;
+
+    if ((object == NULL) || (name == NULL))
+    {
+        return NULL;
+    }
+
+    current_element = object->child;
+    if (case_sensitive)
+    {
+        while ((current_element != NULL) && (strcmp(name, current_element->string) != 0))
+        {
+            current_element = current_element->next;
+        }
+    }
+    else
+    {
+        while ((current_element != NULL) && (case_insensitive_strcmp((const unsigned char*)name, (const unsigned char*)(current_element->string)) != 0))
+        {
+            current_element = current_element->next;
+        }
+    }
+
+    return current_element;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string)
+{
+    return get_object_item(object, string, false);
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string)
+{
+    return get_object_item(object, string, true);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string)
+{
+    return cJSON_GetObjectItem(object, string) ? 1 : 0;
+}
+
+/* Utility for array list handling. */
+static void suffix_object(cJSON *prev, cJSON *item)
+{
+    prev->next = item;
+    item->prev = prev;
+}
+
+/* Utility for handling references. */
+static cJSON *create_reference(const cJSON *item, const internal_hooks * const hooks)
+{
+    cJSON *reference = NULL;
+    if (item == NULL)
+    {
+        return NULL;
+    }
+
+    reference = cJSON_New_Item(hooks);
+    if (reference == NULL)
+    {
+        return NULL;
+    }
+
+    memcpy(reference, item, sizeof(cJSON));
+    reference->string = NULL;
+    reference->type |= cJSON_IsReference;
+    reference->next = reference->prev = NULL;
+    return reference;
+}
+
+static cJSON_bool add_item_to_array(cJSON *array, cJSON *item)
+{
+    cJSON *child = NULL;
+
+    if ((item == NULL) || (array == NULL))
+    {
+        return false;
+    }
+
+    child = array->child;
+
+    if (child == NULL)
+    {
+        /* list is empty, start new one */
+        array->child = item;
+    }
+    else
+    {
+        /* append to the end */
+        while (child->next)
+        {
+            child = child->next;
+        }
+        suffix_object(child, item);
+    }
+
+    return true;
+}
+
+/* Add item to array/object. */
+CJSON_PUBLIC(void) cJSON_AddItemToArray(cJSON *array, cJSON *item)
+{
+    add_item_to_array(array, item);
+}
+
+#if defined(__clang__) || (defined(__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
+    #pragma GCC diagnostic push
+#endif
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wcast-qual"
+#endif
+/* helper function to cast away const */
+static void* cast_away_const(const void* string)
+{
+    return (void*)string;
+}
+#if defined(__clang__) || (defined(__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
+    #pragma GCC diagnostic pop
+#endif
+
+
+static cJSON_bool add_item_to_object(cJSON * const object, const char * const string, cJSON * const item, const internal_hooks * const hooks, const cJSON_bool constant_key)
+{
+    char *new_key = NULL;
+    int new_type = cJSON_Invalid;
+
+    if ((object == NULL) || (string == NULL) || (item == NULL))
+    {
+        return false;
+    }
+
+    if (constant_key)
+    {
+        new_key = (char*)cast_away_const(string);
+        new_type = item->type | cJSON_StringIsConst;
+    }
+    else
+    {
+        new_key = (char*)cJSON_strdup((const unsigned char*)string, hooks);
+        if (new_key == NULL)
+        {
+            return false;
+        }
+
+        new_type = item->type & ~cJSON_StringIsConst;
+    }
+
+    if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
+    {
+        hooks->deallocate(item->string);
+    }
+
+    item->string = new_key;
+    item->type = new_type;
+
+    return add_item_to_array(object, item);
+}
+
+CJSON_PUBLIC(void) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item)
+{
+    add_item_to_object(object, string, item, &global_hooks, false);
+}
+
+/* Add an item to an object with constant string as key */
+CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item)
+{
+    add_item_to_object(object, string, item, &global_hooks, true);
+}
+
+CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item)
+{
+    if (array == NULL)
+    {
+        return;
+    }
+
+    add_item_to_array(array, create_reference(item, &global_hooks));
+}
+
+CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item)
+{
+    if ((object == NULL) || (string == NULL))
+    {
+        return;
+    }
+
+    add_item_to_object(object, string, create_reference(item, &global_hooks), &global_hooks, false);
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name)
+{
+    cJSON *null = cJSON_CreateNull();
+    if (add_item_to_object(object, name, null, &global_hooks, false))
+    {
+        return null;
+    }
+
+    cJSON_Delete(null);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name)
+{
+    cJSON *true_item = cJSON_CreateTrue();
+    if (add_item_to_object(object, name, true_item, &global_hooks, false))
+    {
+        return true_item;
+    }
+
+    cJSON_Delete(true_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name)
+{
+    cJSON *false_item = cJSON_CreateFalse();
+    if (add_item_to_object(object, name, false_item, &global_hooks, false))
+    {
+        return false_item;
+    }
+
+    cJSON_Delete(false_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean)
+{
+    cJSON *bool_item = cJSON_CreateBool(boolean);
+    if (add_item_to_object(object, name, bool_item, &global_hooks, false))
+    {
+        return bool_item;
+    }
+
+    cJSON_Delete(bool_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number)
+{
+    cJSON *number_item = cJSON_CreateNumber(number);
+    if (add_item_to_object(object, name, number_item, &global_hooks, false))
+    {
+        return number_item;
+    }
+
+    cJSON_Delete(number_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string)
+{
+    cJSON *string_item = cJSON_CreateString(string);
+    if (add_item_to_object(object, name, string_item, &global_hooks, false))
+    {
+        return string_item;
+    }
+
+    cJSON_Delete(string_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw)
+{
+    cJSON *raw_item = cJSON_CreateRaw(raw);
+    if (add_item_to_object(object, name, raw_item, &global_hooks, false))
+    {
+        return raw_item;
+    }
+
+    cJSON_Delete(raw_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name)
+{
+    cJSON *object_item = cJSON_CreateObject();
+    if (add_item_to_object(object, name, object_item, &global_hooks, false))
+    {
+        return object_item;
+    }
+
+    cJSON_Delete(object_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name)
+{
+    cJSON *array = cJSON_CreateArray();
+    if (add_item_to_object(object, name, array, &global_hooks, false))
+    {
+        return array;
+    }
+
+    cJSON_Delete(array);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item)
+{
+    if ((parent == NULL) || (item == NULL))
+    {
+        return NULL;
+    }
+
+    if (item->prev != NULL)
+    {
+        /* not the first element */
+        item->prev->next = item->next;
+    }
+    if (item->next != NULL)
+    {
+        /* not the last element */
+        item->next->prev = item->prev;
+    }
+
+    if (item == parent->child)
+    {
+        /* first element */
+        parent->child = item->next;
+    }
+    /* make sure the detached item doesn't point anywhere anymore */
+    item->prev = NULL;
+    item->next = NULL;
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which)
+{
+    if (which < 0)
+    {
+        return NULL;
+    }
+
+    return cJSON_DetachItemViaPointer(array, get_array_item(array, (size_t)which));
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which)
+{
+    cJSON_Delete(cJSON_DetachItemFromArray(array, which));
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string)
+{
+    cJSON *to_detach = cJSON_GetObjectItem(object, string);
+
+    return cJSON_DetachItemViaPointer(object, to_detach);
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string)
+{
+    cJSON *to_detach = cJSON_GetObjectItemCaseSensitive(object, string);
+
+    return cJSON_DetachItemViaPointer(object, to_detach);
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string)
+{
+    cJSON_Delete(cJSON_DetachItemFromObject(object, string));
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string)
+{
+    cJSON_Delete(cJSON_DetachItemFromObjectCaseSensitive(object, string));
+}
+
+/* Replace array/object items with new ones. */
+CJSON_PUBLIC(void) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem)
+{
+    cJSON *after_inserted = NULL;
+
+    if (which < 0)
+    {
+        return;
+    }
+
+    after_inserted = get_array_item(array, (size_t)which);
+    if (after_inserted == NULL)
+    {
+        add_item_to_array(array, newitem);
+        return;
+    }
+
+    newitem->next = after_inserted;
+    newitem->prev = after_inserted->prev;
+    after_inserted->prev = newitem;
+    if (after_inserted == array->child)
+    {
+        array->child = newitem;
+    }
+    else
+    {
+        newitem->prev->next = newitem;
+    }
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement)
+{
+    if ((parent == NULL) || (replacement == NULL) || (item == NULL))
+    {
+        return false;
+    }
+
+    if (replacement == item)
+    {
+        return true;
+    }
+
+    replacement->next = item->next;
+    replacement->prev = item->prev;
+
+    if (replacement->next != NULL)
+    {
+        replacement->next->prev = replacement;
+    }
+    if (replacement->prev != NULL)
+    {
+        replacement->prev->next = replacement;
+    }
+    if (parent->child == item)
+    {
+        parent->child = replacement;
+    }
+
+    item->next = NULL;
+    item->prev = NULL;
+    cJSON_Delete(item);
+
+    return true;
+}
+
+CJSON_PUBLIC(void) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem)
+{
+    if (which < 0)
+    {
+        return;
+    }
+
+    cJSON_ReplaceItemViaPointer(array, get_array_item(array, (size_t)which), newitem);
+}
+
+static cJSON_bool replace_item_in_object(cJSON *object, const char *string, cJSON *replacement, cJSON_bool case_sensitive)
+{
+    if ((replacement == NULL) || (string == NULL))
+    {
+        return false;
+    }
+
+    /* replace the name in the replacement */
+    if (!(replacement->type & cJSON_StringIsConst) && (replacement->string != NULL))
+    {
+        cJSON_free(replacement->string);
+    }
+    replacement->string = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks);
+    replacement->type &= ~cJSON_StringIsConst;
+
+    cJSON_ReplaceItemViaPointer(object, get_object_item(object, string, case_sensitive), replacement);
+
+    return true;
+}
+
+CJSON_PUBLIC(void) cJSON_ReplaceItemInObject(cJSON *object, const char *string, cJSON *newitem)
+{
+    replace_item_in_object(object, string, newitem, false);
+}
+
+CJSON_PUBLIC(void) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object, const char *string, cJSON *newitem)
+{
+    replace_item_in_object(object, string, newitem, true);
+}
+
+/* Create basic types: */
+CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_NULL;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_True;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_False;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool b)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = b ? cJSON_True : cJSON_False;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_Number;
+        item->valuedouble = num;
+
+        /* use saturation in case of overflow */
+        if (num >= INT_MAX)
+        {
+            item->valueint = INT_MAX;
+        }
+        else if (num <= (double)INT_MIN)
+        {
+            item->valueint = INT_MIN;
+        }
+        else
+        {
+            item->valueint = (int)num;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_String;
+        item->valuestring = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks);
+        if(!item->valuestring)
+        {
+            cJSON_Delete(item);
+            return NULL;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item != NULL)
+    {
+        item->type = cJSON_String | cJSON_IsReference;
+        item->valuestring = (char*)cast_away_const(string);
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item != NULL) {
+        item->type = cJSON_Object | cJSON_IsReference;
+        item->child = (cJSON*)cast_away_const(child);
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child) {
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item != NULL) {
+        item->type = cJSON_Array | cJSON_IsReference;
+        item->child = (cJSON*)cast_away_const(child);
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_Raw;
+        item->valuestring = (char*)cJSON_strdup((const unsigned char*)raw, &global_hooks);
+        if(!item->valuestring)
+        {
+            cJSON_Delete(item);
+            return NULL;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type=cJSON_Array;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item)
+    {
+        item->type = cJSON_Object;
+    }
+
+    return item;
+}
+
+/* Create Arrays: */
+CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+    for(i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber(numbers[i]);
+        if (!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for(i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber((double)numbers[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for(i = 0;a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber(numbers[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char **strings, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (strings == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for (i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateString(strings[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p,n);
+        }
+        p = n;
+    }
+
+    return a;
+}
+
+/* Duplication */
+CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse)
+{
+    cJSON *newitem = NULL;
+    cJSON *child = NULL;
+    cJSON *next = NULL;
+    cJSON *newchild = NULL;
+
+    /* Bail on bad ptr */
+    if (!item)
+    {
+        goto fail;
+    }
+    /* Create new item */
+    newitem = cJSON_New_Item(&global_hooks);
+    if (!newitem)
+    {
+        goto fail;
+    }
+    /* Copy over all vars */
+    newitem->type = item->type & (~cJSON_IsReference);
+    newitem->valueint = item->valueint;
+    newitem->valuedouble = item->valuedouble;
+    if (item->valuestring)
+    {
+        newitem->valuestring = (char*)cJSON_strdup((unsigned char*)item->valuestring, &global_hooks);
+        if (!newitem->valuestring)
+        {
+            goto fail;
+        }
+    }
+    if (item->string)
+    {
+        newitem->string = (item->type&cJSON_StringIsConst) ? item->string : (char*)cJSON_strdup((unsigned char*)item->string, &global_hooks);
+        if (!newitem->string)
+        {
+            goto fail;
+        }
+    }
+    /* If non-recursive, then we're done! */
+    if (!recurse)
+    {
+        return newitem;
+    }
+    /* Walk the ->next chain for the child. */
+    child = item->child;
+    while (child != NULL)
+    {
+        newchild = cJSON_Duplicate(child, true); /* Duplicate (with recurse) each item in the ->next chain */
+        if (!newchild)
+        {
+            goto fail;
+        }
+        if (next != NULL)
+        {
+            /* If newitem->child already set, then crosswire ->prev and ->next and move on */
+            next->next = newchild;
+            newchild->prev = next;
+            next = newchild;
+        }
+        else
+        {
+            /* Set newitem->child and move to it */
+            newitem->child = newchild;
+            next = newchild;
+        }
+        child = child->next;
+    }
+
+    return newitem;
+
+fail:
+    if (newitem != NULL)
+    {
+        cJSON_Delete(newitem);
+    }
+
+    return NULL;
+}
+
+CJSON_PUBLIC(void) cJSON_Minify(char *json)
+{
+    unsigned char *into = (unsigned char*)json;
+
+    if (json == NULL)
+    {
+        return;
+    }
+
+    while (*json)
+    {
+        if (*json == ' ')
+        {
+            json++;
+        }
+        else if (*json == '\t')
+        {
+            /* Whitespace characters. */
+            json++;
+        }
+        else if (*json == '\r')
+        {
+            json++;
+        }
+        else if (*json=='\n')
+        {
+            json++;
+        }
+        else if ((*json == '/') && (json[1] == '/'))
+        {
+            /* double-slash comments, to end of line. */
+            while (*json && (*json != '\n'))
+            {
+                json++;
+            }
+        }
+        else if ((*json == '/') && (json[1] == '*'))
+        {
+            /* multiline comments. */
+            while (*json && !((*json == '*') && (json[1] == '/')))
+            {
+                json++;
+            }
+            json += 2;
+        }
+        else if (*json == '\"')
+        {
+            /* string literals, which are \" sensitive. */
+            *into++ = (unsigned char)*json++;
+            while (*json && (*json != '\"'))
+            {
+                if (*json == '\\')
+                {
+                    *into++ = (unsigned char)*json++;
+                }
+                *into++ = (unsigned char)*json++;
+            }
+            *into++ = (unsigned char)*json++;
+        }
+        else
+        {
+            /* All other characters. */
+            *into++ = (unsigned char)*json++;
+        }
+    }
+
+    /* and null-terminate. */
+    *into = '\0';
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Invalid;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_False;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xff) == cJSON_True;
+}
+
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & (cJSON_True | cJSON_False)) != 0;
+}
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_NULL;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Number;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_String;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Array;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Object;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Raw;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive)
+{
+    if ((a == NULL) || (b == NULL) || ((a->type & 0xFF) != (b->type & 0xFF)) || cJSON_IsInvalid(a))
+    {
+        return false;
+    }
+
+    /* check if type is valid */
+    switch (a->type & 0xFF)
+    {
+        case cJSON_False:
+        case cJSON_True:
+        case cJSON_NULL:
+        case cJSON_Number:
+        case cJSON_String:
+        case cJSON_Raw:
+        case cJSON_Array:
+        case cJSON_Object:
+            break;
+
+        default:
+            return false;
+    }
+
+    /* identical objects are equal */
+    if (a == b)
+    {
+        return true;
+    }
+
+    switch (a->type & 0xFF)
+    {
+        /* in these cases and equal type is enough */
+        case cJSON_False:
+        case cJSON_True:
+        case cJSON_NULL:
+            return true;
+
+        case cJSON_Number:
+            if (a->valuedouble == b->valuedouble)
+            {
+                return true;
+            }
+            return false;
+
+        case cJSON_String:
+        case cJSON_Raw:
+            if ((a->valuestring == NULL) || (b->valuestring == NULL))
+            {
+                return false;
+            }
+            if (strcmp(a->valuestring, b->valuestring) == 0)
+            {
+                return true;
+            }
+
+            return false;
+
+        case cJSON_Array:
+        {
+            cJSON *a_element = a->child;
+            cJSON *b_element = b->child;
+
+            for (; (a_element != NULL) && (b_element != NULL);)
+            {
+                if (!cJSON_Compare(a_element, b_element, case_sensitive))
+                {
+                    return false;
+                }
+
+                a_element = a_element->next;
+                b_element = b_element->next;
+            }
+
+            /* one of the arrays is longer than the other */
+            if (a_element != b_element) {
+                return false;
+            }
+
+            return true;
+        }
+
+        case cJSON_Object:
+        {
+            cJSON *a_element = NULL;
+            cJSON *b_element = NULL;
+            cJSON_ArrayForEach(a_element, a)
+            {
+                /* TODO This has O(n^2) runtime, which is horrible! */
+                b_element = get_object_item(b, a_element->string, case_sensitive);
+                if (b_element == NULL)
+                {
+                    return false;
+                }
+
+                if (!cJSON_Compare(a_element, b_element, case_sensitive))
+                {
+                    return false;
+                }
+            }
+
+            /* doing this twice, once on a and b to prevent true comparison if a subset of b
+             * TODO: Do this the proper way, this is just a fix for now */
+            cJSON_ArrayForEach(b_element, b)
+            {
+                a_element = get_object_item(a, b_element->string, case_sensitive);
+                if (a_element == NULL)
+                {
+                    return false;
+                }
+
+                if (!cJSON_Compare(b_element, a_element, case_sensitive))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        default:
+            return false;
+    }
+}
+
+CJSON_PUBLIC(void *) cJSON_malloc(size_t size)
+{
+    return global_hooks.allocate(size);
+}
+
+CJSON_PUBLIC(void) cJSON_free(void *object)
+{
+    global_hooks.deallocate(object);
+}
diff --git a/app/help/cJSON.h b/app/help/cJSON.h
new file mode 100644
index 0000000..8d45390
--- /dev/null
+++ b/app/help/cJSON.h
@@ -0,0 +1,285 @@
+/*
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#ifndef cJSON__h
+#define cJSON__h
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
+#define __WINDOWS__
+#endif
+
+#ifdef __WINDOWS__
+
+/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention.  For windows you have 3 define options:
+
+CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
+CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
+CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
+
+For *nix builds that support visibility attribute, you can define similar behavior by
+
+setting default visibility to hidden by adding
+-fvisibility=hidden (for gcc)
+or
+-xldscope=hidden (for sun cc)
+to CFLAGS
+
+then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
+
+*/
+
+#define CJSON_CDECL __cdecl
+#define CJSON_STDCALL __stdcall
+
+/* export symbols by default, this is necessary for copy pasting the C and header file */
+#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_EXPORT_SYMBOLS
+#endif
+
+#if defined(CJSON_HIDE_SYMBOLS)
+#define CJSON_PUBLIC(type)   type CJSON_STDCALL
+#elif defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllexport) type CJSON_STDCALL
+#elif defined(CJSON_IMPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllimport) type CJSON_STDCALL
+#endif
+#else /* !__WINDOWS__ */
+#define CJSON_CDECL
+#define CJSON_STDCALL
+
+#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
+#define CJSON_PUBLIC(type)   __attribute__((visibility("default"))) type
+#else
+#define CJSON_PUBLIC(type) type
+#endif
+#endif
+
+/* project version */
+#define CJSON_VERSION_MAJOR 1
+#define CJSON_VERSION_MINOR 7
+#define CJSON_VERSION_PATCH 8
+
+#include <stddef.h>
+
+/* cJSON Types: */
+#define cJSON_Invalid (0)
+#define cJSON_False  (1 << 0)
+#define cJSON_True   (1 << 1)
+#define cJSON_NULL   (1 << 2)
+#define cJSON_Number (1 << 3)
+#define cJSON_String (1 << 4)
+#define cJSON_Array  (1 << 5)
+#define cJSON_Object (1 << 6)
+#define cJSON_Raw    (1 << 7) /* raw json */
+
+#define cJSON_IsReference 256
+#define cJSON_StringIsConst 512
+
+/* The cJSON structure: */
+typedef struct cJSON
+{
+    /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
+    struct cJSON *next;
+    struct cJSON *prev;
+    /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
+    struct cJSON *child;
+
+    /* The type of the item, as above. */
+    int type;
+
+    /* The item's string, if type==cJSON_String  and type == cJSON_Raw */
+    char *valuestring;
+    /* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
+    int valueint;
+    /* The item's number, if type==cJSON_Number */
+    double valuedouble;
+
+    /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
+    char *string;
+} cJSON;
+
+typedef struct cJSON_Hooks
+{
+      /* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */
+      void *(CJSON_CDECL *malloc_fn)(size_t sz);
+      void (CJSON_CDECL *free_fn)(void *ptr);
+} cJSON_Hooks;
+
+typedef int cJSON_bool;
+
+/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
+ * This is to prevent stack overflows. */
+#ifndef CJSON_NESTING_LIMIT
+#define CJSON_NESTING_LIMIT 1000
+#endif
+
+/* returns the version of cJSON as a string */
+CJSON_PUBLIC(const char*) cJSON_Version(void);
+
+/* Supply malloc, realloc and free functions to cJSON */
+CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
+
+/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */
+/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
+CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
+/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
+/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
+
+/* Render a cJSON entity to text for transfer/storage. */
+CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
+/* Render a cJSON entity to text for transfer/storage without any formatting. */
+CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
+/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
+CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
+/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
+/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
+CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
+/* Delete a cJSON entity and all subentities. */
+CJSON_PUBLIC(void) cJSON_Delete(cJSON *c);
+
+/* Returns the number of items in an array (or object). */
+CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
+/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */
+CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
+/* Get item "string" from object. Case insensitive. */
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
+/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
+CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
+
+/* Check if the item is a string and return its valuestring */
+CJSON_PUBLIC(char *) cJSON_GetStringValue(cJSON *item);
+
+/* These functions check the type of an item */
+CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item);
+
+/* These calls create a cJSON item of the appropriate type. */
+CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean);
+CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num);
+CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string);
+/* raw json */
+CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void);
+
+/* Create a string where valuestring references a string so
+ * it will not be freed by cJSON_Delete */
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string);
+/* Create an object/arrray that only references it's elements so
+ * they will not be freed by cJSON_Delete */
+CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child);
+
+/* These utilities create an Array of count items. */
+CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char **strings, int count);
+
+/* Append item to the specified array/object. */
+CJSON_PUBLIC(void) cJSON_AddItemToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(void) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
+/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object.
+ * WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before
+ * writing to `item->string` */
+CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item);
+/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
+CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
+
+/* Remove/Detatch items from Arrays/Objects. */
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
+
+/* Update array items. */
+CJSON_PUBLIC(void) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
+CJSON_PUBLIC(void) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
+CJSON_PUBLIC(void) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
+CJSON_PUBLIC(void) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
+
+/* Duplicate a cJSON item */
+CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
+/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
+need to be released. With recurse!=0, it will duplicate any children connected to the item.
+The item->next and ->prev pointers are always zero on return from Duplicate. */
+/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
+ * case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
+CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
+
+
+CJSON_PUBLIC(void) cJSON_Minify(char *json);
+
+/* Helper functions for creating and adding items to an object at the same time.
+ * They return the added item or NULL on failure. */
+CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean);
+CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number);
+CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string);
+CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw);
+CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name);
+
+/* When assigning an integer value, it needs to be propagated to valuedouble too. */
+#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number))
+/* helper for the cJSON_SetNumberValue macro */
+CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
+#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number))
+
+/* Macro for iterating over an array or object */
+#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
+
+/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
+CJSON_PUBLIC(void *) cJSON_malloc(size_t size);
+CJSON_PUBLIC(void) cJSON_free(void *object);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/app/help/genhelp.c b/app/help/genhelp.c
index 7f79330..be20ff4 100644
--- a/app/help/genhelp.c
+++ b/app/help/genhelp.c
@@ -1,6 +1,6 @@
 
 /*  XTrkCad - Model Railroad CAD
- *  Copyright (C) 2005 Dave Bullis
+ *  Copyright (C) 2018 Martin Fischer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,197 +16,123 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-//#ifdef WINDOWS
-#include <stdlib.h>
-//#endif
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include "cJSON.h"
 
 #define I18NHEADERFILE "i18n.h"
 
-typedef enum { MSWPOPUP, XVINFO, BALLOONHELP, HPJALIAS, ALIASREF, ALIASDEF, DEFINE, BALLOONHELPI18N } mode_e;
+typedef enum { BALLOONHELP, BALLOONHELPI18N } mode_e;
 
-void remap_minus( char * cp )
+int process(mode_e mode, char * json, FILE * outFile)
 {
-    for ( ; *cp; cp++ )
-	if ( *cp == '-' )
-	    *cp = '_';
-}
+    const cJSON *messages = NULL;
+    const cJSON *messageLine = NULL;
+    int status = 0;
 
-void process( mode_e mode, FILE * inFile, FILE * outFile )
-{
-	char line[256];
-	char * cp;
-	char * contents;
-	char * alias;
-	char * extHelp;
-	int lineNum;
-	int len;
-
-	switch ( mode ) {
-	case MSWPOPUP:
-		break;
-	case XVINFO:
-		break;
-	case BALLOONHELP:
-	case BALLOONHELPI18N:
-		fputs( "/*\n * DO NOT EDIT! This file has been automatically created by genhelp.\n * Changes to this file will be overwritten.\n */\n", outFile );
-		fprintf( outFile, "#include <stdio.h>\n" );
-		fprintf( outFile, "#include \"wlib.h\"\n" );
-		if( mode == BALLOONHELPI18N )
-			fprintf( outFile, "#include \"" I18NHEADERFILE "\"\n" );
-			
-		fprintf( outFile, "wBalloonHelp_t balloonHelp[] = {\n\n" );
-		break;
-	case HPJALIAS:
-		fprintf( outFile, "[ALIAS]\r\n" );
-		break;
-	case ALIASREF:
-		break;
-	case ALIASDEF:
-		break;
-	case DEFINE:
-		break;
-	}
-
-	lineNum = 0;
-	while ( fgets( line, sizeof line, inFile ) != NULL ) {
-		lineNum++;
-		if (line[0] == '#')
-			continue;
-		len = (int)strlen( line );
-		if (line[len-1] == '\n' ) len--;
-		if (line[len-1] == '\r' ) len--;
-		line[len] = '\0';
-		if (len == 0)
-			continue;
-		contents = strchr( line, '\t' );
-		if (contents == NULL) {
-			fprintf( stderr, "Not tab on line %d\n%s\n", lineNum, line );
-			continue;
-		}
-		*contents++ = '\0';
-		alias = strchr( contents, '\t' );
-		if (alias != NULL) {
-			*alias++ = '\0';
-			extHelp = strchr( alias, '\t' );
-			if (extHelp != NULL) {
-				*extHelp++ = '\0';
-			}
-		}
-		switch ( mode ) {
-		case MSWPOPUP:
-			remap_minus( line );
-			remap_minus( contents );
-			fprintf( outFile, "\\page #{\\footnote _%s}\r\n", line );
-			for ( cp=contents; *cp; cp++ ) {
-				if ( (*cp) & 0x80 ) {
-					fprintf( outFile, "\\'%2.2X", (unsigned char)*cp );
-				} else {
-					fprintf( outFile, "%c", *cp );
-				}
-			}
-			fprintf( outFile, "\r\n" );
-			break;
-		case XVINFO:
-			if ( *contents )
-			    fprintf( outFile, ":%s\n%s\n", line, contents );
-			break;
-		case BALLOONHELP:
-		case BALLOONHELPI18N:
-			if ( *contents )
-				if( mode == BALLOONHELP )
-			   	fprintf( outFile, "\t{ \"%s\", \"%s\" },\n", line, contents );
-				else
-			   	fprintf( outFile, "\t{ \"%s\", N_(\"%s\") },\n", line, contents );					
-			else
-			    fprintf( outFile, "\t{ \"%s\" },\n", line );
-			break;
-		case HPJALIAS:
-			if (alias && *alias) {
-				remap_minus( line );
-				remap_minus( alias );
-				fprintf( outFile, "%s=%s\r\n", line, alias );
-			}
-			break;
-		case ALIASREF:
-			if (alias && *alias)
-				fprintf( outFile, "%s\n", alias );
-			break;
-		case ALIASDEF:
-			if (alias && *alias)
-				fprintf( outFile, "%s\n", line );
-			break;
-		case DEFINE:
-			fprintf( outFile, "%s\n", line );
-			break;
-		}
-	}
-
-	switch ( mode ) {
-	case MSWPOPUP:
-		break;
-	case XVINFO:
-		fprintf( outFile, ":\n" );
-		break;
-	case BALLOONHELP:
-	case BALLOONHELPI18N:
-		fprintf( outFile, "\n	{ NULL, NULL } };\n" );
-		break;
-	case HPJALIAS:
-		break;
-	case ALIASREF:
-		break;
-	case ALIASDEF:
-		break;
-	case DEFINE:
-		break;
-	}
+    cJSON *message_json = cJSON_Parse(json);
+    if (message_json == NULL) {
+        const char *error_ptr = cJSON_GetErrorPtr();
+        if (error_ptr != NULL) {
+            fprintf(stderr, "Error before: %s\n", error_ptr);
+        }
+        status = 0;
+        goto end;
+    }
+
+    fputs("/*\n * DO NOT EDIT! This file has been automatically created by genhelp.\n * Changes to this file will be overwritten.\n */\n",
+          outFile);
+    fprintf(outFile, "#include <stdio.h>\n");
+    fprintf(outFile, "#include \"wlib.h\"\n");
+    if (mode == BALLOONHELPI18N) {
+        fprintf(outFile, "#include \"" I18NHEADERFILE "\"\n");
+    }
+
+    fprintf(outFile, "wBalloonHelp_t balloonHelp[] = {\n");
+
+
+    messages = cJSON_GetObjectItemCaseSensitive(message_json, "messages");
+    cJSON_ArrayForEach(messageLine, messages) {
+        cJSON *line = cJSON_GetObjectItemCaseSensitive(messageLine, "line");
+        cJSON *contents = cJSON_GetObjectItemCaseSensitive(messageLine, "contents");
 
+        if (!cJSON_IsString(line) || !cJSON_IsString(contents)) {
+            status = 0;
+            goto end;
+        }
+
+        if (contents->valuestring != NULL) {
+            if (mode == BALLOONHELP) {
+                fprintf(outFile, "\t{ \"%s\", \"%s\" },\n", line->valuestring,
+                        contents->valuestring);
+            } else {
+                if (contents->valuestring[0]) {
+                    fprintf(outFile, "\t{ \"%s\", N_(\"%s\") },\n", line->valuestring,
+                            contents->valuestring);
+                } else {
+                    fprintf(outFile, "\t{ \"%s\", \"\" },\n", line->valuestring);
+                }
+            }
+        } else {
+            fprintf(outFile, "\t{ \"%s\", \"No help\" },\n", line->valuestring);
+            fprintf(stderr, "INFO: %s has an empty help text\n", line->valuestring);
+        }
+    }
+
+    fprintf(outFile, "\t{ NULL, NULL } };\n");
+end:
+    cJSON_Delete(message_json);
+    return status;
 }
 
 
-int main ( int argc, char * argv[] )
+int main(int argc, char * argv[])
 {
-	FILE * inFile, * outFile;
-	mode_e mode;
-	if ( argc != 4 ) {
-		fprintf( stderr, "Usage: %s (-msw|-xv|-bh|-hpj|-ref) INFILE OUTFILE\n", argv[0] );
-		exit(1);
-	}
-	if ( strcmp( argv[1], "-msw" ) == 0 )
-		mode = MSWPOPUP;
-	else if ( strcmp( argv[1], "-xv" ) == 0 )
-		mode = XVINFO;
-	else if ( strcmp( argv[1], "-bh" ) == 0 )
-		mode = BALLOONHELP;
-	else if ( strcmp( argv[1], "-bhi" ) == 0 )
-		mode = BALLOONHELPI18N;
-	else if ( strcmp( argv[1], "-hpj" ) == 0 )
-		mode = HPJALIAS;
-	else if ( strcmp( argv[1], "-aliasref" ) == 0 )
-		mode = ALIASREF;
-	else if ( strcmp( argv[1], "-aliasdef" ) == 0 )
-		mode = ALIASDEF;
-	else if ( strcmp( argv[1], "-define" ) == 0 )
-		mode = DEFINE;
-	else {
-		fprintf( stderr, "Bad mode: %s\n", argv[1] );
-		exit(1);
-	}
-
-	inFile = fopen( argv[2], "r" );
-	if (inFile == NULL) {
-		perror( argv[2] );
-		exit(1);
-	}
-	outFile = fopen( argv[3], "w" );
-	if (outFile == NULL) {
-		perror( argv[3] );
-		exit(1);
-	}
-
-	process( mode, inFile, outFile );
-	exit(0);
+    FILE * inFile, * outFile;
+    char *jsonData;
+
+    mode_e mode;
+    if (argc != 4) {
+        fprintf(stderr, "Usage: %s (-bh|-bhi) JSONFILE OUTFILE\n", argv[0]);
+        exit(1);
+    }
+
+    if (strcmp(argv[1], "-bh") == 0) {
+        mode = BALLOONHELP;
+    } else if (strcmp(argv[1], "-bhi") == 0) {
+        mode = BALLOONHELPI18N;
+    } else {
+        fprintf(stderr, "Bad mode: %s\n", argv[1]);
+        exit(1);
+    }
+
+    inFile = fopen(argv[2], "r");
+    if (inFile == NULL) {
+        perror(argv[2]);
+        exit(1);
+    }
+
+    if (inFile) {
+        unsigned int length;
+        fseek(inFile, 0, SEEK_END);
+        length = ftell(inFile);
+        fseek(inFile, 0, SEEK_SET);
+        jsonData = malloc(length + 1);
+        if (jsonData) {
+            fread(jsonData, 1, length, inFile);
+            jsonData[length] = '\0';
+        }
+        fclose(inFile);
+    }
+
+    outFile = fopen(argv[3], "w");
+    if (outFile == NULL) {
+        perror(argv[3]);
+        exit(1);
+    }
+
+    int ret = process(mode, jsonData, outFile);
+    exit(ret);
 }
diff --git a/app/help/genhelp.in b/app/help/genhelp.in
deleted file mode 100644
index 3364354..0000000
--- a/app/help/genhelp.in
+++ /dev/null
@@ -1,728 +0,0 @@
-Help	Invokes on-line help for this dialog
-cancel	Cancels this command
-Close	Closes the dialog
-#
-cmdAbout	About box dialog
-cmdAbove	Move Selected object to top
-cmdAddElevations	Raise or Lower all Selected tracks
-cmdBelow	Move Selected object to bottom
-cmdBlockCreate	Create a section of track for automation
-cmdBlockEdit	Edit a Block Definition 
-cmdCarDesc	Create a new Car/Loco description
-cmdCarInventory	Manage your Car and Loco Inventory
-cmdCircleCenter	Create track circle from center	cmdCircle
-cmdCircleFixedRadius	Create fixed radius track circle	cmdCircle
-#cmdCircleMode	Default Circle creation mode	cmdCircle
-cmdCircleSetCmd	Set Circle Track creation mode	cmdCircle
-cmdCircleTangent	Create track circle from tangent	cmdCircle
-cmdClearElevations	Removes elevation from Selected tracks
-cmdCmdopt	Command Options dialog
-cmdColor	Controls colors
-cmdConnect	Connect two tracks
-cmdControl	Create a control for layout automation
-cmdContmgm	Manage control elements
-cmdCopy	Copy selected objects to clipboard
-cmdCurveCenter	Create curved track from center	cmdCurve
-cmdCurveChord	Create curved track from chord	cmdCurve
-cmdCurveEndPt	Create curved track from end-point	cmdCurve
-cmdBezier	Create Bezier track	cmdCurve
-cmdCurveSetCmd	Set Curve Track creation mode	cmdCurve
-cmdCurveTangent	Create curved track from tangent	cmdCurve
-cmdCustmgm	Manipulate Custom designer entries
-cmdCut	Moves selected objects to clipboard
-cmdDelete	Delete objects
-cmdDemo	Playback demos
-cmdDescribe	Change Object Properties
-cmdDeselectAll	Deselect all selected objects	cmdSelect
-cmdDisplay	Change Display parameters
-cmdDrawBench	Create benchwork	cmdDraw
-cmdDrawBox	Create a box	cmdDraw
-cmdDrawCircleSetCmd	Set Circle drawing command	cmdDraw
-cmdDrawCircle	Create a circle	cmdDraw
-cmdDrawCircleCenter	Draw a circle line from center	cmdDraw
-cmdDrawCircleFixedRadius	Draw a fixed radius circle line	cmdDraw
-cmdDrawCircleTangent	Draw a circle line from tangent	cmdDraw
-cmdDrawCurveSetCmd	Set Curve drawing command	cmdDraw
-cmdDrawCurve	Create a curved line	cmdDraw
-cmdDrawCurveEndPt	Create a curved line from End	cmdDraw
-cmdDrawCurveCenter	Create a curved line from center	cmdDraw
-cmdDrawCurveChord	Create a curved line from chord	cmdDraw
-cmdDrawCurveTangent	Create a curved line from tangent	cmdDraw
-cmdDrawBezierCurve	Create a Bezier line	cmdDraw
-cmdDrawDimLine	Create a dimension line	cmdDraw
-cmdDrawFilledBox	Create a filled box	cmdDraw
-cmdDrawFilledCurve	Create a filled circle	cmdDraw
-cmdDrawFilledCircleCenter	Draw a filled circle from center	cmdDraw
-cmdDrawFilledCircleFixedRadius	Draw a fixed radius filled circle	cmdDraw
-cmdDrawFilledCircleTangent	Draw a filled circle from tangent	cmdDraw
-cmdDrawPolygon	Create a filled polygon	cmdDraw
-cmdDrawPolyline	Create a polyline	cmdDraw
-cmdDrawLine	Create a straight line	cmdDraw
-cmdDrawLineSetCmd	Set Line drawing command	cmdDraw
-cmdDrawShapeSetCmd	Set Shape drawing command	cmdDraw
-cmdDrawTableEdge	Draw table edge	cmdDraw
-cmdEasement	Easement menu
-cmdElevation	Change Elevations
-cmdEnumerate	Generate a Parts List of selected objects
-cmdExport	Export a .xti file
-cmdExportDXF	Export a DXF file
-cmdFileNote	General note about the layout
-cmdFlip	Flip selected objects
-cmdGrid	Adjust snap grid
-cmdGridEnable	Enable snap grid	cmdGrid
-cmdGridShow	Show snap grid	cmdGrid
-cmdGroup	Create a structure from a Group of objects
-cmdHandLaidTurnout	Create a hand-laid turnout
-cmdHelix	Create a track helix
-#cmdHotBar	Place a turnout or structure
-cmdImport	Import a .xti file	cmdExport
-cmdJoin	Join two tracks
-cmdLayer	Change Layers
-cmdLayerSet	Selects the current drawing layer	cmdLayer
-#cmdLayerShow0	Shows or hides layers	cmdLayer
-#cmdLayerShow1	Shows or hides layers	cmdLayer
-#cmdLayerShow10	Shows or hides layers	cmdLayer
-#cmdLayerShow11	Shows or hides layers	cmdLayer
-#cmdLayerShow12	Shows or hides layers	cmdLayer
-#cmdLayerShow13	Shows or hides layers	cmdLayer
-#cmdLayerShow14	Shows or hides layers	cmdLayer
-#cmdLayerShow15	Shows or hides layers	cmdLayer
-#cmdLayerShow16	Shows or hides layers	cmdLayer
-#cmdLayerShow17	Shows or hides layers	cmdLayer
-#cmdLayerShow18	Shows or hides layers	cmdLayer
-#cmdLayerShow19	Shows or hides layers	cmdLayer
-#cmdLayerShow2	Shows or hides layers	cmdLayer
-#cmdLayerShow3	Shows or hides layers	cmdLayer
-#cmdLayerShow4	Shows or hides layers	cmdLayer
-#cmdLayerShow5	Shows or hides layers	cmdLayer
-#cmdLayerShow6	Shows or hides layers	cmdLayer
-#cmdLayerShow7	Shows or hides layers	cmdLayer
-#cmdLayerShow8	Shows or hides layers	cmdLayer
-#cmdLayerShow9	Shows or hides layers	cmdLayer
-cmdLayout	Layout parameters
-#cmdLoosen	Disconnect tracks at loose joints	nohelp
-cmdMapShow	Show/Hide Map Window
-cmdModify	Modify or extend a track
-cmdMove	Move selected objects
-cmdMoveLabel	Move a label
-cmdMoveToCurrentLayer	Move selected objects to current layer
-cmdNote	Place a note on the layout
-cmdOutputbitmap	Print a BitMap
-cmdPan	Pan or Zoom the Layout
-cmdParallel	Create a parallel track
-cmdParameter	Register	register
-cmdPaste	Copy objects from clipboard
-cmdPref	Perferences dialog
-cmdPricelist	Display prices of turnouts, sectional tracks and structures
-cmdPrint	Print the layout
-cmdPrmfile	Loads and unloads parameter files
-cmdProfile	Elevation Profile Command
-cmdProfileDraw	Profile	cmdProfile
-cmdRecord	Command recorder
-cmdRedo	Redo last undo
-cmdRefreshCompound	Update selected Turnout and Structure definitions
-cmdRescale	Rescale selected objects
-cmdRotate	Rotate selected object(s)
-cmdRuler	Show a ruler
-cmdSelect	Select objects
-cmdSelectAll	Selects all objects on the layout	cmdSelect
-cmdSelectCurrentLayer	Selects all objects in the current Layer	layer
-cmdSelectInvert	Invert current selection
-cmdSplitTrack	Split a track
-cmdSelectOrphaned	Select stranded (unconnected) track pieces
-cmdSensor	Create a sensor (ie. a occupancy detector or a toggle switch)
-cmdSignal	Create a signal for train control
-cmdSticky	Choose which commands are sticky
-cmdStraight	Create straight track
-cmdStructure	Place a structure on the layout
-cmdSwitchMotorCreate	Create a switchmotor for turnout control
-cmdSwitchMotorEdit	Edit a switchmotor definition
-cmdText	Enter text on the layout
-cmdTextSize	Controls the size of the entered text	cmdText
-#cmdTighten	Remove slack from connected tracks
-cmdTip	Tip of the Day window
-cmdTrain	Run Trains
-cmdTrainPause	Pause/Resume Trains	cmdTrain
-cmdTrainNewCar	Place a car on the layout	cmdTrain
-cmdTrainExit	Exit Trains	cmdTrain
-cmdTunnel	Hide/Unhide a track
-cmdTurnout	Place a turnout or sectional track
-cmdTurnoutNew	Create a new turnout definition
-cmdTurntable	Place a turntable
-cmdUpdatetitle	Updates old source files with 3 part titles
-cmdUndo	Undo last command
-cmdUngroup	Ungroup objects
-cmdWidth0	Draw tracks with thin lines	editM
-cmdWidth2	Draw tracks with medium lines	editM
-cmdWidth3	Draw tracks with thick lines	editM
-cmdZoom	Change drawing scale	editZoom
-cmdZoomIn	Zoom in	editZoomIn
-cmdZoomOut	Zoom out	editZoomOut
-#
-#
-menuFile	File Menu
-menuFile-save	Save layout
-menuFile-saveAs	Save layout under a new name 
-menuFile-clear	New layout
-menuFile-enum	Generate parts list
-menuFile-load	Load a layout
-menuFile-quit	Exit the program
-menuFile-revert	Revert to last saved state of layout plan
-#
-editM	Edit menu
-menuEdit-redraw	Redraw layout
-menuEdit-zoomIn	Zoom in
-menuEdit-zoomOut	Zoom out
-#
-toolsM	Tools menu
-#
-menuView	View menu
-menuToolbar	Toolbar configuration
-#
-menuTools	Tools menu
-#
-menuOption	Options menu
-#
-menuMacro	Playback/Record commands
-#
-menuWindow	Window menu
-#
-menuHelp	Help menu
-menuHelpRecentMessages	Recent error messages and explanations	menuHelp
-#
-#
-hotBarLeft	Move Hot Bar left	cmdHotBar
-hotBarRight	Move Hot Bar right	cmdHotBar
-infoBarCount	Total track count	statusBar
-infoBarPosX	X Position of cursor	statusBar
-infoBarPosY	Y Position of cursor	statusBar
-infoBarScale	Drawing scale	statusBar
-infoBarStatus	Message and status line	statusBar
-main-draw	Main layout canvas
-mainDraw	Main layout canvas
-main-canvas	Main drawing canvas
-main-commandbar	Command buttons
-main-menubar	Menus
-main-titlebar	Tile, Filename and Window Manager buttons
-main-hotbar	Turnout and Structure Hot Bar
-main-layers	Active layer list and layer buttons
-map-draw	Map window
-map-hilight	This is the portion of the layout shown in the Main Window canvas
-#
-#
-addElev-value	Raise or Lower all Selected Track	cmdAddElevations
-#
-block-name	Name of block	cmdBlockCreate
-block-script	Script that the block will run	cmdBlockCreate
-block-segments	List of tracks in the Block	cmdBlockEdit 
-#
-carpart-ok	Add or Update car object	cmdCarInventory
-carpart-manuf	Manufacturer name	cmdCarInventory
-carpart-prototype	Car Prototype	cmdCarInventory
-carpart-prototype-list	Car Prototype	cmdCarInventory
-carpart-isLoco	Is the Car a Locomotive?	cmdCarInventory
-carpart-partno-list	Part Number and Description	cmdCarInventory
-carpart-partno	Manufacturer Part Number	cmdCarInventory
-carpart-import	Use the Selected figure as the car image	cmdCarInventory
-carpart-reset	Use the default figure as the car image	cmdCarInventory
-carpart-desc	Optional description of the Car Part	cmdCarInventory
-carpart-flip	Flip car image	cmdCarInventory
-carpart-dispmode	Display Car Item information or reporting marks and dimensions	cmdCarInventory
-carpart-road	Full Roadname	cmdCarInventory
-carpart-type	Car Type	cmdCarInventory
-carpart-protokind-list	Car Type	cmdCarInventory
-carpart-repmark	Reporting Marks (Roadname abbreviation)	cmdCarInventory
-carpart-number	Car Number	cmdCarInventory
-carpart-bodyColor	Car body Color	cmdCarInventory
-carpart-carLength	Length of car body	cmdCarInventory
-carpart-carWidth	Width of car body	cmdCarInventory
-carpart-trkCenter	Distance between Trucks 	cmdCarInventory
-carpart-cplrMount	Coupler are mounted on body or truck	cmdCarInventory
-carpart-cpldLen	Overall Coupled Length	cmdCarInventory
-carpart-cplrLen	Coupler Length from end of car	cmdCarInventory
-carpart-canvas	Diagram of Car	cmdCarInventory
-carpart-index	Item Index Number	cmdCarInventory
-carpart-purchPrice	Original Purchase Price	cmdCarInventory
-carpart-currPrice	Current Price	cmdCarInventory
-carpart-condition	Condition of car	cmdCarInventory
-carpart-purchDate	Original Purchase Date	cmdCarInventory
-carpart-serviceDate	Last Service Date	cmdCarInventory
-carpart-quantity	Number of identical cars to be entered	cmdCarInventory
-carpart-multinum	Do all the cars have the same Number?	cmdCarInventory
-carpart-notes	Notes about the car	cmdCarInventory
-carpart-new	Create a new car Part or Prototype definitions	cmdCarInventory
-carpart-new-menu	Create a new car Part or Prototype definitions	cmdCarInventory
-
-#
-carinv-ok	Finds the selected Car Item on the layout	cmdCarInvertory
-carinv-sort1	Sort the Item list	cmdCarInvertory
-carinv-sort2	Sort the Item list	cmdCarInvertory
-carinv-sort3	Sort the Item list	cmdCarInvertory
-carinv-sort4	Sort the Item list	cmdCarInvertory
-carinv-list		cmdCarInvertory
-carinv-edit	Edit the selected Car Item	cmdCarInvertory
-carinv-add	Add a new Car Item	cmdCarInvertory
-carinv-delete	Delete the selected Car Items	cmdCarInvertory
-carinv-import	Import a Car Item .csv file	cmdCarInvertory
-carinv-export	Export a Car Item .csv file	cmdCarInvertory
-carinv-savetext	Create a text list of the Car Items	cmdCarInvertory
-#
-circle-radius	Specifies the radius of the circle track	cmdCircle
-#
-cmdopt-move-quick	How to draw track being moved/rotated	cmdCmdopt
-cmdopt-preselect	Default command is Describe or Select	cmdCmdopt
-cmdopt-rightclickmode	Action to invoke on Right-Click	cmdCmdopt
-cmdopt-ok		cmdCmdopt
-#
-contmgm-inx	The list of control elements	cmdContmgm
-contmgm-edit	Edit the element	cmdContmgm
-contmgm-delete	Delete the element	cmdContmgm
-#
-contents-label	Contents Label for new Parameter file	cmdCustmgm
-#
-custmgm-inx	List of custom designed turnouts and structures	cmdCustmgm
-custmgm-edit	Invoke designer editor	cmdCustmgm
-custmgm-delete	Remove selected entries	cmdCustmgm
-custmgm-export	Copy selected entries to Parameter File	cmdCustmgm
-custmgm-new	Create a New part or prototype	cmdCustmgm
-custmgm-ok	Update custom file and close	cmdCustmgm
-#
-demo-step	Executes the next step of the demo	cmdDemo
-demo-next	Skip to next demo	cmdDemo
-demo-quit	Stops the demonstration and returns you to XTrackCAD	cmdDemo
-demo-speed	Select speed of Playback	cmdDemo
-demo-text	This is where comments about the demo are displayed	cmdDemo
-#
-#Note all below have tab char after name
-describe-F1	
-describe-F2	
-describe-F3	
-describe-F4	
-describe-F5	
-describe-F6	
-describe-F7	
-describe-F8	
-describe-F9	
-describe-F10	
-describe-F11	
-describe-F12	
-describe-F13	
-describe-F14	
-describe-F15	
-describe-F16	
-describe-F17	
-describe-F18	
-describe-F19	
-describe-F20	
-describe-I1	
-describe-I2	
-describe-I3	
-describe-I4	
-describe-I5	
-describe-S1	
-describe-S2	
-describe-S3	
-describe-S4	
-describe-Y1	
-describe-C1	
-describe-L1	
-describe-L2	
-describe-LE1	
-describe-T1	
-describe-P1	
-#
-display-autoPan	Move the Main canvas if you drag near the edge	cmdDisplay
-display-color-layers	Color tracks or other objects by layer
-display-tunnels	Controls the drawing of hidden tracks	cmdDisplay
-display-endpt	Controls the drawing of End-Points	cmdDisplay
-display-tiedraw	How to draw track ties	cmdDisplay
-display-centerdraw	Show crosshair at center of curves	cmdDisplay
-display-tworailscale	Drawing scale when to draw tracks with 2 rails	cmdDisplay
-display-mapscale	Drawing scale of the map window	cmdDisplay
-display-livemap	Whether the main layout is updated while dragging on the Map	cmdDisplay
-display-labelenable	Enable labels for Turnouts, Flextrack Lengths and Elevations	cmdDisplay
-display-labelscale	When to label Turnout, Flextrack Lengths and Elevations	cmdDisplay
-display-description-fontsize	Font size for labels on layout	cmdDisplay
-display-hotbarlabels	Label elements on the Hot Bar	cmdDisplay
-display-layoutlabels	Label elements on layout	cmdDisplay
-display-listlabels	Label elements for lists	cmdDisplay
-display-carhotbarlabels	How to group cars on the Train Hot Bar	cmdDisplay
-display-trainpause	Delay (in mS) between updating train movements	cmdDisplay
-display-hideTrainsInTunnels	Don't show trains in tunnels when tunnels are hidden	cmdDisplay
-display-unconnected-endpt	Display unconnected endpoints of track with special marks	cmdDisplay
-display-zoom-corner	Whether zoom is locked to the bottom left corner or the center point	cmdDisplay
-#display-ok	Update the display	cmdDisplay
-display-ok		cmdDisplay
-#
-draw-linewidth	Width of the lines	cmdDraw
-draw-linecolor	Color of the lines	cmdDraw
-draw-benchlist	List of types of Lumber	cmdDraw
-draw-benchcolor	Color of Benchwork	cmdDraw
-draw-benchorient	Orientation of Benchwork	cmdDraw
-draw-arrowsize	Size of Dimension Arrows	cmdDraw
-#
-easement-val	This controls the sharpness of the easement curve	cmdEasement
-easement-r	Minimum radius	cmdEasement
-easement-x	Maximum offset	cmdEasement
-easement-l	Easement length	cmdEasement
-easement-radio	These radio buttons are a short-cut for Values of 0.0, 0.5, 1.0 and 2.0.  None turns Easements off	cmdEasement
-easement-ok	Complete easement selection	cmdEasement
-#
-elev-mode	Type of elevation	cmdElevation
-elev-value	Height of End Point	cmdElevation
-elev-computed	Compute elevation based on neighbors	cmdElevation
-elev-grade	Compute grade based on neighbors	cmdElevation
-elev-station	Specify a name for an End-Point	cmdElevation
-elev-ok		cmdElevation
-#
-enum-print	Print parts list	cmdEnumerate
-enum-printsetup	Invoke the Print Setup dialog	printSetup
-enum-save	Save parts list to file	cmdEnumerate
-enum-text	This is the list of parts for the layout	cmdEnumerate
-enum-list-prices	Enable prices on the Parts List	cmdEnumerate
-#
-grid-horzspacing	Spacing between major grid lines	cmdGrid
-grid-horzdivision	Allows the spacing to be subdivided	cmdGrid
-grid-horzenable	Specifies if positions are snaped in this direction	cmdGrid
-grid-vertspacing	Spacing between major grid lines	cmdGrid
-grid-vertdivision	Allows the spacing to be subdivided	cmdGrid
-grid-vertenable	Specifies if positions are snaped in this direction	cmdGrid
-grid-origx	Shows the origin and angle of the grid	cmdGrid
-grid-origy	Shows the origin and angle of the grid	cmdGrid
-grid-origa	Shows the origin and angle of the grid	cmdGrid
-grid-show	Specifies if the grid is shown	cmdGrid
-grid-ok	Completes the grid specification	cmdGrid
-#
-group-manuf	Manufacturer	cmdGroup
-group-desc	Description	cmdGroup
-group-partno	Part Number	cmdGroup
-group-segcnt	Number of segments in Group	cmdGroup
-group-replace	Replace the Selected object with the new definition?	cmdGroup
-group-ok	Creates a new Structure (or Turnout)	cmdGroup
-#
-helix-elev	Elevation difference of Helix End-Points	cmdHelix
-helix-radius	Helix Radius	cmdHelix
-helix-turns	Number of turns in the helix	cmdHelix
-helix-angSep	Angle betweek helix entrance and exit	cmdHelix
-helix-grade	Grade in helix	cmdHelix
-helix-vertSep	Separation between helix layers	cmdHelix
-#
-layer-layer	Layer list	cmdLayer
-layer-name	Layer Name	cmdLayer
-layer-color	Color of layer	cmdLayer
-layer-visible	Layer is drawn on Main window	cmdLayer
-layer-frozen	Layer cannot be changed	cmdLayer
-layer-onmap	Layer is drawn on Map window	cmdLayer
-layer-button-count	Number of layer buttons to show	cmdLayer
-layer-object-count	Number of objects in this layer	cmdLayer
-layer-ok		cmdLayer
-layer-reset	Load layer configuration from default	cmdLayer
-layer-save	Save current layer configuration as default	cmdLayer
-layer-clear	Overwrite layer configuration with system default values	cmdLayer
-#
-layout-roomsizeX	Specifies the size of the room (in inches or centimeters)	cmdLayout
-layout-roomsizeY	Specifies the size of the room (in inches or centimeters)	cmdLayout
-layout-title1	Specifies the layout Title that will appear on printouts	cmdLayout
-layout-title2	Specifies the layout Subtitle that will appear on printouts	cmdLayout
-layout-scale	Specifies the Modelling Scale	cmdLayout
-layout-gauge	Specifies the rail gauge, ie. the distance between the rails	cmdLayout
-layout-mintrackradius	Specifies minimum track radius (in inches or centimeters). Tracks with a smaller radius are considered exceptional.	cmdLayout
-layout-maxtrackgrade	Specifies maximum track elevation expressed as a percent (%). Tracks with a larger elevation are considered exceptional.	cmdLayout
-#
-newcar-road	Roadname	cmdTrain
-newcar-number	Car Number	cmdTrain
-#
-note-text	This is the body of the Note.  To change this select Modify from the File Menu	cmdNote
-note-ok		cmdNote
-#
-outputbitmap-density	Specifies number of pixels per inch (or centimeter)	cmdOutputbitmap
-outputbitmap-ok		cmdOutputbitmap
-outputbitmap-toggles	Specifies whether Layout Titles, Borders or Track Centerlines are printed on the BitMap	cmdOutputbitmap
-#
-parallel-separation	Specifies the separation between parallel tracks	cmdParallel
-#
-parameter-name	Enter your name as specified in the XTrackCAD Registration Notice	register
-parameter-key	Enter the key value as specified in the XTrackCAD Registration Notice	register
-parameter-ok	Validates the name and key.  Terminates the registration command	register
-#
-pref-anglesystem	0� is up or to the right	cmdPref
-pref-units	Choose english (inches) or metric (centimeters)	cmdPref
-pref-dstfmt	How to display length measurements	cmdPref
-pref-minlength	Do not create tracks to be shorter than this value	cmdPref
-pref-connectdistance	Maximum distance between connected end points	cmdPref
-pref-connectangle	Minimum angle between connected End-Points	cmdPref
-pref-turntable-angle	Specifies the minimum angle between tracks connected to a turntable	cmdPref
-pref-coupling-speed-max	Trains will crash above this speed	cmdPref
-pref-balloonhelp	Enable/Disable balloon popup help windows	cmdPref
-pref-dragpixels	How far you can move the mouse before its considered a drag	cmdPref
-pref-dragtimeout	How long you can hold a mouse button down before its considered a drag	cmdPref
-pref-mingridspacing	Minimum distance (in pixels) between grid lines/ticks	cmdPref
-pref-checkpoint	Specifies the Check Point frequency; number of modifications made since the last save.	cmdPref
-pref-onstartup	Resume work on last layout or start with new layout	cmdPref
-pref-ok		cmdPref
-#
-pricelist-cost	Updated cost of current selected item	cmdPricelist
-pricelist-entry	Item	cmdPricelist
-pricelist-inx	Selection list for prices	cmdPricelist
-pricelist-flexlen	Price of specified length of flex-track	cmdPricelist
-pricelist-flexunit	Price of specified length of flex-track	cmdPricelist
-pricelist-flexcost	Price of specified length of flex-track	cmdPricelist
-pricelist-ok		cmdPricelist
-#
-print-centerLine	Controls the printing of a centerline of track cmdPrint
-print-scale	Controls the reduction (scale) of the printout	cmdPrint
-print-pagew	Scaled page width (Scale times physical page width)	cmdPrint
-print-max	Sets page size to the maximum (based on scale and physical page size)	cmdPrint
-print-pageh	Scaled page height (Scale times physical page height)	cmdPrint
-print-snapshot	Sets scale, origin and angle for a one page printout of the layout	cmdPrint
-print-format	Print page in Portrait or Landscape format	cmdPrint
-print-order	Order of printing pages	cmdPrint
-print-style	Print Title, Date, Author and other information at bottom of page?	cmdPrint
-print-physsize	Ignore unprintable page margins?	cmdPrint
-print-registrationMarks	Print Registration Marks at 1:1?	cmdPrint
-print-grid	Print Snap Grid?	cmdPrint
-print-ruler	Print Rulers on all page edges?	cmdPrint
-print-roadbed	Print Roadbed Outline?	cmdPrint
-print-roadbedWidth	Print Roadbed Outline	cmdPrint
-print-origx	Origin of the print grid.  This is useful if you want to reprint a set of pages	cmdPrint
-print-origy	Origin of the print grid.  This is useful if you want to reprint a set of pages	cmdPrint
-print-reset	Resets the origin and angle to 0	cmdPrint
-print-origa	Origin of the print grid.  This is useful if you want to reprint a set of pages	cmdPrint
-print-clear	Deselects all pages	cmdPrint
-print-setup	Invoke the Print Setup dialog	printSetup
-print-ok	Print selected pages and terminates the print command	cmdPrint
-#
-prmfile-inx	List of loaded and unloaded parameter files	cmdPrmfile
-prmfile-mode	Show parameter files by names or descriptions	cmdPrmfile
-prmfile-action	Toggle the loaded status of the selected parameter file	cmdPrmfile
-prmfile-browse	Find a parameter file for loading	cmdPrmfile
-prmfile-ok	Update parameter file list	cmdPrmfile
-prmfile-selectall	Select all parameter files shown	cmdPrmfile 
-#
-profile-canvas	Profile of specified path	cmdProfile
-profile-clear	Clear the profile	cmdProfile
-profile-print	Print the profile	cmdProfile
-profile-ok		cmdProfile
-#
-record-stop	Stop recording	cmdRecord
-record-message	Insert a message	cmdRecord
-record-end	End a message	cmdRecord
-record-text	Message body	cmdRecord
-#
-refreshSpecial-list	Possible turnouts	cmdRefreshSpecial
-refreshSpecial-skip	Skip this turnout	cmdRefreshSpecial
-refreshSpecial-ok		cmdRefreshSpecial
-#
-rename-manuf	Manufacturer of Object	cmdCustmgm
-rename-desc	Description of Object	cmdCustmgm
-rename-partno	Part Nuber of Object	cmdCustmgm
-rename-ok		cmdCustmgm
-#
-rescale-toggle	Rescale by Scale Conversion or by Ratio	cmdRescale
-rescale-fromS	Original Scale of the selected objects	cmdRescale
-rescale-fromG	Original Gauge of the selected objects	cmdRescale
-rescale-toS	New Scale of the selected objects	cmdRescale
-rescale-toG	New Gauge of the selected objects	cmdRescale
-rescale-change-dim	Change track dimensions to new scale	cmdRescale
-rescale-ratio	Change size by this amount	cmdRescale
-rescale-ok		cmdRescale
-#
-rgbcolor-snapgrid	Snap Grid Line and Division	cmdRgbcolor
-rgbcolor-marker	X and Y position markers	cmdRgbcolor
-rgbcolor-border	Border rulers, room boundaries and table edges	cmdRgbcolor
-rgbcolor-crossmajor	Primary Axis of grid rotation	cmdRgbcolor
-rgbcolor-crossminor	Secondary Axis of grid rotation	cmdRgbcolor
-rgbcolor-normal	Unselected tracks	cmdRgbcolor
-rgbcolor-selected	Selected tracks	cmdRgbcolor
-rgbcolor-profile	Color of tracks on the Profile path	cmdRgbcolor
-rgbcolor-exception	Color of Exceptional tracks	cmdRgbcolor
-rgbcolor-tie	Color of track ties	cmdRgbcolor
-rgbcolor-ok	Updates the colors	cmdRgbcolor
-#
-rotate-rotate	Angle in degrees	cmdRotate
-rotate-ok	Rotate object(s) by specified amount	cmdRotate
-#
-sticky-set	Choose commands to be sticky	cmdSticky
-sticky-ok	Make the commands sticky	cmdSticky
-#
-structure-list	List of available structure	cmdStructure
-structure-canvas	Diagram of the selected structure	cmdStructure
-structure-hide	Hide Selection window when placing Structure	cmdStructure
-structure-stats	Drawing scale and size	cmdStructure
-structure-ok	Complete structure placement	cmdStructure
-#
-structure-pier-inx	Choose a Pier number	cmdStructure
-#
-switchmotor-name	Name of the Motor	cmdSwitchMotorCreate
-switchmotor-normal	Value when switch is normal	cmdSwitchMotorCreate
-switchmotor-reverse	Value when the switch is reversed	cmdSwitchMotorCreate
-switchmotor-pointSense	Value for a positive comfirmation of switch position	cmdSwitchMotorCreate 
-#
-text-fontsize	Controls the size of the entered text	cmdText
-#
-tip-text	Useful information about the program	cmdTip
-tip-showatstart	Show Tip of the Day every time the program starts	cmdTip
-tip-next	Show the next Tip of the Day	cmdTip
-tip-prev	Show the previous Tip of the Day	cmdTip
-tip-ok		cmdTip
-#
-toolbarM	Controls which Command Buttons are displayed
-#
-train-newcar-index	List of Cars	cmdTrain
-train-list	List of active trains	cmdTrain
-train-speed	Speed	cmdTrain
-train-distance	Train odometer	cmdTrain
-train-zeroDistance	Reset odometer to 0	cmdTrain
-train-goto	Find train on layout	cmdTrain
-train-follow	Follow train around layout	cmdTrain
-train-autoreverse	Flip direction at End Of Track	cmdTrain
-train-direction	Change direction of train	cmdTrain
-train-stop	Stop the train	cmdTrain
-#
-turnout-list	List of available turnouts for the current scale	cmdTurnout
-turnout-canvas	Diagram of the currently selected turnout.  Click on a End-Point to select the Active End-Point	cmdTurnout
-turnout-new	A menu list of various type of turnouts and sectional tracks you can define
-turnout-hide	Hide Selection window when placing Turnout	cmdTurnout
-turnout-activeEndPoint	The selected Active End-Point	cmdTurnout
-turnout-current	Current selected turnout, (displayed in the diagram window)	cmdTurnout
-turnout-endPoint	One the End-Points that can be selected	cmdTurnout
-turnout-ok		cmdTurnout
-#
-turnoutNew-angle1	Angle of the specified track to the center line of the turnout
-turnoutNew-angle2	Angle of the specified track to the center line of the turnout
-turnoutNew-angleMode	Specifies if angles are entered as Frog Numbers or in degrees	cmdTurnoutNew
-turnoutNew-desc1	Desciption
-turnoutNew-desc2	Desciption
-turnoutNew-label	Turnout description (Manuf., Size, Part Number, etc)	cmdTurnoutNew
-turnoutNew-len0	Length from the base to the end of the specified track
-turnoutNew-len1	Length from the base to the end of the specified track
-turnoutNew-len2	Length from the base to the end of the specified track
-turnoutNew-manuf	Manufacturer
-turnoutNew-off1	Offset of the track End-Point from the center line of the turnout
-turnoutNew-off2	Offset of the track End-Point from the center line of the turnout
-turnoutNew-partno1	Part Number
-turnoutNew-partno2	Part Number
-turnoutNew-print	Prints a full size diagram of the turnout for checking	cmdTurnoutNew
-turnoutNew-ok	Prints a full size diagram of the turnout for checking	cmdTurnoutNew
-turnoutNew-color	Color of Roadbed lines	cmdTurnoutNew
-turnoutNew-roadbedLineWidth	Width of Roadbed lines	cmdTurnoutNew
-turnoutNew-roadbedWidth	Width of Roadbed	cmdTurnoutNew
-turnoutNew-printsetup	Invoke the Print Setup dialog	printSetup
-turnoutNew-done	Closes the window and returns to the Turnout Selection window	cmdTurnoutNew
-#
-turntable-diameter	Specifies the diameter of the turntable	cmdTurntable
-#
-updatetitle-old	Old Turnout title	cmdUpdatetitle
-updatetitle-sel	List of available titles	cmdUpdatetitle
-updatetitle-ignore	Leave the Turnouts' title unchanged	cmdUpdatetitle
-updatetitle-load	Invoke the Parameter Files dialog	cmdUpdatetitle
-updatetitle-list	List of available turnouts	cmdUpdatetitle
-updatetitle-ok	Update the Turnouts' title	cmdUpdatetitle
-#
-#
-fontSelCancel	Cancel	fontSelW
-fontSelList	List	fontSelW
-fontSelOk	Ok	fontSelW
-fontSelSample	Sample	fontSelW
-fontSelSize	Size	fontSelW
-fontSelSlant	Slant	fontSelW
-fontSelW	Font selection dialog
-fontSelWeight	Weight	fontSelW
-#
-printAbortW	Printer Abort Window
-printFileName	Print to filename
-printFontAlias	Specify Postscript font alias mapping
-printSetup	Displays the Print Setup window to change printers, orientation, paper size, etc.
-printSetupCancel	Closes this dialog	printSetup
-printSetupFormat	Page orientation	printSetup
-printSetupMargin	Unprintable margins	printSetup
-printSetupOk	Updates and closes this dialog	printSetup
-printSetupPaper	Choose paper size	printSetup
-printSetupPrinter	Choose printer	printSetup
-printSetupTest	Print test page	printSetup
-#
-#
-about	No Help	nohelp
-about-about	No Help	nohelp
-about-ok		nohelp
-cmdDebug	No Help	nohelp
-loosen	No Help	nohelp
-misc-cur-turnout-ep	
-misc-toolbarset	No Help	nohelp
-misc-showlayout	No Help	nohelp
-misc-showdisplay	No Help	nohelp
-misc-showcmdopt	No Help	nohelp
-misc-showeasement	No Help	nohelp
-misc-showfontSel	No Help	nohelp
-misc-showgrid	No Help	nohelp
-misc-showdebug	No Help	nohelp
-misc-sticky	No Help	nohelp
-misc-showpref	No Help	nohelp
-misc-showcolor	No Help	nohelp
-misc-showfileClear	No Help	nohelp
-misc-showparamFile	No Help	nohelp
-misc-showpriceList	No Help	nohelp
-misc-showprint	No Help	nohelp
-misc-showprintSetup	No Help	nohelp
-misc-showprintBitmap	No Help	nohelp
-misc-showpartsList	No Help	nohelp
-misc-shownotes	No Help	nohelp
-misc-showundo	No Help	nohelp
-misc-showredo	No Help	nohelp
-misc-showcut	No Help	nohelp
-misc-showcopy	No Help	nohelp
-misc-showpaste	No Help	nohelp
-misc-showdelete	No Help	nohelp
-misc-showtunnel	No Help	nohelp
-misc-showabove	No Help	nohelp
-misc-showbelow	No Help	nohelp
-misc-showwidth0	No Help	nohelp
-misc-showwidth2	No Help	nohelp
-misc-showwidth3	No Help	nohelp
-misc-showrecompelev	No Help	nohelp
-misc-showcardesc	No Help	nohelp
-misc-showcaradd	No Help	nohelp
-misc-showselectAll	No Help	nohelp
-misc-showimport	No Help	nohelp
-misc-showexport	No Help	nohelp
-misc-showexportDXF	No Help	nohelp
-misc-showloosen	No Help	nohelp
-misc-group-objects	No Help	nohelp
-misc-ungroup-objects	No Help	nohelp
-misc-showcustomMgm	No Help	nohelp
-misc-showlayers	No Help	nohelp
-misc-showmoveToCurrentLayer	No Help	nohelp
-misc-showselectCurrentLayer	No Help	nohelp
-misc-showclearElevations	No Help	nohelp
-misc-showaddElevations	No Help	nohelp
-debug-Track	No Help	nohelp
-debug-EndPt	No Help	nohelp
-debug-ReadTracks	No Help	nohelp
-debug-Curve	No Help	nohelp
-debug-Join	No Help	nohelp
-debug-Turnout	No Help	nohelp
-debug-Structure	No Help	nohelp
-debug-Print	No Help	nohelp
-debug-ok		nohelp
-map-canvas	No Help	nohelp
-#
-cmdLayerShow0	Layer	cmdLayer
-cmdLayerShow1	Layer	cmdLayer
-cmdLayerShow2	Layer	cmdLayer
-cmdLayerShow3	Layer	cmdLayer
-cmdLayerShow4	Layer	cmdLayer
-cmdLayerShow5	Layer	cmdLayer
-cmdLayerShow6	Layer	cmdLayer
-cmdLayerShow7	Layer	cmdLayer
-cmdLayerShow8	Layer	cmdLayer
-cmdLayerShow9	Layer	cmdLayer
-cmdLayerShow10	Layer	cmdLayer
-cmdLayerShow11	Layer	cmdLayer
-cmdLayerShow12	Layer	cmdLayer
-cmdLayerShow13	Layer	cmdLayer
-cmdLayerShow14	Layer	cmdLayer
-cmdLayerShow15	Layer	cmdLayer
-cmdLayerShow16	Layer	cmdLayer
-cmdLayerShow17	Layer	cmdLayer
-cmdLayerShow18	Layer	cmdLayer
-cmdLayerShow19	Layer	cmdLayer
diff --git a/app/help/genhelp.json b/app/help/genhelp.json
new file mode 100644
index 0000000..1d6f8af
--- /dev/null
+++ b/app/help/genhelp.json
@@ -0,0 +1,681 @@
+{

+	"messages": [

+		{"line": "Help", "contents": "Invokes online help for this dialog" },

+		{"line": "cancel", "contents": "Cancels this command" },

+		{"line": "Close", "contents": "Closes the dialog" },

+		{"line": "cmdAbout", "contents": "About program dialog" },

+		{"line": "cmdAbove", "contents": "Move selected object to top" },

+		{"line": "cmdAddElevations", "contents": "Raise or lower all selected tracks" },

+		{"line": "cmdMagneticSnap", "contents": "Turn magnetic snap on or off" },

+		{"line": "cmdBelow", "contents": "Move selected object to bottom" },

+		{"line": "cmdBlockCreate", "contents": "Create a section of track for automation" },

+		{"line": "cmdBlockEdit", "contents": "Edit a block definition " },

+		{"line": "cmdCarDesc", "contents": "Create a new Car/Loco description" },

+		{"line": "cmdCarInventory", "contents": "Manage your Car and Loco Inventory" },

+		{"line": "cmdCircleCenter", "contents": "Create track circle from center" },

+		{"line": "cmdCircleFixedRadius", "contents": "Create fixed radius track circle" },

+		{"line": "cmdCircleSetCmd", "contents": "Set Circle Track creation mode" },

+		{"line": "cmdCircleTangent", "contents": "Create track circle from tangent" },

+		{"line": "cmdClearElevations", "contents": "Removes elevation from Selected tracks" },

+		{"line": "cmdClone", "contents": "Copy objects to clipboard and duplicate them in exactly the same place" },

+		{"line": "cmdCmdopt", "contents": "Command Options dialog" },

+		{"line": "cmdColor", "contents": "Controls colors" },

+		{"line": "cmdConnect", "contents": "Connect two tracks" },

+		{"line": "cmdControl", "contents": "Create a control for layout automation" },

+		{"line": "cmdControlElements", "contents": "Select control element to create" },

+		{"line": "cmdContmgm", "contents": "Manage control elements" },

+		{"line": "cmdConvertSetCmd", "contents": "Set Convert mode" },

+		{"line": "cmdConvertTo", "contents": "Convert from Fixed Track to Cornu" },

+		{"line": "cmdConvertFrom", "contents": "Convert from Cornu and Bezier to Fixed Track" },

+		{"line": "cmdCopy", "contents": "Copy selected objects to clipboard" },

+		{"line": "cmdCornu", "contents": "Create Cornu track" },

+		{"line": "cmdCurveCenter", "contents": "Create curved track from center" },

+		{"line": "cmdCurveChord", "contents": "Create curved track from chord" },

+		{"line": "cmdCurveEndPt", "contents": "Create curved track from end-point" },

+		{"line": "cmdBezier", "contents": "Create Bezier track" },

+		{"line": "cmdCurveSetCmd", "contents": "Set Curve Track creation mode" },

+		{"line": "cmdCurveTangent", "contents": "Create curved track from tangent" },

+		{"line": "cmdCustmgm", "contents": "Manipulate Custom designer entries" },

+		{"line": "cmdCut", "contents": "Moves selected objects to clipboard" },

+		{"line": "cmdDelete", "contents": "Delete objects" },

+		{"line": "cmdDemo", "contents": "Playback demos" },

+		{"line": "cmdDescribe", "contents": "Change Object Properties" },

+		{"line": "cmdDescribeMode", "contents": "Change to properties mode" },

+		{"line": "cmdDeselectAll", "contents": "Deselect all selected objects" },

+		{"line": "cmdDisplay", "contents": "Change Display parameters" },

+		{"line": "cmdDrawBench", "contents": "Create benchwork" },

+		{"line": "cmdDrawBox", "contents": "Create a box" },

+		{"line": "cmdDrawCircleSetCmd", "contents": "Set Circle drawing command" },

+		{"line": "cmdDrawCircle", "contents": "Create a circle" },

+		{"line": "cmdDrawCircleCenter", "contents": "Draw a circle line from center" },

+		{"line": "cmdDrawCircleFixedRadius", "contents": "Draw a fixed radius circle line" },

+		{"line": "cmdDrawCircleTangent", "contents": "Draw a circle line from tangent" },

+		{"line": "cmdDrawCurveSetCmd", "contents": "Set Curve drawing command" },

+		{"line": "cmdDrawCurve", "contents": "Create a curved line" },

+		{"line": "cmdDrawCurveEndPt", "contents": "Create a curved line from End" },

+		{"line": "cmdDrawCurveCenter", "contents": "Create a curved line from center" },

+		{"line": "cmdDrawCurveChord", "contents": "Create a curved line from chord" },

+		{"line": "cmdDrawCurveTangent", "contents": "Create a curved line from tangent" },

+		{"line": "cmdDrawBezierCurve", "contents": "Create a Bezier line" },

+		{"line": "cmdDrawDimLine", "contents": "Create a dimension line" },

+		{"line": "cmdDrawFilledBox", "contents": "Create a filled box" },

+		{"line": "cmdDrawFilledCurve", "contents": "Create a filled circle" },

+		{"line": "cmdDrawFilledCircleCenter", "contents": "Draw a filled circle from center" },

+		{"line": "cmdDrawFilledCircleFixedRadius", "contents": "Draw a fixed radius filled circle" },

+		{"line": "cmdDrawFilledCircleTangent", "contents": "Draw a filled circle from tangent" },

+		{"line": "cmdDrawPolygon", "contents": "Create a polygon" },

+		{"line": "cmdDrawFilledPolygon", "contents": "Create a filled polygon" },

+		{"line": "cmdDrawPolyline", "contents": "Create a polyline" },

+		{"line": "cmdDrawLine", "contents": "Create a straight line" },

+		{"line": "cmdDrawLineSetCmd", "contents": "Set Line drawing command" },

+		{"line": "cmdDrawShapeSetCmd", "contents": "Set Shape drawing command" },

+		{"line": "cmdDrawTableEdge", "contents": "Draw table edge" },

+		{"line": "cmdEasement", "contents": "Easement menu" },

+		{"line": "cmdElevation", "contents": "Change Elevations" },

+		{"line": "cmdEnumerate", "contents": "Generate a Parts List of selected objects" },

+		{"line": "cmdExportImportSetCmd", "contents": "Set Import/Export mode" },

+		{"line": "cmdExport", "contents": "Export a .xti file" },

+		{"line": "cmdExportDXF", "contents": "Export a DXF file" },

+		{"line": "cmdFileNote", "contents": "Document" },

+		{"line": "cmdFlip", "contents": "Flip selected objects" },

+		{"line": "cmdGrid", "contents": "Adjust snap grid" },

+		{"line": "cmdGridEnable", "contents": "Enable snap grid" },

+		{"line": "cmdGridShow", "contents": "Show snap grid" },

+		{"line": "cmdGroup", "contents": "Create a structure from a Group of objects" },

+		{"line": "cmdHandLaidTurnout", "contents": "Create a hand-laid turnout" },

+		{"line": "cmdHelix", "contents": "Create a track helix" },

+		{"line": "cmdImport", "contents": "Import a .xti file" },

+		{"line": "cmdImportModule", "contents": "Import an .xti file as a Module" },

+		{"line": "cmdJoinTrack", "contents": "Join two tracks" },

+		{"line": "cmdJoinLine", "contents": "Join two lines or polylines" },

+		{"line": "cmdJoinSetCmd", "contents": "Set Join mode" },

+		{"line": "cmdLayer", "contents": "Change Layers" },

+		{"line": "cmdLayerSet", "contents": "Selects the current drawing layer" },

+		{"line": "cmdLayout", "contents": "Layout parameters" },

+		{"line": "cmdLinkNote", "contents": "Weblink" },

+		{"line": "cmdMapShow", "contents": "Show/Hide Map Window" },

+		{"line": "cmdModify", "contents": "Modify or extend a track" },

+		{"line": "cmdModifyMode", "contents": "Change To modify mode" },

+		{"line": "cmdMove", "contents": "Move selected objects" },

+		{"line": "cmdMoveLabel", "contents": "Move a label" },

+		{"line": "cmdMoveToCurrentLayer", "contents": "Move selected objects to current layer" },

+		{"line": "cmdNote", "contents": "Place a note on the layout" },

+		{"line": "cmdOutputbitmap", "contents": "Print a bitmap" },

+		{"line": "cmdPan", "contents": "Pan or zoom the layout" },

+		{"line": "cmdPanMode", "contents": "Change to zoom/pan mode" },

+		{"line": "cmdParallelTrack", "contents": "Create a parallel track" },

+		{"line": "cmdParallelLine", "contents": "Create a parallel line" },

+		{"line": "cmdParallelSetCmd", "contents": "Set Parallel mode" },

+		{"line": "cmdParameter", "contents": "Register" },

+		{"line": "cmdPaste", "contents": "Copy objects from clipboard" },

+		{"line": "cmdPref", "contents": "Perferences dialog" },

+		{"line": "cmdPricelist", "contents": "Display prices of turnouts, sectional tracks and structures" },

+		{"line": "cmdPrint", "contents": "Print the layout" },

+		{"line": "cmdPrmfile", "contents": "Loads and unloads parameter files into/from toolbar" },

+		{"line": "cmdProfile", "contents": "Elevation Profile Command" },

+		{"line": "cmdProfileDraw", "contents": "Profile" },

+		{"line": "cmdRecord", "contents": "Command recorder" },

+		{"line": "cmdRedo", "contents": "Redo last undo" },

+		{"line": "cmdRefreshCompound", "contents": "Update selected Turnout and Structure definitions" },

+		{"line": "cmdRescale", "contents": "Rescale selected objects" },

+		{"line": "cmdRotate", "contents": "Rotate selected object(s)" },

+		{"line": "cmdRuler", "contents": "Show a ruler" },

+		{"line": "cmdSelect", "contents": "Select objects" },

+		{"line": "cmdSelectMode", "contents": "Change To Select Mode" },

+		{"line": "cmdSelectAll", "contents": "Selects all objects on the layout" },

+		{"line": "cmdSelectCurrentLayer", "contents": "Selects all objects in the current Layer" },

+		{"line": "cmdSelectInvert", "contents": "Invert current selection" },

+		{"line": "cmdSplitTrack", "contents": "Split a track" },

+		{"line": "cmdSelectOrphaned", "contents": "Select stranded (unconnected) track pieces" },

+		{"line": "cmdSensor", "contents": "Create a sensor (ie. a occupancy detector or a toggle switch)" },

+		{"line": "cmdSignal", "contents": "Create a signal for train control" },

+		{"line": "cmdSticky", "contents": "Choose which commands are sticky" },

+		{"line": "cmdStraight", "contents": "Create straight track" },

+		{"line": "cmdStructure", "contents": "Place a structure on the layout" },

+		{"line": "cmdSwitchMotorCreate", "contents": "Create a switchmotor for turnout control" },

+		{"line": "cmdSwitchMotorEdit", "contents": "Edit a switchmotor definition" },

+		{"line": "cmdText", "contents": "Enter text on the layout" },

+		{"line": "cmdTextSize", "contents": "Controls the size of the entered text" },

+		{"line": "cmdTextNote", "contents": "Plain Text"},

+		{"line": "cmdTip", "contents": "Tip of the Day window" },

+		{"line": "cmdTrain", "contents": "Run Trains" },

+		{"line": "cmdTrainMode", "contents": "Change To Run Trains Mode" },

+		{"line": "cmdTrainPause", "contents": "Pause/Resume Trains" },

+		{"line": "cmdTrainNewCar", "contents": "Place a car on the layout" },

+		{"line": "cmdTrainExit", "contents": "Exit Trains" },

+		{"line": "cmdTunnel", "contents": "Hide/Unhide a track" },

+		{"line": "cmdBridge", "contents": "Make/Unmake a track a bridge" },

+		{"line": "cmdTurnout", "contents": "Place a turnout or sectional track" },

+		{"line": "cmdTurnoutNew", "contents": "Create a new turnout definition" },

+		{"line": "cmdTurntable", "contents": "Place a turntable" },

+		{"line": "cmdUpdatetitle", "contents": "Updates old source files with 3 part titles" },

+		{"line": "cmdUndo", "contents": "Undo last command" },

+		{"line": "cmdUngroup", "contents": "Ungroup objects" },

+		{"line": "cmdWidth0", "contents": "Draw tracks with thin lines" },

+		{"line": "cmdWidth2", "contents": "Draw tracks with medium lines" },

+		{"line": "cmdWidth3", "contents": "Draw tracks with thick lines" },

+		{"line": "cmdZoom", "contents": "Change drawing scale" },

+		{"line": "cmdZoomIn", "contents": "Zoom in" },

+		{"line": "cmdZoomOut", "contents": "Zoom out" },

+		{"line": "menuFile", "contents": "File Menu" },

+		{"line": "menuFile-save", "contents": "Save layout" },

+		{"line": "menuFile-saveAs", "contents": "Save layout under a new name " },

+		{"line": "menuFile-clear", "contents": "New layout" },

+		{"line": "menuFile-enum", "contents": "Generate parts list" },

+		{"line": "menuFile-load", "contents": "Load a layout" },

+		{"line": "menuFile-quit", "contents": "Exit the program" },

+		{"line": "menuFile-revert", "contents": "Revert to last saved state of layout plan" },

+		{"line": "editM", "contents": "Edit menu" },

+		{"line": "menuEdit-redraw", "contents": "Redraw layout" },

+		{"line": "menuEdit-zoomIn", "contents": "Zoom in" },

+		{"line": "menuEdit-zoomOut", "contents": "Zoom out" },

+		{"line": "toolsM", "contents": "Tools menu" },

+		{"line": "menuView", "contents": "View menu" },

+		{"line": "menuToolbar", "contents": "Toolbar configuration" },

+		{"line": "menuTools", "contents": "Tools menu" },

+		{"line": "menuOption", "contents": "Options menu" },

+		{"line": "menuMacro", "contents": "Playback/Record commands" },

+		{"line": "menuWindow", "contents": "Window menu" },

+		{"line": "menuHelp", "contents": "Help menu" },

+		{"line": "menuHelpRecentMessages", "contents": "Recent error messages and explanations" },

+		{"line": "hotBarLeft", "contents": "Move Hot Bar left" },

+		{"line": "hotBarRight", "contents": "Move Hot Bar right" },

+		{"line": "infoBarCount", "contents": "Total track count" },

+		{"line": "infoBarPosX", "contents": "X Position of cursor" },

+		{"line": "infoBarPosY", "contents": "Y Position of cursor" },

+		{"line": "infoBarScale", "contents": "Drawing scale" },

+		{"line": "infoBarStatus", "contents": "Message and status line" },

+		{"line": "main-draw", "contents": "Main layout canvas" },

+		{"line": "mainDraw", "contents": "Main layout canvas" },

+		{"line": "main-canvas", "contents": "Main drawing canvas" },

+		{"line": "main-commandbar", "contents": "Command buttons" },

+		{"line": "main-menubar", "contents": "Menus" },

+		{"line": "main-titlebar", "contents": "Tile, Filename and Window Manager buttons" },

+		{"line": "main-hotbar", "contents": "Turnout and Structure Hot Bar" },

+		{"line": "main-layers", "contents": "Active layer list and layer buttons" },

+		{"line": "map-draw", "contents": "Map window" },

+		{"line": "map-hilight", "contents": "This is the portion of the layout shown in the Main Window canvas" },

+		{"line": "addElev-value", "contents": "Raise or Lower all Selected Track" },

+		{"line": "block-name", "contents": "Name of block" },

+		{"line": "block-script", "contents": "Script that the block will run" },

+		{"line": "block-segments", "contents": "List of tracks in the Block" },

+		{"line": "carpart-ok", "contents": "Add or Update car object" },

+		{"line": "carpart-manuf", "contents": "Manufacturer name" },

+		{"line": "carpart-prototype", "contents": "Car Prototype" },

+		{"line": "carpart-prototype-list", "contents": "Car Prototype" },

+		{"line": "carpart-isLoco", "contents": "Is the Car a Locomotive?" },

+		{"line": "carpart-partno-list", "contents": "Part Number and Description" },

+		{"line": "carpart-partno", "contents": "Manufacturer Part Number" },

+		{"line": "carpart-import", "contents": "Use the Selected figure as the car image" },

+		{"line": "carpart-reset", "contents": "Use the default figure as the car image" },

+		{"line": "carpart-desc", "contents": "Optional description of the Car Part" },

+		{"line": "carpart-flip", "contents": "Flip car image" },

+		{"line": "carpart-dispmode", "contents": "Display Car Item information or reporting marks and dimensions" },

+		{"line": "carpart-road", "contents": "Full Roadname" },

+		{"line": "carpart-type", "contents": "Car Type" },

+		{"line": "carpart-protokind-list", "contents": "Car Type" },

+		{"line": "carpart-repmark", "contents": "Reporting Marks (Roadname abbreviation)" },

+		{"line": "carpart-number", "contents": "Car Number" },

+		{"line": "carpart-bodyColor", "contents": "Car body Color" },

+		{"line": "carpart-carLength", "contents": "Length of car body" },

+		{"line": "carpart-carWidth", "contents": "Width of car body" },

+		{"line": "carpart-trkCenter", "contents": "Distance between Trucks " },

+		{"line": "carpart-trkCenterOffset", "contents": "Distance Trucks are displaced along Car" },

+		{"line": "carpart-cplrMount", "contents": "Coupler are mounted on body or truck" },

+		{"line": "carpart-cpldLen", "contents": "Overall Coupled Length" },

+		{"line": "carpart-cplrLen", "contents": "Coupler Length from end of car" },

+		{"line": "carpart-canvas", "contents": "Diagram of Car" },

+		{"line": "carpart-index", "contents": "Item Index Number" },

+		{"line": "carpart-purchPrice", "contents": "Original Purchase Price" },

+		{"line": "carpart-currPrice", "contents": "Current Price" },

+		{"line": "carpart-condition", "contents": "Condition of car" },

+		{"line": "carpart-purchDate", "contents": "Original Purchase Date" },

+		{"line": "carpart-serviceDate", "contents": "Last Service Date" },

+		{"line": "carpart-quantity", "contents": "Number of identical cars to be entered" },

+		{"line": "carpart-multinum", "contents": "Do all the cars have the same Number?" },

+		{"line": "carpart-notes", "contents": "Notes about the car" },

+		{"line": "carpart-new", "contents": "Create a new car Part or Prototype definitions" },

+		{"line": "carpart-new-menu", "contents": "Create a new car Part or Prototype definitions" },

+		{"line": "carinv-ok", "contents": "Finds the selected Car Item on the layout" },

+		{"line": "carinv-sort1", "contents": "Sort the Item list" },

+		{"line": "carinv-sort2", "contents": "Sort the Item list" },

+		{"line": "carinv-sort3", "contents": "Sort the Item list" },

+		{"line": "carinv-sort4", "contents": "Sort the Item list" },

+		{"line": "carinv-list", "contents": "" },

+		{"line": "carinv-edit", "contents": "Edit the selected Car Item" },

+		{"line": "carinv-add", "contents": "Add a new Car Item" },

+		{"line": "carinv-delete", "contents": "Delete the selected Car Items" },

+		{"line": "carinv-import", "contents": "Import a Car Item .csv file" },

+		{"line": "carinv-export", "contents": "Export a Car Item .csv file" },

+		{"line": "carinv-savetext", "contents": "Create a text list of the Car Items" },

+		{"line": "circle-radius", "contents": "Specifies the radius of the circle track" },

+		{"line": "cmdopt-preselect", "contents": "Default command is Describe or Select" },

+		{"line": "cmdopt-rightclickmode", "contents": "Action to invoke on Right-Click" },

+		{"line": "cmdopt-selectmode", "contents": "Replace current selection with clicked object or add clicked object to selection" },

+		{"line": "cmdopt-selectzero", "contents": "Clicking into an empty area clears selection if select mode is <add>" },

+		{"line": "cmdopt-ok", "contents": "" },

+		{"line": "contmgm-inx", "contents": "The list of control elements" },

+		{"line": "contmgm-edit", "contents": "Edit the element" },

+		{"line": "contmgm-delete", "contents": "Delete the element" },

+		{"line": "contents-label", "contents": "Contents Label for new Parameter file" },

+		{"line": "custmgm-inx", "contents": "List of custom designed turnouts and structures" },

+		{"line": "custmgm-edit", "contents": "Invoke designer editor" },

+		{"line": "custmgm-delete", "contents": "Remove selected entries" },

+		{"line": "custmgm-export", "contents": "Copy selected entries to Parameter File" },

+		{"line": "custmgm-new", "contents": "Create a New part or prototype" },

+		{"line": "custmgm-ok", "contents": "Update custom file and close" },

+		{"line": "demo-step", "contents": "Executes the next step of the demo" },

+		{"line": "demo-next", "contents": "Skip to next demo" },

+		{"line": "demo-quit", "contents": "Stops the demonstration and returns you to XTrackCAD" },

+		{"line": "demo-speed", "contents": "Select speed of Playback" },

+		{"line": "demo-text", "contents": "This is where comments about the demo are displayed" },

+		{"line": "describe-F1", "contents": "" },

+		{"line": "describe-F2", "contents": "" },

+		{"line": "describe-F3", "contents": "" },

+		{"line": "describe-F4", "contents": "" },

+		{"line": "describe-F5", "contents": "" },

+		{"line": "describe-F6", "contents": "" },

+		{"line": "describe-F7", "contents": "" },

+		{"line": "describe-F8", "contents": "" },

+		{"line": "describe-F9", "contents": "" },

+		{"line": "describe-F10", "contents": "" },

+		{"line": "describe-F11", "contents": "" },

+		{"line": "describe-F12", "contents": "" },

+		{"line": "describe-F13", "contents": "" },

+		{"line": "describe-F14", "contents": "" },

+		{"line": "describe-F15", "contents": "" },

+		{"line": "describe-F16", "contents": "" },

+		{"line": "describe-F17", "contents": "" },

+		{"line": "describe-F18", "contents": "" },

+		{"line": "describe-F19", "contents": "" },

+		{"line": "describe-F20", "contents": "" },

+		{"line": "describe-I1", "contents": "" },

+		{"line": "describe-I2", "contents": "" },

+		{"line": "describe-I3", "contents": "" },

+		{"line": "describe-I4", "contents": "" },

+		{"line": "describe-I5", "contents": "" },

+		{"line": "describe-S1", "contents": "" },

+		{"line": "describe-S2", "contents": "" },

+		{"line": "describe-S3", "contents": "" },

+		{"line": "describe-S4", "contents": "" },

+		{"line": "describe-Y1", "contents": "" },

+		{"line": "describe-C1", "contents": "" },

+		{"line": "describe-L1", "contents": "" },

+		{"line": "describe-L2", "contents": "" },

+		{"line": "describe-LE1", "contents": "" },

+		{"line": "describe-T1", "contents": "" },

+		{"line": "describe-P1", "contents": "" },

+		{"line": "display-autoPan", "contents": "Move the Main canvas if you drag near the edge" },

+		{"line": "display-color-track", "contents": "Color tracks by layer or individually" },

+		{"line": "display-color-draw", "contents": "Color draw objects by layer or individually" },

+		{"line": "display-tunnels", "contents": "Controls the drawing of hidden tracks" },

+		{"line": "display-endpt", "contents": "Controls the drawing of End-Points" },

+		{"line": "display-tiedraw", "contents": "How to draw track ties" },

+		{"line": "display-centerdraw", "contents": "Show crosshair at center of curves" },

+		{"line": "display-tworailscale", "contents": "Drawing scale when to draw tracks with 2 rails" },

+		{"line": "display-mapscale", "contents": "Drawing scale of the map window" },

+		{"line": "display-livemap", "contents": "Whether the main layout is updated while dragging on the Map" },

+		{"line": "display-labelenable", "contents": "Enable labels for Turnouts, Flextrack Lengths and Elevations" },

+		{"line": "display-labelscale", "contents": "When to label Turnout, Flextrack Lengths and Elevations" },

+		{"line": "display-description-fontsize", "contents": "Font size for labels on layout" },

+		{"line": "display-hotbarlabels", "contents": "Label elements on the Hot Bar" },

+		{"line": "display-layoutlabels", "contents": "Label elements on layout" },

+		{"line": "display-listlabels", "contents": "Label elements for lists" },

+		{"line": "display-carhotbarlabels", "contents": "How to group cars on the Train Hot Bar" },

+		{"line": "display-trainpause", "contents": "Delay (in mS) between updating train movements" },

+		{"line": "display-hideTrainsInTunnels", "contents": "Don't show trains in tunnels when tunnels are hidden" },

+		{"line": "display-unconnected-endpt", "contents": "Display unconnected endpoints of track with special marks" },

+		{"line": "display-constrainmain", "contents": "Whether the Main Drawing Area shows as much of the room as possible" },

+		{"line": "display-ok", "contents": "" },

+		{"line": "draw-linewidth", "contents": "Width of the lines" },

+		{"line": "draw-linecolor", "contents": "Color of the lines" },

+		{"line": "draw-benchlist", "contents": "List of types of Lumber" },

+		{"line": "draw-benchcolor", "contents": "Color of Benchwork" },

+		{"line": "draw-benchorient", "contents": "Orientation of Benchwork" },

+		{"line": "draw-arrowsize", "contents": "Size of Dimension Arrows" },

+		{"line": "easement-val", "contents": "This controls the sharpness of the easement curve" },

+		{"line": "easement-r", "contents": "Minimum radius" },

+		{"line": "easement-x", "contents": "Maximum offset" },

+		{"line": "easement-l", "contents": "Easement length" },

+		{"line": "easement-radio", "contents": "These radio buttons are a short-cut for Values of 0.0, 0.5, 1.0 and 2.0.  None turns Easements off" },

+		{"line": "easement-ok", "contents": "Complete easement selection" },

+		{"line": "elev-mode", "contents": "Type of elevation" },

+		{"line": "elev-value", "contents": "Height of End Point" },

+		{"line": "elev-computed", "contents": "Compute elevation based on neighbors" },

+		{"line": "elev-grade", "contents": "Compute grade based on neighbors" },

+		{"line": "elev-station", "contents": "Specify a name for an End-Point" },

+		{"line": "elev-ok", "contents": "" },

+		{"line": "enum-print", "contents": "Print parts list" },

+		{"line": "enum-printsetup", "contents": "Invoke the Print Setup dialog" },

+		{"line": "enum-save", "contents": "Save parts list to file" },

+		{"line": "enum-text", "contents": "This is the list of parts for the layout" },

+		{"line": "enum-list-prices", "contents": "Enable prices on the Parts List" },

+		{"line": "grid-horzspacing", "contents": "Spacing between major grid lines" },

+		{"line": "grid-horzdivision", "contents": "Allows the spacing to be subdivided" },

+		{"line": "grid-horzenable", "contents": "Specifies if positions are snaped in this direction" },

+		{"line": "grid-vertspacing", "contents": "Spacing between major grid lines" },

+		{"line": "grid-vertdivision", "contents": "Allows the spacing to be subdivided" },

+		{"line": "grid-vertenable", "contents": "Specifies if positions are snaped in this direction" },

+		{"line": "grid-origx", "contents": "Shows the origin and angle of the grid" },

+		{"line": "grid-origy", "contents": "Shows the origin and angle of the grid" },

+		{"line": "grid-origa", "contents": "Shows the origin and angle of the grid" },

+		{"line": "grid-show", "contents": "Specifies if the grid is shown" },

+		{"line": "grid-ok", "contents": "Completes the grid specification" },

+		{"line": "group-manuf", "contents": "Manufacturer" },

+		{"line": "group-desc", "contents": "Description" },

+		{"line": "group-partno", "contents": "Part Number" },

+		{"line": "group-segcnt", "contents": "Number of segments in Group" },

+		{"line": "group-replace", "contents": "Replace the Selected object with the new definition?" },

+		{"line": "group-ok", "contents": "Creates a new Structure (or Turnout)" },

+		{"line": "helix-elev", "contents": "Elevation difference of Helix End-Points" },

+		{"line": "helix-radius", "contents": "Helix Radius" },

+		{"line": "helix-turns", "contents": "Number of turns in the helix" },

+		{"line": "helix-angSep", "contents": "Angle betweek helix entrance and exit" },

+		{"line": "helix-grade", "contents": "Grade in helix" },

+		{"line": "helix-vertSep", "contents": "Separation between helix layers" },

+		{"line": "join-fixed-radius", "contents": "Desired curve radius between straight tracks" },

+		{"line": "layer-layer", "contents": "Layer list" },

+		{"line": "layer-name", "contents": "Layer Name" },

+		{"line": "layer-color", "contents": "Color of layer" },

+		{"line": "layer-visible", "contents": "Layer is drawn on Main window" },

+		{"line": "layer-frozen", "contents": "Layer cannot be changed" },

+		{"line": "layer-onmap", "contents": "Layer is drawn on Map window" },

+		{"line": "layer-button-count", "contents": "Number of layer buttons to show" },

+		{"line": "layer-object-count", "contents": "Number of objects in this layer" },

+		{"line": "layer-ok", "contents": "" },

+		{"line": "layer-reset", "contents": "Load layer configuration from default" },

+		{"line": "layer-save", "contents": "Save current layer configuration as default" },

+		{"line": "layer-clear", "contents": "Overwrite layer configuration with system default values" },

+		{"line": "layout-roomsizeX", "contents": "Specifies the size of the room (in inches or centimeters)" },

+		{"line": "layout-roomsizeY", "contents": "Specifies the size of the room (in inches or centimeters)" },

+		{"line": "layout-title1", "contents": "Specifies the layout Title that will appear on printouts" },

+		{"line": "layout-title2", "contents": "Specifies the layout Subtitle that will appear on printouts" },

+		{"line": "layout-scale", "contents": "Specifies the Modelling Scale" },

+		{"line": "layout-gauge", "contents": "Specifies the rail gauge, ie. the distance between the rails" },

+		{"line": "layout-mintrackradius", "contents": "Specifies minimum track radius (in inches or centimeters). Tracks with a smaller radius are considered exceptional." },

+		{"line": "layout-maxtrackgrade", "contents": "Specifies maximum track elevation expressed as a percent (%). Tracks with a larger elevation are considered exceptional." },

+		{"line": "layout-browse", "contents": "Select the background image" },

+		{"line": "layout-clear", "contents": "Remove the background image" },

+		{"line": "layout-backgroundposX", "contents": "Specifies the x offset of the bottom left of the background image" },

+		{"line": "layout-backgroundposY", "contents": "Specifies the y offset of the bottom left of the background image" },

+		{"line": "layout-backgroundWidth", "contents": "Specifies how large the bottom edge of the background image should be in model units" },

+		{"line": "layout-backgroundScreen", "contents": "Specifies the screening of the background image from 0 (none) to 100% (vanishes)" },

+		{"line": "layout-backgroundAngle", "contents": "Specifies the rotation angle of the background image in degrees" },

+		{"line": "newcar-road", "contents": "Roadname" },

+		{"line": "newcar-number", "contents": "Car Number" },

+		{"line": "note-text", "contents": "This is the body of the Note.  To change this select Modify from the File Menu" },

+		{"line": "note-ok", "contents": "" },

+		{"line": "outputbitmap-density", "contents": "Specifies number of pixels per inch (or centimeter)" },

+		{"line": "outputbitmap-ok", "contents": "" },

+		{"line": "outputbitmap-toggles", "contents": "Specifies whether Layout Titles, Borders or Track Centerlines are printed on the BitMap" },

+		{"line": "parallel-separation", "contents": "Specifies the separation between the original track and the parallel track/line" },

+		{"line": "parallel-factor", "contents": "Specifies the a factor that increases the seperation as the radius of the original track reduces. 0.0 means no increase." },

+		{"line": "parameter-name", "contents": "Enter your name as specified in the XTrackCAD Registration Notice" },

+		{"line": "parameter-key", "contents": "Enter the key value as specified in the XTrackCAD Registration Notice" },

+		{"line": "parameter-ok", "contents": "Validates the name and key.  Terminates the registration command" },

+		{"line": "pref-anglesystem", "contents": "0� is up or to the right" },

+		{"line": "pref-units", "contents": "Choose english (inches) or metric (centimeters)" },

+		{"line": "pref-dstfmt", "contents": "How to display length measurements" },

+		{"line": "pref-minlength", "contents": "Do not create tracks to be shorter than this value" },

+		{"line": "pref-connectdistance", "contents": "Maximum distance between connected end points" },

+		{"line": "pref-connectangle", "contents": "Minimum angle between connected End-Points" },

+		{"line": "pref-turntable-angle", "contents": "Specifies the minimum angle between tracks connected to a turntable" },

+		{"line": "pref-coupling-speed-max", "contents": "Trains will crash above this speed" },

+		{"line": "pref-balloonhelp", "contents": "Enable/Disable balloon popup help windows" },

+		{"line": "pref-showflextrack", "contents": "Enable/Disable show of flextrack on hotbar" },

+		{"line": "pref-dragpixels", "contents": "How far you can move the mouse before its considered a drag" },

+		{"line": "pref-dragtimeout", "contents": "How long you can hold a mouse button down before its considered a drag" },

+		{"line": "pref-mingridspacing", "contents": "Minimum distance (in pixels) between grid lines/ticks" },

+		{"line": "pref-checkpoint", "contents": "Specifies the Check Point frequency; number of modifications made since the last checkpoint." },

+		{"line": "pref-autosave", "contents": "Specifies the number of checkpoints after save before auto-saving." },

+		{"line": "pref-onstartup", "contents": "Resume work on last layout or start with new layout" },

+		{"line": "pref-ok", "contents": "" },

+		{"line": "pricelist-cost", "contents": "Updated cost of current selected item" },

+		{"line": "pricelist-entry", "contents": "Item" },

+		{"line": "pricelist-inx", "contents": "Selection list for prices" },

+		{"line": "pricelist-flexlen", "contents": "Price of specified length of flex-track" },

+		{"line": "pricelist-flexunit", "contents": "Price of specified length of flex-track" },

+		{"line": "pricelist-flexcost", "contents": "Price of specified length of flex-track" },

+		{"line": "pricelist-ok", "contents": "" },

+		{"line": "print-centerLine", "contents": "Controls the printing of a centerline of track cmdPrint" },

+		{"line": "print-scale", "contents": "Controls the reduction (scale) of the printout" },

+		{"line": "print-pagew", "contents": "Scaled page width (Scale times physical page width)" },

+		{"line": "print-max", "contents": "Sets page size to the maximum (based on scale and physical page size)" },

+		{"line": "print-pageh", "contents": "Scaled page height (Scale times physical page height)" },

+		{"line": "print-snapshot", "contents": "Sets scale, origin and angle for a one page printout of the layout" },

+		{"line": "print-format", "contents": "Print page in Portrait or Landscape format" },

+		{"line": "print-order", "contents": "Order of printing pages" },

+		{"line": "print-style", "contents": "Print Title, Date, Author and other information at bottom of page?" },

+		{"line": "print-physsize", "contents": "Ignore unprintable page margins?" },

+		{"line": "print-registrationMarks", "contents": "Print Registration Marks at 1:1?" },

+		{"line": "print-grid", "contents": "Print Snap Grid?" },

+		{"line": "print-ruler", "contents": "Print Rulers on all page edges?" },

+		{"line": "print-roadbed", "contents": "Print Roadbed Outline?" },

+		{"line": "print-roadbedWidth", "contents": "Print Roadbed Outline" },

+		{"line": "print-origx", "contents": "Origin of the print grid.  This is useful if you want to reprint a set of pages" },

+		{"line": "print-origy", "contents": "Origin of the print grid.  This is useful if you want to reprint a set of pages" },

+		{"line": "print-reset", "contents": "Resets the origin and angle to 0" },

+		{"line": "print-origa", "contents": "Origin of the print grid.  This is useful if you want to reprint a set of pages" },

+		{"line": "print-clear", "contents": "Deselects all pages" },

+		{"line": "print-setup", "contents": "Invoke the Print Setup dialog" },

+		{"line": "print-ok", "contents": "Print selected pages and terminates the print command" },

+		{"line": "prmfile-inx", "contents": "List of loaded, shown or hidden parameter files" },

+		{"line": "prmfile-mode", "contents": "Show parameter files by names or descriptions" },

+		{"line": "prmfile-action", "contents": "Toggle the shown status of the selected parameter file" },

+		{"line": "prmfile-browse", "contents": "Find extra parameter files from the filesystem" },

+		{"line": "prmfile-find", "contents": "Find parameter files from the system library" },

+		{"line": "prmfile-ok", "contents": "Update parameter file list" },

+		{"line": "prmfile-reload", "contents": "Reload parameter file from list" },

+		{"line": "prmfile-selectall", "contents": "Select all parameter files shown" },

+		{"line": "profile-canvas", "contents": "Profile of specified path" },

+		{"line": "profile-clear", "contents": "Clear the profile" },

+		{"line": "profile-print", "contents": "Print the profile" },

+		{"line": "profile-ok", "contents": "" },

+		{"line": "record-stop", "contents": "Stop recording" },

+		{"line": "record-message", "contents": "Insert a message" },

+		{"line": "record-end", "contents": "End a message" },

+		{"line": "record-text", "contents": "Message body" },

+		{"line": "refreshSpecial-list", "contents": "Possible turnouts" },

+		{"line": "refreshSpecial-skip", "contents": "Skip this turnout" },

+		{"line": "refreshSpecial-ok", "contents": "" },

+		{"line": "rename-manuf", "contents": "Manufacturer of Object" },

+		{"line": "rename-desc", "contents": "Description of Object" },

+		{"line": "rename-partno", "contents": "Part Nuber of Object" },

+		{"line": "rename-ok", "contents": "" },

+		{"line": "rescale-toggle", "contents": "Rescale by Scale Conversion or by Ratio" },

+		{"line": "rescale-fromS", "contents": "Original Scale of the selected objects" },

+		{"line": "rescale-fromG", "contents": "Original Gauge of the selected objects" },

+		{"line": "rescale-toS", "contents": "New Scale of the selected objects" },

+		{"line": "rescale-toG", "contents": "New Gauge of the selected objects" },

+		{"line": "rescale-change-dim", "contents": "Change track dimensions to new scale" },

+		{"line": "rescale-ratio", "contents": "Change size by this amount" },

+		{"line": "rescale-ok", "contents": "" },

+		{"line": "rgbcolor-snapgrid", "contents": "Snap Grid Line and Division" },

+		{"line": "rgbcolor-marker", "contents": "X and Y position markers" },

+		{"line": "rgbcolor-border", "contents": "Border rulers, room boundaries and table edges" },

+		{"line": "rgbcolor-crossmajor", "contents": "Primary Axis of grid rotation" },

+		{"line": "rgbcolor-crossminor", "contents": "Secondary Axis of grid rotation" },

+		{"line": "rgbcolor-normal", "contents": "Unselected tracks" },

+		{"line": "rgbcolor-selected", "contents": "Selected tracks" },

+		{"line": "rgbcolor-profile", "contents": "Color of tracks on the Profile path" },

+		{"line": "rgbcolor-exception", "contents": "Color of Exceptional tracks" },

+		{"line": "rgbcolor-tie", "contents": "Color of track ties" },

+		{"line": "rgbcolor-ok", "contents": "Updates the colors" },

+		{"line": "rotate-rotate", "contents": "Angle in degrees" },

+		{"line": "rotate-ok", "contents": "Rotate object(s) by specified amount" },

+		{"line": "searchgui-query", "contents": "Enter one or more words as search terms '*' means all" },

+		{"line": "searchgui-find", "contents": "Find matching file descriptions" },

+		{"line": "searchgui-inx", "contents": "Search Results" },

+		{"line": "searchgui-mode", "contents": "Show Descriptions or FileNames in results" },

+		{"line": "searchgui-apply", "contents": "Add selected entries into parameter file list" },

+		{"line": "searchgui-selectall", "contents": "Select All found entries" },

+		{"line": "searchgui-default", "contents": "Reload the system library contents for finding" },

+		{"line": "sticky-set", "contents": "Choose commands to be sticky" },

+		{"line": "sticky-ok", "contents": "Make the commands sticky" },

+		{"line": "structure-list", "contents": "List of available structure" },

+		{"line": "structure-canvas", "contents": "Diagram of the selected structure" },

+		{"line": "structure-hide", "contents": "Hide Selection window when placing Structure" },

+		{"line": "structure-stats", "contents": "Drawing scale and size" },

+		{"line": "structure-ok", "contents": "Complete structure placement" },

+		{"line": "structure-pier-inx", "contents": "Choose a Pier number" },

+		{"line": "switchmotor-name", "contents": "Name of the Motor" },

+		{"line": "switchmotor-normal", "contents": "Value when switch is normal" },

+		{"line": "switchmotor-reverse", "contents": "Value when the switch is reversed" },

+		{"line": "switchmotor-pointSense", "contents": "Value for a positive comfirmation of switch position" },

+		{"line": "text-fontsize", "contents": "Controls the size of the entered text" },

+		{"line": "tip-text", "contents": "Useful information about the program" },

+		{"line": "tip-showatstart", "contents": "Show Tip of the Day every time the program starts" },

+		{"line": "tip-next", "contents": "Show the next Tip of the Day" },

+		{"line": "tip-prev", "contents": "Show the previous Tip of the Day" },

+		{"line": "tip-ok", "contents": "" },

+		{"line": "toolbarM", "contents": "Controls which Command Buttons are displayed" },

+		{"line": "train-newcar-index", "contents": "List of Cars" },

+		{"line": "train-list", "contents": "List of active trains" },

+		{"line": "train-speed", "contents": "Speed" },

+		{"line": "train-distance", "contents": "Train odometer" },

+		{"line": "train-zeroDistance", "contents": "Reset odometer to 0" },

+		{"line": "train-goto", "contents": "Find train on layout" },

+		{"line": "train-follow", "contents": "Follow train around layout" },

+		{"line": "train-autoreverse", "contents": "Flip direction at End Of Track" },

+		{"line": "train-direction", "contents": "Change direction of train" },

+		{"line": "train-stop", "contents": "Stop the train" },

+		{"line": "turnout-list", "contents": "List of available turnouts for the current scale" },

+		{"line": "turnout-canvas", "contents": "Diagram of the currently selected turnout.  Click on a End-Point to select the Active End-Point" },

+		{"line": "turnout-new", "contents": "A menu list of various type of turnouts and sectional tracks you can define" },

+		{"line": "turnout-hide", "contents": "Hide Selection window when placing Turnout" },

+		{"line": "turnout-activeEndPoint", "contents": "The selected Active End-Point" },

+		{"line": "turnout-current", "contents": "Current selected turnout, (displayed in the diagram window)" },

+		{"line": "turnout-endPoint", "contents": "One the End-Points that can be selected" },

+		{"line": "turnout-ok", "contents": "" },

+		{"line": "turnoutNew-angle1", "contents": "Angle of the specified track to the center line of the turnout" },

+		{"line": "turnoutNew-angle2", "contents": "Angle of the specified track to the center line of the turnout" },

+		{"line": "turnoutNew-angleMode", "contents": "Specifies if angles are entered as Frog Numbers or in degrees" },

+		{"line": "turnoutNew-desc1", "contents": "Desciption" },

+		{"line": "turnoutNew-desc2", "contents": "Desciption" },

+		{"line": "turnoutNew-label", "contents": "Turnout description (Manuf., Size, Part Number, etc)" },

+		{"line": "turnoutNew-len0", "contents": "Length from the base to the end of the specified track" },

+		{"line": "turnoutNew-len1", "contents": "Length from the base to the end of the specified track" },

+		{"line": "turnoutNew-len2", "contents": "Length from the base to the end of the specified track" },

+		{"line": "turnoutNew-manuf", "contents": "Manufacturer" },

+		{"line": "turnoutNew-off1", "contents": "Offset of the track End-Point from the center line of the turnout" },

+		{"line": "turnoutNew-off2", "contents": "Offset of the track End-Point from the center line of the turnout" },

+		{"line": "turnoutNew-partno1", "contents": "Part Number" },

+		{"line": "turnoutNew-partno2", "contents": "Part Number" },

+		{"line": "turnoutNew-print", "contents": "Prints a full size diagram of the turnout for checking" },

+		{"line": "turnoutNew-ok", "contents": "Prints a full size diagram of the turnout for checking" },

+		{"line": "turnoutNew-color", "contents": "Color of Roadbed lines" },

+		{"line": "turnoutNew-roadbedLineWidth", "contents": "Width of Roadbed lines" },

+		{"line": "turnoutNew-roadbedWidth", "contents": "Width of Roadbed" },

+		{"line": "turnoutNew-printsetup", "contents": "Invoke the Print Setup dialog" },

+		{"line": "turnoutNew-done", "contents": "Closes the window and returns to the Turnout Selection window" },

+		{"line": "turntable-diameter", "contents": "Specifies the diameter of the turntable" },

+		{"line": "updatetitle-old", "contents": "Old Turnout title" },

+		{"line": "updatetitle-sel", "contents": "List of available titles" },

+		{"line": "updatetitle-ignore", "contents": "Leave the Turnouts' title unchanged" },

+		{"line": "updatetitle-load", "contents": "Invoke the Parameter Files dialog" },

+		{"line": "updatetitle-list", "contents": "List of available turnouts" },

+		{"line": "updatetitle-ok", "contents": "Update the Turnouts' title" },

+		{"line": "fontSelCancel", "contents": "Cancel" },

+		{"line": "fontSelList", "contents": "List" },

+		{"line": "fontSelOk", "contents": "Ok" },

+		{"line": "fontSelSample", "contents": "Sample" },

+		{"line": "fontSelSize", "contents": "Size" },

+		{"line": "fontSelSlant", "contents": "Slant" },

+		{"line": "fontSelW", "contents": "Font selection dialog" },

+		{"line": "fontSelWeight", "contents": "Weight" },

+		{"line": "printAbortW", "contents": "Printer Abort Window" },

+		{"line": "printFileName", "contents": "Print to filename" },

+		{"line": "printFontAlias", "contents": "Specify Postscript font alias mapping" },

+		{"line": "printSetup", "contents": "Displays the Print Setup window to change printers, orientation, paper size, etc." },

+		{"line": "printSetupCancel", "contents": "Closes this dialog" },

+		{"line": "printSetupFormat", "contents": "Page orientation" },

+		{"line": "printSetupMargin", "contents": "Unprintable margins" },

+		{"line": "printSetupOk", "contents": "Updates and closes this dialog" },

+		{"line": "printSetupPaper", "contents": "Choose paper size" },

+		{"line": "printSetupPrinter", "contents": "Choose printer" },

+		{"line": "printSetupTest", "contents": "Print test page" },

+		{"line": "about", "contents": "No Help" },

+		{"line": "about-about", "contents": "No Help" },

+		{"line": "about-ok", "contents": "" },

+		{"line": "cmdDebug", "contents": "No Help" },

+		{"line": "loosen", "contents": "No Help" },

+		{"line": "misc-cur-turnout-ep", "contents": "" },

+		{"line": "misc-toolbarset", "contents": "No Help" },

+		{"line": "misc-showlayout", "contents": "No Help" },

+		{"line": "misc-showdisplay", "contents": "No Help" },

+		{"line": "misc-showcmdopt", "contents": "No Help" },

+		{"line": "misc-showeasement", "contents": "No Help" },

+		{"line": "misc-showfontSel", "contents": "No Help" },

+		{"line": "misc-showgrid", "contents": "No Help" },

+		{"line": "misc-showdebug", "contents": "No Help" },

+		{"line": "misc-sticky", "contents": "No Help" },

+		{"line": "misc-showpref", "contents": "No Help" },

+		{"line": "misc-showcolor", "contents": "No Help" },

+		{"line": "misc-showfileClear", "contents": "No Help" },

+		{"line": "misc-showparamFile", "contents": "No Help" },

+		{"line": "misc-showpriceList", "contents": "No Help" },

+		{"line": "misc-showprint", "contents": "No Help" },

+		{"line": "misc-showprintSetup", "contents": "No Help" },

+		{"line": "misc-showprintBitmap", "contents": "No Help" },

+		{"line": "misc-showpartsList", "contents": "No Help" },

+		{"line": "misc-shownotes", "contents": "No Help" },

+		{"line": "misc-showundo", "contents": "No Help" },

+		{"line": "misc-showredo", "contents": "No Help" },

+		{"line": "misc-showcut", "contents": "No Help" },

+		{"line": "misc-showcopy", "contents": "No Help" },

+		{"line": "misc-showpaste", "contents": "No Help" },

+		{"line": "misc-showdelete", "contents": "No Help" },

+		{"line": "misc-showtunnel", "contents": "No Help" },

+		{"line": "misc-showabove", "contents": "No Help" },

+		{"line": "misc-showbelow", "contents": "No Help" },

+		{"line": "misc-showwidth0", "contents": "No Help" },

+		{"line": "misc-showwidth2", "contents": "No Help" },

+		{"line": "misc-showwidth3", "contents": "No Help" },

+		{"line": "misc-showrecompelev", "contents": "No Help" },

+		{"line": "misc-showcardesc", "contents": "No Help" },

+		{"line": "misc-showcaradd", "contents": "No Help" },

+		{"line": "misc-showselectAll", "contents": "No Help" },

+		{"line": "misc-showimport", "contents": "No Help" },

+		{"line": "misc-showexport", "contents": "No Help" },

+		{"line": "misc-showexportDXF", "contents": "No Help" },

+		{"line": "misc-showloosen", "contents": "No Help" },

+		{"line": "misc-group-objects", "contents": "No Help" },

+		{"line": "misc-ungroup-objects", "contents": "No Help" },

+		{"line": "misc-showcustomMgm", "contents": "No Help" },

+		{"line": "misc-showlayers", "contents": "No Help" },

+		{"line": "misc-showmoveToCurrentLayer", "contents": "No Help" },

+		{"line": "misc-showselectCurrentLayer", "contents": "No Help" },

+		{"line": "misc-showclearElevations", "contents": "No Help" },

+		{"line": "misc-showaddElevations", "contents": "No Help" },

+		{"line": "debug-Track", "contents": "No Help" },

+		{"line": "debug-EndPt", "contents": "No Help" },

+		{"line": "debug-ReadTracks", "contents": "No Help" },

+		{"line": "debug-Curve", "contents": "No Help" },

+		{"line": "debug-Join", "contents": "No Help" },

+		{"line": "debug-Turnout", "contents": "No Help" },

+		{"line": "debug-Structure", "contents": "No Help" },

+		{"line": "debug-Print", "contents": "No Help" },

+		{"line": "debug-ok", "contents": "" },

+		{"line": "map-canvas", "contents": "No Help" },

+		{"line": "cmdLayerShow0", "contents": "Layer" },

+		{"line": "cmdLayerShow1", "contents": "Layer" },

+		{"line": "cmdLayerShow2", "contents": "Layer" },

+		{"line": "cmdLayerShow3", "contents": "Layer" },

+		{"line": "cmdLayerShow4", "contents": "Layer" },

+		{"line": "cmdLayerShow5", "contents": "Layer" },

+		{"line": "cmdLayerShow6", "contents": "Layer" },

+		{"line": "cmdLayerShow7", "contents": "Layer" },

+		{"line": "cmdLayerShow8", "contents": "Layer" },

+		{"line": "cmdLayerShow9", "contents": "Layer" },

+		{"line": "cmdLayerShow10", "contents": "Layer" },

+		{"line": "cmdLayerShow11", "contents": "Layer" },

+		{"line": "cmdLayerShow12", "contents": "Layer" },

+		{"line": "cmdLayerShow13", "contents": "Layer" },

+		{"line": "cmdLayerShow14", "contents": "Layer" },

+		{"line": "cmdLayerShow15", "contents": "Layer" },

+		{"line": "cmdLayerShow16", "contents": "Layer" },

+		{"line": "cmdLayerShow17", "contents": "Layer" },

+		{"line": "cmdLayerShow18", "contents": "Layer" },

+		{"line": "cmdLayerShow19", "contents": "Layer" }

+	]

+}

diff --git a/app/help/messages.in b/app/help/messages.in
index 519f2f8..f5bb62b 100644
--- a/app/help/messages.in
+++ b/app/help/messages.in
@@ -78,6 +78,16 @@ HELP
 The angle specified for a curve must be between 0\u00B0 and 360\u00B0.
 END
 
+# ctodesgn.c
+MESSAGE MSG_TODSGN_CORNU_TOO_COMPLEX
+The curves created by the Turnout Designer for a cornu curve have more than 128 segments.
+Try adjusting the end angles and radii to be closer in values.
+HELP
+Too complex a curve set to be used. Respecify \f{Turnout Designer} values.
+
+Refer to \k{cmdTurnoutNew} for detail.
+END
+
 # dcustmgm.c
 MESSAGE MSG_CUSTMGM_DELETE_CONFIRM
 Are you sure you want to delete the
@@ -114,7 +124,7 @@ Cannot change elevation mode.
 HELP
 In the \f{Profile} command, the \f{Elevation} mode for this \e{endpoint} can be change only if it is \f{Defined}, \f{Ignored} or \f{None}. The \f{Elevation} command can be used to change this \e{endpoint}.
 
-Refer to \k{cmdElev} for detail.
+Refer to \k{cmdElevation} for detail.
 END
 
 # csnap.c
@@ -160,6 +170,15 @@ The current \f{Layer} is where most new objects are created. It's not possible t
 Refer to \k{cmdLayer} for detail.
 END
 
+# dlayer.c
+MESSAGE MSG_LAYER_MODULE
+Cannot turn current layer into a Module
+HELP
+The current \f{Layer} is where new objects are created. It's not possible to turn this layer into a module, since then the objects can't be chnaged or added. Change the current \f{Layer} to some other \f{Layer} before trying to make this Layer into a module.
+
+Refer to \k{cmdLayer} for detail.
+END
+
 # cjoin.c track.c:getTrackParams/PARAMS_..._JOIN
 MESSAGE MSG_JOIN_EASEMENTS
 Cannot Join; Easements do not align or abut.
@@ -189,7 +208,7 @@ You cannot select a \f{Turntable} as the second track in \f{Join} command. If yo
 Refer to \k{cmdJoin} for detail.
 END
 
- ccornu.c
+# ccornu.c
 MESSAGE MSG_JOIN_CORNU_SAME
 Cannot Join; Selected endpoints are on same track.
 HELP
@@ -376,6 +395,48 @@ necessary to upgrade your version of \e{XTrackCAD} to at least the version ident
 Take full advantage of the latest features within \e{XTrackCAD} by visiting the \W{http://www.xtrkcad.org/}{\e{XTrackCAD} Fork Website} and downloading the latest release.
 END
 
+#fileio.c
+MESSAGE MSG_LAYOUT_LINES_SKIPPED
+While processing Layout file %s, %d lines were skipped because they were not recognized.
+HELP
+The layout file that you loaded contained records that were not recognized. This could be because the file was written by a higher level of \e{XTrackCAD} or because it was corrupted.
+
+Take full advantage of the latest features within \e{XTrackCAD} by visiting the \W{http://www.xtrkcad.org/}{\e{XTrackCAD} Fork Website} and downloading the latest release.
+END
+
+#paramfile.c
+MESSAGE MSG_PARAM_UPGRADE_VERSION1
+File version %ld is greater than supported
+version %d. You need to upgrade %s
+to at least version %s.
+HELP
+The parameter file that you're attempting to load was designed for a newer version
+of \e{XTrackCAD}. In order to load this file it will be necessary to upgrade your version of \e{XTrackCAD} to at least the version identified within the error message.
+
+Take full advantage of the latest features within \e{XTrackCAD} by visiting the \W{http://www.xtrkcad.org/}{\e{XTrackCAD} Website} and downloading the latest release.
+END
+
+#paramfile.c
+MESSAGE MSG_PARAM_UPGRADE_VERSION2
+File version %ld is greater than supported
+version %d. You need to upgrade your
+version of %s
+HELP
+The parameter file that you're attempting to load was designed for a newer version of \e{XTrackCAD}. In order to load this file it will be
+necessary to upgrade your version of \e{XTrackCAD} to at least the version identified within the error message.
+
+Take full advantage of the latest features within \e{XTrackCAD} by visiting the \W{http://www.xtrkcad.org/}{\e{XTrackCAD} Fork Website} and downloading the latest release.
+END
+
+#paramfile.c
+MESSAGE MSG_PARAM_LINES_SKIPPED
+While processing Parameter file %s, %d lines were skipped because they were not recognized.
+HELP
+The parameter file that you loaded contained records that were not recognized. This could be because the file was designed for a higher level of \e{XTrackCAD} or because it was corrupted.
+
+Take full advantage of the latest features within \e{XTrackCAD} by visiting the \W{http://www.xtrkcad.org/}{\e{XTrackCAD} Fork Website} and downloading the latest release.
+END
+
 # chndldto.c
 MESSAGE MSG_MOVE_POINTS_OTHER_SIDE
 Frog angle prevents placement of points. Move points to opposite side of frog.
@@ -404,6 +465,16 @@ You are connecting two \e{endpoints} which differ in heights by N.NNN. The eleva
 END
 
 # cselect.c:cmdMoveDescription
+MESSAGE MSG_TRK_DESC_NOT_VISIBLE
+Label description is hidden
+HELP
+The \f{Move Description} command can only be used when labels are visible on the layout. Labels can be hidden using the Context Menu.
+
+Use the Context Menu to toggle a track's visbility on and off.
+
+END
+
+# cselect.c:cmdMoveDescription
 MESSAGE MSG_DESC_NOT_VISIBLE
 Label descriptions not visible
 HELP
@@ -439,6 +510,13 @@ Values for \f{Page Width} and \f{Height} can be manually entered thus overriding
 Refer to \k{cmdPrint} for detail.
 END
 
+MESSAGE MSG_NO_PRINTER_SELECTED
+Please select a printer from the Print Setup dialog.
+HELP
+Printer Margins are specific to the selected printer, but no selected printer is chosen.
+You can select a printer from the Print Setup dialog.
+END
+
 # dprmfile.c
 MESSAGE MSG_PRMFIL_NO_CONTENTS
 New Parameter File has no CONTENTS line: %s
@@ -518,6 +596,13 @@ The current command operates on \f{Select}ed tracks of which there are none. \f{
 Refer to \k{cmdSelect} for detail.
 END
 
+# dlayer.c
+MESSAGE MSG_NO_EMPTY_LAYER
+No layer was found that has no contents, so the module can not be imported
+HELP
+The import module function needs an empty layer to work with, but none could be found. Clear a layer and retry.
+END
+
 # dcmpnd.c:refreshCompound
 MESSAGE MSG_NO_TURNOUTS_AVAILABLE
 No %s are available.
@@ -551,9 +636,9 @@ END
 
 # cparalle.c
 MESSAGE MSG_PARALLEL_SEP_GTR_0
-Parallel separation must be greater than 0.
+Parallel separation must be greater than 0, or the new guage must be different than the old.
 HELP
-A parallel track with a separation of 0 or less cannot be created. Specify a positive value in the \f{Separation} field that appears in the Status Bar.
+A parallel track with an identical gauge and separation of 0 or less cannot be created. Specify a positive value in the \f{Separation} field that appears in the Status Bar, or select a track with a different guage.
 
 Refer to \k{cmdParallel} for detail.
 END
@@ -617,7 +702,14 @@ END
 MESSAGE MSG_POLY_SHAPES_3_SIDES
 Poly shapes must have at least 3 sides.
 HELP
-Polygons and Poly Lines must have at least 3 sides. By moving one of the corners close to another corner you're attempting to merge the corners and create a Poly shape with only 2 sides. Try moving the other corner to the new position first.
+Polygons and Poly Lines must have at least 3 sides. You're attempting to create a Poly shape with only 2 sides by deleting the third. 
+END
+
+# drawgeom.c
+MESSAGE MSG_POLY_MULTIPLE_SELECTED
+Can't delete multiple points at once
+HELP
+Polygons and Poly Lines points can only be deleted one at a time. 
 END
 
 # dcar.c
@@ -928,6 +1020,15 @@ This operation cannot be executed as the selected track is present on a frozen l
 Refer to \k{cmdLayer} for detail.
 END
 
+# track.c
+MESSAGE MSG_CANT_MODIFY_MODULE_TRK
+Tracks in a module cannot be modified.
+HELP
+This operation cannot be executed as the selected track is present in a module layer. Track modifications may be performed only on unfrozen, non-module layers.
+
+Refer to \k{cmdLayer} for detail.
+END
+
 #ctodesgn.c
 MESSAGE MSG_SEGMENTS_DIFFER
 Turnout definition contains non-track segments.
@@ -1015,6 +1116,132 @@ Cannot open %s file:
 #NOHELP
 END
 
+# fileio.c
+MESSAGE MSG_DIR_CREATE_FAIL
+Cannot create directory: %s - %s
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_DIR_OPEN_FAIL
+Cannot open directory: %s 
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_NOT_DIR_FAIL
+Path for deletion is not a directory: %s 
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_OPEN_DIR_FAIL
+Open failed for directory: %s 
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_ZIP_DIR_ADD_FAIL
+Can't add directory record %s to zip - %s 
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_ZIP_FILE_ADD_FAIL
+Can't add file record %s to zip at %s - %s
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_ZIP_CREATE_FAIL
+Can't create zip %s - %s
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_ZIP_CLOSE_FAIL
+Close failure for zip %s - %s
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_ZIP_RENAME_FAIL
+Rename failure for zip from %s to %s - %s
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_ZIP_OPEN_FAIL
+Open failure for zip %s - %s
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_ZIP_INDEX_FAIL
+Index failure for zip %s - %s
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_ZIP_FILE_OPEN_FAIL
+Open read file failure %s %s
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_ZIP_READ_FAIL
+Open file in zip failure %s %s
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_UNLINK_FAIL
+Unlink failed for: %s 
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_RMDIR_FAIL
+Remove Directory failed for: %s 
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_ARCHIVE_FAIL
+Cannot save archive to %s from directory: %s
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_MANIFEST_FAIL
+Cannot save manifest file to %s
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_MANIFEST_OPEN_FAIL
+Cannot open manifest file %s
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_UNPACK_FAIL
+Cannot unpack file: %s for file: %s in directory: %s
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_COPY_OPEN_FAIL
+Cannot open file %s 
+#NOHELP
+END
+
+# fileio.c
+MESSAGE MSG_COPY_FAIL
+Cannot copy file %s into directory %s
+#NOHELP
+END
+
 # various
 MESSAGE MSG_BAD_OPTION
 Unrecognized Option: %s
@@ -1208,7 +1435,12 @@ layout file using an older version of %s
 #NOHELP
 END
 
-
+# paramfile.c
+MESSAGE MSG_PARAM_BAD_FILE_VERSION
+File version %ld is lower than the minimum
+supported version %d.This parameter file will only work using an older version of %s
+#NOHELP
+END
 
 # macro.c
 MESSAGE MSG_CANT_READ_DEMO
diff --git a/app/help/xtrkcad.info b/app/help/xtrkcad.info
deleted file mode 100644
index 6350f82..0000000
--- a/app/help/xtrkcad.info
+++ /dev/null
@@ -1,1123 +0,0 @@
-INFO-DIR-SECTION CAD
-START-INFO-DIR-ENTRY
-* xtrkcad: xtrkcad-4.2.4.   Model Train Track CAD Program
-END-INFO-DIR-ENTRY
-
-:Help
-Invokes on-line help for this dialog
-:cancel
-Cancels this command
-:Close
-Closes the dialog
-:cmdAbout
-About box dialog
-:cmdAbove
-Move Selected object to top
-:cmdAddElevations
-Raise or Lower all Selected tracks
-:cmdBelow
-Move Selected object to bottom
-:cmdBlockCreate
-Create a section of track for automation. 
-:cmdCarDesc
-Create a new Car/Loco description
-:cmdCarInventory
-Manage your Car and Loco Inventory
-:cmdCircleCenter
-Create track circle from center
-:cmdCircleFixedRadius
-Create fixed radius track circle
-:cmdCircleSetCmd
-Set Circle Track creation mode
-:cmdCircleTangent
-Create track circle from tangent
-:cmdClearElevations
-Removes elevation from Selected tracks
-:cmdCmdopt
-Command Options dialog
-:cmdColor
-Controls colors
-:cmdConnect
-Connect two tracks
-:cmdCopy
-Copy selected objects to clipboard
-:cmdControl
-Create a control for layout automation
-:cmdCurveCenter
-Create curved track from center
-:cmdCurveChord
-Create curved track from chord
-:cmdCurveEndPt
-Create curved track from end-point
-:cmdCurveSetCmd
-Set Curve Track creation mode
-:cmdCurveTangent
-Create curved track from tangent
-:cmdCustmgm
-Create Bezier Track
-:cmdBezCurve
-Manipulate Custom designer entries
-:cmdCut
-Moves selected objects to clipboard
-:cmdDelete
-Delete objects
-:cmdDemo
-Playback demos
-:cmdDescribe
-Properties
-:cmdDeselectAll
-Deselect all selected objects
-:cmdDisplay
-Change Display parameters
-:cmdDrawBench
-Create benchwork
-:cmdDrawBox
-Create a box
-:cmdDrawCircleSetCmd
-Set Circle drawing command
-:cmdDrawCircle
-Create a circle
-:cmdDrawCircleCenter
-Draw a circle line from center
-:cmdDrawCircleFixedRadius
-Draw a fixed radius circle line
-:cmdDrawCircleTangent
-Draw a circle line from tangent
-:cmdDrawCurveSetCmd
-Set Curve drawing command
-:cmdDrawCurve
-Create a curved line
-:cmdDrawCurveEndPt
-Create a curved line from End
-:cmdDrawCurveCenter
-Create a curved line from center
-:cmdDrawCurveChord
-Create a curved line from chord
-:cmdDrawCurveTangent
-Create a curved line from tangent
-:cmdDrawDimLine
-Create a dimension line
-:cmdDrawFilledBox
-Create a filled box
-:cmdDrawFilledCurve
-Create a filled circle
-:cmdDrawFilledCircleCenter
-Draw a filled circle from center
-:cmdDrawFilledCircleFixedRadius
-Draw a fixed radius filled circle
-:cmdDrawFilledCircleTangent
-Draw a filled circle from tangent
-:cmdDrawPolygon
-Create a filled polygon
-:cmdDrawPolyline
-Create a polyline
-:cmdDrawLine
-Create a straight line
-:cmdDrawLineSetCmd
-Set Line drawing command
-:cmdDrawShapeSetCmd
-Set Shape drawing command
-:cmdDrawTableEdge
-Draw table edge
-:cmdEasement
-Easement menu
-:cmdElevation
-Change Elevations
-:cmdEnumerate
-Generate a Parts List of selected objects
-:cmdExport
-Export a .xti file
-:cmdExportDXF
-Export a DXF file
-:cmdFileNote
-General note about the layout
-:cmdFlip
-Flip selected objects
-:cmdGrid
-Adjust snap grid
-:cmdGridEnable
-Enable snap grid
-:cmdGridShow
-Show snap grid
-:cmdMapShow
-Show/Hide Map Window
-:cmdGroup
-Create a structure from a Group of objects
-:cmdHandLaidTurnout
-Create a hand-laid turnout
-:cmdHelix
-Create a track helix
-:cmdImport
-Import a .xti file
-:cmdJoin
-Join two tracks
-:cmdLayer
-Change Layers
-:cmdLayerSet
-Selects the current drawing layer
-:cmdLayout
-Layout parameters
-:cmdModify
-Modify or extend a track
-:cmdMove
-Move selected objects
-:cmdMoveLabel
-Move a label
-:cmdMoveToCurrentLayer
-Move selected objects to current layer
-:cmdNote
-Place a note on the layout
-:cmdOutputbitmap
-Print a BitMap
-:cmdParallel
-Create a parallel track
-:cmdParameter
-Register
-:cmdPaste
-Copy objects from clipboard
-:cmdPref
-Perferences dialog
-:cmdPricelist
-Display prices of turnouts, sectional tracks and structures
-:cmdPrint
-Print the layout
-:cmdPrmfile
-Loads and unloads parameter files
-:cmdProfile
-Elevation Profile Command
-:cmdProfileDraw
-Profile
-:cmdRecord
-Command recorder
-:cmdRedo
-Redo last undo
-:cmdRefreshCompound
-Update selected Turnout and Structure definitions
-:cmdRescale
-Rescale selected objects
-:cmdRotate
-Rotate selected object(s)
-:cmdRuler
-Show a ruler
-:cmdSelect
-Select objects
-:cmdSelectAll
-Selects all objects on the layout
-:cmdSelectCurrentLayer
-Selects all objects in the current Layer
-:cmdSelectInvert
-Invert current selection
-:cmdSensor
-Create a sensor (ie. a occupancy detector or a toggle switch)
-:cmdSplitTrack
-Split a track
-:cmdSelectOrphaned
-Select stranded (unconnected) track pieces
-:cmdSignal
-Create a signal for train control
-:cmdSticky
-Choose which commands are sticky
-:cmdStraight
-Create straight track
-:cmdStructure
-Place a structure on the layout
-:cmdSwitchMotorCreate
-Create a switchmotor for turnout control
-:cmdText
-Enter text on the layout
-:cmdTextSize
-Controls the size of the entered text
-:cmdTip
-Tip of the Day window
-:cmdTrain
-Run Trains
-:cmdTrainPause
-Pause/Resume Trains
-:cmdTrainNewCar
-Place a car on the layout
-:cmdTrainExit
-Exit Trains
-:cmdTunnel
-Hide/Unhide a track
-:cmdTurnout
-Place a turnout or sectional track
-:cmdTurnoutNew
-Create a new turnout definition
-:cmdTurntable
-Place a turntable
-:cmdUpdatetitle
-Updates old source files with 3 part titles
-:cmdUndo
-Undo last command
-:cmdUngroup
-Ungroup objects
-:cmdWidth0
-Draw tracks with thin lines
-:cmdWidth2
-Draw tracks with medium lines
-:cmdWidth3
-Draw tracks with thick lines
-:cmdZoom
-Change drawing scale
-:cmdZoomIn
-Zoom in
-:cmdZoomOut
-Zoom out
-:menuFile
-File Menu
-:menuFile-save
-Save layout
-:menuFile-saveAs
-Save layout under a new name 
-:menuFile-clear
-New layout
-:menuFile-enum
-Generate parts list
-:menuFile-load
-Load a layout
-:menuFile-quit
-Exit the program
-:menuFile-revert
-Revert to last saved state of layout plan
-:editM
-Edit menu
-:menuEdit-redraw
-Redraw layout
-:menuEdit-zoomIn
-Zoom in
-:menuEdit-zoomOut
-Zoom out
-:toolsM
-Tools menu
-:menuView
-View menu
-:menuToolbar
-Toolbar configuration
-:menuTools
-Tools menu
-:menuOption
-Options menu
-:menuMacro
-Playback/Record commands
-:menuWindow
-Window menu
-:menuHelp
-Help menu
-:menuHelpRecentMessages
-Recent error messages and explanations
-:hotBarLeft
-Move Hot Bar left
-:hotBarRight
-Move Hot Bar right
-:infoBarCount
-Total track count
-:infoBarPosX
-X Position of cursor
-:infoBarPosY
-Y Position of cursor
-:infoBarScale
-Drawing scale
-:infoBarStatus
-Message and status line
-:main-draw
-Main layout canvas
-:mainDraw
-Main layout canvas
-:main-canvas
-Main drawing canvas
-:main-commandbar
-Command buttons
-:main-menubar
-Menus
-:main-titlebar
-Tile, Filename and Window Manager buttons
-:main-hotbar
-Turnout and Structure Hot Bar
-:main-layers
-Active layer list and layer buttons
-:map-draw
-Map window
-:map-hilight
-This is the portion of the layout shown in the Main Window canvas
-:addElev-value
-Raise or Lower all Selected Track
-:carpart-ok
-Add or Update car object
-:carpart-manuf
-Manufacturer name
-:carpart-prototype
-Car Prototype
-:carpart-prototype-list
-Car Prototype
-:carpart-isLoco
-Is the Car a Locomotive?
-:carpart-partno-list
-Part Number and Description
-:carpart-partno
-Manufacturer Part Number
-:carpart-import
-Use the Selected figure as the car image
-:carpart-reset
-Use the default figure as the car image
-:carpart-desc
-Optional description of the Car Part
-:carpart-flip
-Flip car image
-:carpart-dispmode
-Display Car Item information or reporting marks and dimensions
-:carpart-road
-Full Roadname
-:carpart-type
-Car Type
-:carpart-protokind-list
-Car Type
-:carpart-repmark
-Reporting Marks (Roadname abbreviation)
-:carpart-number
-Car Number
-:carpart-bodyColor
-Car body Color
-:carpart-carLength
-Length of car body
-:carpart-carWidth
-Width of car body
-:carpart-trkCenter
-Distance between Trucks 
-:carpart-cplrMount
-Coupler are mounted on body or truck
-:carpart-cpldLen
-Overall Coupled Length
-:carpart-cplrLen
-Coupler Length from end of car
-:carpart-canvas
-Diagram of Car
-:carpart-index
-Item Index Number
-:carpart-purchPrice
-Original Purchase Price
-:carpart-currPrice
-Current Price
-:carpart-condition
-Condition of car
-:carpart-purchDate
-Original Purchase Date
-:carpart-serviceDate
-Last Service Date
-:carpart-quantity
-Number of identical cars to be entered
-:carpart-multinum
-Do all the cars have the same Number?
-:carpart-notes
-Notes about the car
-:carpart-new
-Create a new car Part or Prototype definitions
-:carpart-new-menu
-Create a new car Part or Prototype definitions
-:carinv-ok
-Finds the selected Car Item on the layout
-:carinv-sort1
-Sort the Item list
-:carinv-sort2
-Sort the Item list
-:carinv-sort3
-Sort the Item list
-:carinv-sort4
-Sort the Item list
-:carinv-edit
-Edit the selected Car Item
-:carinv-add
-Add a new Car Item
-:carinv-delete
-Delete the selected Car Items
-:carinv-import
-Import a Car Item .csv file
-:carinv-export
-Export a Car Item .csv file
-:carinv-savetext
-Create a text list of the Car Items
-:circle-radius
-Specifies the radius of the circle track
-:cmdopt-move-quick
-How to draw track being moved/rotated
-:cmdopt-turntable-angle
-Specifies the minimum angle between tracks connected to a turntable
-:cmdopt-preselect
-Default command is Describe or Select
-:cmdopt-coupling-speed-max
-Trains will crash above this speed
-:cmdopt-rightclickmode
-Action to invoke on Right-Click
-:contents-label
-Contents Label for new Parameter file
-:custmgm-inx
-List of custom designed turnouts and structures
-:custmgm-edit
-Invoke designer editor
-:custmgm-delete
-Remove selected entries
-:custmgm-export
-Copy selected entries to Parameter File
-:custmgm-new
-Create a New part or prototype
-:custmgm-ok
-Update custom file and close
-:demo-step
-Executes the next step of the demo
-:demo-next
-Skip to next demo
-:demo-quit
-Stops the demonstration and returns you to XTrkCad
-:demo-speed
-Select speed of Playback
-:demo-text
-This is where comments about the demo are displayed
-:display-tunnels
-Controls the drawing of hidden tracks
-:display-endpt
-Controls the drawing of End-Points
-:display-labelenable
-Enable labels for Turnouts, Flextrack Lengths and Elevations
-:display-description-fontsize
-Font size for labels on layout
-:display-labelscale
-When to label Turnout, Flextrack Lengths and Elevations
-:display-layoutlabels
-Label elements on layout
-:display-color-layers
-Color tracks or other objects by layer
-:display-tworailscale
-Drawing scale when to draw tracks with 2 rails
-:display-zoom-corner
-Zoom to keep lower corner in view or not
-:display-tiedraw
-How to draw track ties
-:display-mingridspacing
-Minimum distance (in pixels) between grid lines/ticks
-:display-balloonhelp
-Enable/Disable balloon popup help windows
-:display-hotbarlabels
-Label elements on the Hot Bar
-:display-mapscale
-Drawing scale of the map window
-:display-livemap
-Whether the main layout is updated while dragging on the Map
-:display-carhotbarlabels
-How to group cars on the Train Hot Bar
-:display-hideTrainsInTunnels
-Don't show trains in tunnels when tunnels are hidden
-:draw-linewidth
-Width of the lines
-:draw-linecolor
-Color of the lines
-:draw-benchlist
-List of types of Lumber
-:draw-benchcolor
-Color of Benchwork
-:draw-benchorient
-Orientation of Benchwork
-:draw-arrowsize
-Size of Dimension Arrows
-:easement-val
-This controls the sharpness of the easement curve
-:easement-r
-Minumum radius
-:easement-x
-Maximum offset
-:easement-l
-Easement length
-:easement-radio
-These radio buttons are a short-cut for Values of 0.0, 0.5, 1.0 and 2.0.  None turns Easements off
-:easement-ok
-Complete easement selection
-:elev-mode
-Type of elevation
-:elev-value
-Height of End Point
-:elev-computed
-Compute elevation based on neighbors
-:elev-grade
-Compute grade based on neighbors
-:elev-station
-Specify a name for an End-Point
-:enum-print
-Print parts list
-:enum-printsetup
-Invoke the Print Setup dialog
-:enum-save
-Save parts list to file
-:enum-text
-This is the list of parts for the layout
-:enum-list-prices
-Enable prices on the Parts List
-:grid-horzspacing
-Spacing between major grid lines
-:grid-horzdivision
-Allows the spacing to be subdivided
-:grid-horzenable
-Specifies if positions are snaped in this direction
-:grid-vertspacing
-Spacing between major grid lines
-:grid-vertdivision
-Allows the spacing to be subdivided
-:grid-vertenable
-Specifies if positions are snaped in this direction
-:grid-origx
-Shows the origin and angle of the grid
-:grid-origy
-Shows the origin and angle of the grid
-:grid-origa
-Shows the origin and angle of the grid
-:grid-show
-Specifies if the grid is shown
-:grid-ok
-Completes the grid specification
-:group-manuf
-Manufacturer
-:group-desc
-Description
-:group-partno
-Part Number
-:group-segcnt
-Number of segments in Group
-:group-replace
-Replace the Selected object with the new definition?
-:group-ok
-Creates a new Structure (or Turnout)
-:helix-elev
-Elevation difference of Helix End-Points
-:helix-radius
-Helix Radius
-:helix-turns
-Number of turns in the helix
-:helix-angSep
-Angle betweek helix entrance and exit
-:helix-grade
-Grade in helix
-:helix-vertSep
-Separation between helix layers
-:layer-layer
-Layer list
-:layer-name
-Layer Name
-:layer-color
-Color of layer
-:layer-visible
-Layer is drawn on Main window
-:layer-frozen
-Layer cannot be changed
-:layer-onmap
-Layer is drawn on Map window
-:layer-button-count
-Number of layer buttons to show
-:layer-object-count
-Number of objects in this layer
-:layer-reset
-Load layer configuration from default
-:layer-save
-Save current layer configuration as default
-:layer-clear
-Overwrite layer configuration with system default values
-:layout-roomsizeX
-Specifies the size of the room (in inches or centimeters)
-:layout-roomsizeY
-Specifies the size of the room (in inches or centimeters)
-:layout-title1
-Specifies the Title of the layout.  This appears on Gaudy printouts
-:layout-title2
-Specifies the Title of the layout.  This appears on Gaudy printouts
-:layout-scale
-Specifies the Modelling Scale
-:layout-gauge
-Specifies the rail gauge, ie. the distance between the rails
-:newcar-road
-Roadname
-:newcar-number
-Car Number
-:note-text
-This is the body of the Note.  To change this select Modify from the File Menu
-:outputbitmap-density
-Specifies number of pixels per inch (or centimeter)
-:outputbitmap-toggles
-Specifies whether Layout Titles, Borders or Track Centerlines are printed on the BitMap
-:parallel-separation
-Specifies the separation between parallel tracks
-:parameter-name
-Enter your name as specified in the XTrkCad Registration Notice
-:parameter-key
-Enter the key value as specified in the XTrkCad Registration Notice
-:parameter-ok
-Validates the name and key.  Terminates the registration command
-:pref-checkpoint
-Specifies the check point frequency
-:pref-units
-Choose english (inches) or metric (centimeters)
-:pref-dstfmt
-How to display length measurements
-:pref-anglesystem
-0� is up or to the right
-:pref-minlength
-Do not create tracks to be shorter than this value
-:pref-connectdistance
-Maximum distance between connected end points
-:pref-connectangle
-Minimum angle between connected End-Points
-:pref-dragpixels
-How far you can move the mouse before its considered a drag
-:pref-dragtimeout
-How long you can hold a mouse button down before its considered a drag
-:pref-autoPan
-Move the Main canvas if you drag near the edge
-:pref-listlabels
-Label elements for lists
-:pref-mintrackradius
-Tracks with tighter radius than this are Exceptional
-:pref-maxtrackgrade
-Tracks with grades steeper than this are Exceptional
-:pref-trainpause
-Delay (in mS) between updating train movements
-:pricelist-cost
-Updated cost of current selected item
-:pricelist-entry
-Item
-:pricelist-inx
-Selection list for prices
-:pricelist-flexlen
-Price of specified length of flex-track
-:pricelist-flexunit
-Price of specified length of flex-track
-:pricelist-flexcost
-Price of specified length of flex-track
-:print-scale
-Controls the reduction (scale) of the printout
-:print-pagew
-Scaled page width (Scale times physical page width)
-:print-max
-Sets page size to the maximum (based on scale and physical page size)
-:print-pageh
-Scaled page height (Scale times physical page height)
-:print-snapshot
-Sets scale, origin and angle for a one page printout of the layout
-:print-format
-Print page in Portrait or Landscape format
-:print-order
-Order of printing pages
-:print-style
-Print Title, Date, Author and other information at bottom of page?
-:print-physsize
-Ignore unprintable page margins?
-:print-registrationMarks
-Print Registration Marks at 1:1?
-:print-grid
-Print Snap Grid?
-:print-ruler
-Print Rulers on all page edges?
-:print-roadbed
-Print Roadbed Outline?
-:print-roadbedWidth
-Print Roadbed Outline
-:print-origx
-Origin of the print grid.  This is useful if you want to reprint a set of pages
-:print-origy
-Origin of the print grid.  This is useful if you want to reprint a set of pages
-:print-reset
-Resets the origin and angle to 0
-:print-origa
-Origin of the print grid.  This is useful if you want to reprint a set of pages
-:print-clear
-Deselects all pages
-:print-setup
-Invoke the Print Setup dialog
-:print-ok
-Print selected pages and terminates the print command
-:prmfile-inx
-List of loaded and unloaded parameter files
-:prmfile-mode
-Show parameter files by names or descriptions
-:prmfile-action
-Toggle the loaded status of the selected parameter file
-:prmfile-browse
-Find a parameter file for loading
-:prmfile-ok
-Update parameter file list
-:profile-canvas
-Profile of specified path
-:profile-clear
-Clear the profile
-:profile-print
-Print the profile
-:record-stop
-Stop recording
-:record-message
-Insert a message
-:record-end
-End a message
-:record-text
-Message body
-:refreshSpecial-list
-Possible turnouts
-:refreshSpecial-skip
-Skip this turnout
-:rename-manuf
-Manufacturer of Object
-:rename-desc
-Description of Object
-:rename-partno
-Part Nuber of Object
-:rescale-toggle
-Rescale by Scale Conversion or by Ratio
-:rescale-fromS
-Original Scale of the selected objects
-:rescale-fromG
-Original Gauge of the selected obkects
-:rescale-toS
-New Scale of the selected objects
-:rescale-toG
-New Gauge of the selected objects
-:rescale-change-dim
-Change track dimensions to new scale
-:rescale-ratio
-Change size by this amount
-:rgbcolor-snapgrid
-Snap Grid Line and Division
-:rgbcolor-marker
-X and Y position markers
-:rgbcolor-border
-Border rulers, room boundaries and table edges
-:rgbcolor-crossmajor
-Primary Axis of grid rotation
-:rgbcolor-crossminor
-Secondary Axis of grid rotation
-:rgbcolor-normal
-Unselected tracks
-:rgbcolor-selected
-Selected tracks
-:rgbcolor-profile
-Color of tracks on the Profile path
-:rgbcolor-exception
-Color of Exceptional tracks
-:rgbcolor-tie
-Color of track ties
-:rgbcolor-ok
-Updates the colors
-:rotate-rotate
-Angle in degrees
-:rotate-ok
-Rotate object(s) by specified amount
-:sticky-set
-Choose commands to be sticky
-:sticky-ok
-Make the commands sticky
-:structure-list
-List of available structure
-:structure-canvas
-Diagram of the selected structure
-:structure-hide
-Hide Selection window when placing Structure
-:structure-stats
-Drawing scale and size
-:structure-ok
-Complete structure placement
-:structure-pier-inx
-Choose a Pier number
-:text-fontsize
-Controls the size of the entered text
-:tip-text
-Useful information about the program
-:tip-showatstart
-Show Tip of the Day every time the program starts
-:tip-next
-Show the next Tip of the Day
-:tip-prev
-Show the previous Tip of the Day
-:toolbarM
-Controls which Command Buttons are displayed
-:train-newcar-index
-List of Cars
-:train-list
-List of active trains
-:train-speed
-Speed
-:train-distance
-Train odometer
-:train-zeroDistance
-Reset odometer to 0
-:train-goto
-Find train on layout
-:train-follow
-Follow train around layout
-:train-autoreverse
-Flip direction at End Of Track
-:train-direction
-Change direction of train
-:train-stop
-Stop the train
-:turnout-list
-List of available turnouts for the current scale
-:turnout-canvas
-Diagram of the currently selected turnout.  Click on a End-Point to select the Active End-Point
-:turnout-new
-A menu list of various type of turnouts and sectional tracks you can define
-:turnout-hide
-Hide Selection window when placing Turnout
-:turnout-activeEndPoint
-The selected Active End-Point
-:turnout-current
-Current selected turnout, (displayed in the diagram window)
-:turnout-endPoint
-One the End-Points that can be selected
-:turnoutNew-angle1
-Angle of the specified track to the center line of the turnout
-:turnoutNew-angle2
-Angle of the specified track to the center line of the turnout
-:turnoutNew-angleMode
-Specifies if angles are entered as Frog Numbers or in degrees
-:turnoutNew-desc1
-Desciption
-:turnoutNew-desc2
-Desciption
-:turnoutNew-label
-Turnout description (Manuf., Size, Part Number, etc)
-:turnoutNew-len0
-Length from the base to the end of the specified track
-:turnoutNew-len1
-Length from the base to the end of the specified track
-:turnoutNew-len2
-Length from the base to the end of the specified track
-:turnoutNew-manuf
-Manufacturer
-:turnoutNew-off1
-Offset of the track End-Point from the center line of the turnout
-:turnoutNew-off2
-Offset of the track End-Point from the center line of the turnout
-:turnoutNew-partno1
-Part Number
-:turnoutNew-partno2
-Part Number
-:turnoutNew-print
-Prints a full size diagram of the turnout for checking
-:turnoutNew-ok
-Prints a full size diagram of the turnout for checking
-:turnoutNew-color
-Color of Roadbed lines
-:turnoutNew-roadbedLineWidth
-Width of Roadbed lines
-:turnoutNew-roadbedWidth
-Width of Roadbed
-:turnoutNew-printsetup
-Invoke the Print Setup dialog
-:turnoutNew-done
-Closes the window and returns to the Turnout Selection window
-:turntable-diameter
-Specifies the diameter of the turntable
-:updatetitle-old
-Old Turnout title
-:updatetitle-sel
-List of available titles
-:updatetitle-ignore
-Leave the Turnouts' title unchanged
-:updatetitle-load
-Invoke the Parameter Files dialog
-:updatetitle-list
-List of available turnouts
-:updatetitle-ok
-Update the Turnouts' title
-:fontSelCancel
-Cancel
-:fontSelList
-List
-:fontSelOk
-Ok
-:fontSelSample
-Sample
-:fontSelSize
-Size
-:fontSelSlant
-Slant
-:fontSelW
-Font selection dialog
-:fontSelWeight
-Weight
-:printAbortW
-Printer Abort Window
-:printFileName
-Print to filename
-:printFontAlias
-Specify Postscript font alias mapping
-:printSetup
-Displays the Print Setup window to change printers, orientation, paper size, etc.
-:printSetupCancel
-Closes this dialog
-:printSetupFormat
-Page orientation
-:printSetupMargin
-Unprintable margins
-:printSetupOk
-Updates and closes this dialog
-:printSetupPaper
-Choose paper size
-:printSetupPrinter
-Choose printer
-:printSetupTest
-Print test page
-:about
-No Help
-:about-about
-No Help
-:cmdDebug
-No Help
-:loosen
-No Help
-:misc-toolbarset
-No Help
-:misc-showlayout
-No Help
-:misc-showdisplay
-No Help
-:misc-showcmdopt
-No Help
-:misc-showeasement
-No Help
-:misc-showfontSel
-No Help
-:misc-showgrid
-No Help
-:misc-showdebug
-No Help
-:misc-sticky
-No Help
-:misc-showpref
-No Help
-:misc-showcolor
-No Help
-:misc-showfileClear
-No Help
-:misc-showparamFile
-No Help
-:misc-showpriceList
-No Help
-:misc-showprint
-No Help
-:misc-showprintSetup
-No Help
-:misc-showprintBitmap
-No Help
-:misc-showpartsList
-No Help
-:misc-shownotes
-No Help
-:misc-showundo
-No Help
-:misc-showredo
-No Help
-:misc-showcut
-No Help
-:misc-showcopy
-No Help
-:misc-showpaste
-No Help
-:misc-showdelete
-No Help
-:misc-showtunnel
-No Help
-:misc-showabove
-No Help
-:misc-showbelow
-No Help
-:misc-showwidth0
-No Help
-:misc-showwidth2
-No Help
-:misc-showwidth3
-No Help
-:misc-showrecompelev
-No Help
-:misc-showcardesc
-No Help
-:misc-showcaradd
-No Help
-:misc-showselectAll
-No Help
-:misc-showimport
-No Help
-:misc-showexport
-No Help
-:misc-showexportDXF
-No Help
-:misc-showloosen
-No Help
-:misc-group-objects
-No Help
-:misc-ungroup-objects
-No Help
-:misc-showcustomMgm
-No Help
-:misc-showlayers
-No Help
-:misc-showmoveToCurrentLayer
-No Help
-:misc-showselectCurrentLayer
-No Help
-:misc-showclearElevations
-No Help
-:misc-showaddElevations
-No Help
-:debug-Track
-No Help
-:debug-EndPt
-No Help
-:debug-ReadTracks
-No Help
-:debug-Curve
-No Help
-:debug-Join
-No Help
-:debug-Turnout
-No Help
-:debug-Structure
-No Help
-:debug-Print
-No Help
-:map-canvas
-No Help
-:cmdLayerShow0
-Layer
-:cmdLayerShow1
-Layer
-:cmdLayerShow2
-Layer
-:cmdLayerShow3
-Layer
-:cmdLayerShow4
-Layer
-:cmdLayerShow5
-Layer
-:cmdLayerShow6
-Layer
-:cmdLayerShow7
-Layer
-:cmdLayerShow8
-Layer
-:cmdLayerShow9
-Layer
-:cmdLayerShow10
-Layer
-:cmdLayerShow11
-Layer
-:cmdLayerShow12
-Layer
-:cmdLayerShow13
-Layer
-:cmdLayerShow14
-Layer
-:cmdLayerShow15
-Layer
-:cmdLayerShow16
-Layer
-:cmdLayerShow17
-Layer
-:cmdLayerShow18
-Layer
-:cmdLayerShow19
-Layer
-:
-
diff --git a/app/help/xtrkcad.tip b/app/help/xtrkcad.tip
index 8deffc6..bcc15c3 100644
--- a/app/help/xtrkcad.tip
+++ b/app/help/xtrkcad.tip
@@ -1,17 +1,17 @@
 XTrackCAD provides demonstrations on most of the program's features.  The demos can be run by clicking on the Help menu on the Main window and then selecting Demos.
 
 The notation "Menu|Item" is used in the documentation (and the on-line demos and tips) to indicate the selection of a menu item.\
-For example File|Open means to open the menu by clicking on File on the menu bar of the Main window and then selecting the Open item from that menu.
+For example, "File|Open" means to open the menu by clicking on File on the menu bar of the Main window and then selecting the Open item from that menu.
 
-A number of example layouts are provided.  These files are located in the 'examples' directory where you installed XTrackCAD.  The "File|Open" command will open that directory when first used.
+Set your modeling scale on the "Options|Layout" dialog.  This controls the Turnouts and Structures that are available, Easement values and track gauge.
 
-When installed, the program measures all units in inches.  You can change this on the "Options|Preferences" dialog by changing the Units item to Metric instead of English.
+A number of example layouts are provided.  These files can be accessed by "Help|Examples".
 
-You can change the overall size of your layout on the "Options|Layout" dialog.
+When installed, the length units are set based on your contry: inches for United States or Canada and centimeters elsewhere.  You can change this on the "Options|Preferences" dialog by choosing between Metric and English.
 
-When installed, the default command is the Describe command.  More experienced users will probably want to change this to the Select command.  You can do this on the "Options|Command Options" dialog.
+You can change the overall size of your layout on the "Options|Layout" dialog.
 
-Set your modeling scale on the "Options|Layout" dialog.  This controls the Turnouts and Structures that are available, Easement values and track gauge.
+When installed, the default command is the Select command. You might want to change this to the Decribe command.  You can do this on the "Options|Command Options" dialog.
 
 When Selecting tracks, the connection between Selected and Unselected tracks is marked by a Red X.  This indicates points where the connection between tracks will be broken if you Move or Rotate the Selected tracks.
 
@@ -22,14 +22,14 @@ You can add track to any unconnected End-Point with the Modify command.\
 Hold down the Shift key and click on the End-Point and drag away to create a new track segment attached to the End-Point.\
 Repeat with the new End-Point to create flowing tracks.
 
-You can create Curved tracks in four ways by dragging from:\
-  the 1st End-Point in the direction of the curve\
-  Center of the Curve to the 1st End-Point\
-   End-Point to the Center\
-  the 1st to 2nd End-Point\
+You can create curved tracks in four ways by dragging from:\
+  the 1st endpoint in the direction of the curve\
+  center of the curve to the 1st endpoint\
+  endpoint to the center\
+  the 1st to 2nd endpoint\
 Then drag on one of the Red arrows to create the final shape of the curve.\
 \
-You can click on the small button to the left of the Curve command button to change the method.
+You can click on the small button to the right of the Curve command button to change the method.
 
 When creating a straight or a curved track by dragging from the 1st End Point, you can snap the new track to an existing open end point by holding down Shift while you click.\
 The new track will be joined to the old when you create it.
@@ -49,7 +49,7 @@ The Easement dialog is used to control easements.
 "Help|Recent Messages" shows the last error and warning messages that were generated by the program.  Also an explanation of each message is displayed.
 
 When creating stall tracks for a turntable, you usually want the the stall tracks to be spaced evenly.\
-The "Turntable Angle" item on "Options|Command Options" dialog can be used specify the minimum angle between stall tracks.
+The "Turntable Angle" item on "Options|Preferences" dialog can be used specify the minimum angle between stall tracks.
 
 XTrackCAD periodically saves the current layout in a check point file.  The 'Check Point' item on the 'Options|Preferences' dialog controls how often the file is saved.\
 You can recover your working file after a system crash by copying the checkpoint file (xtrkcad.ckp in the XTrackCAD Working directory) to file.xtc
@@ -73,12 +73,13 @@ Select the track at the beginning and end of the section.  The total length of t
 Note: the Profile selects the shortest path between the two selected tracks, which might not be the path you are interested in.  In this case, select the first track and then select other tracks along the path.
 
 Layers can be used to contain different groups of tracks or other features.  You might use one layer for the main-line, another of staging tracks and another of benchwork.\
-You can give each layer a name (by using the Layer dialog).  This name will be displayed as the Balloon Help for the corresponding Layer button, if you have Balloon Help enabled on the Display dialog.
 
-You can remove groups of buttons or the Hot Bar from the Main window to give you more room if you are not using some features.  Also, the number of Layer buttons displayed is controlled by the Layers dialog.
+You can give each layer a name (by using the "Manage|Layer" dialog).  This name will be displayed as the Balloon Help for the corresponding Layer button, if you have Balloon Help enabled on the "Options|Display" dialog.
 
-The size of the Map window is controlled by the overall size of the room (specified on the Layout dialog) and the Map Scale (on the Display dialog).  You can make the Map window larger (or smaller) by decreasing (or increasing) the Map Scale.\
-XTrackCAD will prevent you from making the Map window too small or too large.
+You can remove groups of buttons or the Hot Bar from the Main window to give you more room if you are not using some features.  Also, the number of Layer buttons displayed is controlled by the "Manage|Layers" dialog.
+
+The size of the map window is controlled by the overall size of the room (specified on the layout dialog) and the map scale (on the display dialog).  You can make the Map window larger (or smaller) by decreasing (or increasing) the map scale.\
+XTrackCad will prevent you from making the map window too small or too large.
 
 You can unload parameter files you are not using by the Parameter Files dialog.  This removes unused Turnout and Structure definitions from the Hot Bar and makes the program start faster.
 
@@ -107,7 +108,7 @@ The colors of different parts of the Main window can be changed with the Colors
 By default objects are drawn in their normal colors.  Tracks will be drawn in Black.  Objects can also be drawn in the color according to their Layer.  The color of a Layer is displayed on the corresponding Layer button.\
 The Display dialog 'Color Layers' item has separate toggles for Tracks and non-Tracks.
 
-Each Layer can be drawn or hidden by the 'Visible' toggle on the Layers dialog.  
+Each Layer can be drawn or hidden by the 'Visible' toggle on the Layers dialog.
 Short cut Layer buttons can also be displayed on the tool bar for up to the first 20 layers.\
 This buttons allow to Show or Hide the layers.
 
@@ -120,7 +121,7 @@ Many of the commands and dialogs can be invoked by special key combinations call
 The Connect command is used to join Sectional track pieces that don't quite fit together.\
 This command works by adding small gaps between other tracks to move the selected End-Points closer together.
 
-To copy a group of objects: Select the objects, press Control-C (or select Copy from the Edit menu), press Control-V (or select Paste from the Edit menu).\
+To copy a group of objects: Select the objects, press Control-c (or select Copy from the Edit menu), press Control-v (or select Paste from the Edit menu).\
 The selected tracks will be copied to the layout and you can Move or Rotate them into position.
 
 In the Rotate (or Select) commands you can press Shift-Right-Click to display the Rotate menu which allows you to rotate the selected objects by a specific angle.
@@ -134,7 +135,7 @@ Areas of water can represented by a Polygon (use the Draw command) of the approp
 By using the Modify command, you can move, add or remove corners of the Polygon to fit the shape of the water.\
 You use the Below command to place the Polygon below (or behind) other objects.\
 \
-You can also use a Polygon to represent aisles. 
+You can also use a Polygon to represent aisles.
 
 When you create Benchwork you can move it below other objects by Selecting the Benchwork and use the Below command.\
 Also, put Benchwork in a separate Layer so you can hide it if desired.
@@ -143,7 +144,7 @@ You can enter Distances and Lengths using any format regardless of the Length Fo
 You can enter Metric values when English is the default Units and vice versa.
 
 When entering Distances and Lengths you can press the '=' key to redisplay the value in the default format.
-You can also press the 's' key to convert a Prototype measurement to a Scale measurement y dividing by the ratio for the current scale.
+You can also press the 's' key to convert a Prototype measurement to a Scale measurement by dividing by the ratio for the current scale.
 The 'p' key will convert a Scale measurement to a Prototype measurement.
 
 You can place cars on the layout using the Train Simulation command to check clearance points, track to track separation and coupling.
@@ -197,7 +198,7 @@ You can export the selected tracks to a DXF file which can be read by most CAD p
 
 Lengths and distances can be displayed in a variety of units and formats such as 1' 10 3/4", 1ft 10.75in or 22.750.  In Metric mode, distances can be displayed as millimeters, centimeters or meters.  See the Length Format item on the Preferences dialog.
 
-Tracks that are too steep or curve too tightly are drawn in the Expection color (Purple by default).  \
+Tracks that are too steep or curve too tightly are drawn in the Exception color (Yellow by default).  \
 This helps to identify potential problem areas.  \
 The maximum grade and minimum radius are set on the Preferences dialog.
 
@@ -219,20 +220,28 @@ As well, the color and thickness of the lines used to represent the roadbed can
 The Color dialog (on the Options menu) is used to change the color of different objects on the display.  \
 You can change the color of the Snap Grid and Borders, as well as Normal, Selected and Exception tracks.
 
-#Elevations
+You can set the elevation (height) of track end-points. \
+Elevations of intermediate end points can be computed automatically based on the distance to the nearest end points with defined elevations.  \
+Grades can also be displayed at selected end points.  \
+Please see the Elevations help and demo.
 
-#Profile
+Once you have elevations on some endpoints, you can use the Profile command to produce an elevation graph. \
+The graph shows the selected elevations, grades and distances.  \
+Please see the Profile help and demo for details.
 
 You can draw tracks with wider lines for rails.  \
 Select the tracks and use Medium or Thick Tracks on the Edit menu.
 
-#Custom TO
-
-#Helix
+The Helix command is used to create a Helix track.  \
+You specify some parameters: height, radius, number of turns, grade and vertical separation between layers. \
+These values are interrelated so changing one value will affect ohers. \
+Then you can place the Helix and join to other tracks as you would a Circle track.
 
 Many objects on the layout have labels: Turnouts/Helix/Curved Titles, Track Lenghts, End-Point Elevations, Track Elevations and Cars.  \
 You can turn these labels on or off with the Label Enable toggle buttons on the Display options dialog.
 
-If you hold down the Control key when using the Rotate command, the rotation will be down in increments of 15°.
+If you hold down the Control key when using the Rotate command, the rotation will be done in increments of 15�.
 
 When using the Rotate command, Shift-Right-Click displays a menu allowing you to rotate by specific amounts or to align the selected objects with another object.
+
+This is last tip.  If you have any additions or comments, please let us know.