Remove font_unicode_list - font_unicode is a list now.

This commit is contained in:
Chris Young 2012-11-08 23:56:42 +00:00
parent 83e2c640cf
commit e25cb44814
3 changed files with 3 additions and 14 deletions

View File

@ -74,7 +74,7 @@ If the font NetSurf is trying to use does not contain a specific character used
For most users, installing and selecting @{"Code2000" rxs "address netsurf 'open http://code2000.sf.net'"} or @{"Bitstream Cyberbit" rxs "address netsurf 'open http://ftp.netscape.com/pub/communicator/extras/fonts/windows/'"} is the best option.
Additional fall-back fonts can be provided since NetSurf 3.0. These need to go into Users/user/Choices as a comma-separated list, for the font_unicode_list option.
Additional fall-back fonts can be provided since NetSurf 3.0. These need to go into Users/user/Choices as a comma-separated list, for the font_unicode option.
NB: Since NetSurf 3.0, NetSurf will scan the provided Unicode fonts, and the rest of the system fonts, on first startup. Setting font_unicode_only:1 will prevent fonts not in the preferred Unicode fonts list from being scanned or used as fallback fonts. If the system fonts or NetSurf's fallback fonts list changes, this cache will need to be re-generated. This can be forced by deleting the font glyph cache (which defaults to Users/user/FontGlyphCache).

View File

@ -448,17 +448,9 @@ void ami_font_scan_init(const char *filename, bool force_scan, bool save,
if(found == 0) {
if(list = NewObjList()) {
/* add preferred font */
asprintf(&unicode_font, "%s.font", nsoption_charp(font_unicode));
if(unicode_font != NULL) {
node = AddObject(list, AMINS_UNKNOWN);
if(node) node->dtz_Node.ln_Name = unicode_font;
entries = 1;
}
/* add preferred fonts list */
if(nsoption_charp(font_unicode_list) &&
(csv = strdup(nsoption_charp(font_unicode_list))))
if(nsoption_charp(font_unicode) &&
(csv = strdup(nsoption_charp(font_unicode))))
{
char *p;

View File

@ -58,7 +58,6 @@
bool close_no_quit; \
bool hide_docky_icon; \
char *font_unicode; \
char *font_unicode_list; \
char *font_unicode_file; \
bool font_unicode_only; \
bool font_antialiasing; \
@ -121,7 +120,6 @@
.close_no_quit = false, \
.hide_docky_icon = false, \
.font_unicode = NULL, \
.font_unicode_list = NULL, \
.font_unicode_file = NULL, \
.font_unicode_only = false, \
.font_antialiasing = true, \
@ -183,7 +181,6 @@
{ "close_no_quit", OPTION_BOOL, &nsoptions.close_no_quit}, \
{ "hide_docky_icon", OPTION_BOOL, &nsoptions.hide_docky_icon}, \
{ "font_unicode", OPTION_STRING, &nsoptions.font_unicode }, \
{ "font_unicode_list", OPTION_STRING, &nsoptions.font_unicode_list }, \
{ "font_unicode_file", OPTION_STRING, &nsoptions.font_unicode_file }, \
{ "font_unicode_only", OPTION_BOOL, &nsoptions.font_unicode_only }, \
{ "font_antialiasing", OPTION_BOOL, &nsoptions.font_antialiasing }, \