⛏️ index : haiku.git

c19566e4c1194f936bf3946dd478a166adac1a8d [patch]

57406af3de670093208b6336086779fc71a2127e

fff9c8e3a4b3f30c257c9903df98359490d7ac42

c19566e4c1194f936bf3946dd478a166adac1a8d.tar.gz

Set Noto Sans Mono as monospace default font

Should help improve [1].

[1]: https://github.com/haikuports/haikuports/issues/3116

Change-Id: I29dd94e3380c3a5935d47d97e2a2ac1c5fb7e774
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3070
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>

Diff

 docs/interface_guidelines/haiku.css          | 2 +-
 src/servers/app/ServerConfig.h               | 2 +-
 src/kits/network/libnetapi/GopherRequest.cpp | 2 +-
 src/servers/app/font/FontManager.cpp         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/interface_guidelines/haiku.css b/docs/interface_guidelines/haiku.css
index cdd108d..ed5c6a9 100644
--- a/docs/interface_guidelines/haiku.css
+++ b/docs/interface_guidelines/haiku.css
@@ -12,7 +12,7 @@
}
cmdsynopsis, code, command, computeroutput, envar, filename, keycode, keysym,
literal, option, parameter, sgmltag, systemitem {
	font-family: "Noto Mono", Courier, "Courier New", monospace, fixed;
	font-family: "Noto Sans Mono", Courier, "Courier New", monospace, fixed;
}
term {
  font-weight: bold;
diff --git a/src/servers/app/ServerConfig.h b/src/servers/app/ServerConfig.h
index 6d1dd65..a58b5ed 100644
--- a/src/servers/app/ServerConfig.h
+++ b/src/servers/app/ServerConfig.h
@@ -35,7 +35,7 @@
#define FALLBACK_BOLD_FONT_FAMILY "Swis721 BT"
#define DEFAULT_BOLD_FONT_STYLE "Bold"
#define DEFAULT_BOLD_FONT_SIZE 12.0f
#define DEFAULT_FIXED_FONT_FAMILY "Noto Mono"
#define DEFAULT_FIXED_FONT_FAMILY "Noto Sans Mono"
#define FALLBACK_FIXED_FONT_FAMILY "Courier10 BT"
#define DEFAULT_FIXED_FONT_STYLE "Regular"
#define DEFAULT_FIXED_FONT_SIZE 12.0f
diff --git a/src/kits/network/libnetapi/GopherRequest.cpp b/src/kits/network/libnetapi/GopherRequest.cpp
index 8b4bf68..1612227 100644
--- a/src/kits/network/libnetapi/GopherRequest.cpp
+++ b/src/kits/network/libnetapi/GopherRequest.cpp
@@ -143,7 +143,7 @@
"body#gopher span {\n"
"	margin-left: 1em;\n"
"	padding-left: 2em;\n"
"	font-family: 'Noto Mono', Courier, monospace;\n"
"	font-family: 'Noto Sans Mono', Courier, monospace;\n"
"	word-wrap: break-word;\n"
"	white-space: pre-wrap; }\n"
"\n"
diff --git a/src/servers/app/font/FontManager.cpp b/src/servers/app/font/FontManager.cpp
index 9bdee12..5ae176d 100644
--- a/src/servers/app/font/FontManager.cpp
+++ b/src/servers/app/font/FontManager.cpp
@@ -342,8 +342,8 @@
		_AddDefaultMapping("Noto Sans Display", "Bold", veraFontPath.Path());

		veraFontPath.SetTo(ttfontsPath.Path());
		veraFontPath.Append("NotoMono-Regular.ttf");
		_AddDefaultMapping("Noto Mono", "Regular", veraFontPath.Path());
		veraFontPath.Append("NotoSansMono-Regular.ttf");
		_AddDefaultMapping("Noto Sans Mono", "Regular", veraFontPath.Path());

		return true;
	}