fly/fgdata
1
0
Fork 0
Code Activity

Canvas svg: use font-style and map LiberationFonts

Browse source 
- interprete the font-style attribute for text
- add a better font-mapper for Liberation Fonts
This commit is contained in:
Torsten Dreyer 2014-09-10 16:51:12 +02:00
parent fd3bd5da20
commit 61a6fee0db
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Nasal/canvas/svg.nas
View file

@ -27,15 +27,26 @@ var parsesvg = func(group, path, options = nil)
};
var custom_font_mapper = options['font-mapper'];
var font_mapper = func(family, weight)
var font_mapper = func(family, weight, style)
{
if( typeof(custom_font_mapper) == 'func' )
{
var font = custom_font_mapper(family, weight);
var font = custom_font_mapper(family, weight, style);
if( font != nil )
return font;
}
if( string.match(family,"Liberation*") ) {
style = style == "italic" ? "Italic" : "";
weight = weight == "bold" ? "Bold" : "";
var s = weight ~ style;
if( s == "" ) s = "Regular";
return "LiberationFonts/" ~ string.replace(family," ", "") ~ "-" ~ s ~ ".ttf";
}
return "LiberationFonts/LiberationMono-Bold.ttf";
};
@ -349,8 +360,9 @@ var parsesvg = func(group, path, options = nil)
var font_family = style["font-family"];
var font_weight = style["font-weight"];
if( font_family != nil or font_weight != nil )
stack[-1].set("font", font_mapper(font_family, font_weight));
var font_style = style["font-style"];
if( font_family != nil or font_weight != nil or font_style != nil )
stack[-1].set("font", font_mapper(font_family, font_weight, font_style));
var font_size = style["font-size"];
if( font_size != nil )