sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

accept woff (web font) format - closes #2113

Browse source
This commit is contained in:
Dane Springmeyer 2013-12-20 17:15:41 -05:00
parent bead269923
commit 448d093f77
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bindings/python/mapnik/__init__.py
View file

@ -1030,7 +1030,7 @@ def register_plugins(path=None):
path = inputpluginspath
DatasourceCache.register_datasources(path)
def register_fonts(path=None,valid_extensions=['.ttf','.otf','.ttc','.pfa','.pfb','.ttc','.dfont']):
def register_fonts(path=None,valid_extensions=['.ttf','.otf','.ttc','.pfa','.pfb','.ttc','.dfont','.woff']):
"""Recursively register fonts using path argument as base directory"""
if not path:
if os.environ.has_key('MAPNIK_FONT_DIRECTORY'):

1
src/font_engine_freetype.cpp
View file

@ -83,6 +83,7 @@ bool freetype_engine::is_font_file(std::string const& file_name)
boost::algorithm::ends_with(fn,std::string(".pfa")) ||
boost::algorithm::ends_with(fn,std::string(".pfb")) ||
boost::algorithm::ends_with(fn,std::string(".ttc")) ||
boost::algorithm::ends_with(fn,std::string(".woff"))||
// Plus OSX custom ext
boost::algorithm::ends_with(fn,std::string(".dfont"));
}