2001-08-21
2001-08-21 14:26:51 by Per Hedbor <ph@opera.com>
-
b5a1a7d1ba5f8105699cd693f5538d24d3929869
(11 lines)
(+6/-5)
[
Show
| Annotate
]
Branch: 5.2
Fixed fake bold and italic in ttf as well, and fixed the fake italic code
Rev: server/font_handlers/builtin.pike:1.10
Rev: server/font_handlers/freetype.pike:1.7
Rev: server/font_handlers/ttf.pike:1.9
4:
#else
inherit "ttf";
#endif
- constant cvs_version = "$Id: builtin.pike,v 1.9 2001/08/21 13:55:02 per Exp $";
+ constant cvs_version = "$Id: builtin.pike,v 1.10 2001/08/21 14:26:51 per Exp $";
constant name = "Builtin fonts";
constant doc = "Fonts included in pike (and roxen)";
70: Inside #if constant(__rbf) && constant(grbf) and #if defined(THREADS)
#ifdef THREADS
object key = lock->lock();
#endif
- #if constant(Image.FreeType.Face)
+
if( !roxenbuiltin ) catch(roxenbuiltin = grbf());
- if( roxenbuiltin ) return FTFont( roxenbuiltin, size,"-",bold,italic );
+ if( roxenbuiltin )
+ #if constant(Image.FreeType.Face)
+ return FTFont( roxenbuiltin, size,"-", bold, italic );
#else
- if( !roxenbuiltin ) catch(roxenbuiltin = grbf());
- if( roxenbuiltin ) return TTFWrapper( roxenbuiltin(), size, "-" );
+ return TTFWrapper( roxenbuiltin(), size, "-", bold, italic);
#endif
#endif
case "pikebuiltin":
return Image.Font();
}
}