51 files changed, 350 insertions, 234 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b22d0bf..4031c3c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@
 cmake_minimum_required (VERSION 3.9)
 
 project (Lagrange
-    VERSION 1.7.1
+    VERSION 1.8.0
     DESCRIPTION "A Beautiful Gemini Client"
     LANGUAGES C
 )
@@ -59,10 +59,18 @@ option (ENABLE_X11_SWRENDER     "Use software rendering (X11)" OFF)
 
 include (BuildType.cmake)
 include (res/Embed.cmake)
+include (res/Fontpack.cmake)
 include (Depends.cmake)
 
 # Embedded resources are written to a generated source file.
 message (STATUS "Preparing embedded resources...")
+make_fontpack (res/default.fontpack)
+make_fontpack (res/arabic.fontpack)
+make_fontpack (res/cjk.fontpack)
+make_fontpack (res/firasans.fontpack)
+make_fontpack (res/literata.fontpack)
+make_fontpack (res/nunito.fontpack)
+make_fontpack (res/tinos.fontpack)
 # Fonts are too large to comfortably embed as a C source.
 set (EMBED_RESOURCES
     res/about/about.gmi
@@ -71,37 +79,6 @@ set (EMBED_RESOURCES
     res/about/license.gmi
     res/about/version.gmi
     res/arg-help.txt
-    res/fonts/Tinos-Regular.ttf
-    res/fonts/Tinos-Italic.ttf
-    res/fonts/Tinos-Bold.ttf
-    res/fonts/IosevkaTerm-Extended.ttf
-    res/fonts/FiraSans-Bold.ttf
-    res/fonts/FiraSans-Italic.ttf
-    res/fonts/FiraSans-Light.ttf
-    res/fonts/FiraSans-Regular.ttf
-    res/fonts/FiraSans-SemiBold.ttf
-    res/fonts/Literata-Regular-opsz=14.ttf
-    res/fonts/Literata-Bold-opsz=36.ttf
-    res/fonts/Literata-ExtraLight-opsz=18.ttf
-    res/fonts/Literata-LightItalic-opsz=10.ttf
-    res/fonts/NanumGothic-Regular.ttf
-    res/fonts/NotoEmoji-Regular.ttf
-    res/fonts/NotoSansArabicUI-Regular.ttf
-    res/fonts/NotoSansJP-Regular.ttf
-    res/fonts/NotoSansSC-Regular.ttf
-    res/fonts/NotoSansSymbols-Regular.ttf
-    res/fonts/NotoSansSymbols2-Regular.ttf
-    res/fonts/Nunito-Bold.ttf
-    res/fonts/Nunito-ExtraBold.ttf
-    res/fonts/Nunito-ExtraLight.ttf
-    res/fonts/Nunito-LightItalic.ttf
-    res/fonts/Nunito-Regular.ttf
-    res/fonts/SmolEmoji-Regular.ttf
-    res/fonts/SourceSans3-Bold.ttf
-    res/fonts/SourceSans3-ExtraLight.ttf
-    res/fonts/SourceSans3-It.ttf
-    res/fonts/SourceSans3-Regular.ttf
-    res/fonts/SourceSans3-Semibold.ttf
     res/lang/de.bin
     res/lang/en.bin
     res/lang/eo.bin
@@ -121,6 +98,7 @@ set (EMBED_RESOURCES
     res/lang/zh_Hans.bin
     res/lang/zh_Hant.bin
     res/shadow.png
+    ${CMAKE_BINARY_DIR}/default.fontpack
 )
 if ((UNIX AND NOT APPLE) OR MSYS)
     list (APPEND EMBED_RESOURCES res/lagrange-64.png)
diff --git a/res/Embed.cmake b/res/Embed.cmake
index d9f84ed5..fe859dbc 100644
--- a/res/Embed.cmake
+++ b/res/Embed.cmake
@@ -34,6 +34,8 @@ function (embed_getname output fn)
     get_filename_component (ext ${fn} EXT)
     if (ext STREQUAL .ttf)
         set (resName "font")
+    elseif (ext STREQUAL .fontpack)
+        set (resName "fontpack")
     elseif (ext STREQUAL .png)
         set (resName "image")
     else ()
diff --git a/res/Fontpack.cmake b/res/Fontpack.cmake
new file mode 100644
index 00000000..9471c93d
--- /dev/null
+++ b/res/Fontpack.cmake
@@ -0,0 +1,16 @@
+find_program (ZIP_EXECUTABLE zip DOC "ZIP archiver")
+
+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/fonts/LICENSE_OFL.txt b/res/arabic.fontpack/LICENSE_OFL.txt
index d952d62c..d952d62c 100644
--- a/res/fonts/LICENSE_OFL.txt
+++ b/res/arabic.fontpack/LICENSE_OFL.txt
diff --git a/res/fonts/NotoSansArabicUI-Regular.ttf b/res/arabic.fontpack/NotoSansArabicUI-Regular.ttf
index 89b02b31..89b02b31 100644
--- a/res/fonts/NotoSansArabicUI-Regular.ttf
+++ b/res/arabic.fontpack/NotoSansArabicUI-Regular.ttf
diff --git a/res/arabic.fontpack/fontpack.ini b/res/arabic.fontpack/fontpack.ini
new file mode 100644
index 00000000..e35efaad
--- /dev/null
+++ b/res/arabic.fontpack/fontpack.ini
@@ -0,0 +1,4 @@
+[arabic]
+name        = "Noto Sans Arabic UI"
+auxiliary   = true
+regular     = "NotoSansArabicUI.ttf"
diff --git a/res/fonts/LICENSE_NanumGothic.txt b/res/cjk.fontpack/LICENSE_NanumGothic.txt
index 69ff4015..69ff4015 100644
--- a/res/fonts/LICENSE_NanumGothic.txt
+++ b/res/cjk.fontpack/LICENSE_NanumGothic.txt
diff --git a/res/cjk.fontpack/LICENSE_OFL.txt b/res/cjk.fontpack/LICENSE_OFL.txt
new file mode 100644
index 00000000..d952d62c
--- /dev/null
+++ b/res/cjk.fontpack/LICENSE_OFL.txt
@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/res/fonts/NanumGothic-Regular.ttf b/res/cjk.fontpack/NanumGothic-Regular.ttf
index 6e4dd874..6e4dd874 100644
--- a/res/fonts/NanumGothic-Regular.ttf
+++ b/res/cjk.fontpack/NanumGothic-Regular.ttf
diff --git a/res/fonts/NotoSansJP-Regular.ttf b/res/cjk.fontpack/NotoSansJP-Regular.ttf
index 9a35ce95..9a35ce95 100644
--- a/res/fonts/NotoSansJP-Regular.ttf
+++ b/res/cjk.fontpack/NotoSansJP-Regular.ttf
diff --git a/res/fonts/NotoSansSC-Regular.ttf b/res/cjk.fontpack/NotoSansSC-Regular.ttf
index 5bf2eb48..5bf2eb48 100644
--- a/res/fonts/NotoSansSC-Regular.ttf
+++ b/res/cjk.fontpack/NotoSansSC-Regular.ttf
diff --git a/res/cjk.fontpack/fontpack.ini b/res/cjk.fontpack/fontpack.ini
new file mode 100644
index 00000000..5a4bfbac
--- /dev/null
+++ b/res/cjk.fontpack/fontpack.ini
@@ -0,0 +1,16 @@
+[notosansjp]
+name        = "Noto Sans JP"
+auxiliary   = true
+priority    = 3
+regular     = "NotoSansJP-Regular.ttf"
+
+[notosanssc]
+name        = "Noto Sans SC"
+auxiliary   = true
+priority    = 2
+regular     = "NotoSansSC-Regular.ttf"
+
+[nanumgothic]
+name        = "Nanum Gothic"
+regular     = "NanumGothic-Regular.ttf"
+priority    = 1
diff --git a/res/fonts/IosevkaTerm-Extended.ttf b/res/default.fontpack/IosevkaTerm-Extended.ttf
index 16989a85..16989a85 100644
--- a/res/fonts/IosevkaTerm-Extended.ttf
+++ b/res/default.fontpack/IosevkaTerm-Extended.ttf
diff --git a/res/default.fontpack/LICENSE_OFL.txt b/res/default.fontpack/LICENSE_OFL.txt
new file mode 100644
index 00000000..d952d62c
--- /dev/null
+++ b/res/default.fontpack/LICENSE_OFL.txt
@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/res/fonts/LICENSE_SmolEmoji.txt b/res/default.fontpack/LICENSE_SmolEmoji.txt
index 3513b65a..3513b65a 100644
--- a/res/fonts/LICENSE_SmolEmoji.txt
+++ b/res/default.fontpack/LICENSE_SmolEmoji.txt
diff --git a/res/fonts/NotoEmoji-Regular.ttf b/res/default.fontpack/NotoEmoji-Regular.ttf
index 19b7badf..19b7badf 100644
--- a/res/fonts/NotoEmoji-Regular.ttf
+++ b/res/default.fontpack/NotoEmoji-Regular.ttf
diff --git a/res/fonts/NotoSansSymbols-Regular.ttf b/res/default.fontpack/NotoSansSymbols-Regular.ttf
index 68847551..68847551 100644
--- a/res/fonts/NotoSansSymbols-Regular.ttf
+++ b/res/default.fontpack/NotoSansSymbols-Regular.ttf
diff --git a/res/fonts/NotoSansSymbols2-Regular.ttf b/res/default.fontpack/NotoSansSymbols2-Regular.ttf
index 79706435..79706435 100644
--- a/res/fonts/NotoSansSymbols2-Regular.ttf
+++ b/res/default.fontpack/NotoSansSymbols2-Regular.ttf
diff --git a/res/fonts/SmolEmoji-Regular.ttf b/res/default.fontpack/SmolEmoji-Regular.ttf
index 7fdbace5..7fdbace5 100644
--- a/res/fonts/SmolEmoji-Regular.ttf
+++ b/res/default.fontpack/SmolEmoji-Regular.ttf
diff --git a/res/fonts/SourceSans3-Bold.ttf b/res/default.fontpack/SourceSans3-Bold.ttf
index 486ede63..486ede63 100644
--- a/res/fonts/SourceSans3-Bold.ttf
+++ b/res/default.fontpack/SourceSans3-Bold.ttf
diff --git a/res/fonts/SourceSans3-ExtraLight.ttf b/res/default.fontpack/SourceSans3-ExtraLight.ttf
index 53e1541c..53e1541c 100644
--- a/res/fonts/SourceSans3-ExtraLight.ttf
+++ b/res/default.fontpack/SourceSans3-ExtraLight.ttf
diff --git a/res/fonts/SourceSans3-It.ttf b/res/default.fontpack/SourceSans3-It.ttf
index 9823601c..9823601c 100644
--- a/res/fonts/SourceSans3-It.ttf
+++ b/res/default.fontpack/SourceSans3-It.ttf
diff --git a/res/fonts/SourceSans3-Regular.ttf b/res/default.fontpack/SourceSans3-Regular.ttf
index f6d31e8c..f6d31e8c 100644
--- a/res/fonts/SourceSans3-Regular.ttf
+++ b/res/default.fontpack/SourceSans3-Regular.ttf
diff --git a/res/fonts/SourceSans3-Semibold.ttf b/res/default.fontpack/SourceSans3-Semibold.ttf
index d4774aab..d4774aab 100644
--- a/res/fonts/SourceSans3-Semibold.ttf
+++ b/res/default.fontpack/SourceSans3-Semibold.ttf
diff --git a/res/fonts/fontpack.ini b/res/default.fontpack/fontpack.ini
index c86dfd59..c86dfd59 100644
--- a/res/fonts/fontpack.ini
+++ b/res/default.fontpack/fontpack.ini
diff --git a/res/fonts/FiraSans-Bold.ttf b/res/firasans.fontpack/FiraSans-Bold.ttf
index 95e16602..95e16602 100644
--- a/res/fonts/FiraSans-Bold.ttf
+++ b/res/firasans.fontpack/FiraSans-Bold.ttf
diff --git a/res/fonts/FiraSans-Italic.ttf b/res/firasans.fontpack/FiraSans-Italic.ttf
index f5e49144..f5e49144 100644
--- a/res/fonts/FiraSans-Italic.ttf
+++ b/res/firasans.fontpack/FiraSans-Italic.ttf
diff --git a/res/fonts/FiraSans-Light.ttf b/res/firasans.fontpack/FiraSans-Light.ttf
index 2ad0374b..2ad0374b 100644
--- a/res/fonts/FiraSans-Light.ttf
+++ b/res/firasans.fontpack/FiraSans-Light.ttf
diff --git a/res/fonts/FiraSans-Regular.ttf b/res/firasans.fontpack/FiraSans-Regular.ttf
index d9fdc0e9..d9fdc0e9 100644
--- a/res/fonts/FiraSans-Regular.ttf
+++ b/res/firasans.fontpack/FiraSans-Regular.ttf
diff --git a/res/fonts/FiraSans-SemiBold.ttf b/res/firasans.fontpack/FiraSans-SemiBold.ttf
index 821a43d7..821a43d7 100644
--- a/res/fonts/FiraSans-SemiBold.ttf
+++ b/res/firasans.fontpack/FiraSans-SemiBold.ttf
diff --git a/res/firasans.fontpack/LICENSE_OFL.txt b/res/firasans.fontpack/LICENSE_OFL.txt
new file mode 100644
index 00000000..d952d62c
--- /dev/null
+++ b/res/firasans.fontpack/LICENSE_OFL.txt
@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/res/firasans.fontpack/fontpack.ini b/res/firasans.fontpack/fontpack.ini
new file mode 100644
index 00000000..fbe3136f
--- /dev/null
+++ b/res/firasans.fontpack/fontpack.ini
@@ -0,0 +1,8 @@
+[firasans]
+name        = "Fira Sans"
+scaling     = 0.85
+regular     = "FiraSans-Regular.ttf"
+italic      = "FiraSans-Italic.ttf"
+light       = "FiraSans-Light.ttf"
+semibold    = "FiraSans-SemiBold.ttf"
+bold        = "FiraSans-Bold.ttf"
diff --git a/res/fonts/LICENSE_KosugiMaru.txt b/res/fonts/LICENSE_KosugiMaru.txt
deleted file mode 100644
index 75b52484..00000000
--- a/res/fonts/LICENSE_KosugiMaru.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed under the Apache License, Version 2.0 (the "License");

-   you may not use this file except in compliance with the License.

-   You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-   Unless required by applicable law or agreed to in writing, software

-   distributed under the License is distributed on an "AS IS" BASIS,

-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-   See the License for the specific language governing permissions and

-   limitations under the License.

diff --git a/res/fonts/NotoSansArabic-Regular.ttf b/res/fonts/NotoSansArabic-Regular.ttf
deleted file mode 100644
index 94eead4c..00000000
--- a/res/fonts/NotoSansArabic-Regular.ttf
+++ /dev/null
diff --git a/res/fonts/LICENSE_Literata.txt b/res/literata.fontpack/LICENSE_Literata.txt
index 8bf7b94f..8bf7b94f 100644
--- a/res/fonts/LICENSE_Literata.txt
+++ b/res/literata.fontpack/LICENSE_Literata.txt
diff --git a/res/fonts/Literata-Bold-opsz=36.ttf b/res/literata.fontpack/Literata-Bold-opsz=36.ttf
index 0b36bcc5..0b36bcc5 100644
--- a/res/fonts/Literata-Bold-opsz=36.ttf
+++ b/res/literata.fontpack/Literata-Bold-opsz=36.ttf
diff --git a/res/fonts/Literata-ExtraLight-opsz=18.ttf b/res/literata.fontpack/Literata-ExtraLight-opsz=18.ttf
index adf2269c..adf2269c 100644
--- a/res/fonts/Literata-ExtraLight-opsz=18.ttf
+++ b/res/literata.fontpack/Literata-ExtraLight-opsz=18.ttf
diff --git a/res/fonts/Literata-LightItalic-opsz=10.ttf b/res/literata.fontpack/Literata-LightItalic-opsz=10.ttf
index e07554b4..e07554b4 100644
--- a/res/fonts/Literata-LightItalic-opsz=10.ttf
+++ b/res/literata.fontpack/Literata-LightItalic-opsz=10.ttf
diff --git a/res/fonts/Literata-Regular-opsz=14.ttf b/res/literata.fontpack/Literata-Regular-opsz=14.ttf
index e523b1ce..e523b1ce 100644
--- a/res/fonts/Literata-Regular-opsz=14.ttf
+++ b/res/literata.fontpack/Literata-Regular-opsz=14.ttf
diff --git a/res/literata.fontpack/fontpack.ini b/res/literata.fontpack/fontpack.ini
new file mode 100644
index 00000000..e4e49bcb
--- /dev/null
+++ b/res/literata.fontpack/fontpack.ini
@@ -0,0 +1,6 @@
+[literata]
+name        = "Literata"
+regular     = "Literata-Regular-opsz=14.ttf"
+italic      = "Literata-LightItalic-opsz=10.ttf"
+light       = "Literata-ExtraLight-opsz=18.ttf"
+bold        = "Literata-Bold-opsz=36.ttf"
diff --git a/res/fonts/LICENSE_Nunito.txt b/res/nunito.fontpack/LICENSE_Nunito.txt
index 165d2489..165d2489 100644
--- a/res/fonts/LICENSE_Nunito.txt
+++ b/res/nunito.fontpack/LICENSE_Nunito.txt
diff --git a/res/fonts/Nunito-Bold.ttf b/res/nunito.fontpack/Nunito-Bold.ttf
index f41ef203..f41ef203 100644
--- a/res/fonts/Nunito-Bold.ttf
+++ b/res/nunito.fontpack/Nunito-Bold.ttf
diff --git a/res/fonts/Nunito-ExtraBold.ttf b/res/nunito.fontpack/Nunito-ExtraBold.ttf
index 406ab9a8..406ab9a8 100644
--- a/res/fonts/Nunito-ExtraBold.ttf
+++ b/res/nunito.fontpack/Nunito-ExtraBold.ttf
diff --git a/res/fonts/Nunito-ExtraLight.ttf b/res/nunito.fontpack/Nunito-ExtraLight.ttf
index da3020df..da3020df 100644
--- a/res/fonts/Nunito-ExtraLight.ttf
+++ b/res/nunito.fontpack/Nunito-ExtraLight.ttf
diff --git a/res/fonts/Nunito-LightItalic.ttf b/res/nunito.fontpack/Nunito-LightItalic.ttf
index 1eb29cc7..1eb29cc7 100644
--- a/res/fonts/Nunito-LightItalic.ttf
+++ b/res/nunito.fontpack/Nunito-LightItalic.ttf
diff --git a/res/fonts/Nunito-Regular.ttf b/res/nunito.fontpack/Nunito-Regular.ttf
index 1f038185..1f038185 100644
--- a/res/fonts/Nunito-Regular.ttf
+++ b/res/nunito.fontpack/Nunito-Regular.ttf
diff --git a/res/nunito.fontpack/fontpack.ini b/res/nunito.fontpack/fontpack.ini
new file mode 100644
index 00000000..e9d913a2
--- /dev/null
+++ b/res/nunito.fontpack/fontpack.ini
@@ -0,0 +1,7 @@
+[nunito]
+name        = "Nunito"
+regular     = "Nunito-Regular.ttf"
+italic      = "Nunito-LightItalic.ttf"
+light       = "Nunito-ExtraLight.ttf"
+semibold    = "Nunito-Bold.ttf"
+bold        = "Nunito-ExtraBold.ttf"
diff --git a/res/fonts/Tinos-Bold.ttf b/res/tinos.fontpack/Tinos-Bold.ttf
index 8b850691..8b850691 100644
--- a/res/fonts/Tinos-Bold.ttf
+++ b/res/tinos.fontpack/Tinos-Bold.ttf
diff --git a/res/fonts/Tinos-Italic.ttf b/res/tinos.fontpack/Tinos-Italic.ttf
index 54b1f4d5..54b1f4d5 100644
--- a/res/fonts/Tinos-Italic.ttf
+++ b/res/tinos.fontpack/Tinos-Italic.ttf
diff --git a/res/fonts/Tinos-Regular.ttf b/res/tinos.fontpack/Tinos-Regular.ttf
index 823f7273..823f7273 100644
--- a/res/fonts/Tinos-Regular.ttf
+++ b/res/tinos.fontpack/Tinos-Regular.ttf
diff --git a/res/tinos.fontpack/fontpack.ini b/res/tinos.fontpack/fontpack.ini
new file mode 100644
index 00000000..eeefb8eb
--- /dev/null
+++ b/res/tinos.fontpack/fontpack.ini
@@ -0,0 +1,5 @@
+[tinos]
+name        = "Tinos"
+regular     = "Tinos-Regular.ttf"
+italic      = "Tinos-Italic.ttf"
+bold        = "Tinos-Bold.ttf"