From 95d6bf83eb20737d1f19dea6c45ea9f846ebcbf8 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 10 Mar 2024 00:44:20 -0500
Subject: [PATCH] A bunch of fixes and tweaks to the fonts and add Noto options
---
autobuild.xml | 6 +-
.../xui/en/floater_script_ed_prefs.xml | 2 +-
.../default/xui/en/font_main_ibmplex.xml | 40 ++++-----
.../default/xui/en/font_main_notosans.xml | 61 ++++++++++++++
.../default/xui/en/font_mono_ibmplex.xml | 8 +-
.../default/xui/en/font_mono_notosans.xml | 20 +++++
indra/newview/skins/default/xui/en/fonts.xml | 83 ++++++++++++-------
.../xui/en/panel_preferences_interface.xml | 8 ++
8 files changed, 171 insertions(+), 57 deletions(-)
create mode 100644 indra/newview/skins/default/xui/en/font_main_notosans.xml
create mode 100644 indra/newview/skins/default/xui/en/font_mono_notosans.xml
diff --git a/autobuild.xml b/autobuild.xml
index a5578c9e4c6..d0fcfbd838b 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -696,11 +696,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>d8e58016074727c9b4fffb8623035adac7dda2933f61e03998cac1d75e80a2da4ece61f9222bdc589e3be10154e80beda4eb7d4ff8a3b2aab4736350d27098e0</string>
+ <string>0bd93717f0a839f908cfadcb055918ba600107b9e4aac4bb3eadb686a523c612ec659daf7f1f030ed62d7fe360c60749658a9e088efb2cb3b8af9963f82a45ce</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/169/packages/generic/fonts/427d30e.2397/fonts-427d30e-common-2397.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/169/packages/generic/fonts/e04de2e.2401/fonts-e04de2e-common-2401.tar.zst</string>
</map>
<key>name</key>
<string>common</string>
@@ -713,7 +713,7 @@
<key>copyright</key>
<string>Various Licenses</string>
<key>version</key>
- <string>427d30e</string>
+ <string>e04de2e</string>
<key>name</key>
<string>fonts</string>
<key>canonical_repo</key>
diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index 23d1236dc88..8541973baaa 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -409,7 +409,7 @@ default
label="Fira Code"
name="FiraCode"
value="FiraCode" />
- <combo_box.item.item
+ <combo_box.item
label="IBM Plex Mono"
name="IBMPlexMono"
value="IBMPlexMono"/>
diff --git a/indra/newview/skins/default/xui/en/font_main_ibmplex.xml b/indra/newview/skins/default/xui/en/font_main_ibmplex.xml
index fb1ccd8f7fe..322db010732 100644
--- a/indra/newview/skins/default/xui/en/font_main_ibmplex.xml
+++ b/indra/newview/skins/default/xui/en/font_main_ibmplex.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<fonts>
- <font name="default">
- <file>IBMPlexSans-Regular.otf</file>
+ <font name="default">
+ <file>IBMPlexSans-Regular.otf</file>
<file>IBMPlexSansJP-Regular.otf</file>
<file>IBMPlexSansKR-Regular.otf</file>
<file>IBMPlexSansThai-Regular.otf</file>
<file>IBMPlexSansHebrew-Regular.otf</file>
<file>IBMPlexSansDevanagari-Regular.otf</file>
<file>IBMPlexSansArabic-Regular.otf</file>
- </font>
+ </font>
- <font name="SansSerif">
- <file>IBMPlexSans-Regular.otf</file>
+ <font name="SansSerif">
+ <file>IBMPlexSans-Regular.otf</file>
<file>IBMPlexSansJP-Regular.otf</file>
<file>IBMPlexSansKR-Regular.otf</file>
<file>IBMPlexSansThai-Regular.otf</file>
<file>IBMPlexSansHebrew-Regular.otf</file>
<file>IBMPlexSansDevanagari-Regular.otf</file>
<file>IBMPlexSansArabic-Regular.otf</file>
- </font>
+ </font>
- <font name="SansSerif" font_style="BOLD">
- <file>IBMPlexSans-Bold.otf</file>
+ <font name="SansSerif" font_style="BOLD">
+ <file>IBMPlexSans-Bold.otf</file>
<file>IBMPlexSansJP-Bold.otf</file>
<file>IBMPlexSansKR-Bold.otf</file>
<file>IBMPlexSansThai-Bold.otf</file>
<file>IBMPlexSansHebrew-Bold.otf</file>
<file>IBMPlexSansDevanagari-Bold.otf</file>
<file>IBMPlexSansArabic-Bold.otf</file>
- </font>
+ </font>
- <font name="SansSerif" font_style="ITALIC">
- <file>IBMPlexSans-Italic.otf</file>
- </font>
+ <font name="SansSerif" font_style="ITALIC">
+ <file>IBMPlexSans-Italic.otf</file>
+ </font>
- <font name="SansSerif" font_style="BOLD|ITALIC">
- <file>IBMPlexSans-BoldItalic.otf</file>
- </font>
+ <font name="SansSerif" font_style="BOLD|ITALIC">
+ <file>IBMPlexSans-BoldItalic.otf</file>
+ </font>
- <font name="OverrideTest">
- <file>IBMPlexSans-Regular.otf</file>
- </font>
+ <font name="OverrideTest">
+ <file>IBMPlexSans-Regular.otf</file>
+ </font>
<font_size name="Huge" size="16.0" />
<font_size name="Large" size="12.0" />
<font_size name="Medium" size="10.0" />
<font_size name="Small" size="9.0" />
-</fonts>
+</fonts>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/font_main_notosans.xml b/indra/newview/skins/default/xui/en/font_main_notosans.xml
new file mode 100644
index 00000000000..748447d6c01
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/font_main_notosans.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<fonts>
+ <font name="default">
+ <file>NotoSans-Regular.otf</file>
+ <file functor="is_emoji">TwemojiSVG.ttf</file>
+ <file load_collection="true">NotoSansCJK-Regular.ttc</file>
+ <file>NotoSansOriya-Regular.otf</file>
+ <file>NotoSansKannadaUI-Regular.otf</file>
+ <file>NotoSansDevanagariUI-Regular.otf</file>
+ <file>NotoNaskhArabicUI-Regular.otf</file>
+ <file>NotoSansThai-Regular.otf</file>
+ <file>NotoSansEgyptianHieroglyphs-Regular.otf</file>
+ <file>NotoSansSymbols-Regular.otf</file>
+ <file>NotoSansSymbols2-Regular.otf</file>
+ <file>NotoSansMath-Regular.otf</file>
+ </font>
+
+ <font name="SansSerif">
+ <file>NotoSans-Regular.otf</file>
+ <file functor="is_emoji">TwemojiSVG.ttf</file>
+ <file load_collection="true">NotoSansCJK-Regular.ttc</file>
+ <file>NotoSansOriya-Regular.otf</file>
+ <file>NotoSansKannadaUI-Regular.otf</file>
+ <file>NotoSansDevanagariUI-Regular.otf</file>
+ <file>NotoNaskhArabicUI-Regular.otf</file>
+ <file>NotoSansThai-Regular.otf</file>
+ <file>NotoSansEgyptianHieroglyphs-Regular.otf</file>
+ <file>NotoSansSymbols-Regular.otf</file>
+ <file>NotoSansSymbols2-Regular.otf</file>
+ <file>NotoSansMath-Regular.otf</file>
+ </font>
+
+ <font name="SansSerif" font_style="BOLD">
+ <file>NotoSans-Bold.otf</file>
+ <file load_collection="true">NotoSansCJK-Bold.ttc</file>
+ <file>NotoSansTamilUI-Bold.otf</file>
+ <file>NotoSansOriya-Bold.otf</file>
+ <file>NotoSansKannadaUI-Bold.otf</file>
+ <file>NotoSansDevanagariUI-Bold.otf</file>
+ <file>NotoNaskhArabicUI-Bold.otf</file>
+ <file>NotoSansThai-Bold.otf</file>
+ <file>NotoSansSymbols-Bold.otf</file>
+ </font>
+
+ <font name="SansSerif" font_style="ITALIC">
+ <file>NotoSans-Italic.otf</file>
+ </font>
+
+ <font name="SansSerif" font_style="BOLD|ITALIC">
+ <file>NotoSans-BoldItalic.otf</file>
+ </font>
+
+ <font name="OverrideTest">
+ <file>NotoSans-Regular.otf</file>
+ </font>
+
+ <font_size name="Huge" size="16.0" />
+ <font_size name="Large" size="11.4" />
+ <font_size name="Medium" size="9.4" />
+ <font_size name="Small" size="8.4" />
+</fonts>
diff --git a/indra/newview/skins/default/xui/en/font_mono_ibmplex.xml b/indra/newview/skins/default/xui/en/font_mono_ibmplex.xml
index bc34d3aceb4..6b84cc2428a 100644
--- a/indra/newview/skins/default/xui/en/font_mono_ibmplex.xml
+++ b/indra/newview/skins/default/xui/en/font_mono_ibmplex.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<fonts>
<font name="Monospace">
- <file>UbuntuMono-R.ttf</file>
+ <file>IBMPlexMono-Regular.otf</file>
</font>
<font name="Monospace" font_style="BOLD">
- <file>UbuntuMono-B.ttf</file>
+ <file>IBMPlexMono-Bold.otf</file>
</font>
<font name="Monospace" font_style="ITALIC">
- <file>UbuntuMono-RI.ttf</file>
+ <file>IBMPlexMono-Italic.otf</file>
</font>
<font name="Monospace" font_style="BOLD|ITALIC">
- <file>UbuntuMono-BI.ttf</file>
+ <file>IBMPlexMono-BoldItalic.otf</file>
</font>
<font_size name="Monospace" size="8.0" />
diff --git a/indra/newview/skins/default/xui/en/font_mono_notosans.xml b/indra/newview/skins/default/xui/en/font_mono_notosans.xml
new file mode 100644
index 00000000000..396c3e75db9
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/font_mono_notosans.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<fonts>
+ <font name="Monospace">
+ <file>NotoSansMono-Regular.otf</file>
+ </font>
+
+ <font name="Monospace" font_style="BOLD">
+ <file>NotoSansMono-Bold.otf</file>
+ </font>
+
+ <font name="Monospace" font_style="ITALIC">
+ <file>NotoSansMono-Italic.otf</file>
+ </font>
+
+ <font name="Monospace" font_style="BOLD|ITALIC">
+ <file>NotoSansMono-BoldItalic.otf</file>
+ </font>
+
+ <font_size name="Monospace" size="8.0" />
+</fonts>
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index dfc1c8adda7..49287ae9ce3 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -4,16 +4,17 @@
<font name="default" comment="default font files (global fallbacks)">
<file>DejaVuSans.ttf</file>
<file functor="is_emoji">TwemojiSVG.ttf</file>
- <file>NotoSans-Regular.ttf</file>
+ <file>NotoSans-Regular.otf</file>
<file load_collection="true">NotoSansCJK-Regular.ttc</file>
- <file>NotoSansOriya-Regular.ttf</file>
- <file>NotoSansKannada-Regular.ttf</file>
- <file>NotoSansDevanagari-Regular.ttf</file>
- <file>NotoNaskhArabicUI-Regular.ttf</file>
- <file>NotoLoopedThaiUI-Regular.ttf</file>
- <file>NotoSansSymbols-Regular.ttf</file>
- <file>NotoSansSymbols2-Regular.ttf</file>
- <file>NotoSansMath-Regular.ttf</file>
+ <file>NotoSansOriya-Regular.otf</file>
+ <file>NotoSansKannadaUI-Regular.otf</file>
+ <file>NotoSansDevanagariUI-Regular.otf</file>
+ <file>NotoNaskhArabicUI-Regular.otf</file>
+ <file>NotoSansThai-Regular.otf</file>
+ <file>NotoSansEgyptianHieroglyphs-Regular.otf</file>
+ <file>NotoSansSymbols-Regular.otf</file>
+ <file>NotoSansSymbols2-Regular.otf</file>
+ <file>NotoSansMath-Regular.otf</file>
<os name="Windows">
<file load_collection="true">YuGothR.ttc</file>
<file>Seguiemj.ttf</file>
@@ -60,15 +61,15 @@
comment="Name of bold sans-serif font"
font_style="BOLD">
<file>DejaVuSans-Bold.ttf</file>
- <file>NotoSans-Bold.ttf</file>
+ <file>NotoSans-Bold.otf</file>
<file load_collection="true">NotoSansCJK-Bold.ttc</file>
- <file>NotoSansTamil-Bold.ttf</file>
- <file>NotoSansOriya-Bold.ttf</file>
- <file>NotoSansKannada-Bold.ttf</file>
- <file>NotoSansDevanagari-Bold.ttf</file>
- <file>NotoNaskhArabicUI-Bold.ttf</file>
- <file>NotoLoopedThaiUI-Bold.ttf</file>
- <file>NotoSansSymbols-Bold.ttf</file>
+ <file>NotoSansTamilUI-Bold.otf</file>
+ <file>NotoSansOriya-Bold.otf</file>
+ <file>NotoSansKannadaUI-Bold.otf</file>
+ <file>NotoSansDevanagariUI-Bold.otf</file>
+ <file>NotoNaskhArabicUI-Bold.otf</file>
+ <file>NotoSansThai-Bold.otf</file>
+ <file>NotoSansSymbols-Bold.otf</file>
<os name="Windows">
<file>arialbd.ttf</file>
<file load_collection="true">YuGothB.ttc</file>
@@ -83,14 +84,14 @@
comment="Name of italic sans-serif font"
font_style="ITALIC">
<file>DejaVuSans-Oblique.ttf</file>
- <file>NotoSans-Italic.ttf</file>
+ <file>NotoSans-Italic.otf</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>
+ <file>NotoSans-BoldItalic.otf</file>
</font>
<font name="Emoji"
@@ -107,11 +108,12 @@
<font name="Monospace"
comment="Name of monospace font">
<file>DejaVuSansMono.ttf</file>
- <file>NotoSansMono-Regular.ttf</file>
+ <file>NotoSansMono-Regular.otf</file>
</font>
<font name="Monospace" font_style="BOLD">
<file>DejaVuSansMono-Bold.ttf</file>
+ <file>NotoSansMono-Bold.otf</file>
</font>
<font name="Monospace" font_style="ITALIC">
@@ -256,19 +258,38 @@
<!--NotoSans-->
<font name="NotoSans">
- <file>NotoSans-Regular.ttf</file>
+ <file>NotoSans-Regular.otf</file>
+ <file functor="is_emoji">TwemojiSVG.ttf</file>
+ <file load_collection="true">NotoSansCJK-Regular.ttc</file>
+ <file>NotoSansOriya-Regular.otf</file>
+ <file>NotoSansKannadaUI-Regular.otf</file>
+ <file>NotoSansDevanagariUI-Regular.otf</file>
+ <file>NotoNaskhArabicUI-Regular.otf</file>
+ <file>NotoSansThai-Regular.otf</file>
+ <file>NotoSansEgyptianHieroglyphs-Regular.otf</file>
+ <file>NotoSansSymbols-Regular.otf</file>
+ <file>NotoSansSymbols2-Regular.otf</file>
+ <file>NotoSansMath-Regular.otf</file>
</font>
<font name="NotoSans" font_style="BOLD">
- <file>NotoSans-Bold.ttf</file>
+ <file>NotoSans-Bold.otf</file>
+ <file load_collection="true">NotoSansCJK-Bold.ttc</file>
+ <file>NotoSansTamilUI-Bold.otf</file>
+ <file>NotoSansOriya-Bold.otf</file>
+ <file>NotoSansKannadaUI-Bold.otf</file>
+ <file>NotoSansDevanagariUI-Bold.otf</file>
+ <file>NotoNaskhArabicUI-Bold.otf</file>
+ <file>NotoSansThai-Bold.otf</file>
+ <file>NotoSansSymbols-Bold.otf</file>
</font>
<font name="NotoSans" font_style="ITALIC">
- <file>NotoSans-Italic.ttf</file>
+ <file>NotoSans-Italic.otf</file>
</font>
<font name="NotoSans" font_style="BOLD|ITALIC">
- <file>NotoSans-BoldItalic.ttf</file>
+ <file>NotoSans-BoldItalic.otf</file>
</font>
<font_size name="Monospace" font="NotoSans" size="8.0" />
@@ -303,12 +324,12 @@
<!--Source Sans 3-->
<font name="SourceSans">
<file>SourceSans3-Regular.otf</file>
- <file load_collection="true">SourceHanSans-Regular.ttc</file>
+ <file load_collection="true">NotoSansCJK-Regular.ttc</file>
</font>
<font name="SourceSans" font_style="BOLD">
<file>SourceSans3-Bold.otf</file>
- <file load_collection="true">SourceHanSans-Bold.ttc</file>
+ <file load_collection="true">NotoSansCJK-Regular.ttc</file>
</font>
<font name="SourceSans" font_style="ITALIC">
@@ -528,7 +549,11 @@
<!--Noto Sans Mono-->
<font name="NotoSansMono">
- <file>NotoSansMono-Regular.ttf</file>
+ <file>NotoSansMono-Regular.otf</file>
+ </font>
+
+ <font name="NotoSansMono" font_style="BOLD">
+ <file>NotoSansMono-Bold.otf</file>
</font>
<font_size name="Monospace" font="NotoSansMono" size="8.0" />
@@ -551,12 +576,12 @@
<!--Source Code Pro-->
<font name="SourceCodePro">
<file>SourceCodePro-Regular.otf</file>
- <file load_collection="true">SourceHanSans-Regular.ttc</file>
+ <file load_collection="true">NotoSansCJK-Regular.ttc</file>
</font>
<font name="SourceCodePro" font_style="BOLD">
<file>SourceCodePro-Bold.otf</file>
- <file load_collection="true">SourceHanSans-Bold.ttc</file>
+ <file load_collection="true">NotoSansCJK-Regular.ttc</file>
</font>
<font name="SourceCodePro" font_style="ITALIC">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_interface.xml b/indra/newview/skins/default/xui/en/panel_preferences_interface.xml
index 77f86489bbe..feaa1735207 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_interface.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_interface.xml
@@ -333,6 +333,10 @@
label="Open Dyslexic"
name="opendyslexic"
value="font_main_opendyslexic.xml"/>
+ <item
+ label="Noto Sans"
+ name="notosans"
+ value="font_main_notosans.xml"/>
<item
label="Source Sans 3"
name="sourcesans"
@@ -369,6 +373,10 @@ Monospace Font(restart required):
label="IBM Plex Mono"
name="ibmplexmono"
value="font_mono_ibmplex.xml"/>
+ <item
+ label="Noto Sans Mono"
+ name="notosansmono"
+ value="font_mono_notosans.xml"/>
<item
label="Source Code Pro"
name="sourcecodepro"
--
GitLab