Skip to content
Snippets Groups Projects
Commit 95d6bf83 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

A bunch of fixes and tweaks to the fonts and add Noto options

parent 7ac11ff7
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
Hide whitespace changes
Inline Side-by-side
Showing
with 171 additions and 57 deletions
autobuild.xml
+ 3
− 3
View file @ 95d6bf83
...@@ -696,11 +696,11 @@ ...@@ -696,11 +696,11 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>d8e58016074727c9b4fffb8623035adac7dda2933f61e03998cac1d75e80a2da4ece61f9222bdc589e3be10154e80beda4eb7d4ff8a3b2aab4736350d27098e0</string> <string>0bd93717f0a839f908cfadcb055918ba600107b9e4aac4bb3eadb686a523c612ec659daf7f1f030ed62d7fe360c60749658a9e088efb2cb3b8af9963f82a45ce</string>
<key>hash_algorithm</key> <key>hash_algorithm</key>
<string>blake2b</string> <string>blake2b</string>
<key>url</key> <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> </map>
<key>name</key> <key>name</key>
<string>common</string> <string>common</string>
...@@ -713,7 +713,7 @@ ...@@ -713,7 +713,7 @@
<key>copyright</key> <key>copyright</key>
<string>Various Licenses</string> <string>Various Licenses</string>
<key>version</key> <key>version</key>
<string>427d30e</string> <string>e04de2e</string>
<key>name</key> <key>name</key>
<string>fonts</string> <string>fonts</string>
<key>canonical_repo</key> <key>canonical_repo</key>
......
indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+ 1
− 1
View file @ 95d6bf83
...@@ -409,7 +409,7 @@ default ...@@ -409,7 +409,7 @@ default
label="Fira Code" label="Fira Code"
name="FiraCode" name="FiraCode"
value="FiraCode" /> value="FiraCode" />
<combo_box.item.item <combo_box.item
label="IBM Plex Mono" label="IBM Plex Mono"
name="IBMPlexMono" name="IBMPlexMono"
value="IBMPlexMono"/> value="IBMPlexMono"/>
......
indra/newview/skins/default/xui/en/font_main_ibmplex.xml
+ 20
− 20
View file @ 95d6bf83
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<fonts> <fonts>
<font name="default"> <font name="default">
<file>IBMPlexSans-Regular.otf</file> <file>IBMPlexSans-Regular.otf</file>
<file>IBMPlexSansJP-Regular.otf</file> <file>IBMPlexSansJP-Regular.otf</file>
<file>IBMPlexSansKR-Regular.otf</file> <file>IBMPlexSansKR-Regular.otf</file>
<file>IBMPlexSansThai-Regular.otf</file> <file>IBMPlexSansThai-Regular.otf</file>
<file>IBMPlexSansHebrew-Regular.otf</file> <file>IBMPlexSansHebrew-Regular.otf</file>
<file>IBMPlexSansDevanagari-Regular.otf</file> <file>IBMPlexSansDevanagari-Regular.otf</file>
<file>IBMPlexSansArabic-Regular.otf</file> <file>IBMPlexSansArabic-Regular.otf</file>
</font> </font>
<font name="SansSerif"> <font name="SansSerif">
<file>IBMPlexSans-Regular.otf</file> <file>IBMPlexSans-Regular.otf</file>
<file>IBMPlexSansJP-Regular.otf</file> <file>IBMPlexSansJP-Regular.otf</file>
<file>IBMPlexSansKR-Regular.otf</file> <file>IBMPlexSansKR-Regular.otf</file>
<file>IBMPlexSansThai-Regular.otf</file> <file>IBMPlexSansThai-Regular.otf</file>
<file>IBMPlexSansHebrew-Regular.otf</file> <file>IBMPlexSansHebrew-Regular.otf</file>
<file>IBMPlexSansDevanagari-Regular.otf</file> <file>IBMPlexSansDevanagari-Regular.otf</file>
<file>IBMPlexSansArabic-Regular.otf</file> <file>IBMPlexSansArabic-Regular.otf</file>
</font> </font>
<font name="SansSerif" font_style="BOLD"> <font name="SansSerif" font_style="BOLD">
<file>IBMPlexSans-Bold.otf</file> <file>IBMPlexSans-Bold.otf</file>
<file>IBMPlexSansJP-Bold.otf</file> <file>IBMPlexSansJP-Bold.otf</file>
<file>IBMPlexSansKR-Bold.otf</file> <file>IBMPlexSansKR-Bold.otf</file>
<file>IBMPlexSansThai-Bold.otf</file> <file>IBMPlexSansThai-Bold.otf</file>
<file>IBMPlexSansHebrew-Bold.otf</file> <file>IBMPlexSansHebrew-Bold.otf</file>
<file>IBMPlexSansDevanagari-Bold.otf</file> <file>IBMPlexSansDevanagari-Bold.otf</file>
<file>IBMPlexSansArabic-Bold.otf</file> <file>IBMPlexSansArabic-Bold.otf</file>
</font> </font>
<font name="SansSerif" font_style="ITALIC"> <font name="SansSerif" font_style="ITALIC">
<file>IBMPlexSans-Italic.otf</file> <file>IBMPlexSans-Italic.otf</file>
</font> </font>
<font name="SansSerif" font_style="BOLD|ITALIC"> <font name="SansSerif" font_style="BOLD|ITALIC">
<file>IBMPlexSans-BoldItalic.otf</file> <file>IBMPlexSans-BoldItalic.otf</file>
</font> </font>
<font name="OverrideTest"> <font name="OverrideTest">
<file>IBMPlexSans-Regular.otf</file> <file>IBMPlexSans-Regular.otf</file>
</font> </font>
<font_size name="Huge" size="16.0" /> <font_size name="Huge" size="16.0" />
<font_size name="Large" size="12.0" /> <font_size name="Large" size="12.0" />
<font_size name="Medium" size="10.0" /> <font_size name="Medium" size="10.0" />
<font_size name="Small" size="9.0" /> <font_size name="Small" size="9.0" />
</fonts> </fonts>
\ No newline at end of file
indra/newview/skins/default/xui/en/font_main_notosans.xml 0 → 100644
+ 61
− 0
View file @ 95d6bf83
<?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>
indra/newview/skins/default/xui/en/font_mono_ibmplex.xml
+ 4
− 4
View file @ 95d6bf83
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<fonts> <fonts>
<font name="Monospace"> <font name="Monospace">
<file>UbuntuMono-R.ttf</file> <file>IBMPlexMono-Regular.otf</file>
</font> </font>
<font name="Monospace" font_style="BOLD"> <font name="Monospace" font_style="BOLD">
<file>UbuntuMono-B.ttf</file> <file>IBMPlexMono-Bold.otf</file>
</font> </font>
<font name="Monospace" font_style="ITALIC"> <font name="Monospace" font_style="ITALIC">
<file>UbuntuMono-RI.ttf</file> <file>IBMPlexMono-Italic.otf</file>
</font> </font>
<font name="Monospace" font_style="BOLD|ITALIC"> <font name="Monospace" font_style="BOLD|ITALIC">
<file>UbuntuMono-BI.ttf</file> <file>IBMPlexMono-BoldItalic.otf</file>
</font> </font>
<font_size name="Monospace" size="8.0" /> <font_size name="Monospace" size="8.0" />
......
indra/newview/skins/default/xui/en/font_mono_notosans.xml 0 → 100644
+ 20
− 0
View file @ 95d6bf83
<?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>
indra/newview/skins/default/xui/en/fonts.xml
+ 54
− 29
View file @ 95d6bf83
...@@ -4,16 +4,17 @@ ...@@ -4,16 +4,17 @@
<font name="default" comment="default font files (global fallbacks)"> <font name="default" comment="default font files (global fallbacks)">
<file>DejaVuSans.ttf</file> <file>DejaVuSans.ttf</file>
<file functor="is_emoji">TwemojiSVG.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 load_collection="true">NotoSansCJK-Regular.ttc</file>
<file>NotoSansOriya-Regular.ttf</file> <file>NotoSansOriya-Regular.otf</file>
<file>NotoSansKannada-Regular.ttf</file> <file>NotoSansKannadaUI-Regular.otf</file>
<file>NotoSansDevanagari-Regular.ttf</file> <file>NotoSansDevanagariUI-Regular.otf</file>
<file>NotoNaskhArabicUI-Regular.ttf</file> <file>NotoNaskhArabicUI-Regular.otf</file>
<file>NotoLoopedThaiUI-Regular.ttf</file> <file>NotoSansThai-Regular.otf</file>
<file>NotoSansSymbols-Regular.ttf</file> <file>NotoSansEgyptianHieroglyphs-Regular.otf</file>
<file>NotoSansSymbols2-Regular.ttf</file> <file>NotoSansSymbols-Regular.otf</file>
<file>NotoSansMath-Regular.ttf</file> <file>NotoSansSymbols2-Regular.otf</file>
<file>NotoSansMath-Regular.otf</file>
<os name="Windows"> <os name="Windows">
<file load_collection="true">YuGothR.ttc</file> <file load_collection="true">YuGothR.ttc</file>
<file>Seguiemj.ttf</file> <file>Seguiemj.ttf</file>
...@@ -60,15 +61,15 @@ ...@@ -60,15 +61,15 @@
comment="Name of bold sans-serif font" comment="Name of bold sans-serif font"
font_style="BOLD"> font_style="BOLD">
<file>DejaVuSans-Bold.ttf</file> <file>DejaVuSans-Bold.ttf</file>
<file>NotoSans-Bold.ttf</file> <file>NotoSans-Bold.otf</file>
<file load_collection="true">NotoSansCJK-Bold.ttc</file> <file load_collection="true">NotoSansCJK-Bold.ttc</file>
<file>NotoSansTamil-Bold.ttf</file> <file>NotoSansTamilUI-Bold.otf</file>
<file>NotoSansOriya-Bold.ttf</file> <file>NotoSansOriya-Bold.otf</file>
<file>NotoSansKannada-Bold.ttf</file> <file>NotoSansKannadaUI-Bold.otf</file>
<file>NotoSansDevanagari-Bold.ttf</file> <file>NotoSansDevanagariUI-Bold.otf</file>
<file>NotoNaskhArabicUI-Bold.ttf</file> <file>NotoNaskhArabicUI-Bold.otf</file>
<file>NotoLoopedThaiUI-Bold.ttf</file> <file>NotoSansThai-Bold.otf</file>
<file>NotoSansSymbols-Bold.ttf</file> <file>NotoSansSymbols-Bold.otf</file>
<os name="Windows"> <os name="Windows">
<file>arialbd.ttf</file> <file>arialbd.ttf</file>
<file load_collection="true">YuGothB.ttc</file> <file load_collection="true">YuGothB.ttc</file>
...@@ -83,14 +84,14 @@ ...@@ -83,14 +84,14 @@
comment="Name of italic sans-serif font" comment="Name of italic sans-serif font"
font_style="ITALIC"> font_style="ITALIC">
<file>DejaVuSans-Oblique.ttf</file> <file>DejaVuSans-Oblique.ttf</file>
<file>NotoSans-Italic.ttf</file> <file>NotoSans-Italic.otf</file>
</font> </font>
<font name="SansSerif" <font name="SansSerif"
comment="Name of bold italic sans-serif font" comment="Name of bold italic sans-serif font"
font_style="BOLD|ITALIC"> font_style="BOLD|ITALIC">
<file>DejaVuSans-BoldOblique.ttf</file> <file>DejaVuSans-BoldOblique.ttf</file>
<file>NotoSans-BoldItalic.ttf</file> <file>NotoSans-BoldItalic.otf</file>
</font> </font>
<font name="Emoji" <font name="Emoji"
...@@ -107,11 +108,12 @@ ...@@ -107,11 +108,12 @@
<font name="Monospace" <font name="Monospace"
comment="Name of monospace font"> comment="Name of monospace font">
<file>DejaVuSansMono.ttf</file> <file>DejaVuSansMono.ttf</file>
<file>NotoSansMono-Regular.ttf</file> <file>NotoSansMono-Regular.otf</file>
</font> </font>
<font name="Monospace" font_style="BOLD"> <font name="Monospace" font_style="BOLD">
<file>DejaVuSansMono-Bold.ttf</file> <file>DejaVuSansMono-Bold.ttf</file>
<file>NotoSansMono-Bold.otf</file>
</font> </font>
<font name="Monospace" font_style="ITALIC"> <font name="Monospace" font_style="ITALIC">
...@@ -256,19 +258,38 @@ ...@@ -256,19 +258,38 @@
<!--NotoSans--> <!--NotoSans-->
<font name="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>
<font name="NotoSans" font_style="BOLD"> <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>
<font name="NotoSans" font_style="ITALIC"> <font name="NotoSans" font_style="ITALIC">
<file>NotoSans-Italic.ttf</file> <file>NotoSans-Italic.otf</file>
</font> </font>
<font name="NotoSans" font_style="BOLD|ITALIC"> <font name="NotoSans" font_style="BOLD|ITALIC">
<file>NotoSans-BoldItalic.ttf</file> <file>NotoSans-BoldItalic.otf</file>
</font> </font>
<font_size name="Monospace" font="NotoSans" size="8.0" /> <font_size name="Monospace" font="NotoSans" size="8.0" />
...@@ -303,12 +324,12 @@ ...@@ -303,12 +324,12 @@
<!--Source Sans 3--> <!--Source Sans 3-->
<font name="SourceSans"> <font name="SourceSans">
<file>SourceSans3-Regular.otf</file> <file>SourceSans3-Regular.otf</file>
<file load_collection="true">SourceHanSans-Regular.ttc</file> <file load_collection="true">NotoSansCJK-Regular.ttc</file>
</font> </font>
<font name="SourceSans" font_style="BOLD"> <font name="SourceSans" font_style="BOLD">
<file>SourceSans3-Bold.otf</file> <file>SourceSans3-Bold.otf</file>
<file load_collection="true">SourceHanSans-Bold.ttc</file> <file load_collection="true">NotoSansCJK-Regular.ttc</file>
</font> </font>
<font name="SourceSans" font_style="ITALIC"> <font name="SourceSans" font_style="ITALIC">
...@@ -528,7 +549,11 @@ ...@@ -528,7 +549,11 @@
<!--Noto Sans Mono--> <!--Noto Sans Mono-->
<font name="NotoSansMono"> <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>
<font_size name="Monospace" font="NotoSansMono" size="8.0" /> <font_size name="Monospace" font="NotoSansMono" size="8.0" />
...@@ -551,12 +576,12 @@ ...@@ -551,12 +576,12 @@
<!--Source Code Pro--> <!--Source Code Pro-->
<font name="SourceCodePro"> <font name="SourceCodePro">
<file>SourceCodePro-Regular.otf</file> <file>SourceCodePro-Regular.otf</file>
<file load_collection="true">SourceHanSans-Regular.ttc</file> <file load_collection="true">NotoSansCJK-Regular.ttc</file>
</font> </font>
<font name="SourceCodePro" font_style="BOLD"> <font name="SourceCodePro" font_style="BOLD">
<file>SourceCodePro-Bold.otf</file> <file>SourceCodePro-Bold.otf</file>
<file load_collection="true">SourceHanSans-Bold.ttc</file> <file load_collection="true">NotoSansCJK-Regular.ttc</file>
</font> </font>
<font name="SourceCodePro" font_style="ITALIC"> <font name="SourceCodePro" font_style="ITALIC">
......
indra/newview/skins/default/xui/en/panel_preferences_interface.xml
+ 8
− 0
View file @ 95d6bf83
...@@ -333,6 +333,10 @@ ...@@ -333,6 +333,10 @@
label="Open Dyslexic" label="Open Dyslexic"
name="opendyslexic" name="opendyslexic"
value="font_main_opendyslexic.xml"/> value="font_main_opendyslexic.xml"/>
<item
label="Noto Sans"
name="notosans"
value="font_main_notosans.xml"/>
<item <item
label="Source Sans 3" label="Source Sans 3"
name="sourcesans" name="sourcesans"
...@@ -369,6 +373,10 @@ Monospace Font(restart required): ...@@ -369,6 +373,10 @@ Monospace Font(restart required):
label="IBM Plex Mono" label="IBM Plex Mono"
name="ibmplexmono" name="ibmplexmono"
value="font_mono_ibmplex.xml"/> value="font_mono_ibmplex.xml"/>
<item
label="Noto Sans Mono"
name="notosansmono"
value="font_mono_notosans.xml"/>
<item <item
label="Source Code Pro" label="Source Code Pro"
name="sourcecodepro" name="sourcecodepro"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment