6 files changed, 14 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c942c864..75883966 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,7 @@ set (EMBED_RESOURCES
     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/Nunito-Bold.ttf
@@ -188,6 +189,7 @@ set (SOURCES
     res/about/about.gmi
     res/about/help.gmi
     res/about/lagrange.gmi
+    res/about/license.gmi
     res/about/version.gmi
     ${CMAKE_CURRENT_BINARY_DIR}/resources.lgr
     ${CMAKE_CURRENT_BINARY_DIR}/embedded.c
diff --git a/res/about/license.gmi b/res/about/license.gmi
index d5ffe3c4..8c00f5d2 100644
--- a/res/about/license.gmi
+++ b/res/about/license.gmi
@@ -104,7 +104,8 @@ This application uses fonts licensed under the Open Font License.
 => https://typeof.net/Iosevka/  Iosevka
 => https://github.com/googlefonts/literata/blob/master/OFL.txt  Literata
 => https://github.com/google/fonts/blob/master/ofl/nanumgothic/OFL.txt  Nanum Gothic
-=> https://www.google.com/get/noto/help/cjk/  Noto Sans CJK JP
+=> https://www.google.com/get/noto/#sans-arab  Noto Sans Arabic
+=> https://www.google.com/get/noto/help/cjk/  Noto Sans CJK (JP, SC)
 => https://github.com/googlefonts/nunito/blob/master/OFL.txt  Nunito
 => https://github.com/adobe-fonts/source-sans-pro/blob/release/LICENSE.md  Source Sans Pro
 
diff --git a/res/fonts/NotoSansArabic-Regular.ttf b/res/fonts/NotoSansArabic-Regular.ttf
new file mode 100644
index 00000000..94eead4c
--- /dev/null
+++ b/res/fonts/NotoSansArabic-Regular.ttf
diff --git a/res/fonts/NotoSansArabicUI-Regular.ttf b/res/fonts/NotoSansArabicUI-Regular.ttf
new file mode 100644
index 00000000..89b02b31
--- /dev/null
+++ b/res/fonts/NotoSansArabicUI-Regular.ttf
diff --git a/src/ui/text.c b/src/ui/text.c
index 6aaf40f5..b4401abb 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -331,6 +331,7 @@ static void initFonts_Text_(iText *d) {
         DEFINE_FONT_SET(fontNotoSansJPRegular_Embedded),
         DEFINE_FONT_SET(fontNotoSansSCRegular_Embedded),
         DEFINE_FONT_SET(fontNanumGothicRegular_Embedded), /* TODO: should use Noto Sans here, too */
+        DEFINE_FONT_SET(fontNotoSansArabicUIRegular_Embedded),
     };
     iForIndices(i, fontData) {
         iFont *font = &d->fonts[i];
@@ -584,6 +585,13 @@ iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
             return japanese;
         }
     }
+    /* Maybe Arabic. */
+    if (ch >= 0x600) {
+        iFont *arabic = font_Text_(arabic_FontId + d->sizeId);
+        if (arabic != d && (*glyphIndex = glyphIndex_Font_(arabic, ch)) != 0) {
+            return arabic;
+        }
+    }
 #if defined (iPlatformApple)
     /* White up arrow is used for the Shift key on macOS. Symbola's glyph is not a great
        match to the other text, so use the UI font instead. */
diff --git a/src/ui/text.h b/src/ui/text.h
index d86754cc..58941974 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -75,7 +75,8 @@ enum iFontId {
     japanese_FontId          = emoji_FontId + max_FontSize,
     chineseSimplified_FontId = japanese_FontId + max_FontSize,
     korean_FontId            = chineseSimplified_FontId + max_FontSize,
-    max_FontId               = korean_FontId + max_FontSize,
+    arabic_FontId            = korean_FontId + max_FontSize,
+    max_FontId               = arabic_FontId + max_FontSize,
 
     /* Meta: */
     mask_FontId               = 0xffff,