Switch from DejaVu to Noto font

As discussed, Noto renders much better with freetype 2.7 [1].
The DejaVu package is still in the HaikuPorts repo and can be installed
manually just like all the other available fonts.

[1] http://www.freelists.org/post/haiku-development/freetype-update-from-265-to-27
This commit is contained in:
Humdinger
2016-11-27 19:04:26 +01:00
parent 209b520fa0
commit 945566ff43
10 changed files with 21 additions and 21 deletions
+1 -1
View File
@@ -11,6 +11,6 @@ for f in data/artwork/icons/*; do
echo "-label" echo "-label"
echo "${bn}" echo "${bn}"
echo "${tmpf}${bn}.png" echo "${tmpf}${bn}.png"
done | xargs -d '\n' sh -c 'montage -frame 5 -background "#336699" -geometry +4+4 -font /system/data/fonts/ttfonts/DejaVuSansCondensed.ttf -pointsize 8 "$@" haiku_icons.png' -- done | xargs -d '\n' sh -c 'montage -frame 5 -background "#336699" -geometry +4+4 -font /system/data/fonts/ttfonts/NotoSans-Regular.ttf -pointsize 9 "$@" haiku_icons.png' --
rm /tmp/$$_icon_* rm /tmp/$$_icon_*
+3 -3
View File
@@ -75,12 +75,12 @@ rule DefineDefaultBuildProfiles
AddHaikuImagePackages AddHaikuImagePackages
bepdf bepdf
cvs cvs
dejavu
keymapswitcher keymapswitcher
llvm llvm
man man
mercurial mercurial
nano nano
noto
openssh openssh
p7zip p7zip
pe pe
@@ -130,9 +130,9 @@ rule DefineDefaultBuildProfiles
HAIKU_IMAGE_SIZE ?= 600 ; HAIKU_IMAGE_SIZE ?= 600 ;
AddHaikuImagePackages AddHaikuImagePackages
dejavu
man man
nano nano
noto
openssh openssh
openssl openssl
p7zip p7zip
@@ -164,7 +164,6 @@ rule DefineDefaultBuildProfiles
binutils binutils
bison bison
curl_devel curl_devel
dejavu
expat expat
flex flex
freetype_devel freetype_devel
@@ -179,6 +178,7 @@ rule DefineDefaultBuildProfiles
make make
ncurses6 ncurses6
ncurses6_devel ncurses6_devel
noto
python python
sed sed
texinfo texinfo
+2 -2
View File
@@ -7,12 +7,12 @@
*/ */
*, title { *, title {
font-family: "DejaVu Sans", Arial, sans-serif; font-family: "Noto Sans", Arial, sans-serif;
color: #333333; color: #333333;
} }
cmdsynopsis, code, command, computeroutput, envar, filename, keycode, keysym, cmdsynopsis, code, command, computeroutput, envar, filename, keycode, keysym,
literal, option, parameter, sgmltag, systemitem { literal, option, parameter, sgmltag, systemitem {
font-family: "Deja Vu Mono", Courier, "Courier New", monospace, fixed; font-family: "Noto Mono", Courier, "Courier New", monospace, fixed;
} }
term { term {
font-weight: bold; font-weight: bold;
+1 -1
View File
@@ -27,7 +27,7 @@ body {
color: #333333; /* mine shaft */ color: #333333; /* mine shaft */
background-color: white; background-color: white;
font-size: 14.4px; font-size: 14.4px;
font-family: "DejaVu Sans", Arial, sans-serif; font-family: "Noto Sans", Arial, sans-serif;
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
+1 -1
View File
@@ -21,7 +21,7 @@ body {
line-height: 1.5; line-height: 1.5;
margin: 0; margin: 0;
padding: 0; padding: 0;
font-family: "DejaVu Sans", Arial, Helvetica, sans-serif; font-family: "Noto Sans", Arial, Helvetica, sans-serif;
} }
/* link colors and text decoration */ /* link colors and text decoration */
+1 -1
View File
@@ -21,7 +21,7 @@ body {
line-height: 1.5; line-height: 1.5;
margin: 0; margin: 0;
padding: 0; padding: 0;
font-family: "DejaVu Sans", Arial, Helvetica, sans-serif; font-family: "Noto Sans", Arial, Helvetica, sans-serif;
} }
/* link colors and text decoration */ /* link colors and text decoration */
+1 -1
View File
@@ -808,7 +808,7 @@ status_t convert_styled_text_to_rtf(
} else { } else {
// There is no STYL section // There is no STYL section
// Just use a generic preamble // Just use a generic preamble
rtfFile << "{\\fonttbl\\f0 DejaVu Sans;}\\f0\\pard " << plainText rtfFile << "{\\fonttbl\\f0 Noto Sans;}\\f0\\pard " << plainText
<< "}"; << "}";
} }
+1 -1
View File
@@ -143,7 +143,7 @@ static const char *kStyleSheet = "\n"
"body#gopher span {\n" "body#gopher span {\n"
" margin-left: 1em;\n" " margin-left: 1em;\n"
" padding-left: 2em;\n" " padding-left: 2em;\n"
" font-family: 'DejaVu Sans Mono', Courier, monospace;\n" " font-family: 'Noto Mono', Courier, monospace;\n"
" word-wrap: break-word;\n" " word-wrap: break-word;\n"
" white-space: pre-wrap; }\n" " white-space: pre-wrap; }\n"
"\n" "\n"
+4 -4
View File
@@ -27,17 +27,17 @@
// These definitions provide the server something to use for default // These definitions provide the server something to use for default
// system fonts. // system fonts.
#define DEFAULT_PLAIN_FONT_FAMILY "DejaVu Sans" #define DEFAULT_PLAIN_FONT_FAMILY "Noto Sans"
#define FALLBACK_PLAIN_FONT_FAMILY "Swis721 BT" #define FALLBACK_PLAIN_FONT_FAMILY "Swis721 BT"
#define DEFAULT_PLAIN_FONT_STYLE "Book" #define DEFAULT_PLAIN_FONT_STYLE "Book"
#define DEFAULT_PLAIN_FONT_SIZE 12.0f #define DEFAULT_PLAIN_FONT_SIZE 12.0f
#define DEFAULT_BOLD_FONT_FAMILY "DejaVu Sans" #define DEFAULT_BOLD_FONT_FAMILY "Noto Sans"
#define FALLBACK_BOLD_FONT_FAMILY "Swis721 BT" #define FALLBACK_BOLD_FONT_FAMILY "Swis721 BT"
#define DEFAULT_BOLD_FONT_STYLE "Bold" #define DEFAULT_BOLD_FONT_STYLE "Bold"
#define DEFAULT_BOLD_FONT_SIZE 12.0f #define DEFAULT_BOLD_FONT_SIZE 12.0f
#define DEFAULT_FIXED_FONT_FAMILY "DejaVu Sans Mono" #define DEFAULT_FIXED_FONT_FAMILY "Noto Mono"
#define FALLBACK_FIXED_FONT_FAMILY "Courier10 BT" #define FALLBACK_FIXED_FONT_FAMILY "Courier10 BT"
#define DEFAULT_FIXED_FONT_STYLE "Book" #define DEFAULT_FIXED_FONT_STYLE "Regular"
#define DEFAULT_FIXED_FONT_SIZE 12.0f #define DEFAULT_FIXED_FONT_SIZE 12.0f
// This is the port capacity for all monitoring objects - ServerApps // This is the port capacity for all monitoring objects - ServerApps
+6 -6
View File
@@ -334,16 +334,16 @@ FontManager::_LoadRecentFontMappings()
ttfontsPath.Append("ttfonts"); ttfontsPath.Append("ttfonts");
BPath veraFontPath = ttfontsPath; BPath veraFontPath = ttfontsPath;
veraFontPath.Append("DejaVuSans.ttf"); veraFontPath.Append("NotoSans-Regular.ttf");
_AddDefaultMapping("DejaVu Sans", "Book", veraFontPath.Path()); _AddDefaultMapping("Noto Sans", "Book", veraFontPath.Path());
veraFontPath.SetTo(ttfontsPath.Path()); veraFontPath.SetTo(ttfontsPath.Path());
veraFontPath.Append("DejaVuSans-Bold.ttf"); veraFontPath.Append("NotoSans-Bold.ttf");
_AddDefaultMapping("DejaVu Sans", "Bold", veraFontPath.Path()); _AddDefaultMapping("Noto Sans", "Bold", veraFontPath.Path());
veraFontPath.SetTo(ttfontsPath.Path()); veraFontPath.SetTo(ttfontsPath.Path());
veraFontPath.Append("DejaVuSansMono.ttf"); veraFontPath.Append("NotoMono-Regular.ttf");
_AddDefaultMapping("DejaVu Sans Mono", "Book", veraFontPath.Path()); _AddDefaultMapping("Noto Mono", "Regular", veraFontPath.Path());
return true; return true;
} }