Libraries/CMakeLists.txt

@@ -1,4 +1,2 @@
-add_subdirectory(Common)
 add_subdirectory(Kanimaji)
 add_subdirectory(Megane)
-add_subdirectory(Tablegen)

Libraries/Common/CMakeLists.txt

@@ -1,11 +0,0 @@
-add_library(KVGToolsCommon INTERFACE)
-
-target_compile_features(KVGToolsCommon
-    INTERFACE
-    cxx_std_23
-)
-
-target_include_directories(KVGToolsCommon
-    INTERFACE
-    "Include"
-)

Libraries/Kanimaji/CMakeLists.txt

@@ -8,9 +8,6 @@ target_compile_features(Kanimaji
 )
 
 target_link_libraries(Kanimaji
-    PUBLIC
-    KVGToolsCommon
-
     PRIVATE
     pugixml
 )

Libraries/Kanimaji/Include/Kanimaji/RGB.hpp

@@ -1,11 +1,11 @@
-#ifndef KVG_TOOLS_COMMON_RGB_HPP
+#ifndef KANIMAJI_RGB_HPP
-#define KVG_TOOLS_COMMON_RGB_HPP
+#define KANIMAJI_RGB_HPP
 
 #include <cstdint>
 #include <string>
 #include <string_view>
 
-namespace Common
+namespace Kanimaji
 {
     namespace Implementation
     {
@@ -108,4 +108,4 @@ namespace Common
     };
 }
 
-#endif // KVG_TOOLS_COMMON_RGB_HPP
+#endif // KANIMAJI_RGB_HPP

Libraries/Kanimaji/Include/Kanimaji/Settings.hpp

@@ -1,15 +1,13 @@
 #ifndef KANIMAJI_CONFIG_HPP
 #define KANIMAJI_CONFIG_HPP
 
-#include <Common/RGB.hpp>
+#include "RGB.hpp"
 
 #include <chrono>
 #include <functional>
 
 namespace Kanimaji
 {
-    using Common::RGB;
-
     enum class Flag {
         Enable, Disable,
     };

Libraries/Tablegen/CMakeLists.txt

@@ -1,27 +0,0 @@
-include(${PROJECT_SOURCE_DIR}/CMake/pugixml.cmake)
-
-add_library(Tablegen STATIC)
-
-target_compile_features(Tablegen
-    PUBLIC
-    cxx_std_23
-)
-
-target_include_directories(Tablegen
-    PUBLIC
-    "Include"
-)
-
-target_link_libraries(Tablegen
-    PUBLIC
-    KVGToolsCommon
-
-    PRIVATE
-    pugixml
-)
-
-target_sources(Tablegen
-    PRIVATE
-    "Source/Tablegen.cpp"
-    "Source/Settings.cpp"
-)

Libraries/Tablegen/Include/Tablegen/Settings.hpp

@@ -1,58 +0,0 @@
-#ifndef TABLEGEN_SETTINGS_HPP
-#define TABLEGEN_SETTINGS_HPP
-
-#include <Common/RGB.hpp>
-
-#include <string>
-#include <vector>
-
-namespace Tablegen
-{
-    using Common::RGB;
-
-    enum class Flag {
-        Enable, Disable,
-    };
-
-    enum class FontSizeUnits {
-        Px, Em,
-    };
-    std::string ToString(FontSizeUnits units);
-
-    struct CharacterInfo
-    {
-        std::string Label;
-        std::string ImagePath;
-        std::string AnimationPath;
-    };
-
-    struct Settings
-    {
-        Flag                       FullDocument;
-
-        Flag                       OverrideIndentLevel;
-        std::size_t                IndentLevel;
-
-        double                     TableWidth;
-        double                     TableMargin;
-
-        double                     TableItemWidth;
-        double                     TableItemPadding;
-        RGB                        TableItemColour;
-
-        double                     LabelFontSize;
-        FontSizeUnits              LabelFontUnits;
-        RGB                        ButtonColour;
-        RGB                        ButtonHoverColour;
-        double                     ButtonAnimationLength;
-
-        std::size_t                CharactersPerRow;
-        std::string                ImageFormat;
-        std::string                AnimationFormat;
-        std::vector<CharacterInfo> Characters;
-
-        static Settings Default();
-    };
-}
-
-#endif // TABLEGEN_SETTINGS_HPP

Libraries/Tablegen/Include/Tablegen/Tablegen.hpp

@@ -1,23 +0,0 @@
-#ifndef TABLEGEN_TABLEGEN_HPP
-#define TABLEGEN_TABLEGEN_HPP
-
-#include "Settings.hpp"
-
-#ifdef TABLEGEN_EXPOSE_XML
-#include <pugixml.hpp>
-#endif
-
-#include <string>
-
-namespace Tablegen
-{
-    std::string GeneratePage(const Settings& settings = Settings::Default());
-
-    void GeneratePage(const std::string& path, const Settings& settings = Settings::Default());
-
-#   ifdef TABLEGEN_EXPOSE_XML
-    pugi::xml_document GenerateDocument(const Settings& settings = Settings::Default());
-#   endif
-}
-
-#endif // TABLEGEN_TABLEGEN_HPP

Libraries/Tablegen/Source/Settings.cpp

@@ -1,38 +0,0 @@
-#include "Tablegen/Settings.hpp"
-
-#include <utility>
-
-namespace Tablegen
-{
-    std::string ToString(FontSizeUnits units)
-    {
-        switch (units) {
-        case FontSizeUnits::Px: return "px";
-        case FontSizeUnits::Em: return "em";
-        default: std::unreachable();
-        };
-    }
-
-    Settings Settings::Default()
-    {
-        return {
-            .FullDocument = Flag::Enable,
-            .OverrideIndentLevel = Flag::Disable,
-            .IndentLevel = 0,
-            .TableWidth = 90,
-            .TableMargin = 5,
-            .TableItemWidth = 30,
-            .TableItemPadding = 2,
-            .TableItemColour = RGB::FromHex("#666666"),
-            .LabelFontSize = 1.75,
-            .LabelFontUnits = FontSizeUnits::Em,
-            .ButtonColour = RGB::FromHex("#FF6347"),
-            .ButtonHoverColour = RGB::FromHex("#FFA500"),
-            .ButtonAnimationLength = 0.5,
-            .CharactersPerRow = 3,
-            .ImageFormat = "https://3011.io/Assets/Images/Kanji/Static/{}.png",
-            .AnimationFormat = "https://3011.io/Assets/Temp/{}.svg",
-            .Characters = {},
-        };
-    }
-}

Libraries/Tablegen/Source/Tablegen.cpp

@@ -1,206 +0,0 @@
-#define TABLEGEN_EXPOSE_XML
-#include "Tablegen/Tablegen.hpp"
-
-#include <pugixml.hpp>
-
-#include <format>
-#include <ranges>
-#include <sstream>
-
-namespace Tablegen
-{
-    namespace vw = std::views;
-
-    namespace
-    {
-        constexpr std::string_view generalStylesFormat(
-            "\n"
-            "{}.kanji-table {{ interpolate-size: allow-keywords; width: {}%; margin: {}%; }}\n"
-            "{}.kanji-table-row {{ width: 100%; vertical-align: top; }}\n"
-            "{}.kanji-table-item {{ width: {}%; padding: {}%; }}\n"
-            "{}.kanji-container {{ background: {}; border-radius: 25px; }}\n"
-            "{}.kanji-button {{ display: flex; justify-content: center; align-items: center; "
-                               "border-radius: 25px; border: 0; height: 2em; width: 100%; "
-                               "padding: 2%; background: {}; font-size: {}{}; }}\n"
-            "{}.kanji-button:hover {{ background: {}; }}\n"
-            "{}.kanji-image-wrap {{ width: 100%; border-radius: 25px; overflow: hidden; "
-                                   "box-sizing: border-box; height: 0; transition: height {}s; "
-                                   "&.kanji-show {{ height: max-content; }} }}\n"
-            "{}.kanji-image {{ width: 100%; height: 100%; display: block; appearance: none; }}\n"
-        );
-
-        constexpr std::string_view imageStyleFormat(
-            "{}#kanji-image-{}{} {{ content: url({}); }}\n"
-        );
-
-        constexpr std::string_view buttonScriptFormat(
-            "{}document.getElementById(\"kanji-button-{}\")"
-                    ".addEventListener(\"click\", e => {{ "
-                        "document.getElementById(\"kanji-{}\")"
-                                ".classList.toggle(\"kanji-show\"); }});\n"
-        );
-
-        constexpr std::string_view scriptFormat(
-            "\n{}document.body.onload = () => {{\n{}{}}}\n{}"
-        );
-
-        constexpr std::string_view stylesFormat(
-            "{}{}{}{}"
-        );
-
-        std::string GeneralStyles(const Settings& settings, std::string_view indent)
-        {
-            return std::format(generalStylesFormat,
-                               indent, settings.TableWidth, settings.TableMargin,
-                               indent,
-                               indent, settings.TableItemWidth, settings.TableItemPadding,
-                               indent, settings.TableItemColour.ToHex(),
-                               indent, settings.ButtonColour.ToHex(), settings.LabelFontSize,
-                                       ToString(settings.LabelFontUnits),
-                               indent, settings.ButtonHoverColour.ToHex(),
-                               indent, settings.ButtonAnimationLength,
-                               indent);
-        }
-
-        constexpr std::string ImageStyle(std::string_view indent,
-                                         std::size_t index,
-                                         std::string_view imageName,
-                                         std::string_view imageFormat,
-                                         std::string_view extraSpecifier = "")
-        {
-            std::string imagePath = std::vformat(imageFormat, std::make_format_args(imageName));
-            return std::format(imageStyleFormat, indent, index, extraSpecifier, imagePath);
-        }
-
-        constexpr std::string ButtonScript(std::string_view indent, std::size_t index)
-        {
-            return std::format(buttonScriptFormat, indent, index, index);
-        }
-
-        constexpr std::string Script(std::string_view indent, std::string_view tagIndent,
-                                     std::string_view buttonStatements)
-        {
-            return std::format(scriptFormat,
-                               indent, buttonStatements, indent, tagIndent);
-        }
-
-        constexpr std::string Styles(const Settings& settings,
-                                     std::string_view indent,
-                                     std::string_view tagIndent,
-                                     std::string_view staticImageStyles,
-                                     std::string_view animatedImageStyles)
-        {
-            return std::format(stylesFormat, GeneralStyles(settings, indent),
-                               staticImageStyles, animatedImageStyles, tagIndent);
-        }
-    }
-
-    std::string GeneratePage(const Settings& settings)
-    {
-        pugi::xml_document doc = GenerateDocument(settings);
-
-        std::uint32_t formatOptions;
-        formatOptions = pugi::format_indent | pugi::format_no_escapes | pugi::format_no_declaration;
-        std::stringstream str;
-        doc.save(str, "    ", formatOptions);
-        return str.str();
-    }
-
-    void GeneratePage(const std::string& path, const Settings& settings)
-    {
-        pugi::xml_document doc = GenerateDocument(settings);
-
-        std::uint32_t formatOptions;
-        formatOptions = pugi::format_indent | pugi::format_no_escapes | pugi::format_no_declaration;
-        doc.save_file("test.html", "    ", formatOptions);
-    }
-
-    pugi::xml_document GenerateDocument(const Settings& settings)
-    {
-        pugi::xml_document doc;
-        pugi::xml_node tableRoot = doc;
-
-        if (settings.FullDocument == Flag::Enable) {
-            doc.append_child(pugi::node_doctype).set_value("html");
-
-            pugi::xml_node html = doc.append_child("html");
-
-            pugi::xml_node head = html.append_child("head");\
-            head.append_child("title").append_child(pugi::node_pcdata).set_value("Kanji Table");
-
-            tableRoot = html.append_child("body").append_child("main");
-        }
-
-        pugi::xml_node table = tableRoot.append_child("table");
-        table.append_attribute("class") = "kanji-table";
-
-        pugi::xml_node comment = table.append_child(pugi::node_comment);
-        comment.set_value(" Autogenerated by Tablegen, please avoid editing manually. ");
-
-        pugi::xml_node script = table.append_child("script");
-        pugi::xml_node styles = table.append_child("style");
-
-        std::string staticImg;
-        std::string animatedImg;
-
-        std::string buttons;
-
-        std::size_t indentLevel = settings.OverrideIndentLevel == Flag::Enable
-                                ? settings.IndentLevel
-                                : settings.FullDocument == Flag::Enable ? 5 : 2;
-        std::string indent(indentLevel * 4, ' ');
-        std::string tagIndent((indentLevel > 0 ? indentLevel - 1 : 0) * 4, ' ');
-
-        pugi::xml_node tableBody = table.append_child("tbody");
-        for (pugi::xml_node row; const auto& [i, character] : vw::enumerate(settings.Characters)) {
-            ////////////////////////////////////////////////////////////////////
-            // HTML
-            ////////////////////////////////////////////////////////////////////
-            if (i % 3 == 0) {
-                row = tableBody.append_child("tr");
-                row.append_attribute("class") = "kanji-table-row";
-            }
-
-            pugi::xml_node element = row.append_child("td");
-            element.append_attribute("class") = "kanji-table-item";
-
-            pugi::xml_node container = element.append_child("div");
-            container.append_attribute("class") = "kanji-container";
-
-            pugi::xml_node button = container.append_child("button");
-            button.append_attribute("class") = "kanji-button";
-            button.append_attribute("id") = std::format("kanji-button-{}", i);
-
-            pugi::xml_node label = button.append_child("span");
-            label.append_attribute("class") = "kanji-button-text";
-            label.append_child(pugi::node_pcdata).set_value(character.Label);
-
-            pugi::xml_node imageWrap = container.append_child("div");
-            imageWrap.append_attribute("class") = "kanji-image-wrap";
-            imageWrap.append_attribute("id") = std::format("kanji-{}", i);
-
-            pugi::xml_node image = imageWrap.append_child("input");
-            image.append_attribute("type") = "checkbox";
-            image.append_attribute("class") = "kanji-image";
-            image.append_attribute("id") = std::format("kanji-image-{}", i);
-
-            ////////////////////////////////////////////////////////////////////
-            // CSS
-            ////////////////////////////////////////////////////////////////////
-            staticImg.append(ImageStyle(indent, i, character.ImagePath, settings.ImageFormat));
-            animatedImg.append(ImageStyle(indent, i, character.AnimationPath,
-                                          settings.AnimationFormat, ":checked"));
-
-            ////////////////////////////////////////////////////////////////////
-            // JavaScript
-            ////////////////////////////////////////////////////////////////////
-            buttons.append(ButtonScript(indent, i));
-        }
-
-        styles.append_child(pugi::node_pcdata).set_value(Styles(settings, indent, tagIndent,
-                                                                staticImg, animatedImg));
-        script.append_child(pugi::node_pcdata).set_value(Script(indent, tagIndent, buttons));
-
-        return doc;
-    }
-}

Tools/KanimajiTool/CMakeLists.txt

@@ -8,6 +8,7 @@ target_compile_features(KanimajiTool
 target_link_libraries(KanimajiTool
     PRIVATE
     Kanimaji
+    Megane
 )
 
 target_sources(KanimajiTool