Changed format of resources.lgr

Resources are now stored in a ZIP archive, and it comes with an explicit version number. All the old embed/bincat stuff was removed as unnecessary.

resources.lgr is also a valid fontpack, for loading the built-in fonts.

IssueID #363

16 files changed, 11 insertions, 100 deletions

diff --git a/res/Fontpack.cmake b/res/Fontpack.cmake
deleted file mode 100644
index 26d6df1e..00000000
--- a/res/Fontpack.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-find_program (ZIP_EXECUTABLE zip DOC "ZIP archiver")
-if (NOT ZIP_EXECUTABLE)
-    message (FATAL_ERROR "Please install 'zip' to create fontpacks.")
-endif ()
-
-function (make_fontpack src)
-    get_filename_component (dst ${src} NAME)
-    set (fn ${CMAKE_BINARY_DIR}/${dst})
-    execute_process (COMMAND ${CMAKE_COMMAND} -E remove ${fn})
-    file (GLOB files RELATIVE ${CMAKE_SOURCE_DIR}/${src}
-        ${CMAKE_SOURCE_DIR}/${src}/*
-    )
-    message (STATUS "  ${src}")
-    execute_process (
-        COMMAND ${ZIP_EXECUTABLE} -0 ${fn} ${files}
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/${src}
-        OUTPUT_QUIET
-    )
-endfunction ()
diff --git a/res/bincat.c b/res/bincat.c
deleted file mode 100644
index 8fc9d831..00000000
--- a/res/bincat.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-
-/* bincat.c: Tiny tool for concatenating binary files */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-int main(int argc, char *argv[]) {
-    const size_t bufSize = 1024 * 256;
-    char *buf = malloc(bufSize);
-    FILE *out = fopen(argv[1], "wb");
-    int i;
-    for (i = 2; i < argc; ++i) {
-        FILE *f = fopen(argv[i], "rb");
-        size_t fileSize = 0;
-        for (;;) {
-            size_t num = fread(buf, 1, bufSize, f);
-            if (num <= 0) break;
-            fileSize += num;
-            fwrite(buf, 1, num, out); 
-        }
-        fclose(f);
-        printf("%zu;", fileSize);
-    }
-    fclose(out);
-    free(buf);
-    return 0;
-}
diff --git a/res/bincat.sh b/res/bincat.sh
deleted file mode 100755
index eb46655b..00000000
--- a/res/bincat.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# Binary Resource Concatenator
-# Copyright: 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
-# License: BSD 2-Clause
-
-OUTPUT=--
-SIZES=""
-for fn in $*; do
-    if [ "$OUTPUT" = "--" ]; then
-        OUTPUT=$fn
-        rm -f ${OUTPUT}
-    else
-        vals=(`/bin/ls -l $fn`)
-        if [ "$SIZES" = "" ]; then
-            SIZES=${vals[4]}
-        else
-            SIZES=$SIZES\;${vals[4]}
-        fi
-        cat ${fn} >> ${OUTPUT}
-    fi
-done
-echo $SIZES
diff --git a/res/default.fontpack/fontpack.ini b/res/fontpack.ini
index 68316ef6..920a4ad2 100644
--- a/res/default.fontpack/fontpack.ini
+++ b/res/fontpack.ini
@@ -19,17 +19,17 @@
 
 [default]
 name        = "Source Sans"
-regular     = "SourceSans3-Regular.ttf"
-italic      = "SourceSans3-It.ttf"
-light       = "SourceSans3-ExtraLight.ttf"
-semibold    = "SourceSans3-Semibold.ttf"
-bold        = "SourceSans3-Bold.ttf"
+regular     = "fonts/SourceSans3-Regular.ttf"
+italic      = "fonts/SourceSans3-It.ttf"
+light       = "fonts/SourceSans3-ExtraLight.ttf"
+semibold    = "fonts/SourceSans3-Semibold.ttf"
+bold        = "fonts/SourceSans3-Bold.ttf"
 
 [iosevka]
 name        = "Iosevka (compact)"
 monospace   = true
 doc.height  = 0.800
-regular     = "IosevkaTerm-Extended.ttf"
+regular     = "fonts/IosevkaTerm-Extended.ttf"
 
 [iosevka-body]
 # Variant of Iosevka with expanded line spacing for better readability.
@@ -38,21 +38,21 @@ name        = "Iosevka"
 monospace   = true
 priority    = -10
 glyphscale  = 0.800
-regular     = "IosevkaTerm-Extended.ttf"
+regular     = "fonts/IosevkaTerm-Extended.ttf"
 
 [smolemoji]
 name        = "Smol Emoji"
 override    = true  # These Emoji/symbols are always preferred.
 auxiliary   = true
 priority    = 100
-regular     = "SmolEmoji-Regular.ttf"
+regular     = "fonts/SmolEmoji-Regular.ttf"
 
 [notoemoji]
 name        = "Noto Emoji"
 auxiliary   = true
 priority    = 30
 glyphscale  = 1.1
-regular     = "NotoEmoji-Regular.ttf"
+regular     = "fonts/NotoEmoji-Regular.ttf"
 
 [notosymbols2]
 name        = "Noto Sans Symbols 2"
@@ -60,7 +60,7 @@ auxiliary   = true
 priority    = 20
 glyphscale  = 1.45
 voffset     = 0.5
-regular     = "NotoSansSymbols2-Regular.ttf"
+regular     = "fonts/NotoSansSymbols2-Regular.ttf"
 
 [notosymbols]
 name        = "Noto Sans Symbols"
@@ -68,4 +68,4 @@ auxiliary   = true
 priority    = 10
 glyphscale  = 2.0
 voffset     = 1.2
-regular     = "NotoSansSymbols-Regular.ttf"
+regular     = "fonts/NotoSansSymbols-Regular.ttf"
diff --git a/res/default.fontpack/IosevkaTerm-Extended.ttf b/res/fonts/IosevkaTerm-Extended.ttf
index 16989a85..16989a85 100644
--- a/res/default.fontpack/IosevkaTerm-Extended.ttf
+++ b/res/fonts/IosevkaTerm-Extended.ttf
diff --git a/res/default.fontpack/LICENSE_OFL.txt b/res/fonts/LICENSE_OFL.txt
index d952d62c..d952d62c 100644
--- a/res/default.fontpack/LICENSE_OFL.txt
+++ b/res/fonts/LICENSE_OFL.txt
diff --git a/res/default.fontpack/LICENSE_SmolEmoji.txt b/res/fonts/LICENSE_SmolEmoji.txt
index 3513b65a..3513b65a 100644
--- a/res/default.fontpack/LICENSE_SmolEmoji.txt
+++ b/res/fonts/LICENSE_SmolEmoji.txt
diff --git a/res/default.fontpack/NotoEmoji-Regular.ttf b/res/fonts/NotoEmoji-Regular.ttf
index 19b7badf..19b7badf 100644
--- a/res/default.fontpack/NotoEmoji-Regular.ttf
+++ b/res/fonts/NotoEmoji-Regular.ttf
diff --git a/res/default.fontpack/NotoSansSymbols-Regular.ttf b/res/fonts/NotoSansSymbols-Regular.ttf
index 68847551..68847551 100644
--- a/res/default.fontpack/NotoSansSymbols-Regular.ttf
+++ b/res/fonts/NotoSansSymbols-Regular.ttf
diff --git a/res/default.fontpack/NotoSansSymbols2-Regular.ttf b/res/fonts/NotoSansSymbols2-Regular.ttf
index 79706435..79706435 100644
--- a/res/default.fontpack/NotoSansSymbols2-Regular.ttf
+++ b/res/fonts/NotoSansSymbols2-Regular.ttf
diff --git a/res/default.fontpack/SmolEmoji-Regular.ttf b/res/fonts/SmolEmoji-Regular.ttf
index 3ab9484b..3ab9484b 100644
--- a/res/default.fontpack/SmolEmoji-Regular.ttf
+++ b/res/fonts/SmolEmoji-Regular.ttf
diff --git a/res/default.fontpack/SourceSans3-Bold.ttf b/res/fonts/SourceSans3-Bold.ttf
index 486ede63..486ede63 100644
--- a/res/default.fontpack/SourceSans3-Bold.ttf
+++ b/res/fonts/SourceSans3-Bold.ttf
diff --git a/res/default.fontpack/SourceSans3-ExtraLight.ttf b/res/fonts/SourceSans3-ExtraLight.ttf
index 53e1541c..53e1541c 100644
--- a/res/default.fontpack/SourceSans3-ExtraLight.ttf
+++ b/res/fonts/SourceSans3-ExtraLight.ttf
diff --git a/res/default.fontpack/SourceSans3-It.ttf b/res/fonts/SourceSans3-It.ttf
index 9823601c..9823601c 100644
--- a/res/default.fontpack/SourceSans3-It.ttf
+++ b/res/fonts/SourceSans3-It.ttf
diff --git a/res/default.fontpack/SourceSans3-Regular.ttf b/res/fonts/SourceSans3-Regular.ttf
index f6d31e8c..f6d31e8c 100644
--- a/res/default.fontpack/SourceSans3-Regular.ttf
+++ b/res/fonts/SourceSans3-Regular.ttf
diff --git a/res/default.fontpack/SourceSans3-Semibold.ttf b/res/fonts/SourceSans3-Semibold.ttf
index d4774aab..d4774aab 100644
--- a/res/default.fontpack/SourceSans3-Semibold.ttf
+++ b/res/fonts/SourceSans3-Semibold.ttf