From 6c340c3fd400494b0d7c7672403ebd13ca4b9a9f Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 11 Oct 2021 18:32:53 -0400
Subject: [PATCH] Increase unicode font coverage
---
autobuild.xml | 6 ++---
indra/newview/skins/default/xui/en/fonts.xml | 27 ++++++++++++++++++++
indra/newview/viewer_manifest.py | 1 +
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index ea1529da0ec..89c4b74f0c5 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -598,18 +598,18 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>439196ad7d55786d3fea808c3afc147e54afdf3255de3d0d2a10b109e720e4fbbeb66065e1009a8d6a74df8e24265794655b633ded2c603fa221469b38f0c8f3</string>
+ <string>ba6f350cc13df0f1f8eb9c0033d587abdd8d3942fcd972441d4e42554d54c72ca472cb49a9c004463e94e471f3510abbec1ecfb3f1332ba4a442130c576fae76</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/169/packages/generic/fonts/8ae51f5.1222/fonts-8ae51f5-common-1222.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/169/packages/generic/fonts/187d5d3.1224/fonts-187d5d3-common-1224.tar.zst</string>
</map>
<key>name</key>
<string>common</string>
</map>
</map>
<key>version</key>
- <string>8ae51f5</string>
+ <string>187d5d3</string>
</map>
<key>freetype</key>
<map>
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index c26fadc4297..7341e92285e 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -3,6 +3,13 @@
<font name="default" comment="default font files (global fallbacks)">
<file>DejaVuSans.ttf</file>
+ <file>NotoSans-Regular.ttf</file>
+ <file>NotoSansSymbols-Regular.ttf</file>
+ <file>NotoSansSymbols2-Regular.ttf</file>
+ <file>NotoSansMath-Regular.ttf</file>
+ <file>NotoNaskhArabicUI-Regular.ttf</file>
+ <file>NotoLoopedThaiUI-Regular.ttf</file>
+ <file>NotoSansCJK-Regular.ttc</file>
<os name="Windows">
<file>meiryo.TTC</file>
<file>MSGOTHIC.TTC</file>
@@ -34,6 +41,11 @@
<font name="SansSerifBold"
comment="Name of bold sans-serif font">
<file>DejaVuSans-Bold.ttf</file>
+ <file>NotoSans-Bold.ttf</file>
+ <file>NotoSansSymbols-Bold.ttf</file>
+ <file>NotoNaskhArabicUI-Bold.ttf</file>
+ <file>NotoLoopedThaiUI-Bold.ttf</file>
+ <file>NotoSansCJK-Bold.ttc</file>
<os name="Windows">
<file>arialbd.ttf</file>
</os>
@@ -44,6 +56,13 @@
<font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
<file>DejaVuSans.ttf</file>
+ <file>NotoSans-Regular.ttf</file>
+ <file>NotoSansSymbols-Regular.ttf</file>
+ <file>NotoSansSymbols2-Regular.ttf</file>
+ <file>NotoSansMath-Regular.ttf</file>
+ <file>NotoNaskhArabicUI-Regular.ttf</file>
+ <file>NotoLoopedThaiUI-Regular.ttf</file>
+ <file>NotoSansCJK-Regular.ttc</file>
<os name="Windows">
<file>arial.ttf</file>
</os>
@@ -56,23 +75,31 @@
comment="Name of bold sans-serif font"
font_style="BOLD">
<file>DejaVuSans-Bold.ttf</file>
+ <file>NotoSans-Bold.ttf</file>
+ <file>NotoSansSymbols-Bold.ttf</file>
+ <file>NotoNaskhArabicUI-Bold.ttf</file>
+ <file>NotoNaskhArabicUI-Regular.ttf</file>
+ <file>NotoSansCJK-Bold.ttc</file>
</font>
<font name="SansSerif"
comment="Name of italic sans-serif font"
font_style="ITALIC">
<file>DejaVuSans-Oblique.ttf</file>
+ <file>NotoSans-Italic.ttf</file>
</font>
<font name="SansSerif"
comment="Name of bold italic sans-serif font"
font_style="BOLD|ITALIC">
<file>DejaVuSans-BoldOblique.ttf</file>
+ <file>NotoSans-BoldItalic.ttf</file>
</font>
<font name="Monospace"
comment="Name of monospace font">
<file>DejaVuSansMono.ttf</file>
+ <file>NotoSansMono-Regular.ttf</file>
</font>
<font name="DejaVu"
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index def5ef47377..0905e7505cc 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -148,6 +148,7 @@ def construct(self):
# Include our fonts
with self.prefix(src=os.path.join(pkgdir, 'fonts'), dst="fonts"):
self.path("*.ttf")
+ self.path("*.ttc")
self.path("*.txt")
# skins
--
GitLab