diff --git a/.gitmodules b/.gitmodules index e34fcc897277cf607ea3d38c586d8ce332531187..248421b2fd2580c75e50e8d1fd6c0c5894a1bb63 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,3 +40,6 @@ path = vendor/uchardet url = https://gitlab.freedesktop.org/uchardet/uchardet.git ignore = dirty +[submodule "vendor/japan7-fonts"] + path = vendor/japan7-fonts + url = https://github.com/odrling/japan7-fonts.git diff --git a/packages/win_installer/aegisub3.iss b/packages/win_installer/aegisub3.iss index 2683e02c1a9ef0443d6759cb1ceeead955cebc9c..bc74569b9abd9924b69510e3a079c356cccd397a 100644 --- a/packages/win_installer/aegisub3.iss +++ b/packages/win_installer/aegisub3.iss @@ -50,6 +50,7 @@ ArchitecturesAllowed=x64 #include "fragment_automation.iss" #include "fragment_translations.iss" #include "fragment_spelling.iss" +#include "fragment_fonts.iss" #ifdef DEPCTRL #include "fragment_runtimes.iss" #endif diff --git a/packages/win_installer/fragment_fonts.iss b/packages/win_installer/fragment_fonts.iss new file mode 100644 index 0000000000000000000000000000000000000000..5f80d9082300b8e759fc4b9527604f9778f37f55 --- /dev/null +++ b/packages/win_installer/fragment_fonts.iss @@ -0,0 +1,7 @@ + +[Files] +DestDir: {app}\FontsLicenses; DestName: Amaranth-OFL.txt; Source: ..\..\vendor\japan7-fonts\Amaranth\OFL.txt; Flags: ignoreversion; Components: fonts +DestDir: "{fonts}"; FontInstall: "Amaranth"; Source: ..\..\vendor\japan7-fonts\Amaranth\Amaranth-Regular.ttf; Flags: onlyifdoesntexist uninsneveruninstall; Components: fonts +DestDir: "{fonts}"; FontInstall: "Amaranth"; Source: ..\..\vendor\japan7-fonts\Amaranth\Amaranth-Bold.ttf; Flags: onlyifdoesntexist uninsneveruninstall; Components: fonts +DestDir: "{fonts}"; FontInstall: "Amaranth"; Source: ..\..\vendor\japan7-fonts\Amaranth\Amaranth-Italic.ttf; Flags: onlyifdoesntexist uninsneveruninstall; Components: fonts +DestDir: "{fonts}"; FontInstall: "Amaranth"; Source: ..\..\vendor\japan7-fonts\Amaranth\Amaranth-BoldItalic.ttf; Flags: onlyifdoesntexist uninsneveruninstall; Components: fonts diff --git a/packages/win_installer/fragment_mainprogram.iss b/packages/win_installer/fragment_mainprogram.iss index f314b021c6f40a836496964718ee362b1ced30ab..135f2b2c68a81e8e850690b90a25a587302f0191 100644 --- a/packages/win_installer/fragment_mainprogram.iss +++ b/packages/win_installer/fragment_mainprogram.iss @@ -46,6 +46,7 @@ Name: "macros\modules\luajson"; Description: "LuaJSON"; Types: full Name: "dictionaries"; Description: "Spellcheck Dictionaries"; Types: full Name: "dictionaries\en_US"; Description: "English (US)"; Types: full Name: "translations"; Description: "Aegisub Translations"; Types: full +Name: "fonts"; Description: "Bundled fonts"; Types: full [Tasks] Name: "startmenuicon"; Description: "{cm:StartMenuIcon}"; GroupDescription: "{cm:AdditionalIcons}" diff --git a/vendor/japan7-fonts b/vendor/japan7-fonts new file mode 160000 index 0000000000000000000000000000000000000000..74ef0dea87e3c10bbf0b4df90b663b8868d9cbd5 --- /dev/null +++ b/vendor/japan7-fonts @@ -0,0 +1 @@ +Subproject commit 74ef0dea87e3c10bbf0b4df90b663b8868d9cbd5