hrev50959 adds 1 changeset to branch 'master'
old head: fc4167a80128d9c9f43bd21405bd651d81027baa
new head: 2423ba84701f064cb78a40010113a8a45cc02a92
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=2423ba84701f+%5Efc4167a80128
----------------------------------------------------------------------------
2423ba84701f: Revert "Switch from DejaVu to Noto font"
This reverts commit 945566ff43583e4f8102b4440c88f53dae775cb4.
As discussed on the mailing lists and with Humdinger off-list:
* The general design concensus tends slightly towards DejaVu, as metrics
of DejaVu look much better (DejaVu 12 and Noto 13 are roughly the same
size,
but Noto has much wider margins with that)
* While Noto does have a wider set of fonts with support for lots of
different languages, DejaVu actually has built-in support for more
Unicode languages (the default Noto has, as far as I can tell, only
Latin/Greek/Cyrillic [2416 glyphs], while DejaVu also has Armenian,
Georgian,
and a few other scripts too [5119 glyphs].)
* The worse rendering of DejaVu appears to have been somewhat rectified by
disabling the average-based subpixel filter in app_server.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev50959
Commit: 2423ba84701f064cb78a40010113a8a45cc02a92
URL: http://cgit.haiku-os.org/haiku/commit/?id=2423ba84701f
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sat Feb 18 19:36:36 2017 UTC
----------------------------------------------------------------------------
8 files changed, 19 insertions(+), 19 deletions(-)
3rdparty/mmu_man/scripts/generate_icon_table.sh | 2 +-
build/jam/DefaultBuildProfiles | 6 +++---
docs/interface_guidelines/haiku.css | 4 ++--
docs/user/book.css | 2 +-
src/add-ons/translators/rtf/convert.cpp | 2 +-
src/kits/network/libnetapi/GopherRequest.cpp | 2 +-
src/servers/app/ServerConfig.h | 8 ++++----
src/servers/app/font/FontManager.cpp | 12 ++++++------
----------------------------------------------------------------------------
diff --git a/3rdparty/mmu_man/scripts/generate_icon_table.sh
b/3rdparty/mmu_man/scripts/generate_icon_table.sh
index 680ee27..4aec7fa 100755
--- a/3rdparty/mmu_man/scripts/generate_icon_table.sh
+++ b/3rdparty/mmu_man/scripts/generate_icon_table.sh
@@ -11,6 +11,6 @@ for f in data/artwork/icons/*; do
echo "-label"
echo "${bn}"
echo "${tmpf}${bn}.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' --
+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' --
rm /tmp/$$_icon_*
diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 7263991..2ec0a4b 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -75,12 +75,12 @@ rule DefineDefaultBuildProfiles
AddHaikuImagePackages
bepdf
cvs
+ dejavu
keymapswitcher
llvm
man
mercurial
nano
- noto
openssh
p7zip
pe
@@ -130,9 +130,9 @@ rule DefineDefaultBuildProfiles
HAIKU_IMAGE_SIZE ?= 600 ;
AddHaikuImagePackages
+ dejavu
man
nano
- noto
openssh
openssl
p7zip
@@ -164,6 +164,7 @@ rule DefineDefaultBuildProfiles
binutils
bison
curl_devel
+ dejavu
expat
flex
freetype_devel
@@ -178,7 +179,6 @@ rule DefineDefaultBuildProfiles
make
ncurses6
ncurses6_devel
- noto
python
sed
texinfo
diff --git a/docs/interface_guidelines/haiku.css
b/docs/interface_guidelines/haiku.css
index cdd108d..867536c 100644
--- a/docs/interface_guidelines/haiku.css
+++ b/docs/interface_guidelines/haiku.css
@@ -7,12 +7,12 @@
*/
*, title {
- font-family: "Noto Sans", Arial, sans-serif;
+ font-family: "DejaVu Sans", Arial, sans-serif;
color: #333333;
}
cmdsynopsis, code, command, computeroutput, envar, filename, keycode, keysym,
literal, option, parameter, sgmltag, systemitem {
- font-family: "Noto Mono", Courier, "Courier New", monospace, fixed;
+ font-family: "Deja Vu Mono", Courier, "Courier New", monospace, fixed;
}
term {
font-weight: bold;
diff --git a/docs/user/book.css b/docs/user/book.css
index ce79e98..4cd2a15 100644
--- a/docs/user/book.css
+++ b/docs/user/book.css
@@ -27,7 +27,7 @@ body {
color: #333333; /* mine shaft */
background-color: white;
font-size: 14.4px;
- font-family: "Noto Sans", Arial, sans-serif;
+ font-family: "DejaVu Sans", Arial, sans-serif;
}
h1, h2, h3, h4, h5, h6 {
diff --git a/src/add-ons/translators/rtf/convert.cpp
b/src/add-ons/translators/rtf/convert.cpp
index 4924f7f..6a6577d 100644
--- a/src/add-ons/translators/rtf/convert.cpp
+++ b/src/add-ons/translators/rtf/convert.cpp
@@ -808,7 +808,7 @@ status_t convert_styled_text_to_rtf(
} else {
// There is no STYL section
// Just use a generic preamble
- rtfFile << "{\\fonttbl\\f0 Noto Sans;}\\f0\\pard " << plainText
+ rtfFile << "{\\fonttbl\\f0 DejaVu Sans;}\\f0\\pard " <<
plainText
<< "}";
}
diff --git a/src/kits/network/libnetapi/GopherRequest.cpp
b/src/kits/network/libnetapi/GopherRequest.cpp
index 8b4bf68..9e57bf0 100644
--- a/src/kits/network/libnetapi/GopherRequest.cpp
+++ b/src/kits/network/libnetapi/GopherRequest.cpp
@@ -143,7 +143,7 @@ static const char *kStyleSheet = "\n"
"body#gopher span {\n"
" margin-left: 1em;\n"
" padding-left: 2em;\n"
-" font-family: 'Noto Mono', Courier, monospace;\n"
+" font-family: 'DejaVu Sans Mono', Courier, monospace;\n"
" word-wrap: break-word;\n"
" white-space: pre-wrap; }\n"
"\n"
diff --git a/src/servers/app/ServerConfig.h b/src/servers/app/ServerConfig.h
index 6416516..8d05dd4 100644
--- a/src/servers/app/ServerConfig.h
+++ b/src/servers/app/ServerConfig.h
@@ -27,17 +27,17 @@
// These definitions provide the server something to use for default
// system fonts.
-#define DEFAULT_PLAIN_FONT_FAMILY "Noto Sans"
+#define DEFAULT_PLAIN_FONT_FAMILY "DejaVu Sans"
#define FALLBACK_PLAIN_FONT_FAMILY "Swis721 BT"
#define DEFAULT_PLAIN_FONT_STYLE "Book"
#define DEFAULT_PLAIN_FONT_SIZE 12.0f
-#define DEFAULT_BOLD_FONT_FAMILY "Noto Sans"
+#define DEFAULT_BOLD_FONT_FAMILY "DejaVu Sans"
#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 "DejaVu Sans Mono"
#define FALLBACK_FIXED_FONT_FAMILY "Courier10 BT"
-#define DEFAULT_FIXED_FONT_STYLE "Regular"
+#define DEFAULT_FIXED_FONT_STYLE "Book"
#define DEFAULT_FIXED_FONT_SIZE 12.0f
// This is the port capacity for all monitoring objects - ServerApps
diff --git a/src/servers/app/font/FontManager.cpp
b/src/servers/app/font/FontManager.cpp
index 088b23f..43b1801 100644
--- a/src/servers/app/font/FontManager.cpp
+++ b/src/servers/app/font/FontManager.cpp
@@ -334,16 +334,16 @@ FontManager::_LoadRecentFontMappings()
ttfontsPath.Append("ttfonts");
BPath veraFontPath = ttfontsPath;
- veraFontPath.Append("NotoSans-Regular.ttf");
- _AddDefaultMapping("Noto Sans", "Book", veraFontPath.Path());
+ veraFontPath.Append("DejaVuSans.ttf");
+ _AddDefaultMapping("DejaVu Sans", "Book", veraFontPath.Path());
veraFontPath.SetTo(ttfontsPath.Path());
- veraFontPath.Append("NotoSans-Bold.ttf");
- _AddDefaultMapping("Noto Sans", "Bold", veraFontPath.Path());
+ veraFontPath.Append("DejaVuSans-Bold.ttf");
+ _AddDefaultMapping("DejaVu Sans", "Bold", veraFontPath.Path());
veraFontPath.SetTo(ttfontsPath.Path());
- veraFontPath.Append("NotoMono-Regular.ttf");
- _AddDefaultMapping("Noto Mono", "Regular", veraFontPath.Path());
+ veraFontPath.Append("DejaVuSansMono.ttf");
+ _AddDefaultMapping("DejaVu Sans Mono", "Book",
veraFontPath.Path());
return true;
}
